public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Alerting: Update prometheus/client_golang to v1.20 (#92070)

Browse Source 
Update prometheus/client_golang to v1.20
This commit is contained in:
Alexander Akhmetov
2024-08-20 11:26:06 +02:00
committed by GitHub
parent d9812153dd
commit d32e1e009b
11 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/ngalert/schedule/schedule_unit_test.go
+5 -5
View File
@@ -519,7 +519,7 @@ func TestSchedule_updateRulesMetrics(t *testing.T) {
expectedMetric := ""
err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric), "grafana_alerting_rule_group_rules")
require.NoError(t, err)
require.ErrorContains(t, err, fmt.Sprintf("expected metric name(s) not found: [%v]", "grafana_alerting_rule_group_rules"))
})
alertRule1 := models.RuleGen.With(models.RuleGen.WithOrgID(firstOrgID)).GenerateRef()
@@ -590,7 +590,7 @@ func TestSchedule_updateRulesMetrics(t *testing.T) {
expectedMetric := ""
err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric), "grafana_alerting_rule_group_rules")
require.NoError(t, err)
require.ErrorContains(t, err, "expected metric name(s) not found: [grafana_alerting_rule_group_rules]")
})
})
@@ -604,7 +604,7 @@ func TestSchedule_updateRulesMetrics(t *testing.T) {
expectedMetric := ""
err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric), "grafana_alerting_rule_groups")
require.NoError(t, err)
require.ErrorContains(t, err, "expected metric name(s) not found: [grafana_alerting_rule_groups]")
})
alertRule1 := models.RuleGen.With(models.RuleGen.WithOrgID(firstOrgID)).GenerateRef()
@@ -735,7 +735,7 @@ func TestSchedule_updateRulesMetrics(t *testing.T) {
expectedMetric := ""
err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric), "grafana_alerting_simple_routing_rules")
require.NoError(t, err)
require.ErrorContains(t, err, "expected metric name(s) not found: [grafana_alerting_simple_routing_rules]")
})
})
@@ -749,7 +749,7 @@ func TestSchedule_updateRulesMetrics(t *testing.T) {
expectedMetric := ""
err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric), "grafana_alerting_rule_groups")
require.NoError(t, err)
require.ErrorContains(t, err, "expected metric name(s) not found: [grafana_alerting_rule_groups]")
})
alertRule1 := models.RuleGen.With(models.RuleGen.WithOrgID(firstOrgID)).GenerateRef()
pkg/services/ngalert/state/manager_test.go
+3 -1
View File
@@ -1592,8 +1592,10 @@ func TestProcessEvalResults(t *testing.T) {
grafana_alerting_state_calculation_duration_seconds_sum 0
grafana_alerting_state_calculation_duration_seconds_count %[1]d
`, results)
err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric), "grafana_alerting_state_calculation_duration_seconds", "grafana_alerting_state_calculation_total")
err := testutil.GatherAndCompare(reg, bytes.NewBufferString(expectedMetric), "grafana_alerting_state_calculation_duration_seconds")
require.NoError(t, err)
err = testutil.GatherAndCompare(reg, bytes.NewBufferString(""), "grafana_alerting_state_calculation_total")
require.ErrorContains(t, err, "expected metric name(s) not found: [grafana_alerting_state_calculation_total]")
})
}