fetchClusters creates index pattern

elastic · Jan 18, 2022 · 6878713 · 6878713
1 parent 2b841e4
commit 6878713
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 17 deletions.
diff --git a/x-pack/plugins/monitoring/server/alerts/base_rule.ts b/x-pack/plugins/monitoring/server/alerts/base_rule.ts
@@ -31,7 +31,6 @@ import { fetchClusters } from '../lib/alerts/fetch_clusters';
 import { AlertSeverity } from '../../common/enums';
 import { parseDuration } from '../../../alerting/common';
 import { Globals } from '../static_globals';
-import { getNewIndexPatterns } from '../lib/cluster/get_index_patterns';
 
 type ExecutedState =
   | {
@@ -230,12 +229,8 @@ export class BaseRule {
   }
 
   protected async fetchClusters(esClient: ElasticsearchClient, params: CommonAlertParams) {
-    const indexPatterns = getNewIndexPatterns({
-      config: Globals.app.config,
-      moduleType: 'elasticsearch',
-    });
     if (!params.limit) {
-      return await fetchClusters(esClient, indexPatterns);
+      return await fetchClusters(esClient);
     }
     const limit = parseDuration(params.limit);
     const rangeFilter = this.ruleOptions.fetchClustersRange
@@ -246,7 +241,7 @@ export class BaseRule {
           },
         }
       : undefined;
-    return await fetchClusters(esClient, indexPatterns, rangeFilter);
+    return await fetchClusters(esClient, rangeFilter);
   }
 
   protected async fetchData(

diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts
@@ -106,8 +106,7 @@ export function getMonitoringUsageCollector(
         : getClient().asInternalUser;
       const usageClusters: MonitoringClusterStackProductUsage[] = [];
       const availableCcs = config.ui.ccs.enabled;
-      const elasticsearchIndex = getCcsIndexPattern(INDEX_PATTERN_ELASTICSEARCH, availableCcs);
-      const clusters = await fetchClusters(callCluster, elasticsearchIndex);
+      const clusters = await fetchClusters(callCluster);
       for (const cluster of clusters) {
         const license = await fetchLicenseType(callCluster, availableCcs, cluster.clusterUuid);
         const stackProducts = await getStackProductsUsage(

diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.test.ts
@@ -11,6 +11,18 @@ import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mo
 import { elasticsearchServiceMock } from 'src/core/server/mocks';
 import { fetchClusters } from './fetch_clusters';
 
+jest.mock('../../static_globals', () => ({
+  Globals: {
+    app: {
+      config: {
+        ui: {
+          ccs: { enabled: true },
+        },
+      },
+    },
+  },
+}));
+
 describe('fetchClusters', () => {
   const clusterUuid = '1sdfds734';
   const clusterName = 'monitoring';
@@ -31,8 +43,7 @@ describe('fetchClusters', () => {
         },
       } as estypes.SearchResponse)
     );
-    const index = '.monitoring-es-*';
-    const result = await fetchClusters(esClient, index);
+    const result = await fetchClusters(esClient);
     expect(result).toEqual([{ clusterUuid, clusterName }]);
   });
 
@@ -60,15 +71,13 @@ describe('fetchClusters', () => {
         },
       } as estypes.SearchResponse)
     );
-    const index = '.monitoring-es-*';
-    const result = await fetchClusters(esClient, index);
+    const result = await fetchClusters(esClient);
     expect(result).toEqual([{ clusterUuid, clusterName: metadataName }]);
   });
 
   it('should limit the time period in the query', async () => {
     const esClient = elasticsearchServiceMock.createScopedClusterClient().asCurrentUser;
-    const index = '.monitoring-es-*';
-    await fetchClusters(esClient, index);
+    await fetchClusters(esClient);
     const params = esClient.search.mock.calls[0][0] as any;
     expect(params?.body?.query.bool.filter[1].range.timestamp.gte).toBe('now-2m');
   });

diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.ts
@@ -8,7 +8,10 @@
 import { ElasticsearchClient } from 'kibana/server';
 import { get } from 'lodash';
 import { AlertCluster } from '../../../common/types/alerts';
+import { getNewIndexPatterns } from '../cluster/get_index_patterns';
 import { createDatasetFilter } from './create_dataset_query_filter';
+import { Globals } from '../../static_globals';
+import { getConfigCcs } from '../../../common/ccs_utils';
 
 interface RangeFilter {
   [field: string]: {
@@ -19,11 +22,15 @@ interface RangeFilter {
 
 export async function fetchClusters(
   esClient: ElasticsearchClient,
-  index: string,
   rangeFilter: RangeFilter = { timestamp: { gte: 'now-2m' } }
 ): Promise<AlertCluster[]> {
+  const indexPatterns = getNewIndexPatterns({
+    config: Globals.app.config,
+    moduleType: 'elasticsearch',
+    ccs: getConfigCcs(Globals.app.config) ? '*' : undefined,
+  });
   const params = {
-    index,
+    index: indexPatterns,
     filter_path: [
       'hits.hits._source.cluster_settings.cluster.metadata.display_name',
       'hits.hits._source.cluster_uuid',