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

Add support for optional metricsets in xpack mode #34273

Merged
merged 7 commits into from Jan 24, 2023

Conversation

joshdover
Copy link
Member

@joshdover joshdover commented Jan 16, 2023

What does this PR do?

This adds support for specifying that a metricset can also be enabled when xpack.enabled: true is set, but is not turned on by default. This allows for finer-grained control of when a metricset is enabled when using xpack mode. For example this will allow support for a configuration like:

- module: elasticsearch
  metricsets:
    - ingest_pipeline # turn on the optional ingest_pipeline metricset
  xpack.enabled: true # turn on all required xpack metricsets

This only affects the beat, elasticsearch, kibana, and logstash modules for Stack Monitoring.

Why is it important?

We are adding a new ingest metricset as "beta" in #34012. We want to be able to enable/disable this on Cloud deployments as we do testing. Since Cloud uses xpack.enabled: true we need a new way to have control over which metricsets are enabled.

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.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • [ ]

How to test this PR locally

Not possible yet since there's no metricsets using this

Related issues

@joshdover joshdover added backport-skip Skip notification from the automated backport with mergify Team:Infra Monitoring UI - DEPRECATED Infrastructure Monitoring UI team - DEPRECATED - Use Team:Monitoring >enhancement labels Jan 16, 2023
@joshdover joshdover requested review from a team as code owners January 16, 2023 12:23
@joshdover joshdover requested review from cmacknz and fearful-symmetry and removed request for a team January 16, 2023 12:23
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jan 16, 2023
@miltonhultgren miltonhultgren requested review from klacabane and removed request for miltonhultgren January 16, 2023 13:28
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jan 16, 2023

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-01-24T14:30:58.139+0000

  • Duration: 63 min 23 sec

Test stats 🧪

Test Results
Failed 0
Passed 4583
Skipped 1025
Total 5608

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@joshdover
Copy link
Member Author

@klacabane friendly bump here if you have some time to review

@ruflin
Copy link
Member

ruflin commented Jan 23, 2023

Thanks for separating out this change. I'm good with moving forward with it. I think eventually we should extend it this logic to make it possible to also disable metricsets that are on by default but we can do this in a follow up.

Copy link
Contributor

@klacabane klacabane left a comment

Choose a reason for hiding this comment

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

LGTM

@joshdover joshdover merged commit 78e3a37 into elastic:main Jan 24, 2023
@joshdover joshdover deleted the xpack-optional branch January 24, 2023 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-skip Skip notification from the automated backport with mergify >enhancement Team:Infra Monitoring UI - DEPRECATED Infrastructure Monitoring UI team - DEPRECATED - Use Team:Monitoring
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants