Fix Prometheus Metrics Filtering #1012
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
Previously, the Prometheus collector ignored the `MetricsConfig` field of the custom metrics specification, simply storing all exposed metrics. Now, if the `MetricsConfig` field contains any metric names, only those metrics will be stored and exposed. Fixes google#1005
The documentation for custom metrics contained an error in the Prometheus metrics example JSON, and was also somewhat unclear as to how the labels worked.
|
Can one of the admins verify this patch? |
|
@DirectXMan12 @rjnagal @vishh @jimmidyson |
|
Thanks @DirectXMan12 this has been sitting in my queue for a while LGTM |
| @@ -88,6 +87,9 @@ Dockerfile (or runtime): | |||
|
|
|||
| cAdvisor will then reach into the container image at runtime, process the config, and start collecting and exposing application metrics. | |||
|
|
|||
| Note that cAdvisor specifically looks at the container labels to extract this information. In Docker 1.8, containers don't inherit labels | |||
| from their images, and thus you must specify the label at runtime. | |||
|
@jimmidyson Can you please merge it? |
|
ok to test |
|
Jenkins PR status link is wrong, normal test flake when checking correct build. Merging. Thanks @DirectXMan12 |
jimmidyson
added a commit
that referenced
this pull request
Dec 10, 2015
…-filtering Fix Prometheus Metrics Filtering
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.
Previously, the Prometheus collector ignored the list of metrics specified in the custom metrics config, and just collected and stored all metrics. This makes the Prometheus collector skip metrics that aren't listed.
Also included is a tweak to the custom metrics documentation.
Fixes #1005