Merge branch '3.0-cross-cluster-dev' of https://github.com/AWSHurneyt…

…/alerting-dashboards-plugin into 3.0-cross-cluster-dev
opensearch-project · Feb 5, 2024 · 4b353f1 · 4b353f1
2 parents 096815f + bda7e3e
commit 4b353f1
Show file tree

Hide file tree

Showing 12 changed files with 78 additions and 25 deletions.
diff --git a/...atureAnywhereContextMenu/AddAlertingMonitor/__snapshots__/AddAlertingMonitor.test.js.snap b/...atureAnywhereContextMenu/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": "",

diff --git a/...nents/Flyout/flyouts/components/__snapshots__/AlertsDashboardFlyoutComponent.test.js.snap b/...nents/Flyout/flyouts/components/__snapshots__/AlertsDashboardFlyoutComponent.test.js.snap
@@ -76,6 +76,24 @@ exports[`AlertsDashboardFlyoutComponent renders 1`] = `
         </p>
       </EuiText>
     </EuiFlexItem>
+    <EuiFlexItem>
+      <EuiText
+        size="m"
+      >
+        <strong>
+          Monitor data sources
+        </strong>
+        <p
+          style={
+            Object {
+              "whiteSpace": "pre-wrap",
+            }
+          }
+        >
+          -
+        </p>
+      </EuiText>
+    </EuiFlexItem>
   </EuiFlexGroup>
   <EuiHorizontalRule
     margin="xxl"

diff --git a/...ges/CreateMonitor/components/QueryPerformance/__snapshots__/QueryPerformance.test.js.snap b/...ges/CreateMonitor/components/QueryPerformance/__snapshots__/QueryPerformance.test.js.snap
@@ -36,27 +36,7 @@ exports[`QueryPerformance renders 1`] = `
   >
     <div
       class="euiTextColor euiTextColor--subdued"
-    >
-      <span>
-        Check the performance of your query and make sure to follow best practices. 
-        <a
-          class="euiLink euiLink--primary"
-          href="https://docs-beta.opensearch.org/monitoring-plugins/alerting/"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          Learn more
-          <div>
-            EuiIconMock
-          </div>
-          <span
-            class="euiScreenReaderOnly"
-          >
-            (opens in a new tab or window)
-          </span>
-        </a>
-      </span>
-    </div>
+    />
   </div>
   <hr
     class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginXSmall"

