feat(grafana): Use grafana 9.5.7

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

services/grafana-logging/6.58.6/defaults/cm.yaml

@@ -7,12 +7,10 @@ data:
   values.yaml: |
     ---
     priorityClassName: "dkp-critical-priority"
-    # overriding the default image due to this issue
-    # https://d2iq.atlassian.net/browse/D2IQ-94038
-    # cause by upstream bug
-    # https://github.com/grafana/grafana/issues/56087
+    # pinning grafana to 9.5 since it appears that upgrading to v10 is causing issues with prometheus scraping
+    # grafana metrics
     image:
-      tag: 8.5.14
+      tag: 9.5.7
     datasources:
       datasources.yaml:
         apiVersion: 1
@@ -62,6 +60,11 @@ data:
       type: ClusterIP
       port: 3000
 
+    serviceMonitor:
+      enabled: true
+      labels:
+        prometheus.kommander.d2iq.io/select: "true"
+
     resources:
       # keep request = limit to keep this container in guaranteed class
       limits:

services/grafana-logging/6.58.6/grafana.yaml

@@ -38,8 +38,8 @@ data:
   name: "Grafana Logging"
   dashboardLink: "/dkp/logging/grafana"
   docsLink: "https://grafana.com/docs/"
-  # Check https://artifacthub.io/packages/helm/grafana/grafana/6.57.4 for app version
-  version: "9.5.5"
+  # Check https://artifacthub.io/packages/helm/grafana/grafana/6.58.6 for app version
+  version: "9.5.7"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

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 scraping
+      # grafana metrics
+      image:
+        tag: 9.5.7
       defaultDashboardsEnabled: true
       priorityClassName: "dkp-critical-priority"
       serviceMonitor:

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"

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/)

services/project-grafana-logging/6.58.6/defaults/cm.yaml

@@ -7,12 +7,10 @@ data:
   values.yaml: |
     ---
     priorityClassName: "dkp-critical-priority"
-    # overriding the default image due to this issue
-    # https://d2iq.atlassian.net/browse/D2IQ-94038
-    # cause by upstream bug
-    # https://github.com/grafana/grafana/issues/56087
+    # pinning grafana to 9.5 since it appears that upgrading to v10 is causing issues with prometheus scraping
+    # grafana metrics
     image:
-      tag: 8.5.14
+      tag: 9.5.7
     datasources:
       datasources.yaml:
         apiVersion: 1
@@ -63,6 +61,11 @@ data:
       type: ClusterIP
       port: 3000
 
+    serviceMonitor:
+      enabled: true
+      labels:
+        prometheus.kommander.d2iq.io/select: "true"
+
     resources:
       # keep request = limit to keep this container in guaranteed class
       limits: