Merge Upstream master (as of 2019-07-31) #1
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
…atch-value to feature/writeback_index * commit 'e5bb26f7a865fbfc658ba536431e2330dd8e1d5d': writeback suffix is formatted with content from match body Updated the writeback suffix to include customer id
Writeback alias
# Conflicts: # elastalert/config.py # elastalert/elastalert.py # elastalert/test_rule.py # tests/base_test.py # tests/conftest.py
Fixed a bug causing buffer_time to sometimes be ignored
Avoid writing slack_webhook_url in elastalert_status index
Support reading a whole dict logging configuration from the config file and configure the logging framework accordingly. Move special logging configuration via command line options (--verbose, --debug) into load_rules() as it needs to be set after the logging framework has been reconfigured. This should keep the previous behavior as close as possible when no logging setup is provided in the configuration and mimic the desired log level adjustments where appropriate even if a custom logging config is given.
Read logging configuration from config file
Add a missing comma to fix dependency error
Rules loader
Allow run_every to be unique per rule
updated rules_mapping to include spike_aggregation
Removed thehive alerter
Re-add TheHive alerter without any libraries
Added back custom fields to the hive alerter
Update elastalert-test-rule to use ascii_letters
Fix Flake Lint Ambiguous Variable Error
Made the schema valid according to draft-07
Fix slack kibana properties in schema
exotel_accout_sid → exotel_account_sid
Fix Exotel to docs
fix issue 2518, where false positive may be triggered sometimes
This has come about because we currently use records which have timestamps like:
```
"@timestamp": {
"min": "2020-10-03T07:05:01.987Z",
"max": "2020-10-05T07:05:09.572Z"
},
```
These work fine with the `timestamp_field` set to `@timestamp.min`.
However, when we try to create a Jira alert using ElastAlert from these, we run
into a Python error:
```
File "/usr/local/lib/python3.6/site-packages/elastalert/alerts.py", line 875, in create_default_title,
title += ' - %s' % (pretty_ts(matches[0][self.rule['timestamp_field']], self.rule.get('use_local_time'))), KeyError: '@timestamp.min'
```
This is because matches[0][self.rule['timestamp_field']] attempts to access
the `timestamp_field` directly rather than using a `get()`.
The proposed fix will not change any existing behaviour, but will skip the addition
of a timestamp to the ticket title if the required field doesn't exist, rather than
throwing an error and disabling the rule.
Fix the use of timestamps in the Jira ticket titles
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.
No description provided.