test

Author: ndr-ds

kubernetes/linera-validator/helmfile.yaml

@@ -1,7 +1,7 @@
 environments:
   default:
     values:
-      - writeToGrafanaCloud: {{ env "LINERA_WRITE_TO_GRAFANA_CLOUD" | default "false" }}
+      - writeToGrafanaCloud: {{ env "LINERA_WRITE_TO_GRAFANA_CLOUD" | default "true" }}
         validatorLabel: {{ env "LINERA_VALIDATOR_LABEL" | default (printf "local-%s" (env "USER")) }}
 
 ---
@@ -25,8 +25,8 @@ releases:
       - scylla/scylla
     values:
       {{ if .Values.writeToGrafanaCloud -}}
-      - grafanaCloudUsername: {{ fetchSecretValue (env "LINERA_GRAFANA_CLOUD_USERNAME_SECRET") | quote }}
-        grafanaCloudAPIToken: {{ fetchSecretValue (env "LINERA_GRAFANA_CLOUD_API_TOKEN_SECRET") | quote }}
+      - grafanaCloudUsername: {{ fetchSecretValue (env "LINERA_GRAFANA_CLOUD_USERNAME_SECRET" | default "ref+gcpsecrets://linera-io-dev/grafana-cloud-username?version=latest") | quote }}
+        grafanaCloudAPIToken: {{ fetchSecretValue (env "LINERA_GRAFANA_CLOUD_API_TOKEN_SECRET" | default "ref+gcpsecrets://linera-io-dev/grafana-cloud-api-token?version=latest") | quote }}
       {{- end }}
       - writeToGrafanaCloud: {{ .Values.writeToGrafanaCloud }}
       - {{ env "LINERA_HELMFILE_VALUES_LINERA_CORE" | default "values-local.yaml.gotmpl" }}

kubernetes/linera-validator/templates/scylla-manager-service-monitor.yaml

@@ -1,4 +1,3 @@
-{{- if not .Values.writeToGrafanaCloud }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -16,4 +15,3 @@ spec:
           targetLabel: instance
           regex: (.*)
           replacement: ${1}
-{{- end }}

kubernetes/linera-validator/templates/scylla-service-monitor.yaml

@@ -1,4 +1,3 @@
-{{- if not .Values.writeToGrafanaCloud }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -32,4 +31,3 @@ spec:
           regex: (.*)
           replacement: ${1}
           action: replace
-{{- end }}

kubernetes/linera-validator/values-local.yaml.gotmpl

@@ -55,9 +55,10 @@ kube-prometheus-stack:
               name: grafana-cloud-auth-secret
               key: password
           writeRelabelConfigs:
-            - source_labels: [__name__]
-              regex: 'linera_.*'
-              action: keep
+            - source_labels:
+              - "__name__"
+              regex: "(apiextensions|apiserver|csi|kube|kubelet|kubernetes|node|prober|prometheus|rest|storage|volume|etcd|net|grafana)_.+"
+              action: "drop"
       externalLabels:
         validator: {{ .Values.validatorLabel }}
       {{- end }}
@@ -77,7 +78,6 @@ kube-prometheus-stack:
       # This prevents from adding any Helm label to serviceMonitorSelector if
       # above is empty.
       serviceMonitorSelectorNilUsesHelmValues: false
-      {{- if not .Values.writeToGrafanaCloud }}
       # Relabelings needed for Scylla dashboards
       additionalScrapeConfigs:
         - job_name: scylla
@@ -117,7 +117,6 @@ kube-prometheus-stack:
               regex: '([0-9]+\.[0-9]+)(\.?[0-9]*).*'
               replacement: '$1$2'
               target_label: svr
-      {{- end }}
 
 # Environment
 environment: "kind"