Skip to content

Commit f6b342d

Browse files
branczbrancz
authored
Merge pull request prometheus-operator#3364 from coreos/revert-3308-normalize-default-durations
Revert "Normalize default durations"
2 parents f1e0131 + 024da7b commit f6b342d

File tree

2 files changed

+58
-58
lines changed

2 files changed

+58
-58
lines changed

‎pkg/prometheus/promcfg.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,12 @@ func (cg *configGenerator) generateConfig(
174174

175175
cfg := yaml.MapSlice{}
176176

177-
scrapeInterval := "1m"
177+
scrapeInterval := "30s"
178178
if p.Spec.ScrapeInterval != "" {
179179
scrapeInterval = p.Spec.ScrapeInterval
180180
}
181181

182-
evaluationInterval := "1m"
182+
evaluationInterval := "30s"
183183
if p.Spec.EvaluationInterval != "" {
184184
evaluationInterval = p.Spec.EvaluationInterval
185185
}

‎pkg/prometheus/promcfg_test.go

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ func TestGlobalSettings(t *testing.T) {
6767
{
6868
Version: "v2.15.2",
6969
Expected: `global:
70-
evaluation_interval: 1m
71-
scrape_interval: 1m
70+
evaluation_interval: 30s
71+
scrape_interval: 30s
7272
external_labels:
7373
prometheus: /
7474
prometheus_replica: $(POD_NAME)
@@ -83,10 +83,10 @@ alerting:
8383
},
8484
{
8585
Version: "v2.15.2",
86-
EvaluationInterval: "1m",
86+
EvaluationInterval: "60s",
8787
Expected: `global:
88-
evaluation_interval: 1m
89-
scrape_interval: 1m
88+
evaluation_interval: 60s
89+
scrape_interval: 30s
9090
external_labels:
9191
prometheus: /
9292
prometheus_replica: $(POD_NAME)
@@ -101,10 +101,10 @@ alerting:
101101
},
102102
{
103103
Version: "v2.15.2",
104-
ScrapeInterval: "1m",
104+
ScrapeInterval: "60s",
105105
Expected: `global:
106-
evaluation_interval: 1m
107-
scrape_interval: 1m
106+
evaluation_interval: 30s
107+
scrape_interval: 60s
108108
external_labels:
109109
prometheus: /
110110
prometheus_replica: $(POD_NAME)
@@ -121,8 +121,8 @@ alerting:
121121
Version: "v2.15.2",
122122
ScrapeTimeout: "30s",
123123
Expected: `global:
124-
evaluation_interval: 1m
125-
scrape_interval: 1m
124+
evaluation_interval: 30s
125+
scrape_interval: 30s
126126
external_labels:
127127
prometheus: /
128128
prometheus_replica: $(POD_NAME)
@@ -143,8 +143,8 @@ alerting:
143143
"key2": "value2",
144144
},
145145
Expected: `global:
146-
evaluation_interval: 1m
147-
scrape_interval: 1m
146+
evaluation_interval: 30s
147+
scrape_interval: 30s
148148
external_labels:
149149
key1: value1
150150
key2: value2
@@ -163,8 +163,8 @@ alerting:
163163
Version: "v2.16.0",
164164
QueryLogFile: "test.log",
165165
Expected: `global:
166-
evaluation_interval: 1m
167-
scrape_interval: 1m
166+
evaluation_interval: 30s
167+
scrape_interval: 30s
168168
external_labels:
169169
prometheus: /
170170
prometheus_replica: $(POD_NAME)
@@ -430,8 +430,8 @@ func TestProbeStaticTargetsConfigGeneration(t *testing.T) {
430430
}
431431

432432
expected := `global:
433-
evaluation_interval: 1m
434-
scrape_interval: 1m
433+
evaluation_interval: 30s
434+
scrape_interval: 30s
435435
external_labels:
436436
prometheus: default/test
437437
prometheus_replica: $(POD_NAME)
@@ -534,8 +534,8 @@ func TestProbeStaticTargetsConfigGenerationWithLabelEnforce(t *testing.T) {
534534
}
535535

536536
expected := `global:
537-
evaluation_interval: 1m
538-
scrape_interval: 1m
537+
evaluation_interval: 30s
538+
scrape_interval: 30s
539539
external_labels:
540540
prometheus: default/test
541541
prometheus_replica: $(POD_NAME)
@@ -640,8 +640,8 @@ func TestProbeStaticTargetsConfigGenerationWithJobName(t *testing.T) {
640640
}
641641

642642
expected := `global:
643-
evaluation_interval: 1m
644-
scrape_interval: 1m
643+
evaluation_interval: 30s
644+
scrape_interval: 30s
645645
external_labels:
646646
prometheus: default/test
647647
prometheus_replica: $(POD_NAME)
@@ -751,8 +751,8 @@ func TestProbeIngressSDConfigGeneration(t *testing.T) {
751751
}
752752

753753
expected := `global:
754-
evaluation_interval: 1m
755-
scrape_interval: 1m
754+
evaluation_interval: 30s
755+
scrape_interval: 30s
756756
external_labels:
757757
prometheus: default/test
758758
prometheus_replica: $(POD_NAME)
@@ -881,8 +881,8 @@ func TestProbeIngressSDConfigGenerationWithLabelEnforce(t *testing.T) {
881881
}
882882

883883
expected := `global:
884-
evaluation_interval: 1m
885-
scrape_interval: 1m
884+
evaluation_interval: 30s
885+
scrape_interval: 30s
886886
external_labels:
887887
prometheus: default/test
888888
prometheus_replica: $(POD_NAME)
@@ -1063,8 +1063,8 @@ func TestAlertmanagerBearerToken(t *testing.T) {
10631063
// change this to check that just the `bearer_token_file` is set with
10641064
// something like json-path.
10651065
expected := `global:
1066-
evaluation_interval: 1m
1067-
scrape_interval: 1m
1066+
evaluation_interval: 30s
1067+
scrape_interval: 30s
10681068
external_labels:
10691069
prometheus: default/test
10701070
prometheus_replica: $(POD_NAME)
@@ -1142,8 +1142,8 @@ func TestAlertmanagerAPIVersion(t *testing.T) {
11421142
// change this to check that just the `api_version` is set with
11431143
// something like json-path.
11441144
expected := `global:
1145-
evaluation_interval: 1m
1146-
scrape_interval: 1m
1145+
evaluation_interval: 30s
1146+
scrape_interval: 30s
11471147
external_labels:
11481148
prometheus: default/test
11491149
prometheus_replica: $(POD_NAME)
@@ -1220,8 +1220,8 @@ func TestAdditionalAlertRelabelConfigs(t *testing.T) {
12201220
}
12211221

12221222
expected := `global:
1223-
evaluation_interval: 1m
1224-
scrape_interval: 1m
1223+
evaluation_interval: 30s
1224+
scrape_interval: 30s
12251225
external_labels:
12261226
prometheus: default/test
12271227
prometheus_replica: $(POD_NAME)
@@ -1329,8 +1329,8 @@ func TestNoEnforcedNamespaceLabelServiceMonitor(t *testing.T) {
13291329
}
13301330

13311331
expected := `global:
1332-
evaluation_interval: 1m
1333-
scrape_interval: 1m
1332+
evaluation_interval: 30s
1333+
scrape_interval: 30s
13341334
external_labels:
13351335
prometheus: ns-value/test
13361336
prometheus_replica: $(POD_NAME)
@@ -1474,8 +1474,8 @@ func TestEnforcedNamespaceLabelPodMonitor(t *testing.T) {
14741474
}
14751475

14761476
expected := `global:
1477-
evaluation_interval: 1m
1478-
scrape_interval: 1m
1477+
evaluation_interval: 30s
1478+
scrape_interval: 30s
14791479
external_labels:
14801480
prometheus: ns-value/test
14811481
prometheus_replica: $(POD_NAME)
@@ -1607,8 +1607,8 @@ func TestEnforcedNamespaceLabelServiceMonitor(t *testing.T) {
16071607
}
16081608

16091609
expected := `global:
1610-
evaluation_interval: 1m
1611-
scrape_interval: 1m
1610+
evaluation_interval: 30s
1611+
scrape_interval: 30s
16121612
external_labels:
16131613
prometheus: ns-value/test
16141614
prometheus_replica: $(POD_NAME)
@@ -1723,8 +1723,8 @@ func TestAdditionalAlertmanagers(t *testing.T) {
17231723
}
17241724

17251725
expected := `global:
1726-
evaluation_interval: 1m
1727-
scrape_interval: 1m
1726+
evaluation_interval: 30s
1727+
scrape_interval: 30s
17281728
external_labels:
17291729
prometheus: default/test
17301730
prometheus_replica: $(POD_NAME)
@@ -1816,8 +1816,8 @@ func TestSettingHonorTimestampsInServiceMonitor(t *testing.T) {
18161816
}
18171817

18181818
expected := `global:
1819-
evaluation_interval: 1m
1820-
scrape_interval: 1m
1819+
evaluation_interval: 30s
1820+
scrape_interval: 30s
18211821
external_labels:
18221822
prometheus: default/test
18231823
prometheus_replica: $(POD_NAME)
@@ -1946,8 +1946,8 @@ func TestSettingHonorTimestampsInPodMonitor(t *testing.T) {
19461946
}
19471947

19481948
expected := `global:
1949-
evaluation_interval: 1m
1950-
scrape_interval: 1m
1949+
evaluation_interval: 30s
1950+
scrape_interval: 30s
19511951
external_labels:
19521952
prometheus: default/test
19531953
prometheus_replica: $(POD_NAME)
@@ -2058,8 +2058,8 @@ func TestHonorTimestampsOverriding(t *testing.T) {
20582058
}
20592059

20602060
expected := `global:
2061-
evaluation_interval: 1m
2062-
scrape_interval: 1m
2061+
evaluation_interval: 30s
2062+
scrape_interval: 30s
20632063
external_labels:
20642064
prometheus: default/test
20652065
prometheus_replica: $(POD_NAME)
@@ -2187,8 +2187,8 @@ func TestSettingHonorLabels(t *testing.T) {
21872187
}
21882188

21892189
expected := `global:
2190-
evaluation_interval: 1m
2191-
scrape_interval: 1m
2190+
evaluation_interval: 30s
2191+
scrape_interval: 30s
21922192
external_labels:
21932193
prometheus: default/test
21942194
prometheus_replica: $(POD_NAME)
@@ -2315,8 +2315,8 @@ func TestHonorLabelsOverriding(t *testing.T) {
23152315
}
23162316

23172317
expected := `global:
2318-
evaluation_interval: 1m
2319-
scrape_interval: 1m
2318+
evaluation_interval: 30s
2319+
scrape_interval: 30s
23202320
external_labels:
23212321
prometheus: default/test
23222322
prometheus_replica: $(POD_NAME)
@@ -2442,8 +2442,8 @@ func TestTargetLabels(t *testing.T) {
24422442
}
24432443

24442444
expected := `global:
2445-
evaluation_interval: 1m
2446-
scrape_interval: 1m
2445+
evaluation_interval: 30s
2446+
scrape_interval: 30s
24472447
external_labels:
24482448
prometheus: default/test
24492449
prometheus_replica: $(POD_NAME)
@@ -2569,8 +2569,8 @@ func TestPodTargetLabels(t *testing.T) {
25692569
}
25702570

25712571
expected := `global:
2572-
evaluation_interval: 1m
2573-
scrape_interval: 1m
2572+
evaluation_interval: 30s
2573+
scrape_interval: 30s
25742574
external_labels:
25752575
prometheus: default/test
25762576
prometheus_replica: $(POD_NAME)
@@ -2696,8 +2696,8 @@ func TestPodTargetLabelsFromPodMonitor(t *testing.T) {
26962696
}
26972697

26982698
expected := `global:
2699-
evaluation_interval: 1m
2700-
scrape_interval: 1m
2699+
evaluation_interval: 30s
2700+
scrape_interval: 30s
27012701
external_labels:
27022702
prometheus: default/test
27032703
prometheus_replica: $(POD_NAME)
@@ -2799,8 +2799,8 @@ func TestEmptyEndointPorts(t *testing.T) {
27992799
// change this to check that just the `bearer_token_file` is set with
28002800
// something like json-path.
28012801
expected := `global:
2802-
evaluation_interval: 1m
2803-
scrape_interval: 1m
2802+
evaluation_interval: 30s
2803+
scrape_interval: 30s
28042804
external_labels:
28052805
prometheus: default/test
28062806
prometheus_replica: $(POD_NAME)

0 commit comments

Comments
 (0)