Implemented cross-cluster monitors.

.github/workflows/cypress-workflow.yml

@@ -67,7 +67,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

.github/workflows/unit-tests-workflow.yml

@@ -9,11 +9,48 @@ on:
 env:
   OPENSEARCH_DASHBOARDS_VERSION: 'main'
 jobs:
-  tests:
+  Get-CI-Image-Tag:
+    uses: opensearch-project/opensearch-build/.github/workflows/get-ci-image-tag.yml@main
+    with:
+      product: opensearch-dashboards
+
+  tests-linux:
+    needs: Get-CI-Image-Tag
+    name: Run unit tests
+    runs-on: ubuntu-latest
+    container:
+      # using the same image which is used by opensearch-build team to build the OpenSearch Distribution
+      # this image tag is subject to change as more dependencies and updates will arrive over time
+      image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
+      # need to switch to root so that github actions can install runner binary on container without permission issues.
+      options: --user root
+
+    steps:
+      - name: Checkout OpenSearch Dashboards
+        uses: actions/checkout@v2
+        with:
+          repository: opensearch-project/OpenSearch-Dashboards
+          ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }}
+          path: OpenSearch-Dashboards
+      - name: Checkout Alerting OpenSearch Dashboards plugin
+        uses: actions/checkout@v2
+        with:
+          path: OpenSearch-Dashboards/plugins/alerting-dashboards-plugin
+      - name: Run non-window tests
+        run: |
+          chown -R 1000:1000 `pwd`
+          cd ./OpenSearch-Dashboards/
+          su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v &&
+                               cd ./plugins/alerting-dashboards-plugin &&
+                               whoami && yarn osd bootstrap && yarn build && yarn run test:jest --coverage"
+      - name: Uploads coverage
+        uses: codecov/codecov-action@v1
+
+  tests-macos-windows:
     name: Run unit tests
     strategy:
       matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        os: [ macos-latest, windows-latest ]
     runs-on: ${{ matrix.os }}
     steps:
       # Enable longer filenames for windows
@@ -58,6 +95,3 @@ jobs:
         run: |
           cd OpenSearch-Dashboards/plugins/alerting-dashboards-plugin
           yarn run test:jest --coverage
-      - name: Uploads coverage
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        uses: codecov/codecov-action@v1

babel.config.js

@@ -7,8 +7,8 @@ module.exports = {
     require('@babel/preset-typescript'),
   ],
   plugins: [
-    require('@babel/plugin-proposal-class-properties'),
-    require('@babel/plugin-proposal-object-rest-spread'),
+    require('@babel/plugin-transform-class-properties'),
+    require('@babel/plugin-transform-object-rest-spread'),
     require('@babel/plugin-transform-modules-commonjs'),
   ],
 };

cypress/integration/alerts_dashboard_flyout_spec.js

@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
 import { INDEX, PLUGIN_NAME } from '../support/constants';
 import sampleAlertsFlyoutBucketMonitor from '../fixtures/sample_alerts_flyout_bucket_level_monitor.json';
 import sampleAlertsFlyoutQueryMonitor from '../fixtures/sample_alerts_flyout_query_level_monitor.json';
