Update versions

* grafana 12.3.5
* grafonnet 10.4.0
* jsonnet dependencies

Dittybopper template volume tweaks
Signed-off-by: Andrew Collins <ancollin@redhat.com>

Author: afcollins

Dockerfile

@@ -4,7 +4,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal
 WORKDIR /performance-dashboards
 
 # Install necessary libraries for subsequent commands
-RUN microdnf install -y podman python3 python3-pip && \
+RUN microdnf install -y podman python3.12 python3.12-pip && \
     microdnf clean all && \
     rm -rf /var/cache/yum
 

assets/pgbench-dashboard/panels.libsonnet

@@ -87,8 +87,7 @@ local g = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonn
       + options.color.HeatmapColorOptions.withReverse(false)
       + options.withCellGap(2)
       + options.filterValues.FilterValueRange.withLe(1e-9)
-      + options.tooltip.withShow(false)
-      + options.tooltip.withYHistogram(false)
+      + options.withTooltip(false)
       + options.legend.withShow(true)
       + options.exemplars.withColor('rgba(255,0,255,0.7)')
       + options.withShowValue('never')

dittybopper/deploy.sh

@@ -41,8 +41,8 @@ export PROMETHEUS_USER=internal
 export GRAFANA_ADMIN_PASSWORD=admin
 export GRAFANA_URL="http://admin:${GRAFANA_ADMIN_PASSWORD}@localhost:3000"
 export SYNCER_IMAGE=${SYNCER_IMAGE:-"quay.io/cloud-bulldozer/dittybopper-syncer:latest"} # Syncer image
-export GRAFANA_IMAGE=${GRAFANA_IMAGE:-"quay.io/cloud-bulldozer/grafana:9.4.3"} # Syncer image
-export GRAFANA_RENDERER_IMAGE=${GRAFANA_RENDERER_IMAGE:-"grafana/grafana-image-renderer:latest"} # Grafana renderer image
+export GRAFANA_IMAGE=${GRAFANA_IMAGE:-"docker.io/grafana/grafana:12.3.5"} # Grafana image
+export GRAFANA_RENDERER_IMAGE=${GRAFANA_RENDERER_IMAGE:-"docker.io/grafana/grafana-image-renderer:v5.7.1"} # Grafana renderer image
 
 # Set defaults for command options
 k8s_cmd='oc'

dittybopper/k8s-deploy.sh

@@ -41,7 +41,8 @@ export GRAFANA_ADMIN_PASSWORD=admin
 export GRAFANA_URL="http://admin:${GRAFANA_ADMIN_PASSWORD}@localhost:3000"
 export DASHBOARDS="k8s-performance.json"
 export SYNCER_IMAGE=${SYNCER_IMAGE:-"quay.io/cloud-bulldozer/dittybopper-syncer:latest"} # Syncer image
-export GRAFANA_IMAGE=${GRAFANA_IMAGE:-"quay.io/cloud-bulldozer/grafana:9.4.3"} # Syncer image
+export GRAFANA_IMAGE=${GRAFANA_IMAGE:-"docker.io/grafana/grafana:12.3.5"} # Grafana image
+export GRAFANA_RENDERER_IMAGE=${GRAFANA_RENDERER_IMAGE:-"docker.io/grafana/grafana-image-renderer:v5.7.1"} # Grafana renderer image
 
 
 # Set defaults for command options

dittybopper/templates/dittybopper.yaml.template

@@ -90,10 +90,13 @@ spec:
         - name: sc-grafana-http
           containerPort: 3000
         volumeMounts:
-        - mountPath: /etc/grafana
+        - mountPath: /etc/grafana/grafana.ini
           name: sc-grafana-config
+          subPath: grafana.ini
         - mountPath: /etc/grafana/provisioning/datasources
           name: sc-ocp-prom
+        - mountPath: /var/lib/grafana
+          name: grafana-data
         env:
         - name: GF_RENDERING_SERVER_URL
           value: "http://renderer.dittybopper.svc:8081/render"
@@ -116,6 +119,8 @@ spec:
       - name: sc-ocp-prom
         configMap:
           name: sc-ocp-prom
+      - name: grafana-data
+        emptyDir: {}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -130,7 +135,7 @@ data:
       type: prometheus
       access: proxy
       orgId: 1
