From 2df6044b5bffed5c409c4c62f7a2bf4d94d48a47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= <thorsten.rossner.extern@zendis.de>
Date: Fri, 1 Aug 2025 09:58:59 +0200
Subject: [PATCH] fix(natsexporter): Finalize MR

---
 helmfile/apps/nubus/helmfile-child.yaml.gotmpl       |  4 ++--
 .../values-prometheus-nats-exporter.yaml.gotmpl      |  6 ++----
 helmfile/environments/default/charts.yaml.gotmpl     |  2 +-
 helmfile/environments/default/monitoring.yaml.gotmpl | 12 +++++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/helmfile/apps/nubus/helmfile-child.yaml.gotmpl b/helmfile/apps/nubus/helmfile-child.yaml.gotmpl
index 513d64e5..a815e04e 100644
--- a/helmfile/apps/nubus/helmfile-child.yaml.gotmpl
+++ b/helmfile/apps/nubus/helmfile-child.yaml.gotmpl
@@ -38,7 +38,7 @@ repositories:
     url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.nginxS3Gateway.registry }}/{{ .Values.charts.nginxS3Gateway.repository }}"
   # prometheus-nats-exporter chart
   - name: "prometheus-nats-exporter-repo"
-    keyring: "../../files/gpg-pubkeys/opencode.gpg"
+    # keyring: "no_verification"
     verify: {{ .Values.charts.prometheusNatsExporter.verify }}
     username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
     password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
@@ -103,7 +103,7 @@ releases:
       {{- range .Values.customization.release.prometheusNatsExporter }}
       - {{ . }}
       {{- end }}
-    installed: {{ eq .Values.monitoring.prometheus.exporters.nats nil | ternary .Values.monitoring.prometheus.exporters.all .Values.monitoring.prometheus.exporters.nats }}
+    installed: {{ eq .Values.monitoring.prometheus.exporters.overrides.nats nil | ternary .Values.monitoring.prometheus.exporters.global .Values.monitoring.prometheus.exporters.overrides.nats }}
     timeout: 900
 
 commonLabels:
diff --git a/helmfile/apps/nubus/values-prometheus-nats-exporter.yaml.gotmpl b/helmfile/apps/nubus/values-prometheus-nats-exporter.yaml.gotmpl
index 84cb7cc4..f966442c 100644
--- a/helmfile/apps/nubus/values-prometheus-nats-exporter.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-prometheus-nats-exporter.yaml.gotmpl
@@ -1,7 +1,5 @@
-{{/*
-SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
-SPDX-License-Identifier: Apache-2.0
-*/}}
+# SPDX-FileCopyrightText: 2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+# SPDX-License-Identifier: Apache-2.0
 ---
 image:
   repository: {{ coalesce .Values.repositories.image.registryOpencodeDeEnterprise .Values.global.imageRegistry .Values.images.prometheusNatsExporter.registry }}/{{ .Values.images.prometheusNatsExporter.repository }}
diff --git a/helmfile/environments/default/charts.yaml.gotmpl b/helmfile/environments/default/charts.yaml.gotmpl
index 7a15a908..3b42759f 100644
--- a/helmfile/environments/default/charts.yaml.gotmpl
+++ b/helmfile/environments/default/charts.yaml.gotmpl
@@ -442,7 +442,7 @@ charts:
     version: "2.1.2"
     verify: true
   prometheusNatsExporter:
-    # providerCategory: "Platform"
+    # providerCategory: "Community"
     # providerResponsible: "openDesk"
     # upstreamRegistry: "https://ghcr.io"
     # upstreamRepository: "prometheus-community/charts"
diff --git a/helmfile/environments/default/monitoring.yaml.gotmpl b/helmfile/environments/default/monitoring.yaml.gotmpl
index dbcf172f..7b49f47a 100644
--- a/helmfile/environments/default/monitoring.yaml.gotmpl
+++ b/helmfile/environments/default/monitoring.yaml.gotmpl
@@ -17,12 +17,14 @@ monitoring:
       labels:
         release: "kube-prometheus-stack"
 
-    # toggles for deploying additional prometheus exporters as part of openDesk
+    # Prometheus exporter deployment toggles for openDesk
     exporters:
-      # general switch to enable all optional exporters
-      all: false
-      # overwrite for whether a prometheus-nats-exporter should be deployed to allow monitoring of the internal nats server
-      nats: ~
+      # Global switch for all optional exporters
+      global: false
+      # Per-exporter overrides (take precedence over "global")
+      overrides:
+        # prometheus-nats-exporter
+        nats: ~
 
   grafana:
     dashboards: