[APM] Improvments in the APM fleet integration (#95501)

elastic · Jun 9, 2021 · 03bf7d5 · 03bf7d5
1 parent fa109c6
commit 03bf7d5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 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
@@ -115,6 +115,7 @@ export function getPackagePolicyWithAgentConfigurations(
       {
         ...firstInput,
         config: {
+          ...firstInput.config,
           [APM_SERVER]: {
             value: {
               ...apmServerValue,

diff --git a/x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.ts b/x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.ts
@@ -7,6 +7,7 @@
 
 import type { PackagePolicy, FullAgentPolicyInput, FullAgentPolicyInputStream } from '../types';
 import { DEFAULT_OUTPUT } from '../constants';
+import { merge } from 'lodash';
 
 export const storedPackagePoliciesToAgentInputs = (
   packagePolicies: PackagePolicy[]
@@ -31,10 +32,6 @@ export const storedPackagePoliciesToAgentInputs = (
           namespace: packagePolicy.namespace || 'default',
         },
         use_output: DEFAULT_OUTPUT.name,
-        ...Object.entries(input.config || {}).reduce((acc, [key, { value }]) => {
-          acc[key] = value;
-          return acc;
-        }, {} as { [k: string]: any }),
         ...(input.compiled_input || {}),
         ...(input.streams.length
           ? {
@@ -56,6 +53,14 @@ export const storedPackagePoliciesToAgentInputs = (
           : {}),
       };
 
+      merge(
+        fullInput,
+        Object.entries(input.config || {}).reduce(
+          (acc, [key, { value }]) => ({ ...acc, [key]: value }),
+          {}
+        )
+      );
+
       if (packagePolicy.package) {
         fullInput.meta = {
           package: {