feat(grafana): data source change to prometheus

Author: jianxiaoguo

README.md

@@ -32,13 +32,13 @@ Grafana is a stand alone graphing application. It natively supports Influxdb as
 └──────────┘             └─────────┘               └──────────────┘
                                                           │
 ┌──────────┐                                              │
-│   HOST   │                                              │
-│ Telegraf │───┐                                          │
+│   HOST   │───┐                                          │
+│ Telegraf │   │                                          │
 └──────────┘   │                                          │
                │                                          ▼
 ┌──────────┐   │    ┌──────────┐                     ┌──────────┐
-│   HOST   │───┼───▶│ Influxdb │◀──────Wire──────────│ Telegraf │
-│ Telegraf │   │    └──────────┘     Protocol        └──────────┘
+│   HOST   │───┼───▶│ Influxdb │◀────────Wire────────│ Telegraf │
+│ Telegraf │   │    └──────────┘       Protocol      └──────────┘
 └──────────┘   │         │
                │         │
 ┌──────────┐   │         ▼

charts/monitor/templates/_helpers.tmpl

@@ -5,40 +5,25 @@ env:
   valueFrom:
     fieldRef:
       fieldPath: metadata.namespace
-{{- if eq .Values.global.influxdbLocation "off-cluster" }}
-- name: "INFLUXDB_URL"
+{{- if eq .Values.global.prometheusLocation "off-cluster" }}
+- name: "PROMETHEUS_URL"
   valueFrom:
     secretKeyRef:
-      name: influxdb-creds
+      name: prometheus-creds
       key: url
 {{- else }}
-- name: "INFLUXDB_URL"
-  value: http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT)
+- name: "PROMETHEUS_URL"
+  value: http://$(DRYCC_PROMETHEUS_SERVICE_HOST):$(DRYCC_PROMETHEUS_SERVICE_PORT)
 {{- end }}
-- name: "INFLUXDB_BUCKET"
-  valueFrom:
-    secretKeyRef:
-      name: influxdb-creds
-      key: bucket
-- name: "INFLUXDB_ORG"
-  valueFrom:
-    secretKeyRef:
-      name: influxdb-creds
-      key: org
-- name: "INFLUXDB_TOKEN"
-  valueFrom:
-    secretKeyRef:
-      name: influxdb-creds
-      key: token
 - name: "BIND_PORT"
   value: "3000"
 {{- if not (.Values.grafana.environment.DEFAULT_USER) }}
 - name: "DEFAULT_USER"
-  value: {{ randAlphaNum 32 | b64enc }}
+  value: {{ randAlphaNum 32 }}
 {{- end}}
 {{- if not (.Values.grafana.environment.DEFAULT_USER_PASSWORD) }}
 - name: "DEFAULT_USER_PASSWORD"
-  value: {{ randAlphaNum 32 | b64enc }}
+  value: {{ randAlphaNum 32 }}
 {{- end}}
 - name: "KUBERNETES_CLUSTER_DOMAIN"
   value: {{.Values.global.clusterDomain}}
@@ -77,8 +62,8 @@ env:
 - name: DRYCC_PASSPORT_SECRET
   value: "{{ .Values.grafana.passportSecret }}"
 {{- end }}
-- name: "INFLUXDB_LOCATION"
-  value: {{ .Values.global.influxdbLocation }}
+- name: "PROMETHEUS_LOCATION"
+  value: {{ .Values.global.prometheusLocation }}
 - name: "REDIS_LOCATION"
   value: {{ .Values.global.redisLocation }}
 - name: "RABBITMQ_LOCATION"
@@ -92,99 +77,3 @@ env:
 - name: "REGISTRY_LOCATION"
   value: {{ .Values.global.registryLocation }}
 {{- end }}
-
-{{/* Generate monitor telegraf deployment envs */}}
-{{- define "telegraf.deployment.envs" }}
-env:
-- name: POD_NAMESPACE
-  valueFrom:
-    fieldRef:
-      fieldPath: metadata.namespace
-{{- if eq .Values.global.influxdbLocation "off-cluster" }}
-- name: "INFLUXDB_URLS_V2"
-  valueFrom:
-    secretKeyRef:
-      name: influxdb-creds
-      key: url
-{{- else }}
-- name: "INFLUXDB_URLS_V2"
-  value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT)\""
-- name: "INFLUXDB_V2_INPUT_URLS"
-  value: "\"http://$(DRYCC_INFLUXDB_SERVICE_HOST):$(DRYCC_INFLUXDB_SERVICE_PORT)/metrics\""
-- name: "ENABLE_INFLUXDB_V2_INPUT"
-  value: "true"
-{{- end }}
-- name: "INFLUXDB_BUCKET"
-  valueFrom:
-    secretKeyRef:
-      name: influxdb-creds
-      key: bucket
-- name: "INFLUXDB_ORG"
-  valueFrom:
-    secretKeyRef:
-      name: influxdb-creds
-      key: org
-- name: "INFLUXDB_TOKEN"
-  valueFrom:
-    secretKeyRef:
-      name: influxdb-creds
-      key: token
-- name: "AGENT_QUIET"
-  value: "true"
-- name: "AGENT_BUFFER_LIMIT"
-  value: "100000"
-{{- if eq .Values.global.redisLocation "on-cluster" }}
-- name: DRYCC_REDIS_ADDRS
-  valueFrom:
-    secretKeyRef:
-      name: redis-creds
-      key: addrs
-- name: DRYCC_REDIS_PASSWORD
-  valueFrom:
-    secretKeyRef:
-      name: redis-creds
-      key: password
-{{- end }}
-{{- if eq .Values.global.storageLocation "on-cluster" }}
-- name: DRYCC_STORAGE_LOOKUP
-  valueFrom:
-    secretKeyRef:
-      name: storage-creds
-      key: lookup
-- name: DRYCC_STORAGE_HEALTH
-  valueFrom:
-    secretKeyRef:
-      name: storage-creds
-      key: health
-- name: DRYCC_STORAGE_BUCKET
-  valueFrom:
-    secretKeyRef:
-      name: storage-creds
-      key: builder-bucket
-- name: DRYCC_STORAGE_ENDPOINT
-  valueFrom:
-    secretKeyRef:
-      name: storage-creds
-      key: endpoint
-- name: DRYCC_STORAGE_ACCESSKEY
-  valueFrom:
-    secretKeyRef:
-      name: storage-creds
-      key: accesskey
-- name: DRYCC_STORAGE_SECRETKEY
-  valueFrom:
-    secretKeyRef:
-      name: storage-creds
-      key: secretkey
-- name: DRYCC_STORAGE_PD_ADDRS
-  valueFrom:
-    secretKeyRef:
-      name: storage-meta-creds
-      key: pd-addrs
-- name: DRYCC_STORAGE_TIKV_ADDRS
-  valueFrom:
-    secretKeyRef:
-      name: storage-meta-creds
-      key: tikv-addrs
-{{- end }}
-{{- end }}

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

@@ -96,40 +96,9 @@ spec:
             secretKeyRef:
               name: influxdb-creds
               key: token
-        - name: "HOST_PROC"
-          value: "/rootfs/proc"
-        - name: "HOST_SYS"
-          value: "/rootfs/sys"
         - name: "AGENT_QUIET"
           value: "true"
         - name: "AGENT_BUFFER_LIMIT"
           value: "100000"
         - name: "ENABLE_KUBERNETES"
           value: "true"
-        - name: "ENABLE_BARE_METAL_SERVER"
-          value: "true"
-        volumeMounts:
-        - mountPath: /var/run/docker.sock
-          name: docker-socket
-        - name: sysro
-          mountPath: /rootfs/sys
-          readOnly: true
-        - name: procro
-          mountPath: /rootfs/proc
-          readOnly: true
-        - name: varrunutmpro
-          mountPath: /var/run/utmp
-          readOnly: true
-      volumes:
-      - name: docker-socket
-        hostPath:
-          path: /var/run/docker.sock
-      - name: sysro
-        hostPath:
-          path: /sys
-      - name: procro
-        hostPath:
-          path: /proc
-      - name: varrunutmpro
-        hostPath:
-          path: /var/run/utmp

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

@@ -78,6 +78,7 @@ global:
   # - on-cluster: Run component within the Kubernetes cluster
   # - off-cluster: component is running outside of the cluster and credentials and connection information will be provided.
   influxdbLocation: "on-cluster"
+  prometheusLocation: "on-cluster"
   grafanaLocation: "on-cluster"
   redisLocation: "on-cluster"
   rabbitmqLocation: "on-cluster"

charts/monitor/values.yaml

@@ -1,7 +1,7 @@
 # Grafana
 
 ## Description
-[Grafana](https://grafana.org/) is a graphing application built for time series data. It natively supports influxdb and provides great dashboarding support. This project is focused on provided a grafana installation that can be run within a kubernetes installation. The grafana application is agnostic to [Workflow](https://github.com/drycc/workflow) and can be installed as a stand alone system with the monitoring suite.
+[Grafana](https://grafana.org/) is a graphing application built for time series data. It natively supports prometheus and provides great dashboarding support. This project is focused on provided a grafana installation that can be run within a kubernetes installation. The grafana application is agnostic to [Workflow](https://github.com/drycc/workflow) and can be installed as a stand alone system with the monitoring suite.
 
 ## Configuration
 | ENV Var | Default Value | Description |