From cd03a74bf58a91b9297bd0c706614aed9847d546 Mon Sep 17 00:00:00 2001 From: SeanOMik Date: Sat, 29 Apr 2023 21:07:15 -0400 Subject: [PATCH] Try again --- .../monitoring/alertmanager-gotify-bridge/kustomization.yaml | 1 - .../alertmanager-config.yaml} | 2 +- .../apps/monitoring/kube-prometheus-stack/helm-release.yaml | 4 ++++ .../apps/monitoring/kube-prometheus-stack/kustomization.yaml | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) rename cluster/apps/monitoring/{alertmanager-gotify-bridge/receiver-config.yaml => kube-prometheus-stack/alertmanager-config.yaml} (80%) diff --git a/cluster/apps/monitoring/alertmanager-gotify-bridge/kustomization.yaml b/cluster/apps/monitoring/alertmanager-gotify-bridge/kustomization.yaml index 6e0ef5c..bf0d63d 100644 --- a/cluster/apps/monitoring/alertmanager-gotify-bridge/kustomization.yaml +++ b/cluster/apps/monitoring/alertmanager-gotify-bridge/kustomization.yaml @@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ./bridge-secrets.sops.yaml -- ./receiver-config.yaml - ./helm-release.yaml \ No newline at end of file diff --git a/cluster/apps/monitoring/alertmanager-gotify-bridge/receiver-config.yaml b/cluster/apps/monitoring/kube-prometheus-stack/alertmanager-config.yaml similarity index 80% rename from cluster/apps/monitoring/alertmanager-gotify-bridge/receiver-config.yaml rename to cluster/apps/monitoring/kube-prometheus-stack/alertmanager-config.yaml index 7428946..e21e8be 100644 --- a/cluster/apps/monitoring/alertmanager-gotify-bridge/receiver-config.yaml +++ b/cluster/apps/monitoring/kube-prometheus-stack/alertmanager-config.yaml @@ -1,7 +1,7 @@ apiVersion: monitoring.coreos.com/v1alpha1 kind: AlertmanagerConfig metadata: - name: alertmanager-gotify-bridge-config + name: alertmanager-config namespace: monitoring spec: receivers: diff --git a/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml b/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml index dc8dec7..23696aa 100644 --- a/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml +++ b/cluster/apps/monitoring/kube-prometheus-stack/helm-release.yaml @@ -32,6 +32,10 @@ spec: - hosts: - *alertmanager-host secretName: wildcard-main-tls + + alertmanagerSpec: + alertmanagerConfiguration: + name: alertmanager-config grafana: ingress: diff --git a/cluster/apps/monitoring/kube-prometheus-stack/kustomization.yaml b/cluster/apps/monitoring/kube-prometheus-stack/kustomization.yaml index 14a2c31..ebc0bda 100644 --- a/cluster/apps/monitoring/kube-prometheus-stack/kustomization.yaml +++ b/cluster/apps/monitoring/kube-prometheus-stack/kustomization.yaml @@ -2,4 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ./helm-repository.yaml -- ./helm-release.yaml \ No newline at end of file +- ./helm-release.yaml +- ./alertmanager-config.yaml \ No newline at end of file