Skip to content

[7.x] [APM] Fleet support for merging input.config values with other nested properties in the policy input (#101690) #101955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kibanamachine merged 2 commits into from
Jun 10, 2021
Merged

[7.x] [APM] Fleet support for merging input.config values with other nested properties in the policy input (#101690) #101955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9883d40
[APM] Fleet support for merging input.config values with other nested…
ogupte Jun 10, 2021
1e9e772
Merge branch '7.x' into backport/7.x/pr-101690
kibanamachine Jun 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions x-pack/plugins/apm/server/lib/fleet/register_fleet_policy_callbacks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ export function getPackagePolicyWithAgentConfigurations(
{
...firstInput,
config: {
...firstInput.config,
[APM_SERVER]: {
value: {
...apmServerValue,
Expand Down
77 changes: 77 additions & 0 deletions x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,4 +218,81 @@ describe('Fleet - storedPackagePoliciesToAgentInputs', () => {
},
]);
});

it('returns agent inputs with deeply merged config values', () => {
expect(
storedPackagePoliciesToAgentInputs([
{
...mockPackagePolicy,
inputs: [
{
...mockInput,
compiled_input: {
agent_input_template_group1_vars: {
inputVar: 'input-value',
},
agent_input_template_group2_vars: {
inputVar3: {
testFieldGroup: {
subField1: 'subfield1',
},
testField: 'test',
},
},
},
config: {
agent_input_template_group1_vars: {
value: {
inputVar2: {},
},
},
agent_input_template_group2_vars: {
value: {
inputVar3: {
testFieldGroup: {
subField2: 'subfield2',
},
},
inputVar4: '',
},
},
},
},
],
},
])
).toEqual([
{
id: 'some-uuid',
revision: 1,
name: 'mock-package-policy',
type: 'test-logs',
data_stream: { namespace: 'default' },
use_output: 'default',
agent_input_template_group1_vars: {
inputVar: 'input-value',
inputVar2: {},
},
agent_input_template_group2_vars: {
inputVar3: {
testField: 'test',
testFieldGroup: {
subField1: 'subfield1',
subField2: 'subfield2',
},
},
inputVar4: '',
},
streams: [
{
id: 'test-logs-foo',
data_stream: { dataset: 'foo', type: 'logs' },
fooKey: 'fooValue1',
fooKey2: ['fooValue2'],
},
{ id: 'test-logs-bar', data_stream: { dataset: 'bar', type: 'logs' } },
],
},
]);
});
});
15 changes: 11 additions & 4 deletions x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
* 2.0.
*/

import { merge } from 'lodash';

import type { PackagePolicy, FullAgentPolicyInput, FullAgentPolicyInputStream } from '../types';
import { DEFAULT_OUTPUT } from '../constants';

Expand All @@ -31,10 +33,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
? {
Expand All @@ -56,6 +54,15 @@ export const storedPackagePoliciesToAgentInputs = (
: {}),
};

// deeply merge the input.config values with the full policy input
merge(
fullInput,
Object.entries(input.config || {}).reduce(
(acc, [key, { value }]) => ({ ...acc, [key]: value }),
{}
)
);

if (packagePolicy.package) {
fullInput.meta = {
package: {
Expand Down