add thanos config args

Introducing missing arguments for thanos config interval and timeout. thanos-io/thanos#5573
viennaa · Mar 8, 2023 · 018eadd · 018eadd
1 parent 105ae14
commit 018eadd
Show file tree

Hide file tree

Showing 9 changed files with 145 additions and 0 deletions.
diff --git a/Documentation/api.md b/Documentation/api.md
@@ -12477,6 +12477,32 @@ Duration
 </tr>
 <tr>
 <td>
+<code>getConfigInterval</code><br/>
+<em>
+<a href="#monitoring.coreos.com/v1.Duration">
+Duration
+</a>
+</em>
+</td>
+<td>
+<p>GetConfigInterval is how often the Prometheus config is fetched. Default 30s.</p>
+</td>
+</tr>
+<tr>
+<td>
+<code>getConfigTimeout</code><br/>
+<em>
+<a href="#monitoring.coreos.com/v1.Duration">
+Duration
+</a>
+</em>
+</td>
+<td>
+<p>GetConfigTimeout is the Timeout for getting Prometheus config. Default 5s.</p>
+</td>
+</tr>
+<tr>
+<td>
 <code>volumeMounts</code><br/>
 <em>
 <a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#volumemount-v1-core">

diff --git a/bundle.yaml b/bundle.yaml
@@ -19670,6 +19670,16 @@ spec:
                       = 1h.'
                     pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
                     type: string
+                  getConfigInterval:
+                    description: GetConfigInterval is how often the Prometheus config
+                      is fetched. Default 30s.
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
+                  getConfigTimeout:
+                    description: GetConfigTimeout is the Timeout for getting Prometheus
+                      config. Default 5s.
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
                   grpcListenLocal:
                     description: If true, the Thanos sidecar listens on the loopback
                       interface for the gRPC endpoints. It has no effect if `listenLocal`

diff --git a/example/prometheus-operator-crd-full/monitoring.coreos.com_prometheuses.yaml b/example/prometheus-operator-crd-full/monitoring.coreos.com_prometheuses.yaml
@@ -6683,6 +6683,16 @@ spec:
                       = 1h.'
                     pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
                     type: string
+                  getConfigInterval:
+                    description: GetConfigInterval is how often the Prometheus config
+                      is fetched. Default 30s.
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
+                  getConfigTimeout:
+                    description: GetConfigTimeout is the Timeout for getting Prometheus
+                      config. Default 5s.
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
                   grpcListenLocal:
                     description: If true, the Thanos sidecar listens on the loopback
                       interface for the gRPC endpoints. It has no effect if `listenLocal`

diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
@@ -6683,6 +6683,16 @@ spec:
                       = 1h.'
                     pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
                     type: string
+                  getConfigInterval:
+                    description: GetConfigInterval is how often the Prometheus config
+                      is fetched. Default 30s.
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
+                  getConfigTimeout:
+                    description: GetConfigTimeout is the Timeout for getting Prometheus
+                      config. Default 5s.
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
                   grpcListenLocal:
                     description: If true, the Thanos sidecar listens on the loopback
                       interface for the gRPC endpoints. It has no effect if `listenLocal`

diff --git a/jsonnet/prometheus-operator/prometheuses-crd.json b/jsonnet/prometheus-operator/prometheuses-crd.json
@@ -6186,6 +6186,16 @@
                         "pattern": "^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$",
                         "type": "string"
                       },
