[Stack Monitoring] Add stack_monitoring suffix to metrics-* index pattern

x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.test.ts

@@ -38,7 +38,7 @@ describe('fetchCCReadExceptions', () => {
     await fetchCCRReadExceptions(esClient, 1643306331418, 1643309869056, 10000);
     expect(esClient.search).toHaveBeenCalledWith({
       index:
-        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.ccr-*,metrics-elasticsearch.ccr-*',
+        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.ccr-*,metrics-elasticsearch.stack_monitoring.ccr-*',
       filter_path: ['aggregations.remote_clusters.buckets'],
       body: {
         size: 0,
@@ -137,6 +137,6 @@ describe('fetchCCReadExceptions', () => {
     await fetchCCRReadExceptions(esClient, 1643306331418, 1643309869056, 10000);
 
     // @ts-ignore
-    expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.ccr-*');
+    expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.stack_monitoring.ccr-*');
   });
 });

x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.test.ts

@@ -61,7 +61,7 @@ describe('fetchClusterHealth', () => {
     ]);
     expect(esClient.search).toHaveBeenCalledWith({
       index:
-        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.cluster_stats-*,metrics-elasticsearch.cluster_stats-*',
+        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.cluster_stats-*,metrics-elasticsearch.stack_monitoring.cluster_stats-*',
       filter_path: [
         'hits.hits._source.cluster_state.status',
         'hits.hits._source.elasticsearch.cluster.stats.status',
@@ -108,6 +108,8 @@ describe('fetchClusterHealth', () => {
     await fetchClusterHealth(esClient, [{ clusterUuid: '1', clusterName: 'foo1' }]);
 
     // @ts-ignore
-    expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.cluster_stats-*');
+    expect(params.index).toBe(
+      '.monitoring-es-*,metrics-elasticsearch.stack_monitoring.cluster_stats-*'
+    );
   });
 });

x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.test.ts

@@ -83,7 +83,7 @@ describe('fetchClusters', () => {
     await fetchClusters(esClient);
     expect(esClient.search).toHaveBeenCalledWith({
       index:
-        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.cluster_stats-*,metrics-elasticsearch.cluster_stats-*',
+        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.cluster_stats-*,metrics-elasticsearch.stack_monitoring.cluster_stats-*',
       filter_path: [
         'hits.hits._source.cluster_settings.cluster.metadata.display_name',
         'hits.hits._source.cluster_uuid',
@@ -125,6 +125,8 @@ describe('fetchClusters', () => {
     });
     await fetchClusters(esClient);
     // @ts-ignore
-    expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.cluster_stats-*');
+    expect(params.index).toBe(
+      '.monitoring-es-*,metrics-elasticsearch.stack_monitoring.cluster_stats-*'
+    );
   });
 });

x-pack/plugins/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.test.ts

@@ -214,7 +214,7 @@ describe('fetchCpuUsageNodeStats', () => {
     await fetchCpuUsageNodeStats(esClient, clusters, startMs, endMs, size, filterQuery);
     expect(params).toStrictEqual({
       index:
-        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.node_stats-*,metrics-elasticsearch.node_stats-*',
+        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.node_stats-*,metrics-elasticsearch.stack_monitoring.node_stats-*',
       filter_path: ['aggregations'],
       body: {
         size: 0,

x-pack/plugins/monitoring/server/lib/alerts/fetch_disk_usage_node_stats.test.ts

@@ -89,7 +89,7 @@ describe('fetchDiskUsageNodeStats', () => {
     await fetchDiskUsageNodeStats(esClient, clusters, duration, size);
     expect(esClient.search).toHaveBeenCalledWith({
       index:
-        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.node_stats-*,metrics-elasticsearch.node_stats-*',
+        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.node_stats-*,metrics-elasticsearch.stack_monitoring.node_stats-*',
       filter_path: ['aggregations'],
       body: {
         size: 0,
@@ -150,6 +150,8 @@ describe('fetchDiskUsageNodeStats', () => {
     });
     await fetchDiskUsageNodeStats(esClient, clusters, duration, size);
     // @ts-ignore
-    expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.node_stats-*');
+    expect(params.index).toBe(
+      '.monitoring-es-*,metrics-elasticsearch.stack_monitoring.node_stats-*'
+    );
   });
 });

x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.test.ts

@@ -67,7 +67,7 @@ describe('fetchElasticsearchVersions', () => {
     await fetchElasticsearchVersions(esClient, clusters, size);
     expect(esClient.search).toHaveBeenCalledWith({
       index:
-        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.cluster_stats-*,metrics-elasticsearch.cluster_stats-*',
+        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.cluster_stats-*,metrics-elasticsearch.stack_monitoring.cluster_stats-*',
       filter_path: [
         'hits.hits._source.cluster_stats.nodes.versions',
         'hits.hits._source.elasticsearch.cluster.stats.nodes.versions',
@@ -110,6 +110,8 @@ describe('fetchElasticsearchVersions', () => {
     });
     await fetchElasticsearchVersions(esClient, clusters, size);
     // @ts-ignore
-    expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.cluster_stats-*');
+    expect(params.index).toBe(
+      '.monitoring-es-*,metrics-elasticsearch.stack_monitoring.cluster_stats-*'
+    );
   });
 });

x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.test.ts

@@ -150,7 +150,7 @@ describe('fetchIndexShardSize', () => {
     await fetchIndexShardSize(esClient, clusters, threshold, shardIndexPatterns, size);
     expect(esClient.search).toHaveBeenCalledWith({
       index:
-        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.index-*,metrics-elasticsearch.index-*',
+        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.index-*,metrics-elasticsearch.stack_monitoring.index-*',
       filter_path: ['aggregations.clusters.buckets'],
       body: {
         size: 0,
@@ -211,6 +211,6 @@ describe('fetchIndexShardSize', () => {
     });
     await fetchIndexShardSize(esClient, clusters, threshold, shardIndexPatterns, size);
     // @ts-ignore
-    expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.index-*');
+    expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.stack_monitoring.index-*');
   });
 });

x-pack/plugins/monitoring/server/lib/alerts/fetch_kibana_versions.test.ts

@@ -90,7 +90,7 @@ describe('fetchKibanaVersions', () => {
     await fetchKibanaVersions(esClient, clusters, size);
     expect(esClient.search).toHaveBeenCalledWith({
       index:
-        '*:.monitoring-kibana-*,.monitoring-kibana-*,*:metrics-kibana.stats-*,metrics-kibana.stats-*',
+        '*:.monitoring-kibana-*,.monitoring-kibana-*,*:metrics-kibana.stack_monitoring.stats-*,metrics-kibana.stack_monitoring.stats-*',
       filter_path: ['aggregations'],
       body: {
         size: 0,
@@ -146,6 +146,6 @@ describe('fetchKibanaVersions', () => {
     });
     await fetchKibanaVersions(esClient, clusters, size);
     // @ts-ignore
-    expect(params.index).toBe('.monitoring-kibana-*,metrics-kibana.stats-*');
+    expect(params.index).toBe('.monitoring-kibana-*,metrics-kibana.stack_monitoring.stats-*');
   });
 });

x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.test.ts

@@ -81,7 +81,7 @@ describe('fetchLicenses', () => {
     await fetchLicenses(esClient, clusters);
     expect(params).toStrictEqual({
       index:
-        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.cluster_stats-*,metrics-elasticsearch.cluster_stats-*',
+        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.cluster_stats-*,metrics-elasticsearch.stack_monitoring.cluster_stats-*',
       filter_path: [
         'hits.hits._source.license.*',
         'hits.hits._source.elasticsearch.cluster.stats.license.*',
@@ -126,6 +126,8 @@ describe('fetchLicenses', () => {
     const clusters = [{ clusterUuid, clusterName }];
     await fetchLicenses(esClient, clusters);
     // @ts-ignore
-    expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.cluster_stats-*');
+    expect(params.index).toBe(
+      '.monitoring-es-*,metrics-elasticsearch.stack_monitoring.cluster_stats-*'
+    );
   });
 });

x-pack/plugins/monitoring/server/lib/alerts/fetch_logstash_versions.test.ts

@@ -95,7 +95,7 @@ describe('fetchLogstashVersions', () => {
     await fetchLogstashVersions(esClient, clusters, size);
     expect(params).toStrictEqual({
       index:
-        '*:.monitoring-logstash-*,.monitoring-logstash-*,*:metrics-logstash.node_stats-*,metrics-logstash.node_stats-*',
+        '*:.monitoring-logstash-*,.monitoring-logstash-*,*:metrics-logstash.stack_monitoring.node_stats-*,metrics-logstash.stack_monitoring.node_stats-*',
       filter_path: ['aggregations'],
       body: {
         size: 0,
@@ -151,6 +151,8 @@ describe('fetchLogstashVersions', () => {
     });
     await fetchLogstashVersions(esClient, clusters, size);
     // @ts-ignore
-    expect(params.index).toBe('.monitoring-logstash-*,metrics-logstash.node_stats-*');
+    expect(params.index).toBe(
+      '.monitoring-logstash-*,metrics-logstash.stack_monitoring.node_stats-*'
+    );
   });
 });

x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.test.ts

@@ -117,7 +117,7 @@ describe('fetchMemoryUsageNodeStats', () => {
     await fetchMemoryUsageNodeStats(esClient, clusters, startMs, endMs, size);
     expect(params).toStrictEqual({
       index:
-        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.node_stats-*,metrics-elasticsearch.node_stats-*',
+        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.node_stats-*,metrics-elasticsearch.stack_monitoring.node_stats-*',
       filter_path: ['aggregations'],
       body: {
         size: 0,
@@ -168,6 +168,8 @@ describe('fetchMemoryUsageNodeStats', () => {
     });
     await fetchMemoryUsageNodeStats(esClient, clusters, startMs, endMs, size);
     // @ts-ignore
-    expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.node_stats-*');
+    expect(params.index).toBe(
+      '.monitoring-es-*,metrics-elasticsearch.stack_monitoring.node_stats-*'
+    );
   });
 });

x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.test.ts

@@ -176,7 +176,7 @@ describe('fetchMissingMonitoringData', () => {
     await fetchMissingMonitoringData(esClient, clusters, size, now, startMs);
     expect(params).toStrictEqual({
       index:
-        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.node_stats-*,metrics-elasticsearch.node_stats-*',
+        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.node_stats-*,metrics-elasticsearch.stack_monitoring.node_stats-*',
       filter_path: ['aggregations.clusters.buckets'],
       body: {
         size: 0,
@@ -240,6 +240,8 @@ describe('fetchMissingMonitoringData', () => {
     });
     await fetchMissingMonitoringData(esClient, clusters, size, now, startMs);
     // @ts-ignore
-    expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.node_stats-*');
+    expect(params.index).toBe(
+      '.monitoring-es-*,metrics-elasticsearch.stack_monitoring.node_stats-*'
+    );
   });
 });

x-pack/plugins/monitoring/server/lib/alerts/fetch_nodes_from_cluster_stats.test.ts

@@ -159,7 +159,7 @@ describe('fetchNodesFromClusterStats', () => {
     await fetchNodesFromClusterStats(esClient, clusters);
     expect(params).toStrictEqual({
       index:
-        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.cluster_stats-*,metrics-elasticsearch.cluster_stats-*',
+        '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.cluster_stats-*,metrics-elasticsearch.stack_monitoring.cluster_stats-*',
       filter_path: ['aggregations.clusters.buckets'],
       body: {
         size: 0,
@@ -210,6 +210,8 @@ describe('fetchNodesFromClusterStats', () => {
     });
     await fetchNodesFromClusterStats(esClient, clusters);
     // @ts-ignore
-    expect(params.index).toBe('.monitoring-es-*,metrics-elasticsearch.cluster_stats-*');
+    expect(params.index).toBe(
+      '.monitoring-es-*,metrics-elasticsearch.stack_monitoring.cluster_stats-*'
+    );
   });
 });

x-pack/plugins/monitoring/server/lib/cluster/get_index_patterns.test.ts

@@ -27,67 +27,71 @@ describe('getNewIndexPatterns', () => {
       config: getConfigWithCcs(true),
       moduleType: 'elasticsearch',
     });
-    expect(indexPatterns).toBe('.monitoring-es-*,metrics-elasticsearch.*-*');
+    expect(indexPatterns).toBe('.monitoring-es-*,metrics-elasticsearch.stack_monitoring.*-*');
   });
   it('returns ecs only elasticsearch index patterns when specifying ecsLegacyOnly: true', () => {
     const indexPatterns = getNewIndexPatterns({
       config: getConfigWithCcs(true),
       moduleType: 'elasticsearch',
       ecsLegacyOnly: true,
     });
-    expect(indexPatterns).toBe('.monitoring-es-8-*,metrics-elasticsearch.*-*');
+    expect(indexPatterns).toBe('.monitoring-es-8-*,metrics-elasticsearch.stack_monitoring.*-*');
   });
   it('returns local kibana index patterns when ccs is enabled with no ccs payload', () => {
     const indexPatterns = getNewIndexPatterns({
       config: getConfigWithCcs(true),
       moduleType: 'kibana',
     });
-    expect(indexPatterns).toBe('.monitoring-kibana-*,metrics-kibana.*-*');
+    expect(indexPatterns).toBe('.monitoring-kibana-*,metrics-kibana.stack_monitoring.*-*');
   });
   it('returns logstash index patterns when ccs is enabled and no ccs payload', () => {
     const indexPatterns = getNewIndexPatterns({
       config: getConfigWithCcs(true),
       moduleType: 'logstash',
     });
-    expect(indexPatterns).toBe('.monitoring-logstash-*,metrics-logstash.*-*');
+    expect(indexPatterns).toBe('.monitoring-logstash-*,metrics-logstash.stack_monitoring.*-*');
   });
   it('returns beats index patterns when ccs is enabled and no ccs payload', () => {
     const indexPatterns = getNewIndexPatterns({
       config: getConfigWithCcs(true),
       moduleType: 'beats',
     });
-    expect(indexPatterns).toBe('.monitoring-beats-*,metrics-beats.*-*');
+    expect(indexPatterns).toBe('.monitoring-beats-*,metrics-beats.stack_monitoring.*-*');
   });
   it('returns elasticsearch index patterns with dataset', () => {
     const indexPatterns = getNewIndexPatterns({
       config: getConfigWithCcs(true),
       moduleType: 'elasticsearch',
       dataset: 'cluster_stats',
     });
-    expect(indexPatterns).toBe('.monitoring-es-*,metrics-elasticsearch.cluster_stats-*');
+    expect(indexPatterns).toBe(
+      '.monitoring-es-*,metrics-elasticsearch.stack_monitoring.cluster_stats-*'
+    );
   });
   it('returns elasticsearch index patterns without ccs prefixes when ccs is disabled', () => {
     const indexPatterns = getNewIndexPatterns({
       config: getConfigWithCcs(false),
       moduleType: 'elasticsearch',
     });
-    expect(indexPatterns).toBe('.monitoring-es-*,metrics-elasticsearch.*-*');
+    expect(indexPatterns).toBe('.monitoring-es-*,metrics-elasticsearch.stack_monitoring.*-*');
   });
   it('returns elasticsearch index patterns without ccs prefixes when ccs is disabled but ccs request payload has a value', () => {
     const indexPatterns = getNewIndexPatterns({
       config: getConfigWithCcs(false),
       ccs: 'myccs',
       moduleType: 'elasticsearch',
     });
-    expect(indexPatterns).toBe('.monitoring-es-*,metrics-elasticsearch.*-*');
+    expect(indexPatterns).toBe('.monitoring-es-*,metrics-elasticsearch.stack_monitoring.*-*');
   });
   it('returns elasticsearch index patterns with custom ccs prefixes when ccs is enabled and ccs request payload has a value', () => {
     const indexPatterns = getNewIndexPatterns({
       config: getConfigWithCcs(true),
       ccs: 'myccs',
       moduleType: 'elasticsearch',
     });
-    expect(indexPatterns).toBe('myccs:.monitoring-es-*,myccs:metrics-elasticsearch.*-*');
+    expect(indexPatterns).toBe(
+      'myccs:.monitoring-es-*,myccs:metrics-elasticsearch.stack_monitoring.*-*'
+    );
   });
   it('returns elasticsearch index patterns with ccs prefixes and local index patterns when ccs is enabled and ccs request payload value is *', () => {
     const indexPatterns = getNewIndexPatterns({
@@ -96,7 +100,7 @@ describe('getNewIndexPatterns', () => {
       moduleType: 'elasticsearch',
     });
     expect(indexPatterns).toBe(
-      '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.*-*,metrics-elasticsearch.*-*'
+      '*:.monitoring-es-*,.monitoring-es-*,*:metrics-elasticsearch.stack_monitoring.*-*,metrics-elasticsearch.stack_monitoring.*-*'
     );
   });
 });

x-pack/plugins/monitoring/server/lib/cluster/get_index_patterns.ts

@@ -105,11 +105,12 @@ export function getDsIndexPattern({
   config: MonitoringConfig;
   ccs?: string;
 }): string {
-  let datasetsPattern = '';
+  let datasetsPattern = `${moduleType}.stack_monitoring`;
+
   if (dataset) {
-    datasetsPattern = `${moduleType}.${dataset}`;
+    datasetsPattern = `${datasetsPattern}.${dataset}`;
   } else {
-    datasetsPattern = `${moduleType}.*`;
+    datasetsPattern = `${datasetsPattern}.*`;
   }
   return prefixIndexPatternWithCcs(config, `${type}-${datasetsPattern}-${namespace}`, ccs);
 }