diff --git a/...eMonitor/containers/AnomalyDetectors/__tests__/__snapshots__/AnomalyDetector.test.js.snap b/...eMonitor/containers/AnomalyDetectors/__tests__/__snapshots__/AnomalyDetector.test.js.snap
@@ -15,6 +15,7 @@ exports[`AnomalyDetectors renders 1`] = `
       "associatedMonitorsList": Array [],
       "bucketUnitOfTime": "h",
       "bucketValue": 1,
+      "clusterNames": Array [],
       "cronExpression": "0 */1 * * *",
       "daily": 0,
       "description": "",
@@ -56,6 +57,7 @@ exports[`AnomalyDetectors renders 1`] = `
       "timezone": Array [],
       "uri": Object {
         "api_type": "",
+        "clusters": Array [],
         "path": "",
         "path_params": "",
         "url": "",
@@ -87,6 +89,7 @@ exports[`AnomalyDetectors renders 1`] = `
         "associatedMonitorsList": Array [],
         "bucketUnitOfTime": "h",
         "bucketValue": 1,
+        "clusterNames": Array [],
         "cronExpression": "0 */1 * * *",
         "daily": 0,
         "description": "",
@@ -128,6 +131,7 @@ exports[`AnomalyDetectors renders 1`] = `
         "timezone": Array [],
         "uri": Object {
           "api_type": "",
+          "clusters": Array [],
           "path": "",
           "path_params": "",
           "url": "",
@@ -220,6 +224,7 @@ exports[`AnomalyDetectors renders 1`] = `
                     "associatedMonitorsList": Array [],
                     "bucketUnitOfTime": "h",
                     "bucketValue": 1,
+                    "clusterNames": Array [],
                     "cronExpression": "0 */1 * * *",
                     "daily": 0,
                     "description": "",
@@ -261,6 +266,7 @@ exports[`AnomalyDetectors renders 1`] = `
                     "timezone": Array [],
                     "uri": Object {
                       "api_type": "",
+                      "clusters": Array [],
                       "path": "",
                       "path_params": "",
                       "url": "",
@@ -311,6 +317,7 @@ exports[`AnomalyDetectors renders 1`] = `
                     "associatedMonitorsList": Array [],
                     "bucketUnitOfTime": "h",
                     "bucketValue": 1,
+                    "clusterNames": Array [],
                     "cronExpression": "0 */1 * * *",
                     "daily": 0,
                     "description": "",
@@ -352,6 +359,7 @@ exports[`AnomalyDetectors renders 1`] = `
                     "timezone": Array [],
                     "uri": Object {
                       "api_type": "",
+                      "clusters": Array [],
                       "path": "",
                       "path_params": "",
                       "url": "",
@@ -450,6 +458,7 @@ exports[`AnomalyDetectors renders 1`] = `
                             "associatedMonitorsList": Array [],
                             "bucketUnitOfTime": "h",
                             "bucketValue": 1,
+                            "clusterNames": Array [],
                             "cronExpression": "0 */1 * * *",
                             "daily": 0,
                             "description": "",
@@ -491,6 +500,7 @@ exports[`AnomalyDetectors renders 1`] = `
                             "timezone": Array [],
                             "uri": Object {
                               "api_type": "",
+                              "clusters": Array [],
                               "path": "",
                               "path_params": "",
                               "url": "",
@@ -541,6 +551,7 @@ exports[`AnomalyDetectors renders 1`] = `
                             "associatedMonitorsList": Array [],
                             "bucketUnitOfTime": "h",
                             "bucketValue": 1,
+                            "clusterNames": Array [],
                             "cronExpression": "0 */1 * * *",
                             "daily": 0,
                             "description": "",
@@ -582,6 +593,7 @@ exports[`AnomalyDetectors renders 1`] = `
                             "timezone": Array [],
                             "uri": Object {
                               "api_type": "",
+                              "clusters": Array [],
                               "path": "",
                               "path_params": "",
                               "url": "",

diff --git a/public/pages/CreateMonitor/containers/CreateMonitor/__snapshots__/CreateMonitor.test.js.snap b/public/pages/CreateMonitor/containers/CreateMonitor/__snapshots__/CreateMonitor.test.js.snap
@@ -23,6 +23,7 @@ exports[`CreateMonitor renders 1`] = `
         "associatedMonitorsList": Array [],
         "bucketUnitOfTime": "h",
         "bucketValue": 1,
+        "clusterNames": Array [],
         "cronExpression": "0 */1 * * *",
         "daily": 0,
         "description": "",
@@ -64,6 +65,7 @@ exports[`CreateMonitor renders 1`] = `
         "timezone": Array [],
         "uri": Object {
           "api_type": "",
+          "clusters": Array [],
           "path": "",
           "path_params": "",
           "url": "",

diff --git a/...s/CreateMonitor/containers/CreateMonitor/utils/__snapshots__/formikToMonitor.test.js.snap b/...s/CreateMonitor/containers/CreateMonitor/utils/__snapshots__/formikToMonitor.test.js.snap
@@ -49,6 +49,7 @@ exports[`formikToClusterMetricsUri can build a ClusterMetricsMonitor request wit
 Object {
   "uri": Object {
     "api_type": "",
+    "clusters": Array [],
     "path": "",
     "path_params": "",
     "url": "",
@@ -60,6 +61,7 @@ exports[`formikToClusterMetricsUri can build a ClusterMetricsMonitor request wit
 Object {
   "uri": Object {
     "api_type": "CLUSTER_HEALTH",
+    "clusters": Array [],
     "path": "_cluster/health",
     "path_params": "",
     "url": "http://localhost:9200/_cluster/health",

diff --git a/public/pages/CreateMonitor/containers/DataSource/__snapshots__/DataSource.test.js.snap b/public/pages/CreateMonitor/containers/DataSource/__snapshots__/DataSource.test.js.snap
@@ -20,9 +20,7 @@ exports[`DataSource renders 1`] = `
     httpClient={[MockFunction]}
     monitorType="query_level_monitor"
   />
-  <EuiSpacer
-    size="s"
-  />
+  <EuiSpacer />
   <MonitorTimeField />
 </ContentPanel>
 `;
diff --git a/public/pages/CreateMonitor/containers/DefineMonitor/__snapshots__/DefineMonitor.test.js.snap b/public/pages/CreateMonitor/containers/DefineMonitor/__snapshots__/DefineMonitor.test.js.snap
@@ -21,6 +21,7 @@ exports[`DefineMonitor renders 1`] = `
           "associatedMonitorsList": Array [],
           "bucketUnitOfTime": "h",
           "bucketValue": 1,
+          "clusterNames": Array [],
           "cronExpression": "0 */1 * * *",
           "daily": 0,
           "description": "",
@@ -62,6 +63,7 @@ exports[`DefineMonitor renders 1`] = `
           "timezone": Array [],
           "uri": Object {
             "api_type": "",
+            "clusters": Array [],
             "path": "",
             "path_params": "",
             "url": "",

diff --git a/public/pages/CreateMonitor/containers/MonitorIndex/__snapshots__/MonitorIndex.test.js.snap b/public/pages/CreateMonitor/containers/MonitorIndex/__snapshots__/MonitorIndex.test.js.snap
@@ -15,6 +15,7 @@ exports[`MonitorIndex renders 1`] = `
       "associatedMonitorsList": Array [],
       "bucketUnitOfTime": "h",
       "bucketValue": 1,
+      "clusterNames": Array [],
       "cronExpression": "0 */1 * * *",
       "daily": 0,
       "description": "",
@@ -56,6 +57,7 @@ exports[`MonitorIndex renders 1`] = `
       "timezone": Array [],
       "uri": Object {
         "api_type": "",
+        "clusters": Array [],
         "path": "",
         "path_params": "",
         "url": "",
@@ -86,6 +88,7 @@ exports[`MonitorIndex renders 1`] = `
         Object {
           "async": true,
           "data-test-subj": "indicesComboBox",
+          "delimiter": ",",
           "isClearable": true,
           "isLoading": true,
           "onBlur": [Function],
@@ -160,6 +163,7 @@ exports[`MonitorIndex renders 1`] = `
                   "associatedMonitorsList": Array [],
                   "bucketUnitOfTime": "h",
                   "bucketValue": 1,
+                  "clusterNames": Array [],
                   "cronExpression": "0 */1 * * *",
                   "daily": 0,
                   "description": "",
@@ -201,6 +205,7 @@ exports[`MonitorIndex renders 1`] = `
                   "timezone": Array [],
                   "uri": Object {
                     "api_type": "",
+                    "clusters": Array [],
                     "path": "",
                     "path_params": "",
                     "url": "",
@@ -251,6 +256,7 @@ exports[`MonitorIndex renders 1`] = `
                   "associatedMonitorsList": Array [],
                   "bucketUnitOfTime": "h",
                   "bucketValue": 1,
+                  "clusterNames": Array [],
                   "cronExpression": "0 */1 * * *",
                   "daily": 0,
                   "description": "",
@@ -292,6 +298,7 @@ exports[`MonitorIndex renders 1`] = `
                   "timezone": Array [],
                   "uri": Object {
                     "api_type": "",
+                    "clusters": Array [],
                     "path": "",
                     "path_params": "",
                     "url": "",
@@ -406,6 +413,7 @@ exports[`MonitorIndex renders 1`] = `
                           "associatedMonitorsList": Array [],
                           "bucketUnitOfTime": "h",
                           "bucketValue": 1,
+                          "clusterNames": Array [],
                           "cronExpression": "0 */1 * * *",
                           "daily": 0,
                           "description": "",
@@ -447,6 +455,7 @@ exports[`MonitorIndex renders 1`] = `
                           "timezone": Array [],
                           "uri": Object {
                             "api_type": "",
+                            "clusters": Array [],
                             "path": "",
                             "path_params": "",
                             "url": "",
@@ -497,6 +506,7 @@ exports[`MonitorIndex renders 1`] = `
                           "associatedMonitorsList": Array [],
                           "bucketUnitOfTime": "h",
                           "bucketValue": 1,
+                          "clusterNames": Array [],
                           "cronExpression": "0 */1 * * *",
                           "daily": 0,
                           "description": "",
@@ -538,6 +548,7 @@ exports[`MonitorIndex renders 1`] = `
                           "timezone": Array [],
                           "uri": Object {
                             "api_type": "",
+                            "clusters": Array [],
                             "path": "",
                             "path_params": "",
                             "url": "",
@@ -559,6 +570,7 @@ exports[`MonitorIndex renders 1`] = `
                       Object {
                         "async": true,
                         "data-test-subj": "indicesComboBox",
+                        "delimiter": ",",
                         "isClearable": true,
                         "isLoading": true,
                         "onBlur": [Function],
@@ -588,6 +600,7 @@ exports[`MonitorIndex renders 1`] = `
                       async={true}
                       compressed={false}
                       data-test-subj="indicesComboBox"
+                      delimiter=","
                       fullWidth={false}
                       id="index"
                       isClearable={true}

diff --git a/...board/components/AcknowledgeAlertsModal/__snapshots__/AcknowledgeAlertsModal.test.js.snap b/...board/components/AcknowledgeAlertsModal/__snapshots__/AcknowledgeAlertsModal.test.js.snap
@@ -44,6 +44,7 @@ exports[`AcknowledgeAlertsModal renders 1`] = `
       "associatedMonitorsList": Array [],
       "bucketUnitOfTime": "h",
       "bucketValue": 1,
+      "clusterNames": Array [],
       "cronExpression": "0 */1 * * *",
       "daily": 0,
       "description": "",
@@ -85,6 +86,7 @@ exports[`AcknowledgeAlertsModal renders 1`] = `
       "timezone": Array [],
       "uri": Object {
         "api_type": "",
+        "clusters": Array [],
         "path": "",
         "path_params": "",
         "url": "",

diff --git a/...ages/MonitorDetails/components/MonitorOverview/__snapshots__/MonitorOverview.test.js.snap b/...ages/MonitorDetails/components/MonitorOverview/__snapshots__/MonitorOverview.test.js.snap
@@ -75,6 +75,20 @@ exports[`MonitorOverview renders 1`] = `
           </div>
         </div>
       </div>
+      <div
+        class="euiFlexItem"
+      >
+        <div
+          class="euiText euiText--extraSmall"
+        >
+          <strong>
+            Data sources
+          </strong>
+          <div>
+            -
+          </div>
+        </div>
+      </div>
       <div
         class="euiFlexItem"
       >

diff --git a/public/pages/MonitorDetails/containers/Triggers/__snapshots__/Triggers.test.js.snap b/public/pages/MonitorDetails/containers/Triggers/__snapshots__/Triggers.test.js.snap
@@ -40,7 +40,15 @@ exports[`Triggers renders 1`] = `
     itemId="id"
     items={
       Array [
-        undefined,
+        Object {
+          "actions": Array [
+            Object {
+              "name": "Random Action",
+            },
+          ],
+          "name": "Random Trigger",
+          "severity": 1,
+        },
       ]
     }
     key="0"