+                      "getConfigInterval": {
+                        "description": "GetConfigInterval is how often the Prometheus config is fetched. Default 30s.",
+                        "pattern": "^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$",
+                        "type": "string"
+                      },
+                      "getConfigTimeout": {
+                        "description": "GetConfigTimeout is the Timeout for getting Prometheus config. Default 5s.",
+                        "pattern": "^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$",
+                        "type": "string"
+                      },
                       "grpcListenLocal": {
                         "description": "If true, the Thanos sidecar listens on the loopback interface for the gRPC endpoints. It has no effect if `listenLocal` is true.",
                         "type": "boolean"

diff --git a/pkg/apis/monitoring/v1/prometheus_types.go b/pkg/apis/monitoring/v1/prometheus_types.go
@@ -668,6 +668,10 @@ type ThanosSpec struct {
 	BlockDuration Duration `json:"blockSize,omitempty"`
 	// ReadyTimeout is the maximum time Thanos sidecar will wait for Prometheus to start. Eg 10m
 	ReadyTimeout Duration `json:"readyTimeout,omitempty"`
+	// GetConfigInterval is how often the Prometheus config is fetched. Default 30s.
+	GetConfigInterval Duration `json:"getConfigInterval,omitempty"`
+	// GetConfigTimeout is the Timeout for getting Prometheus config. Default 5s.
+	GetConfigTimeout Duration `json:"getConfigTimeout,omitempty"`
 	// VolumeMounts allows configuration of additional VolumeMounts on the output StatefulSet definition.
 	// VolumeMounts specified will be appended to other VolumeMounts in the thanos-sidecar container.
 	VolumeMounts []v1.VolumeMount `json:"volumeMounts,omitempty"`

diff --git a/pkg/client/applyconfiguration/monitoring/v1/thanosspec.go b/pkg/client/applyconfiguration/monitoring/v1/thanosspec.go
diff --git a/pkg/prometheus/server/statefulset.go b/pkg/prometheus/server/statefulset.go
@@ -730,6 +730,12 @@ func createThanosContainer(
 		if thanos.ReadyTimeout != "" {
 			thanosArgs = append(thanosArgs, monitoringv1.Argument{Name: "prometheus.ready_timeout", Value: string(thanos.ReadyTimeout)})
 		}
+		if thanos.GetConfigTimeout != "" {
+			thanosArgs = append(thanosArgs, monitoringv1.Argument{Name: "prometheus.get_config_timeout", Value: string(thanos.GetConfigTimeout)})
+		}
+		if thanos.GetConfigInterval != "" {
+			thanosArgs = append(thanosArgs, monitoringv1.Argument{Name: "prometheus.get_config_interval", Value: string(thanos.GetConfigInterval)})
+		}
 
 		containerArgs, err := operator.BuildArgs(thanosArgs, thanos.AdditionalArgs)
 		if err != nil {

diff --git a/pkg/prometheus/server/statefulset_test.go b/pkg/prometheus/server/statefulset_test.go
@@ -2018,7 +2018,58 @@ func TestConfigReloader(t *testing.T) {
 			}
 		}
 	}
+}
+
+func TestThanosGetConfigInterval(t *testing.T) {
+	sset, err := makeStatefulSetFromPrometheus(monitoringv1.Prometheus{
+		Spec: monitoringv1.PrometheusSpec{
+			Thanos: &monitoringv1.ThanosSpec{
+				GetConfigInterval: "1m",
+			},
+		},
+	})
+	require.NoError(t, err)
+
+	found := false
+	for _, container := range sset.Spec.Template.Spec.Containers {
+		if container.Name == "thanos-sidecar" {
+			for _, flag := range container.Args {
+				if flag == "--prometheus.get_config_interval=1m" {
+					found = true
+				}
+			}
+		}
+	}
 
+	if !found {
+		t.Fatal("Sidecar get_config_interval is not set when it should.")
+	}
+}
+
+func TestThanosGetConfigTimeout(t *testing.T) {
+	sset, err := makeStatefulSetFromPrometheus(monitoringv1.Prometheus{
+		Spec: monitoringv1.PrometheusSpec{
+			Thanos: &monitoringv1.ThanosSpec{
+				GetConfigTimeout: "30s",
+			},
+		},
+	})
+	require.NoError(t, err)
+
+	found := false
+	for _, container := range sset.Spec.Template.Spec.Containers {
+		if container.Name == "thanos-sidecar" {
+			for _, flag := range container.Args {
+				if flag == "--prometheus.get_config_timeout=30s" {
+					found = true
+				}
+			}
+		}
+	}
+
+	if !found {
+		t.Fatal("Sidecar get_config_timeout is not set when it should.")
+	}
 }
 
 func TestThanosReadyTimeout(t *testing.T) {