Merge ~jacekn/charm-prometheus-alertmanager:fixes into ~prometheus-charmers/charm-prometheus-alertmanager:master

[Jacek Nykis]

Remove redundant enable_* config options. Rework receivers config so that alerts go to all of them not just first one

[Stuart Bishop (stub)]

Looks good to me. I'm not familiar with alertmanager config, but the changes appear sensible and are understandable.

review: Approve

[JuanJo Ciarlante (jjo)]

review: Approve (lgtm)

diff --git a/config.yaml b/config.yaml
index 415ad67..04be6f7 100644
--- a/config.yaml
+++ b/config.yaml
@@ -22,74 +22,48 @@ options:
         It's templatized to accept the following vars: {private_address},
         {public_address}, {port}, thus you can use e.g.:
         juju set alertmanager external_url="http://{private_address}:{port}/"
-
   repeat_interval:
     default: "30m"
     type: string
     description: |
         If an alert has successfully been sent, wait 'repeat_interval' to
         resend them.
-
   smtp_smarthost:
     default: 'localhost:25'
     type: string
     description: "SMTP relay"
-
   smtp_from:
     default: 'root@localhost'
     type: string
     description: "SMTP from"
-
   smtp_to:
     default: 'root@localhost'
     type: string
     description: "Default email recipient for all alerts"
-
-  enable_pagerduty:
-    default: False
-    type: boolean
-    description: "Enable PagerDuty notifications for critical alerts"
-
   pagerduty_url:
     default: ""
     type: string
     description: "Override default, use default from alertmanager ( global.pagerduty_url) if unset"
-
   pagerduty_service_key:
     type: string
     description: "PagerDuty service key"
     default: ""
-
-  enable_slack:
-    default: False
-    type: boolean
-    description: "Enable Slack.com notifications for critical alerts, requires slack_api_url and slack_channel to be set"
-
   slack_api_url:
     default: ""
     type: string
     description: "Your slack.com Webhook URL, see https://api.slack.com/incoming-webhooks (required)"
-
   slack_channel:
     default: ""
     type: string
     description: "slack channel (required)"
-
-  enable_webhook:
-    default: False
-    type: boolean
-    description: "Enable generic webhook receiver for critical alerts"
-
   webhook_url:
     default: ""
     type: string
     description: "Your webhook url"
-
   extra_routes:
     type: string
     description: "YAML string containing a list of alertmanager 'routes' to add"
     default: ""
-
   extra_receivers:
     type: string
     description: "YAML string containing a list of alertmanager 'receivers' to add"
diff --git a/templates/alertmanager.yml.j2 b/templates/alertmanager.yml.j2
index 7427e78..a79f1f3 100644
--- a/templates/alertmanager.yml.j2
+++ b/templates/alertmanager.yml.j2
@@ -37,123 +37,37 @@ route:
   # overwritten on each.
 
   routes:
-{%- if config.enable_pagerduty and config.pagerduty_service_key is defined %}
-    - match_re:
-        severity: critical|page
-      receiver: juju_pagerduty_receiver
+{%- if config.pagerduty_service_key or config.slack_api_url or config.webhook_url or config.extra_receivers %}
+    - receiver: juju_receiver
 {% endif %}
-{%- if config.enable_slack and config.slack_api_url is defined and config.slack_channel is defined %}
-    - match_re:
-        severity: critical|page
-      receiver: juju_slack_receiver
-{% endif %}
-{%- if config.enable_webhook and config.webhook_url is defined %}
-    - match_re:
-        severity: critical|page
-      receiver: juju_webhook_receiver
-{% endif %}
-{%- if config.extra_routes is defined %}
+{%- if config.extra_routes %}
     {{ config.extra_routes|indent(4) }}
 {% endif %}
 
-#   # The child route trees.
-#   routes:
-#   # This routes performs a regular expression match on alert labels to
-#   # catch alerts that are related to a list of services.
-#   - match_re:
-#       service: ^(foo1|foo2|baz)$
-#     receiver: team-X-mails
-# 
-#     # The service has a sub-route for critical alerts, any alerts
-#     # that do not match, i.e. severity != critical, fall-back to the
-#     # parent node and are sent to 'team-X-mails'
-#     routes:
-#     - match:
-#         severity: critical
-#       receiver: team-X-pager
-# 
-#   - match:
-#       service: files
-#     receiver: team-Y-mails
-# 
-#     routes:
-#     - match:
-#         severity: critical
-#       receiver: team-Y-pager
-# 
-#   # This route handles all alerts coming from a database service. If there's
-#   # no team to handle it, it defaults to the DB team.
-#   - match:
-#       service: database
-# 
-#     receiver: team-DB-pager
-#     # Also group alerts by affected database.
-#     group_by: [alertname, cluster, database]
-# 
-#     routes:
-#     - match:
-#         owner: team-X
-#       receiver: team-X-pager
-# 
-#     - match:
-#         owner: team-Y
-#       receiver: team-Y-pager
-
-# Inhibition rules allow to mute a set of alerts given that another alert is
-# firing.
-# We use this to mute any warning-level notifications if the same alert is
-# already critical.
-inhibit_rules:
-- source_match:
-    severity: 'critical'
-  target_match:
-    severity: 'warning'
-  # Apply inhibition if the alertname is the same.
-  equal: ['alertname']
-
-
 receivers:
 - name: 'default-email-recipient'
   email_configs:
   - to: '{{ config.smtp_to }}'
-
-{%- if config.enable_pagerduty and config.pagerduty_service_key is defined %}
-- name: juju_pagerduty_receiver
+{%- if config.pagerduty_service_key or config.slack_api_url or config.webhook_url or config.extra_receivers %}
+- name: 'juju_receiver'
+{%- if config.pagerduty_service_key %}
   pagerduty_configs:
   - service_key: '{{ config.pagerduty_service_key }}'
 {%- if config.pagerduty_url %}
-  - url: '{{ config.pagerduty_url }}'
+    url: '{{ config.pagerduty_url }}'
 {% endif %}
 {% endif %}
-{%- if config.enable_slack and config.slack_api_url is defined and config.slack_channel is defined %}
-- name: juju_slack_receiver
+{%- if config.slack_api_url and config.slack_channel %}
   slack_configs:
   - api_url: '{{ config.slack_api_url }}'
     channel: '{{ config.slack_channel }}'
 {% endif %}
-{%- if config.enable_webhook and config.webhook_url is defined %}
-- name: juju_webhook_receiver
+{%- if config.webhook_url %}
   webhook_configs:
   - url: '{{ config.webhook_url }}'
 {% endif %}
-{%- if config.extra_receivers is defined %}
-{{ config.extra_receivers }}
+{%- if config.extra_receivers %}
+{{ config.extra_receivers|indent(2) }}
+{% endif %}
 {% endif %}
 
-# - name: 'team-X-pager'
-#   email_configs:
-#   - to: '[e-mail]'
-#   pagerduty_configs:
-#   - service_key: <team-X-key>
-# 
-# - name: 'team-Y-mails'
-#   email_configs:
-#   - to: '[e-mail]'
-# 
-# - name: 'team-Y-pager'
-#   pagerduty_configs:
-#   - service_key: <team-Y-key>
-# 
-# - name: 'team-DB-pager'
-#   pagerduty_configs:
-#   - service_key: <team-DB-key>