make label flag consistent in receive and rule (thanos-io#1498)

* make label flag consistent in receive and rule Signed-off-by: Wing924 <weihe924stephen@gmail.com> * fix test Signed-off-by: Wing924 <weihe924stephen@gmail.com> * fix quickstart Signed-off-by: Wing924 <weihe924stephen@gmail.com>
wbh1 · Sep 17, 2019 · af150c3 · af150c3
1 parent bad980f
commit af150c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cmd/thanos/receive.go b/cmd/thanos/receive.go
@@ -40,7 +40,7 @@ func registerReceive(m map[string]setupFunc, app *kingpin.Application, name stri
 	dataDir := cmd.Flag("tsdb.path", "Data directory of TSDB.").
 		Default("./data").String()
 
-	labelStrs := cmd.Flag("labels", "External labels to announce. This flag will be removed in the future when handling multiple tsdb instances is added.").PlaceHolder("key=\"value\"").Strings()
+	labelStrs := cmd.Flag("label", "External labels to announce. This flag will be removed in the future when handling multiple tsdb instances is added.").PlaceHolder("key=\"value\"").Strings()
 
 	objStoreConfig := regCommonObjStoreFlags(cmd, "", false)
 

diff --git a/scripts/quickstart.sh b/scripts/quickstart.sh
@@ -170,7 +170,7 @@ then
     --tsdb.path                 "./data/remote-write-receive-data" \
     --grpc-address              0.0.0.0:10907 \
     --http-address              0.0.0.0:10909 \
-    --labels                    "receive=\"true\"" \
+    --label                     "receive=\"true\"" \
     ${OBJSTORECFG} \
     --remote-write.address      0.0.0.0:10908 &
 

diff --git a/test/e2e/spinup_test.go b/test/e2e/spinup_test.go
@@ -195,7 +195,7 @@ func receiver(http, grpc, metric address, replicationFactor int, hashring ...rec
 				"--grpc-address", grpc.HostPort(),
 				"--http-address", metric.HostPort(),
 				"--remote-write.address", http.HostPort(),
-				"--labels", fmt.Sprintf(`receive="%s"`, http.Port),
+				"--label", fmt.Sprintf(`receive="%s"`, http.Port),
 				"--tsdb.path", path.Join(receiveDir, "tsdb"),
 				"--log.level", "debug",
 				"--receive.replication-factor", strconv.Itoa(replicationFactor),