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.14](backport #4961) Introduce agent.monitoring.metrics_period #5003

Merged
merged 2 commits into from
Jun 26, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 25, 2024

What does this PR do?

This PR introduces agent.monitoring.metrics_period field

Why is it important?

I consider this PR important as it allows each user to control the sampling period of monitoring metrics according to them needs

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

None

How to test this PR locally

Spawn an agent with setting the config agent.monitoring.metrics_period

Related issues


This is an automatic backport of pull request #4961 done by [Mergify](https://mergify.com).

* feat: introduce agent.monitoring.metrics_period

* doc: add changelog/fragments

* fix: TestDiagnosticLocalConfig unit-test

* doc: reword summary in changelog fragment

(cherry picked from commit 6a45256)

# Conflicts:
#	_meta/config/common.p2.yml.tmpl
#	_meta/config/common.reference.p2.yml.tmpl
#	_meta/config/elastic-agent.docker.yml.tmpl
#	elastic-agent.docker.yml
#	elastic-agent.reference.yml
#	elastic-agent.yml
#	internal/pkg/agent/application/monitoring/v1_monitor.go
#	internal/pkg/agent/application/monitoring/v1_monitor_test.go
@mergify mergify bot requested a review from a team as a code owner June 25, 2024 13:50
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 25, 2024
@mergify mergify bot requested review from AndersonQ and pchila and removed request for a team June 25, 2024 13:50
Copy link
Contributor Author

mergify bot commented Jun 25, 2024

Cherry-pick of 6a45256 has failed:

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

You are currently cherry-picking commit 6a452564dd.
  (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:
	new file:   changelog/fragments/1718818524-support-monitoring-metrics-interval.yaml
	modified:   internal/pkg/agent/application/coordinator/diagnostics_test.go
	modified:   internal/pkg/core/monitoring/config/config.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   _meta/config/common.p2.yml.tmpl
	both modified:   _meta/config/common.reference.p2.yml.tmpl
	both modified:   _meta/config/elastic-agent.docker.yml.tmpl
	both modified:   elastic-agent.docker.yml
	both modified:   elastic-agent.reference.yml
	both modified:   elastic-agent.yml
	both modified:   internal/pkg/agent/application/monitoring/v1_monitor.go
	both modified:   internal/pkg/agent/application/monitoring/v1_monitor_test.go

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

It looks like some changes are depending on #4586
@cmacknz Do we really want to continue to backport this taking this new information into account?

@pierrehilbert
Copy link
Contributor

Looks like we can ignore my message and that @pkoutsovasilis did the necessary adjustments.

@cmacknz cmacknz merged commit fce8a9c into 8.14 Jun 26, 2024
13 checks passed
@cmacknz cmacknz deleted the mergify/bp/8.14/pr-4961 branch June 26, 2024 13:19
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