[FIX] Connect to Grafana using https from auto-provisioning sidecars (s…

…assoftware#627)
greg-wootton · Apr 4, 2024 · 7a32939 · 7a32939
1 parent c941cc0
commit 7a32939
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,8 @@
 * **Overall**
 
 * **Metrics**
-
+  * [FIX] Connect to Grafana using https from auto-provisioning sidecar containers when TLS is enabled
+
 * **Logging**
   * [FIX] Corrected parser definition for Consul messages to eliminate ERROR/WARNING messages in Fluent Bit pod logs
   * [CHANGE] Added parser/processing for Redis log messsages
@@ -14,7 +15,6 @@
 
 * **Tracing**
 
-
 ## Version 1.2.23 (19MAR2024)
 * **Overall**
   * [CHANGE] Drop support for OpenShift 4.11; the minimum supported version of OpenShift is now 4.12.

diff --git a/monitoring/tls/values-prom-operator-tls.yaml b/monitoring/tls/values-prom-operator-tls.yaml
@@ -71,8 +71,15 @@ grafana:
     port: 3000
     targetPort: 3000
   sidecar:
+    dashboards:
+      reloadURL: "https://localhost:3000/api/admin/provisioning/dashboards/reload"
+      env:
+        REQ_SKIP_TLS_VERIFY: true
     datasources:
       defaultDatasourceEnabled: false
+      reloadURL: "https://localhost:3000/api/admin/provisioning/datasources/reload"
+      env:
+        REQ_SKIP_TLS_VERIFY: true
   "grafana.ini":
     server:
       protocol: https