NG: Fixed prom-stak
Update Kubernetes Services Wiki / Generate and Update K8s Wiki (push) Successful in 17s

This commit is contained in:
Aleksandr Bogomiakov committed 2026-10-07 18:52:06 +01:00
1 parent 52bfa88a33
commit ac8e5e127c
4 files changed
+41 -17

No files matched your search

+2 -2
View File
@@ -32,8 +32,8 @@ them. This protects data from a manifest rename, but it is not a backup. Back up
- node `music` must exist and `/data` must be the intended large filesystem; - node `music` must exist and `/data` must be the intended large filesystem;
- `main-rw.psql.svc` and the generated `grafana-db` Secret must be ready; - `main-rw.psql.svc` and the generated `grafana-db` Secret must be ready;
- `vaultwarden-login` must resolve the existing Grafana OIDC and Telegram item - `vaultwarden-fields` must resolve `k8s/prometheus/grafana-secrets` with the
UUIDs used in `external-secrets.yaml`; custom fields `IDM Client ID`, `IDM Client Secret`, `TG Token`, and `TG ID`;
- DNS for `gf.hexor.cy` and `prom.hexor.cy` must point to the new cluster. - DNS for `gf.hexor.cy` and `prom.hexor.cy` must point to the new cluster.
After Argo CD reports the application healthy, verify targets, rules and log After Argo CD reports the application healthy, verify targets, rules and log
@@ -4,6 +4,8 @@ metadata:
name: telegram name: telegram
labels: labels:
alertmanager: main alertmanager: main
annotations:
argocd.argoproj.io/sync-wave: "1"
spec: spec:
route: route:
groupBy: [namespace, alertname] groupBy: [namespace, alertname]
+33 -12
View File
@@ -3,11 +3,15 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: db-credentials-reader name: db-credentials-reader
annotations:
argocd.argoproj.io/sync-wave: "-3"
--- ---
apiVersion: external-secrets.io/v1 apiVersion: external-secrets.io/v1
kind: SecretStore kind: SecretStore
metadata: metadata:
name: psql-credentials name: psql-credentials
annotations:
argocd.argoproj.io/sync-wave: "-2"
spec: spec:
provider: provider:
kubernetes: kubernetes:
@@ -26,6 +30,8 @@ apiVersion: generators.external-secrets.io/v1alpha1
kind: Password kind: Password
metadata: metadata:
name: grafana-admin name: grafana-admin
annotations:
argocd.argoproj.io/sync-wave: "-2"
spec: spec:
length: 40 length: 40
digits: 10 digits: 10
@@ -37,6 +43,8 @@ apiVersion: external-secrets.io/v1
kind: ExternalSecret kind: ExternalSecret
metadata: metadata:
name: grafana-admin name: grafana-admin
annotations:
argocd.argoproj.io/sync-wave: "-1"
spec: spec:
refreshPolicy: CreatedOnce refreshPolicy: CreatedOnce
target: target:
@@ -53,13 +61,15 @@ spec:
kind: Password kind: Password
name: grafana-admin name: grafana-admin
--- ---
# Grafana's database credentials come from CNPG. The existing Grafana Keycloak # Grafana's database credentials come from CNPG. OIDC credentials are read by
# client remains in Vaultwarden; item UUIDs are retained so no secret migration # stable Vaultwarden item and custom-field names, so imports and field ordering
# or rename is required. # do not invalidate the references.
apiVersion: external-secrets.io/v1 apiVersion: external-secrets.io/v1
kind: ExternalSecret kind: ExternalSecret
metadata: metadata:
name: grafana-env name: grafana-env
annotations:
argocd.argoproj.io/sync-wave: "-1"
spec: spec:
refreshInterval: 1h refreshInterval: 1h
target: target:
@@ -84,19 +94,19 @@ spec:
- secretKey: client_id - secretKey: client_id
sourceRef: sourceRef:
storeRef: storeRef:
name: vaultwarden-login name: vaultwarden-fields
kind: ClusterSecretStore kind: ClusterSecretStore
remoteRef: remoteRef:
key: 6a03357b-616e-4973-897a-93ccd675ddcb key: k8s/prometheus/grafana-secrets
property: fields[0].value property: IDM Client ID
- secretKey: client_secret - secretKey: client_secret
sourceRef: sourceRef:
storeRef: storeRef:
name: vaultwarden-login name: vaultwarden-fields
kind: ClusterSecretStore kind: ClusterSecretStore
remoteRef: remoteRef:
key: 6a03357b-616e-4973-897a-93ccd675ddcb key: k8s/prometheus/grafana-secrets
property: fields[1].value property: IDM Client Secret
secretStoreRef: secretStoreRef:
kind: SecretStore kind: SecretStore
name: psql-credentials name: psql-credentials
@@ -105,6 +115,8 @@ apiVersion: external-secrets.io/v1
kind: ExternalSecret kind: ExternalSecret
metadata: metadata:
name: alertmanager-telegram name: alertmanager-telegram
annotations:
argocd.argoproj.io/sync-wave: "-1"
spec: spec:
refreshInterval: 1h refreshInterval: 1h
target: target:
@@ -114,12 +126,21 @@ spec:
type: Opaque type: Opaque
data: data:
bot-token: "{{ .bot_token }}" bot-token: "{{ .bot_token }}"
chat-id: "{{ .chat_id }}"
data: data:
- secretKey: bot_token - secretKey: bot_token
sourceRef: sourceRef:
storeRef: storeRef:
name: vaultwarden-login name: vaultwarden-fields
kind: ClusterSecretStore kind: ClusterSecretStore
remoteRef: remoteRef:
key: eca0fb0b-3939-40a8-890a-6294863e5a65 key: k8s/prometheus/grafana-secrets
property: fields[0].value property: TG Token
- secretKey: chat_id
sourceRef:
storeRef:
name: vaultwarden-fields
kind: ClusterSecretStore
remoteRef:
key: k8s/prometheus/grafana-secrets
property: TG ID
+4 -3
View File
@@ -78,7 +78,9 @@ sidecar:
gateway: gateway:
enabled: true enabled: true
replicas: 2 # A second replica cannot improve availability while both replicas are pinned
# to the only storage node, and the chart's anti-affinity prevents scheduling.
replicas: 1
nodeSelector: nodeSelector:
kubernetes.io/hostname: music kubernetes.io/hostname: music
priorityClassName: monitoring-critical priorityClassName: monitoring-critical
@@ -91,8 +93,7 @@ gateway:
cpu: 500m cpu: 500m
memory: 256Mi memory: 256Mi
podDisruptionBudget: podDisruptionBudget:
enabled: true enabled: false
maxUnavailable: 1
test: test:
enabled: false enabled: false