[8.6] [Fleet] publish agents_per_version telemetry as separate docs (#147615) (#147622)

# Backport This will backport the following commits from `main` to `8.6`: - [[Fleet] publish `agents_per_version` telemetry as separate docs (#147615)](https://github.com/elastic/kibana/pull/147615)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Julia Bardi <90178898+juliaElastic@users.noreply.github.com>
2025-04-23 09:19:04 -04:00 · 2022-12-15 12:04:47 -05:00 · 2022-12-15 12:04:47 -05:00 · 65a1706be4
commit 65a1706be4
parent 2f08d7ddaa
3 changed files with 61 additions and 18 deletions
--- a/x-pack/plugins/fleet/server/collectors/register.ts
+++ b/x-pack/plugins/fleet/server/collectors/register.ts
@ -28,6 +28,22 @@ export interface Usage {
  fleet_server: FleetServerUsage;
 }

+export interface FleetUsage extends Usage {
+  fleet_server_config: { policies: Array<{ input_config: any }> };
+  agent_policies: { count: number; output_types: string[] };
+  agents_per_version: Array<{
+    version: string;
+    count: number;
+  }>;
+  agent_checkin_status: {
+    error: number;
+    degraded: number;
+  };
+  agents_per_policy: number[];
+  agent_logs_top_errors: string[];
+  fleet_server_logs_top_errors: string[];
+}
+
 export const fetchFleetUsage = async (
  core: CoreSetup,
  config: FleetConfigType,
--- a/x-pack/plugins/fleet/server/services/telemetry/fleet_usage_sender.ts
+++ b/x-pack/plugins/fleet/server/services/telemetry/fleet_usage_sender.ts
@ -13,17 +13,18 @@ import { throwUnrecoverableError } from '@kbn/task-manager-plugin/server';
 import type { CoreSetup } from '@kbn/core/server';
 import { withSpan } from '@kbn/apm-utils';

-import type { Usage } from '../../collectors/register';
+import type { FleetUsage } from '../../collectors/register';

 import { appContextService } from '../app_context';

-import { fleetUsagesSchema } from './fleet_usages_schema';
+import { fleetAgentsSchema, fleetUsagesSchema } from './fleet_usages_schema';

-const EVENT_TYPE = 'fleet_usage';
+const FLEET_USAGES_EVENT_TYPE = 'fleet_usage';
+const FLEET_AGENTS_EVENT_TYPE = 'fleet_agents';

 export class FleetUsageSender {
  private taskManager?: TaskManagerStartContract;
-  private taskVersion = '1.0.0';
+  private taskVersion = '1.1.0';
  private taskType = 'Fleet-Usage-Sender';
  private wasStarted: boolean = false;
  private interval = '1h';
@ -33,7 +34,7 @@ export class FleetUsageSender {
  constructor(
    taskManager: TaskManagerSetupContract,
    core: CoreSetup,
-    fetchUsage: (abortController: AbortController) => Promise<Usage | undefined>
+    fetchUsage: (abortController: AbortController) => Promise<FleetUsage | undefined>
  ) {
    taskManager.registerTaskDefinitions({
      [this.taskType]: {
@ -61,7 +62,7 @@ export class FleetUsageSender {
  private runTask = async (
    taskInstance: ConcreteTaskInstance,
    core: CoreSetup,
-    fetchUsage: () => Promise<Usage | undefined>
+    fetchUsage: () => Promise<FleetUsage | undefined>
  ) => {
    if (!this.wasStarted) {
      appContextService.getLogger().debug('[runTask()] Aborted. Task not started yet');
@ -79,8 +80,19 @@ export class FleetUsageSender {
      if (!usageData) {
        return;
      }
-      appContextService.getLogger().debug(JSON.stringify(usageData));
-      core.analytics.reportEvent(EVENT_TYPE, usageData);
+      const { agents_per_version: agentsPerVersion, ...fleetUsageData } = usageData;
+      appContextService
+        .getLogger()
+        .debug('Fleet usage telemetry: ' + JSON.stringify(fleetUsageData));
+
+      core.analytics.reportEvent(FLEET_USAGES_EVENT_TYPE, fleetUsageData);
+
+      appContextService
+        .getLogger()
+        .debug('Agents per version telemetry: ' + JSON.stringify(agentsPerVersion));
+      agentsPerVersion.forEach((byVersion) => {
+        core.analytics.reportEvent(FLEET_AGENTS_EVENT_TYPE, { agents_per_version: byVersion });
+      });
    } catch (error) {
      appContextService
        .getLogger()
@ -125,8 +137,13 @@ export class FleetUsageSender {
   */
  private registerTelemetryEventType(core: CoreSetup): void {
    core.analytics.registerEventType({
-      eventType: EVENT_TYPE,
+      eventType: FLEET_USAGES_EVENT_TYPE,
      schema: fleetUsagesSchema,
    });
+
+    core.analytics.registerEventType({
+      eventType: FLEET_AGENTS_EVENT_TYPE,
+      schema: fleetAgentsSchema,
+    });
  }
 }
--- a/x-pack/plugins/fleet/server/services/telemetry/fleet_usages_schema.ts
+++ b/x-pack/plugins/fleet/server/services/telemetry/fleet_usages_schema.ts
@ -7,6 +7,25 @@

 import type { RootSchema } from '@kbn/analytics-client';

+export const fleetAgentsSchema: RootSchema<any> = {
+  agents_per_version: {
+    properties: {
+      version: {
+        type: 'keyword',
+        _meta: {
+          description: 'Agent version enrolled to this kibana',
+        },
+      },
+      count: {
+        type: 'long',
+        _meta: {
+          description: 'Number of agents enrolled that use this version',
+        },
+      },
+    },
+  },
+};
+
 export const fleetUsagesSchema: RootSchema<any> = {
  agents_enabled: { type: 'boolean', _meta: { description: 'agents enabled' } },
  agents: {
@ -106,15 +125,6 @@ export const fleetUsagesSchema: RootSchema<any> = {
      },
    },
  },
-  agents_per_version: {
-    type: 'array',
-    items: {
-      properties: {
-        version: { type: 'keyword' },
-        count: { type: 'long' },
-      },
-    },
-  },
  agents_per_policy: {
    type: 'array',
    items: {