[docker] fix config bools, skip image stats option #1345
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
Fixes #1342. We should always cast boolean options from the config with the `_is_affirmative` tool, otherwise you're exposed to oddities like bool('false') == True. This introduces a new option `collect_images_stats` that is enabled by default and skips the collection of metrics `docker.images.available` and `docker.images.intermediate` that sometimes is very slow through docker API if you have a lot of intermediate layer images.
|
@remh classifying it as a bugfix still, because of the potential bad boolean flag parsing, so this could still make it for 5.2. |
| @@ -43,11 +43,12 @@ instances: | |||
| # - ".*" | |||
| # | |||
| # include all, except ubuntu and debian. | |||
| # include: [] | |||
| # include: ".*" | |||
There was a problem hiding this comment.
Shouldn't it be [".*"] instead?
There was a problem hiding this comment.
Even worse!
This is wrong, in this case you will include everything.
How it works: if a tag matches an exclude rule, it won't be included unless it also matches an include rule.
LeoCavaille
force-pushed
the
leo/dockercount
branch
from
84b83f7
to
3eaed62
Compare
|
@LotharSee thanks for the review, it was a careless mistake confusing different things, should be gtg now |
| @@ -39,6 +59,7 @@ def load_check(name, config, agentConfig): | |||
| try: | |||
| return check_class(name, init_config=init_config, agentConfig=agentConfig, instances=instances) | |||
| except Exception as e: | |||
| raise | |||
| raise Exception("Check is using old API, {0}".format(e)) | |||
LeoCavaille
force-pushed
the
leo/dockercount
branch
from
3eaed62
to
90e1671
Compare
|
should be fixed now... |
LeoCavaille
added a commit
that referenced
this pull request
Feb 5, 2015
[docker] fix config bools, skip image stats option
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.
Fixes #1342.
We should always cast boolean options from the config with
the
_is_affirmativetool, otherwise you're exposed tooddities like bool('false') == True.
This introduces a new option
collect_images_statsthat isenabled by default and skips the collection of metrics
docker.images.availableanddocker.images.intermediatethatsometimes is very slow through docker API if you have a lot of
intermediate layer images.