Merge branch 'master' into fix-patch

pkg/cluster/spec/instance.go

@@ -191,19 +191,29 @@ func (i *BaseInstance) TransferLocalConfigFile(ctx context.Context, e ctxt.Execu
 // TransferLocalConfigDir scp local config directory to remote
 // Precondition: the user on remote have right to access & mkdir of dest files
 func (i *BaseInstance) TransferLocalConfigDir(ctx context.Context, e ctxt.Executor, local, remote string, filter func(string) bool) error {
+	return i.IteratorLocalConfigDir(ctx, local, filter, func(fname string) error {
+		localPath := path.Join(local, fname)
+		remotePath := path.Join(remote, fname)
+		if err := i.TransferLocalConfigFile(ctx, e, localPath, remotePath); err != nil {
+			return errors.Annotatef(err, "transfer local config (%s -> %s) failed", localPath, remotePath)
+		}
+		return nil
+	})
+}
+
+// IteratorLocalConfigDir iterators the local dir with filter, then invoke f for each found fileName
+func (i *BaseInstance) IteratorLocalConfigDir(ctx context.Context, local string, filter func(string) bool, f func(string) error) error {
 	files, err := ioutil.ReadDir(local)
 	if err != nil {
 		return errors.Annotatef(err, "read local directory %s failed", local)
 	}
 
-	for _, f := range files {
-		if filter != nil && !filter(f.Name()) {
+	for _, file := range files {
+		if filter != nil && !filter(file.Name()) {
 			continue
 		}
-		localPath := path.Join(local, f.Name())
-		remotePath := path.Join(remote, f.Name())
-		if err := i.TransferLocalConfigFile(ctx, e, localPath, remotePath); err != nil {
-			return errors.Annotatef(err, "transfer local config (%s -> %s) failed", localPath, remotePath)
+		if err := f(file.Name()); err != nil {
+			return err
 		}
 	}
 

pkg/cluster/spec/prometheus.go

@@ -253,6 +253,17 @@ func (i *MonitorInstance) InitConfig(
 		}
 	}
 
+	if spec.RuleDir != "" {
+		filter := func(name string) bool { return strings.HasSuffix(name, ".rules.yml") }
+		err := i.IteratorLocalConfigDir(ctx, spec.RuleDir, filter, func(name string) error {
+			cfig.AddLocalRule(name)
+			return nil
+		})
+		if err != nil {
+			return errors.Annotate(err, "add local rule")
+		}
+	}
+
 	if err := i.installRules(ctx, e, paths.Deploy, clusterVersion); err != nil {
 		return errors.Annotate(err, "install rules")
 	}

pkg/cluster/template/config/prometheus.go

@@ -49,6 +49,8 @@ type PrometheusConfig struct {
 
 	DMMasterAddrs []string
 	DMWorkerAddrs []string
+
+	LocalRules []string
 }
 
 // NewPrometheusConfig returns a PrometheusConfig
@@ -185,6 +187,12 @@ func (c *PrometheusConfig) AddDMWorker(ip string, port uint64) *PrometheusConfig
 	return c
 }
 
+// AddLocalRule add a local rule
+func (c *PrometheusConfig) AddLocalRule(rule string) *PrometheusConfig {
+	c.LocalRules = append(c.LocalRules, rule)
+	return c
+}
+
 // Config generate the config file data.
 func (c *PrometheusConfig) Config() ([]byte, error) {
 	fp := path.Join("/templates", "config", "prometheus.yml.tpl")

templates/config/prometheus.yml.tpl

@@ -14,6 +14,9 @@ rule_files:
   - 'blacker.rules.yml'
   - 'bypass.rules.yml'
 {{- end}}
+{{- range .LocalRules}}
+  - '{{.}}'
+{{- end}}
 {{- if .PDAddrs}}
   - 'pd.rules.yml'
 {{- end}}
@@ -48,11 +51,11 @@ rule_files:
 
 {{- if .AlertmanagerAddrs}}
 alerting:
- alertmanagers:
- - static_configs:
-   - targets:
+  alertmanagers:
+  - static_configs:
+    - targets:
 {{- range .AlertmanagerAddrs}}
-     - '{{.}}'
+      - '{{.}}'
 {{- end}}
 {{- end}}