Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Remove Simple Alerter #793

Merged
merged 3 commits into from
Mar 30, 2022
Merged

Remove Simple Alerter #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c7c7c8
Remove Simple Alerter
nsano-rururu Mar 30, 2022
38cd633
Update ChangeLog
nsano-rururu Mar 30, 2022
9826508
Merge branch 'master' into remove_simple
jertel Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# 2.x.x

## Breaking changes
- Remove Simple Alerter - [#793](https://github.com/jertel/elastalert2/pull/793) - @nsano-rururu

## New features
- Add support for Kibana 8.1 for Kibana Discover - [#763](https://github.com/jertel/elastalert2/pull/763) - @nsano-rururu
Expand Down
14 changes: 0 additions & 14 deletions elastalert/loaders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,6 @@ def load_options(self, rule, conf, filename, args=None):
:param filename: Name of the rule
:param args: Arguments
"""
self.adjust_deprecated_values(rule)

try:
self.rule_schema.validate(rule)
except jsonschema.ValidationError as e:
Expand Down Expand Up @@ -529,18 +527,6 @@ def create_alert(alert, alert_config):

return alert_field

@staticmethod
def adjust_deprecated_values(rule):
# From rename of simple HTTP alerter
if rule.get('type') == 'simple':
rule['type'] = 'post'
if 'simple_proxy' in rule:
rule['http_post_proxy'] = rule['simple_proxy']
if 'simple_webhook_url' in rule:
rule['http_post_url'] = rule['simple_webhook_url']
elastalert_logger.warning(
'"simple" alerter has been renamed "post" and comptability may be removed in a future release.')


class FileRulesLoader(RulesLoader):

Expand Down
4 changes: 0 additions & 4 deletions elastalert/schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,10 +294,6 @@ properties:
timestamp_field: {type: string}
field: {}

### Simple
simple_webhook_url: *arrayOfString
simple_proxy: {type: string}

### Alerta
alerta_api_url: {type: string}
alerta_api_key: {type: string}
Expand Down