chore(monitor): modify grafana dashboard with FLUX and pretty config.toml

Author: lijianguo

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

@@ -38,13 +38,13 @@ spec:
 {{- end}}
         env:
         {{- if eq .Values.global.influxdb_location "off-cluster" }}
-        - name: "INFLUXDB_URLS"
+        - name: "INFLUXDB_URL"
           valueFrom:
             secretKeyRef:
               name: influxdb-creds
               key: url
         {{- else }}
-        - name: "INFLUXDB_URLS"
+        - name: "INFLUXDB_URL"
           value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT_TRANSPORT)\""
         {{- end }}
         - name: "INFLUXDB_BUCKET"
@@ -63,7 +63,7 @@ spec:
               name: influxdb-creds
               key: token
         - name: "BIND_PORT"
-          value: "3500"
+          value: "3000"
         - name: "DEFAULT_USER"
           value: {{.Values.grafana.user}}
         - name: "DEFAULT_USER_PASSWORD"
@@ -75,7 +75,7 @@ spec:
           value: {{ $value | quote }}
         {{- end }}
         ports:
-        - containerPort: 3500
+        - containerPort: 3000
           name: ui
 {{- if .Values.grafana.persistence.enabled }}
         volumeMounts:

charts/monitor/templates/monitor-telegraf-daemon.yaml

@@ -39,31 +39,35 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
-          {{- if eq .Values.global.influxdb_location "off-cluster" }}
-          - name: "INFLUXDB_URLS"
+{{- if eq .Values.global.influxdb_location "off-cluster" }}
+          - name: "INFLUXDB_URLS_V2"
             valueFrom:
               secretKeyRef:
                 name: influxdb-creds
                 key: url
-          - name: "INFLUXDB_DATABASE"
+{{- else }}
+          - name: "INFLUXDB_URLS_V2"
+            value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT_TRANSPORT)\""
+          - name: "INFLUXDB_V2_INPUT_URLS"
+            value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT_TRANSPORT)/metrics\""
+          - name: "ENABLE_INFLUXDB_V2_INPUT"
+            value: "true"
+{{- end }}
+          - name: "INFLUXDB_BUCKET"
             valueFrom:
               secretKeyRef:
                 name: influxdb-creds
-                key: database
-          - name: "INFLUXDB_USER"
+                key: bucket
+          - name: "INFLUXDB_ORG"
             valueFrom:
               secretKeyRef:
                 name: influxdb-creds
-                key: user
-          - name: "INFLUXDB_PASSWORD"
+                key: org
+          - name: "INFLUXDB_TOKEN"
             valueFrom:
               secretKeyRef:
                 name: influxdb-creds
-                key: password
-          {{- else }}
-          - name: "INFLUXDB_URLS"
-            value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT_TRANSPORT)\""
-          {{- end }}
+                key: token
           - name: "HOST_PROC"
             value: "/rootfs/proc"
           - name: "HOST_SYS"