diff --git a/template/stacks/observability/grafana-operator/manifests/grafana.yaml b/template/stacks/observability/grafana-operator/manifests/grafana.yaml index c5fa295..1c47357 100644 --- a/template/stacks/observability/grafana-operator/manifests/grafana.yaml +++ b/template/stacks/observability/grafana-operator/manifests/grafana.yaml @@ -9,7 +9,6 @@ spec: metadata: annotations: everest.io/disk-volume-type: SATA - everest.io/crypt-key-id: {{{ .Env.PVC_KMS_KEY_ID }}} spec: storageClassName: csi-disk accessModes: diff --git a/template/stacks/observability/victoria-k8s-stack/manifests/alerts.yaml b/template/stacks/observability/victoria-k8s-stack/manifests/alerts.yaml index 9419609..f884bd9 100644 --- a/template/stacks/observability/victoria-k8s-stack/manifests/alerts.yaml +++ b/template/stacks/observability/victoria-k8s-stack/manifests/alerts.yaml @@ -11,19 +11,8 @@ spec: expr: sum by(cluster_environment) (up{pod=~"forgejo-server-.*"}) < 1 for: 30s labels: - severity: critical + severity: major job: "{{ $labels.job }}" annotations: value: "{{ $value }}" description: 'forgejo is down in cluster environment {{ $labels.cluster_environment }}' - - name: forgejo-backup - rules: - - alert: forgejo s3 backup job failed - expr: max by(cluster_environment) (kube_job_status_failed{job_name=~"forgejo-s3-backup-.*"}) != 0 - for: 30s - labels: - severity: critical - job: "{{ $labels.job }}" - annotations: - value: "{{ $value }}" - description: 'forgejo s3 backup job failed in cluster environment {{ $labels.cluster_environment }}' diff --git a/template/stacks/observability/victoria-k8s-stack/values.yaml b/template/stacks/observability/victoria-k8s-stack/values.yaml index e421957..f3b5241 100644 --- a/template/stacks/observability/victoria-k8s-stack/values.yaml +++ b/template/stacks/observability/victoria-k8s-stack/values.yaml @@ -542,13 +542,12 @@ alertmanager: # -- (object) Alertmanager configuration config: route: - receiver: "blackhole" + receiver: "outlook" routes: - matchers: - - severity=~"critical|major" + - alertname=~".*" receiver: outlook receivers: - - name: blackhole - name: outlook email_configs: - smarthost: 'mail.mms-support.de:465'