package datastreams support rules

elastic · Aug 6, 2022 · 536c537 · 536c537
1 parent 879122d
commit 536c537
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/x-pack/plugins/monitoring/public/application/pages/kibana/instance.tsx b/x-pack/plugins/monitoring/public/application/pages/kibana/instance.tsx
@@ -40,7 +40,7 @@ const KibanaInstance = ({ data, alerts }: { data: any; alerts: any }) => {
   const showRules =
     data.metrics.kibana_instance_rule_executions &&
     data.metrics.kibana_instance_rule_executions.length &&
-    data.metrics.kibana_instance_rule_executions[0].indices_found.metricbeat;
+    data.metrics.kibana_instance_rule_executions[0].indices_found.ecs;
 
   return (
     <EuiPage>

diff --git a/x-pack/plugins/monitoring/public/application/pages/kibana/overview.tsx b/x-pack/plugins/monitoring/public/application/pages/kibana/overview.tsx
@@ -36,7 +36,7 @@ const KibanaOverview = ({ data }: { data: any }) => {
   const showRules =
     data.metrics.kibana_cluster_rule_overdue_count &&
     data.metrics.kibana_cluster_rule_overdue_count.length &&
-    data.metrics.kibana_cluster_rule_overdue_count[0].indices_found.metricbeat;
+    data.metrics.kibana_cluster_rule_overdue_count[0].indices_found.ecs;
 
   return (
     <EuiPage>

diff --git a/x-pack/plugins/monitoring/server/lib/details/get_series.ts b/x-pack/plugins/monitoring/server/lib/details/get_series.ts
@@ -19,6 +19,7 @@ import {
   INDEX_PATTERN_TYPES,
   STANDALONE_CLUSTER_CLUSTER_UUID,
   METRICBEAT_INDEX_NAME_UNIQUE_TOKEN,
+  DS_INDEX_PATTERN_METRICS,
 } from '../../../common/constants';
 import { formatUTCTimestampForTimezone } from '../format_timezone';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
@@ -291,7 +292,7 @@ function handleSeries(
       bucketSizeInSeconds * 1000
     );
     let internalIndicesFound = false;
-    let mbIndicesFound = false;
+    let ecsIndicesFound = false;
     let data: Array<[string | number, number | null]> = [];
 
     if (firstUsableBucketIndex <= lastUsableBucketIndex) {
@@ -308,8 +309,11 @@ function handleSeries(
         // map buckets to X/Y coords for Flot charting
         if (bucket.indices) {
           for (const indexBucket of bucket.indices.buckets) {
-            if (indexBucket.key.includes(METRICBEAT_INDEX_NAME_UNIQUE_TOKEN)) {
-              mbIndicesFound = true;
+            if (
+              indexBucket.key.includes(METRICBEAT_INDEX_NAME_UNIQUE_TOKEN) ||
+              indexBucket.key.includes(DS_INDEX_PATTERN_METRICS)
+            ) {
+              ecsIndicesFound = true;
             } else {
               internalIndicesFound = true;
             }
@@ -327,7 +331,7 @@ function handleSeries(
       ? {
           indices_found: {
             internal: internalIndicesFound,
-            metricbeat: mbIndicesFound,
+            ecs: ecsIndicesFound,
           },
         }
       : {};