diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e12eea0b..12f9f84ea 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/Documentation/api.md b/Documentation/api.md
index b53c54c86..0835fa11a 100644
--- a/Documentation/api.md
+++ b/Documentation/api.md
@@ -7921,6 +7921,20 @@ TSDBSpec
It requires Prometheus >= v2.39.0 or PrometheusAgent >= 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 >= v2.39.0 or PrometheusAgent >= 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 >= v2.39.0 or PrometheusAgent >= 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
diff --git a/bundle.yaml b/bundle.yaml
index 5487cc169..3179605fe 100644
--- a/bundle.yaml
+++ b/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.
diff --git a/example/prometheus-operator-crd-full/monitoring.coreos.com_prometheusagents.yaml b/example/prometheus-operator-crd-full/monitoring.coreos.com_prometheusagents.yaml
index 79f9051dc..81ff368a6 100644
--- a/example/prometheus-operator-crd-full/monitoring.coreos.com_prometheusagents.yaml
+++ b/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.
diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
index 6d03bf123..4a656ea84 100644
--- a/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+++ b/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.
diff --git a/jsonnet/prometheus-operator/prometheusagents-crd.json b/jsonnet/prometheus-operator/prometheusagents-crd.json
index 9e5cc51ce..6b6fbaa12 100644
--- a/jsonnet/prometheus-operator/prometheusagents-crd.json
+++ b/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",
diff --git a/pkg/apis/monitoring/v1/prometheus_types.go b/pkg/apis/monitoring/v1/prometheus_types.go
index 406613435..de7781e2d 100644
--- a/pkg/apis/monitoring/v1/prometheus_types.go
+++ b/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.
diff --git a/pkg/apis/monitoring/v1/zz_generated.deepcopy.go b/pkg/apis/monitoring/v1/zz_generated.deepcopy.go
index 43d2e9b83..5feefbf16 100644
--- a/pkg/apis/monitoring/v1/zz_generated.deepcopy.go
+++ b/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
diff --git a/pkg/client/applyconfiguration/monitoring/v1/commonprometheusfields.go b/pkg/client/applyconfiguration/monitoring/v1/commonprometheusfields.go
index 8aa3d94c4..e4e32995f 100644
--- a/pkg/client/applyconfiguration/monitoring/v1/commonprometheusfields.go
+++ b/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
+}
diff --git a/pkg/client/applyconfiguration/monitoring/v1/prometheusspec.go b/pkg/client/applyconfiguration/monitoring/v1/prometheusspec.go
index 97ac61352..2a3c57c0b 100644
--- a/pkg/client/applyconfiguration/monitoring/v1/prometheusspec.go
+++ 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"`
diff --git a/pkg/client/applyconfiguration/monitoring/v1alpha1/prometheusagentspec.go b/pkg/client/applyconfiguration/monitoring/v1alpha1/prometheusagentspec.go
index 84b30ab36..2a86c0136 100644
--- a/pkg/client/applyconfiguration/monitoring/v1alpha1/prometheusagentspec.go
+++ b/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
+}
diff --git a/pkg/prometheus/promcfg.go b/pkg/prometheus/promcfg.go
index 762eb7534..0ea81f07f 100644
--- a/pkg/prometheus/promcfg.go
+++ 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
+}
diff --git a/pkg/prometheus/server/statefulset_test.go b/pkg/prometheus/server/statefulset_test.go
index 63158131a..8e770ef75 100644
--- a/pkg/prometheus/server/statefulset_test.go
+++ b/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,
+ },
},
},
})
diff --git a/pkg/prometheus/testdata/AdditionalAlertRelabelConfigs_Expected.golden b/pkg/prometheus/testdata/AdditionalAlertRelabelConfigs_Expected.golden
index 2c04f5e0e..305d12fea 100644
--- a/pkg/prometheus/testdata/AdditionalAlertRelabelConfigs_Expected.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AdditionalScrapeConfigs_one_prometheus_shard.golden b/pkg/prometheus/testdata/AdditionalScrapeConfigs_one_prometheus_shard.golden
index 2c92d6bce..6e641d22b 100644
--- a/pkg/prometheus/testdata/AdditionalScrapeConfigs_one_prometheus_shard.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/AdditionalScrapeConfigs_sharded prometheus.golden b/pkg/prometheus/testdata/AdditionalScrapeConfigs_sharded prometheus.golden
index db906a50d..e45bef227 100644
--- a/pkg/prometheus/testdata/AdditionalScrapeConfigs_sharded prometheus.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/AdditionalScrapeConfigs_unsharded_prometheus.golden b/pkg/prometheus/testdata/AdditionalScrapeConfigs_unsharded_prometheus.golden
index 2c92d6bce..6e641d22b 100644
--- a/pkg/prometheus/testdata/AdditionalScrapeConfigs_unsharded_prometheus.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/AlertmanagerAPIVersion.golden b/pkg/prometheus/testdata/AlertmanagerAPIVersion.golden
index 34cce4dca..75aa228a7 100644
--- a/pkg/prometheus/testdata/AlertmanagerAPIVersion.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerBasicAuth_Invalid_Prom_Version.golden b/pkg/prometheus/testdata/AlertmanagerBasicAuth_Invalid_Prom_Version.golden
index 9d4483a37..61b4f1a01 100644
--- a/pkg/prometheus/testdata/AlertmanagerBasicAuth_Invalid_Prom_Version.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerBasicAuth_Valid_Prom_Version.golden b/pkg/prometheus/testdata/AlertmanagerBasicAuth_Valid_Prom_Version.golden
index 60c6f7d8c..42c09eca5 100644
--- a/pkg/prometheus/testdata/AlertmanagerBasicAuth_Valid_Prom_Version.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerBearerToken.golden b/pkg/prometheus/testdata/AlertmanagerBearerToken.golden
index 285cfd385..a25957742 100644
--- a/pkg/prometheus/testdata/AlertmanagerBearerToken.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerConfigEmpty.golden b/pkg/prometheus/testdata/AlertmanagerConfigEmpty.golden
index e6304d4c2..15cd4e902 100644
--- a/pkg/prometheus/testdata/AlertmanagerConfigEmpty.golden
+++ b/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: []
diff --git a/pkg/prometheus/testdata/AlertmanagerConfigEndpointSlice.golden b/pkg/prometheus/testdata/AlertmanagerConfigEndpointSlice.golden
index 6bdb57e99..d3c52fbd8 100644
--- a/pkg/prometheus/testdata/AlertmanagerConfigEndpointSlice.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerConfigOtherNamespace.golden b/pkg/prometheus/testdata/AlertmanagerConfigOtherNamespace.golden
index 6f0669abf..ddc85ee65 100644
--- a/pkg/prometheus/testdata/AlertmanagerConfigOtherNamespace.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerConfigTLSconfig.golden b/pkg/prometheus/testdata/AlertmanagerConfigTLSconfig.golden
index b1c66645e..55e0d2689 100644
--- a/pkg/prometheus/testdata/AlertmanagerConfigTLSconfig.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerConfigTLSconfigOtherNamespace.golden b/pkg/prometheus/testdata/AlertmanagerConfigTLSconfigOtherNamespace.golden
index 2af00e18d..2e0ad90ac 100644
--- a/pkg/prometheus/testdata/AlertmanagerConfigTLSconfigOtherNamespace.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerEnableHttp2_false_expectedWithHTTP2Enabled.golden b/pkg/prometheus/testdata/AlertmanagerEnableHttp2_false_expectedWithHTTP2Enabled.golden
index e1eff754f..e258cd88a 100644
--- a/pkg/prometheus/testdata/AlertmanagerEnableHttp2_false_expectedWithHTTP2Enabled.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerEnableHttp2_false_expectedWithHTTP2Unsupported.golden b/pkg/prometheus/testdata/AlertmanagerEnableHttp2_false_expectedWithHTTP2Unsupported.golden
index 34cce4dca..75aa228a7 100644
--- a/pkg/prometheus/testdata/AlertmanagerEnableHttp2_false_expectedWithHTTP2Unsupported.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerEnableHttp2_true_expectedWithHTTP2Enabled.golden b/pkg/prometheus/testdata/AlertmanagerEnableHttp2_true_expectedWithHTTP2Enabled.golden
index fe59a5a88..c5ca23bb3 100644
--- a/pkg/prometheus/testdata/AlertmanagerEnableHttp2_true_expectedWithHTTP2Enabled.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerEnableHttp2_true_expectedWithHTTP2Unsupported.golden b/pkg/prometheus/testdata/AlertmanagerEnableHttp2_true_expectedWithHTTP2Unsupported.golden
index 34cce4dca..75aa228a7 100644
--- a/pkg/prometheus/testdata/AlertmanagerEnableHttp2_true_expectedWithHTTP2Unsupported.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerSigv4_Invalid_Prom_Version.golden b/pkg/prometheus/testdata/AlertmanagerSigv4_Invalid_Prom_Version.golden
index 9d4483a37..61b4f1a01 100644
--- a/pkg/prometheus/testdata/AlertmanagerSigv4_Invalid_Prom_Version.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerSigv4_Valid_Prom_Version.golden b/pkg/prometheus/testdata/AlertmanagerSigv4_Valid_Prom_Version.golden
index c66088a0b..ea690a1c1 100644
--- a/pkg/prometheus/testdata/AlertmanagerSigv4_Valid_Prom_Version.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerTLSConfig_Valid_Prom_TLSConfig.golden b/pkg/prometheus/testdata/AlertmanagerTLSConfig_Valid_Prom_TLSConfig.golden
index 220bf8e84..3085bbbe2 100644
--- a/pkg/prometheus/testdata/AlertmanagerTLSConfig_Valid_Prom_TLSConfig.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerTLSConfig_Valid_Prom_TLSConfig_MaxVersion.golden b/pkg/prometheus/testdata/AlertmanagerTLSConfig_Valid_Prom_TLSConfig_MaxVersion.golden
index 1194f2a5e..2b9d77303 100644
--- a/pkg/prometheus/testdata/AlertmanagerTLSConfig_Valid_Prom_TLSConfig_MaxVersion.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerTLSConfig_Valid_Prom_TLSConfig_MaxVersion_MinVersion.golden b/pkg/prometheus/testdata/AlertmanagerTLSConfig_Valid_Prom_TLSConfig_MaxVersion_MinVersion.golden
index 769e7e782..695eca37e 100644
--- a/pkg/prometheus/testdata/AlertmanagerTLSConfig_Valid_Prom_TLSConfig_MaxVersion_MinVersion.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerTLSConfig_Valid_Prom_TLSConfig_MinVersion.golden b/pkg/prometheus/testdata/AlertmanagerTLSConfig_Valid_Prom_TLSConfig_MinVersion.golden
index d76fc3711..f6717f0ef 100644
--- a/pkg/prometheus/testdata/AlertmanagerTLSConfig_Valid_Prom_TLSConfig_MinVersion.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmanagerTimeoutConfig.golden b/pkg/prometheus/testdata/AlertmanagerTimeoutConfig.golden
index 277991d81..9a85edfae 100644
--- a/pkg/prometheus/testdata/AlertmanagerTimeoutConfig.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/Alertmanager_with_RelabelConfigs.golden b/pkg/prometheus/testdata/Alertmanager_with_RelabelConfigs.golden
index 19da77730..814301c8e 100644
--- a/pkg/prometheus/testdata/Alertmanager_with_RelabelConfigs.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmangerAlertRelabel_Invalid_Version.golden b/pkg/prometheus/testdata/AlertmangerAlertRelabel_Invalid_Version.golden
index 34cce4dca..75aa228a7 100644
--- a/pkg/prometheus/testdata/AlertmangerAlertRelabel_Invalid_Version.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/AlertmangerAlertRelabel_Valid_Version.golden b/pkg/prometheus/testdata/AlertmangerAlertRelabel_Valid_Version.golden
index 829129122..e76979d20 100644
--- a/pkg/prometheus/testdata/AlertmangerAlertRelabel_Valid_Version.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/BodySizeLimits_enforce0MB_v2.28.0.golden b/pkg/prometheus/testdata/BodySizeLimits_enforce0MB_v2.28.0.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/BodySizeLimits_enforce0MB_v2.28.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/BodySizeLimits_enforce1000MB_v2.28.0.golden b/pkg/prometheus/testdata/BodySizeLimits_enforce1000MB_v2.28.0.golden
index 401062e92..93c45e41d 100644
--- a/pkg/prometheus/testdata/BodySizeLimits_enforce1000MB_v2.28.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/BodySizeLimits_enforce2GB_v2.28.0.golden b/pkg/prometheus/testdata/BodySizeLimits_enforce2GB_v2.28.0.golden
index 0214316fc..1945fe05f 100644
--- a/pkg/prometheus/testdata/BodySizeLimits_enforce2GB_v2.28.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/BodySizeLimits_enforce_v2.27.0.golden b/pkg/prometheus/testdata/BodySizeLimits_enforce_v2.27.0.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/BodySizeLimits_enforce_v2.27.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/ConsulScrapeConfig.golden b/pkg/prometheus/testdata/ConsulScrapeConfig.golden
index 37f132d3c..1a8ac4357 100644
--- a/pkg/prometheus/testdata/ConsulScrapeConfig.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/ConsulScrapeConfigAuthorization.golden b/pkg/prometheus/testdata/ConsulScrapeConfigAuthorization.golden
index ea61b1daa..4aa6082ee 100644
--- a/pkg/prometheus/testdata/ConsulScrapeConfigAuthorization.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/ConsulScrapeConfigBasicAuth.golden b/pkg/prometheus/testdata/ConsulScrapeConfigBasicAuth.golden
index 26cc08f2b..15f52dea4 100644
--- a/pkg/prometheus/testdata/ConsulScrapeConfigBasicAuth.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/ConsulScrapeConfigOAuth.golden b/pkg/prometheus/testdata/ConsulScrapeConfigOAuth.golden
index 3b4b8f8cf..08be2ffe2 100644
--- a/pkg/prometheus/testdata/ConsulScrapeConfigOAuth.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/ConsulScrapeConfigTLSConfig.golden b/pkg/prometheus/testdata/ConsulScrapeConfigTLSConfig.golden
index 805f563f1..f77cb3a5b 100644
--- a/pkg/prometheus/testdata/ConsulScrapeConfigTLSConfig.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/EmptyEndpointPorts.golden b/pkg/prometheus/testdata/EmptyEndpointPorts.golden
index b367564c8..c77beff63 100644
--- a/pkg/prometheus/testdata/EmptyEndpointPorts.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/EnforcedNamespaceLabelOnExcludedPodMonitor_Expected.golden b/pkg/prometheus/testdata/EnforcedNamespaceLabelOnExcludedPodMonitor_Expected.golden
index 3dd5579fa..5cbc40e02 100644
--- a/pkg/prometheus/testdata/EnforcedNamespaceLabelOnExcludedPodMonitor_Expected.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/EnforcedNamespaceLabelOnExcludedServiceMonitor_Expected.golden b/pkg/prometheus/testdata/EnforcedNamespaceLabelOnExcludedServiceMonitor_Expected.golden
index 765c23c33..6e2b8fef1 100644
--- a/pkg/prometheus/testdata/EnforcedNamespaceLabelOnExcludedServiceMonitor_Expected.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/EnforcedNamespaceLabelPodMonitor_Expected.golden b/pkg/prometheus/testdata/EnforcedNamespaceLabelPodMonitor_Expected.golden
index 07e687e46..0e0644290 100644
--- a/pkg/prometheus/testdata/EnforcedNamespaceLabelPodMonitor_Expected.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/EnforcedNamespaceLabelServiceMonitor_Expected.golden b/pkg/prometheus/testdata/EnforcedNamespaceLabelServiceMonitor_Expected.golden
index 51d4562d2..652fdb787 100644
--- a/pkg/prometheus/testdata/EnforcedNamespaceLabelServiceMonitor_Expected.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/GenerateRelabelConfig.golden b/pkg/prometheus/testdata/GenerateRelabelConfig.golden
index f3ed13c9a..970d6829e 100644
--- a/pkg/prometheus/testdata/GenerateRelabelConfig.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/HonorLabelsOverriding.golden b/pkg/prometheus/testdata/HonorLabelsOverriding.golden
index 1334dc295..766fdee6c 100644
--- a/pkg/prometheus/testdata/HonorLabelsOverriding.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/HonorTimestampsOverriding.golden b/pkg/prometheus/testdata/HonorTimestampsOverriding.golden
index a7da3c629..1f47cc680 100644
--- a/pkg/prometheus/testdata/HonorTimestampsOverriding.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/KeepDroppedTargets.golden b/pkg/prometheus/testdata/KeepDroppedTargets.golden
index 6099460d4..771291607 100644
--- a/pkg/prometheus/testdata/KeepDroppedTargets.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/KeepDroppedTargetsNotAddedInConfig.golden b/pkg/prometheus/testdata/KeepDroppedTargetsNotAddedInConfig.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/KeepDroppedTargetsNotAddedInConfig.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/KeepDroppedTargetsOverridedWithEnforcedValue.golden b/pkg/prometheus/testdata/KeepDroppedTargetsOverridedWithEnforcedValue.golden
index 60d5e6978..75c01f90b 100644
--- a/pkg/prometheus/testdata/KeepDroppedTargetsOverridedWithEnforcedValue.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelLimits_Limit2000_v2.26.0_enforceLimit1000.golden b/pkg/prometheus/testdata/LabelLimits_Limit2000_v2.26.0_enforceLimit1000.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/LabelLimits_Limit2000_v2.26.0_enforceLimit1000.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelLimits_Limit2000_v2.27.0_enforceLimit1000.golden b/pkg/prometheus/testdata/LabelLimits_Limit2000_v2.27.0_enforceLimit1000.golden
index bb6bdf6a3..90d328950 100644
--- a/pkg/prometheus/testdata/LabelLimits_Limit2000_v2.27.0_enforceLimit1000.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelLimits_Limit500_v2.26.0_enforceLimit1000.golden b/pkg/prometheus/testdata/LabelLimits_Limit500_v2.26.0_enforceLimit1000.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/LabelLimits_Limit500_v2.26.0_enforceLimit1000.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelLimits_Limit500_v2.27.0_enforceLimit1000.golden b/pkg/prometheus/testdata/LabelLimits_Limit500_v2.27.0_enforceLimit1000.golden
index 177b01800..6656c1548 100644
--- a/pkg/prometheus/testdata/LabelLimits_Limit500_v2.27.0_enforceLimit1000.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelLimits_NoLimit_v2.26.0.golden b/pkg/prometheus/testdata/LabelLimits_NoLimit_v2.26.0.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/LabelLimits_NoLimit_v2.26.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelLimits_NoLimit_v2.26.0_enforceLimit1000.golden b/pkg/prometheus/testdata/LabelLimits_NoLimit_v2.26.0_enforceLimit1000.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/LabelLimits_NoLimit_v2.26.0_enforceLimit1000.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelLimits_NoLimit_v2.27.0.golden b/pkg/prometheus/testdata/LabelLimits_NoLimit_v2.27.0.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/LabelLimits_NoLimit_v2.27.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelLimits_NoLimit_v2.27.0_enforceLimit1000.golden b/pkg/prometheus/testdata/LabelLimits_NoLimit_v2.27.0_enforceLimit1000.golden
index bb6bdf6a3..90d328950 100644
--- a/pkg/prometheus/testdata/LabelLimits_NoLimit_v2.27.0_enforceLimit1000.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelNameLengthLimits_Limit-1_Enforc1000_v2.26.0.golden b/pkg/prometheus/testdata/LabelNameLengthLimits_Limit-1_Enforc1000_v2.26.0.golden
index 93eacd1ab..dff744790 100644
--- a/pkg/prometheus/testdata/LabelNameLengthLimits_Limit-1_Enforc1000_v2.26.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelNameLengthLimits_Limit-1_Enforce-1_v2.26.0.golden b/pkg/prometheus/testdata/LabelNameLengthLimits_Limit-1_Enforce-1_v2.26.0.golden
index 93eacd1ab..dff744790 100644
--- a/pkg/prometheus/testdata/LabelNameLengthLimits_Limit-1_Enforce-1_v2.26.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelNameLengthLimits_Limit-1_Enforce-1_v2.27.0.golden b/pkg/prometheus/testdata/LabelNameLengthLimits_Limit-1_Enforce-1_v2.27.0.golden
index 93eacd1ab..dff744790 100644
--- a/pkg/prometheus/testdata/LabelNameLengthLimits_Limit-1_Enforce-1_v2.27.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelNameLengthLimits_Limit-1_Enforce1000_v2.27.0.golden b/pkg/prometheus/testdata/LabelNameLengthLimits_Limit-1_Enforce1000_v2.27.0.golden
index 9d5e751ad..dae2e877a 100644
--- a/pkg/prometheus/testdata/LabelNameLengthLimits_Limit-1_Enforce1000_v2.27.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelNameLengthLimits_Limit2000_Enforce1000_v2.26.0.golden b/pkg/prometheus/testdata/LabelNameLengthLimits_Limit2000_Enforce1000_v2.26.0.golden
index 93eacd1ab..dff744790 100644
--- a/pkg/prometheus/testdata/LabelNameLengthLimits_Limit2000_Enforce1000_v2.26.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelNameLengthLimits_Limit2000_Enforce1000_v2.27.0.golden b/pkg/prometheus/testdata/LabelNameLengthLimits_Limit2000_Enforce1000_v2.27.0.golden
index 9d5e751ad..dae2e877a 100644
--- a/pkg/prometheus/testdata/LabelNameLengthLimits_Limit2000_Enforce1000_v2.27.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelNameLengthLimits_Limit500_Enforce1000_v2.26.0.golden b/pkg/prometheus/testdata/LabelNameLengthLimits_Limit500_Enforce1000_v2.26.0.golden
index 93eacd1ab..dff744790 100644
--- a/pkg/prometheus/testdata/LabelNameLengthLimits_Limit500_Enforce1000_v2.26.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelNameLengthLimits_Limit500_Enforce1000_v2.27.0.golden b/pkg/prometheus/testdata/LabelNameLengthLimits_Limit500_Enforce1000_v2.27.0.golden
index 819736968..d95b37760 100644
--- a/pkg/prometheus/testdata/LabelNameLengthLimits_Limit500_Enforce1000_v2.27.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce-1_LabelValue-1_v2.26.0.golden b/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce-1_LabelValue-1_v2.26.0.golden
index c1e1bfeb8..e4d1173b9 100644
--- a/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce-1_LabelValue-1_v2.26.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce-1_LabelValue-1_v2.27.0.golden b/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce-1_LabelValue-1_v2.27.0.golden
index c1e1bfeb8..e4d1173b9 100644
--- a/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce-1_LabelValue-1_v2.27.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue-1_v2.26.0.golden b/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue-1_v2.26.0.golden
index c1e1bfeb8..e4d1173b9 100644
--- a/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue-1_v2.26.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue-1_v2.27.0.golden b/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue-1_v2.27.0.golden
index e32a48017..2adf5d345 100644
--- a/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue-1_v2.27.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue2000_v2.26.0.golden b/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue2000_v2.26.0.golden
index c1e1bfeb8..e4d1173b9 100644
--- a/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue2000_v2.26.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue2000_v2.27.0.golden b/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue2000_v2.27.0.golden
index e32a48017..2adf5d345 100644
--- a/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue2000_v2.27.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue500_v2.26.0.golden b/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue500_v2.26.0.golden
index c1e1bfeb8..e4d1173b9 100644
--- a/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue500_v2.26.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue500_v2.27.0.golden b/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue500_v2.27.0.golden
index 74553b878..29b73cd3a 100644
--- a/pkg/prometheus/testdata/LabelValueLengthLimits_Enforce1000_LabelValue500_v2.27.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/MatchExpressionsServiceMonitor.golden b/pkg/prometheus/testdata/MatchExpressionsServiceMonitor.golden
index 0439bf588..4c9ff968a 100644
--- a/pkg/prometheus/testdata/MatchExpressionsServiceMonitor.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/NativeHistogramConfig.golden b/pkg/prometheus/testdata/NativeHistogramConfig.golden
index 8b7ea81f2..c22d1edb0 100644
--- a/pkg/prometheus/testdata/NativeHistogramConfig.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/NativeHistogramConfigWithMissALL.golden b/pkg/prometheus/testdata/NativeHistogramConfigWithMissALL.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/NativeHistogramConfigWithMissALL.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/NativeHistogramConfigWithMissNativeHistogramMinBucketFactor.golden b/pkg/prometheus/testdata/NativeHistogramConfigWithMissNativeHistogramMinBucketFactor.golden
index 180f4e160..a343242e0 100644
--- a/pkg/prometheus/testdata/NativeHistogramConfigWithMissNativeHistogramMinBucketFactor.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/NoEnforcedNamespaceLabelServiceMonitor_Expected.golden b/pkg/prometheus/testdata/NoEnforcedNamespaceLabelServiceMonitor_Expected.golden
index 71f3738e3..3ea2a9fed 100644
--- a/pkg/prometheus/testdata/NoEnforcedNamespaceLabelServiceMonitor_Expected.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/OTLPConfig_Config_empty_attributes.golden b/pkg/prometheus/testdata/OTLPConfig_Config_empty_attributes.golden
index 15f3b4533..3525961c7 100644
--- a/pkg/prometheus/testdata/OTLPConfig_Config_empty_attributes.golden
+++ b/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: []
diff --git a/pkg/prometheus/testdata/OTLPConfig_Config_promote_resource_attributes.golden b/pkg/prometheus/testdata/OTLPConfig_Config_promote_resource_attributes.golden
index b1267111e..959ed940e 100644
--- a/pkg/prometheus/testdata/OTLPConfig_Config_promote_resource_attributes.golden
+++ b/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:
diff --git a/pkg/prometheus/testdata/PodMonitorEndpointEnableHttp2_EnableHTTP2False_v2.34.0.golden b/pkg/prometheus/testdata/PodMonitorEndpointEnableHttp2_EnableHTTP2False_v2.34.0.golden
index 0c992a7e2..d6c764826 100644
--- a/pkg/prometheus/testdata/PodMonitorEndpointEnableHttp2_EnableHTTP2False_v2.34.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/PodMonitorEndpointEnableHttp2_EnableHTTP2False_v2.35.0.golden b/pkg/prometheus/testdata/PodMonitorEndpointEnableHttp2_EnableHTTP2False_v2.35.0.golden
index f516d06fe..8c79abb9b 100644
--- a/pkg/prometheus/testdata/PodMonitorEndpointEnableHttp2_EnableHTTP2False_v2.35.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/PodMonitorEndpointEnableHttp2_EnableHTTP2True_v2.34.0.golden b/pkg/prometheus/testdata/PodMonitorEndpointEnableHttp2_EnableHTTP2True_v2.34.0.golden
index 0c992a7e2..d6c764826 100644
--- a/pkg/prometheus/testdata/PodMonitorEndpointEnableHttp2_EnableHTTP2True_v2.34.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/PodMonitorEndpointEnableHttp2_EnableHTTP2True_v2.35.0.golden b/pkg/prometheus/testdata/PodMonitorEndpointEnableHttp2_EnableHTTP2True_v2.35.0.golden
index f78fde3eb..c8e7ca6f2 100644
--- a/pkg/prometheus/testdata/PodMonitorEndpointEnableHttp2_EnableHTTP2True_v2.35.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/PodMonitorEndpointFollowRedirects_FollowRedirectsFalse_v2.25.0.golden b/pkg/prometheus/testdata/PodMonitorEndpointFollowRedirects_FollowRedirectsFalse_v2.25.0.golden
index 0c992a7e2..d6c764826 100644
--- a/pkg/prometheus/testdata/PodMonitorEndpointFollowRedirects_FollowRedirectsFalse_v2.25.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/PodMonitorEndpointFollowRedirects_FollowRedirectsFalse_v2.28.0.golden b/pkg/prometheus/testdata/PodMonitorEndpointFollowRedirects_FollowRedirectsFalse_v2.28.0.golden
index 5b99daba4..f83a379c5 100644
--- a/pkg/prometheus/testdata/PodMonitorEndpointFollowRedirects_FollowRedirectsFalse_v2.28.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/PodMonitorEndpointFollowRedirects_FollowRedirectsTrue_v2.25.0.golden b/pkg/prometheus/testdata/PodMonitorEndpointFollowRedirects_FollowRedirectsTrue_v2.25.0.golden
index 0c992a7e2..d6c764826 100644
--- a/pkg/prometheus/testdata/PodMonitorEndpointFollowRedirects_FollowRedirectsTrue_v2.25.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/PodMonitorEndpointFollowRedirects_FollowRedirectsTrue_v2.28.0.golden b/pkg/prometheus/testdata/PodMonitorEndpointFollowRedirects_FollowRedirectsTrue_v2.28.0.golden
index 6a139a0ae..4e7da2571 100644
--- a/pkg/prometheus/testdata/PodMonitorEndpointFollowRedirects_FollowRedirectsTrue_v2.28.0.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/PodMonitorPhaseFilter.golden b/pkg/prometheus/testdata/PodMonitorPhaseFilter.golden
index 68014546b..5bd9e6505 100644
--- a/pkg/prometheus/testdata/PodMonitorPhaseFilter.golden
+++ b/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
diff --git a/pkg/prometheus/testdata/PodTargetLabels.golden b/pkg/prometheus/testdata/PodTargetLabels.golden
index cece1daf8..2fe21e420 100644
--- a/pkg/prometheus/testdata/PodTargetLabels.golden
+++ b/pkg/prometheus/testdata/PodTargetLabels.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
diff --git a/pkg/prometheus/testdata/PodTargetLabelsFromPodMonitor.golden b/pkg/prometheus/testdata/PodTargetLabelsFromPodMonitor.golden
index 079254a91..29e844088 100644
--- a/pkg/prometheus/testdata/PodTargetLabelsFromPodMonitor.golden
+++ b/pkg/prometheus/testdata/PodTargetLabelsFromPodMonitor.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
diff --git a/pkg/prometheus/testdata/PodTargetLabelsFromPodMonitorAndGlobal.golden b/pkg/prometheus/testdata/PodTargetLabelsFromPodMonitorAndGlobal.golden
index 85fa2ce48..6f0e50cf6 100644
--- a/pkg/prometheus/testdata/PodTargetLabelsFromPodMonitorAndGlobal.golden
+++ b/pkg/prometheus/testdata/PodTargetLabelsFromPodMonitorAndGlobal.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
diff --git a/pkg/prometheus/testdata/ProbeIngressSDConfigGeneration.golden b/pkg/prometheus/testdata/ProbeIngressSDConfigGeneration.golden
index 1a87cdf0f..9f2b97f3c 100644
--- a/pkg/prometheus/testdata/ProbeIngressSDConfigGeneration.golden
+++ b/pkg/prometheus/testdata/ProbeIngressSDConfigGeneration.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
diff --git a/pkg/prometheus/testdata/ProbeIngressSDConfigGenerationWithLabelEnforce.golden b/pkg/prometheus/testdata/ProbeIngressSDConfigGenerationWithLabelEnforce.golden
index fa861a892..2a379bdd5 100644
--- a/pkg/prometheus/testdata/ProbeIngressSDConfigGenerationWithLabelEnforce.golden
+++ b/pkg/prometheus/testdata/ProbeIngressSDConfigGenerationWithLabelEnforce.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
diff --git a/pkg/prometheus/testdata/ProbeIngressSDConfigGenerationWithShards.golden b/pkg/prometheus/testdata/ProbeIngressSDConfigGenerationWithShards.golden
index d6250fd39..2139becf8 100644
--- a/pkg/prometheus/testdata/ProbeIngressSDConfigGenerationWithShards.golden
+++ b/pkg/prometheus/testdata/ProbeIngressSDConfigGenerationWithShards.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
diff --git a/pkg/prometheus/testdata/ProbeSpecConfig_empty_probe.golden b/pkg/prometheus/testdata/ProbeSpecConfig_empty_probe.golden
index 062d49e5a..f70ced0a6 100644
--- a/pkg/prometheus/testdata/ProbeSpecConfig_empty_probe.golden
+++ b/pkg/prometheus/testdata/ProbeSpecConfig_empty_probe.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/probe1
honor_timestamps: true
diff --git a/pkg/prometheus/testdata/ProbeSpecConfig_module_config.golden b/pkg/prometheus/testdata/ProbeSpecConfig_module_config.golden
index 0a1dc6f89..2a14bd61d 100644
--- a/pkg/prometheus/testdata/ProbeSpecConfig_module_config.golden
+++ b/pkg/prometheus/testdata/ProbeSpecConfig_module_config.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/probe1
honor_timestamps: true
diff --git a/pkg/prometheus/testdata/ProbeSpecConfig_prober_spec.golden b/pkg/prometheus/testdata/ProbeSpecConfig_prober_spec.golden
index 3c4519e28..6f52e11e3 100644
--- a/pkg/prometheus/testdata/ProbeSpecConfig_prober_spec.golden
+++ b/pkg/prometheus/testdata/ProbeSpecConfig_prober_spec.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/probe1
honor_timestamps: true
diff --git a/pkg/prometheus/testdata/ProbeSpecConfig_targets_static_config.golden b/pkg/prometheus/testdata/ProbeSpecConfig_targets_static_config.golden
index 867325972..e521b89ed 100644
--- a/pkg/prometheus/testdata/ProbeSpecConfig_targets_static_config.golden
+++ b/pkg/prometheus/testdata/ProbeSpecConfig_targets_static_config.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/probe1
honor_timestamps: true
diff --git a/pkg/prometheus/testdata/ProbeStaticTargetsConfigGenerationWithJobName.golden b/pkg/prometheus/testdata/ProbeStaticTargetsConfigGenerationWithJobName.golden
index d9ed302d5..f28bccb2b 100644
--- a/pkg/prometheus/testdata/ProbeStaticTargetsConfigGenerationWithJobName.golden
+++ b/pkg/prometheus/testdata/ProbeStaticTargetsConfigGenerationWithJobName.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
diff --git a/pkg/prometheus/testdata/ProbeStaticTargetsConfigGenerationWithLabelEnforce.golden b/pkg/prometheus/testdata/ProbeStaticTargetsConfigGenerationWithLabelEnforce.golden
index bde554558..7a23274dd 100644
--- a/pkg/prometheus/testdata/ProbeStaticTargetsConfigGenerationWithLabelEnforce.golden
+++ b/pkg/prometheus/testdata/ProbeStaticTargetsConfigGenerationWithLabelEnforce.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
diff --git a/pkg/prometheus/testdata/ProbeStaticTargetsConfigGenerationWithoutModule.golden b/pkg/prometheus/testdata/ProbeStaticTargetsConfigGenerationWithoutModule.golden
index 0f95ba3f6..a6d8d57e1 100644
--- a/pkg/prometheus/testdata/ProbeStaticTargetsConfigGenerationWithoutModule.golden
+++ b/pkg/prometheus/testdata/ProbeStaticTargetsConfigGenerationWithoutModule.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
diff --git a/pkg/prometheus/testdata/RemoteReadConfig_v2.25.0.golden b/pkg/prometheus/testdata/RemoteReadConfig_v2.25.0.golden
index b3a8af5d0..063e0a94e 100644
--- a/pkg/prometheus/testdata/RemoteReadConfig_v2.25.0.golden
+++ b/pkg/prometheus/testdata/RemoteReadConfig_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: []
remote_read:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteReadConfig_v2.26.0.golden b/pkg/prometheus/testdata/RemoteReadConfig_v2.26.0.golden
index b3a8af5d0..063e0a94e 100644
--- a/pkg/prometheus/testdata/RemoteReadConfig_v2.26.0.golden
+++ b/pkg/prometheus/testdata/RemoteReadConfig_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: []
remote_read:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteReadConfig_v2.26.0_AuthorizationSafe.golden b/pkg/prometheus/testdata/RemoteReadConfig_v2.26.0_AuthorizationSafe.golden
index 4943f110d..55a74775d 100644
--- a/pkg/prometheus/testdata/RemoteReadConfig_v2.26.0_AuthorizationSafe.golden
+++ b/pkg/prometheus/testdata/RemoteReadConfig_v2.26.0_AuthorizationSafe.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: []
remote_read:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteReadConfig_v2.26.0_FilterExternalLabels.golden b/pkg/prometheus/testdata/RemoteReadConfig_v2.26.0_FilterExternalLabels.golden
index b3a8af5d0..063e0a94e 100644
--- a/pkg/prometheus/testdata/RemoteReadConfig_v2.26.0_FilterExternalLabels.golden
+++ b/pkg/prometheus/testdata/RemoteReadConfig_v2.26.0_FilterExternalLabels.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: []
remote_read:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteReadConfig_v2.26.0_NotFollowRedirects.golden b/pkg/prometheus/testdata/RemoteReadConfig_v2.26.0_NotFollowRedirects.golden
index e25f39da3..03e2106d3 100644
--- a/pkg/prometheus/testdata/RemoteReadConfig_v2.26.0_NotFollowRedirects.golden
+++ b/pkg/prometheus/testdata/RemoteReadConfig_v2.26.0_NotFollowRedirects.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: []
remote_read:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteReadConfig_v2.27.1.golden b/pkg/prometheus/testdata/RemoteReadConfig_v2.27.1.golden
index 61906fd4c..c5b4f629b 100644
--- a/pkg/prometheus/testdata/RemoteReadConfig_v2.27.1.golden
+++ b/pkg/prometheus/testdata/RemoteReadConfig_v2.27.1.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: []
remote_read:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteReadConfig_v2.34.0.golden b/pkg/prometheus/testdata/RemoteReadConfig_v2.34.0.golden
index b3a8af5d0..063e0a94e 100644
--- a/pkg/prometheus/testdata/RemoteReadConfig_v2.34.0.golden
+++ b/pkg/prometheus/testdata/RemoteReadConfig_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: []
remote_read:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteReadConfig_v2.34.0_FilterExternalLabels.golden b/pkg/prometheus/testdata/RemoteReadConfig_v2.34.0_FilterExternalLabels.golden
index 3797e259c..eb3270ff9 100644
--- a/pkg/prometheus/testdata/RemoteReadConfig_v2.34.0_FilterExternalLabels.golden
+++ b/pkg/prometheus/testdata/RemoteReadConfig_v2.34.0_FilterExternalLabels.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: []
remote_read:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteReadConfig_v2.34.0_NotFilterExternalLabels.golden b/pkg/prometheus/testdata/RemoteReadConfig_v2.34.0_NotFilterExternalLabels.golden
index 92df1d0d0..34922ea7a 100644
--- a/pkg/prometheus/testdata/RemoteReadConfig_v2.34.0_NotFilterExternalLabels.golden
+++ b/pkg/prometheus/testdata/RemoteReadConfig_v2.34.0_NotFilterExternalLabels.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: []
remote_read:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteReadConfig_v2.43.0_ProxyConfig.golden b/pkg/prometheus/testdata/RemoteReadConfig_v2.43.0_ProxyConfig.golden
index 364e08857..789a372fd 100644
--- a/pkg/prometheus/testdata/RemoteReadConfig_v2.43.0_ProxyConfig.golden
+++ b/pkg/prometheus/testdata/RemoteReadConfig_v2.43.0_ProxyConfig.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: []
remote_read:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfigAzureADOAuth_v2.47.0_1.golden b/pkg/prometheus/testdata/RemoteWriteConfigAzureADOAuth_v2.47.0_1.golden
index c70c2368c..e3b4de004 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfigAzureADOAuth_v2.47.0_1.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfigAzureADOAuth_v2.47.0_1.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfigAzureADOAuth_v2.48.0_1.golden b/pkg/prometheus/testdata/RemoteWriteConfigAzureADOAuth_v2.48.0_1.golden
index 40c022368..a07e069c3 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfigAzureADOAuth_v2.48.0_1.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfigAzureADOAuth_v2.48.0_1.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfigAzureADSDK_v2.51.0.golden b/pkg/prometheus/testdata/RemoteWriteConfigAzureADSDK_v2.51.0.golden
index c70c2368c..e3b4de004 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfigAzureADSDK_v2.51.0.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfigAzureADSDK_v2.51.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfigAzureADSDK_v2.52.0.golden b/pkg/prometheus/testdata/RemoteWriteConfigAzureADSDK_v2.52.0.golden
index 21c48f17d..09a2e7eab 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfigAzureADSDK_v2.52.0.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfigAzureADSDK_v2.52.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_3.golden b/pkg/prometheus/testdata/RemoteWriteConfig_3.golden
index 3f674a0ce..6f026e7b1 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_3.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_3.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.10.0_1.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.10.0_1.golden
index 23640b963..b69358b60 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.10.0_1.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.10.0_1.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.22.0_1.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.22.0_1.golden
index 2e7d30b4d..5e049a3b3 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.22.0_1.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.22.0_1.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.23.0_1.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.23.0_1.golden
index 6b73d0ba8..035628f28 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.23.0_1.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.23.0_1.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.23.0_2.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.23.0_2.golden
index 6b73d0ba8..035628f28 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.23.0_2.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.23.0_2.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.26.0_2.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.26.0_2.golden
index 735ff282a..e4bbfef4c 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.26.0_2.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.26.0_2.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.26.0_3.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.26.0_3.golden
index 465aac2c6..a7e13592c 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.26.0_3.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.26.0_3.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.26.0_4.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.26.0_4.golden
index 9537e6536..58d98006e 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.26.0_4.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.26.0_4.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.27.1_1.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.27.1_1.golden
index a234be3ad..6a62a382f 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.27.1_1.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.27.1_1.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.30.0_2.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.30.0_2.golden
index bad63a95f..b29e3c9b1 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.30.0_2.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.30.0_2.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.39.0_1.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.39.0_1.golden
index 05ccd25cb..835e0f818 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.39.0_1.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.39.0_1.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.43.0_2.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.43.0_2.golden
index 5248b3efc..420bfb3e4 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.43.0_2.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.43.0_2.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.43.0_ProxyConfig.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.43.0_ProxyConfig.golden
index da343681b..abec282b7 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.43.0_ProxyConfig.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.43.0_ProxyConfig.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.43.0_ProxyConfigWithMutiValues.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.43.0_ProxyConfigWithMutiValues.golden
index 755989240..e123cb0e7 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.43.0_ProxyConfigWithMutiValues.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.43.0_ProxyConfigWithMutiValues.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.45.0_1.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.45.0_1.golden
index 2e639158c..d61326036 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.45.0_1.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.45.0_1.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.49.0.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.49.0.golden
index ffe7bad13..6add31b38 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.49.0.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.49.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.50.0.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.50.0.golden
index 78979b778..14d09b6b5 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.50.0.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.50.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.53.0_MessageVersion2.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.53.0_MessageVersion2.golden
index b9841ea00..4c3ee44e0 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.53.0_MessageVersion2.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.53.0_MessageVersion2.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RemoteWriteConfig_v2.54.0_MessageVersion2.golden b/pkg/prometheus/testdata/RemoteWriteConfig_v2.54.0_MessageVersion2.golden
index d341b453b..d8462aa64 100644
--- a/pkg/prometheus/testdata/RemoteWriteConfig_v2.54.0_MessageVersion2.golden
+++ b/pkg/prometheus/testdata/RemoteWriteConfig_v2.54.0_MessageVersion2.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: []
remote_write:
- url: http://example.com
diff --git a/pkg/prometheus/testdata/RuntimeConfig_GoGC25.golden b/pkg/prometheus/testdata/RuntimeConfig_GoGC25.golden
index 468d10e77..6809a5e09 100644
--- a/pkg/prometheus/testdata/RuntimeConfig_GoGC25.golden
+++ b/pkg/prometheus/testdata/RuntimeConfig_GoGC25.golden
@@ -1,9 +1,9 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
external_labels:
prometheus: default/test
prometheus_replica: $(POD_NAME)
+ evaluation_interval: 30s
runtime:
gogc: 25
scrape_configs: []
diff --git a/pkg/prometheus/testdata/RuntimeConfig_GoGC_Not_Set.golden b/pkg/prometheus/testdata/RuntimeConfig_GoGC_Not_Set.golden
index 3e7a5bdbe..609303fe8 100644
--- a/pkg/prometheus/testdata/RuntimeConfig_GoGC_Not_Set.golden
+++ b/pkg/prometheus/testdata/RuntimeConfig_GoGC_Not_Set.golden
@@ -1,7 +1,7 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
external_labels:
prometheus: default/test
prometheus_replica: $(POD_NAME)
+ evaluation_interval: 30s
scrape_configs: []
diff --git a/pkg/prometheus/testdata/SampleLimits_GlobalLimit-1_Enforce-2000-Limit-500-2.21.golden b/pkg/prometheus/testdata/SampleLimits_GlobalLimit-1_Enforce-2000-Limit-500-2.21.golden
index 0b9de9086..d518ac59a 100644
--- a/pkg/prometheus/testdata/SampleLimits_GlobalLimit-1_Enforce-2000-Limit-500-2.21.golden
+++ b/pkg/prometheus/testdata/SampleLimits_GlobalLimit-1_Enforce-2000-Limit-500-2.21.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
diff --git a/pkg/prometheus/testdata/SampleLimits_GlobalLimit1000_Enforce-1-2.21.golden b/pkg/prometheus/testdata/SampleLimits_GlobalLimit1000_Enforce-1-2.21.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/SampleLimits_GlobalLimit1000_Enforce-1-2.21.golden
+++ b/pkg/prometheus/testdata/SampleLimits_GlobalLimit1000_Enforce-1-2.21.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
diff --git a/pkg/prometheus/testdata/SampleLimits_GlobalLimit1000_Enforce2000-2.21.golden b/pkg/prometheus/testdata/SampleLimits_GlobalLimit1000_Enforce2000-2.21.golden
index 21965d052..63899b9fe 100644
--- a/pkg/prometheus/testdata/SampleLimits_GlobalLimit1000_Enforce2000-2.21.golden
+++ b/pkg/prometheus/testdata/SampleLimits_GlobalLimit1000_Enforce2000-2.21.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
diff --git a/pkg/prometheus/testdata/SampleLimits_GlobalLimit1000_Enforce2000.golden b/pkg/prometheus/testdata/SampleLimits_GlobalLimit1000_Enforce2000.golden
index 1814f2f65..4970cbb82 100644
--- a/pkg/prometheus/testdata/SampleLimits_GlobalLimit1000_Enforce2000.golden
+++ b/pkg/prometheus/testdata/SampleLimits_GlobalLimit1000_Enforce2000.golden
@@ -1,10 +1,10 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
external_labels:
prometheus: default/test
prometheus_replica: $(POD_NAME)
sample_limit: 1000
+ evaluation_interval: 30s
scrape_configs:
- job_name: serviceMonitor/default/testservicemonitor1/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/SampleLimits_Limit-1.golden b/pkg/prometheus/testdata/SampleLimits_Limit-1.golden
index 1814f2f65..4970cbb82 100644
--- a/pkg/prometheus/testdata/SampleLimits_Limit-1.golden
+++ b/pkg/prometheus/testdata/SampleLimits_Limit-1.golden
@@ -1,10 +1,10 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
external_labels:
prometheus: default/test
prometheus_replica: $(POD_NAME)
sample_limit: 1000
+ evaluation_interval: 30s
scrape_configs:
- job_name: serviceMonitor/default/testservicemonitor1/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/SampleLimits_Limit2000.golden b/pkg/prometheus/testdata/SampleLimits_Limit2000.golden
index f993d10bd..17072af78 100644
--- a/pkg/prometheus/testdata/SampleLimits_Limit2000.golden
+++ b/pkg/prometheus/testdata/SampleLimits_Limit2000.golden
@@ -1,10 +1,10 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
external_labels:
prometheus: default/test
prometheus_replica: $(POD_NAME)
sample_limit: 1000
+ evaluation_interval: 30s
scrape_configs:
- job_name: serviceMonitor/default/testservicemonitor1/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/SampleLimits_Limit500.golden b/pkg/prometheus/testdata/SampleLimits_Limit500.golden
index 9db2b1af3..bed63926a 100644
--- a/pkg/prometheus/testdata/SampleLimits_Limit500.golden
+++ b/pkg/prometheus/testdata/SampleLimits_Limit500.golden
@@ -1,10 +1,10 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
external_labels:
prometheus: default/test
prometheus_replica: $(POD_NAME)
sample_limit: 1000
+ evaluation_interval: 30s
scrape_configs:
- job_name: serviceMonitor/default/testservicemonitor1/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/SampleLimits_NoLimit.golden b/pkg/prometheus/testdata/SampleLimits_NoLimit.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/SampleLimits_NoLimit.golden
+++ b/pkg/prometheus/testdata/SampleLimits_NoLimit.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
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Already_Sharded.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Already_Sharded.golden
index 692aeda9b..b287eaacf 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Already_Sharded.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Already_Sharded.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
static_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Authorization.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Authorization.golden
index 0aac12a62..1f03f84f6 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Authorization.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Authorization.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
authorization:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_AzureSDConfigEmpty.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_AzureSDConfigEmpty.golden
index 07324ebdd..26f7d0393 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_AzureSDConfigEmpty.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_AzureSDConfigEmpty.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
relabel_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_AzureSDConfigValid.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_AzureSDConfigValid.golden
index e8a12b600..5d1a39f18 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_AzureSDConfigValid.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_AzureSDConfigValid.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
azure_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_BasicAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_BasicAuth.golden
index 459b0d24f..b5b8b4611 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_BasicAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_BasicAuth.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
basic_auth:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_ARecord.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_ARecord.golden
index 5d916214a..ab81b6167 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_ARecord.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_ARecord.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
dns_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_MXRecord.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_MXRecord.golden
index 503b71258..767dbaa5b 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_MXRecord.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_MXRecord.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
dns_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_NSRecord.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_NSRecord.golden
index 739c7177c..4065cca8a 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_NSRecord.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_NSRecord.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
dns_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_NSRecord_OldVersion.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_NSRecord_OldVersion.golden
index 4a3a7cc9a..a71975253 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_NSRecord_OldVersion.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_NSRecord_OldVersion.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
dns_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_SRVRecord.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_SRVRecord.golden
index 04f29c16b..ce4cd3526 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_SRVRecord.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DNSSD_SRVRecord.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
dns_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DigitalOceanSD.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DigitalOceanSD.golden
index 556023a5f..da9e8c194 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DigitalOceanSD.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DigitalOceanSD.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
digitalocean_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DigitalOceanSD_with_OAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DigitalOceanSD_with_OAuth.golden
index 901577140..23d9a4683 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DigitalOceanSD_with_OAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DigitalOceanSD_with_OAuth.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
digitalocean_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DigitalOceanSD_with_TLSConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DigitalOceanSD_with_TLSConfig.golden
index 17064e7d8..34d9911e6 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DigitalOceanSD_with_TLSConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DigitalOceanSD_with_TLSConfig.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
digitalocean_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSDConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSDConfig.golden
index 272835333..b118b314d 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSDConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSDConfig.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
docker_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSD_with_BasicAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSD_with_BasicAuth.golden
index 82b0fdd95..18e5b43b8 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSD_with_BasicAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSD_with_BasicAuth.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
docker_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSD_with_MatchFirstNetwork.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSD_with_MatchFirstNetwork.golden
index 19eef2da9..8fabfe398 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSD_with_MatchFirstNetwork.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSD_with_MatchFirstNetwork.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
docker_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSD_with_MatchFirstNetwork_OldVersion.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSD_with_MatchFirstNetwork_OldVersion.golden
index 82b0fdd95..18e5b43b8 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSD_with_MatchFirstNetwork_OldVersion.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSD_with_MatchFirstNetwork_OldVersion.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
docker_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSD_with_OAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSD_with_OAuth.golden
index 6028d83eb..739af7f7e 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSD_with_OAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerSD_with_OAuth.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
docker_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerswarmSD.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerswarmSD.golden
index 903fd3972..7346ffea8 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerswarmSD.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerswarmSD.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
dockerswarm_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerswarmSD_withBasicAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerswarmSD_withBasicAuth.golden
index 931866464..e397e8caa 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerswarmSD_withBasicAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerswarmSD_withBasicAuth.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
dockerswarm_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerswarmSD_with_OAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerswarmSD_with_OAuth.golden
index 3d483876e..2a47da398 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerswarmSD_with_OAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerswarmSD_with_OAuth.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
dockerswarm_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerswarmSD_with_TLSConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerswarmSD_with_TLSConfig.golden
index 721333f81..6e7306867 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerswarmSD_with_TLSConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_DockerswarmSD_with_TLSConfig.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
dockerswarm_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigEmpty.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigEmpty.golden
index 07324ebdd..26f7d0393 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigEmpty.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigEmpty.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
relabel_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigFilters.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigFilters.golden
index 3636d94c6..027afeb1a 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigFilters.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigFilters.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
ec2_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigFilters_Unsupported_Version.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigFilters_Unsupported_Version.golden
index 44305e470..d99c8181c 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigFilters_Unsupported_Version.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigFilters_Unsupported_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:
- job_name: scrapeConfig/default/testscrapeconfig1
ec2_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigValidAPIKeys.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigValidAPIKeys.golden
index 58e8b9d0d..10a93e77e 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigValidAPIKeys.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigValidAPIKeys.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
ec2_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigValidRoleARN.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigValidRoleARN.golden
index 44305e470..d99c8181c 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigValidRoleARN.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SDConfigValidRoleARN.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
ec2_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SD_withProxyConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SD_withProxyConfig.golden
index c10258eea..440e4bf2d 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SD_withProxyConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SD_withProxyConfig.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
ec2_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SD_with_TLSConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SD_with_TLSConfig.golden
index e4dad6ad1..35e2c3b0c 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SD_with_TLSConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SD_with_TLSConfig.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
ec2_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SD_with_TLSConfig_Unsupported_Version.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SD_with_TLSConfig_Unsupported_Version.golden
index d40683b94..48ece0e0e 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SD_with_TLSConfig_Unsupported_Version.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EC2SD_with_TLSConfig_Unsupported_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:
- job_name: scrapeConfig/default/testscrapeconfig1
ec2_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Empty.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Empty.golden
index 07324ebdd..26f7d0393 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Empty.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Empty.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
relabel_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EmptyRelabelConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EmptyRelabelConfig.golden
index 07324ebdd..26f7d0393 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EmptyRelabelConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EmptyRelabelConfig.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
relabel_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EnableCompression_False.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EnableCompression_False.golden
index ded69fb46..f0832062b 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EnableCompression_False.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EnableCompression_False.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
enable_compression: false
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EnableCompression_True.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EnableCompression_True.golden
index 5e457c885..9a6e4ca22 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EnableCompression_True.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EnableCompression_True.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
enable_compression: true
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EurekaSD.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EurekaSD.golden
index da719cdf8..4ea288ff9 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EurekaSD.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EurekaSD.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
eureka_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EurekaSD_with_OAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EurekaSD_with_OAuth.golden
index 81b8e8e73..5dd84d5b6 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EurekaSD_with_OAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EurekaSD_with_OAuth.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
eureka_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EurekaSD_with_TLSConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EurekaSD_with_TLSConfig.golden
index 2d5e0155c..dc9f35696 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EurekaSD_with_TLSConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_EurekaSD_with_TLSConfig.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
eureka_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_FileSD.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_FileSD.golden
index d366479d1..17904aaac 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_FileSD.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_FileSD.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
file_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_GCESDConfigEmpty.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_GCESDConfigEmpty.golden
index 07324ebdd..26f7d0393 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_GCESDConfigEmpty.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_GCESDConfigEmpty.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
relabel_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_GCESDConfigValid.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_GCESDConfigValid.golden
index 88f2a392a..d79b0337a 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_GCESDConfigValid.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_GCESDConfigValid.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
gce_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD.golden
index b9151ed77..6b9d5fc7b 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD.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
http_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_Authorization.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_Authorization.golden
index 362e88806..8de183ba1 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_Authorization.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_Authorization.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
http_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_BasicAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_BasicAuth.golden
index 736251acb..7d6e89826 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_BasicAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_BasicAuth.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
http_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_OAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_OAuth.golden
index d91fd6157..e995fcfaf 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_OAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_OAuth.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
http_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_ProxyConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_ProxyConfig.golden
index 0b4eaadf0..47b68e375 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_ProxyConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_ProxyConfig.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
http_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_TLSConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_TLSConfig.golden
index 73c523005..d3a9ce0de 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_TLSConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HTTPSD_with_TLSConfig.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
http_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD.golden
index 1a0673323..1e33ffbb5 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD.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
hetzner_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD_with_Authorization.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD_with_Authorization.golden
index f55c96464..e676eef99 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD_with_Authorization.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD_with_Authorization.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
hetzner_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD_with_BasicAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD_with_BasicAuth.golden
index 380ce5499..cba312ce9 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD_with_BasicAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD_with_BasicAuth.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
hetzner_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD_with_OAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD_with_OAuth.golden
index 53fdf7071..1e3ece018 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD_with_OAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD_with_OAuth.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
hetzner_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD_with_TLSConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD_with_TLSConfig.golden
index 90cd321e5..e6e7b5cd5 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD_with_TLSConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HetznerSD_with_TLSConfig.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
hetzner_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HonorLabels.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HonorLabels.golden
index 8c7c56f88..33a168b8b 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HonorLabels.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HonorLabels.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
honor_labels: true
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HonorTimeStamp.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HonorTimeStamp.golden
index fa264b865..7ecef16e0 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HonorTimeStamp.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_HonorTimeStamp.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
honor_timestamps: true
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_IonosSD.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_IonosSD.golden
index 1d09b579f..1c9f2ee63 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_IonosSD.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_IonosSD.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
ionos_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_IonosSD_withTLSConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_IonosSD_withTLSConfig.golden
index ce9b8dae3..394c5fe6f 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_IonosSD_withTLSConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_IonosSD_withTLSConfig.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
ionos_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD.golden
index 07c58854d..613006e0e 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD.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
kubernetes_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_AttachMetadata.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_AttachMetadata.golden
index 32da4a84e..1e15788aa 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_AttachMetadata.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_AttachMetadata.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
kubernetes_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_Authorization.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_Authorization.golden
index c3b80e683..5a58a0850 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_Authorization.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_Authorization.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
kubernetes_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_BasicAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_BasicAuth.golden
index 39c15739a..ab5a0c24e 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_BasicAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_BasicAuth.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
kubernetes_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_NamespaceDiscovery.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_NamespaceDiscovery.golden
index a15618896..4331a09f1 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_NamespaceDiscovery.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_NamespaceDiscovery.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
kubernetes_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_NamespaceDiscovery_and_OwnNamespace.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_NamespaceDiscovery_and_OwnNamespace.golden
index a177063a3..5e639b218 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_NamespaceDiscovery_and_OwnNamespace.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_NamespaceDiscovery_and_OwnNamespace.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
kubernetes_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_OAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_OAuth.golden
index 1a7fe6248..1047e9c4b 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_OAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_OAuth.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
kubernetes_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_Selectors.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_Selectors.golden
index e31e8840e..d6f552aee 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_Selectors.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_Selectors.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
kubernetes_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_Selectors_Unsupported_Version.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_Selectors_Unsupported_Version.golden
index 5a26cf6f2..69ec64740 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_Selectors_Unsupported_Version.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_Selectors_Unsupported_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:
- job_name: scrapeConfig/default/testscrapeconfig1
kubernetes_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_TLSConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_TLSConfig.golden
index bb8fa07d2..05bb2928b 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_TLSConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_TLSConfig.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
kubernetes_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_Unsupported_Role_AttachMetadata.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_Unsupported_Role_AttachMetadata.golden
index 87957bb59..deea1dd88 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_Unsupported_Role_AttachMetadata.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_K8SSD_with_Unsupported_Role_AttachMetadata.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
kubernetes_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_KumaSD.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_KumaSD.golden
index 820e38996..f0b54373a 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_KumaSD.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_KumaSD.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
kuma_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_KumaSD_with_OAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_KumaSD_with_OAuth.golden
index fc481b2bf..fb30cebe5 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_KumaSD_with_OAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_KumaSD_with_OAuth.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
kuma_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_KumaSD_with_TLSConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_KumaSD_with_TLSConfig.golden
index 96729f7e8..a58aa98a3 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_KumaSD_with_TLSConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_KumaSD_with_TLSConfig.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
kuma_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_KumaSD_with_TLSConfig_TLSVersion.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_KumaSD_with_TLSConfig_TLSVersion.golden
index 1e1acf8c5..6b0cd7e56 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_KumaSD_with_TLSConfig_TLSVersion.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_KumaSD_with_TLSConfig_TLSVersion.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
kuma_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSD.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSD.golden
index c863f84ca..4e052437d 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSD.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSD.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
lightsail_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSDConfigValidAPIKeys.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSDConfigValidAPIKeys.golden
index 6a2e721f7..bd4e9d608 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSDConfigValidAPIKeys.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSDConfigValidAPIKeys.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
lightsail_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSDConfigValidRoleARN.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSDConfigValidRoleARN.golden
index a75c0281c..75e800181 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSDConfigValidRoleARN.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSDConfigValidRoleARN.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
lightsail_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSD_withBasicAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSD_withBasicAuth.golden
index e1537a7ab..3adc0d3cb 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSD_withBasicAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSD_withBasicAuth.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
lightsail_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSD_with_OAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSD_with_OAuth.golden
index 5040dfe09..26910363e 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSD_with_OAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSD_with_OAuth.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
lightsail_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSD_with_TLSConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSD_with_TLSConfig.golden
index 76bec0e96..fd39a6ba1 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSD_with_TLSConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LightSailSD_with_TLSConfig.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
lightsail_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Limits.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Limits.golden
index 07556889d..ab76d5804 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Limits.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Limits.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
sample_limit: 10000
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LinodeSDConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LinodeSDConfig.golden
index 554a14f00..fdea3a47e 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LinodeSDConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LinodeSDConfig.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
linode_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LinodeSD_with_OAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LinodeSD_with_OAuth.golden
index d4563d1a7..d880f80f2 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LinodeSD_with_OAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_LinodeSD_with_OAuth.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
linode_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_MetricPath.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_MetricPath.golden
index 060c8b598..5f9f83f4e 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_MetricPath.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_MetricPath.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
metrics_path: /metrics
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NomadSD.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NomadSD.golden
index 8fec4e86b..a59b4bf4e 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NomadSD.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NomadSD.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
nomad_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NomadSD_with_OAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NomadSD_with_OAuth.golden
index 3ce811b95..a80cecacd 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NomadSD_with_OAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NomadSD_with_OAuth.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
nomad_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NomadSD_with_TLSConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NomadSD_with_TLSConfig.golden
index 6fbe69f34..fbfef3191 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NomadSD_with_TLSConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NomadSD_with_TLSConfig.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
nomad_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NonEmptyMetricRelabelConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NonEmptyMetricRelabelConfig.golden
index 41d51cb08..789619d38 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NonEmptyMetricRelabelConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NonEmptyMetricRelabelConfig.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
relabel_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NonEmptyRelabelConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NonEmptyRelabelConfig.golden
index ed02fff4c..5e31cff08 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NonEmptyRelabelConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_NonEmptyRelabelConfig.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
relabel_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_OVHCloudSD.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_OVHCloudSD.golden
index 772667eda..f166854c0 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_OVHCloudSD.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_OVHCloudSD.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
ovhcloud_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_OpenStackSDConfigEmpty.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_OpenStackSDConfigEmpty.golden
index 07324ebdd..26f7d0393 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_OpenStackSDConfigEmpty.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_OpenStackSDConfigEmpty.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
relabel_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_OpenStackSDConfigValid.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_OpenStackSDConfigValid.golden
index 75dc48904..2ec8f276b 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_OpenStackSDConfigValid.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_OpenStackSDConfigValid.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
openstack_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Params.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Params.golden
index 90bbc92d5..a6de2070a 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Params.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Params.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
metrics_path: /federate
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ProxySettings.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ProxySettings.golden
index 2aa52b579..19bde9d5b 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ProxySettings.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ProxySettings.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
proxy_url: http://no-proxy.com
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ProxySettingsIncompatiblePrometheusVersion.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ProxySettingsIncompatiblePrometheusVersion.golden
index 60168036c..d25260bf8 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ProxySettingsIncompatiblePrometheusVersion.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ProxySettingsIncompatiblePrometheusVersion.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
proxy_url: http://no-proxy.com
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ProxySettingsWithMutiProxyConnectHeaderValues.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ProxySettingsWithMutiProxyConnectHeaderValues.golden
index 2a4a1fbc8..2f037d971 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ProxySettingsWithMutiProxyConnectHeaderValues.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ProxySettingsWithMutiProxyConnectHeaderValues.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
proxy_url: http://no-proxy.com
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_PuppetDBSD.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_PuppetDBSD.golden
index e55f051c8..497b17d95 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_PuppetDBSD.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_PuppetDBSD.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
puppetdb_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_PuppetDBSD_withBasicAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_PuppetDBSD_withBasicAuth.golden
index 79af1155a..4498c6c0a 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_PuppetDBSD_withBasicAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_PuppetDBSD_withBasicAuth.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
puppetdb_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_PuppetDBSD_with_OAuth.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_PuppetDBSD_with_OAuth.golden
index c1b60a462..336377553 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_PuppetDBSD_with_OAuth.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_PuppetDBSD_with_OAuth.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
puppetdb_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_PuppetDBSD_with_TLSConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_PuppetDBSD_with_TLSConfig.golden
index ed53f7df1..9a91d8e95 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_PuppetDBSD_with_TLSConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_PuppetDBSD_with_TLSConfig.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
puppetdb_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScaleWaySD.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScaleWaySD.golden
index c9caf5546..3d021bf41 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScaleWaySD.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScaleWaySD.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
scaleway_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScaleWaySD_with_TLSConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScaleWaySD_with_TLSConfig.golden
index ae9fa3601..a1f3dac5e 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScaleWaySD_with_TLSConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScaleWaySD_with_TLSConfig.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
scaleway_sd_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Scheme.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Scheme.golden
index a53747406..3c6673658 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Scheme.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Scheme.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
scheme: https
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScrapeInterval.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScrapeInterval.golden
index 4418ebf6a..0fa8cdc09 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScrapeInterval.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScrapeInterval.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
scrape_interval: 15s
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScrapeProtocols.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScrapeProtocols.golden
index 4fd978d8e..7c6caa2d6 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScrapeProtocols.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScrapeProtocols.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
scrape_protocols:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScrapeTimeout.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScrapeTimeout.golden
index 26c3850ee..4bcb11813 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScrapeTimeout.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_ScrapeTimeout.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
scrape_timeout: 10s
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Sharded.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Sharded.golden
index ffe6d9c43..fe2e25fc0 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Sharded.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Sharded.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
static_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Static.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Static.golden
index bd6c73b90..5ebcfc404 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Static.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_Static.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
static_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_TLSConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_TLSConfig.golden
index 3157d58ee..3e0e98996 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_TLSConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_TLSConfig.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
tls_config:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_TrackTimestampsStaleness.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_TrackTimestampsStaleness.golden
index 158ce7e08..f4a4f50fb 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_TrackTimestampsStaleness.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_TrackTimestampsStaleness.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
track_timestamps_staleness: true
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_WithJobName.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_WithJobName.golden
index 749ce1a03..d85f2227f 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_WithJobName.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_WithJobName.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
relabel_configs:
diff --git a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_WithJobNameAndRelabelConfig.golden b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_WithJobNameAndRelabelConfig.golden
index b9b6cceb8..181b8551f 100644
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_WithJobNameAndRelabelConfig.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_WithJobNameAndRelabelConfig.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
relabel_configs:
diff --git a/pkg/prometheus/testdata/ServiceMonitorEndpointEnableHttp2_EnableHTTP2False_v2.34.0.golden b/pkg/prometheus/testdata/ServiceMonitorEndpointEnableHttp2_EnableHTTP2False_v2.34.0.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/ServiceMonitorEndpointEnableHttp2_EnableHTTP2False_v2.34.0.golden
+++ b/pkg/prometheus/testdata/ServiceMonitorEndpointEnableHttp2_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: serviceMonitor/default/testservicemonitor1/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/ServiceMonitorEndpointEnableHttp2_EnableHTTP2False_v2.35.0.golden b/pkg/prometheus/testdata/ServiceMonitorEndpointEnableHttp2_EnableHTTP2False_v2.35.0.golden
index b032d0536..1a155df85 100644
--- a/pkg/prometheus/testdata/ServiceMonitorEndpointEnableHttp2_EnableHTTP2False_v2.35.0.golden
+++ b/pkg/prometheus/testdata/ServiceMonitorEndpointEnableHttp2_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: serviceMonitor/default/testservicemonitor1/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/ServiceMonitorEndpointEnableHttp2_EnableHTTP2True_v2.34.0.golden b/pkg/prometheus/testdata/ServiceMonitorEndpointEnableHttp2_EnableHTTP2True_v2.34.0.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/ServiceMonitorEndpointEnableHttp2_EnableHTTP2True_v2.34.0.golden
+++ b/pkg/prometheus/testdata/ServiceMonitorEndpointEnableHttp2_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: serviceMonitor/default/testservicemonitor1/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/ServiceMonitorEndpointEnableHttp2_EnableHTTP2True_v2.35.0.golden b/pkg/prometheus/testdata/ServiceMonitorEndpointEnableHttp2_EnableHTTP2True_v2.35.0.golden
index 83fa9b7c5..166ad43da 100644
--- a/pkg/prometheus/testdata/ServiceMonitorEndpointEnableHttp2_EnableHTTP2True_v2.35.0.golden
+++ b/pkg/prometheus/testdata/ServiceMonitorEndpointEnableHttp2_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: serviceMonitor/default/testservicemonitor1/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/ServiceMonitorEndpointFollowRedirects_FollowRedirectFalse_v2.25.0.golden b/pkg/prometheus/testdata/ServiceMonitorEndpointFollowRedirects_FollowRedirectFalse_v2.25.0.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/ServiceMonitorEndpointFollowRedirects_FollowRedirectFalse_v2.25.0.golden
+++ b/pkg/prometheus/testdata/ServiceMonitorEndpointFollowRedirects_FollowRedirectFalse_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: serviceMonitor/default/testservicemonitor1/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/ServiceMonitorEndpointFollowRedirects_FollowRedirectFalse_v2.28.0.golden b/pkg/prometheus/testdata/ServiceMonitorEndpointFollowRedirects_FollowRedirectFalse_v2.28.0.golden
index 47fbb104c..a392d3fc2 100644
--- a/pkg/prometheus/testdata/ServiceMonitorEndpointFollowRedirects_FollowRedirectFalse_v2.28.0.golden
+++ b/pkg/prometheus/testdata/ServiceMonitorEndpointFollowRedirects_FollowRedirectFalse_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
diff --git a/pkg/prometheus/testdata/ServiceMonitorEndpointFollowRedirects_FollowRedirectTrue_v2.25.0.golden b/pkg/prometheus/testdata/ServiceMonitorEndpointFollowRedirects_FollowRedirectTrue_v2.25.0.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/ServiceMonitorEndpointFollowRedirects_FollowRedirectTrue_v2.25.0.golden
+++ b/pkg/prometheus/testdata/ServiceMonitorEndpointFollowRedirects_FollowRedirectTrue_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: serviceMonitor/default/testservicemonitor1/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/ServiceMonitorEndpointFollowRedirects_FollowRedirectTrue_v2.28.0.golden b/pkg/prometheus/testdata/ServiceMonitorEndpointFollowRedirects_FollowRedirectTrue_v2.28.0.golden
index 714526355..df175cef1 100644
--- a/pkg/prometheus/testdata/ServiceMonitorEndpointFollowRedirects_FollowRedirectTrue_v2.28.0.golden
+++ b/pkg/prometheus/testdata/ServiceMonitorEndpointFollowRedirects_FollowRedirectTrue_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
diff --git a/pkg/prometheus/testdata/SettingHonorLabels.golden b/pkg/prometheus/testdata/SettingHonorLabels.golden
index 50c398b55..dbf32b600 100644
--- a/pkg/prometheus/testdata/SettingHonorLabels.golden
+++ b/pkg/prometheus/testdata/SettingHonorLabels.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: true
diff --git a/pkg/prometheus/testdata/SettingHonorTimestampsInPodMonitor.golden b/pkg/prometheus/testdata/SettingHonorTimestampsInPodMonitor.golden
index c91ae5a41..b281ab473 100644
--- a/pkg/prometheus/testdata/SettingHonorTimestampsInPodMonitor.golden
+++ b/pkg/prometheus/testdata/SettingHonorTimestampsInPodMonitor.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
diff --git a/pkg/prometheus/testdata/SettingHonorTimestampsInServiceMonitor.golden b/pkg/prometheus/testdata/SettingHonorTimestampsInServiceMonitor.golden
index a7da3c629..1f47cc680 100644
--- a/pkg/prometheus/testdata/SettingHonorTimestampsInServiceMonitor.golden
+++ b/pkg/prometheus/testdata/SettingHonorTimestampsInServiceMonitor.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
diff --git a/pkg/prometheus/testdata/SettingScrapeProtocolsInPodMonitor_NewVersion.golden b/pkg/prometheus/testdata/SettingScrapeProtocolsInPodMonitor_NewVersion.golden
index a23ab8a47..2238689f1 100644
--- a/pkg/prometheus/testdata/SettingScrapeProtocolsInPodMonitor_NewVersion.golden
+++ b/pkg/prometheus/testdata/SettingScrapeProtocolsInPodMonitor_NewVersion.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
diff --git a/pkg/prometheus/testdata/SettingScrapeProtocolsInPodMonitor_OldVersion.golden b/pkg/prometheus/testdata/SettingScrapeProtocolsInPodMonitor_OldVersion.golden
index 66c934398..94d3561b2 100644
--- a/pkg/prometheus/testdata/SettingScrapeProtocolsInPodMonitor_OldVersion.golden
+++ b/pkg/prometheus/testdata/SettingScrapeProtocolsInPodMonitor_OldVersion.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
diff --git a/pkg/prometheus/testdata/SettingScrapeProtocolsInServiceMonitor_NewVersion.golden b/pkg/prometheus/testdata/SettingScrapeProtocolsInServiceMonitor_NewVersion.golden
index 4fa9f7342..2d2f27d9b 100644
--- a/pkg/prometheus/testdata/SettingScrapeProtocolsInServiceMonitor_NewVersion.golden
+++ b/pkg/prometheus/testdata/SettingScrapeProtocolsInServiceMonitor_NewVersion.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
diff --git a/pkg/prometheus/testdata/SettingScrapeProtocolsInServiceMonitor_OldVersion.golden b/pkg/prometheus/testdata/SettingScrapeProtocolsInServiceMonitor_OldVersion.golden
index a7da3c629..1f47cc680 100644
--- a/pkg/prometheus/testdata/SettingScrapeProtocolsInServiceMonitor_OldVersion.golden
+++ b/pkg/prometheus/testdata/SettingScrapeProtocolsInServiceMonitor_OldVersion.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
diff --git a/pkg/prometheus/testdata/SettingTrackTimestampsStalenessInPodMonitor.golden b/pkg/prometheus/testdata/SettingTrackTimestampsStalenessInPodMonitor.golden
index 66c934398..94d3561b2 100644
--- a/pkg/prometheus/testdata/SettingTrackTimestampsStalenessInPodMonitor.golden
+++ b/pkg/prometheus/testdata/SettingTrackTimestampsStalenessInPodMonitor.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
diff --git a/pkg/prometheus/testdata/SettingTrackTimestampsStalenessInServiceMonitor.golden b/pkg/prometheus/testdata/SettingTrackTimestampsStalenessInServiceMonitor.golden
index e49fd2333..b06867643 100644
--- a/pkg/prometheus/testdata/SettingTrackTimestampsStalenessInServiceMonitor.golden
+++ b/pkg/prometheus/testdata/SettingTrackTimestampsStalenessInServiceMonitor.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
diff --git a/pkg/prometheus/testdata/StorageSettingMaxExemplars_MaxSize5000000.golden b/pkg/prometheus/testdata/StorageSettingMaxExemplars_MaxSize5000000.golden
index 64aef4eed..e878a48a4 100644
--- a/pkg/prometheus/testdata/StorageSettingMaxExemplars_MaxSize5000000.golden
+++ b/pkg/prometheus/testdata/StorageSettingMaxExemplars_MaxSize5000000.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: []
storage:
exemplars:
diff --git a/pkg/prometheus/testdata/StorageSettingMaxExemplars_MaxSizeNotSetAtAll.golden b/pkg/prometheus/testdata/StorageSettingMaxExemplars_MaxSizeNotSetAtAll.golden
index 3e7a5bdbe..609303fe8 100644
--- a/pkg/prometheus/testdata/StorageSettingMaxExemplars_MaxSizeNotSetAtAll.golden
+++ b/pkg/prometheus/testdata/StorageSettingMaxExemplars_MaxSizeNotSetAtAll.golden
@@ -1,7 +1,7 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
external_labels:
prometheus: default/test
prometheus_replica: $(POD_NAME)
+ evaluation_interval: 30s
scrape_configs: []
diff --git a/pkg/prometheus/testdata/StorageSettingMaxExemplars_MaxSizeNotSet_v2.29.0.golden b/pkg/prometheus/testdata/StorageSettingMaxExemplars_MaxSizeNotSet_v2.29.0.golden
index 3e7a5bdbe..609303fe8 100644
--- a/pkg/prometheus/testdata/StorageSettingMaxExemplars_MaxSizeNotSet_v2.29.0.golden
+++ b/pkg/prometheus/testdata/StorageSettingMaxExemplars_MaxSizeNotSet_v2.29.0.golden
@@ -1,7 +1,7 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
external_labels:
prometheus: default/test
prometheus_replica: $(POD_NAME)
+ evaluation_interval: 30s
scrape_configs: []
diff --git a/pkg/prometheus/testdata/TSDB_config_greater_than_or_equal_to_v2.39.0.golden b/pkg/prometheus/testdata/TSDB_config_greater_than_or_equal_to_v2.39.0.golden
index 87262f49a..3012c6447 100644
--- a/pkg/prometheus/testdata/TSDB_config_greater_than_or_equal_to_v2.39.0.golden
+++ b/pkg/prometheus/testdata/TSDB_config_greater_than_or_equal_to_v2.39.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: []
storage:
tsdb:
diff --git a/pkg/prometheus/testdata/TSDB_config_less_than_v2.39.0.golden b/pkg/prometheus/testdata/TSDB_config_less_than_v2.39.0.golden
index 3e7a5bdbe..609303fe8 100644
--- a/pkg/prometheus/testdata/TSDB_config_less_than_v2.39.0.golden
+++ b/pkg/prometheus/testdata/TSDB_config_less_than_v2.39.0.golden
@@ -1,7 +1,7 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
external_labels:
prometheus: default/test
prometheus_replica: $(POD_NAME)
+ evaluation_interval: 30s
scrape_configs: []
diff --git a/pkg/prometheus/testdata/TargetLabels.golden b/pkg/prometheus/testdata/TargetLabels.golden
index 1334dc295..766fdee6c 100644
--- a/pkg/prometheus/testdata/TargetLabels.golden
+++ b/pkg/prometheus/testdata/TargetLabels.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
diff --git a/pkg/prometheus/testdata/TargetLimits-1_Versionv2.15.0.golden b/pkg/prometheus/testdata/TargetLimits-1_Versionv2.15.0.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/TargetLimits-1_Versionv2.15.0.golden
+++ b/pkg/prometheus/testdata/TargetLimits-1_Versionv2.15.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
diff --git a/pkg/prometheus/testdata/TargetLimits-1_Versionv2.21.0.golden b/pkg/prometheus/testdata/TargetLimits-1_Versionv2.21.0.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/TargetLimits-1_Versionv2.21.0.golden
+++ b/pkg/prometheus/testdata/TargetLimits-1_Versionv2.21.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
diff --git a/pkg/prometheus/testdata/TargetLimits-1_Versionv2.21.0_Enforce1000.golden b/pkg/prometheus/testdata/TargetLimits-1_Versionv2.21.0_Enforce1000.golden
index beec5fa48..4a56a0c67 100644
--- a/pkg/prometheus/testdata/TargetLimits-1_Versionv2.21.0_Enforce1000.golden
+++ b/pkg/prometheus/testdata/TargetLimits-1_Versionv2.21.0_Enforce1000.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
diff --git a/pkg/prometheus/testdata/TargetLimits1000_Versionv2.21.0_Enforce1000.golden b/pkg/prometheus/testdata/TargetLimits1000_Versionv2.21.0_Enforce1000.golden
index 61e83c451..452aafb88 100644
--- a/pkg/prometheus/testdata/TargetLimits1000_Versionv2.21.0_Enforce1000.golden
+++ b/pkg/prometheus/testdata/TargetLimits1000_Versionv2.21.0_Enforce1000.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
diff --git a/pkg/prometheus/testdata/TargetLimits2000_Versionv2.15.0_Enforce1000.golden b/pkg/prometheus/testdata/TargetLimits2000_Versionv2.15.0_Enforce1000.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/TargetLimits2000_Versionv2.15.0_Enforce1000.golden
+++ b/pkg/prometheus/testdata/TargetLimits2000_Versionv2.15.0_Enforce1000.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
diff --git a/pkg/prometheus/testdata/TargetLimits2000_Versionv2.21.0_Enforce1000.golden b/pkg/prometheus/testdata/TargetLimits2000_Versionv2.21.0_Enforce1000.golden
index beec5fa48..4a56a0c67 100644
--- a/pkg/prometheus/testdata/TargetLimits2000_Versionv2.21.0_Enforce1000.golden
+++ b/pkg/prometheus/testdata/TargetLimits2000_Versionv2.21.0_Enforce1000.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
diff --git a/pkg/prometheus/testdata/TargetLimits500_Versionv2.15.0_Enforce1000.golden b/pkg/prometheus/testdata/TargetLimits500_Versionv2.15.0_Enforce1000.golden
index 163ee2503..2a955606f 100644
--- a/pkg/prometheus/testdata/TargetLimits500_Versionv2.15.0_Enforce1000.golden
+++ b/pkg/prometheus/testdata/TargetLimits500_Versionv2.15.0_Enforce1000.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
diff --git a/pkg/prometheus/testdata/TestAdditionalAlertmanagers_Expected.golden b/pkg/prometheus/testdata/TestAdditionalAlertmanagers_Expected.golden
index e1061ec52..fb75f7a4b 100644
--- a/pkg/prometheus/testdata/TestAdditionalAlertmanagers_Expected.golden
+++ b/pkg/prometheus/testdata/TestAdditionalAlertmanagers_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:
diff --git a/pkg/prometheus/testdata/TestServiceMonitorWithEndpointSliceEnable_Expected.golden b/pkg/prometheus/testdata/TestServiceMonitorWithEndpointSliceEnable_Expected.golden
index e513e68ec..daf1ece35 100644
--- a/pkg/prometheus/testdata/TestServiceMonitorWithEndpointSliceEnable_Expected.golden
+++ b/pkg/prometheus/testdata/TestServiceMonitorWithEndpointSliceEnable_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
diff --git a/pkg/prometheus/testdata/TracingConfig_Config_only_with_endpoint.golden b/pkg/prometheus/testdata/TracingConfig_Config_only_with_endpoint.golden
index 391d7d4b3..0dda9c169 100644
--- a/pkg/prometheus/testdata/TracingConfig_Config_only_with_endpoint.golden
+++ b/pkg/prometheus/testdata/TracingConfig_Config_only_with_endpoint.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: []
tracing:
endpoint: https://otel-collector.default.svc.local:3333
diff --git a/pkg/prometheus/testdata/TracingConfig_Expect_valid_config.golden b/pkg/prometheus/testdata/TracingConfig_Expect_valid_config.golden
index 92540e39a..12d51108a 100644
--- a/pkg/prometheus/testdata/TracingConfig_Expect_valid_config.golden
+++ b/pkg/prometheus/testdata/TracingConfig_Expect_valid_config.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: []
tracing:
endpoint: https://otel-collector.default.svc.local:3333
diff --git a/pkg/prometheus/testdata/external_label_specified.golden b/pkg/prometheus/testdata/external_label_specified.golden
index 3ce6f9a67..608c1d483 100644
--- a/pkg/prometheus/testdata/external_label_specified.golden
+++ b/pkg/prometheus/testdata/external_label_specified.golden
@@ -1,9 +1,9 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
external_labels:
key1: value1
key2: value2
prometheus: test/example
prometheus_replica: $(POD_NAME)
+ evaluation_interval: 30s
scrape_configs: []
diff --git a/pkg/prometheus/testdata/external_label_specified_along_with_reserved_labels.golden b/pkg/prometheus/testdata/external_label_specified_along_with_reserved_labels.golden
index e8d6b7b0b..5a4b3aa9f 100644
--- a/pkg/prometheus/testdata/external_label_specified_along_with_reserved_labels.golden
+++ b/pkg/prometheus/testdata/external_label_specified_along_with_reserved_labels.golden
@@ -1,8 +1,8 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
external_labels:
prometheus: test/example
prometheus_replica: $(POD_NAME)
some-other-key: some-value
+ evaluation_interval: 30s
scrape_configs: []
diff --git a/pkg/prometheus/testdata/global_settings_valid_config_v2.15.2.golden b/pkg/prometheus/testdata/global_settings_valid_config_v2.15.2.golden
index f5c3ffcb5..e1ec39470 100644
--- a/pkg/prometheus/testdata/global_settings_valid_config_v2.15.2.golden
+++ b/pkg/prometheus/testdata/global_settings_valid_config_v2.15.2.golden
@@ -1,7 +1,7 @@
global:
- evaluation_interval: 30s
scrape_interval: 15s
external_labels:
prometheus: test/example
prometheus_replica: $(POD_NAME)
+ evaluation_interval: 30s
scrape_configs: []
diff --git a/pkg/prometheus/testdata/monitorObjectWithDefaultScrapeClassAndTLSConfig.golden b/pkg/prometheus/testdata/monitorObjectWithDefaultScrapeClassAndTLSConfig.golden
index de915ff05..c8af53c00 100644
--- a/pkg/prometheus/testdata/monitorObjectWithDefaultScrapeClassAndTLSConfig.golden
+++ b/pkg/prometheus/testdata/monitorObjectWithDefaultScrapeClassAndTLSConfig.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/defaultServiceMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/monitorObjectWithNonDefaultScrapeClassAndTLSConfig.golden b/pkg/prometheus/testdata/monitorObjectWithNonDefaultScrapeClassAndTLSConfig.golden
index d124d7754..a3c83f6a1 100644
--- a/pkg/prometheus/testdata/monitorObjectWithNonDefaultScrapeClassAndTLSConfig.golden
+++ b/pkg/prometheus/testdata/monitorObjectWithNonDefaultScrapeClassAndTLSConfig.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/defaultServiceMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/monitorObjectWithoutScrapeClass.golden b/pkg/prometheus/testdata/monitorObjectWithoutScrapeClass.golden
index 7a52ceecf..76bc77f34 100644
--- a/pkg/prometheus/testdata/monitorObjectWithoutScrapeClass.golden
+++ b/pkg/prometheus/testdata/monitorObjectWithoutScrapeClass.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/defaultServiceMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/no_TSDB_config.golden b/pkg/prometheus/testdata/no_TSDB_config.golden
index 3e7a5bdbe..609303fe8 100644
--- a/pkg/prometheus/testdata/no_TSDB_config.golden
+++ b/pkg/prometheus/testdata/no_TSDB_config.golden
@@ -1,7 +1,7 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
external_labels:
prometheus: default/test
prometheus_replica: $(POD_NAME)
+ evaluation_interval: 30s
scrape_configs: []
diff --git a/pkg/prometheus/testdata/podMonitorObjectWithDefaultScrapeClassWithAttachMetadata.golden b/pkg/prometheus/testdata/podMonitorObjectWithDefaultScrapeClassWithAttachMetadata.golden
index 5f22a06f5..490ffaff5 100644
--- a/pkg/prometheus/testdata/podMonitorObjectWithDefaultScrapeClassWithAttachMetadata.golden
+++ b/pkg/prometheus/testdata/podMonitorObjectWithDefaultScrapeClassWithAttachMetadata.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/defaultPodMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/podMonitorObjectWithDefaultScrapeClassWithMetricRelabelings.golden b/pkg/prometheus/testdata/podMonitorObjectWithDefaultScrapeClassWithMetricRelabelings.golden
index ac7a63b82..e6a68c9b8 100644
--- a/pkg/prometheus/testdata/podMonitorObjectWithDefaultScrapeClassWithMetricRelabelings.golden
+++ b/pkg/prometheus/testdata/podMonitorObjectWithDefaultScrapeClassWithMetricRelabelings.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/defaultPodMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/podMonitorObjectWithDefaultScrapeClassWithRelabelings.golden b/pkg/prometheus/testdata/podMonitorObjectWithDefaultScrapeClassWithRelabelings.golden
index e11c5b7d6..d8c163164 100644
--- a/pkg/prometheus/testdata/podMonitorObjectWithDefaultScrapeClassWithRelabelings.golden
+++ b/pkg/prometheus/testdata/podMonitorObjectWithDefaultScrapeClassWithRelabelings.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/defaultPodMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassAndExistingTLSConfig.golden b/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassAndExistingTLSConfig.golden
index 70defb73e..e573bcb86 100644
--- a/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassAndExistingTLSConfig.golden
+++ b/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassAndExistingTLSConfig.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/defaultPodMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassAndExistingTLSConfigMissingCA.golden b/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassAndExistingTLSConfigMissingCA.golden
index 3f3579df7..586256742 100644
--- a/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassAndExistingTLSConfigMissingCA.golden
+++ b/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassAndExistingTLSConfigMissingCA.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/defaultPodMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassWithAttachMetadata.golden b/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassWithAttachMetadata.golden
index 5f22a06f5..490ffaff5 100644
--- a/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassWithAttachMetadata.golden
+++ b/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassWithAttachMetadata.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/defaultPodMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassWithMetricRelabelings.golden b/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassWithMetricRelabelings.golden
index 4b49305f2..af2962308 100644
--- a/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassWithMetricRelabelings.golden
+++ b/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassWithMetricRelabelings.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/defaultPodMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassWithRelabelings.golden b/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassWithRelabelings.golden
index 4211b90d4..92907452e 100644
--- a/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassWithRelabelings.golden
+++ b/pkg/prometheus/testdata/podMonitorObjectWithNonDefaultScrapeClassWithRelabelings.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/defaultPodMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/pod_monitor_with_oauth2.golden b/pkg/prometheus/testdata/pod_monitor_with_oauth2.golden
index fd03a2d58..bb915c901 100644
--- a/pkg/prometheus/testdata/pod_monitor_with_oauth2.golden
+++ b/pkg/prometheus/testdata/pod_monitor_with_oauth2.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
diff --git a/pkg/prometheus/testdata/probe_monitor_with_oauth2.golden b/pkg/prometheus/testdata/probe_monitor_with_oauth2.golden
index a93c773e6..313d2e92d 100644
--- a/pkg/prometheus/testdata/probe_monitor_with_oauth2.golden
+++ b/pkg/prometheus/testdata/probe_monitor_with_oauth2.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
diff --git a/pkg/prometheus/testdata/query_log_file.golden b/pkg/prometheus/testdata/query_log_file.golden
index e7bf2f855..b6c2d167f 100644
--- a/pkg/prometheus/testdata/query_log_file.golden
+++ b/pkg/prometheus/testdata/query_log_file.golden
@@ -1,8 +1,8 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
external_labels:
prometheus: test/example
prometheus_replica: $(POD_NAME)
+ evaluation_interval: 30s
query_log_file: /var/log/prometheus/test.log
scrape_configs: []
diff --git a/pkg/prometheus/testdata/serviceMonitorObjectWithDefaultScrapeClassWithAttachMetadata.golden b/pkg/prometheus/testdata/serviceMonitorObjectWithDefaultScrapeClassWithAttachMetadata.golden
index 8a87edca0..d02d1c49d 100644
--- a/pkg/prometheus/testdata/serviceMonitorObjectWithDefaultScrapeClassWithAttachMetadata.golden
+++ b/pkg/prometheus/testdata/serviceMonitorObjectWithDefaultScrapeClassWithAttachMetadata.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/defaultServiceMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/serviceMonitorObjectWithDefaultScrapeClassWithMetricRelabelings.golden b/pkg/prometheus/testdata/serviceMonitorObjectWithDefaultScrapeClassWithMetricRelabelings.golden
index e84d580b4..4b7428040 100644
--- a/pkg/prometheus/testdata/serviceMonitorObjectWithDefaultScrapeClassWithMetricRelabelings.golden
+++ b/pkg/prometheus/testdata/serviceMonitorObjectWithDefaultScrapeClassWithMetricRelabelings.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/defaultServiceMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/serviceMonitorObjectWithDefaultScrapeClassWithRelabelings.golden b/pkg/prometheus/testdata/serviceMonitorObjectWithDefaultScrapeClassWithRelabelings.golden
index f765bae1a..8a6b666cc 100644
--- a/pkg/prometheus/testdata/serviceMonitorObjectWithDefaultScrapeClassWithRelabelings.golden
+++ b/pkg/prometheus/testdata/serviceMonitorObjectWithDefaultScrapeClassWithRelabelings.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/defaultServiceMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassAndExistingTLSConfig.golden b/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassAndExistingTLSConfig.golden
index 6cc3b8576..772814c26 100644
--- a/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassAndExistingTLSConfig.golden
+++ b/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassAndExistingTLSConfig.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/defaultServiceMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassAndExistingTLSConfigMissingCA.golden b/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassAndExistingTLSConfigMissingCA.golden
index 44c09c4ba..e248a6e30 100644
--- a/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassAndExistingTLSConfigMissingCA.golden
+++ b/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassAndExistingTLSConfigMissingCA.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/defaultServiceMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassWithAttachMetadata.golden b/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassWithAttachMetadata.golden
index 8a87edca0..d02d1c49d 100644
--- a/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassWithAttachMetadata.golden
+++ b/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassWithAttachMetadata.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/defaultServiceMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassWithMetricRelabelings.golden b/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassWithMetricRelabelings.golden
index e58c7d031..f67e983bb 100644
--- a/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassWithMetricRelabelings.golden
+++ b/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassWithMetricRelabelings.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/defaultServiceMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassWithRelabelings.golden b/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassWithRelabelings.golden
index d72ebac68..d9f99797a 100644
--- a/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassWithRelabelings.golden
+++ b/pkg/prometheus/testdata/serviceMonitorObjectWithNonDefaultScrapeClassWithRelabelings.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/defaultServiceMonitor/0
honor_labels: false
diff --git a/pkg/prometheus/testdata/service_monitor_with_oauth2.golden b/pkg/prometheus/testdata/service_monitor_with_oauth2.golden
index b1d784094..8b8632823 100644
--- a/pkg/prometheus/testdata/service_monitor_with_oauth2.golden
+++ b/pkg/prometheus/testdata/service_monitor_with_oauth2.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
diff --git a/pkg/prometheus/testdata/valid_global_config_with_keep_dropped_targets.golden b/pkg/prometheus/testdata/valid_global_config_with_keep_dropped_targets.golden
index 12bd83077..29bad56f6 100644
--- a/pkg/prometheus/testdata/valid_global_config_with_keep_dropped_targets.golden
+++ b/pkg/prometheus/testdata/valid_global_config_with_keep_dropped_targets.golden
@@ -1,8 +1,8 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
external_labels:
prometheus: test/example
prometheus_replica: $(POD_NAME)
keep_dropped_targets: 50
+ evaluation_interval: 30s
scrape_configs: []
diff --git a/pkg/prometheus/testdata/valid_global_config_with_label_limits.golden b/pkg/prometheus/testdata/valid_global_config_with_label_limits.golden
index 2ea0dea28..dab02f594 100644
--- a/pkg/prometheus/testdata/valid_global_config_with_label_limits.golden
+++ b/pkg/prometheus/testdata/valid_global_config_with_label_limits.golden
@@ -1,5 +1,4 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
external_labels:
prometheus: test/example
@@ -10,4 +9,5 @@ global:
label_limit: 50
label_name_length_limit: 40
label_value_length_limit: 30
+ evaluation_interval: 30s
scrape_configs: []
diff --git a/pkg/prometheus/testdata/valid_global_config_with_rule_query_offset.golden b/pkg/prometheus/testdata/valid_global_config_with_rule_query_offset.golden
index 754c6e0f1..0413702c8 100644
--- a/pkg/prometheus/testdata/valid_global_config_with_rule_query_offset.golden
+++ b/pkg/prometheus/testdata/valid_global_config_with_rule_query_offset.golden
@@ -1,8 +1,8 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
- rule_query_offset: 30s
external_labels:
prometheus: test/example
prometheus_replica: $(POD_NAME)
+ evaluation_interval: 30s
+ rule_query_offset: 30s
scrape_configs: []
diff --git a/pkg/prometheus/testdata/valid_global_config_with_scrape_protocols.golden b/pkg/prometheus/testdata/valid_global_config_with_scrape_protocols.golden
index 080a96878..da75435f2 100644
--- a/pkg/prometheus/testdata/valid_global_config_with_scrape_protocols.golden
+++ b/pkg/prometheus/testdata/valid_global_config_with_scrape_protocols.golden
@@ -1,5 +1,4 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
scrape_protocols:
- OpenMetricsText1.0.0
@@ -8,4 +7,5 @@ global:
external_labels:
prometheus: test/example
prometheus_replica: $(POD_NAME)
+ evaluation_interval: 30s
scrape_configs: []
diff --git a/pkg/prometheus/testdata/valid_global_config_without_rule_query_offset.golden b/pkg/prometheus/testdata/valid_global_config_without_rule_query_offset.golden
index a16a4a571..14f383870 100644
--- a/pkg/prometheus/testdata/valid_global_config_without_rule_query_offset.golden
+++ b/pkg/prometheus/testdata/valid_global_config_without_rule_query_offset.golden
@@ -1,7 +1,7 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
external_labels:
prometheus: test/example
prometheus_replica: $(POD_NAME)
+ evaluation_interval: 30s
scrape_configs: []
diff --git a/pkg/prometheus/testdata/valid_global_limits.golden b/pkg/prometheus/testdata/valid_global_limits.golden
index a4f9ffded..9c9aa0077 100644
--- a/pkg/prometheus/testdata/valid_global_limits.golden
+++ b/pkg/prometheus/testdata/valid_global_limits.golden
@@ -1,5 +1,4 @@
global:
- evaluation_interval: 30s
scrape_interval: 30s
external_labels:
prometheus: test/example
@@ -7,4 +6,5 @@ global:
body_size_limit: 1000MB
sample_limit: 10000
target_limit: 1000
+ evaluation_interval: 30s
scrape_configs: []
diff --git a/pkg/prometheus/testdata/valid_scrape_timeout_along_with_valid_scrape_interval_specified.golden b/pkg/prometheus/testdata/valid_scrape_timeout_along_with_valid_scrape_interval_specified.golden
index bf856e6e9..a4f858c02 100644
--- a/pkg/prometheus/testdata/valid_scrape_timeout_along_with_valid_scrape_interval_specified.golden
+++ b/pkg/prometheus/testdata/valid_scrape_timeout_along_with_valid_scrape_interval_specified.golden
@@ -1,8 +1,8 @@
global:
- evaluation_interval: 30s
scrape_interval: 60s
scrape_timeout: 10s
external_labels:
prometheus: test/example
prometheus_replica: $(POD_NAME)
+ evaluation_interval: 30s
scrape_configs: []