Skip to content

Conversation

@blakerouse
Copy link
Contributor

What does this PR do?

Adds the ability for the local output configuration to add extra options to policy configuration.

Why is it important?

This allows some local private settings to be provided by the local configuration and not be viewable in the policy in Fleet.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • [ ] I have added an entry in ./changelog/fragments using the changelog tool
  • [ ] I have added an integration test or an E2E test (covered by unit tests)

Disruptive User Impact

None

How to test this PR locally

  1. Enroll the Elastic Agent into Fleet
  2. Adjust the elastic-agent.yml to have an outputs with a matching output name and setting.
  3. Observe that the setting is applied on that Elastic Agent for that output with the exact same name.

@blakerouse blakerouse self-assigned this Jul 1, 2025
@blakerouse blakerouse requested a review from a team as a code owner July 1, 2025 16:13
@blakerouse blakerouse added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog backport-9.1 Automated backport to the 9.1 branch labels Jul 1, 2025
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@blakerouse
Copy link
Contributor Author

@pkoutsovasilis Thanks for the review. I have updated the code with your suggestions and responded inline.

@pkoutsovasilis
Copy link
Contributor

@pkoutsovasilis Thanks for the review. I have updated the code with your suggestions and responded inline.

Thank you for addressing my comments @blakerouse and for filing an issue on ucfg. Should we deal with the linter errors, I think they are valid, wdyt? 🙂

Copy link
Contributor

@pkoutsovasilis pkoutsovasilis left a comment

Choose a reason for hiding this comment

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

code changes LGTM, waiting for the CI to become green 🙂

@blakerouse
Copy link
Contributor Author

@pkoutsovasilis thanks!

@elastic-sonarqube
Copy link

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

History

cc @blakerouse

@blakerouse blakerouse merged commit bed4eff into elastic:main Jul 2, 2025
19 checks passed
mergify bot pushed a commit that referenced this pull request Jul 2, 2025
…tion (#8766)

* Add ability for local output configuration to override policy configuration.

* Fix import.

* Add extra test for variables.

* Improvements from code review.

* Disable errorlint on isMissingError.

(cherry picked from commit bed4eff)
blakerouse added a commit that referenced this pull request Jul 2, 2025
…tion (#8766) (#8807)

* Add ability for local output configuration to override policy configuration.

* Fix import.

* Add extra test for variables.

* Improvements from code review.

* Disable errorlint on isMissingError.

(cherry picked from commit bed4eff)

Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
v1v added a commit to v1v/elastic-agent that referenced this pull request Jul 6, 2025
…ng-oblt-cli

* upstream: (37 commits)
  [AutoOps] Add `autoops-es.yml` to Packages (elastic#8728)
  EDOT collector: include the forward connector. (elastic#8753)
  Revert "ci: pin elastic-agent version (elastic#8736)" (elastic#8754)
  bk: retry Start ESS stack for integration tests (elastic#8553)
  Re-enable TestStandaloneUpgradeRollbackOnRestarts on windows (elastic#8718)
  removed reviewers from dependabot.yml (elastic#8709)
  Pass `--header` enrollment option to fleet-server (elastic#8071)
  Add ability for local output configuration to add to policy configuration (elastic#8766)
  Bump up github.com/go-viper/mapstructure/v2 dependency (elastic#8764)
  [Synthetics] Upgrade node to latest lts v20 (elastic#8712)
  [CI] BK Vault plugin for EC access (elastic#8377)
  feat: singleTest mage target for each integration test package (elastic#8691)
  ci: always include 8.19 LTS release branch in snapshots of test versions (elastic#8761)
  build(deps): bump github.com/elastic/mito from 1.19.0 to 1.20.0 (elastic#8755)
  chore: fix elastic-agent helm chart examples (elastic#8765)
  feat: support onboarding-id for kubernetes (elastic#8692)
  [main][Automation] Bump VM Image version to 1751072471 (elastic#8734)
  ci: revert deployment_csp_configuration.yaml to create_deployment_csp_configuration.yaml (elastic#8746)
  kustomize: pin kube-state-metrics version (elastic#8739)
  ci: pin elastic-agent version (elastic#8736)
  ...
v1v added a commit that referenced this pull request Jul 6, 2025
* upstream: (39 commits)
  Fix otel extension status reporting (#8696)
  Refactor user change on service (#8347)
  [AutoOps] Add `autoops-es.yml` to Packages (#8728)
  EDOT collector: include the forward connector. (#8753)
  Revert "ci: pin elastic-agent version (#8736)" (#8754)
  bk: retry Start ESS stack for integration tests (#8553)
  Re-enable TestStandaloneUpgradeRollbackOnRestarts on windows (#8718)
  removed reviewers from dependabot.yml (#8709)
  Pass `--header` enrollment option to fleet-server (#8071)
  Add ability for local output configuration to add to policy configuration (#8766)
  Bump up github.com/go-viper/mapstructure/v2 dependency (#8764)
  [Synthetics] Upgrade node to latest lts v20 (#8712)
  [CI] BK Vault plugin for EC access (#8377)
  feat: singleTest mage target for each integration test package (#8691)
  ci: always include 8.19 LTS release branch in snapshots of test versions (#8761)
  build(deps): bump github.com/elastic/mito from 1.19.0 to 1.20.0 (#8755)
  chore: fix elastic-agent helm chart examples (#8765)
  feat: support onboarding-id for kubernetes (#8692)
  [main][Automation] Bump VM Image version to 1751072471 (#8734)
  ci: revert deployment_csp_configuration.yaml to create_deployment_csp_configuration.yaml (#8746)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-9.1 Automated backport to the 9.1 branch skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants