Allow users to set just monitoring.cluster_uuid #14338
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ycombinator
added
bug
review
libbeat
Feature:Stack Monitoring
v8.0.0
v7.6.0
v7.5.1
labels
|
Pinging @elastic/stack-monitoring (Stack monitoring) |
houndci-bot
reviewed
Oct 30, 2019
libbeat/monitoring/monitoring.go
Outdated
| default: | ||
| return nil, nil, nil | ||
| } | ||
| } | ||
|
|
||
| func GetMonitoringClusterUUID(monitoringCfg *common.Config) (string, error) { |
There was a problem hiding this comment.
exported function GetMonitoringClusterUUID should have comment or be unexported
ycombinator
changed the title
ycombinator
force-pushed
the
lb-bugfix-mon-cluster-uuid
branch
from
7522cb7
to
88afc59
Compare
ycombinator
force-pushed
the
lb-bugfix-mon-cluster-uuid
branch
3 times, most recently
from
0c97867
to
baa4771
Compare
cachedout
approved these changes
Nov 13, 2019
ycombinator
force-pushed
the
lb-bugfix-mon-cluster-uuid
branch
from
baa4771
to
d826553
Compare
|
@ycombinator Was this a bad rebase? It looks like this suddenly has many unrelated changes. |
|
@cachedout Thanks, indeed, I did a bad rebase 🤦♂. Fixing now... |
ycombinator
force-pushed
the
lb-bugfix-mon-cluster-uuid
branch
from
9b5bfd6
to
81d21cd
Compare
|
Bad rebase is fixed. |
|
Travis CI is green and Jenkins CI failures are unrelated. Merging. |
ycombinator
added a commit
to ycombinator/beats
that referenced
this pull request
Nov 20, 2019
* Allow users to just set monitoring.cluster_uuid * Adding back comment lost in refactoring * Adds godoc comments for functions * Removes stutter in function name * Adding system test * Adding CHANGELOG entry * Fixing formatting * Move defer to right scope * Adding system test * Fixing formatting
ycombinator
added a commit
to ycombinator/beats
that referenced
this pull request
Nov 20, 2019
* Allow users to just set monitoring.cluster_uuid * Adding back comment lost in refactoring * Adds godoc comments for functions * Removes stutter in function name * Adding system test * Adding CHANGELOG entry * Fixing formatting * Move defer to right scope * Adding system test * Fixing formatting
ycombinator
added a commit
that referenced
this pull request
Nov 20, 2019
* Allow users to set just monitoring.cluster_uuid (#14338) * Allow users to just set monitoring.cluster_uuid * Adding back comment lost in refactoring * Adds godoc comments for functions * Removes stutter in function name * Adding system test * Adding CHANGELOG entry * Fixing formatting * Move defer to right scope * Adding system test * Fixing formatting * Fixing up CHANGELOG
ycombinator
added a commit
that referenced
this pull request
Nov 21, 2019
* Allow users to just set monitoring.cluster_uuid * Adding back comment lost in refactoring * Adds godoc comments for functions * Removes stutter in function name * Adding system test * Adding CHANGELOG entry * Fixing formatting * Move defer to right scope * Adding system test * Fixing formatting
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
…elastic#14633) * Allow users to set just monitoring.cluster_uuid (elastic#14338) * Allow users to just set monitoring.cluster_uuid * Adding back comment lost in refactoring * Adds godoc comments for functions * Removes stutter in function name * Adding system test * Adding CHANGELOG entry * Fixing formatting * Move defer to right scope * Adding system test * Fixing formatting * Fixing up CHANGELOG
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently there is a bug in libbeat which allows users to set
monitoring.cluster_uuidonly if there is also a monitoring reporter configured (either viaoutput.elasticsearch.*settings ormonitoring.elasticsearch.*settings). If there are no monitoring reporter settings (butmonitoring.cluster_uuidis set), the value ofmonitoring.cluster_uuidis not exposed via theGET stateAPI. This further does not allow themonitoring.cluster_uuidMetricbeat'sbeatmodule to monitor a beat that has specified themonitoring.cluster_uuidsetting in it's configuration. Ultimately this results in the monitored beat being shown under a "Standalone Cluster" in the Stack Monitoring UI.Therefore, we should allow users to configure the
monitoring.cluster_uuidsetting even when no other settings under themonitoringnamespace are configured.This PR fixes this bug by:
monitoring.cluster_uuidsetting before the reporter configuration is done;GET stateAPI to use, so Metricbeat'sbeatmodule may be able to fetch it; andmonitoringiscluster_uuid, as we expect the other settings to be related to the reporter (monitoring.elasticsearch.*).This PR also does a bit of cleanup by extracting the monitoring setup code out of
(*Beat).launchand into its own method.Testing this PR
elasticsearchoutput in your Beat and enable some other output.http.enabled=trueandmonitoring.cluster_uuid=<some value>.monitoring.cluster_uuidvalue is reported.