Sync anywhere-dev with main

.github/workflows/cypress-workflow.yml

@@ -7,8 +7,9 @@ on:
     branches:
       - "*"
 env:
-  OPENSEARCH_DASHBOARDS_VERSION: '2.3'
-  OPENSEARCH_VERSION: '2.3.0-SNAPSHOT'
+  OPENSEARCH_DASHBOARDS_VERSION: '2.5.0'
+  OPENSEARCH_VERSION: '2.5.0-SNAPSHOT'
+  ALERTING_PLUGIN_BRANCH: '2.5'
 jobs:
   tests:
     name: Run Cypress E2E tests
@@ -29,7 +30,7 @@ jobs:
         with:
           path: alerting
           repository: opensearch-project/alerting
-          ref: 'main'
+          ref: ${{ env.ALERTING_PLUGIN_BRANCH }}
       - name: Run Opensearch with plugin
         run: |
           cd alerting

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

@@ -7,12 +7,19 @@ on:
     branches:
       - "*"
 env:
-  OPENSEARCH_DASHBOARDS_VERSION: '2.2'
+  OPENSEARCH_DASHBOARDS_VERSION: '2.5.0'
 jobs:
   tests:
     name: Run unit tests
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
+    runs-on: ${{ matrix.os }}
     steps:
+      # Enable longer filenames for windows
+      - name: Enable longer filenames
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: git config --system core.longpaths true
       - name: Checkout OpenSearch Dashboards
         uses: actions/checkout@v2
         with:
@@ -42,9 +49,16 @@ jobs:
         run: |
           cd OpenSearch-Dashboards/plugins/alerting-dashboards-plugin
           yarn osd bootstrap
-      - name: Run tests
+      - name: Run window tests
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: |
+          cd OpenSearch-Dashboards/plugins/alerting-dashboards-plugin
+          yarn run test:jest:windows --coverage
+      - name: Run non-window tests
+        if: ${{ matrix.os != 'windows-latest' }}
         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

DEVELOPER_GUIDE.md

