chore(monitor): upgrade version

Author: duanhongyi

charts/monitor/templates/monitor-grafana-deployment.yaml

@@ -26,27 +26,27 @@ spec:
       - name: drycc-monitor-grafana
         image: {{.Values.grafana.imageRegistry}}/{{.Values.grafana.imageOrg}}/grafana:{{.Values.grafana.imageTag}}
         imagePullPolicy: {{.Values.grafana.imagePullPolicy}}
-{{- if or (.Values.grafana.limitsCpu) (.Values.grafana.limitsMemory)}}
+        {{- if or (.Values.grafana.limitsCpu) (.Values.grafana.limitsMemory)}}
         resources:
           limits:
-{{- if (.Values.grafana.limitsCpu) }}
+            {{- if (.Values.grafana.limitsCpu) }}
             cpu: {{.Values.grafana.limitsCpu}}
-{{- end}}
-{{- if (.Values.grafana.limitsMemory) }}
+            {{- end}}
+            {{- if (.Values.grafana.limitsMemory) }}
             memory: {{.Values.grafana.limitsMemory}}
-{{- end}}
-{{- end}}
+            {{- end}}
+        {{- end}}
         ports:
         - containerPort: 3000
           name: ui
         {{- include "grafana.envs" . | indent 8 }}
-{{- if .Values.grafana.persistence.enabled }}
+      {{- if .Values.grafana.persistence.enabled }}
         volumeMounts:
         - name: grafana-data
           mountPath: /var/lib/grafana
       volumes:
       - name: grafana-data
         persistentVolumeClaim:
           claimName: drycc-monitor-grafana
-{{- end }}
+      {{- end }}
 {{- end }}

grafana/rootfs/Dockerfile

@@ -1,7 +1,7 @@
 FROM docker.io/drycc/go-dev:latest AS go-dev
 
 
-FROM docker.io/grafana/grafana:7.3.4
+FROM docker.io/grafana/grafana:8.3.4
 USER root
 COPY . /
 COPY --from=go-dev /bin/envtpl /usr/share/grafana/envtpl

grafana/rootfs/usr/share/grafana/grafana.ini.tpl

@@ -242,6 +242,8 @@ token_url = {{ .SOCIAL_AUTH_DRYCC_ACCESS_TOKEN_URL }}
 api_url = {{ .SOCIAL_AUTH_DRYCC_USERINFO_URL }}
 allow_sign_up = true
 tls_skip_verify_insecure = true
+role_attribute_path = (is_superuser && 'Admin') || (is_staff && 'Viewer') || ''
+role_attribute_strict = true
 
 [server]
 root_url = {{ .DRYCC_GRAFANA_DOMAIN }}

telegraf/Makefile

@@ -1,4 +1,4 @@
 SHORT_NAME ?= telegraf
-SHELL_SCRIPTS = rootfs/start-telegraf
+SHELL_SCRIPTS = rootfs/home/telegraf/start-telegraf
 
 include ../default.mk

telegraf/rootfs/Dockerfile

@@ -1,15 +1,16 @@
 FROM docker.io/drycc/go-dev:latest AS go-dev
 
 
-FROM docker.io/library/telegraf:1.16.2
+FROM docker.io/library/telegraf:1.21.2
 
 COPY . /
 COPY --from=go-dev /bin/envtpl /usr/bin/envtpl
 
-RUN apt-get update \
+RUN chown -R telegraf /home/telegraf/ \
+  && apt-get update \
   && apt-get install -y --no-install-recommends jq \
   && apt-get autoremove -y \
   && apt-get clean -y \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/man /usr/share/doc
-
-CMD ["/start-telegraf"]
+WORKDIR /home/telegraf
+CMD ["/home/telegraf/start-telegraf"]