@@ -23,12 +22,19 @@ describe('Alerts by trigger flyout', () => {
     // Load sample data
     cy.loadSampleEcommerceData();
 
+    // Ensure monitors have been deleted
+    cy.visit(`${Cypress.env('opensearch_dashboards')}/app/${PLUGIN_NAME}#/monitors`);
+    cy.contains('There are no existing monitors. Create a monitor to add triggers and actions.', {
+      timeout: TWENTY_SECONDS,
+    });
+
     // Create the test monitors
     cy.createMonitor(sampleAlertsFlyoutBucketMonitor);
     cy.createMonitor(sampleAlertsFlyoutQueryMonitor);
 
     // Visit Alerting OpenSearch Dashboards
     cy.visit(`${Cypress.env('opensearch_dashboards')}/app/${PLUGIN_NAME}#/monitors`);
+    cy.reload();
 
     // Confirm test monitors were created successfully
     cy.contains(BUCKET_MONITOR, { timeout: TWENTY_SECONDS });
@@ -41,6 +47,7 @@ describe('Alerts by trigger flyout', () => {
   beforeEach(() => {
     // Reloading the page to close any flyouts that were not closed by other tests that had failures.
     cy.visit(`${Cypress.env('opensearch_dashboards')}/app/${PLUGIN_NAME}#/dashboard`);
+    cy.contains('Alerts by triggers', { timeout: TWENTY_SECONDS });
 
     // Waiting 5 seconds for alerts to finish loading.
     // This short wait period alleviates flakiness observed during these tests.
@@ -60,9 +67,10 @@ describe('Alerts by trigger flyout', () => {
       timeout: TWENTY_SECONDS,
     }).within(() => {
       // Confirm flyout header contains expected text.
-      cy.get(
-        `[data-test-subj="alertsDashboardFlyout_header_${BUCKET_TRIGGER}"]`
-      ).contains(`Alerts by ${BUCKET_TRIGGER}`, { timeout: TWENTY_SECONDS });
+      cy.get(`[data-test-subj="alertsDashboardFlyout_header_${BUCKET_TRIGGER}"]`).contains(
+        `Alerts by ${BUCKET_TRIGGER}`,
+        { timeout: TWENTY_SECONDS }
+      );
 
       // Confirm 'Trigger name' sections renders as expected.
       cy.get(`[data-test-subj="alertsDashboardFlyout_triggerName_${BUCKET_TRIGGER}"]`).as(
@@ -154,9 +162,10 @@ describe('Alerts by trigger flyout', () => {
       timeout: TWENTY_SECONDS,
     }).within(() => {
       // Confirm flyout header contains expected text.
-      cy.get(
-        `[data-test-subj="alertsDashboardFlyout_header_${QUERY_TRIGGER}"]`
-      ).contains(`Alerts by ${QUERY_TRIGGER}`, { timeout: TWENTY_SECONDS });
+      cy.get(`[data-test-subj="alertsDashboardFlyout_header_${QUERY_TRIGGER}"]`).contains(
+        `Alerts by ${QUERY_TRIGGER}`,
+        { timeout: TWENTY_SECONDS }
+      );
 
       // Confirm 'Trigger name' sections renders as expected.
       cy.get(`[data-test-subj="alertsDashboardFlyout_triggerName_${QUERY_TRIGGER}"]`).as(

cypress/integration/bucket_level_monitor_spec.js

@@ -225,23 +225,28 @@ describe('Bucket-Level Monitors', () => {
       cy.get('[data-test-subj="addMetricButton"]').click({ force: true });
 
       cy.get('[data-test-subj="metrics.0.aggregationTypeSelect"]').select('count', { force: true });
+      cy.wait(1000);
 
-      cy.get('[data-test-subj="metrics.0.ofFieldComboBox"]').type(
-        `${COUNT_METRIC_FIELD}{downArrow}{enter}`
-      );
+      cy.get('[data-test-subj="metrics.0.ofFieldComboBox"] input')
+        .focus()
+        .type(`${COUNT_METRIC_FIELD}{downArrow}{enter}`);
 
       cy.get('button').contains('Save').click({ force: true });
+      cy.wait(1000);
 
       // Add a second metric for the query
       cy.get('[data-test-subj="addMetricButton"]').click({ force: true });
 
       cy.get('[data-test-subj="metrics.1.aggregationTypeSelect"]').select('avg', { force: true });
+      cy.wait(1000);
 
-      cy.get('[data-test-subj="metrics.1.ofFieldComboBox"]').type(
-        `${AVERAGE_METRIC_FIELD}{downArrow}{enter}`
-      );
+      cy.get('[data-test-subj="metrics.1.ofFieldComboBox"] input')
+        .focus()
+        .type(`${AVERAGE_METRIC_FIELD}{downArrow}{enter}`);
+      cy.wait(1000);
 
       cy.get('button').contains('Save').click({ force: true });
+      cy.wait(1000);
 
       // Add data filters for the query
       const filters = [

cypress/integration/cluster_metrics_monitor_spec.js

@@ -15,7 +15,7 @@ const SAMPLE_DESTINATION = 'sample_destination';
 
 const addClusterMetricsTrigger = (triggerName, triggerIndex, actionName, isEdit, source) => {
   // Click 'Add trigger' button
-  cy.contains('Add trigger', { timeout: 20000 }).click({ force: true });
+  cy.contains('Add trigger', { timeout: 30000 }).click({ force: true });
 
   if (isEdit === true) {
     // TODO: Passing button props in EUI accordion was added in newer versions (31.7.0+).
@@ -37,7 +37,7 @@ const addClusterMetricsTrigger = (triggerName, triggerIndex, actionName, isEdit,
         force: true,
         parseSpecialCharSequences: false,
         delay: 5,
-        timeout: 20000,
+        timeout: 30000,
       })
       .trigger('blur', { force: true });
   });
@@ -76,7 +76,7 @@ describe('ClusterMetricsMonitor', () => {
     cy.visit(`${Cypress.env('opensearch_dashboards')}/app/${PLUGIN_NAME}#/monitors`);
 
     // Common text to wait for to confirm page loaded, give up to 20 seconds for initial load
-    cy.contains('Create monitor', { timeout: 20000 });
+    cy.contains('Create monitor', { timeout: 30000 });
   });
 
   describe('can be created', () => {
@@ -87,7 +87,7 @@ describe('ClusterMetricsMonitor', () => {
 
     it('for the Cluster Health API', () => {
       // Go to create monitor page
-      cy.contains('Create monitor', { timeout: 20000 }).click({ force: true });
+      cy.contains('Create monitor', { timeout: 30000 }).click({ force: true });
 
       // Select ClusterMetrics radio card
       cy.get('[data-test-subj="clusterMetricsMonitorRadioCard"]').click({ force: true });
@@ -141,7 +141,7 @@ describe('ClusterMetricsMonitor', () => {
 
     it('for the Nodes Stats API', () => {
       // Go to create monitor page
-      cy.contains('Create monitor', { timeout: 20000 }).click({ force: true });
+      cy.contains('Create monitor', { timeout: 30000 }).click({ force: true });
 
       // Select ClusterMetrics radio card
       cy.get('[data-test-subj="clusterMetricsMonitorRadioCard"]').click({ force: true });
@@ -202,7 +202,7 @@ describe('ClusterMetricsMonitor', () => {
 
     it('for the CAT Snapshots API', () => {
       // Go to create monitor page
-      cy.contains('Create monitor', { timeout: 20000 }).click({ force: true });
+      cy.contains('Create monitor', { timeout: 30000 }).click({ force: true });
 
       // Select ClusterMetrics radio card
       cy.get('[data-test-subj="clusterMetricsMonitorRadioCard"]').click({ force: true });
@@ -228,7 +228,7 @@ describe('ClusterMetricsMonitor', () => {
       // Begin monitor creation
 
       // Go to create monitor page
-      cy.contains('Create monitor', { timeout: 20000 }).click({ force: true });
+      cy.contains('Create monitor', { timeout: 30000 }).click({ force: true });
 
       // Select ClusterMetrics radio card
       cy.get('[data-test-subj="clusterMetricsMonitorRadioCard"]').click({ force: true });
@@ -335,7 +335,7 @@ describe('ClusterMetricsMonitor', () => {
         cy.get('[data-test-subj="clusterMetricsApiTypeComboBox"]').contains('Cluster settings');
 
         // Confirm there are 0 triggers defined
-        cy.contains('Triggers (0)', { timeout: 20000 });
+        cy.contains('Triggers (0)', { timeout: 30000 });
       });
     });
   });

cypress/integration/monitors_dashboard_spec.js

@@ -34,7 +34,7 @@ const clusterHealthMonitor = {
         severity: '1',
         condition: {
           script: {
-            source: 'ctx.results[0].status != "green"',
+            source: 'ctx.results[0].status != "blue"',
             lang: 'painless',
           },
         },
@@ -101,8 +101,13 @@ describe('Monitors dashboard page', () => {
   });
 
   it('Displays expected number of alerts', () => {
+    // Wait for table to finish loading
+    cy.get('tbody > tr', { timeout: 20000 }).should(($tr) =>
+      expect($tr).to.have.length.greaterThan(1)
+    );
+
     // 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) => {

package.json

@@ -31,7 +31,7 @@
     }
   },
   "devDependencies": {
-    "@babel/plugin-transform-modules-commonjs": "^7.16.5",
+    "@babel/plugin-transform-modules-commonjs": "^7.22.9",
     "@elastic/elastic-eslint-config-kibana": "link:../../packages/opensearch-eslint-config-opensearch-dashboards",
     "@elastic/eslint-import-resolver-kibana": "link:../../packages/osd-eslint-import-resolver-opensearch-dashboards",
     "cypress": "^6.0.0",

public/components/FeatureAnywhereContextMenu/AddAlertingMonitor/__snapshots__/AddAlertingMonitor.test.js.snap

@@ -19,6 +19,7 @@ exports[`AddAlertingMonitor renders 1`] = `
         "associatedMonitorsList": Array [],
         "bucketUnitOfTime": "h",
         "bucketValue": 1,
+        "clusterNames": Array [],
         "cronExpression": "0 */1 * * *",
         "daily": 0,
         "description": "",
@@ -60,6 +61,7 @@ exports[`AddAlertingMonitor renders 1`] = `
         "timezone": Array [],
         "uri": Object {
           "api_type": "",
+          "clusters": Array [],
           "path": "",
           "path_params": "",
           "url": "",