-      url: ${PROMETHEUS_URL}
+      url: "${PROMETHEUS_URL}"
       isDefault: true
       jsonData:
         tlsSkipVerify: true

dittybopper/templates/k8s-dittybopper.yaml.template

@@ -58,7 +58,7 @@ metadata:
   labels:
     app: dittybopper
   name: dittybopper
-  namespace: $namespace 
+  namespace: $namespace
 spec:
   replicas: 1
   selector:
@@ -78,10 +78,13 @@ spec:
         - name: sc-grafana-http
           containerPort: 3000
         volumeMounts:
-        - mountPath: /etc/grafana
+        - mountPath: /etc/grafana/grafana.ini
           name: sc-grafana-config
+          subPath: grafana.ini
         - mountPath: /etc/grafana/provisioning/datasources
           name: sc-ocp-prom
+        - mountPath: /var/lib/grafana
+          name: grafana-data
         env:
         - name: GF_RENDERING_SERVER_URL
           value: "http://renderer.dittybopper.svc:8081/render"
@@ -104,12 +107,14 @@ spec:
       - name: sc-ocp-prom
         configMap:
           name: sc-ocp-prom
+      - name: grafana-data
+        emptyDir: {}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: sc-ocp-prom
-  namespace: $namespace 
+  namespace: $namespace
 data:
   ocp-prometheus.yml: |
     apiVersion: 1
@@ -118,7 +123,7 @@ data:
       type: prometheus
       access: proxy
       orgId: 1
-      url: ${PROMETHEUS_URL}
+      url: "${PROMETHEUS_URL}"
       basicAuth: false
       withCredentials: false
       isDefault: true
@@ -131,7 +136,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: sc-grafana-config
-  namespace: $namespace 
+  namespace: $namespace
 data:
   grafana.ini: |
     ##################### Grafana Configuration Example #####################

templates/jsonnetfile.lock.json

@@ -8,18 +8,18 @@
           "subdir": "gen/grafonnet-latest"
         }
       },
-      "version": "9e217263ac4b922ca2e00bc5cc36ada2311bb5a6",
-      "sum": "k5S6Nf6VA8Lg9B/qyB5XEoxDmIf5PsW8HTuC/BaNnu4="
+      "version": "439f4deb9d06f12831884595203376373cf22508",
+      "sum": "GxEO83uxgsDclLp/fmlUJZDbSGpeUZY6Ap3G2cgdL1g="
     },
     {
       "source": {
         "git": {
           "remote": "https://github.com/grafana/grafonnet.git",
-          "subdir": "gen/grafonnet-v10.1.0"
+          "subdir": "gen/grafonnet-v10.4.0"
         }
       },
-      "version": "9e217263ac4b922ca2e00bc5cc36ada2311bb5a6",
-      "sum": "GpXlwBysu8dnoH9oYmsJj31CCVsL+wXnbWMxq7sl5Gg="
+      "version": "439f4deb9d06f12831884595203376373cf22508",
+      "sum": "DKj+Sn+rlI48g/aoJpzkfPge46ya0jLk5kcZoiZ2X/I="
     },
     {
       "source": {
@@ -28,8 +28,8 @@
           "subdir": "doc-util"
         }
       },
-      "version": "503e5c8fe96d6b55775037713ac10b184709ad93",
-      "sum": "BY4u0kLF3Qf/4IB4HnX9S5kEQIpHb4MUrppp6WLDtlU="
+      "version": "6ac6c69685b8c29c54515448eaca583da2d88150",
+      "sum": "BrAL/k23jq+xy9oA7TWIhUx07dsA/QLm3g7ktCwe//U="
     },
     {
       "source": {
@@ -38,8 +38,8 @@
           "subdir": ""
         }
       },
-      "version": "c1a315a7dbead0335a5e0486acc5583395b22a24",
-      "sum": "UVdL+uuFI8BSQgLfMJEJk2WDKsQXNT3dRHcr2Ti9rLI="
+      "version": "4d7f8cb24d613430799f9d56809cc6964f35cea9",
+      "sum": "hOrwkOx34tOXqoDVnwuI/Uf/dr9HFFSPWpDPOvnEGrk="
     }
   ],
   "legacyImports": false