| commit | 8dccde052c5ac9b054645f0d612c6460c25546e3 | [log] [tgz] |
|---|---|---|
| author | Ondrej Smola <osmola@mirantis.com> | Tue Apr 24 09:07:09 2018 +0000 |
| committer | Gerrit Code Review <gerrit2@49259fdfccf8> | Tue Apr 24 09:07:09 2018 +0000 |
| tree | 7b6f39a903c14105c689e5cd943023d116b97094 | |
| parent | f57a9edce574a495078be66227a182d480598def [diff] | |
| parent | 53ec5073b87061b839d9ffb04cce901b82066d2d [diff] |
Merge "Update openssh keys for maintenance team members"
diff --git a/fluentd/label/default_output/elasticsearch.yml b/fluentd/label/default_output/elasticsearch.yml index 5960c49..aa96b31 100644 --- a/fluentd/label/default_output/elasticsearch.yml +++ b/fluentd/label/default_output/elasticsearch.yml
@@ -1,7 +1,7 @@ classes: - service.fluentd.agent.output.elasticsearch parameters: - _params: + _param: fluentd_elasticsearch_host: 127.0.0.1 elasticsearch_port: 9200 fluentd:
diff --git a/prometheus/alertmanager/notification/email.yml b/prometheus/alertmanager/notification/email.yml index 4daec23..fdbc05e 100644 --- a/prometheus/alertmanager/notification/email.yml +++ b/prometheus/alertmanager/notification/email.yml
@@ -9,7 +9,7 @@ receiver: SMTP match_re: - label: route - value: email + value: '(.*email.*)' continue: true receiver: SMTP:
diff --git a/prometheus/alertmanager/notification/pushkin.yml b/prometheus/alertmanager/notification/pushkin.yml index 151801b..ec749d7 100644 --- a/prometheus/alertmanager/notification/pushkin.yml +++ b/prometheus/alertmanager/notification/pushkin.yml
@@ -10,6 +10,9 @@ routes: pushkin: receiver: HTTP-pushkin + match_re: + - label: route + value: '(.*pushkin.*)' continue: true receiver: HTTP-pushkin:
diff --git a/prometheus/alertmanager/notification/slack.yml b/prometheus/alertmanager/notification/slack.yml index 412e91f..a86c403 100644 --- a/prometheus/alertmanager/notification/slack.yml +++ b/prometheus/alertmanager/notification/slack.yml
@@ -7,6 +7,9 @@ routes: slack: receiver: HTTP-slack + match_re: + - label: route + value: '(.*slack.*)' continue: true receiver: HTTP-slack: