chore(grafana): add check oauth2 ok

Author: duanhongyi

charts/grafana/templates/_helpers.tmpl

@@ -26,6 +26,8 @@ env:
     secretKeyRef:
       name: controller-creds
       key: service-key
+- name: "DRYCC_QUICKWIT_URL"
+  value: "http://$(DRYCC_CONTROLLER_API_SERVICE_HOST):$(DRYCC_CONTROLLER_API_SERVICE_PORT)/v2/quickwit/drycc"
 - name: "DRYCC_VICTORIAMETRICS_URL"
   value: "http://$(DRYCC_CONTROLLER_API_SERVICE_HOST):$(DRYCC_CONTROLLER_API_SERVICE_PORT)/v2/prometheus/drycc"
 {{- if .Values.passport.enabled}}

charts/grafana/templates/grafana-deployment.yaml

@@ -144,7 +144,7 @@ spec:
         livenessProbe:
           tcpSocket:
             port: oauth2
-          initialDelaySeconds: 120
+          initialDelaySeconds: 240
           periodSeconds: 10
           timeoutSeconds: 5
           failureThreshold: 6
@@ -181,6 +181,12 @@ spec:
         - -ec
         - |
           set -m
+          echo "Waiting for Grafana oauth2 proxy to come up..."
+          until curl -q --fail --output /dev/null --silent "http://localhost:4000/oauth2/healthz"; do
+            printf "."
+            sleep 2
+          done
+          echo "Grafana oauth2 proxy is up and running."
           caddy run --config /usr/share/grafana/Caddyfile
         {{- end }}
         {{- with index .Values "resources" }}
@@ -195,7 +201,7 @@ spec:
         livenessProbe:
           tcpSocket:
             port: proxy
-          initialDelaySeconds: 120
+          initialDelaySeconds: 300
           periodSeconds: 10
           timeoutSeconds: 5
           failureThreshold: 6

rootfs/Dockerfile

@@ -4,7 +4,7 @@ FROM registry.drycc.cc/drycc/base:${CODENAME}
 ENV DRYCC_UID=1001 \
   DRYCC_GID=1001 \
   DRYCC_HOME_DIR=/usr/share/grafana \
-  GRAFANA_VERSION="12.0.1" \
+  GRAFANA_VERSION="12.0.2" \
   JQ_VERSION="1.7.1" \
   CADDY_VERSION="2.9.1" \
   PYTHON_VERSION="3.13"

rootfs/usr/share/grafana/dashboards/drycc_quickwit.json

@@ -59,7 +59,7 @@
     ]
   },
   "description": "Dashboard to monitor Quickwit indexers.",
-  "editable": true,
+  "editable": false,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
   "id": null,

rootfs/usr/share/grafana/provisioning/datasources/drycc.yaml

@@ -1,5 +1,19 @@
 apiVersion: 1
 datasources:
+- name: Application Logs
+  type: quickwit-quickwit-datasource
+  access: proxy
+  orgId: 1
+  url: $DRYCC_QUICKWIT_URL
+  jsonData:
+    httpHeaderName1: X-Drycc-Service-Key
+    index: logs-*
+    logMessageField: log
+  secureJsonData:
+    httpHeaderValue1: $DRYCC_SERVICE_KEY
+  version: 1
+  editable: false
+
 - name: Prometheus on Drycc
   type: prometheus
   access: proxy