Use stats instead of kibana_stats

elastic · Apr 2, 2021 · 80e946a · 80e946a
1 parent 70d2638
commit 80e946a
Show file tree

Hide file tree

Showing 60 changed files with 36,997 additions and 1,625 deletions.
diff --git a/packages/kbn-es-archiver/src/actions/rebuild_all.ts b/packages/kbn-es-archiver/src/actions/rebuild_all.ts
@@ -77,6 +77,8 @@ function convertLegacyTypeToMetricsetName(type: string) {
       return 'shard';
     case 'ccr_stats':
       return 'ccr';
+    case 'kibana_stats':
+      return 'stats';
   }
   return type;
 }

diff --git a/x-pack/plugins/monitoring/server/lib/cluster/flag_supported_clusters.ts b/x-pack/plugins/monitoring/server/lib/cluster/flag_supported_clusters.ts
@@ -41,7 +41,7 @@ async function findSupportedBasicLicenseCluster(
               bool: {
                 should: [
                   { term: { type: 'kibana_stats' } },
-                  { term: { 'metricset.name': 'kibana_stats' } },
+                  { term: { 'metricset.name': 'stats' } },
                 ],
               },
             },

diff --git a/x-pack/plugins/monitoring/server/lib/kibana/get_kibanas.ts b/x-pack/plugins/monitoring/server/lib/kibana/get_kibanas.ts
@@ -74,7 +74,7 @@ export async function getKibanas(
     ignoreUnavailable: true,
     body: {
       query: createQuery({
-        type: 'kibana_stats',
+        types: ['kibana_stats', 'stats'],
         start,
         end,
         clusterUuid,

diff --git a/x-pack/plugins/monitoring/server/lib/kibana/get_kibanas_for_clusters.js b/x-pack/plugins/monitoring/server/lib/kibana/get_kibanas_for_clusters.js
@@ -40,7 +40,7 @@ export function getKibanasForClusters(req, kbnIndexPattern, clusters) {
       ignoreUnavailable: true,
       body: {
         query: createQuery({
-          type: 'kibana_stats',
+          types: ['stats', 'kibana_stats'],
           start,
           end,
           clusterUuid,

diff --git a/x-pack/plugins/monitoring/server/lib/setup/collection/get_collection_status.js b/x-pack/plugins/monitoring/server/lib/setup/collection/get_collection_status.js
@@ -109,7 +109,7 @@ const getRecentMonitoringDocuments = async (req, indexPatterns, clusterUuid, nod
                     bool: {
                       should: [
                         { term: { type: 'kibana_stats' } },
-                        { term: { 'metricset.name': 'kibana_stats' } },
+                        { term: { 'metricset.name': 'stats' } },
                       ],
                     },
                   },

diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/kibana/overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/kibana/overview.js
@@ -48,7 +48,7 @@ export function kibanaOverviewRoute(server) {
               bool: {
                 should: [
                   { term: { type: 'kibana_stats' } },
-                  { term: { 'metricset.name': 'kibana_stats' } },
+                  { term: { 'metricset.name': 'stats' } },
                 ],
               },
             },

diff --git a/x-pack/test/functional/es_archives/monitoring/basic_6.3.x_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/basic_6.3.x_mb/data.json.gz