dry: merge dm's {alertmanager,grafana,prometheus} into cluster (pingc…

…ap#890)
lucklove · Nov 13, 2020 · cc41ad5 · cc41ad5
1 parent bb072ef
commit cc41ad5
Show file tree

Hide file tree

Showing 48 changed files with 535 additions and 1,185 deletions.
diff --git a/components/dm/ansible/import.go b/components/dm/ansible/import.go
@@ -222,7 +222,7 @@ func (im *Importer) handleWorkerConfig(srv *spec.WorkerSpec, fname string) error
 
 // ScpSourceToMaster scp the source files to master,
 // and set V1SourcePath of the master spec.
-func (im *Importer) ScpSourceToMaster(topo *spec.Topology) (err error) {
+func (im *Importer) ScpSourceToMaster(topo *spec.Specification) (err error) {
 	for i := 0; i < len(topo.Masters); i++ {
 		master := &topo.Masters[i]
 		target := filepath.Join(firstNonEmpty(master.DeployDir, topo.GlobalOptions.DeployDir), "v1source")
@@ -293,7 +293,7 @@ func (im *Importer) ImportFromAnsibleDir() (clusterName string, meta *spec.Metad
 	}
 
 	meta = &spec.Metadata{
-		Topology: new(spec.Topology),
+		Topology: new(spec.Specification),
 	}
 	topo := meta.Topology
 
@@ -480,7 +480,7 @@ func (im *Importer) ImportFromAnsibleDir() (clusterName string, meta *spec.Metad
 			}
 		case "alertmanager_servers":
 			for _, host := range group.Hosts {
-				srv := spec.AlertManagerSpec{
+				srv := spec.AlertmanagerSpec{
 					Host:      host.Vars["ansible_host"],
 					SSHPort:   ansible.GetHostPort(host, cfg),
 					DeployDir: firstNonEmpty(host.Vars["deploy_dir"], topo.GlobalOptions.DeployDir),
@@ -521,9 +521,9 @@ func (im *Importer) ImportFromAnsibleDir() (clusterName string, meta *spec.Metad
 					}
 				}
 
-				srv.DeployDir = instancDeployDir(spec.ComponentAlertManager, srv.WebPort, host.Vars["deploy_dir"], topo.GlobalOptions.DeployDir)
+				srv.DeployDir = instancDeployDir(spec.ComponentAlertmanager, srv.WebPort, host.Vars["deploy_dir"], topo.GlobalOptions.DeployDir)
 
-				topo.Alertmanager = append(topo.Alertmanager, srv)
+				topo.Alertmanagers = append(topo.Alertmanagers, srv)
 			}
 		case "grafana_servers":
 			for _, host := range group.Hosts {
@@ -559,7 +559,7 @@ func (im *Importer) ImportFromAnsibleDir() (clusterName string, meta *spec.Metad
 				}
 
 				srv.DeployDir = instancDeployDir(spec.ComponentGrafana, srv.Port, host.Vars["deploy_dir"], topo.GlobalOptions.DeployDir)
-				topo.Grafana = append(topo.Grafana, srv)
+				topo.Grafanas = append(topo.Grafanas, srv)
 			}
 		case "all", "ungrouped":
 			// ignore intent

diff --git a/components/dm/ansible/import_test.go b/components/dm/ansible/import_test.go
@@ -188,9 +188,9 @@ func TestImportFromAnsible(t *testing.T) {
 	assert.Equal(expectedWorker, worker)
 
 	// check Alertmanager
-	assert.Len(topo.Alertmanager, 1)
-	aler := topo.Alertmanager[0]
-	expectedAlter := spec.AlertManagerSpec{
+	assert.Len(topo.Alertmanagers, 1)
+	aler := topo.Alertmanagers[0]
+	expectedAlter := spec.AlertmanagerSpec{
 		Host:      "172.19.0.101",
 		SSHPort:   22,
 		WebPort:   9093,
@@ -201,8 +201,8 @@ func TestImportFromAnsible(t *testing.T) {
 	assert.Equal(expectedAlter, aler)
 
 	// Check Grafana
-	assert.Len(topo.Grafana, 1)
-	grafana := topo.Grafana[0]
+	assert.Len(topo.Grafanas, 1)
+	grafana := topo.Grafanas[0]
 	expectedGrafana := spec.GrafanaSpec{
 		Host:      "172.19.0.101",
 		SSHPort:   22,

diff --git a/components/dm/command/scale_in.go b/components/dm/command/scale_in.go
@@ -75,7 +75,7 @@ func newScaleInCmd() *cobra.Command {
 // ScaleInDMCluster scale in dm cluster.
 func ScaleInDMCluster(
 	getter operator.ExecutorGetter,
-	topo *dm.Topology,
+	topo *dm.Specification,
 	options operator.Options,
 ) error {
 	// instances by uuid

diff --git a/components/dm/spec/alertmanager.go b/components/dm/spec/alertmanager.go
diff --git a/components/dm/spec/bindversion.go b/components/dm/spec/bindversion.go
@@ -5,7 +5,7 @@ import "github.com/pingcap/tiup/pkg/cluster/spec"
 // DMComponentVersion maps the dm version to the third components binding version
 func DMComponentVersion(comp, version string) string {
 	switch comp {
-	case spec.ComponentAlertManager:
+	case spec.ComponentAlertmanager:
 		return "v0.17.0"
 	case spec.ComponentGrafana, spec.ComponentPrometheus:
 		return "v4.0.3"

diff --git a/components/dm/spec/cluster.go b/components/dm/spec/cluster.go
@@ -29,7 +29,7 @@ type Metadata struct {
 	Version string `yaml:"dm_version"` // the version of TiDB cluster
 	//EnableFirewall bool   `yaml:"firewall"`
 
-	Topology *Topology `yaml:"topology"`
+	Topology *Specification `yaml:"topology"`
 }
 
 var _ cspec.UpgradableMetadata = &Metadata{}
@@ -51,7 +51,7 @@ func (m *Metadata) GetTopology() cspec.Topology {
 
 // SetTopology implements Metadata interface.
 func (m *Metadata) SetTopology(topo cspec.Topology) {
-	dmTopo, ok := topo.(*Topology)
+	dmTopo, ok := topo.(*Specification)
 	if !ok {
 		panic(fmt.Sprintln("wrong type: ", reflect.TypeOf(topo)))
 	}
@@ -72,7 +72,7 @@ func GetSpecManager() *cspec.SpecManager {
 	if specManager == nil {
 		specManager = cspec.NewSpec(filepath.Join(cspec.ProfileDir(), cspec.TiOpsClusterDir), func() cspec.Metadata {
 			return &Metadata{
-				Topology: new(Topology),
+				Topology: new(Specification),
 			}
 		})
 	}