Checking that attribute retreived by wmi_property is not None #1800
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
|
@yann could you take a look? |
| @@ -109,7 +109,7 @@ def _extract_metrics(self, results, metrics, tag_by, wmi, tag_queries, constant_ | |||
| # Special-case metric will just submit 1 for every value | |||
| # returned in the result. | |||
| val = 1 | |||
| else: | |||
| elif getattr(res, wmi_property) is not None: | |||
There was a problem hiding this comment.
elif getattr(res, wmi_property):is probably enough as we don't want to cast an empty string either.
Also, should we add a log.warning when we endup in this case ? It could help users or support understanding why some metrics are silenced.
|
Great, thanks for you reactivity @JohnLZeller. |
JohnLZeller
force-pushed
the
zeller/wmi-check-fix
branch
from
8bf787e
to
c864530
Compare
|
@yannmh how's this? |
| val = float(getattr(res, wmi_property)) | ||
| elif not getattr(res, wmi_property): |
There was a problem hiding this comment.
else instead of elif not getattr(res, wmi_property) as not getattr(res, wmi_property) will always be True at this state.
There was a problem hiding this comment.
Ahhh, good point.
JohnLZeller
force-pushed
the
zeller/wmi-check-fix
branch
from
c864530
to
23c0339
Compare
|
@yannmh should be good now |
|
👍 |
yannmh
added a commit
that referenced
this pull request
Aug 7, 2015
Checking that attribute retreived by wmi_property is not None
yannmh
added a commit
that referenced
this pull request
Aug 18, 2015
Sinces #1800, `val` variable is unreferenced when WMI metric is null. Thus, an exception is raised when we try to submit it to Datadog. Ignore null values, and continue, so it does not raise.
yannmh
added a commit
that referenced
this pull request
Aug 19, 2015
Fix regression with #1800, as 0s were not reported anymore. Log a warning when the specified WMI property does not exist among the class, or when the value extracted is not a digit. Keep the crawler running.
Merged
yannmh
added a commit
that referenced
this pull request
Aug 25, 2015
Fix regression with #1800, as 0s were not reported anymore. Log a warning when the specified WMI property does not exist among the class, or when the value extracted is not a digit. Keep the crawler running.
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.
Discovered that when wmi_check.py is run, that depending upon the yaml configuration, it can end up pulling attributes that have a value of None, which will throw a TypeError complaining that float() cannot coerce something that is not a string nor an integer. Specifically, this issue came to light with a config that setup grabbing metrics for the
FreeSpaceandSizeproperties from theWin32_LogicalDiskclass. This runs for all disks, including CD-ROMs, which will report nothing for either property.The fix is to check tht the attribute retrieved by wmi_property is not None before attempting to coerce to a float.
I'll not for the record as well, in regard to the specific situation that this turned up in, that we are already collecting disk usage statistics in
checks.d/disk.py, and specificallyFreeSpacewould probably correspond tosystem.disk.freeandSizetosystem.disk.total, for each disk.