diff --git a/charts/monitoring/Chart.yaml b/charts/monitoring/Chart.yaml index ed017bc39..d18f7b806 100644 --- a/charts/monitoring/Chart.yaml +++ b/charts/monitoring/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: monitoring description: A monitoring stack for the workflows deployment type: application -version: 0.1.26 +version: 0.1.27 dependencies: - name: grafana repository: https://grafana.github.io/helm-charts diff --git a/charts/monitoring/values.yaml b/charts/monitoring/values.yaml index 0f5e0ab49..43090a910 100644 --- a/charts/monitoring/values.yaml +++ b/charts/monitoring/values.yaml @@ -177,6 +177,15 @@ prometheus: rbac: create: false alertmanager: + config: + route: + receiver: slack-notifications + receivers: + - name: slack-notifications + slack_configs: + - api_url_file: /etc/secrets/slack-api-url + channel: "#analysis-platform-alerts" + send_resolved: true serviceAccount: create: true annotations: {} @@ -197,6 +206,11 @@ prometheus: memory: 2Gi extraArgs: web.external-url: https://alertmanager.workflows.diamond.ac.uk + extraSecretMounts: + - name: slack-alert-webhook + secretName: slack-alert-webhook + mountPath: /etc/secrets + readOnly: true configmapReload: enabled: true resources: diff --git a/charts/workflows-cluster/Chart.yaml b/charts/workflows-cluster/Chart.yaml index fe8d3b2e0..0e9d9ff71 100644 --- a/charts/workflows-cluster/Chart.yaml +++ b/charts/workflows-cluster/Chart.yaml @@ -3,7 +3,7 @@ name: workflows-cluster description: A virtual cluster for Data Analysis workflows type: application -version: 0.13.29 +version: 0.13.30 dependencies: - name: common version: 2.23.0 diff --git a/charts/workflows-cluster/charts/secrets/templates/slack-alert-webhook.yaml b/charts/workflows-cluster/charts/secrets/templates/slack-alert-webhook.yaml new file mode 100644 index 000000000..c5ec07488 --- /dev/null +++ b/charts/workflows-cluster/charts/secrets/templates/slack-alert-webhook.yaml @@ -0,0 +1,29 @@ +{{- if eq .Values.cluster "argus" }} +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + name: slack-alert-webhook + namespace: workflows +spec: + encryptedData: + slack-api-url: AgAUG8ZRsintvELTmMukDH6dvPCExHRV/VglRamEEfIeSKNZahxDdu9TKv17RE4hJ4XK/jN0fLrasEtEL/WZaFaxueQIxHDaEM4i3VBGEHptGvR8TfyswVOgLZDDXo9K82yEoRkrXP7BO/SGz5Xtwt0DLdpsCFn19qlO5iElEhp+aV8owJvppxc7Kvj2mRIdmsKAIWRQSbwgmk0SMpA9lJihnRovNgoc/RexCiqTDdvkJoT5al73bUC1L/3sKvt0izRbIUW9LtUwLfDne1uxo4gy3oCsXnhcXtdN7cuAU4O/8z6zdaN+J0zp+ZHgnQ0WFUlervAs8VHKn/nJCU3srKJlMfw/eufbfLjvPgQD1f1vfKDySwNKleILbEO20jDquSL75noms3/GoKJj0bLMhN7++e8OJYhGdTEjDBd//jWEByZO4iMORO0AJip6/Dlu5DNsY80Qv8u5ov/DxMVRaBVANHObHAYR+t8HXADDSpavBmIGPvAgnSrBYCu1eXJDtd241WxZFkAV/PCOOidnquDMQr+LeKMK+uFU+eAQJEQgp27zBSQaZt/XA6ouwgRVEmSWH5QlW3L6iGuGybwtbGKSmyJRUTMEJ7nqXqCJxvxiGId6CHekcu+s2wOESUiD7Vcjxc+bQExaVrkeq29khFb8Fg1eqLvEcH5MKwum8IbVmu7HbFCzNNJ8HbFT3TTOQEDkcwXxs9rMa/F3Qn7bnkMR4bGzbcElKyidaPfqNimLPDe0Lobu7HOqCqoaXpP51aq54VlXd1+IkZKx8vkL9CUkKAi+wS4N0zAAgcvVDwPx + template: + metadata: + name: slack-alert-webhook + namespace: workflows +{{- else if eq .Values.cluster "pollux" }} +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + name: slack-alert-webhook + namespace: workflows +spec: + encryptedData: + slack-api-url: AgBixUIJej+v9Z0xXJ7+8PjY0rQcEP1zbJ4nV2UQHb0H2yytYuOoZFL5/CmQCbrnGWKJhbJ3SZLde+6qJK6jH/wKvzUsIVs00AljNNA/wiFhn/9piIz1xjrNjdfsztqePgxRuYI2PqwNaA4mLN9MCJiBjTUOL39+IgRU+IuTHTHtxFOWeYUGwv2sqRzBDa0EYMvi806XgkEU4y9g4IjCD1HylhYcPFST90MGhPZhax2ZIDq6BQqDz6jW8MaDr/l48uPEFv5l4XMQJYYsWuDnI9C3Kq7WLVlNJmqi0rbQscRV1vKjAbZbUP44X8RceuhQpJ72hpWgnMPgqwOxyOzycXw3dv1G6rvsnXPVgY1ou3qn42VR0FYa/kjZdHCNzF4yqy8rnF/WaZJ8hnkH4jXa5a4aUd/hDaNS4MmArRBtvNxrzGN43OsBYrJubyTm2f11wAsEhzQrCQ+Ch+Iw8gYxBW1TH/bM7gIivSO+huQhOYOnqG5ZVPUfZl+QlaikV6wdCsaHU3db4haYTRKWXb8z9CzSEPtnDAxHdRsdkjJcPZlkGmXhtW7TkcjnDuOIQPIWY/XQm0tXkIWL6/d4b+Isr+gyffY67DCyrT4QEDGMGdo9hll4aDwtzkKylBfI0Qs5ZxO2+2QZ+hLuzI1hEjV6/lWKNDtTJsUZsNcSbSn7o5+p0luJIEQeWtoCEWLHgUeffrZxNBk/J3sVlUoKyoWItGS/EBBu3NzUeoPrfDaGpckIAHLyf+ZuemhMm9poyE0SEsYkHptfBi84QrUbJE2zCZ6rVyu35azSHXprMZQnStOS + template: + metadata: + name: slack-alert-webhook + namespace: workflows + +{{ else }} +{{- end }} diff --git a/charts/workflows-cluster/values.yaml b/charts/workflows-cluster/values.yaml index f31ac2c8f..f1943f00e 100644 --- a/charts/workflows-cluster/values.yaml +++ b/charts/workflows-cluster/values.yaml @@ -148,6 +148,7 @@ vcluster: "/letsencrypt-thanos-query-workflows-diamond-ac-uk": "monitoring/letsencrypt-thanos-query-workflows-diamond-ac-uk" "/letsencrypt-alertmanager-workflows-diamond-ac-uk": "monitoring/letsencrypt-alertmanager-workflows-diamond-ac-uk" "/letsencrypt-prometheus-workflows-diamond-ac-uk": "monitoring/letsencrypt-prometheus-workflows-diamond-ac-uk" + "/slack-alert-webhook": monitoring/slack-alert-webhook" "/grafana-oauth": "monitoring/grafana-oauth" "/monitoring-thanos-s3": "monitoring/monitoring-thanos-s3" "/argocd-oauth": "argocd/argocd-oauth"