Add metrics labels to all metrics #270
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
patched off of v0.3.1
rboyer
reviewed
Aug 2, 2022
config.go
Outdated
| // CIDRsAllowed If nil, allow any connection (default), otherwise specify all networks | ||
| // allowed to connect (you must specify IPv6/IPv4 separately) | ||
| // Using [] will block all connections. | ||
| CIDRsAllowed []net.IPNet | ||
|
|
||
| // MetricLabels is a map of optional labels to apply to all metrics emitted. | ||
| MetricLabels map[string]string |
There was a problem hiding this comment.
Would it make sense to match the serf config and have this be a slice of metric labels?
There was a problem hiding this comment.
Either way looks good to me. If we switch to MetricLabels []metrics.Label, we can get rid of mapToLabels and pass []metrics.Label all the way from consul to memberlist, right?
rboyer
reviewed
Aug 8, 2022
memberlist.go
Outdated
| @@ -198,6 +203,8 @@ func newMemberlist(conf *Config) (*Memberlist, error) { | |||
| } | |||
| } | |||
|
|
|||
| metricLabels := conf.MetricLabels | |||
There was a problem hiding this comment.
nit: why make a local variable for two uses below?
There was a problem hiding this comment.
oops, I forgot to delete the variables after change the type; we used to have metricLabels := mapToLabels(conf.MetricLabels)
Fixed now.
rboyer
approved these changes
Aug 8, 2022
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.
Cherry pick from the metrics-label-backport branch