Fix agent config indicator when applied through fleet integration

packages/elastic-apm-synthtrace/src/index.ts

@@ -9,6 +9,7 @@
 export { timerange } from './lib/timerange';
 export { apm } from './lib/apm';
 export { stackMonitoring } from './lib/stack_monitoring';
+export { agentConfig } from './lib/agent_config';
 export { cleanWriteTargets } from './lib/utils/clean_write_targets';
 export { createLogger, LogLevel } from './lib/utils/create_logger';
 

packages/elastic-apm-synthtrace/src/lib/agent_config/agent_config.ts

@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { Entity } from '../entity';
+import { AgentConfigFields } from './agent_config_fields';
+import { AgentConfigMetrics } from './agent_config_metrics';
+
+export class AgentConfig extends Entity<AgentConfigFields> {
+  metrics() {
+    return new AgentConfigMetrics({
+      ...this.fields,
+      'processor.event': 'metric',
+      'processor.name': 'metric',
+      'metricset.name': 'agent_config',
+      agent_config_applied: 1,
+    });
+  }
+}
+
+export function agentConfig(etag: string) {
+  return new AgentConfig({
+    'labels.etag': etag,
+  });
+}

packages/elastic-apm-synthtrace/src/lib/agent_config/agent_config_fields.ts

@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { Fields } from '../entity';
+
+export interface Observer {
+  hostname: string;
+  id: string;
+  ephemeral_id: string;
+  type: string;
+  version: string;
+}
+
+export type AgentConfigFields = Fields &
+  Partial<{
+    'processor.event': string;
+    'processor.name': string;
+    'labels.etag': string;
+    'metricset.name': string;
+    observer: Observer;
+    agent_config_applied: number;
+    'ecs.version': string;
+    'event.agent_id_status': string;
+    'event.ingested': string;
+  }>;

packages/elastic-apm-synthtrace/src/lib/agent_config/agent_config_metrics.ts

@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { Serializable } from '../serializable';
+import { AgentConfigFields } from './agent_config_fields';
+
+export class AgentConfigMetrics extends Serializable<AgentConfigFields> {
+  timestamp(timestamp: number): this {
+    super.timestamp(timestamp);
+    this.fields['event.ingested'] = new Date(timestamp).toISOString();
+    return this;
+  }
+}

packages/elastic-apm-synthtrace/src/lib/agent_config/index.ts

@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { agentConfig } from './agent_config';

packages/elastic-apm-synthtrace/src/lib/stream_processor.ts

