Skip to content
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

Jump to bottom

[Fleet] fix remote output health reporting if remote es output is default #178857

Merged
merged 8 commits into from
Mar 19, 2024
Merged

[Fleet] fix remote output health reporting if remote es output is default #178857

Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2ffa365
added output id to agent policy sent to fleet-server
juliaElastic Mar 18, 2024
e754127
Merge branch 'main' into fix-default-output-health
juliaElastic Mar 18, 2024
e3aa2c6
Revert "added output id to agent policy sent to fleet-server"
juliaElastic Mar 18, 2024
be523ed
get rid of default output id in full agent policy
juliaElastic Mar 18, 2024
faa276a
Merge branch 'main' into fix-default-output-health
juliaElastic Mar 18, 2024
971828f
fix tests
juliaElastic Mar 18, 2024
c485d5d
Merge branch 'fix-default-output-health' of github.com:juliaElastic/k…
juliaElastic Mar 18, 2024
4e5a333
Merge branch 'main' into fix-default-output-health
juliaElastic Mar 19, 2024
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
6 changes: 0 additions & 6 deletions x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import type {
} from '../../../common/types';
import { agentPolicyService } from '../agent_policy';
import { dataTypes, kafkaCompressionType, outputType } from '../../../common/constants';
import { DEFAULT_OUTPUT } from '../../constants';

import { getPackageInfo } from '../epm/packages';
import { pkgToPkgKey, splitPkgKey } from '../epm/registry';
Expand Down Expand Up @@ -491,13 +490,8 @@ export function transformOutputToFullPolicyOutput(

/**
* Get id used in full agent policy (sent to the agents)
* we use "default" for the default policy to avoid breaking changes
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed this logic, it was added in 8.0: #111002

@nchaulet do you remember what was the potential breaking change referred here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think in 7.x we required to have one default output elastic/fleet-server#713 it's probably not relevant anymore

*/
function getOutputIdForAgentPolicy(output: Output) {
if (output.is_default) {
return DEFAULT_OUTPUT.name;
}

return output.id;
}

Expand Down