Use node and node_stats for logstash

elastic · Apr 5, 2021 · c1d505d · c1d505d
1 parent 80e946a
commit c1d505d
Show file tree

Hide file tree

Showing 30 changed files with 14 additions and 7 deletions.
diff --git a/packages/kbn-es-archiver/src/actions/rebuild_all.ts b/packages/kbn-es-archiver/src/actions/rebuild_all.ts
@@ -78,7 +78,10 @@ function convertLegacyTypeToMetricsetName(type: string) {
     case 'ccr_stats':
       return 'ccr';
     case 'kibana_stats':
+    case 'logstash_stats':
       return 'stats';
+    case 'logstash_state':
+      return 'state';
   }
   return type;
 }

diff --git a/x-pack/plugins/monitoring/server/lib/logstash/get_logstash_for_clusters.js b/x-pack/plugins/monitoring/server/lib/logstash/get_logstash_for_clusters.js
@@ -51,7 +51,7 @@ export function getLogstashForClusters(req, lsIndexPattern, clusters) {
       ignoreUnavailable: true,
       body: {
         query: createQuery({
-          type: 'logstash_stats',
+          types: ['node_stats', 'logstash_stats'],
           start,
           end,
           clusterUuid,

diff --git a/x-pack/plugins/monitoring/server/lib/logstash/get_pipeline_stats_aggregation.js b/x-pack/plugins/monitoring/server/lib/logstash/get_pipeline_stats_aggregation.js
@@ -157,7 +157,7 @@ export function getPipelineStatsAggregation(
   end = version.lastSeen;
 
   const query = createQuery({
-    type: 'logstash_stats',
+    types: ['node_stats', 'logstash_stats'],
     start,
     end,
     metric: LogstashMetric.getMetricFields(),

diff --git a/x-pack/plugins/monitoring/server/lib/logstash/get_pipeline_vertex_stats_aggregation.js b/x-pack/plugins/monitoring/server/lib/logstash/get_pipeline_vertex_stats_aggregation.js
@@ -200,7 +200,7 @@ export function getPipelineVertexStatsAggregation(
   end = version.lastSeen;
 
   const query = createQuery({
-    type: 'logstash_stats',
+    types: ['node_stats', 'logstash_stats'],
     start,
     end,
     metric: LogstashMetric.getMetricFields(),

diff --git a/x-pack/plugins/monitoring/server/lib/metrics/logstash/metrics.js b/x-pack/plugins/monitoring/server/lib/metrics/logstash/metrics.js
@@ -92,6 +92,7 @@ const eventsPerSecondUnitLabel = i18n.translate(
 
 export const metrics = {
   logstash_cluster_events_input_rate: new LogstashEventsRateClusterMetric({
+    debug: true,
     field: 'logstash_stats.events.in',
     label: i18n.translate('xpack.monitoring.metrics.logstash.eventsReceivedRateLabel', {
       defaultMessage: 'Events Received Rate',

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
@@ -171,7 +171,7 @@ const getRecentMonitoringDocuments = async (req, indexPatterns, clusterUuid, nod
                     bool: {
                       should: [
                         { term: { type: 'logstash_stats' } },
-                        { term: { 'metricset.name': 'logstash_stats' } },
+                        { term: { 'metricset.name': 'node_stats' } },
                       ],
                     },
                   },

diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/logstash/node.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/node.js
@@ -77,7 +77,7 @@ export function logstashNodeRoute(server) {
               bool: {
                 should: [
                   { term: { type: 'logstash_stats' } },
-                  { term: { 'metricset.name': 'logstash_stats' } },
+                  { term: { 'metricset.name': 'node_stats' } },
                 ],
               },
             },

diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/logstash/overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/overview.js
@@ -57,7 +57,7 @@ export function logstashOverviewRoute(server) {
               bool: {
                 should: [
                   { term: { type: 'logstash_stats' } },
-                  { term: { 'metricset.name': 'logstash_stats' } },
+                  { term: { 'metricset.name': 'node_stats' } },
                 ],
               },
             },

diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.ts
@@ -290,7 +290,10 @@ export async function fetchLogstashStats(
           { terms: { cluster_uuid: clusterUuids } },
           {
             bool: {
-              must: { term: { type: 'logstash_stats' } },
+              should: [
+                { term: { type: 'logstash_stats' } },
+                { term: { 'metricset.name': 'node_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
diff --git a/x-pack/test/functional/es_archives/monitoring/beats-with-restarted-instance_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/beats-with-restarted-instance_mb/data.json.gz
diff --git a/x-pack/test/functional/es_archives/monitoring/beats_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/beats_mb/data.json.gz
diff --git a/x-pack/test/functional/es_archives/monitoring/ccr_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/ccr_mb/data.json.gz
diff --git a/x-pack/test/functional/es_archives/monitoring/logs_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/logs_mb/data.json.gz
diff --git a/x-pack/test/functional/es_archives/monitoring/logs_multiple_clusters_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/logs_multiple_clusters_mb/data.json.gz
diff --git a/x-pack/test/functional/es_archives/monitoring/logstash-pipelines_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/logstash-pipelines_mb/data.json.gz
diff --git a/x-pack/test/functional/es_archives/monitoring/logstash/changing_pipelines_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/logstash/changing_pipelines_mb/data.json.gz
diff --git a/...ck/test/functional/es_archives/monitoring/logstash_pipelines_multicluster_mb/data.json.gz b/...ck/test/functional/es_archives/monitoring/logstash_pipelines_multicluster_mb/data.json.gz
diff --git a/x-pack/test/functional/es_archives/monitoring/multi-basic_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/multi-basic_mb/data.json.gz
diff --git a/x-pack/test/functional/es_archives/monitoring/multicluster_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/multicluster_mb/data.json.gz
diff --git a/x-pack/test/functional/es_archives/monitoring/singlecluster-basic-beats_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/singlecluster-basic-beats_mb/data.json.gz
diff --git a/x-pack/test/functional/es_archives/monitoring/singlecluster-green-gold_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/singlecluster-green-gold_mb/data.json.gz
diff --git a/x-pack/test/functional/es_archives/monitoring/singlecluster-green-platinum_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/singlecluster-green-platinum_mb/data.json.gz
diff --git a/...l/es_archives/monitoring/singlecluster-green-trial-two-nodes-one-cgrouped_mb/data.json.gz b/...l/es_archives/monitoring/singlecluster-green-trial-two-nodes-one-cgrouped_mb/data.json.gz
diff --git a/x-pack/test/functional/es_archives/monitoring/singlecluster-red-platinum_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/singlecluster-red-platinum_mb/data.json.gz
diff --git a/...ctional/es_archives/monitoring/singlecluster-three-nodes-shard-relocation_mb/data.json.gz b/...ctional/es_archives/monitoring/singlecluster-three-nodes-shard-relocation_mb/data.json.gz
diff --git a/x-pack/test/functional/es_archives/monitoring/singlecluster-yellow-basic_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/singlecluster-yellow-basic_mb/data.json.gz
diff --git a/x-pack/test/functional/es_archives/monitoring/singlecluster-yellow-platinum_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/singlecluster-yellow-platinum_mb/data.json.gz
diff --git a/x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes_mb/data.json.gz
diff --git a/x-pack/test/functional/es_archives/monitoring/standalone_cluster_mb/data.json.gz b/x-pack/test/functional/es_archives/monitoring/standalone_cluster_mb/data.json.gz