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.

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

[8.16](backport #5855) [helm]: implement system integration as chart built-in #5886

Merged
merged 3 commits into from
Oct 31, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 30, 2024

What does this PR do?

This PR introduces support for the system integration

Why is it important?

system integration is usually used in the context of k8s, thus having it as a built-in integration improves the user configuration experience

Checklist

  • 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

Disruptive User Impact

How to test this PR locally

mage integration:kubernetesMatrix
```<hr>This is an automatic backport of pull request #5855 done by [Mergify](https://mergify.com).

* feat: implement system integration as chart built-in

* feat: restructure logs streams in system integration to allow passing user-supplied vars

* doc: add an example of system integration

* feat: add missing rendered file for system integration example

(cherry picked from commit e6f281a)

# Conflicts:
#	deploy/helm/elastic-agent/values.yaml
@mergify mergify bot requested a review from a team as a code owner October 30, 2024 13:35
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 30, 2024
@mergify mergify bot requested review from kaanyalti and pchila and removed request for a team October 30, 2024 13:35
Copy link
Contributor Author

mergify bot commented Oct 30, 2024

Cherry-pick of e6f281a has failed:

On branch mergify/bp/8.16/pr-5855
Your branch is up to date with 'origin/8.16'.

You are currently cherry-picking commit e6f281aa4d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   deploy/helm/elastic-agent/README.md
	modified:   deploy/helm/elastic-agent/examples/README.md
	new file:   deploy/helm/elastic-agent/examples/system-custom-auth-paths/README.md
	new file:   deploy/helm/elastic-agent/examples/system-custom-auth-paths/agent-system-values.yaml
	new file:   deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
	modified:   deploy/helm/elastic-agent/templates/NOTES.txt
	modified:   deploy/helm/elastic-agent/templates/agent/_helpers.tpl
	new file:   deploy/helm/elastic-agent/templates/integrations/_system/_system.tpl
	new file:   deploy/helm/elastic-agent/templates/integrations/_system/_system_logs.tpl
	new file:   deploy/helm/elastic-agent/templates/integrations/_system/_system_metrics.tpl
	modified:   deploy/helm/elastic-agent/values.schema.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deploy/helm/elastic-agent/values.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@pierrehilbert
Copy link
Contributor

@pkoutsovasilis should we wait for 8.16.0 to be released or should we merge this one right now?

@pierrehilbert
Copy link
Contributor

@pkoutsovasilis I let you fix the conflict as I want to be sure I won't do something bad :x

@pierrehilbert pierrehilbert requested review from pkoutsovasilis and removed request for kaanyalti and pchila October 30, 2024 13:52
@pkoutsovasilis
Copy link
Contributor

@pkoutsovasilis should we wait for 8.16.0 to be released or should we merge this one right now?

Being completely transparent here, I am not sure 😄 My logic is that this change is not a breaking one, the helm chart is not yet released so I don't see any immediate reason to wait for 8.16.0 release. But please do correct me if I miss anything 🙂

@ycombinator
Copy link
Contributor

Yeah, I'm OK with adding this to 8.16.0. As @pkoutsovasilis said, we are still working out the release plan for the Helm chart and these changes don't add risk to the product (given how late we are in the 8.16.0 feature freeze cycle at this point).

Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@pkoutsovasilis pkoutsovasilis merged commit 525359b into 8.16 Oct 31, 2024
9 checks passed
@pkoutsovasilis pkoutsovasilis deleted the mergify/bp/8.16/pr-5855 branch October 31, 2024 14:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants