Merge branch 'master' into update-diff

pingcap · Jan 12, 2021 · a7e11ec · a7e11ec
2 parents f249da9 + a246cfa
commit a7e11ec
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/cluster/spec/grafana.go b/pkg/cluster/spec/grafana.go
@@ -208,7 +208,7 @@ func (i *GrafanaInstance) initDashboards(e executor.Executor, spec GrafanaSpec,
 
 	cmds := []string{
 		"mkdir -p %[1]s",
-		`find %[1]s -type f -name "*.json" -delete`,
+		`find %[1]s -maxdepth 1 -type f -name "*.json" -delete`,
 		"cp %[2]s/bin/*.json %[1]s",
 	}
 	_, stderr, err := e.Execute(fmt.Sprintf(strings.Join(cmds, " && "), dashboardsDir, paths.Deploy), false)
@@ -266,7 +266,7 @@ func (i *GrafanaInstance) installDashboards(e executor.Executor, deployDir, clus
 	targetDir := filepath.Join(deployDir, "bin")
 	cmds := []string{
 		"mkdir -p %[1]s",
-		`find %[1]s -type f -name "*.json" -delete`,
+		`find %[1]s -maxdepth 1 -type f -name "*.json" -delete`,
 		"cp %[2]s/dm-master/scripts/*.json %[1]s",
 		"rm -rf %[2]s",
 	}