fix(grafana): Pin image to 9.5.7

mesosphere · Aug 17, 2023 · 3c77429 · 3c77429
1 parent a232078
commit 3c77429
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
@@ -94,12 +94,6 @@ resources:
       - license_path: LICENSE
         ref: v${image_tag%-rootless}
         url: https://github.com/go-gitea/gitea
-  - container_image: docker.io/grafana/grafana:8.5.14
-    sources:
-      - license_path: LICENSE
-        notice_path: NOTICE.md
-        ref: v${image_tag}
-        url: https://github.com/grafana/grafana
   - container_image: docker.io/grafana/grafana:9.4.7
     sources:
       - license_path: LICENSE
@@ -112,7 +106,7 @@ resources:
         notice_path: NOTICE.md
         ref: v${image_tag}
         url: https://github.com/grafana/grafana
-  - container_image: docker.io/grafana/grafana:10.0.3
+  - container_image: docker.io/grafana/grafana:9.5.7
     sources:
       - license_path: LICENSE
         notice_path: NOTICE.md

diff --git a/services/grafana-logging/6.58.6/defaults/cm.yaml b/services/grafana-logging/6.58.6/defaults/cm.yaml
@@ -7,6 +7,10 @@ data:
   values.yaml: |
     ---
     priorityClassName: "dkp-critical-priority"
+    # pinning grafana to 9.5 since it appears that upgrading to v10 is causing issues with prometheus scrapin
+    # grafana metrics
+    image:
+      tag: 9.5.7
     datasources:
       datasources.yaml:
         apiVersion: 1

diff --git a/services/grafana-logging/6.58.6/grafana.yaml b/services/grafana-logging/6.58.6/grafana.yaml
@@ -39,7 +39,7 @@ data:
   dashboardLink: "/dkp/logging/grafana"
   docsLink: "https://grafana.com/docs/"
   # Check https://artifacthub.io/packages/helm/grafana/grafana/6.58.6 for app version
-  version: "10.0.2"
+  version: "9.5.7"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/services/kube-prometheus-stack/48.3.1/defaults/cm.yaml b/services/kube-prometheus-stack/48.3.1/defaults/cm.yaml
@@ -340,6 +340,10 @@ data:
             memory: 200Mi
     grafana:
       enabled: true
+      # pinning grafana to 9.5 since it appears that upgrading to v10 is causing issues with prometheus scrapin
+      # grafana metrics
+      image:
+        tag: 9.5.7
       defaultDashboardsEnabled: true
       priorityClassName: "dkp-critical-priority"
       serviceMonitor:

diff --git a/services/kube-prometheus-stack/48.3.1/helmrelease/kube-prometheus-stack.yaml b/services/kube-prometheus-stack/48.3.1/helmrelease/kube-prometheus-stack.yaml
@@ -77,4 +77,4 @@ data:
   # Since Grafana is a subchart of kube-prometheus-stack, get the version of the Grafana chart dependency at:
   # https://github.com/mesosphere/charts/tree/master/staging/kube-prometheus-stack/charts
   # Then, check https://artifacthub.io/packages/helm/grafana/grafana/ for app version
-  version: "10.0.3"
+  version: "9.5.7"
diff --git a/services/kube-prometheus-stack/metadata.yaml b/services/kube-prometheus-stack/metadata.yaml
@@ -27,7 +27,7 @@ overview: |-
 
   - [Prometheus Alertmanager Documentation - Overview](https://prometheus.io/docs/alerting/latest/alertmanager/)
 
-  ### Grafana (v10.0.3)
+  ### Grafana (v9.5.7)
   A monitoring dashboard from Grafana that can be used to visualize metrics collected by Prometheus.
 
   - [Grafana Documentation](https://grafana.com/docs/)

diff --git a/services/project-grafana-logging/6.58.6/defaults/cm.yaml b/services/project-grafana-logging/6.58.6/defaults/cm.yaml
@@ -7,6 +7,10 @@ data:
   values.yaml: |
     ---
     priorityClassName: "dkp-critical-priority"
+    # pinning grafana to 9.5 since it appears that upgrading to v10 is causing issues with prometheus scrapin
+    # grafana metrics
+    image:
+      tag: 9.5.7
     datasources:
       datasources.yaml:
         apiVersion: 1