@@ -24,7 +24,7 @@ You will need to install [node.js](https://nodejs.org/en/), [nvm](https://github
 1. Download and install the appropriate [OpenSearch Alerting plugin](https://github.com/opensearch-project/alerting).
 1. Download the OpenSearch-Dashboards source code for the [version specified in package.json](./package.json#L9) you want to set up.
 
-   See the [OpenSearch Dashboards developer guide](https://github.com/opensearch-project/OpenSearch/blob/main/DEVELOPER_GUIDE.md) for more instructions on setting up your development environment.
+   See the [OpenSearch Dashboards developer guide](https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/DEVELOPER_GUIDE.md) for more instructions on setting up your development environment.
 
 1. Change your node version to the version specified in `.node-version` inside the OpenSearch-Dashboards root directory.
 1. cd into the `plugins` directory of the OpenSearch-Dashboards source code directory.

MAINTAINERS.md

@@ -1,14 +1,15 @@
-# OpenSearch Maintainers
+## Overview
 
-## Maintainers
-| Maintainer | GitHub ID | Affiliation |
-| --------------- | --------- | ----------- |
-| Ashish Agrawal | [lezzago](https://github.com/lezzago) | Amazon |
-| Mohammad Qureshi | [qreshi](https://github.com/qreshi) | Amazon |
-| Sriram | [skkosuri-amzn](https://github.com/skkosuri-amzn) | Amazon |
-| Bowen Lan | [bowenlan-amzn](https://github.com/bowenlan-amzn) | Amazon |
-| Rishabh Maurya | [rishabhmaurya](https://github.com/rishabhmaurya) | Amazon | 
-| Tianli Feng | [tlfeng](https://github.com/tlfeng) | Amazon |
-| Annie Lee | [leeyun-amzn](https://github.com/leeyun-amzn) | Amazon |
+This document contains a list of maintainers in this repo. See [opensearch-project/.github/RESPONSIBILITIES.md](https://github.com/opensearch-project/.github/blob/main/RESPONSIBILITIES.md#maintainer-responsibilities) that explains what the role of maintainer means, what maintainers do in this and other repos, and how they should be doing it. If you're interested in contributing, and becoming a maintainer, see [CONTRIBUTING](CONTRIBUTING.md).
 
-[This document](https://github.com/opensearch-project/.github/blob/main/MAINTAINERS.md) explains what maintainers do in this repo, and how they should be doing it. If you're interested in contributing, see [CONTRIBUTING](CONTRIBUTING.md).
+## Current Maintainers
+
+| Maintainer       | GitHub ID                                         | Affiliation |
+| ---------------- | ------------------------------------------------- | ----------- |
+| Ashish Agrawal   | [lezzago](https://github.com/lezzago)             | Amazon      |
+| Mohammad Qureshi | [qreshi](https://github.com/qreshi)               | Amazon      |
+| Sriram           | [skkosuri-amzn](https://github.com/skkosuri-amzn) | Amazon      |
+| Bowen Lan        | [bowenlan-amzn](https://github.com/bowenlan-amzn) | Amazon      |
+| Rishabh Maurya   | [rishabhmaurya](https://github.com/rishabhmaurya) | Amazon      |
+| Tianli Feng      | [tlfeng](https://github.com/tlfeng)               | Amazon      |
+| Annie Lee        | [leeyun-amzn](https://github.com/leeyun-amzn)     | Amazon      |

babel.config.js

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

cypress/integration/query_level_monitor_spec.js

@@ -166,7 +166,7 @@ describe('Query-Level Monitors', () => {
       cy.contains(SAMPLE_MONITOR, { timeout: 20000 });
 
       // Select the existing monitor
-      cy.get('a').contains(SAMPLE_MONITOR, { timeout: 20000 }).click();
+      cy.get(`[data-test-subj="${SAMPLE_MONITOR}"]`).click();
 
       // Click Edit button
       cy.contains('Edit', { timeout: 20000 }).click({ force: true });
@@ -195,7 +195,7 @@ describe('Query-Level Monitors', () => {
       cy.contains(SAMPLE_MONITOR, { timeout: 20000 });
 
       // Select the existing monitor
-      cy.get('a').contains(SAMPLE_MONITOR, { timeout: 20000 }).click({ force: true });
+      cy.get(`[data-test-subj="${SAMPLE_MONITOR}"]`).click({ force: true });
 
       // Click Edit button
       cy.contains('Edit', { timeout: 20000 }).click({ force: true });
@@ -304,7 +304,7 @@ describe('Query-Level Monitors', () => {
       cy.contains(SAMPLE_MONITOR);
 
       // Select the existing monitor
-      cy.get('a').contains(SAMPLE_MONITOR).click();
+      cy.get(`[data-test-subj="${SAMPLE_MONITOR}"]`).click();
 
       // Click Edit button
       cy.contains('Edit').click({ force: true });
@@ -373,7 +373,7 @@ describe('Query-Level Monitors', () => {
       cy.contains(SAMPLE_DAYS_INTERVAL_MONITOR, { timeout: 20000 });
 
       // Select the existing monitor
-      cy.get('a').contains(SAMPLE_DAYS_INTERVAL_MONITOR).click({ force: true });
+      cy.get(`[data-test-subj="${SAMPLE_DAYS_INTERVAL_MONITOR}"]`).click({ force: true });
 
       // Click Edit button
       cy.contains('Edit').click({ force: true });
@@ -398,7 +398,7 @@ describe('Query-Level Monitors', () => {
       cy.contains(SAMPLE_CRON_EXPRESSION_MONITOR, { timeout: 20000 });
 
       // Select the existing monitor
-      cy.get('a').contains(SAMPLE_CRON_EXPRESSION_MONITOR).click({ force: true });
+      cy.get(`[data-test-subj="${SAMPLE_CRON_EXPRESSION_MONITOR}"]`).click({ force: true });
 
       // Click Edit button
       cy.contains('Edit').click({ force: true });

opensearch_dashboards.json

@@ -1,7 +1,7 @@
 {
   "id": "alertingDashboards",
-  "version": "2.3.0.0",
-  "opensearchDashboardsVersion": "2.3.0",
+  "version": "2.5.0.0",
+  "opensearchDashboardsVersion": "2.5.0",
   "configPath": ["opensearch_alerting"],
   "requiredPlugins": [],
   "server": true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opensearch-alerting-dashboards",
-  "version": "2.3.0.0",
+  "version": "2.5.0.0",
   "description": "OpenSearch Dashboards Alerting Plugin",
   "main": "index.js",
   "license": "Apache-2.0",
@@ -16,6 +16,7 @@
     "osd": "node ../../scripts/osd",
     "opensearch": "node ../../scripts/opensearch",
     "lint": "../../node_modules/.bin/eslint '**/*.js' -c .eslintrc --ignore-path .gitignore",
+    "test:jest:windows": "SET TZ=UTC ../../node_modules/.bin/jest --config ./test/jest.config.js",
     "test:jest": "TZ=UTC ../../node_modules/.bin/jest --config ./test/jest.config.js",
     "build": "yarn plugin-helpers build",
     "plugin-helpers": "node ../../scripts/plugin_helpers",
@@ -31,7 +32,8 @@
     "@elastic/eslint-import-resolver-kibana": "link:../../packages/osd-eslint-import-resolver-opensearch-dashboards",
     "cypress": "^6.0.0",
     "husky": "^3.0.0",
-    "lint-staged": "^10.0.0"
+    "lint-staged": "^10.0.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.16.5"
   },
   "dependencies": {
     "brace": "0.11.1",
@@ -43,12 +45,15 @@
   "resolutions": {
     "ansi-regex": "^5.0.1",
     "async": "^3.2.3",
+    "decode-uri-component": "^0.2.1",
     "fstream": "1.0.12",
     "glob-parent": "^5.1.2",
     "json-schema": "^0.4.0",
+    "loader-utils": "1.4.2",
     "minimist": "^1.2.6",
     "moment": "^2.29.4",
-    "terser": "^4.8.1"
+    "terser": "^4.8.1",
+    "**/d3-color": "^3.1.0"
   },
   "engines": {
     "yarn": "^1.21.1"

public/components/Flyout/flyouts/__snapshots__/flyouts.test.js.snap

@@ -8,33 +8,40 @@ Object {
     "data-test-subj": "alertsDashboardFlyout_undefined",
     "hideCloseButton": true,
     "size": "m",
-    "type": "push",
   },
-  "footer": <EuiButtonEmpty
-    data-test-subj="alertsDashboardFlyout_closeButton_undefined"
-    iconType="cross"
-    onClick={[Function]}
-    style={
-      Object {
-        "marginLeft": "0px",
-        "paddingLeft": "0px",
-      }
-    }
-  >
-    Close
-  </EuiButtonEmpty>,
   "footerProps": Object {
     "style": Object {
       "backgroundColor": "#F5F7FA",
     },
   },
-  "header": <EuiText
-    data-test-subj="alertsDashboardFlyout_header_undefined"
+  "header": <EuiFlexGroup
+    alignItems="center"
+    justifyContent="flexStart"
   >
-    <h2>
-      Alerts by undefined
-    </h2>
-  </EuiText>,
+    <EuiFlexItem
+      className="eui-textTruncate"
+    >
+      <EuiTitle
+        className="eui-textTruncate"
+        data-test-subj="alertsDashboardFlyout_header_undefined"
+        size="m"
+      >
+        <h3>
+          Alerts by undefined
+        </h3>
+      </EuiTitle>
+    </EuiFlexItem>
+    <EuiFlexItem
+      grow={false}
+    >
+      <EuiButtonIcon
+        data-test-subj="alertsDashboardFlyout_closeButton_undefined"
+        display="empty"
+        iconSize="m"
+        iconType="cross"
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>,
   "headerProps": Object {
     "hasBorder": true,
   },

public/components/Flyout/flyouts/alertsDashboard.js

@@ -4,7 +4,7 @@
  */
 
 import React from 'react';
-import { EuiButtonEmpty, EuiText } from '@elastic/eui';
+import { EuiFlexGroup, EuiButtonIcon, EuiTitle, EuiFlexItem } from '@elastic/eui';
 import AlertsDashboardFlyoutComponent from './components/AlertsDashboardFlyoutComponent';
 
 const alertsDashboard = (payload) => {
@@ -15,25 +15,31 @@ const alertsDashboard = (payload) => {
       size: 'm',
       hideCloseButton: true,
       'data-test-subj': `alertsDashboardFlyout_${trigger_name}`,
-      type: 'push',
     },
     headerProps: { hasBorder: true },
     header: (
-      <EuiText data-test-subj={`alertsDashboardFlyout_header_${trigger_name}`}>
-        <h2>{`Alerts by ${trigger_name}`}</h2>
-      </EuiText>
+      <EuiFlexGroup justifyContent="flexStart" alignItems="center">
+        <EuiFlexItem className="eui-textTruncate">
+          <EuiTitle
+            className="eui-textTruncate"
+            size={'m'}
+            data-test-subj={`alertsDashboardFlyout_header_${trigger_name}`}
+          >
+            <h3>{`Alerts by ${trigger_name}`}</h3>
+          </EuiTitle>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiButtonIcon
+            data-test-subj={`alertsDashboardFlyout_closeButton_${trigger_name}`}
+            iconType="cross"
+            display="empty"
+            iconSize="m"
+            onClick={closeFlyout}
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
     ),
     footerProps: { style: { backgroundColor: '#F5F7FA' } },
-    footer: (
-      <EuiButtonEmpty
-        iconType={'cross'}
-        onClick={() => closeFlyout()}
-        style={{ paddingLeft: '0px', marginLeft: '0px' }}
-        data-test-subj={`alertsDashboardFlyout_closeButton_${trigger_name}`}
-      >
-        Close
-      </EuiButtonEmpty>
-    ),
     body: <AlertsDashboardFlyoutComponent {...payload} />,
   };
 };

public/components/Flyout/flyouts/components/AlertsDashboardFlyoutComponent.js

@@ -361,7 +361,7 @@ export default class AlertsDashboardFlyoutComponent extends Component {
           columns.splice(
             0,
             0,
-            getAlertsFindingColumn(httpClient, history, true, location, notifications)
+            getAlertsFindingColumn(httpClient, history, location, notifications)
           );
           break;
         default:

public/pages/CreateMonitor/components/VisualGraph/utils/helpers.js

@@ -91,7 +91,8 @@ export function getDataFromResponse(response, fieldName, monitorType) {
     const buckets = _.get(response, 'aggregations.composite_agg.buckets', []);
     return buckets
       .map((bucket) => getXYValuesByFieldName(bucket, fieldName))
-      .filter(filterInvalidYValues);
+      .filter(filterInvalidYValues)
+      .sort((a, b) => a.x - b.x);
   }
 }
 

public/pages/CreateMonitor/containers/CreateMonitor/CreateMonitor.js

@@ -286,6 +286,7 @@ export default class CreateMonitor extends Component {
                 plugins={plugins}
                 isAd={values.searchType === SEARCH_TYPE.AD}
                 detectorId={this.props.detectorId}
+                setFlyout={this.props.setFlyout}
               />
               <EuiSpacer />
 

public/pages/CreateTrigger/components/Action/Action.js

@@ -78,7 +78,7 @@ const Action = ({
                   // Just a swap correct fields.
                   arrayHelpers.replace(index, {
                     ...action,
-                    destination_id: options[0].value,
+                    destination_id: options[0]?.value,
                   });
                 },
                 onBlur: (e, field, form) => {
@@ -96,7 +96,6 @@ const Action = ({
                   </React.Fragment>
                 ),
                 rowHeight: 45,
-                async: true,
                 isLoading: loadingDestinations,
               }}
             />

public/pages/CreateTrigger/components/Action/actions/Message.js

@@ -172,6 +172,7 @@ export default function Message(
   switch (monitorType) {
     case MONITOR_TYPE.BUCKET_LEVEL:
       displayActionableAlertsOptions = true;
+      displayThrottlingSettings = actionExecutionScopeId === NOTIFY_OPTIONS_VALUES.PER_ALERT;
       actionableAlertsSelections = _.get(values, actionableAlertsSelectionsPath);
       break;
     case MONITOR_TYPE.DOC_LEVEL:
@@ -194,6 +195,8 @@ export default function Message(
     _.set(values, actionableAlertsSelectionsPath, actionableAlertsSelections);
   }
 
+  if (!displayThrottlingSettings) _.set(values, `${actionPath}.throttle_enabled`, false);
+
   let preview = '';
   try {
     preview = Mustache.render(action.message_template.source, context);