From 4c5c4c2abe12f1deb576248f2201b2326895e1f8 Mon Sep 17 00:00:00 2001 From: Darkfella91 Date: Sat, 18 Jan 2025 00:54:45 +0000 Subject: [PATCH] test --- .../app/helmrelease.yaml | 34 +++++++------------ .../app/secretproviderclass.yaml | 5 +++ 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/kubernetes/main/apps/observability/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/main/apps/observability/kube-prometheus-stack/app/helmrelease.yaml index 709675cb..951a0ab8 100755 --- a/kubernetes/main/apps/observability/kube-prometheus-stack/app/helmrelease.yaml +++ b/kubernetes/main/apps/observability/kube-prometheus-stack/app/helmrelease.yaml @@ -153,27 +153,19 @@ spec: vault.hashicorp.com/role: "prometheus" vault.hashicorp.com/agent-run-as-user: "1000" vault.hashicorp.com/agent-run-as-group: "2000" - #alertingEndpoints: - #- name: "alertmanager-operated" - #namespace: "observability" - #port: 9093 - #scheme: https - #pathPrefix: "/" - #apiVersion: v2 - #tlsConfig: - #serverName: "alertmanager.darkfellanetwork.com" - #oauth2: - #clientId: - #secret: - #name: prometheus-oauth2-credentials - #key: client_id - #clientSecret: - #name: prometheus-oauth2-credentials - #key: client_secret - #tokenUrl: https://accounts.darkfellanetwork.com/realms/DarkfellaNET/protocol/openid-connect/token - #scopes: ["openid", "profile", "email"] - #endpointParams: - #grant_type: 'client_credentials' + additionalAlertManagerConfigsSecret: + name: prometheus-oauth2-credentials + key: alertmanager-config.yaml + optional: false + alertingEndpoints: + - name: "alertmanager-operated" + namespace: "observability" + port: 9093 + scheme: https + pathPrefix: "/" + apiVersion: v2 + tlsConfig: + serverName: "alertmanager.darkfellanetwork.com" podMonitorSelectorNilUsesHelmValues: false probeSelectorNilUsesHelmValues: false ruleSelectorNilUsesHelmValues: false diff --git a/kubernetes/main/apps/observability/kube-prometheus-stack/app/secretproviderclass.yaml b/kubernetes/main/apps/observability/kube-prometheus-stack/app/secretproviderclass.yaml index 34dbf928..b809776f 100644 --- a/kubernetes/main/apps/observability/kube-prometheus-stack/app/secretproviderclass.yaml +++ b/kubernetes/main/apps/observability/kube-prometheus-stack/app/secretproviderclass.yaml @@ -11,6 +11,8 @@ spec: objectName: client_id - key: client_secret objectName: client_secret + - key: alertmanager-config.yaml + objectName: alertmanager-config.yaml secretName: prometheus-oauth2-credentials type: Opaque parameters: @@ -29,6 +31,9 @@ spec: - objectName: "client_secret" secretPath: "secrets/data/oauth2/prometheus" secretKey: "client_secret" + - objectName: "alertmanager-config.yaml" + secretPath: "secrets/data/oauth2/prometheus" + secretKey: "alertmanager-config.yaml" --- apiVersion: secrets-store.csi.x-k8s.io/v1alpha1 kind: SecretProviderClass