aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ansible/roles/postfix/templates/virtual.j21
-rw-r--r--kubernetes/namespaces/monitoring/alerts/alertmanager.yaml11
-rw-r--r--kubernetes/namespaces/monitoring/alerts/alertmanager/secrets.yamlbin366 -> 433 bytes
3 files changed, 12 insertions, 0 deletions
diff --git a/ansible/roles/postfix/templates/virtual.j2 b/ansible/roles/postfix/templates/virtual.j2
index 908b37f..bd524b1 100644
--- a/ansible/roles/postfix/templates/virtual.j2
+++ b/ansible/roles/postfix/templates/virtual.j2
@@ -22,6 +22,7 @@ staff administrators
cloudflare joe,cj
netcup joe,cj
linode joe,cj
+devops-alerts jc
# Admin Domain Email
conferences stelercus
diff --git a/kubernetes/namespaces/monitoring/alerts/alertmanager.yaml b/kubernetes/namespaces/monitoring/alerts/alertmanager.yaml
index 558f208..b8da299 100644
--- a/kubernetes/namespaces/monitoring/alerts/alertmanager.yaml
+++ b/kubernetes/namespaces/monitoring/alerts/alertmanager.yaml
@@ -13,6 +13,8 @@ route:
matchers:
- severity="page"
continue: true
+ - receiver: email
+ continue: true
receivers:
- name: devops-team
@@ -33,3 +35,12 @@ receivers:
pagerduty_configs:
- routing_key_file: "/opt/pydis/alertmanager/webhooks/PAGERDUTY_KEY"
url: https://events.pagerduty.com/v2/enqueue
+ - name: email
+ email_configs:
+ send_resolved: true
+ smarthost: mail.pydis.wtf
+ auth_username: [email protected]
+ auth_password_file: /opt/pydis/alertmanager/webhooks/EMAIL_PASSWORD
+ text: 'summary: {{ .CommonAnnotations.summary }}\ndescription: {{ .CommonAnnotations.description }}"'
diff --git a/kubernetes/namespaces/monitoring/alerts/alertmanager/secrets.yaml b/kubernetes/namespaces/monitoring/alerts/alertmanager/secrets.yaml
index 4107c0e..37f173e 100644
--- a/kubernetes/namespaces/monitoring/alerts/alertmanager/secrets.yaml
+++ b/kubernetes/namespaces/monitoring/alerts/alertmanager/secrets.yaml
Binary files differ