Fix agent config indicator when applied through fleet integration

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

@@ -0,0 +1,52 @@
+/*
+ * 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 } from 'lodash';
+import datemath from '@kbn/datemath';
+import { METRICSET_NAME } from '../../../../common/elasticsearch_fieldnames';
+import { Setup } from '../../../lib/helpers/setup_request';
+
+export async function getConfigAppliedToAgentsThroughFleet({
+  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 keyBy(response.aggregations?.config_by_etag.buckets, 'key');
+}

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

@@ -25,6 +25,7 @@ import {
 } from '../../../../common/agent_configuration/runtime_types/agent_configuration_intake_rt';
 import { getSearchAggregatedTransactions } from '../../../lib/helpers/transactions';
 import { syncAgentConfigsToApmPackagePolicies } from '../../fleet/sync_agent_configs_to_apm_package_policies';
+import { getConfigAppliedToAgentsThroughFleet } from './get_config_applied_to_agent_through_fleet';
 
 // get list of configurations
 const agentConfigurationRoute = createApmServerRoute({
@@ -38,7 +39,26 @@ const agentConfigurationRoute = createApmServerRoute({
     >;
   }> => {
     const setup = await setupRequest(resources);
-    const configurations = await listConfigurations({ setup });
+
+    const [agentConfigAppliedByEtag, configList] = await Promise.all([
+      getConfigAppliedToAgentsThroughFleet({ setup }),
+      listConfigurations({ setup }),
+    ]);
+
+    const configurations = configList.map(
+      (
+        agentConfig
+      ): import('./../../../../common/agent_configuration/configuration_types').AgentConfiguration => {
+        return {
+          ...agentConfig,
+          applied_by_agent:
+            agentConfig.applied_by_agent ||
+            (agentConfig.etag !== undefined &&
+              agentConfigAppliedByEtag.hasOwnProperty(agentConfig.etag)),
+        };
+      }
+    );
+
     return { configurations };
   },
 });