[9.0] [Usage collection] Replace agent.type with hard coded value to categorize monitoring type correctly. (#216391) (#216953)

# Backport This will backport the following commits from `main` to `9.0`: - [[Usage collection] Replace `agent.type` with hard coded value to categorize monitoring type correctly. (#216391)](https://github.com/elastic/kibana/pull/216391)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport)  Co-authored-by: Mashhur <99575341+mashhurs@users.noreply.github.com>
2025-04-23 17:28:26 -04:00 · 2025-04-03 11:34:43 +02:00 · 2025-04-03 11:34:43 +02:00 · e658d0ed24
commit e658d0ed24
parent 0ab9cd521e
5 changed files with 20 additions and 9 deletions
--- a/x-pack/platform/plugins/private/monitoring/server/telemetry_collection/logstash_agent_monitoring.test.ts
+++ b/x-pack/platform/plugins/private/monitoring/server/telemetry_collection/logstash_agent_monitoring.test.ts
@ -204,7 +204,7 @@ describe('LogstashAgentMonitoring', () => {
          count: 1,
          cluster_stats: {
            collection_types: {
-              filebeat: 1,
+              agent: 1,
            },
            monitoringClusterUuid: 'FlV4ckTxQ0a78hmBkzzc9A',
            pipelines: {
@ -288,7 +288,7 @@ describe('LogstashAgentMonitoring', () => {
          count: 1,
          cluster_stats: {
            collection_types: {
-              filebeat: 1,
+              agent: 1,
            },
            monitoringClusterUuid: 'FlV4ckTxQ0a78hmBkzzc9A',
            pipelines: {
@ -491,7 +491,7 @@ describe('LogstashAgentMonitoring', () => {
        '1n1p': {
          cluster_stats: {
            collection_types: {
-              filebeat: 1,
+              agent: 1,
            },
            monitoringClusterUuid: 'monitoringClusterUuid',
            pipelines: {
@ -523,7 +523,7 @@ describe('LogstashAgentMonitoring', () => {
        '1nmp': {
          cluster_stats: {
            collection_types: {
-              filebeat: 2,
+              agent: 2,
            },
            monitoringClusterUuid: 'monitoringClusterUuid',
            pipelines: {
@ -547,7 +547,7 @@ describe('LogstashAgentMonitoring', () => {
        mnmp: {
          cluster_stats: {
            collection_types: {
-              filebeat: 3,
+              agent: 3,
            },
            monitoringClusterUuid: 'monitoringClusterUuid',
            pipelines: {
--- a/x-pack/platform/plugins/private/monitoring/server/telemetry_collection/logstash_agent_monitoring.ts
+++ b/x-pack/platform/plugins/private/monitoring/server/telemetry_collection/logstash_agent_monitoring.ts
@ -120,7 +120,7 @@ export class LogstashAgentMonitoring implements LogstashMonitoring {
          }
        }

-        const thisCollectionType = hit._source?.agent?.type || 'agent';
+        const thisCollectionType = 'agent';
        if (!Object.hasOwn(clusterStats, 'collection_types')) {
          clusterStats.collection_types = {};
        }
--- a/x-pack/platform/plugins/private/monitoring/server/telemetry_collection/logstash_metricbeat_monitoring.test.ts
+++ b/x-pack/platform/plugins/private/monitoring/server/telemetry_collection/logstash_metricbeat_monitoring.test.ts
@ -53,15 +53,17 @@ describe('LogstashMetricbeatMonitoring', () => {
  });

  test('should set and get indexPattern correctly', () => {
-    metricbeatMonitoring.setIndexPattern('legacy');
+    metricbeatMonitoring.setIndexPattern('metricbeat');
    const indexPatternForLegacy = metricbeatMonitoring.getIndexPattern();
    expect(indexPatternForLegacy.stats).toBe(INDEX_PATTERN_LOGSTASH_MONITORING);
    expect(indexPatternForLegacy.state).toBe(INDEX_PATTERN_LOGSTASH_MONITORING);
+    expect(metricbeatMonitoring.getMonitoringType()).toBe('metricbeat');

    metricbeatMonitoring.setIndexPattern('stack');
    const indexPatternForStack = metricbeatMonitoring.getIndexPattern();
    expect(indexPatternForStack.stats).toBe(INDEX_PATTERN_LOGSTASH_STACK_MONITORING_STATS);
    expect(indexPatternForStack.state).toBe(INDEX_PATTERN_LOGSTASH_STACK_MONITORING_STATE);
+    expect(metricbeatMonitoring.getMonitoringType()).toBe('stack');
  });

  describe('Logstash metricbeat monitoring query test', () => {
--- a/x-pack/platform/plugins/private/monitoring/server/telemetry_collection/logstash_metricbeat_monitoring.ts
+++ b/x-pack/platform/plugins/private/monitoring/server/telemetry_collection/logstash_metricbeat_monitoring.ts
@ -33,6 +33,8 @@ export class LogstashMetricbeatMonitoring implements LogstashMonitoring {
    stats: INDEX_PATTERN_LOGSTASH_STACK_MONITORING_STATS,
  };

+  private monitoringType: string = 'metricbeat';
+
  /*
   * Call the function for fetching and summarizing Logstash metrics for Metricbeat monitoring
   * @param {Object} callCluster - ES client
@ -67,6 +69,7 @@ export class LogstashMetricbeatMonitoring implements LogstashMonitoring {
   * @param monitoringType - the monitoring type where metricbeat monitoring is intended.
   */
  setIndexPattern(monitoringType: string) {
+    this.monitoringType = monitoringType;
    if (monitoringType === 'stack') {
      this.indexPattern.state = INDEX_PATTERN_LOGSTASH_STACK_MONITORING_STATE;
      this.indexPattern.stats = INDEX_PATTERN_LOGSTASH_STACK_MONITORING_STATS;
@ -79,6 +82,11 @@ export class LogstashMetricbeatMonitoring implements LogstashMonitoring {
  getIndexPattern(): { [key: string]: string } {
    return this.indexPattern;
  }
+
+  getMonitoringType(): string {
+    return this.monitoringType;
+  }
+
  /*
   * Update a clusters object with processed Logstash stats for metricbeat monitoring
   * @param {Array} results - array of LogstashStats docs from ES
@ -117,7 +125,8 @@ export class LogstashMetricbeatMonitoring implements LogstashMonitoring {
        incrementByKey(a, thisVersion);
        clusters[clusterUuid].versions = mapToList(a, 'version');

-        const thisCollectionType = hit._source?.agent?.type || 'metricbeat';
+        // for stack_monitoring, agent internally uses metricbeat or filebeat
+        const thisCollectionType = this.getMonitoringType() === 'stack' ? 'agent' : 'metricbeat';
        if (!Object.hasOwn(clusterStats, 'collection_types')) {
          clusterStats.collection_types = {};
        }
--- a/x-pack/platform/plugins/private/monitoring/server/telemetry_collection/logstash_self_monitoring.ts
+++ b/x-pack/platform/plugins/private/monitoring/server/telemetry_collection/logstash_self_monitoring.ts
@ -103,7 +103,7 @@ export class LogstashSelfMonitoring implements LogstashMonitoring {
        clusters[clusterUuid].versions = mapToList(a, 'version');

        // Internal Collection has no agent field, so default to 'internal_collection'
-        const thisCollectionType = hit._source?.agent?.type || 'internal_collection';
+        const thisCollectionType = 'internal_collection';
        if (!Object.hasOwn(clusterStats, 'collection_types')) {
          clusterStats.collection_types = {};
        }