Improvements to prometheus and Grafana (#1991)

apache · Oct 4, 2023 · 5ed09fd · 5ed09fd
1 parent 4829537
commit 5ed09fd
Show file tree

Hide file tree

Showing 6 changed files with 195 additions and 681 deletions.
diff --git a/installer/k8s/README.md b/installer/k8s/README.md
@@ -280,7 +280,7 @@ rm -rf ${HOME}/streampipes-k8s
 | prometheus.config.backendJobName                | Prometheus backend job name                              | "backend"                                |
 | prometheus.config.extensionsName                | Prometheus extensions job name                           | "extensions-all-iiot"                    |
 | prometheus.config.tokenFileName                 | Prometheus token file name                               | "token"                                  |
-| prometheus.config.tokenFileDir                  | Prometheus token file directory                          | "/opt/data/"
+| prometheus.config.tokenFileDir                  | Prometheus token file directory                          | "/opt/data"
 
 #### Monitoring - Grafana
 | Parameter Name                                  | Description                                              | Value                                    |

diff --git a/installer/k8s/templates/monitor/prometheus/prometheus-configmap.yaml b/installer/k8s/templates/monitor/prometheus/prometheus-configmap.yaml
@@ -37,7 +37,7 @@ data:
 
       - job_name: "{{ .Values.monitoring.prometheus.config.backendJobName }}"
         metrics_path: "/streampipes-backend/actuator/prometheus"
-        bearer_token_file: "{{ .Values.monitoring.prometheus.config.tokenFileDir }}{{ .Values.monitoring.prometheus.config.tokenFileName }}{{ .Values.monitoring.prometheus.config.tokenFileName }}"
+        bearer_token_file: "{{ .Values.monitoring.prometheus.config.tokenFileDir }}/{{ .Values.monitoring.prometheus.config.tokenFileName }}"
         static_configs:
           - targets: [ "{{ .Values.streampipes.core.service.name }}:{{ .Values.streampipes.core.service.port }}" ]
 

diff --git a/installer/k8s/templates/monitor/prometheus/prometheus-deployment.yml b/installer/k8s/templates/monitor/prometheus/prometheus-deployment.yml
@@ -51,7 +51,7 @@ spec:
           imagePullPolicy: "IfNotPresent"
           env:
             - name: SP_HOST
-              value: "backend"
+              value: "{{ .Values.streampipes.core.service.name }}"
             - name: SP_PORT
               value: "{{ .Values.streampipes.core.service.port }}"
             - name: SP_USERNAME
@@ -60,13 +60,13 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.streampipes.auth.secretName}}
-                  key: sp-encryption-passcode
+                  key: sp-initial-admin-password
             - name: PROMETHEUS_HOST
               value: "{{ .Values.monitoring.prometheus.service.name }}"
             - name: PROMETHEUS_PORT
               value: "{{ .Values.monitoring.prometheus.service.port }}"
             - name: TOKEN_FILE
-              value: "{{ .Values.monitoring.prometheus.config.tokenFileDir }}{{ .Values.monitoring.prometheus.config.tokenFileName }}"
+              value: "{{ .Values.monitoring.prometheus.config.tokenFileDir }}/{{ .Values.monitoring.prometheus.config.tokenFileName }}"
           volumeMounts:
             - name: shared-token
               mountPath: {{ .Values.monitoring.prometheus.config.tokenFileDir }}

diff --git a/installer/k8s/values.yaml b/installer/k8s/values.yaml
@@ -212,7 +212,7 @@ monitoring:
       backendJobName: backend
       extensionsName: extensions-all-iiot
       tokenFileName: token
-      tokenFileDir: /opt/data/
+      tokenFileDir: /opt/data
 
   # monitoring - grafana
   grafana: