diff --git a/deploy/base/inflated/grafana/templates/configmap.yaml b/deploy/base/inflated/grafana/templates/configmap.yaml index bc22a09..0b1e691 100644 --- a/deploy/base/inflated/grafana/templates/configmap.yaml +++ b/deploy/base/inflated/grafana/templates/configmap.yaml @@ -33,6 +33,8 @@ data: name: Prometheus type: prometheus url: http://prometheus-server + contactpoints.yaml: | + apiVersion: 1 dashboardproviders.yaml: | apiVersion: 1 providers: diff --git a/deploy/base/inflated/grafana/templates/deployment.yaml b/deploy/base/inflated/grafana/templates/deployment.yaml index c88899b..5da1cc7 100644 --- a/deploy/base/inflated/grafana/templates/deployment.yaml +++ b/deploy/base/inflated/grafana/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana annotations: - checksum/config: 6d02e56644107500207b217eb10509f2af0039e3a918f8cb1411f6c7d8db7cd5 + checksum/config: 36a36abf9dd9e61eaa035cfc90acbb82d3e6c131aa9fd57eaf98ae5380401bf3 checksum/dashboards-json-config: 2b3b91b055108de2da8951a904e7c7ea49b5a5a250d2649ba27b7b7b7ec34cfd checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b kubectl.kubernetes.io/default-container: grafana @@ -80,6 +80,9 @@ spec: - name: config mountPath: "/etc/grafana/provisioning/datasources/datasources.yaml" subPath: "datasources.yaml" + - name: config + mountPath: "/etc/grafana/provisioning/alerting/contactpoints.yaml" + subPath: "contactpoints.yaml" - name: config mountPath: "/etc/grafana/provisioning/dashboards/dashboardproviders.yaml" subPath: "dashboardproviders.yaml" diff --git a/deploy/base/values/grafana.yaml b/deploy/base/values/grafana.yaml index 9fe1f03..ef38a47 100644 --- a/deploy/base/values/grafana.yaml +++ b/deploy/base/values/grafana.yaml @@ -16,6 +16,12 @@ datasources: name: Prometheus type: prometheus url: http://prometheus-server +# Note: alerting rules are patched in overlays. +# Including here is required for the helm chart to mount the configmap +# volume. +alerting: + contactpoints.yaml: + apiVersion: 1 dashboardProviders: dashboardproviders.yaml: apiVersion: 1 diff --git a/deploy/dev/grafana-contactpoints.yaml b/deploy/dev/grafana-contactpoints.yaml new file mode 100644 index 0000000..cb02d88 --- /dev/null +++ b/deploy/dev/grafana-contactpoints.yaml @@ -0,0 +1,9 @@ +apiVersion: 1 +contactPoints: +- name: Prometheus Alertmanager + receivers: + - uid: prometheus-alertmanager-1 + type: prometheus-alertmanager + disableResolveMessage: false + settings: + url: http://dev-prometheus-alertmanager:9093 diff --git a/deploy/dev/kustomization.yaml b/deploy/dev/kustomization.yaml index 656eaa1..0349ff5 100644 --- a/deploy/dev/kustomization.yaml +++ b/deploy/dev/kustomization.yaml @@ -38,6 +38,7 @@ configMapGenerator: files: - grafana.ini - datasources.yaml=grafana-datasources.yaml + - contactpoints.yaml=grafana-contactpoints.yaml - name: invidious-config files: - config.yml=invidious-config.yaml diff --git a/deploy/prod/grafana-contactpoints.yaml b/deploy/prod/grafana-contactpoints.yaml new file mode 100644 index 0000000..417c64b --- /dev/null +++ b/deploy/prod/grafana-contactpoints.yaml @@ -0,0 +1,9 @@ +apiVersion: 1 +contactPoints: +- name: Prometheus Alertmanager + receivers: + - uid: prometheus-alertmanager-1 + type: prometheus-alertmanager + disableResolveMessage: false + settings: + url: http://prod-prometheus-alertmanager:9093 diff --git a/deploy/prod/kustomization.yaml b/deploy/prod/kustomization.yaml index ff34c29..601a0f8 100644 --- a/deploy/prod/kustomization.yaml +++ b/deploy/prod/kustomization.yaml @@ -27,6 +27,7 @@ configMapGenerator: files: - grafana.ini=secrets/grafana-config.ini - datasources.yaml=secrets/grafana-datasources.yaml + - contactpoints.yaml=grafana-contactpoints.yaml - name: invidious-config files: - config.yml=invidious-config.yaml