[win32_event_log] Allow optional tagging by event_id #2009
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
|
Tested on Windows Server 2012 and it works beautifully. |
|
@degemer since you last touched this check, would you mind giving me a quick r? :) |
| # event sent from this check. Defaults to false. | ||
| # tag_event_id: true | ||
|
|
||
| tag_event_id: false |
There was a problem hiding this comment.
I think we kind of have an implicit convention that the default parameter should be commented, and nothing outside the comment, i.e. :
init_config:
# The (optional) tag_event_id setting will add an event id tag to each
# event sent from this check. Defaults to false.
# tag_event_id: false
JohnLZeller
force-pushed
the
zeller/win-event-id
branch
from
d3180a8 to
03801af
Compare
|
@degemer fixed! All good now? |
| @@ -150,13 +151,14 @@ def _convert_event_types(self, types): | |||
|
|
|||
|
|
|||
| class LogEvent(object): | |||
| def __init__(self, ev, api_key, hostname, tags, notify_list): | |||
| def __init__(self, ev, api_key, hostname, tags, notify_list, tag_event_id): | |||
| self.event = ev | |||
| self.api_key = api_key | |||
| self.hostname = hostname | |||
| self.tags = tags | |||
There was a problem hiding this comment.
I might be missing something, but why not use something like self.tags = self._tags(tags, ev.EventCode) if tag_event_id else tags ?
This way you don't need to have a self.tag_event_id = tag_event_id.
|
Two last small comments, but LGTM otherwise ! |
JohnLZeller
force-pushed
the
zeller/win-event-id
branch
2 times, most recently
from
6553ab0 to
97bdbdc
Compare
JohnLZeller
force-pushed
the
zeller/win-event-id
branch
from
97bdbdc to
70263b8
Compare
JohnLZeller
added a commit
that referenced
this pull request
Oct 30, 2015
[win32_event_log] Allow optional tagging by event_id
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.
Add config option for allowing the user to have events tagged by event_id of the form
event_id:<num>.