[Stack Monitoring] support for integration package

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>

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>

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,
           },
         }
       : {};

x-pack/plugins/monitoring/server/lib/kibana/get_kibana_info.ts

@@ -13,6 +13,8 @@ import { getNewIndexPatterns } from '../cluster/get_index_patterns';
 import { MissingRequiredError } from '../error_missing_required';
 import { buildKibanaInfo } from './build_kibana_info';
 import { isKibanaStatusStale } from './is_kibana_status_stale';
+import { createQuery } from '../create_query';
+import { KibanaMetric } from '../metrics';
 
 export function handleResponse(resp: ElasticsearchResponse) {
   const hit = resp.hits?.hits[0];
@@ -36,10 +38,13 @@ export function getKibanaInfo(
   { clusterUuid, kibanaUuid }: { clusterUuid: string; kibanaUuid: string }
 ) {
   const moduleType = 'kibana';
+  const type = 'kibana_stats';
+  const dataset = 'stats';
   const indexPatterns = getNewIndexPatterns({
     config: Globals.app.config,
     ccs: req.payload.ccs,
     moduleType,
+    dataset,
   });
   const params = {
     index: indexPatterns,
@@ -58,14 +63,14 @@ export function getKibanaInfo(
       'hits.hits._source.service.version',
     ],
     body: {
-      query: {
-        bool: {
-          filter: [
-            { term: { cluster_uuid: clusterUuid } },
-            { term: { 'kibana_stats.kibana.uuid': kibanaUuid } },
-          ],
-        },
-      },
+      query: createQuery({
+        type,
+        dsDataset: `${moduleType}.${dataset}`,
+        metricset: dataset,
+        clusterUuid,
+        uuid: kibanaUuid,
+        metric: KibanaMetric.getMetricFields(),
+      }),
       collapse: { field: 'kibana_stats.kibana.uuid' },
       sort: [{ timestamp: { order: 'desc', unmapped_type: 'long' } }],
     },

x-pack/test/api_integration/apis/monitoring/kibana/fixtures/instance.json

@@ -656,7 +656,7 @@
         },
         "indices_found": {
           "internal": true,
-          "metricbeat": false
+          "ecs": false
         },
         "data": [
           [
@@ -719,7 +719,7 @@
         },
         "indices_found": {
           "internal": true,
-          "metricbeat": false
+          "ecs": false
         },
         "data": [
           [
@@ -782,7 +782,7 @@
         },
         "indices_found": {
           "internal": true,
-          "metricbeat": false
+          "ecs": false
         },
         "data": [
           [
@@ -845,7 +845,7 @@
         },
         "indices_found": {
           "internal": true,
-          "metricbeat": false
+          "ecs": false
         },
         "data": [
           [

x-pack/test/api_integration/apis/monitoring/kibana/fixtures/overview.json

@@ -208,7 +208,7 @@
         },
         "indices_found": {
           "internal": true,
-          "metricbeat": false
+          "ecs": false
         },
         "data": [
           [
@@ -272,7 +272,7 @@
         },
         "indices_found": {
           "internal": true,
-          "metricbeat": false
+          "ecs": false
         },
         "data": [
           [
@@ -334,7 +334,7 @@
         },
         "indices_found": {
           "internal": true,
-          "metricbeat": false
+          "ecs": false
         },
         "data": [
           [
@@ -397,7 +397,7 @@
         },
         "indices_found": {
           "internal": true,
-          "metricbeat": false
+          "ecs": false
         },
         "data": [
           [
@@ -461,7 +461,7 @@
         },
         "indices_found": {
           "internal": true,
-          "metricbeat": false
+          "ecs": false
         },
         "data": [
           [
@@ -523,7 +523,7 @@
         },
         "indices_found": {
           "internal": true,
-          "metricbeat": false
+          "ecs": false
         },
         "data": [
           [

x-pack/test/api_integration/apis/monitoring/kibana/rules_and_actions/fixtures/instance.json

@@ -348,7 +348,7 @@
         },
         "indices_found": {
           "internal": false,
-          "metricbeat": true
+          "ecs": true
         },
         "data": [
           [
@@ -383,7 +383,7 @@
         },
         "indices_found": {
           "internal": false,
-          "metricbeat": true
+          "ecs": true
         },
         "data": [
           [
@@ -418,7 +418,7 @@
         },
         "indices_found": {
           "internal": false,
-          "metricbeat": true
+          "ecs": true
         },
         "data": [
           [
@@ -453,7 +453,7 @@
         },
         "indices_found": {
           "internal": false,
-          "metricbeat": true
+          "ecs": true
         },
         "data": [
           [

x-pack/test/api_integration/apis/monitoring/set_indices_found.tsx

@@ -7,13 +7,13 @@
 export function setIndicesFound(metrics: any, setFromMetricbeat: boolean = false) {
   return Object.keys(metrics).reduce((accum: any, metricName) => {
     accum[metricName] = metrics[metricName].map(
-      (item: { indices_found: { internal: boolean; metricbeat: boolean } }, index: number) => {
+      (item: { indices_found: { internal: boolean; ecs: boolean } }, index: number) => {
         if (item.indices_found) {
           return {
             ...item,
             indices_found: {
               internal: !setFromMetricbeat,
-              metricbeat: setFromMetricbeat,
+              ecs: setFromMetricbeat,
             },
           };
         }