-
Notifications
You must be signed in to change notification settings - Fork 288
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closing the rule schema.yml file stream #567
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
d78ec3c
Closing the rule schema.yml file stream
JeffAshton 16594b1
Updating CHANGELOG.md
JeffAshton 5f09f6a
Simplifying variable names
JeffAshton a3f561b
Merge branch 'master' into load_rule_schema
JeffAshton 0a9c36d
Merge branch 'master' into load_rule_schema
jertel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -62,6 +62,14 @@ | |
from elastalert.yaml import read_yaml | ||
|
||
|
||
# load rules schema | ||
def load_rule_schema(): | ||
schema_path = os.path.join(os.path.dirname(__file__), 'schema.yaml') | ||
with open(schema_path) as schema_file: | ||
schema_yml = yaml.load(schema_file, Loader=yaml.FullLoader) | ||
return jsonschema.Draft7Validator(schema_yml) | ||
|
||
|
||
class RulesLoader(object): | ||
# import rule dependency | ||
import_rules = {} | ||
|
@@ -137,10 +145,7 @@ class RulesLoader(object): | |
jinja_environment = Environment(loader=FileSystemLoader("")) | ||
|
||
def __init__(self, conf): | ||
# schema for rule yaml | ||
self.rule_schema = jsonschema.Draft7Validator( | ||
yaml.load(open(os.path.join(os.path.dirname(__file__), 'schema.yaml')), Loader=yaml.FullLoader)) | ||
|
||
self.rule_schema = load_rule_schema() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Existing test coverage utilizes the |
||
self.base_config = copy.deepcopy(conf) | ||
|
||
def load(self, conf, args=None): | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Chasing down unclosed streams from the
yaml
library and came across this one. Likely not an issue, but thewith open
pattern should be followed everywhere.