@@ -211,7 +211,9 @@ export class StreamProcessor<TFields extends Fields = ApmFields> {
     const eventType = d.processor.event as keyof ApmElasticsearchOutputWriteTargets;
     let dataStream = writeTargets[eventType];
     if (eventType === 'metric') {
-      if (!d.service?.name) {
+      if (d.metricset?.name === 'agent_config') {
+        dataStream = 'metrics-apm.internal-default';
+      } else if (!d.service?.name) {
         dataStream = 'metrics-apm.app-default';
       } else {
         if (!d.transaction && !d.span) {

packages/elastic-apm-synthtrace/src/scripts/examples/04_agent_config.ts

@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { agentConfig, timerange } from '../..';
+import { Scenario } from '../scenario';
+import { getLogger } from '../utils/get_common_services';
+import { RunOptions } from '../utils/parse_run_cli_flags';
+import { AgentConfigFields } from '../../lib/agent_config/agent_config_fields';
+
+const scenario: Scenario<AgentConfigFields> = async (runOptions: RunOptions) => {
+  const logger = getLogger(runOptions);
+
+  return {
+    generate: ({ from, to }) => {
+      const agentConfigMetrics = agentConfig('test-etag').metrics();
+
+      const range = timerange(from, to);
+      return range
+        .interval('30s')
+        .rate(1)
+        .generator((timestamp) => {
+          const events = logger.perf('generating_agent_config_events', () => {
+            return agentConfigMetrics.timestamp(timestamp);
+          });
+          return events;
+        });
+    },
+  };
+};
+
+export default scenario;

x-pack/plugins/apm/server/routes/settings/agent_configuration/find_exact_configuration.ts

@@ -13,6 +13,7 @@ import {
 } from '../../../../common/elasticsearch_fieldnames';
 import { Setup } from '../../../lib/helpers/setup_request';
 import { convertConfigSettingsToString } from './convert_settings_to_string';
+import { getConfigsAppliedToAgentsThroughFleet } from './get_config_applied_to_agent_through_fleet';
 
 export async function findExactConfiguration({
   service,
@@ -51,5 +52,15 @@ export async function findExactConfiguration({
     return;
   }
 
-  return convertConfigSettingsToString(hit);
+  const configsAppliedToAgentsThroughFleet =
+    await getConfigsAppliedToAgentsThroughFleet({ setup });
+
+  return {
+    id: hit._id,
+    ...convertConfigSettingsToString(hit)._source,
+    applied_by_agent:
+      hit._source.applied_by_agent ||
+      (hit._source.etag !== undefined &&
+        configsAppliedToAgentsThroughFleet.hasOwnProperty(hit._source.etag)),
+  };
 }

x-pack/plugins/apm/server/routes/settings/agent_configuration/get_config_applied_to_agent_through_fleet.ts

@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { termQuery, rangeQuery } from '@kbn/observability-plugin/server';
+import { keyBy, mapValues } from 'lodash';
+import datemath from '@kbn/datemath';
+import { METRICSET_NAME } from '../../../../common/elasticsearch_fieldnames';
+import { Setup } from '../../../lib/helpers/setup_request';
+
+export async function getConfigsAppliedToAgentsThroughFleet({
+  setup,
+}: {
+  setup: Setup;
+}) {
+  const { internalClient, indices } = setup;
+
+  const params = {
+    index: indices.metric,
+    size: 200,
+    body: {
+      query: {
+        bool: {
+          filter: [
+            ...termQuery(METRICSET_NAME, 'agent_config'),
+            ...rangeQuery(
+              datemath.parse('now-15m')!.valueOf(),
+              datemath.parse('now')!.valueOf()
+            ),
+          ],
+        },
+      },
+      aggs: {
+        config_by_etag: {
+          terms: {
+            field: 'labels.etag',
+          },
+        },
+      },
+    },
+  };
+
+  const response = await internalClient.search(
+    'get_config_applied_to_agent_through_fleet',
+    params
+  );
+
+  return mapValues(
+    keyBy(response.aggregations?.config_by_etag.buckets, 'key'),
+    'key'
+  ) as Record<string, string>;
+}

x-pack/plugins/apm/server/routes/settings/agent_configuration/list_configurations.ts

@@ -8,6 +8,7 @@
 import { Setup } from '../../../lib/helpers/setup_request';
 import { AgentConfiguration } from '../../../../common/agent_configuration/configuration_types';
 import { convertConfigSettingsToString } from './convert_settings_to_string';
+import { getConfigsAppliedToAgentsThroughFleet } from './get_config_applied_to_agent_through_fleet';
 
 export async function listConfigurations({ setup }: { setup: Setup }) {
   const { internalClient, indices } = setup;
@@ -22,7 +23,16 @@ export async function listConfigurations({ setup }: { setup: Setup }) {
     params
   );
 
-  return resp.hits.hits
-    .map(convertConfigSettingsToString)
-    .map((hit) => hit._source);
+  const configsAppliedToAgentsThroughFleet =
+    await getConfigsAppliedToAgentsThroughFleet({ setup });
+
+  return resp.hits.hits.map(convertConfigSettingsToString).map((hit) => {
+    return {
+      ...hit._source,
+      applied_by_agent:
+        hit._source.applied_by_agent ||
+        (hit._source.etag !== undefined &&
+          configsAppliedToAgentsThroughFleet.hasOwnProperty(hit._source.etag)),
+    };
+  });
 }

x-pack/plugins/apm/server/routes/settings/agent_configuration/route.ts

@@ -38,7 +38,9 @@ const agentConfigurationRoute = createApmServerRoute({
     >;
   }> => {
     const setup = await setupRequest(resources);
+
     const configurations = await listConfigurations({ setup });
+
     return { configurations };
   },
 });
@@ -71,7 +73,7 @@ const getSingleAgentConfigurationRoute = createApmServerRoute({
       throw Boom.notFound();
     }
 
-    return config._source;
+    return config;
   },
 });
 
@@ -102,11 +104,11 @@ const deleteAgentConfigurationRoute = createApmServerRoute({
     }
 
     logger.info(
-      `Deleting config ${service.name}/${service.environment} (${config._id})`
+      `Deleting config ${service.name}/${service.environment} (${config.id})`
     );
 
     const deleteConfigurationResult = await deleteConfiguration({
-      configurationId: config._id,
+      configurationId: config.id,
       setup,
     });
 
@@ -162,7 +164,7 @@ const createOrUpdateAgentConfigurationRoute = createApmServerRoute({
     );
 
     await createOrUpdateConfiguration({
-      configurationId: config?._id,
+      configurationId: config?.id,
       configurationIntake: body,
       setup,
     });

x-pack/test/apm_api_integration/tests/settings/agent_configuration/add_agent_config_metrics.ts

@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { timerange, agentConfig } from '@elastic/apm-synthtrace';
+import type { ApmSynthtraceEsClient } from '@elastic/apm-synthtrace';
+
+export async function addAgentConfigMetrics({
+  synthtraceEsClient,
+  start,
+  end,
+  etag,
+}: {
+  synthtraceEsClient: ApmSynthtraceEsClient;
+  start: number;
+  end: number;
+  etag?: string;
+}) {
+  const agentConfigMetrics = agentConfig(etag ?? 'test-etag').metrics();
+
+  const agentConfigEvents = [
+    timerange(start, end)
+      .interval('1m')
+      .rate(1)
+      .generator((timestamp) => agentConfigMetrics.timestamp(timestamp)),
+  ];
+
+  await synthtraceEsClient.index(agentConfigEvents);
+}