Use grafana provisioning to replace dashboard installer

charts/tidb-cluster/templates/config/_grafana-dashboard.tpl

@@ -0,0 +1,14 @@
+{
+    "apiVersion": 1,
+    "providers": [
+        {
+            "folder": "",
+            "name": "0",
+            "options": {
+                "path": "/grafana-dashboard-definitions/tidb"
+            },
+            "orgId": 1,
+            "type": "file"
+        }
+    ]
+}

charts/tidb-cluster/templates/config/_grafana-datasource.tpl

@@ -0,0 +1,14 @@
+{
+  "apiVersion": 1,
+  "datasources": [
+    {
+      "access": "proxy",
+      "editable": false,
+      "name": "tidb-cluster",
+      "orgId": 1,
+      "type": "prometheus",
+      "url": "http://127.0.0.1:9090",
+      "version": 1
+    }
+  ]
+}

charts/tidb-cluster/templates/monitor-configmap.yaml

@@ -12,10 +12,13 @@ metadata:
 data:
   prometheus-config: |-
 {{ tuple "config/_prometheus-config.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-
   alert-rules-config: |-
 {{ tuple "config/_alert-rules-config.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 {{- if .Values.monitor.grafana.create }}
+  datasource-config: |-
+{{ tuple "config/_grafana-datasource.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
+  dashboard-config: |-
+{{ tuple "config/_grafana-dashboard.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   grafana-config: |-
 {{ tuple "config/_grafana-config.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 {{- end }}

charts/tidb-cluster/templates/monitor-deployment.yaml

@@ -94,6 +94,17 @@ spec:
       - name: grafana
         image: {{ .Values.monitor.grafana.image }}
         imagePullPolicy: {{ .Values.monitor.grafana.imagePullPolicy | default "IfNotPresent" }}
+        lifecycle:
+            postStart:
+              exec:
+                command:
+                  - "/bin/sh"
+                  - "-c"
+                  - >
+                    gzip -dc /tmp/dashboard-gz/tidb.json.gz > /grafana-dashboard-definitions/tidb/tidb.json &&
+                    gzip -dc /tmp/dashboard-gz/pd.json.gz > /grafana-dashboard-definitions/tidb/pd.json &&
+                    gzip -dc /tmp/dashboard-gz/tikv.json.gz > /grafana-dashboard-definitions/tidb/tikv.json &&
+                    gzip -dc /tmp/dashboard-gz/overview.json.gz > /grafana-dashboard-definitions/tidb/overview.json
         {{- if .Values.monitor.grafana.resources }}
         resources:
 {{ toYaml .Values.monitor.grafana.resources | indent 12 }}
@@ -136,6 +147,18 @@ spec:
           #   mountPath: /etc/grafana
           - name: monitor-data
             mountPath: /data
+          - mountPath: /etc/grafana/provisioning/datasources
+            name: datasource
+            readOnly: false
+          - mountPath: /etc/grafana/provisioning/dashboards
+            name: dashboards-provisioning
+            readOnly: false
+          - mountPath: /tmp/dashboard-gz
+            name: dashboard-gz
+            readOnly: false
+          - mountPath: /grafana-dashboard-definitions/tidb
+            name: grafana-dashboard
+            readOnly: false
       {{- end }}
       volumes:
       - name: monitor-data
@@ -160,6 +183,23 @@ spec:
           items:
           - key: grafana-config
             path: grafana.ini
+      - configMap:
+          name: {{ template "cluster.name" . }}-monitor
+          items:
+          - key: datasource-config
+            path: datasource.yaml
+        name: datasource
+      - configMap:
+          name: {{ template "cluster.name" . }}-monitor
+          items:
+          - key: dashboard-config
+            path: dashboards.yaml
+        name: dashboards-provisioning
+      - emptyDir: {}
+        name: grafana-dashboard
+      - configMap:
+          name: {{ template "cluster.name" . }}-monitor-dashboard
+        name: dashboard-gz
       {{- end }}
     {{- if .Values.monitor.tolerations }}
       tolerations:

charts/tidb-cluster/values.yaml

@@ -207,12 +207,9 @@ monitor:
   persistent: false
   storageClassName: local-storage
   storage: 10Gi
-  dashboardInstaller:
-    image: pingcap/tidb-dashboard-installer:v2.0.0
-    imagePullPolicy: IfNotPresent
   grafana:
     create: true
-    image: grafana/grafana:4.6.5
+    image: grafana/grafana:6.0.1
     imagePullPolicy: IfNotPresent
     logLevel: info
     resources: