diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 8ab15fd8f..e97ecf299 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -7,8 +7,8 @@ on: branches: - "**" env: - OPENSEARCH_DASHBOARDS_VERSION: '2.x' - ALERTING_PLUGIN_BRANCH: '2.x' + OPENSEARCH_DASHBOARDS_VERSION: '2.9.0' + ALERTING_PLUGIN_BRANCH: '2.9.0.0' jobs: tests: name: Run Cypress E2E tests @@ -66,7 +66,7 @@ jobs: - name: Run OpenSearch Dashboards server run: | cd OpenSearch-Dashboards - yarn start --no-base-path --no-watch & + yarn start --no-base-path --no-watch --server.host="0.0.0.0" & sleep 300 # timeout 300 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:5601/api/status)" != "200" ]]; do sleep 5; done' - name: Run Cypress tests diff --git a/cypress/integration/monitors_dashboard_spec.js b/cypress/integration/monitors_dashboard_spec.js index 61facec7a..44da4480d 100644 --- a/cypress/integration/monitors_dashboard_spec.js +++ b/cypress/integration/monitors_dashboard_spec.js @@ -102,7 +102,7 @@ describe('Monitors dashboard page', () => { it('Displays expected number of alerts', () => { // Ensure the 'Monitor name' column is sorted in ascending order by sorting another column first - cy.contains('Last updated by').click({ force: true }); + cy.contains('Last notification time').click({ force: true }); cy.contains('Monitor name').click({ force: true }); testMonitors.forEach((entry) => { diff --git a/public/pages/Destinations/containers/DestinationsList/utils/constants.js b/public/pages/Destinations/containers/DestinationsList/utils/constants.js index dd179cb6d..a740f4d81 100644 --- a/public/pages/Destinations/containers/DestinationsList/utils/constants.js +++ b/public/pages/Destinations/containers/DestinationsList/utils/constants.js @@ -42,13 +42,4 @@ export const staticColumns = [ } }, }, - { - field: 'user', - name: 'Last updated by', - sortable: true, - truncateText: true, - textOnly: true, - width: '100px', - render: (value) => (value && value.name ? value.name : '-'), - }, ]; diff --git a/public/pages/MonitorDetails/components/MonitorOverview/__snapshots__/MonitorOverview.test.js.snap b/public/pages/MonitorDetails/components/MonitorOverview/__snapshots__/MonitorOverview.test.js.snap index 56795047d..69cc25cf8 100644 --- a/public/pages/MonitorDetails/components/MonitorOverview/__snapshots__/MonitorOverview.test.js.snap +++ b/public/pages/MonitorDetails/components/MonitorOverview/__snapshots__/MonitorOverview.test.js.snap @@ -143,20 +143,6 @@ exports[`MonitorOverview renders 1`] = ` -
-
- - Last updated by - -
- - -
-
-
diff --git a/public/pages/MonitorDetails/components/MonitorOverview/utils/getOverviewStats.js b/public/pages/MonitorDetails/components/MonitorOverview/utils/getOverviewStats.js index 1fe1defc6..30fa20829 100644 --- a/public/pages/MonitorDetails/components/MonitorOverview/utils/getOverviewStats.js +++ b/public/pages/MonitorDetails/components/MonitorOverview/utils/getOverviewStats.js @@ -120,16 +120,6 @@ export default function getOverviewStats( header: 'Monitor version number', value: monitorVersion, }, - { - /* There are 3 cases: - 1. Monitors created by older versions and never updated. - These monitors won’t have User details in the monitor object. `monitor.user` will be null. - 2. Monitors are created when security plugin is disabled, these will have empty User object. - (`monitor.user.name`, `monitor.user.roles` are empty ) - 3. Monitors are created when security plugin is enabled, these will have an User object. */ - header: 'Last updated by', - value: monitor.user && monitor.user.name ? monitor.user.name : '-', - }, ]; return overviewStats; diff --git a/public/pages/MonitorDetails/components/MonitorOverview/utils/getOverviewStats.test.js b/public/pages/MonitorDetails/components/MonitorOverview/utils/getOverviewStats.test.js index 2bf486470..d9c567dfe 100644 --- a/public/pages/MonitorDetails/components/MonitorOverview/utils/getOverviewStats.test.js +++ b/public/pages/MonitorDetails/components/MonitorOverview/utils/getOverviewStats.test.js @@ -46,10 +46,6 @@ describe('getOverviewStats', () => { header: 'Monitor version number', value: monitorVersion, }, - { - header: 'Last updated by', - value: monitor.user.name, - }, ]); }); }); diff --git a/public/pages/Monitors/containers/Monitors/__snapshots__/Monitors.test.js.snap b/public/pages/Monitors/containers/Monitors/__snapshots__/Monitors.test.js.snap index 4bebe8cbc..a1b75778a 100644 --- a/public/pages/Monitors/containers/Monitors/__snapshots__/Monitors.test.js.snap +++ b/public/pages/Monitors/containers/Monitors/__snapshots__/Monitors.test.js.snap @@ -57,14 +57,6 @@ exports[`Monitors renders 1`] = ` "sortable": false, "truncateText": false, }, - Object { - "field": "user", - "name": "Last updated by", - "render": [Function], - "sortable": true, - "textOnly": true, - "truncateText": true, - }, Object { "field": "latestAlert", "name": "Latest alert", diff --git a/public/pages/Monitors/containers/Monitors/utils/tableUtils.js b/public/pages/Monitors/containers/Monitors/utils/tableUtils.js index eba228a5c..0422aa37d 100644 --- a/public/pages/Monitors/containers/Monitors/utils/tableUtils.js +++ b/public/pages/Monitors/containers/Monitors/utils/tableUtils.js @@ -45,20 +45,6 @@ export const columns = [ truncateText: false, render: (item_type) => getItemLevelType(item_type), }, - { - field: 'user', - name: 'Last updated by', - sortable: true, - truncateText: true, - textOnly: true, - /* There are 3 cases: - 1. Monitors created by older versions and never updated. - These monitors won’t have User details in the monitor object. `monitor.user` will be null. - 2. Monitors are created when security plugin is disabled, these will have empty User object. - (`monitor.user.name`, `monitor.user.roles` are empty ) - 3. Monitors are created when security plugin is enabled, these will have an User object. */ - render: (_, item) => (item.user && item.user.name ? item.user.name : '-'), - }, { field: 'latestAlert', name: 'Latest alert',