Merge branch 'opensearch-project:main' into main

mengweieric · Oct 14, 2024 · cebc6a9 · cebc6a9
2 parents 6dbc204 + f68eba1
commit cebc6a9
Show file tree

Hide file tree

Showing 704 changed files with 70,400 additions and 40,348 deletions.
diff --git a/.cypress/integration/datasources_test/datasources_basic_ui.spec.js b/.cypress/integration/datasources_test/datasources_basic_ui.spec.js
diff --git a/.cypress/integration/integrations_test/integrations.spec.js b/.cypress/integration/integrations_test/integrations.spec.js
@@ -107,7 +107,7 @@ describe('Add nginx integration instance flow', () => {
 
     cy.get('button[data-test-subj="popoverModal__deleteButton"]').should('be.disabled');
 
-    cy.get(`input.euiFieldText[placeholder="${testInstance}"]`).focus().type(testInstance, {
+    cy.get(`input.euiFieldText[placeholder="delete"]`).focus().type("delete", {
       delay: 50,
     });
     cy.get('button[data-test-subj="popoverModal__deleteButton"]').should('not.be.disabled');

diff --git a/.cypress/integration/notebooks_test/notebooks.spec.js b/.cypress/integration/notebooks_test/notebooks.spec.js
@@ -75,7 +75,7 @@ describe('Testing notebooks table', () => {
     cy.get('h3[data-test-subj="notebookTableTitle"]').contains('Notebooks (0)').should('exist');
     cy.get('div[data-test-subj="notebookEmptyTableText"]').contains('No notebooks');
     cy.get('a[data-test-subj="notebookEmptyTableCreateBtn"]').contains('Create notebook');
-    cy.get('button[data-test-subj="notebookEmptyTableAddSamplesBtn"]').contains('Add samples');
+    cy.get('button[data-test-subj="notebookEmptyTableAddSamplesBtn"]').contains('Add sample notebooks');
   });
 
   it('Displays error toast for invalid notebook name', () => {
@@ -93,33 +93,16 @@ describe('Testing notebooks table', () => {
     cy.contains(TEST_NOTEBOOK).should('exist');
   });
 
-  it('Duplicates a notebook', () => {
-    cy.get('.euiCheckbox__input[title="Select this row"]').eq(0).click();
-    cy.get('button[data-test-subj="notebookTableActionBtn"]').click();
-    cy.get('button[data-test-subj="duplicateNotebookBtn"]').click();
-    cy.get('button[data-test-subj="custom-input-modal-confirm-button"]').click();
-
-    cy.get('.euiCheckbox__input[title="Select this row"]').eq(1).click();
-  });
-
-  it('Renames a notebook', () => {
-    cy.get('.euiCheckbox__input[title="Select this row"]').eq(0).click();
-    cy.get('button[data-test-subj="notebookTableActionBtn"]').click();
-    cy.get('button[data-test-subj="renameNotebookBtn"]').click();
-    cy.get('input[data-test-subj="custom-input-modal-input"]').focus().type(' (rename)');
-    cy.get('button[data-test-subj="custom-input-modal-confirm-button"]').click();
-  });
-
   it('Searches existing notebooks', () => {
     cy.get('input.euiFieldSearch').focus().type('this notebook should not exist');
     cy.get('.euiTableCellContent__text').contains('No items found').should('exist');
     cy.get('.euiFormControlLayoutClearButton').click();
     cy.get('input.euiFieldSearch')
       .focus()
-      .type(TEST_NOTEBOOK + ' (copy) (rename)');
+      .type(TEST_NOTEBOOK);
 
     cy.get('a.euiLink')
-      .contains(TEST_NOTEBOOK + ' (copy) (rename)')
+      .contains(TEST_NOTEBOOK)
       .should('exist');
   });
 
@@ -152,7 +135,7 @@ describe('Testing paragraphs', () => {
     cy.get('a[data-test-subj="createNotebookPrimaryBtn"]').click();
     cy.get('input[data-test-subj="custom-input-modal-input"]').focus().type(TEST_NOTEBOOK);
     cy.get('button[data-test-subj="custom-input-modal-confirm-button"]').click();
-    cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist');
+    cy.get('h3[data-test-subj="notebookTableTitle"]').contains(TEST_NOTEBOOK).should('exist');
   });
 
   beforeEach(() => {
@@ -183,7 +166,7 @@ describe('Testing paragraphs', () => {
 
   it('Has working breadcrumbs', () => {
     cy.get('a[data-test-subj="breadcrumb last"]').contains(TEST_NOTEBOOK).click();
-    cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist');
+    cy.get('h3[data-test-subj="notebookTableTitle"]').contains(TEST_NOTEBOOK).should('exist');
     cy.get('a[data-test-subj="breadcrumb"]').contains('Notebooks').click();
     cy.get('h3[data-test-subj="notebookTableTitle"]').should('exist');
     cy.get('a[data-test-subj="breadcrumb first"]').contains('Observability').click();
@@ -192,12 +175,8 @@ describe('Testing paragraphs', () => {
 
   it('Paragraph actions layout', () => {
     cy.get('button[data-test-subj="notebook-paragraph-actions-button"]').should('exist').click();
-    cy.get('.euiContextMenuPanelTitle').contains('Actions');
-    cy.get('.euiContextMenuItem__text').eq(0).contains('Add paragraph to top');
-    cy.get('.euiContextMenuItem__text').eq(1).contains('Add paragraph to bottom');
-    cy.get('.euiContextMenuItem__text').eq(2).contains('Run all paragraphs');
-    cy.get('.euiContextMenuItem__text').eq(3).contains('Clear all outputs');
-    cy.get('.euiContextMenuItem__text').eq(4).contains('Delete all paragraphs');
+    cy.get('.euiContextMenuItem__text').eq(0).contains('To top');
+    cy.get('.euiContextMenuItem__text').eq(1).contains('To bottom');
   });
 
   it('Shows output message', () => {
@@ -260,15 +239,16 @@ describe('Testing paragraphs', () => {
   });
 
   it('Adds a SQL query paragraph', () => {
-    cy.get('button[data-test-subj="AddParagraphButton"]').click();
-    cy.get('button[data-test-subj="AddCodeBlockBtn"]').click();
+    cy.get('button[data-test-subj="notebook-paragraph-actions-button"]').click();
+    cy.get('span.euiContextMenuItem__text').contains('To top').click();
+    cy.get('button.euiContextMenuItem').contains('Code block').click();
 
-    cy.get('textarea[data-test-subj="editorArea-3"]').clear();
-    cy.get('textarea[data-test-subj="editorArea-3"]').focus();
-    cy.get('textarea[data-test-subj="editorArea-3"]').type(SQL_QUERY_TEXT);
-    cy.get('button[data-test-subj="runRefreshBtn-3"]').click();
+    cy.get('textarea[data-test-subj="editorArea-0"]').clear();
+    cy.get('textarea[data-test-subj="editorArea-0"]').focus();
+    cy.get('textarea[data-test-subj="editorArea-0"]').type(SQL_QUERY_TEXT);
+    cy.get('button[data-test-subj="runRefreshBtn-0"]').click();
 
-    cy.get('textarea[data-test-subj="editorArea-3"]').should('not.exist');
+    cy.get('textarea[data-test-subj="editorArea-0"]').should('not.exist');
     cy.get('div[data-test-subj="queryOutputText"]')
       .contains('select * from opensearch_dashboards_sample_data_flights limit 20')
       .should('exist');
@@ -318,10 +298,11 @@ describe('Testing paragraphs', () => {
   });
 
   it('Adds an observability visualization paragraph', () => {
-    cy.get('button[data-test-subj="AddParagraphButton"]').click();
-    cy.get('button[data-test-subj="AddVisualizationBlockBtn"]').click();
+    cy.get('button[data-test-subj="notebook-paragraph-actions-button"]').click();
+    cy.get('span.euiContextMenuItem__text').contains('To top').click();
+    cy.get('button.euiContextMenuItem').contains('Visualization').click();
 
-    cy.get('button[data-test-subj="runRefreshBtn-6"]').click();
+    cy.get('button[data-test-subj="runRefreshBtn-0"]').click();
     cy.get('div[data-test-subj="paragraphInputErrorText"]')
       .contains('Visualization is required.')
       .should('exist');
@@ -331,7 +312,7 @@ describe('Testing paragraphs', () => {
       .type('[Logs] Count total requests by tags');
 
     cy.get('.euiComboBoxOption__content').contains('[Logs] Count total requests by tags').click();
-    cy.get('button[data-test-subj="runRefreshBtn-6"]').click();
+    cy.get('button[data-test-subj="runRefreshBtn-0"]').click();
     cy.get('h5').contains('[Logs] Count total requests by tags').should('exist');
   });
 
@@ -353,7 +334,7 @@ describe('Testing paragraphs', () => {
   });
 
   it('Clears outputs', () => {
-    cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist');
+    cy.get('h3[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist');
     cy.get('[data-test-subj="notebook-paragraph-actions-button"]').should('exist');
     cy.get('[data-test-subj="notebook-paragraph-actions-button"]').click();
     cy.get('.euiContextMenuItem__text').contains('Clear all outputs').click();
@@ -363,35 +344,36 @@ describe('Testing paragraphs', () => {
   });
 
   it('Runs all paragraphs', () => {
-    cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist');
+    cy.get('h3[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist');
     cy.get('[data-test-subj="notebook-paragraph-actions-button"]').click();
     cy.get('.euiContextMenuItem__text').contains('Run all paragraphs').click();
 
     cy.get(`a[href="${SAMPLE_URL}"]`).should('exist');
   });
 
   it('Adds paragraph to top', () => {
-    cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist');
+    cy.get('h3[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist');
 
-    cy.get('[data-test-subj="notebook-paragraph-actions-button"]').click();
-    cy.get('.euiContextMenuItem__text').contains('Add paragraph to top').click();
-    cy.get('.euiContextMenuItem__text').contains('Code block').click();
+    cy.get('button[data-test-subj="notebook-paragraph-actions-button"]').click();
+    cy.get('span.euiContextMenuItem__text').contains('To top').click();
+    cy.get('button.euiContextMenuItem').contains('Code block').click();
 
     cy.get('.euiText').contains('[1] Code block').should('exist');
   });
 
   it('Adds paragraph to bottom', () => {
-    cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist');
-    cy.get('[data-test-subj="notebook-paragraph-actions-button"]').click();
-    cy.get('.euiContextMenuItem__text').contains('Add paragraph to bottom').click();
-    cy.get('.euiContextMenuItem__text').contains('Code block').click();
+    cy.get('h3[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist');
+
+    cy.get('button[data-test-subj="notebook-paragraph-actions-button"]').click();
+    cy.get('span.euiContextMenuItem__text').contains('To To bottom').click();
+    cy.get('button.euiContextMenuItem').contains('Code block').click();
 
     cy.get('.euiText').contains('[4] Visualization').should('exist');
     cy.get('.euiText').contains('[5] Code block').should('exist');
   });
 
   it('Moves paragraphs', () => {
-    cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist');
+    cy.get('h3[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist');
     cy.get('.euiButtonIcon[aria-label="Open paragraph menu"').eq(0).click();
     cy.get('.euiContextMenuItem-isDisabled').should('have.length.gte', 2);
     cy.get('.euiContextMenuItem__text').contains('Move to bottom').click();
@@ -400,7 +382,7 @@ describe('Testing paragraphs', () => {
   });
 
   it('Duplicates and renames the notebook', () => {
-    cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist');
+    cy.get('h3[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist');
     cy.get('[data-test-subj="notebook-notebook-actions-button"]').click();
     cy.get('.euiContextMenuItem__text').contains('Duplicate notebook').click();
     cy.get('.euiButton__text').contains('Duplicate').click();
@@ -411,14 +393,14 @@ describe('Testing paragraphs', () => {
     cy.get('.euiButton__text').last().contains('Rename').click();
     cy.reload();
 
-    cy.get('.euiTitle')
+    cy.get('.euiText')
       .contains(TEST_NOTEBOOK + ' (rename)')
       .should('exist');
     cy.get(`a[href="${SAMPLE_URL}"]`).should('have.length.gte', 2);
   });
 
   it('Deletes paragraphs', () => {
-    cy.get('h1[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist');
+    cy.get('h3[data-test-subj="notebookTitle"]').contains(TEST_NOTEBOOK).should('exist');
     cy.get('[data-test-subj="notebook-paragraph-actions-button"]').click();
     cy.get('.euiContextMenuItem__text').contains('Delete all paragraphs').click();
     cy.get('button[data-test-subj="confirmModalConfirmButton"]').click();

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,2 +1,3 @@
 # This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
-*   @pjfitzgibbons @ps48 @kavithacm @derek-ho @joshuali925 @dai-chen @YANG-DB @rupal-bq @mengweieric @vamsi-amazon @swiddis @penghuo @seankao-az @anirudha @paulstn @sumukhswamy
+
+- @ps48 @kavithacm @derek-ho @joshuali925 @dai-chen @YANG-DB @rupal-bq @mengweieric @vamsi-amazon @swiddis @penghuo @seankao-az @anirudha @paulstn @sumukhswamy @sejli @TackAdam @RyanL1997
diff --git a/.github/ISSUE_TEMPLATE/integration_request.md b/.github/ISSUE_TEMPLATE/integration_request.md
@@ -16,7 +16,7 @@ Describe the integration resource log protocol you are interesting in [ [`access
 
 **What is the integration target protocol ?**
 
-Describe the target protocol you are interested to ingest [ for example [`logs.mapping`](https://github.com/opensearch-project/opensearch-catalog/blob/main/schema/observability/logs/logs.mapping) , [`http.mapping`](https://github.com/opensearch-project/opensearch-catalog/blob/main/schema/observability/logs/http.mapping) ]
+Describe the target protocol you are interested to ingest [ for example [`logs.mapping`](https://github.com/opensearch-project/opensearch-catalog/blob/c40d1e87199528d3853c0c3fa308524c76ac6c2c/schema/observability/logs/logs-1.0.0.mapping) , [`http.mapping`](https://github.com/opensearch-project/opensearch-catalog/blob/c40d1e87199528d3853c0c3fa308524c76ac6c2c/schema/observability/logs/http-1.0.0.mapping) ]
 
 **Which agents would you use to ship this data ?**
 

diff --git a/.github/workflows/dashboards-observability-test-and-build-workflow.yml b/.github/workflows/dashboards-observability-test-and-build-workflow.yml
@@ -75,7 +75,7 @@ jobs:
                                  yarn build && mv ./build/*.zip ./build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip"
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: dashboards-observability-ubuntu-latest
           path: ./OpenSearch-Dashboards/plugins/dashboards-observability/build
@@ -145,7 +145,7 @@ jobs:
           mv ./build/*.zip ./build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: dashboards-observability-${{ matrix.os }}
           path: ./OpenSearch-Dashboards/plugins/dashboards-observability/build