Skip to content

Commit

Permalink
Updating 2.x from 2.7 changes (opensearch-project#482)
Browse files Browse the repository at this point in the history
* Fix for hover issue on docs of discover/explorer data grid (opensearch-project#329) (opensearch-project#358)

Signed-off-by: Eric Wei <[email protected]>
(cherry picked from commit 19f29e1)

Co-authored-by: Eric Wei <[email protected]>

* [2.7] Refactor Saved objects and add visualization embeddable (opensearch-project#341) (opensearch-project#353)

Signed-off-by: Joshua Li <[email protected]>
Co-authored-by: Eric Wei <[email protected]>

* Cohesion main to 2.7 (opensearch-project#382)

Signed-off-by: Eric Wei <[email protected]>
Signed-off-by: Joshua Li <[email protected]>
Signed-off-by: Peter Fitzgibbons <[email protected]>
Signed-off-by: Shenoy Pratik <[email protected]>
Signed-off-by: Derek Ho <[email protected]>
Co-authored-by: Derek Ho <[email protected]>
Co-authored-by: Eric Wei <[email protected]>
Co-authored-by: Joshua Li <[email protected]>
Co-authored-by: Peter Fitzgibbons <[email protected]>
Co-authored-by: Shenoy Pratik <[email protected]>
Co-authored-by: Rupal Mahajan <[email protected]>

* Fix redirection to legacy event_analytics URL (opensearch-project#383) (opensearch-project#384)

Signed-off-by: Joshua Li <[email protected]>
(cherry picked from commit 23e09e5)

Co-authored-by: Joshua Li <[email protected]>

* [2.7] Redo pick from main to 2.7 (opensearch-project#385)

Signed-off-by: Peter Fitzgibbons <[email protected]>
Signed-off-by: Derek Ho <[email protected]>
Signed-off-by: Eric Wei <[email protected]>
Signed-off-by: Rupal Mahajan <[email protected]>
Signed-off-by: Kavitha Conjeevaram Mohan <[email protected]>
Signed-off-by: Shenoy Pratik <[email protected]>
Signed-off-by: Joshua Li <[email protected]>
Co-authored-by: Eric Wei <[email protected]>
Co-authored-by: Peter Fitzgibbons <[email protected]>
Co-authored-by: Derek Ho <[email protected]>
Co-authored-by: Peter Fitzgibbons <[email protected]>
Co-authored-by: Rupal Mahajan <[email protected]>
Co-authored-by: Kavitha Conjeevaram Mohan <[email protected]>
Co-authored-by: Shenoy Pratik <[email protected]>

* Metrics analytics support for SOpanels  (opensearch-project#386) (opensearch-project#388)

Signed-off-by: Shenoy Pratik <[email protected]>
(cherry picked from commit 1ecd7ea)

Co-authored-by: Shenoy Pratik <[email protected]>

* change plugin ordering (opensearch-project#389) (opensearch-project#390)

Signed-off-by: Shenoy Pratik <[email protected]>
(cherry picked from commit a6c1ebc)

Co-authored-by: Shenoy Pratik <[email protected]>

* notebooks fix for cypress and minor bugs (opensearch-project#392) (opensearch-project#393)

* notebooks fix for cypress and minor bugs

Signed-off-by: Shenoy Pratik <[email protected]>

* remove comments

Signed-off-by: Shenoy Pratik <[email protected]>

---------

Signed-off-by: Shenoy Pratik <[email protected]>
(cherry picked from commit 3219f14)

* Update traces integration tests (opensearch-project#391) (opensearch-project#397)

* Update traces cypress tests

Signed-off-by: Rupal Mahajan <[email protected]>

* Update traces cypress test

Signed-off-by: Rupal Mahajan <[email protected]>

* Fix traces cypress tests

Signed-off-by: Rupal Mahajan <[email protected]>

* Fix filters test

Signed-off-by: Rupal Mahajan <[email protected]>

---------

Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit b8f9ca3)

Co-authored-by: Rupal Mahajan <[email protected]>

* Fix redirection to legacy event_analytics URL from dashboards (opensearch-project#399) (opensearch-project#403)

Signed-off-by: Joshua Li <[email protected]>
(cherry picked from commit 05ef180)

Co-authored-by: Joshua Li <[email protected]>

* Adjust metrics top menu layout to avoid overflow (opensearch-project#398) (opensearch-project#402)

Signed-off-by: Joshua Li <[email protected]>
(cherry picked from commit 6309e63)

Co-authored-by: Joshua Li <[email protected]>

* Support duplicate visualization in dashboard (opensearch-project#400) (opensearch-project#405)

Signed-off-by: Joshua Li <[email protected]>
(cherry picked from commit 3d74bac)

Co-authored-by: Joshua Li <[email protected]>

* fix panel visualization preview, new viz workflow (opensearch-project#401) (opensearch-project#404)

Signed-off-by: Shenoy Pratik <[email protected]>
(cherry picked from commit 78347d9)

Co-authored-by: Shenoy Pratik <[email protected]>

* Fix saving multiple metrics to SOpanels (opensearch-project#407) (opensearch-project#408)

* fix saving multiple metrics to SOpanels

Signed-off-by: Shenoy Pratik <[email protected]>

* remove unused variable

Signed-off-by: Shenoy Pratik <[email protected]>

---------

Signed-off-by: Shenoy Pratik <[email protected]>
(cherry picked from commit a4cb6d1)

Co-authored-by: Shenoy Pratik <[email protected]>

* Panel table fixes (opensearch-project#406)

* Fix Panel View (legacy)
  - Duplicate
  - Rename
  - Delete

---------

Signed-off-by: Peter Fitzgibbons <[email protected]>
Co-authored-by: Peter Fitzgibbons <[email protected]>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Joshua Li <[email protected]>
Co-authored-by: Shenoy Pratik <[email protected]>

* Release Notes 2.7.0.0 (opensearch-project#394) (opensearch-project#412)

* Release Notes 2.7.0.0

Signed-off-by: Peter Fitzgibbons <[email protected]>

* Release Notes 2.7.0.0

Signed-off-by: Peter Fitzgibbons <[email protected]>

---------

Signed-off-by: Peter Fitzgibbons <[email protected]>
Co-authored-by: Peter Fitzgibbons <[email protected]>
(cherry picked from commit 969e639)

Co-authored-by: Peter Fitzgibbons <[email protected]>

* [Dashboard listing] update edit url and view url (opensearch-project#416) (opensearch-project#421)

* [Dashboard listing] update edit url and view url

Update to include BASE_URL if basePath is defined. Since create url is just
a direct nav and needs the basePath when passing props to the provider, the source
code no longer appends the basePath to keep these URLs consistent.

A feature should consolidate the basePaths in the dashboard listing service so that
createUrl also adds the base path. At which point we no longer need the base path.

Also removed some rogue URLs.

Core PR:
opensearch-project/OpenSearch-Dashboards#3922

---------

Signed-off-by: Kawika Avilla <[email protected]>
Signed-off-by: Joshua Li <[email protected]>
Co-authored-by: Joshua Li <[email protected]>
(cherry picked from commit f94c21e)

Co-authored-by: Kawika Avilla <[email protected]>

* Fix invalid time range in new panels (opensearch-project#419)

Signed-off-by: Joshua Li <[email protected]>

* open new tab for editing panel visualization (opensearch-project#430)

Signed-off-by: Eric Wei <[email protected]>

* Save new prometheus metrics to OSD saved objects (opensearch-project#428)

* Save new prometheus metrics to OSD saved objects

Signed-off-by: Joshua Li <[email protected]>

* Return if failed at saving metrics

Signed-off-by: Joshua Li <[email protected]>

---------

Signed-off-by: Joshua Li <[email protected]>

* fixes edit mode callback bug in Saved Object Panels (opensearch-project#420)

* fix for SOpanels editMode

Signed-off-by: Shenoy Pratik <[email protected]>

* rename edit button data-test-subj

Signed-off-by: Shenoy Pratik <[email protected]>

---------

Signed-off-by: Shenoy Pratik <[email protected]>

* Add Toasts to Observability Dashboards  (opensearch-project#435)

* Fixes
* Panel View (legacy)
  - Duplicate
  - Rename

Signed-off-by: Peter Fitzgibbons <[email protected]>

* Toasts use hook from useOpenSearchDashboards context provider

Signed-off-by: Peter Fitzgibbons <[email protected]>

* Testing for CustomPanel Toast

Signed-off-by: Peter Fitzgibbons <[email protected]>

* update catches from comments, minor code cleaning

Signed-off-by: Shenoy Pratik <[email protected]>

* update tests

Signed-off-by: Shenoy Pratik <[email protected]>

* remove unused redux slice

Signed-off-by: Shenoy Pratik <[email protected]>

* revert cypress changes

Signed-off-by: Shenoy Pratik <[email protected]>

* add toasts to SOflyout

Signed-off-by: Shenoy Pratik <[email protected]>

* fix messaging for multiple delete

Signed-off-by: Derek Ho <[email protected]>

* fix up toast and error handling for create and delete flows

Signed-off-by: Derek Ho <[email protected]>

* fix up clone

Signed-off-by: Derek Ho <[email protected]>

* fix rename in table

Signed-off-by: Derek Ho <[email protected]>

* fix rename in custom panel so view

Signed-off-by: Derek Ho <[email protected]>

* fix up panel toasts

Signed-off-by: Derek Ho <[email protected]>

* fix up for flyout

Signed-off-by: Derek Ho <[email protected]>

* code cleanup

Signed-off-by: Derek Ho <[email protected]>

* finish merge

Signed-off-by: Derek Ho <[email protected]>

* fix up PR comments

Signed-off-by: Derek Ho <[email protected]>

---------

Signed-off-by: Peter Fitzgibbons <[email protected]>
Signed-off-by: Shenoy Pratik <[email protected]>
Signed-off-by: Derek Ho <[email protected]>
Co-authored-by: Peter Fitzgibbons <[email protected]>
Co-authored-by: Derek Ho <[email protected]>

* change samples to saved object (opensearch-project#427) (opensearch-project#436)

* change samples to saved object



* add sample to so



* fix saved object sample



* fix up



* add back toast



* revert file



* refactoring



* use constant



---------


(cherry picked from commit ce06ccb)

Signed-off-by: Derek Ho <[email protected]>

* Add Error handling on duplicate dashboard names (opensearch-project#441)

* Add check for existing panel name

Signed-off-by: Rupal Mahajan <[email protected]>

* Nit

Signed-off-by: Rupal Mahajan <[email protected]>

* Remove double await

Signed-off-by: Rupal Mahajan <[email protected]>

* Add rename name check test

Signed-off-by: Rupal Mahajan <[email protected]>

* Remove test

Signed-off-by: Rupal Mahajan <[email protected]>

* Add unique id to sample panel name

Signed-off-by: Rupal Mahajan <[email protected]>

---------

Signed-off-by: Rupal Mahajan <[email protected]>

* fix timestamp overriding issue (opensearch-project#449)

Signed-off-by: Eric Wei <[email protected]>

* Renaming custom panels to Observability Dashboards (opensearch-project#450)

* change custom panels -> observability dashboards

Signed-off-by: Eric Wei <[email protected]>

* rest of the panel renaming

Signed-off-by: Eric Wei <[email protected]>

---------

Signed-off-by: Eric Wei <[email protected]>

* Fix delete failure when no osd item selected (opensearch-project#452)

Signed-off-by: Joshua Li <[email protected]>
(cherry picked from commit a4a310e)

* Open log patterns by default (opensearch-project#444) (opensearch-project#459)

Signed-off-by: Joshua Li <[email protected]>
(cherry picked from commit 72970aa)

* diff merging between 2.x and 2.7

Signed-off-by: Shenoy Pratik <[email protected]>

* add service fields length check in app analytics

Signed-off-by: Shenoy Pratik <[email protected]>

---------

Signed-off-by: Joshua Li <[email protected]>
Signed-off-by: Eric Wei <[email protected]>
Signed-off-by: Peter Fitzgibbons <[email protected]>
Signed-off-by: Shenoy Pratik <[email protected]>
Signed-off-by: Derek Ho <[email protected]>
Signed-off-by: Rupal Mahajan <[email protected]>
Signed-off-by: Kavitha Conjeevaram Mohan <[email protected]>
Co-authored-by: Joshua Li <[email protected]>
Co-authored-by: Eric Wei <[email protected]>
Co-authored-by: Peter Fitzgibbons <[email protected]>
Co-authored-by: Derek Ho <[email protected]>
Co-authored-by: Peter Fitzgibbons <[email protected]>
Co-authored-by: Rupal Mahajan <[email protected]>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Kavitha Conjeevaram Mohan <[email protected]>
Co-authored-by: Kawika Avilla <[email protected]>
  • Loading branch information
10 people authored May 24, 2023
1 parent 4f7b479 commit 776d1ed
Show file tree
Hide file tree
Showing 103 changed files with 11,882 additions and 11,097 deletions.
Binary file added .cypress/.DS_Store
Binary file not shown.
37 changes: 22 additions & 15 deletions .cypress/integration/2_notebooks.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,26 @@ import { SAMPLE_PANEL } from '../utils/panel_constants';
import { skipOn } from '@cypress/skip-test';

const moveToEventsHome = () => {
cy.visit(`${Cypress.env('opensearchDashboards')}/app/observability-dashboards#/event_analytics/`);
cy.visit(`${Cypress.env('opensearchDashboards')}/app/observability-logs#/`);
cy.wait(delay * 3);
};

const moveToPanelHome = () => {
cy.visit(
`${Cypress.env('opensearchDashboards')}/app/observability-dashboards#/operational_panels/`
);
cy.visit(`${Cypress.env('opensearchDashboards')}/app/observability-dashboards#/`);
cy.wait(delay * 3);
};

const moveToTestNotebook = () => {
cy.visit(`${Cypress.env('opensearchDashboards')}/app/observability-notebooks#/`, {
timeout: 6000,
});
cy.get('.euiTableCellContent')
.contains(TEST_NOTEBOOK, {
timeout: 6000,
})
.click();
};

describe('Adding sample data and visualization', () => {
it('Adds sample flights data for visualization paragraph', () => {
cy.visit(`${Cypress.env('opensearchDashboards')}/app/home#/tutorial_directory/sampleData`);
Expand All @@ -41,28 +50,29 @@ describe('Adding sample data and visualization', () => {
});

it('Add sample observability data', () => {
moveToPanelHome();
cy.get('.euiButton__text').contains('Actions').trigger('mouseover').click();
moveToEventsHome();
cy.get('button[data-test-subj="eventHomeAction"]').trigger('mouseover').click();
cy.wait(100);
cy.get('.euiContextMenuItem__text').contains('Add samples').trigger('mouseover').click();
cy.get('button[data-test-subj="eventHomeAction__addSamples"]').trigger('mouseover').click();
cy.wait(100 * 3);
cy.get('.euiModalHeader__title[data-test-subj="confirmModalTitleText"]')
.contains('Add samples')
.should('exist');
cy.wait(100);
cy.get('.euiButton__text').contains('Yes').trigger('mouseover').click();
cy.get('button[data-test-subj="confirmModalConfirmButton"]').trigger('mouseover').click();
cy.wait(100 * 5);
cy.route2('POST', '/addSamplePanels').as('addSamples');
cy.wait('@addSamples').then(() => {
cy.get('.euiTableCellContent').contains(SAMPLE_PANEL).should('exist');
cy.get('.euiToastHeader__title').should('contain', 'successfully');
});
cy.wait(100);
});
});

describe('Testing notebooks table', () => {
beforeEach(() => {
cy.visit(`${Cypress.env('opensearchDashboards')}/app/observability-dashboards#/notebooks`);
cy.visit(`${Cypress.env('opensearchDashboards')}/app/observability-notebooks#/`);
cy.wait(delay);
});

it('Notebooks table empty state', () => {
Expand Down Expand Up @@ -178,7 +188,7 @@ describe('Testing notebooks table', () => {

describe('Test reporting integration if plugin installed', () => {
beforeEach(() => {
cy.visit(`${Cypress.env('opensearchDashboards')}/app/observability-dashboards#/notebooks`);
cy.visit(`${Cypress.env('opensearchDashboards')}/app/observability-notebooks#/`);
cy.get('.euiTableCellContent').contains(TEST_NOTEBOOK).click();
cy.wait(delay * 3);
cy.get('body').then(($body) => {
Expand Down Expand Up @@ -222,8 +232,7 @@ describe('Test reporting integration if plugin installed', () => {

describe('Testing paragraphs', () => {
beforeEach(() => {
cy.visit(`${Cypress.env('opensearchDashboards')}/app/observability-dashboards#/notebooks`);
cy.get('.euiTableCellContent').contains(TEST_NOTEBOOK).click();
moveToTestNotebook();
});

it('Goes into a notebook and creates paragraphs', () => {
Expand Down Expand Up @@ -550,7 +559,5 @@ describe('clean up all test data', () => {
});
cy.get('button.euiButton--danger').should('not.be.disabled');
cy.get('.euiButton__text').contains('Delete').trigger('mouseover').click();

cy.get('.euiTextAlign').contains('No Operational Panels').should('exist');
});
});
Loading

0 comments on commit 776d1ed

Please sign in to comment.