Fix remote config secret environment variable and telemetry services deployment notes

Signed-off-by: Pete Wall <pete.wall@grafana.com>

Author: petewall

charts/k8s-monitoring/charts/telemetry-services/templates/_notes.tpl

@@ -0,0 +1,17 @@
+{{- define "telemetry-services.notes.deployments" }}
+{{- if dig "node-exporter" "deploy" false . }}
+* Node Exporter (daemonset)
+{{- end }}
+{{- if dig "windows-exporter" "deploy" false . }}
+* Windows Exporter (daemonset)
+{{- end }}
+{{- if dig "kube-state-metrics" "deploy" false . }}
+* kube-state-metrics (deployment)
+{{- end }}
+{{- if dig "kepler" "deploy" false . }}
+* Kepler (daemonset)
+{{- end }}
+{{- if dig "opencost" "deploy" false . }}
+* OpenCost (deployment)
+{{- end }}
+{{- end }}

charts/k8s-monitoring/docs/examples/instrumentation-hub/output.yaml

@@ -8,6 +8,7 @@ This chart will install the following components:
   {{- include (printf "feature.%s.notes.deployments" $feature) (dict "Values" (index $.Values $feature)) | indent 0 }}
 {{- end }}
 {{- include "collectors.notes.deployments" . }}
+{{- include "telemetry-services.notes.deployments" (index .Values "telemetry-services" | default dict) }}
 
 It will:
 {{- $isTranslating := false }}

charts/k8s-monitoring/docs/examples/remote-config/output.yaml

@@ -19,7 +19,7 @@
     {{- end }}
 
     {{- if eq (include "collectors.hasExtraEnv" (deepCopy $ | merge (dict "collectorName" $collectorName "envVarName" "GCLOUD_RW_API_KEY"))) "false" }}
-      {{- $remoteConfigValues := merge ((get $.Values.collectors $collectorName).remoteConfig) (dict "type" "remoteConfig") }}
+      {{- $remoteConfigValues := merge (dict "type" "remoteConfig") (get $collectorValues "remoteConfig") }}
       {{- if eq (include "secrets.usesKubernetesSecret" $remoteConfigValues ) "true" }}
         {{- $secretName := include "secrets.kubernetesSecretName" (dict "Values" $.Values "Chart" $.Chart "Release" $.Release "object" $remoteConfigValues "name" (printf "%s-remote-cfg" $collectorName)) }}
         {{- $secretKey := include "secrets.getSecretKey" (dict "object" $remoteConfigValues "key" "auth.password") }}

charts/k8s-monitoring/templates/NOTES.txt

@@ -0,0 +1,37 @@
+should list all telemetry services when all are enabled:
+  1: |
+    |
+      Grafana k8s-monitoring Helm chart deployed!
+
+      This chart will install the following components:
+      * Grafana Alloy Operator
+      * Grafana Alloy "my-collector" (daemonset)
+      * Node Exporter (daemonset)
+      * Windows Exporter (daemonset)
+      * kube-state-metrics (deployment)
+      * Kepler (daemonset)
+      * OpenCost (deployment)
+
+      It will:
+should list node-exporter and windows-exporter:
+  1: |
+    |
+      Grafana k8s-monitoring Helm chart deployed!
+
+      This chart will install the following components:
+      * Grafana Alloy Operator
+      * Grafana Alloy "my-collector" (daemonset)
+      * Node Exporter (daemonset)
+      * Windows Exporter (daemonset)
+
+      It will:
+should list nothing when all telemetry services are disabled:
+  1: |
+    |
+      Grafana k8s-monitoring Helm chart deployed!
+
+      This chart will install the following components:
+      * Grafana Alloy Operator
+      * Grafana Alloy "my-collector" (daemonset)
+
+      It will:

charts/k8s-monitoring/templates/collectors/_collector_remoteConfig.tpl

@@ -0,0 +1,67 @@
+# yamllint disable rule:document-start rule:line-length rule:trailing-spaces
+suite: Telemetry Services - Notes
+templates:
+  - NOTES.txt
+tests:
+  - it: should list node-exporter and windows-exporter
+    set:
+      cluster:
+        name: ci-test-cluster
+      destinations:
+        prometheus:
+          type: prometheus
+          url: http://prometheus.prometheus.svc:9090
+      collectors: {my-collector: {}}
+      telemetry-services:
+        node-exporter:
+          deploy: true
+        windows-exporter:
+          deploy: true
+    asserts:
+      - matchSnapshotRaw: {}
+
+  - it: should list all telemetry services when all are enabled
+    set:
+      cluster:
+        name: ci-test-cluster
+      destinations:
+        prometheus:
+          type: prometheus
+          url: http://prometheus.prometheus.svc:9090
+      collectors: {my-collector: {}}
+      telemetry-services:
+        node-exporter:
+          deploy: true
+        windows-exporter:
+          deploy: true
+        kube-state-metrics:
+          deploy: true
+        kepler:
+          deploy: true
+        opencost:
+          deploy: true
+    asserts:
+      - matchSnapshotRaw: {}
+
+  - it: should list nothing when all telemetry services are disabled
+    set:
+      cluster:
+        name: ci-test-cluster
+      destinations:
+        prometheus:
+          type: prometheus
+          url: http://prometheus.prometheus.svc:9090
+      collectors: {my-collector: {}}
+      telemetry-services:
+        node-exporter:
+          deploy: false
+        windows-exporter:
+          deploy: false
+        kube-state-metrics:
+          deploy: false
+        kepler:
+          deploy: false
+        opencost:
+          deploy: false
+    asserts:
+      - matchSnapshotRaw: {}