Merge branch 'main' into 3962-audit-navigation-plugin

Signed-off-by: Manasvini B Suryanarayana <manasvis@amazon.com>

.github/CODEOWNERS

@@ -1 +1 @@
-*   @ananzh @kavilla @seanneumann @AMoo-Miki @ashwin-pc @joshuarrrr @abbyhu2000 @zengyan-amazon @kristenTian @zhongnansu @manasvinibs
+*   @ananzh @kavilla @seanneumann @AMoo-Miki @ashwin-pc @joshuarrrr @abbyhu2000 @zengyan-amazon @kristenTian @zhongnansu @manasvinibs @ZilongX @Flyingliuhub

.github/workflows/build_and_test_workflow.yml

@@ -25,13 +25,13 @@ env:
   TEST_OPENSEARCH_TRANSPORT_PORT: 9403
   TEST_OPENSEARCH_PORT: 9400
   OSD_SNAPSHOT_SKIP_VERIFY_CHECKSUM: true
-  # Version 112.0.5615.0
-  CHROME_VERSION: 1109208
+  NODE_OPTIONS: "--max-old-space-size=6144 --dns-result-order=ipv4first"
 
 jobs:
   build-lint-test:
     name: Build and Verify on ${{ matrix.name }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
         include:
@@ -137,22 +137,6 @@ jobs:
     steps:
       - run: echo Running functional tests for ciGroup${{ matrix.group }}
 
-      - name: Setup Chrome
-        id: setup-chrome
-        uses: browser-actions/setup-chrome@v1
-        with:
-          chrome-version: ${{ env.CHROME_VERSION }}
-
-      - name: Set Chrome Path
-        if: matrix.os != 'windows-latest'
-        run: |
-          echo "TEST_BROWSER_BINARY_PATH=${{ steps.setup-chrome.outputs.chrome-path }}" >> $GITHUB_ENV
-
-      - name: Set Chrome Path (Windows)
-        if: matrix.os == 'windows-latest'
-        run: |
-          echo "TEST_BROWSER_BINARY_PATH=${{ steps.setup-chrome.outputs.chrome-path }}" >> $env:GITHUB_ENV
-
       - name: Configure git's autocrlf (Windows only)
         if: matrix.os == 'windows-latest'
         run: |
@@ -403,6 +387,7 @@ jobs:
         with:
           name: ${{ matrix.version }}-test-failures
           path: |
-            ./artifacts/bwc_tmp/test/cypress/videos/without-security/*
-            ./artifacts/bwc_tmp/test/cypress/screenshots/without-security/*
+            ./artifacts/bwc_tmp/test/cypress/videos/*
+            ./artifacts/bwc_tmp/test/cypress/screenshots/*
+            ./artifacts/bwc_tmp/test/cypress/results/*
           retention-days: 1

.github/workflows/cypress_workflow.yml

@@ -12,7 +12,10 @@ env:
   START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch'
   OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot'
   SPEC: 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/**/*.js,'
-  CYPRESS_ENV: 'env CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=false'
+  CYPRESS_BROWSER: 'chromium'
+  CYPRESS_VISBUILDER_ENABLED: true
+  CYPRESS_DATASOURCE_MANAGEMENT_ENABLED: false
+  OSD_SNAPSHOT_SKIP_VERIFY_CHECKSUM: true
 
 jobs:
   cypress-tests:
@@ -76,7 +79,7 @@ jobs:
           working-directory: ${{ env.FTR_PATH }}
           start: ${{ env.OPENSEARCH_SNAPSHOT_CMD }}, ${{ env.START_CMD }}
           wait-on: 'http://localhost:9200, http://localhost:5601'
-          command: ${{ env.CYPRESS_ENV }} yarn cypress:run-without-security --browser chromium --spec ${{ env.SPEC }}
+          command: yarn cypress:run-without-security --browser ${{ env.CYPRESS_BROWSER }} --spec ${{ env.SPEC }}
 
       # Screenshots are only captured on failure, will change this once we do visual regression tests
       - uses: actions/upload-artifact@v3

.i18nrc.json

@@ -48,7 +48,7 @@
       "src/plugins/telemetry_management_section"
     ],
     "tileMap": "src/plugins/tile_map",
-    "timeline": ["src/plugins/timeline", "src/plugins/vis_type_timeline"],
+    "timeline": ["src/plugins/vis_type_timeline"],
     "uiActions": "src/plugins/ui_actions",
     "visDefaultEditor": "src/plugins/vis_default_editor",
     "visTypeMarkdown": "src/plugins/vis_type_markdown",

.lycheeexclude

@@ -89,6 +89,7 @@ http://www.opensearch.org/painlessDocs
 https://www.hostedgraphite.com/
 https://connectionurl.com
 http://169.254.169.254/latest/meta-data/
+http://company.net/*
 
 # External urls
 https://www.zeek.org/

.node-version

@@ -1 +1 @@
-14.21.3
+18.16.0

.nvmrc

@@ -1 +1 @@
-14.21.3
+18.16.0

Dockerfile

@@ -1,4 +1,4 @@
-ARG NODE_VERSION=14.20.1
+ARG NODE_VERSION=18.16.0
 FROM node:${NODE_VERSION} AS base
 
 ENV HOME '.'

MAINTAINERS.md

@@ -17,6 +17,8 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Kristen Tian              | [kristenTian](/~https://github.com/kristenTian)       | Amazon      |
 | Zhongnan Su               | [zhongnansu](/~https://github.com/zhongnansu)         | Amazon      |
 | Manasvini B Suryanarayana | [manasvinibs](/~https://github.com/manasvinibs)       | Amazon      |
+| Tao Liu                   | [Flyingliuhub](/~https://github.com/Flyingliuhub)     | Amazon      |
+| Zilong Xia                | [ZilongX](/~https://github.com/ZilongX)               | Amazon      |
 
 ## Emeritus
 

config/opensearch_dashboards.yml

@@ -229,8 +229,7 @@
 # functionality in Visualization.
 # vis_builder.enabled: false
 
-# Set the value of this setting to true to enable the experimental multiple data source
-# support feature. Use with caution.
+# Set the value of this setting to true to enable multiple data source feature.
 #data_source.enabled: false
 # Set the value of these settings to customize crypto materials to encryption saved credentials
 # in data sources.

cypress/integration/with-security/check_advanced_settings.js

@@ -25,13 +25,6 @@ describe('verify the advanced settings are saved', () => {
       .should('eq', 'true');
   });
 
-  it('the Timeline default columns field is set to 4', () => {
-    cy.get('[data-test-subj="advancedSetting-editField-timeline:default_columns"]').should(
-      'have.value',
-      4
-    );
-  });
-
   it('the Timeline Maximum buckets field is set to 4', () => {
     cy.get('[data-test-subj="advancedSetting-editField-timeline:max_buckets"]').should(
       'have.value',

cypress/integration/with-security/helpers/generate_data.js

@@ -31,9 +31,6 @@ describe('Generating BWC test data with security', () => {
   it('adds advanced settings', () => {
     miscUtils.visitPage('app/management/opensearch-dashboards/settings');
     cy.get('[data-test-subj="advancedSetting-editField-theme:darkMode"]').click();
-    cy.get('[data-test-subj="advancedSetting-editField-timeline:default_columns"]').type(
-      '{selectAll}4'
-    );
     cy.get('[data-test-subj="advancedSetting-editField-timeline:max_buckets"]').type(
       '{selectAll}4'
     );

cypress/integration/without-security/check_advanced_settings.js

@@ -18,13 +18,6 @@ describe('verify the advanced settings are saved', () => {
       .should('eq', 'true');
   });
 
-  it('the Timeline default columns field is set to 4', () => {
-    cy.get('[data-test-subj="advancedSetting-editField-timeline:default_columns"]').should(
-      'have.value',
-      4
-    );
-  });
-
   it('the Timeline Maximum buckets field is set to 4', () => {
     cy.get('[data-test-subj="advancedSetting-editField-timeline:max_buckets"]').should(
       'have.value',

cypress/integration/without-security/helpers/generate_data.js

@@ -14,9 +14,6 @@ describe('Generating BWC test data without security', () => {
   it('adds advanced settings', () => {
     miscUtils.visitPage('app/management/opensearch-dashboards/settings');
     cy.get('[data-test-subj="advancedSetting-editField-theme:darkMode"]').click();
-    cy.get('[data-test-subj="advancedSetting-editField-timeline:default_columns"]').type(
-      '{selectAll}4'
-    );
     cy.get('[data-test-subj="advancedSetting-editField-timeline:max_buckets"]').type(
       '{selectAll}4'
     );

docs/saved_objects/resources/current_saved_object_service_workflow.puml

@@ -0,0 +1,19 @@
+@startuml
+title: Current Saved Object Service Flow
+actor User
+participant "Saved Object Client" as Client
+participant "Saved Object Repository" as Repo
+participant "Opensearch" as OS
+
+User -> Client: Create Saved Object
+Client -> Repo: Create Saved Object
+Repo -> OS: Index Saved Object
+OS --> Repo: Saved Object Saved
+Client -> User: Saved Object Created
+User -> Client: Get Saved Object
+Client -> Repo: Get Saved Object
+Repo -> OS: Get Saved Object
+OS --> Repo: Return Saved Object
+Repo -> Client: Return Saved Object
+Client -> User: Saved Object Data
+@enduml

docs/saved_objects/resources/proposed_saved_object_service_workflow.puml

@@ -0,0 +1,38 @@
+@startuml
+
+title: Proposed Saved Object Service Flow
+
+actor User
+
+participant "OpenSearch-Dashboards" as OSD
+
+box "Saved Object Service" #LightBlue
+participant "Saved Object Client" as Client
+participant "Repository Factory Provider" as Factory
+end box
+
+box "Dashboards Storage Plugin" #LightYellow
+participant "Repository\n(e.g. PostgresRepository,\nDynamoDBRepository)" as Repo
+participant "Metadata Storage\n(e.g. Postgres, \nDynamoDB etc)" as Meta
+end box
+
+autonumber
+group OSD Bootstrap
+Repo -> Factory: Register custom repository
+Factory -> Client: Returns repository
+Client -> OSD: Returns Saved Object Client
+end group
+User -> Client: Create Saved Object
+Client -> Repo: Create Saved Object
+Repo -> Meta: Create/Update Record
+Meta --> Repo: Saved Object Saved
+Client -> User: Saved Object Created
+User -> Client: Get Saved Object
+Client -> Repo: Get Saved Object
+Repo -> Meta: Fetch Saved Object from storage
+Meta --> Repo: Return Saved Object
+Repo -> Client: Return Saved Object
+Client -> User: Saved Object Data
+
+skinparam BoxPadding 15
+@enduml