Add args for Thanos sidecar (thanos-io#5573)

Signed-off-by: Zemtsov Vladimir <vl.zemtsov@gmail.com> Signed-off-by: Zemtsov Vladimir <vl.zemtsov@gmail.com> Signed-off-by: Prakul Jain <prakul.jain@udaan.com>
prajain12 · Sep 6, 2022 · 115ed03 · 115ed03
1 parent 3311d32
commit 115ed03
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 
 ### Added
 
+- [#5573](https://github.com/thanos-io/thanos/pull/5573) Sidecar: Added `--prometheus.get_config_interval` and `--prometheus.get_config_timeout` allowing to configure parameters for getting Prometheus config.
 - [#5440](https://github.com/thanos-io/thanos/pull/5440) HTTP metrics: export number of in-flight HTTP requests.
 - [#5424](https://github.com/thanos-io/thanos/pull/5424) Receive: Export metrics regarding size of remote write requests.
 - [#5420](https://github.com/thanos-io/thanos/pull/5420) Receive: Automatically remove stale tenants.

diff --git a/cmd/thanos/config.go b/cmd/thanos/config.go
@@ -63,9 +63,11 @@ func (hc *httpConfig) registerFlag(cmd extkingpin.FlagClause) *httpConfig {
 }
 
 type prometheusConfig struct {
-	url          *url.URL
-	readyTimeout time.Duration
-	httpClient   *extflag.PathOrContent
+	url               *url.URL
+	readyTimeout      time.Duration
+	getConfigInterval time.Duration
+	getConfigTimeout  time.Duration
+	httpClient        *extflag.PathOrContent
 }
 
 func (pc *prometheusConfig) registerFlag(cmd extkingpin.FlagClause) *prometheusConfig {
@@ -75,6 +77,12 @@ func (pc *prometheusConfig) registerFlag(cmd extkingpin.FlagClause) *prometheusC
 	cmd.Flag("prometheus.ready_timeout",
 		"Maximum time to wait for the Prometheus instance to start up").
 		Default("10m").DurationVar(&pc.readyTimeout)
+	cmd.Flag("prometheus.get_config_interval",
+		"How often to get Prometheus config").
+		Default("30s").DurationVar(&pc.getConfigInterval)
+	cmd.Flag("prometheus.get_config_timeout",
+		"Timeout for getting Prometheus config").
+		Default("5s").DurationVar(&pc.getConfigTimeout)
 	pc.httpClient = extflag.RegisterPathOrContent(
 		cmd,
 		"prometheus.http-client",

diff --git a/cmd/thanos/sidecar.go b/cmd/thanos/sidecar.go
@@ -216,8 +216,8 @@ func runSidecar(
 
 			// Periodically query the Prometheus config. We use this as a heartbeat as well as for updating
 			// the external labels we apply.
-			return runutil.Repeat(30*time.Second, ctx.Done(), func() error {
-				iterCtx, iterCancel := context.WithTimeout(context.Background(), 5*time.Second)
+			return runutil.Repeat(conf.prometheus.getConfigInterval, ctx.Done(), func() error {
+				iterCtx, iterCancel := context.WithTimeout(context.Background(), conf.prometheus.getConfigTimeout)
 				defer iterCancel()
 
 				if err := m.UpdateLabels(iterCtx); err != nil {

diff --git a/docs/components/sidecar.md b/docs/components/sidecar.md
@@ -125,6 +125,10 @@ Flags:
                                  Path to YAML file that contains object store
                                  configuration. See format details:
                                  https://thanos.io/tip/thanos/storage.md/#configuration
+      --prometheus.get_config_interval=30s
+                                 How often to get Prometheus config
+      --prometheus.get_config_timeout=5s
+                                 Timeout for getting Prometheus config
       --prometheus.http-client=<content>
                                  Alternative to 'prometheus.http-client-file'
                                  flag (mutually exclusive). Content of YAML file