Skip to content

Commit ae3ae82

Browse files
committed
Add per rule_group to iterations in test
The upstream metric got a new label after this change was done. When it was originally added 9mo ago: 27e2d46 When upstream changed 8mo ago: prometheus/prometheus#7823 Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
1 parent 7ea009a commit ae3ae82

File tree

1 file changed

+32
-18
lines changed

1 file changed

+32
-18
lines changed

pkg/ruler/manager_metrics_test.go

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,20 @@ cortex_prometheus_rule_group_duration_seconds_sum{user="user3"} 100
9292
cortex_prometheus_rule_group_duration_seconds_count{user="user3"} 1
9393
# HELP cortex_prometheus_rule_group_iterations_missed_total The total number of rule group evaluations missed due to slow rule group evaluation.
9494
# TYPE cortex_prometheus_rule_group_iterations_missed_total counter
95-
cortex_prometheus_rule_group_iterations_missed_total{user="user1"} 1
96-
cortex_prometheus_rule_group_iterations_missed_total{user="user2"} 10
97-
cortex_prometheus_rule_group_iterations_missed_total{user="user3"} 100
95+
cortex_prometheus_rule_group_iterations_missed_total{rule_group="group_one",user="user1"} 1
96+
cortex_prometheus_rule_group_iterations_missed_total{rule_group="group_one",user="user2"} 10
97+
cortex_prometheus_rule_group_iterations_missed_total{rule_group="group_one",user="user3"} 100
98+
cortex_prometheus_rule_group_iterations_missed_total{rule_group="group_two",user="user1"} 1
99+
cortex_prometheus_rule_group_iterations_missed_total{rule_group="group_two",user="user2"} 10
100+
cortex_prometheus_rule_group_iterations_missed_total{rule_group="group_two",user="user3"} 100
98101
# HELP cortex_prometheus_rule_group_iterations_total The total number of scheduled rule group evaluations, whether executed or missed.
99102
# TYPE cortex_prometheus_rule_group_iterations_total counter
100-
cortex_prometheus_rule_group_iterations_total{user="user1"} 1
101-
cortex_prometheus_rule_group_iterations_total{user="user2"} 10
102-
cortex_prometheus_rule_group_iterations_total{user="user3"} 100
103+
cortex_prometheus_rule_group_iterations_total{rule_group="group_one",user="user1"} 1
104+
cortex_prometheus_rule_group_iterations_total{rule_group="group_one",user="user2"} 10
105+
cortex_prometheus_rule_group_iterations_total{rule_group="group_one",user="user3"} 100
106+
cortex_prometheus_rule_group_iterations_total{rule_group="group_two",user="user1"} 1
107+
cortex_prometheus_rule_group_iterations_total{rule_group="group_two",user="user2"} 10
108+
cortex_prometheus_rule_group_iterations_total{rule_group="group_two",user="user3"} 100
103109
# HELP cortex_prometheus_rule_group_last_duration_seconds The duration of the last rule group evaluation.
104110
# TYPE cortex_prometheus_rule_group_last_duration_seconds gauge
105111
cortex_prometheus_rule_group_last_duration_seconds{rule_group="group_one",user="user1"} 1000
@@ -135,9 +141,11 @@ func populateManager(base float64) *prometheus.Registry {
135141

136142
metrics.evalDuration.Observe(base)
137143
metrics.iterationDuration.Observe(base)
138-
metrics.iterationsMissed.Add(base)
139-
metrics.iterationsScheduled.Add(base)
140144

145+
metrics.iterationsScheduled.WithLabelValues("group_one").Add(base)
146+
metrics.iterationsScheduled.WithLabelValues("group_two").Add(base)
147+
metrics.iterationsMissed.WithLabelValues("group_one").Add(base)
148+
metrics.iterationsMissed.WithLabelValues("group_two").Add(base)
141149
metrics.evalTotal.WithLabelValues("group_one").Add(base)
142150
metrics.evalTotal.WithLabelValues("group_two").Add(base)
143151
metrics.evalFailures.WithLabelValues("group_one").Add(base)
@@ -162,8 +170,8 @@ func populateManager(base float64) *prometheus.Registry {
162170
type groupMetrics struct {
163171
evalDuration prometheus.Summary
164172
iterationDuration prometheus.Summary
165-
iterationsMissed prometheus.Counter
166-
iterationsScheduled prometheus.Counter
173+
iterationsMissed *prometheus.CounterVec
174+
iterationsScheduled *prometheus.CounterVec
167175
evalTotal *prometheus.CounterVec
168176
evalFailures *prometheus.CounterVec
169177
groupInterval *prometheus.GaugeVec
@@ -186,14 +194,20 @@ func newGroupMetrics(r prometheus.Registerer) *groupMetrics {
186194
Help: "The duration of rule group evaluations.",
187195
Objectives: map[float64]float64{0.01: 0.001, 0.05: 0.005, 0.5: 0.05, 0.90: 0.01, 0.99: 0.001},
188196
}),
189-
iterationsMissed: promauto.With(r).NewCounter(prometheus.CounterOpts{
190-
Name: "prometheus_rule_group_iterations_missed_total",
191-
Help: "The total number of rule group evaluations missed due to slow rule group evaluation.",
192-
}),
193-
iterationsScheduled: promauto.With(r).NewCounter(prometheus.CounterOpts{
194-
Name: "prometheus_rule_group_iterations_total",
195-
Help: "The total number of scheduled rule group evaluations, whether executed or missed.",
196-
}),
197+
iterationsMissed: promauto.With(r).NewCounterVec(
198+
prometheus.CounterOpts{
199+
Name: "prometheus_rule_group_iterations_missed_total",
200+
Help: "The total number of rule group evaluations missed due to slow rule group evaluation.",
201+
},
202+
[]string{"rule_group"},
203+
),
204+
iterationsScheduled: promauto.With(r).NewCounterVec(
205+
prometheus.CounterOpts{
206+
Name: "prometheus_rule_group_iterations_total",
207+
Help: "The total number of scheduled rule group evaluations, whether executed or missed.",
208+
},
209+
[]string{"rule_group"},
210+
),
197211
evalTotal: promauto.With(r).NewCounterVec(
198212
prometheus.CounterOpts{
199213
Name: "prometheus_rule_evaluations_total",

0 commit comments

Comments
 (0)