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

Check validity of beat module configuration when xpack.enabled is set to true #12645

Merged
merged 42 commits into from
Jun 25, 2019
Merged

Check validity of beat module configuration when xpack.enabled is set to true #12645

merged 42 commits into from
Jun 25, 2019

Conversation

ycombinator
Copy link
Contributor

@ycombinator ycombinator commented Jun 23, 2019 •
edited
Loading

Similar to #12386 but for the beat module.

When the beat metricbeat module is enabled and the xpack.enabled flag in the module configuration is set to true, an exact set of metricsets is required to be configured for Stack Monitoring to work correctly. This PR implements the necessary validation.

@ycombinator ycombinator added needs_backport PR is waiting to be backported to other branches. v8.0.0 v7.3.0 labels Jun 23, 2019
@ycombinator ycombinator mentioned this pull request Jun 23, 2019
Closed
ycombinator and others added 26 commits June 25, 2019 08:00
@ycombinator
Renaming anchor for beats common fields
3eaa6c7
@ycombinator
Removing extraneous file accidentally checked in
403ef6e
@ycombinator
Adding beats module with stats metricset
65a6bfb
@ycombinator
Rename argument for clarity
933773f
@ycombinator
Adding tests
17a38d5
@ycombinator
Adding tests + sample data
1d6b8c8
@ycombinator
Removing debugging statements
76155ea
@ycombinator
Regenerating data.json file
0ff7c7f
@ycombinator
Trying a different host name
3ed78a2
@ycombinator
Stubbing out xpack code path
f6e8280
@ycombinator
Fixing service name in system test
7138bec
@ycombinator
Fleshing out TODOs
0517486
@ycombinator
Fixing index name
243a090
@ycombinator
Renaming module name from beats to beat
b7419e8
@ycombinator
Regenerating data.json file
e794c13
@ycombinator @ruflin
Update metricbeat/module/beat/_meta/config.reference.yml
48f0cdd 
Co-Authored-By: Nicolas Ruflin <spam@ruflin.com>
@ycombinator @ruflin
Update metricbeat/module/beat/_meta/config-xpack.yml
8172b93 
Co-Authored-By: Nicolas Ruflin <spam@ruflin.com>
@ycombinator @ruflin
Update metricbeat/module/beat/_meta/config.yml
7db4f95 
Co-Authored-By: Nicolas Ruflin <spam@ruflin.com>
@ycombinator
Update metricbeat/modules.d/beat-xpack.yml.disabled
f14d35b
@ycombinator
Update metricbeat/modules.d/beat.yml.disabled
7d168d3
@ycombinator
Renaming system test
2624c8a
@ycombinator
Trying to use the new testdata framework
8d0faa1
@ycombinator
Renaming service to avoid naming collision
bf4fb6b
@ycombinator
Adding back data_test.go
b7984f1
@ycombinator
Fixing HTTP server hostname
d1f13d4
@ycombinator
Trying localhost
3ce22c1
ycombinator added 15 commits June 25, 2019 08:00
@ycombinator
Fixing inconsistencies
0ba38d9
@ycombinator
Fixing typo
83b0165
@ycombinator
Make runtime optional as it is absent in older versions of Beats
7467c2e
@ycombinator
Adding beats module with stats metricset
c8ca220
@ycombinator
Renaming module name from beats to beat
8b0d0c3
@ycombinator
Adding beat/state metricset
c8fce58
@ycombinator
Rebase misses
217a83e
@ycombinator
Regenerating docs
a6f7d56
@ycombinator
Regenerating docs
1604c8a
@ycombinator
Undoing accidental change during rebase
b613073
@ycombinator
Removing files since new testdata framework cannot be used yet
a02df5b
@ycombinator
Regenerating generated files
1bfc08e
@ycombinator
Fixing datatype (again!)
f4f0dd5
@ycombinator
Check validity of beat module configuration when xpack.enabled is set…
9f0ad20 
… to true

When the `beat` metricbeat module is enabled and the `xpack.enabled` flag in the module configuration is set to `true`, an exact set of metricsets is required to be configured for Stack Monitoring to work correctly. This PR implements the necessary validation.
@ycombinator
Regenerating generated files
d1babc3
@ycombinator ycombinator requested review from cachedout and ruflin June 25, 2019 12:06
@elasticmachine
Copy link
Collaborator

Pinging @elastic/stack-monitoring

@ycombinator ycombinator marked this pull request as ready for review June 25, 2019 12:06
@ycombinator ycombinator requested a review from a team as a code owner June 25, 2019 12:06
ruflin
ruflin approved these changes Jun 25, 2019
View reviewed changes
Copy link
Collaborator

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

LGTM. I assume it does not need a changelog as we didn't ship this yet.

metricbeat/module/beat/beat.go Outdated
"github.com/pkg/errors"

"github.com/elastic/beats/libbeat/common"

Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: newline

cachedout
cachedout approved these changes Jun 25, 2019
View reviewed changes
Copy link
Contributor

@cachedout cachedout left a comment

Choose a reason for hiding this comment

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

LGTM

@ycombinator ycombinator merged commit a33a8e1 into elastic:master Jun 25, 2019
@ycombinator ycombinator deleted the mb-beat-xpack-validation branch June 25, 2019 15:38
@ycombinator ycombinator removed the needs_backport PR is waiting to be backported to other branches. label Jan 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cachedout cachedout cachedout approved these changes

@ruflin ruflin ruflin approved these changes

Assignees
No one assigned
Labels
Feature:Stack Monitoring Metricbeat Metricbeat module review v7.3.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ycombinator @elasticmachine @cachedout @ruflin