cherry pick pingcap#2715 to release-1.1

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot · Jun 16, 2020 · f7e683e · f7e683e
1 parent 442a0b6
commit f7e683e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/charts/tidb-cluster/templates/monitor-deployment.yaml b/charts/tidb-cluster/templates/monitor-deployment.yaml
@@ -67,7 +67,11 @@ spec:
         - name: PROM_PERSISTENT_DIR
           value: /data
         - name: TIDB_VERSION
+      {{- if .Values.monitor.prometheus.alertManagerRulesVersion }}
+          value: tidb:{{ .Values.monitor.prometheus.alertManagerRulesVersion }}
+      {{- else }}
           value: {{ .Values.tidb.image }}
+      {{- end }}
         - name: GF_K8S_PROMETHEUS_URL
           value: {{ .Values.monitor.initializer.config.K8S_PROMETHEUS_URL }}
         - name: GF_TIDB_PROMETHEUS_URL

diff --git a/charts/tidb-cluster/values.yaml b/charts/tidb-cluster/values.yaml
@@ -573,6 +573,11 @@ monitor:
       portName: http-prometheus
     reserveDays: 12
     # alertmanagerURL: ""
+
+    # alertManagerRulesVersion is the version of the tidb cluster that used for alert rules.
+    # default to current tidb cluster version, for example: v3.0.15
+    #
+    # alertManagerRulesVersion: ""
   nodeSelector: {}
     # kind: monitor
     # zone: cn-bj1-01,cn-bj1-02