feat(influxdb): modify influxdb naming rules

Author: duanhongyi

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

@@ -38,7 +38,7 @@ spec:
 {{- end}}
         env:
         {{- if eq .Values.global.influxdb_location "off-cluster" }}
-        - name: "INFLUXDB_SERVICE_URL"
+        - name: "INFLUXDB_URL"
           valueFrom:
             secretKeyRef:
               name: influxdb-creds

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

@@ -50,7 +50,7 @@ spec:
               secretKeyRef:
                 name: influxdb-creds
                 key: database
-          - name: "INFLUXDB_USERNAME"
+          - name: "INFLUXDB_USER"
             valueFrom:
               secretKeyRef:
                 name: influxdb-creds
@@ -100,4 +100,4 @@ spec:
           path: /proc
       - name: varrunutmpro
         hostPath:
-          path: /var/run/utmp
+          path: /var/run/utmp

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

@@ -53,7 +53,7 @@ spec:
               secretKeyRef:
                 name: influxdb-creds
                 key: database
-          - name: "INFLUXDB_USERNAME"
+          - name: "INFLUXDB_USER"
             valueFrom:
               secretKeyRef:
                 name: influxdb-creds

grafana/rootfs/usr/share/grafana/start-grafana

@@ -78,14 +78,14 @@ export GF_AUTH_ANONYMOUS_ENABLED=true
 export GF_SERVER_HTTP_PORT=${GRAFANA_PORT}
 
 BACKEND_ACCESS_MODE=${BACKEND_ACCESS_MODE:-proxy}
-INFLUXDB_SERVICE_URL=${INFLUXDB_SERVICE_URL}
-if [ -n "$INFLUXDB_SERVICE_URL" ]; then
+INFLUXDB_URL=${INFLUXDB_URL}
+if [ -n "$INFLUXDB_URL" ]; then
   echo "Influxdb service URL is provided."
 else
-  INFLUXDB_SERVICE_URL="http://${INFLUXDB_HOST}:${INFLUXDB_PORT}"
+  INFLUXDB_URL="http://${INFLUXDB_HOST}:${INFLUXDB_PORT}"
 fi
 
-echo "Using the following URL for InfluxDB: ${INFLUXDB_SERVICE_URL}"
+echo "Using the following URL for InfluxDB: ${INFLUXDB_URL}"
 echo "Using the following backend access mode for InfluxDB: ${BACKEND_ACCESS_MODE}"
 
 echo "Creating default influxdb datasource..."
@@ -95,7 +95,7 @@ curl -i -XPOST -H "${HEADER_ACCEPT}" -H "${HEADER_CONTENT_TYPE}" "http://${GRAFA
   "type": "influxdb",
   "access": "'"${BACKEND_ACCESS_MODE}"'",
   "isDefault": true,
-  "url": "'"${INFLUXDB_SERVICE_URL}"'",
+  "url": "'"${INFLUXDB_URL}"'",
   "password": "'"${INFLUXDB_PASSWORD}"'",
   "user": "'"${INFLUXDB_USER}"'",
   "database": "'"${INFLUXDB_DATABASE}"'"

telegraf/rootfs/config.toml.tpl

@@ -60,7 +60,7 @@
   database = {{default "kubernetes" .INFLUXDB_DATABASE | quote }}
   precision = {{ default "ns" .INFLUXDB_PRECISION | quote }}
   timeout = {{ default "5s" .INFLUXDB_TIMEOUT | quote }}
-  {{ if .INFLUXDB_USERNAME}} username = {{ .INFLUXDB_USERNAME | quote }} {{ end }}
+  {{ if .INFLUXDB_USER}} username = {{ .INFLUXDB_USER | quote }} {{ end }}
   {{ if .INFLUXDB_PASSWORD}} password = {{ .INFLUXDB_PASSWORD | quote }} {{ end }}
   {{ if .INFLUXDB_USER_AGENT}} user_agent = {{ .INFLUXDB_USER_AGENT | quote }} {{ end }}
   {{ if .INFLUXDB_UDP_PAYLOAD}} udp_payload = {{ .INFLUXDB_UDP_PAYLOAD | quote }} {{ end }}