[8.6] [Fleet] Bugfix: count agent policies not agent policy revisions in telemetry (#149858) (#150036)

# Backport This will backport the following commits from `main` to `8.6`: - [[Fleet] Bugfix: count agent policies not agent policy revisions in telemetry (#149858)](https://github.com/elastic/kibana/pull/149858)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)
2025-04-23 17:28:26 -04:00 · 2023-02-01 15:04:15 +00:00 · 2023-02-01 15:04:15 +00:00 · 1c89d27ff7
commit 1c89d27ff7
parent daf9cfe5a8
3 changed files with 86 additions and 42 deletions
--- a/x-pack/plugins/fleet/server/collectors/agent_policies.ts
+++ b/x-pack/plugins/fleet/server/collectors/agent_policies.ts
@ -5,57 +5,55 @@
 * 2.0.
 */

-import type { ElasticsearchClient } from '@kbn/core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
+import _ from 'lodash';

-import { AGENT_POLICY_INDEX } from '../../common';
-import { ES_SEARCH_LIMIT } from '../../common/constants';
-import { appContextService } from '../services';
+import {
+  AGENT_POLICY_SAVED_OBJECT_TYPE,
+  OUTPUT_SAVED_OBJECT_TYPE,
+  SO_SEARCH_LIMIT,
+} from '../../common';
+import type { OutputSOAttributes, AgentPolicy } from '../types';

 export interface AgentPoliciesUsage {
  count: number;
  output_types: string[];
 }

-const DEFAULT_AGENT_POLICIES_USAGE = {
-  count: 0,
-  output_types: [],
-};
-
 export const getAgentPoliciesUsage = async (
-  esClient: ElasticsearchClient,
-  abortController: AbortController
+  soClient: SavedObjectsClientContract
 ): Promise<AgentPoliciesUsage> => {
-  try {
-    const res = await esClient.search(
-      {
-        index: AGENT_POLICY_INDEX,
-        size: ES_SEARCH_LIMIT,
-        track_total_hits: true,
-        rest_total_hits_as_int: true,
-      },
-      { signal: abortController.signal }
-    );
+  const { saved_objects: outputs } = await soClient.find<OutputSOAttributes>({
+    type: OUTPUT_SAVED_OBJECT_TYPE,
+    page: 1,
+    perPage: SO_SEARCH_LIMIT,
+  });

-    const agentPolicies = res.hits.hits;
+  const defaultOutputId = outputs.find((output) => output.attributes.is_default)?.id || '';

-    const outputTypes = new Set<string>();
-    agentPolicies.forEach((item) => {
-      const source = (item._source as any) ?? {};
-      Object.keys(source.data.outputs).forEach((output) => {
-        outputTypes.add(source.data.outputs[output].type);
-      });
+  const outputsById = _.keyBy(outputs, 'id');
+
+  const { saved_objects: agentPolicies, total: totalAgentPolicies } =
+    await soClient.find<AgentPolicy>({
+      type: AGENT_POLICY_SAVED_OBJECT_TYPE,
+      page: 1,
+      perPage: SO_SEARCH_LIMIT,
    });

-    return {
-      count: res.hits.total as number,
-      output_types: Array.from(outputTypes),
-    };
-  } catch (error) {
-    if (error.statusCode === 404) {
-      appContextService.getLogger().debug('Index .fleet-policies does not exist yet.');
-    } else {
-      throw error;
-    }
-    return DEFAULT_AGENT_POLICIES_USAGE;
-  }
+  const uniqueOutputIds = new Set<string>();
+  agentPolicies.forEach((agentPolicy) => {
+    uniqueOutputIds.add(agentPolicy.attributes.monitoring_output_id || defaultOutputId);
+    uniqueOutputIds.add(agentPolicy.attributes.data_output_id || defaultOutputId);
+  });
+
+  const uniqueOutputTypes = new Set(
+    Array.from(uniqueOutputIds).map((outputId) => {
+      return outputsById[outputId]?.attributes.type;
+    })
+  );
+
+  return {
+    count: totalAgentPolicies,
+    output_types: Array.from(uniqueOutputTypes),
+  };
 };
--- a/x-pack/plugins/fleet/server/collectors/register.ts
+++ b/x-pack/plugins/fleet/server/collectors/register.ts
@ -62,7 +62,7 @@ export const fetchFleetUsage = async (
    packages: await getPackageUsage(soClient),
    ...(await getAgentData(esClient, abortController)),
    fleet_server_config: await getFleetServerConfig(soClient),
-    agent_policies: await getAgentPoliciesUsage(esClient, abortController),
+    agent_policies: await getAgentPoliciesUsage(soClient),
    ...(await getPanicLogsLastHour(esClient)),
    // TODO removed top errors telemetry as it causes this issue: https://github.com/elastic/kibana/issues/148976
    // ...(await getAgentLogsTopErrors(esClient)),
--- a/x-pack/plugins/fleet/server/integration_tests/fleet_usage_telemetry.test.ts
+++ b/x-pack/plugins/fleet/server/integration_tests/fleet_usage_telemetry.test.ts
@ -265,6 +265,49 @@ describe('fleet usage telemetry', () => {
        },
      ],
    });
+
+    await soClient.create(
+      'ingest-outputs',
+      {
+        name: 'output2',
+        type: 'third_type',
+        hosts: ['http://localhost:9300'],
+        is_default: false,
+        is_default_monitoring: false,
+        config_yaml: '',
+        ca_trusted_fingerprint: '',
+        proxy_id: null,
+      },
+      { id: 'output2' }
+    );
+    await soClient.create(
+      'ingest-outputs',
+      {
+        name: 'output3',
+        type: 'logstash',
+        hosts: ['http://localhost:9400'],
+        is_default: false,
+        is_default_monitoring: false,
+        config_yaml: '',
+        ca_trusted_fingerprint: '',
+        proxy_id: null,
+      },
+      { id: 'output3' }
+    );
+
+    await soClient.create('ingest-agent-policies', {
+      namespace: 'default',
+      monitoring_enabled: ['logs', 'metrics'],
+      name: 'Another policy',
+      description: 'Policy 2',
+      status: 'active',
+      is_managed: false,
+      revision: 2,
+      updated_by: 'system',
+      schema_version: '1.0.0',
+      data_output_id: 'output2',
+      monitoring_output_id: 'output3',
+    });
  });

  afterAll(async () => {
@ -317,7 +360,10 @@ describe('fleet usage telemetry', () => {
            },
          ],
        },
-        agent_policies: { count: 3, output_types: ['elasticsearch'] },
+        agent_policies: {
+          count: 2,
+          output_types: expect.arrayContaining(['elasticsearch', 'logstash', 'third_type']),
+        },
        agent_logs_panics_last_hour: [
          {
            timestamp: expect.any(String),