nest agent_config within apm-server in the package policy input

elastic · Jun 2, 2021 · 6129f4f · 6129f4f
1 parent a25497e
commit 6129f4f
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/x-pack/plugins/apm/server/lib/fleet/register_fleet_policy_callbacks.ts b/x-pack/plugins/apm/server/lib/fleet/register_fleet_policy_callbacks.ts
@@ -100,25 +100,31 @@ function registerAgentConfigExternalCallback({
   fleetPluginStart.registerExternalCallback(callbackName, callbackFn);
 }
 
+const APM_SERVER = 'apm-server';
+
 // Immutable function applies the given package policy with a set of agent configurations
 export function getPackagePolicyWithAgentConfigurations(
   packagePolicy: PackagePolicy,
   agentConfigurations: AgentConfiguration[]
 ) {
   const [firstInput, ...restInputs] = packagePolicy.inputs;
+  const apmServer = firstInput?.config?.[APM_SERVER];
   return {
     ...packagePolicy,
     inputs: [
       {
         ...firstInput,
         config: {
-          agent_config: {
-            value: agentConfigurations.map((configuration) => ({
-              service: configuration.service,
-              config: configuration.settings,
-              etag: configuration.etag,
-              [AGENT_NAME]: configuration.agent_name,
-            })),
+          [APM_SERVER]: {
+            ...apmServer,
+            agent_config: {
+              value: agentConfigurations.map((configuration) => ({
+                service: configuration.service,
+                config: configuration.settings,
+                etag: configuration.etag,
+                [AGENT_NAME]: configuration.agent_name,
+              })),
+            },
           },
         },
       },