fix: add runtime configuration for PrometheusAgent

In #6667, we forgot to support the new runtime configuration for the
PrometheusAgent CRD.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

CHANGELOG.md

@@ -1,3 +1,7 @@
+## Unreleased
+
+* [BUGFIX] Add `goGC` field to `PrometheusAgent` CRD. #6667
+
 ## 0.78.1 / 2024-10-30
 
 * [BUGFIX] Fix container images for architectures other than `amd64`. #7065 #7066 #7067

Documentation/api.md

@@ -7921,6 +7921,20 @@ TSDBSpec
 It requires Prometheus &gt;= v2.39.0 or PrometheusAgent &gt;= v2.54.0.</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>runtime</code><br/>
+<em>
+<a href="#monitoring.coreos.com/v1.RuntimeConfig">
+RuntimeConfig
+</a>
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>RuntimeConfig configures the values for the Prometheus process behavior</p>
+</td>
+</tr>
 </tbody>
 </table>
 <h3 id="monitoring.coreos.com/v1.Condition">Condition
@@ -14644,7 +14658,7 @@ Alertmanager.</p>
 <h3 id="monitoring.coreos.com/v1.RuntimeConfig">RuntimeConfig
 </h3>
 <p>
-(<em>Appears on:</em><a href="#monitoring.coreos.com/v1.PrometheusSpec">PrometheusSpec</a>)
+(<em>Appears on:</em><a href="#monitoring.coreos.com/v1.CommonPrometheusFields">CommonPrometheusFields</a>)
 </p>
 <div>
 <p>RuntimeConfig configures the values for the process behavior.</p>
@@ -19152,6 +19166,20 @@ TSDBSpec
 It requires Prometheus &gt;= v2.39.0 or PrometheusAgent &gt;= v2.54.0.</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>runtime</code><br/>
+<em>
+<a href="#monitoring.coreos.com/v1.RuntimeConfig">
+RuntimeConfig
+</a>
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>RuntimeConfig configures the values for the Prometheus process behavior</p>
+</td>
+</tr>
 </table>
 </td>
 </tr>
@@ -26965,6 +26993,20 @@ TSDBSpec
 It requires Prometheus &gt;= v2.39.0 or PrometheusAgent &gt;= v2.54.0.</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>runtime</code><br/>
+<em>
+<a href="#monitoring.coreos.com/v1.RuntimeConfig">
+RuntimeConfig
+</a>
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>RuntimeConfig configures the values for the Prometheus process behavior</p>
+</td>
+</tr>
 </tbody>
 </table>
 <h3 id="monitoring.coreos.com/v1alpha1.PuppetDBSDConfig">PuppetDBSDConfig

bundle.yaml

@@ -27176,6 +27176,18 @@ spec:
                   the server serves requests under a different route prefix. For example
                   for use with `kubectl proxy`.
                 type: string
+              runtime:
+                description: RuntimeConfig configures the values for the Prometheus
+                  process behavior
+                properties:
+                  goGC:
+                    description: |-
+                      The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+                      See: https://tip.golang.org/doc/gc-guide#GOGC
+                    format: int32
+                    minimum: -1
+                    type: integer
+                type: object
               sampleLimit:
                 description: |-
                   SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.

example/prometheus-operator-crd-full/monitoring.coreos.com_prometheusagents.yaml

@@ -6237,6 +6237,18 @@ spec:
                   the server serves requests under a different route prefix. For example
                   for use with `kubectl proxy`.
                 type: string
+              runtime:
+                description: RuntimeConfig configures the values for the Prometheus
+                  process behavior
+                properties:
+                  goGC:
+                    description: |-
+                      The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+                      See: https://tip.golang.org/doc/gc-guide#GOGC
+                    format: int32
+                    minimum: -1
+                    type: integer
+                type: object
               sampleLimit:
                 description: |-
                   SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.

example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml

@@ -6238,6 +6238,18 @@ spec:
                   the server serves requests under a different route prefix. For example
                   for use with `kubectl proxy`.
                 type: string
+              runtime:
+                description: RuntimeConfig configures the values for the Prometheus
+                  process behavior
+                properties:
+                  goGC:
+                    description: |-
+                      The Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+                      See: https://tip.golang.org/doc/gc-guide#GOGC
+                    format: int32
+                    minimum: -1
+                    type: integer
+                type: object
               sampleLimit:
                 description: |-
                   SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.

