Bind newest stable non-core components (#1129)

* Save * Bind newest stable non-core components Close #1100 * Fmt Co-authored-by: Ti Chi Robot <[email protected]>
pingcap · Feb 22, 2021 · d566de8 · d566de8
1 parent c3f11c5
commit d566de8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 21 deletions.
diff --git a/components/dm/spec/bindversion.go b/components/dm/spec/bindversion.go
@@ -3,12 +3,13 @@ package spec
 import "github.com/pingcap/tiup/pkg/cluster/spec"
 
 // DMComponentVersion maps the dm version to the third components binding version
+// Empty version means the latest stable one
 func DMComponentVersion(comp, version string) string {
 	switch comp {
-	case spec.ComponentAlertmanager:
-		return "v0.17.0"
-	case spec.ComponentGrafana, spec.ComponentPrometheus:
-		return "v4.0.3"
+	case spec.ComponentAlertmanager,
+		spec.ComponentGrafana,
+		spec.ComponentPrometheus:
+		return ""
 	default:
 		return version
 	}

diff --git a/pkg/cluster/embed/autogen_pkger.go b/pkg/cluster/embed/autogen_pkger.go
diff --git a/pkg/cluster/spec/bindversion.go b/pkg/cluster/spec/bindversion.go
@@ -19,20 +19,17 @@ import (
 )
 
 // TiDBComponentVersion maps the TiDB version to the third components binding version
+// Empty version should be treate as the the last stable one
 func TiDBComponentVersion(comp, version string) string {
 	switch comp {
-	case ComponentAlertmanager:
-		return "v0.17.0"
-	case ComponentBlackboxExporter:
-		return "v0.12.0"
-	case ComponentNodeExporter:
-		return "v0.17.0"
-	case ComponentPushwaygate:
-		return "v0.7.0"
-	case ComponentCheckCollector:
-		return "" // empty version should be treate as the the last stable one
-	case ComponentSpark, ComponentTiSpark:
-		return "" // empty version should be treate as the the last stable one
+	case ComponentAlertmanager,
+		ComponentBlackboxExporter,
+		ComponentNodeExporter,
+		ComponentPushwaygate,
+		ComponentCheckCollector,
+		ComponentSpark,
+		ComponentTiSpark:
+		return ""
 	default:
 		return version
 	}

diff --git a/pkg/cluster/spec/prometheus.go b/pkg/cluster/spec/prometheus.go
@@ -332,7 +332,7 @@ func (i *MonitorInstance) installRules(ctx context.Context, e ctxt.Executor, dep
 	cmds := []string{
 		"mkdir -p %[1]s",
 		`find %[1]s -type f -name "*.rules.yml" -delete`,
-		`find %[2]s/dm-master/conf -type f -name "*.rules.yml" -exec cp %[1]s \;`,
+		`find %[2]s/dm-master/conf -type f -name "*.rules.yml" -exec cp {} %[1]s \;`,
 		"rm -rf %[2]s",
 	}
 	_, stderr, err = e.Execute(ctx, fmt.Sprintf(strings.Join(cmds, " && "), targetDir, tmp), false)

diff --git a/templates/config/prometheus.yml.tpl b/templates/config/prometheus.yml.tpl
@@ -47,9 +47,6 @@ rule_files:
 {{- if .DMWorkerAddrs}}
   - 'dm_worker.rules.yml'
 {{- end}}
-{{- if .DMMasterAddrs}}
-  - 'dm_master.rules.yml'
-{{- end}}
 {{- end}}
 
 {{- if .AlertmanagerAddrs}}