[Windows] Update pdh library to support generic pdh based checks #3581
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
derekwbrown
force-pushed
the
db/pdh_update
branch
from
e0ff172
to
ab543e7
Compare
gmmeyer
suggested changes
Nov 10, 2017
checks/libs/win/pdhbasecheck.py
Outdated
| try: | ||
| from checks.libs.win.winpdh import WinPDHCounter | ||
| except ImportError: | ||
| def WinPDHCounter(*args, **kwargs): |
There was a problem hiding this comment.
this should be a class instead of a function? You'd probably want to have the check error out if it can't import it, but not on import. That will be ugly
| @@ -8,24 +8,24 @@ class WinPDHCounter(object): | |||
| # store the dictionary of pdh counter names | |||
| pdh_counter_dict = {} | |||
|
|
|||
| def __init__(self, class_name, instance_name, log): | |||
| def __init__(self, class_name, counter_name, log, instance_name = None): | |||
There was a problem hiding this comment.
Will making these changes affect the pdh check in integrations core?
There was a problem hiding this comment.
No; the pdh check always will supply no instance name. The problem is confusion between what PDH calls countersets, counters, and instances, and what we generally refer to as instances. The generic PDH counter does all instances of the counters, so it's instance_name param is always none.
derekwbrown
force-pushed
the
db/pdh_update
branch
from
ab543e7
to
e9496fa
Compare
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.
Updates the PDH library. Provide a generic PDHBaseCheck to build PDH based system checks.