jsonnet/prometheus-operator/prometheusagents-crd.json

@@ -5353,6 +5353,18 @@
                     "description": "The route prefix Prometheus registers HTTP handlers for.\n\nThis is useful when using `spec.externalURL`, and a proxy is rewriting\nHTTP routes of a request, and the actual ExternalURL is still true, but\nthe server serves requests under a different route prefix. For example\nfor use with `kubectl proxy`.",
                     "type": "string"
                   },
+                  "runtime": {
+                    "description": "RuntimeConfig configures the values for the Prometheus process behavior",
+                    "properties": {
+                      "goGC": {
+                        "description": "The Go garbage collection target percentage. Lowering this number may increase the CPU usage.\nSee: https://tip.golang.org/doc/gc-guide#GOGC",
+                        "format": "int32",
+                        "minimum": -1,
+                        "type": "integer"
+                      }
+                    },
+                    "type": "object"
+                  },
                   "sampleLimit": {
                     "description": "SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.\nOnly valid in Prometheus versions 2.45.0 and newer.\n\nNote that the global limit only applies to scrape objects that don't specify an explicit limit value.\nIf you want to enforce a maximum limit for all scrape objects, refer to enforcedSampleLimit.",
                     "format": "int64",

pkg/apis/monitoring/v1/prometheus_types.go

@@ -821,6 +821,10 @@ type CommonPrometheusFields struct {
 	//
 	// +optional
 	TSDB *TSDBSpec `json:"tsdb,omitempty"`
+
+	// RuntimeConfig configures the values for the Prometheus process behavior
+	// +optional
+	Runtime *RuntimeConfig `json:"runtime,omitempty"`
 }
 
 // +kubebuilder:validation:Enum=HTTP;ProcessSignal
@@ -919,10 +923,6 @@ func (l *PrometheusList) DeepCopyObject() runtime.Object {
 type PrometheusSpec struct {
 	CommonPrometheusFields `json:",inline"`
 
-	// RuntimeConfig configures the values for the Prometheus process behavior
-	// +optional
-	Runtime *RuntimeConfig `json:"runtime,omitempty"`
-
 	// Deprecated: use 'spec.image' instead.
 	BaseImage string `json:"baseImage,omitempty"`
 	// Deprecated: use 'spec.image' instead. The image's tag can be specified as part of the image name.

pkg/apis/monitoring/v1/zz_generated.deepcopy.go

@@ -1014,6 +1014,11 @@ func (in *CommonPrometheusFields) DeepCopyInto(out *CommonPrometheusFields) {
 		*out = new(TSDBSpec)
 		(*in).DeepCopyInto(*out)
 	}
+	if in.Runtime != nil {
+		in, out := &in.Runtime, &out.Runtime
+		*out = new(RuntimeConfig)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CommonPrometheusFields.
@@ -2214,11 +2219,6 @@ func (in *PrometheusRuleSpec) DeepCopy() *PrometheusRuleSpec {
 func (in *PrometheusSpec) DeepCopyInto(out *PrometheusSpec) {
 	*out = *in
 	in.CommonPrometheusFields.DeepCopyInto(&out.CommonPrometheusFields)
-	if in.Runtime != nil {
-		in, out := &in.Runtime, &out.Runtime
-		*out = new(RuntimeConfig)
-		(*in).DeepCopyInto(*out)
-	}
 	out.Rules = in.Rules
 	if in.PrometheusRulesExcludedFromEnforce != nil {
 		in, out := &in.PrometheusRulesExcludedFromEnforce, &out.PrometheusRulesExcludedFromEnforce

pkg/client/applyconfiguration/monitoring/v1/commonprometheusfields.go

@@ -113,6 +113,7 @@ type CommonPrometheusFieldsApplyConfiguration struct {
 	ScrapeClasses                        []ScrapeClassApplyConfiguration                         `json:"scrapeClasses,omitempty"`
 	ServiceDiscoveryRole                 *monitoringv1.ServiceDiscoveryRole                      `json:"serviceDiscoveryRole,omitempty"`
 	TSDB                                 *TSDBSpecApplyConfiguration                             `json:"tsdb,omitempty"`
+	Runtime                              *RuntimeConfigApplyConfiguration                        `json:"runtime,omitempty"`
 }
 
 // CommonPrometheusFieldsApplyConfiguration constructs a declarative configuration of the CommonPrometheusFields type for use with
@@ -882,3 +883,11 @@ func (b *CommonPrometheusFieldsApplyConfiguration) WithTSDB(value *TSDBSpecApply
 	b.TSDB = value
 	return b
 }
+
+// WithRuntime sets the Runtime field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Runtime field is set to the value of the last call.
+func (b *CommonPrometheusFieldsApplyConfiguration) WithRuntime(value *RuntimeConfigApplyConfiguration) *CommonPrometheusFieldsApplyConfiguration {
+	b.Runtime = value
+	return b
+}

pkg/client/applyconfiguration/monitoring/v1/prometheusspec.go

@@ -27,7 +27,6 @@ import (
 // with apply.
 type PrometheusSpecApplyConfiguration struct {
 	CommonPrometheusFieldsApplyConfiguration `json:",inline"`
-	Runtime                                  *RuntimeConfigApplyConfiguration                `json:"runtime,omitempty"`
 	BaseImage                                *string                                         `json:"baseImage,omitempty"`
 	Tag                                      *string                                         `json:"tag,omitempty"`
 	SHA                                      *string                                         `json:"sha,omitempty"`

pkg/client/applyconfiguration/monitoring/v1alpha1/prometheusagentspec.go

@@ -806,3 +806,11 @@ func (b *PrometheusAgentSpecApplyConfiguration) WithTSDB(value *v1.TSDBSpecApply
 	b.TSDB = value
 	return b
 }
+
+// WithRuntime sets the Runtime field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Runtime field is set to the value of the last call.
+func (b *PrometheusAgentSpecApplyConfiguration) WithRuntime(value *v1.RuntimeConfigApplyConfiguration) *PrometheusAgentSpecApplyConfiguration {
+	b.Runtime = value
+	return b
+}

pkg/prometheus/promcfg.go

@@ -772,20 +772,18 @@ func (cg *ConfigGenerator) GenerateServerConfiguration(
 		}
 	}
 
-	// Global config
 	cfg := yaml.MapSlice{}
-	globalItems := yaml.MapSlice{}
-	globalItems = cg.appendEvaluationInterval(globalItems, p.Spec.EvaluationInterval)
-	globalItems = cg.appendScrapeIntervals(globalItems)
-	globalItems = cg.appendScrapeProtocols(globalItems)
-	globalItems = cg.appendRuleQueryOffset(globalItems, p.Spec.RuleQueryOffset)
-	globalItems = cg.appendExternalLabels(globalItems)
-	globalItems = cg.appendQueryLogFile(globalItems, p.Spec.QueryLogFile)
-	globalItems = cg.appendScrapeLimits(globalItems)
-	cfg = append(cfg, yaml.MapItem{Key: "global", Value: globalItems})
+
+	// Global config
+	globalCfg := cg.buildGlobalConfig()
+	globalCfg = cg.appendEvaluationInterval(globalCfg, p.Spec.EvaluationInterval)
+	globalCfg = cg.appendRuleQueryOffset(globalCfg, p.Spec.RuleQueryOffset)
+	globalCfg = cg.appendQueryLogFile(globalCfg, p.Spec.QueryLogFile)
+	cfg = append(cfg, yaml.MapItem{Key: "global", Value: globalCfg})
 
 	// Runtime config
-	cfg = cg.appendRuntime(cfg, p.Spec.Runtime)
+	cfg = cg.appendRuntime(cfg)
+
 	// Rule Files config
 	cfg = cg.appendRuleFiles(cfg, ruleConfigMapNames, p.Spec.RuleSelector)
 
@@ -2585,14 +2583,19 @@ func (cg *ConfigGenerator) appendScrapeProtocols(slice yaml.MapSlice) yaml.MapSl
 	return cg.WithMinimumVersion("2.49.0").AppendMapItem(slice, "scrape_protocols", cpf.ScrapeProtocols)
 }
 
-func (cg *ConfigGenerator) appendRuntime(slice yaml.MapSlice, runtime *monitoringv1.RuntimeConfig) yaml.MapSlice {
-	if runtime == nil || !cg.WithMinimumVersion("2.53.0").IsCompatible() {
+func (cg *ConfigGenerator) appendRuntime(slice yaml.MapSlice) yaml.MapSlice {
+	runtime := cg.prom.GetCommonPrometheusFields().Runtime
+	if runtime == nil {
+		return slice
+	}
+	if !cg.WithMinimumVersion("2.53.0").IsCompatible() {
+		cg.Warn("runtime")
 		return slice
 	}
 
 	var runtimeSlice yaml.MapSlice
 	if runtime.GoGC != nil {
-		runtimeSlice = cg.AppendMapItem(runtimeSlice, "gogc", *runtime.GoGC)
+		runtimeSlice = append(runtimeSlice, yaml.MapItem{Key: "gogc", Value: *runtime.GoGC})
 	}
 
 	return cg.AppendMapItem(slice, "runtime", runtimeSlice)
@@ -2654,11 +2657,11 @@ func (cg *ConfigGenerator) appendRuleQueryOffset(slice yaml.MapSlice, ruleQueryO
 }
 
 func (cg *ConfigGenerator) appendQueryLogFile(slice yaml.MapSlice, queryLogFile string) yaml.MapSlice {
-	if queryLogFile != "" {
-		slice = cg.WithMinimumVersion("2.16.0").AppendMapItem(slice, "query_log_file", queryLogFilePath(queryLogFile))
+	if queryLogFile == "" {
+		return slice
 	}
 
-	return slice
+	return cg.WithMinimumVersion("2.16.0").AppendMapItem(slice, "query_log_file", queryLogFilePath(queryLogFile))
 }
 
 func (cg *ConfigGenerator) appendRuleFiles(slice yaml.MapSlice, ruleFiles []string, ruleSelector *metav1.LabelSelector) yaml.MapSlice {
@@ -2771,14 +2774,13 @@ func (cg *ConfigGenerator) GenerateAgentConfiguration(
 		}
 	}
 
-	// Global config
 	cfg := yaml.MapSlice{}
-	globalItems := yaml.MapSlice{}
-	globalItems = cg.appendScrapeIntervals(globalItems)
-	globalItems = cg.appendScrapeProtocols(globalItems)
-	globalItems = cg.appendExternalLabels(globalItems)
-	globalItems = cg.appendScrapeLimits(globalItems)
-	cfg = append(cfg, yaml.MapItem{Key: "global", Value: globalItems})
+
+	// Global config
+	cfg = append(cfg, yaml.MapItem{Key: "global", Value: cg.buildGlobalConfig()})
+
+	// Runtime config
+	cfg = cg.appendRuntime(cfg)
 
 	// Scrape config
 	var (
@@ -4625,3 +4627,13 @@ func (cg *ConfigGenerator) addFiltersToYaml(cfg yaml.MapSlice, filters []monitor
 
 	return cg.AppendMapItem(cfg, "filters", filtersYamlMap)
 }
+
+func (cg *ConfigGenerator) buildGlobalConfig() yaml.MapSlice {
+	cfg := yaml.MapSlice{}
+	cfg = cg.appendScrapeIntervals(cfg)
+	cfg = cg.appendScrapeProtocols(cfg)
+	cfg = cg.appendExternalLabels(cfg)
+	cfg = cg.appendScrapeLimits(cfg)
+
+	return cfg
+}

pkg/prometheus/server/statefulset_test.go

@@ -2373,9 +2373,9 @@ func TestRuntimeGOGCEnvVar(t *testing.T) {
 				Spec: monitoringv1.PrometheusSpec{
 					CommonPrometheusFields: monitoringv1.CommonPrometheusFields{
 						Version: tc.version,
-					},
-					Runtime: &monitoringv1.RuntimeConfig{
-						GoGC: tc.gogc,
+						Runtime: &monitoringv1.RuntimeConfig{
+							GoGC: tc.gogc,
+						},
 					},
 				},
 			})

pkg/prometheus/testdata/AdditionalAlertRelabelConfigs_Expected.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AdditionalScrapeConfigs_one_prometheus_shard.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: prometheus
   scrape_interval: 15s

pkg/prometheus/testdata/AdditionalScrapeConfigs_sharded prometheus.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: prometheus
   scrape_interval: 15s

pkg/prometheus/testdata/AdditionalScrapeConfigs_unsharded_prometheus.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: prometheus
   scrape_interval: 15s

pkg/prometheus/testdata/AlertmanagerAPIVersion.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerBasicAuth_Invalid_Prom_Version.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerBasicAuth_Valid_Prom_Version.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerBearerToken.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerConfigEmpty.golden

@@ -1,7 +1,7 @@
 global:
-  evaluation_interval: ""
   scrape_interval: ""
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: ""
 scrape_configs: []

pkg/prometheus/testdata/AlertmanagerConfigEndpointSlice.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: ""
   scrape_interval: ""
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: ""
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerConfigOtherNamespace.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: ""
   scrape_interval: ""
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: ""
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerConfigTLSconfig.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: ""
   scrape_interval: ""
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: ""
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerConfigTLSconfigOtherNamespace.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: ""
   scrape_interval: ""
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: ""
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerEnableHttp2_false_expectedWithHTTP2Enabled.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerEnableHttp2_false_expectedWithHTTP2Unsupported.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerEnableHttp2_true_expectedWithHTTP2Enabled.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerEnableHttp2_true_expectedWithHTTP2Unsupported.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerSigv4_Invalid_Prom_Version.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerSigv4_Valid_Prom_Version.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerTLSConfig_Valid_Prom_TLSConfig.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: ""
   scrape_interval: ""
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: ""
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerTLSConfig_Valid_Prom_TLSConfig_MaxVersion.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: ""
   scrape_interval: ""
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: ""
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerTLSConfig_Valid_Prom_TLSConfig_MaxVersion_MinVersion.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: ""
   scrape_interval: ""
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: ""
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerTLSConfig_Valid_Prom_TLSConfig_MinVersion.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: ""
   scrape_interval: ""
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: ""
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmanagerTimeoutConfig.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/Alertmanager_with_RelabelConfigs.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmangerAlertRelabel_Invalid_Version.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/AlertmangerAlertRelabel_Valid_Version.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs: []
 alerting:
   alert_relabel_configs:

pkg/prometheus/testdata/BodySizeLimits_enforce0MB_v2.28.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/BodySizeLimits_enforce1000MB_v2.28.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/BodySizeLimits_enforce2GB_v2.28.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/BodySizeLimits_enforce_v2.27.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/ConsulScrapeConfig.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: scrapeConfig/default/testscrapeconfig1
   consul_sd_configs:

pkg/prometheus/testdata/ConsulScrapeConfigAuthorization.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: scrapeConfig/default/testscrapeconfig1
   consul_sd_configs:

pkg/prometheus/testdata/ConsulScrapeConfigBasicAuth.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: scrapeConfig/default/testscrapeconfig1
   consul_sd_configs:

pkg/prometheus/testdata/ConsulScrapeConfigOAuth.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: scrapeConfig/default/testscrapeconfig1
   consul_sd_configs:

pkg/prometheus/testdata/ConsulScrapeConfigTLSConfig.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: scrapeConfig/default/testscrapeconfig1
   consul_sd_configs:

pkg/prometheus/testdata/EmptyEndpointPorts.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/test/0
   honor_labels: false

pkg/prometheus/testdata/EnforcedNamespaceLabelOnExcludedPodMonitor_Expected.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/pod-monitor-ns/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/EnforcedNamespaceLabelOnExcludedServiceMonitor_Expected.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/service-monitor-ns/servicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/EnforcedNamespaceLabelPodMonitor_Expected.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/pod-monitor-ns/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/EnforcedNamespaceLabelServiceMonitor_Expected.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/test/0
   honor_labels: false

pkg/prometheus/testdata/GenerateRelabelConfig.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/test/0
   honor_labels: false

pkg/prometheus/testdata/HonorLabelsOverriding.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/HonorTimestampsOverriding.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/KeepDroppedTargets.golden

@@ -1,10 +1,10 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
   keep_dropped_targets: 1000
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/KeepDroppedTargetsNotAddedInConfig.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/KeepDroppedTargetsOverridedWithEnforcedValue.golden

@@ -1,10 +1,10 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
   keep_dropped_targets: 1000
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/LabelLimits_Limit2000_v2.26.0_enforceLimit1000.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/LabelLimits_Limit2000_v2.27.0_enforceLimit1000.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/LabelLimits_Limit500_v2.26.0_enforceLimit1000.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/LabelLimits_Limit500_v2.27.0_enforceLimit1000.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/LabelLimits_NoLimit_v2.26.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/LabelLimits_NoLimit_v2.26.0_enforceLimit1000.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/LabelLimits_NoLimit_v2.27.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/LabelLimits_NoLimit_v2.27.0_enforceLimit1000.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/LabelNameLengthLimits_Limit-1_Enforc1000_v2.26.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/default/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/LabelNameLengthLimits_Limit-1_Enforce-1_v2.26.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/default/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/LabelNameLengthLimits_Limit-1_Enforce-1_v2.27.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/default/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/LabelNameLengthLimits_Limit-1_Enforce1000_v2.27.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/default/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/LabelNameLengthLimits_Limit2000_Enforce1000_v2.26.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/default/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/LabelNameLengthLimits_Limit2000_Enforce1000_v2.27.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/default/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/LabelNameLengthLimits_Limit500_Enforce1000_v2.26.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/default/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/LabelNameLengthLimits_Limit500_Enforce1000_v2.27.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/default/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/LabelValueLengthLimits_Enforce-1_LabelValue-1_v2.26.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: probe/default/testprobe1
   honor_timestamps: true

pkg/prometheus/testdata/LabelValueLengthLimits_Enforce-1_LabelValue-1_v2.27.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: probe/default/testprobe1
   honor_timestamps: true

pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue-1_v2.26.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: probe/default/testprobe1
   honor_timestamps: true

pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue-1_v2.27.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: probe/default/testprobe1
   honor_timestamps: true

pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue2000_v2.26.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: probe/default/testprobe1
   honor_timestamps: true

pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue2000_v2.27.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: probe/default/testprobe1
   honor_timestamps: true

pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue500_v2.26.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: probe/default/testprobe1
   honor_timestamps: true

pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue500_v2.27.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: probe/default/testprobe1
   honor_timestamps: true

pkg/prometheus/testdata/MatchExpressionsServiceMonitor.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/test/0
   honor_labels: false

pkg/prometheus/testdata/NativeHistogramConfig.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/NativeHistogramConfigWithMissALL.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/NativeHistogramConfigWithMissNativeHistogramMinBucketFactor.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/testservicemonitor1/0
   honor_labels: false

pkg/prometheus/testdata/NoEnforcedNamespaceLabelServiceMonitor_Expected.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: serviceMonitor/default/test/0
   honor_labels: true

pkg/prometheus/testdata/OTLPConfig_Config_empty_attributes.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs: []
 otlp:
   promote_resource_attributes: []

pkg/prometheus/testdata/OTLPConfig_Config_promote_resource_attributes.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs: []
 otlp:
   promote_resource_attributes:

pkg/prometheus/testdata/PodMonitorEndpointEnableHttp2_EnableHTTP2False_v2.34.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/pod-monitor-ns/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/PodMonitorEndpointEnableHttp2_EnableHTTP2False_v2.35.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/pod-monitor-ns/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/PodMonitorEndpointEnableHttp2_EnableHTTP2True_v2.34.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/pod-monitor-ns/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/PodMonitorEndpointEnableHttp2_EnableHTTP2True_v2.35.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/pod-monitor-ns/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/PodMonitorEndpointFollowRedirects_FollowRedirectsFalse_v2.25.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/pod-monitor-ns/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/PodMonitorEndpointFollowRedirects_FollowRedirectsFalse_v2.28.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/pod-monitor-ns/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/PodMonitorEndpointFollowRedirects_FollowRedirectsTrue_v2.25.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/pod-monitor-ns/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/PodMonitorEndpointFollowRedirects_FollowRedirectsTrue_v2.28.0.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/pod-monitor-ns/testpodmonitor1/0
   honor_labels: false

pkg/prometheus/testdata/PodMonitorPhaseFilter.golden

@@ -1,9 +1,9 @@
 global:
-  evaluation_interval: 30s
   scrape_interval: 30s
   external_labels:
     prometheus: default/test
     prometheus_replica: $(POD_NAME)
+  evaluation_interval: 30s
 scrape_configs:
 - job_name: podMonitor/default/testpodmonitor1/0
   honor_labels: false