Fix/prometheus wrong data dir (#1040)

* playground: don't quote prometheus.tsdb.path * tests/tiup-playground: add prometheus data dir check
pingcap · Jan 5, 2021 · 56d7377 · 56d7377
1 parent cbc4e18
commit 56d7377
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/components/playground/monitor.go b/components/playground/monitor.go
@@ -135,7 +135,7 @@ scrape_configs:
 		fmt.Sprintf("--config.file=%s", filepath.Join(dir, "prometheus.yml")),
 		fmt.Sprintf("--web.external-url=http://%s", addr),
 		fmt.Sprintf("--web.listen-address=%s:%d", host, port),
-		fmt.Sprintf("--storage.tsdb.path='%s'", filepath.Join(dir, "data")),
+		fmt.Sprintf("--storage.tsdb.path=%s", filepath.Join(dir, "data")),
 	}
 
 	env := environment.GlobalEnv()

diff --git a/tests/tiup-playground/test_playground.sh b/tests/tiup-playground/test_playground.sh
@@ -62,6 +62,10 @@ tiup-playground display | grep -qv "exit"
 tiup-playground scale-out --db 2
 sleep 5
 
+# ensure prometheus/data dir exists,
+# fix https://github.com/pingcap/tiup/issues/1039
+ls "${TIUP_HOME}/data/test_play/prometheus/data"
+
 # 1(init) + 2(scale-out)
 check_tidb_num 3