chore(grafana): change deployment to statefulset

Author: duanhongyi

charts/grafana/templates/grafana-configmap.yaml

@@ -37,9 +37,9 @@ data:
     app_mode = production
 
     [paths]
-    data = /var/lib/grafana
+    data = /opt/drycc/grafana/data
     home = /usr/share/grafana
-    logs = /var/log/grafana
+    logs = /opt/drycc/grafana/data/logs
     plugins = /usr/share/grafana/plugins
     provisioning = /usr/share/grafana/provisioning
 

charts/grafana/templates/grafana-pvc.yaml

@@ -0,0 +1,37 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: drycc-grafana
+  annotations:
+    {{- with .Values.service.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  labels:
+    heritage: drycc
+    app: drycc-grafana
+spec:
+  type: ClusterIP
+  publishNotReadyAddresses: true
+  ports:
+  - name: grafana-tcp
+    port: 3000
+    targetPort: grafana
+    protocol: TCP
+  - name: alerting-tcp
+    port: 9094
+    targetPort: alerting
+    protocol: TCP
+  - name: alerting-udp
+    port: 9094
+    targetPort: alerting
+    protocol: UDP
+  - name: oauth2-tcp
+    port: 4000
+    targetPort: oauth2
+    protocol: TCP
+  - name: proxy-tcp
+    port: 80
+    targetPort: proxy
+    protocol: TCP
+  selector:
+    app: drycc-grafana

charts/grafana/templates/grafana-service.yaml

@@ -1,5 +1,5 @@
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
   name: drycc-grafana
   labels:
@@ -8,11 +8,9 @@ metadata:
     component.drycc.cc/version: {{ .Values.imageTag }}
 spec:
   replicas: 1
-  strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 0
+  updateStrategy:
     type: RollingUpdate
+  podManagementPolicy: Parallel
   selector:
     matchLabels:
       app: drycc-grafana
@@ -194,7 +192,7 @@ spec:
           {{- toYaml . | nindent 10 }}
         {{- end }}
         ports:
-        - containerPort: 5000
+        - containerPort: 80
           name: proxy
         {{- include "grafana.envs" . | indent 8 }}
         {{- if not .Values.diagnosticMode.enabled }}
@@ -226,16 +224,26 @@ spec:
           successThreshold: 1
         {{- end }}
         volumeMounts:
+        {{- if .Values.persistence.enabled }}
+        - name: grafana-data
+          mountPath: /opt/drycc/grafana/data
+        {{- end }}
         - name: grafana-config
           subPath: Caddyfile
           readOnly: true
           mountPath: /usr/share/grafana/Caddyfile
       volumes:
-      {{- if .Values.persistence.enabled }}
-      - name: grafana-data
-        persistentVolumeClaim:
-          claimName: drycc-grafana
-      {{- end }}
       - name: grafana-config
         configMap:
           name: grafana-config
+  {{- if .Values.persistence.enabled }}
+  volumeClaimTemplates:
+  - metadata:
+      name: grafana-data
+    spec:
+      accessModes: [ "ReadWriteOnce" ]
+      storageClassName: {{ .Values.persistence.storageClass }}
+      resources:
+        requests:
+          storage: {{ .Values.persistence.size | quote }}
+  {{- end }}

…rafana/templates/grafana-deployment.yaml …afana/templates/grafana-statefulset.yamlcharts/grafana/templates/grafana-deployment.yaml renamed to charts/grafana/templates/grafana-statefulset.yaml charts/grafana/templates/grafana-deployment.yaml renamed to charts/grafana/templates/grafana-statefulset.yaml

@@ -53,8 +53,8 @@ service:
 
 persistence:
   enabled: false
-  accessMode: ReadWriteOnce
   size: 5Gi
+  storageClass: ""
 # Any custom grafana environment variables
 # can be specified as key-value pairs under environment
 # this is usually a non required setting.

charts/grafana/templates/grafana-svc.yaml

@@ -25,11 +25,11 @@ RUN install-packages unzip fontconfig \
   && chown -R ${DRYCC_UID}:${DRYCC_GID} ${DRYCC_HOME_DIR} \
   # set env
   && echo "source ${DRYCC_HOME_DIR}/venv/bin/activate" >> /opt/drycc/python/profile.d/python.sh \
-  # grafana plugin
+  # grafana plugins
   && mkdir ${DRYCC_HOME_DIR}/plugins \
-  && curl -sSL https://github.com/quickwit-oss/quickwit-datasource/releases/download/v0.4.6/quickwit-quickwit-datasource-0.4.6.zip -o quickwit.zip \
-  && unzip quickwit.zip -d ${DRYCC_HOME_DIR}/plugins \
-  && rm -rf quickwit.zip \
+  && grafana cli --pluginsDir=${DRYCC_HOME_DIR}/plugins --homepath=/opt/drycc/grafana plugins install grafana-llm-app \
+  && grafana cli --pluginsDir=${DRYCC_HOME_DIR}/plugins --homepath=/opt/drycc/grafana plugins install quickwit-quickwit-datasource \
+  # clean
   && rm -rf \
       /usr/share/doc \
       /usr/share/man \

charts/grafana/values.yaml

@@ -1,9 +1,9 @@
 from .grafana import (
-    init_org, sync_user, sync_role, sync_datasources, sync_folder, sync_dashboards, sync_alerting
+    init_org, sync_user, sync_role, sync_default, sync_datasources, sync_dashboards, sync_alerting
 )
 
 startup_hooks = [init_org]
 login_hooks = [
-    sync_user, sync_role, sync_datasources, sync_folder, sync_dashboards, sync_alerting
+    sync_user, sync_role, sync_default, sync_datasources, sync_dashboards, sync_alerting
 ]
 destroy_hooks = []

rootfs/Dockerfile

@@ -82,13 +82,26 @@ async def sync_role(context: dict, token: dict, userinfo: dict):
     await init_org(org_id=context["org_id"], name=userinfo["preferred_username"])
 
 
-async def sync_folder(context: dict, token: dict, userinfo: dict):
+async def sync_default(context: dict, token: dict, userinfo: dict):
     async with httpx.AsyncClient() as client:
         await client.post(
             api_url("/api/folders"),
             headers=api_headers(context, userinfo),
             json={"uid": "drycc", "title": "drycc"},
         )
+        await client.post(
+            api_url("/api/v1/provisioning/contact-points"),
+            headers=api_headers(context, userinfo),
+            json={
+                "uid": "grafana-default-email",
+                "name": "grafana-default-email",
+                "type": "email",
+                "settings": {
+                    "addresses": f"{userinfo["email"]}"
+                },
+                "disableResolveMessage": False
+            },
+        )
 
 
 async def sync_alerting(context: dict, token: dict, userinfo: dict):