From 04336d53a915165e739d8cd9df586c81a5dc23ea Mon Sep 17 00:00:00 2001 From: Steve Simpson Date: Fri, 31 Mar 2023 16:34:35 +0200 Subject: [PATCH] Alerting: Update prometheus version (#65688) --- go.mod | 2 +- go.sum | 4 ++-- pkg/services/ngalert/api/promql_compat.go | 2 +- pkg/services/ngalert/api/promql_compat_test.go | 2 +- pkg/services/ngalert/sender/sender.go | 2 +- pkg/services/ngalert/sender/sender_test.go | 2 +- pkg/services/ngalert/state/template/template.go | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index f4fb127aee5..0b48753a3d3 100644 --- a/go.mod +++ b/go.mod @@ -94,7 +94,7 @@ require ( github.com/prometheus/client_golang v1.14.0 github.com/prometheus/client_model v0.3.0 github.com/prometheus/common v0.40.0 - github.com/prometheus/prometheus v1.8.2-0.20211011171444-354d8d2ecfac + github.com/prometheus/prometheus v1.8.2-0.20211217191541-41f1a8125e66 github.com/robfig/cron/v3 v3.0.1 github.com/russellhaering/goxmldsig v1.2.0 github.com/stretchr/testify v1.8.2 diff --git a/go.sum b/go.sum index 6e8ed1f330b..526cea17e50 100644 --- a/go.sum +++ b/go.sum @@ -2027,8 +2027,8 @@ github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB github.com/prometheus/prometheus v0.0.0-20190818123050-43acd0e2e93f/go.mod h1:rMTlmxGCvukf2KMu3fClMDKLLoJ5hl61MhcJ7xKakf0= github.com/prometheus/prometheus v0.0.0-20200609090129-a6600f564e3c/go.mod h1:S5n0C6tSgdnwWshBUceRx5G1OsjLv/EeZ9t3wIfEtsY= github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02/go.mod h1:fC6ROpjS/2o+MQTO7X8NSZLhLBSNlDzxaeDMqQm+TUM= -github.com/prometheus/prometheus v1.8.2-0.20211011171444-354d8d2ecfac h1:emphJoDK6yZ1GxyFbyYa7ByoWkl3dXfOmPvHAy0L0XI= -github.com/prometheus/prometheus v1.8.2-0.20211011171444-354d8d2ecfac/go.mod h1:wP6L5BiOZ1JZYadRh17u5RujSS19zNSGZfGUi/MZUpM= +github.com/prometheus/prometheus v1.8.2-0.20211217191541-41f1a8125e66 h1:Y4Cq+kBfu+yc4dbCUn4syvC2/F6rYhg1UoeyudhPq2o= +github.com/prometheus/prometheus v1.8.2-0.20211217191541-41f1a8125e66/go.mod h1:bBByfKZ/sC+obk4CX3GpJ2Ul+fKZGtXneLYFG8C//nc= github.com/prometheus/statsd_exporter v0.20.0/go.mod h1:YL3FWCG8JBBtaUSxAg4Gz2ZYu22bS84XM89ZQXXTWmQ= github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= diff --git a/pkg/services/ngalert/api/promql_compat.go b/pkg/services/ngalert/api/promql_compat.go index ecfd0d1be0c..4c5730dedb3 100644 --- a/pkg/services/ngalert/api/promql_compat.go +++ b/pkg/services/ngalert/api/promql_compat.go @@ -9,7 +9,7 @@ import ( "time" "github.com/grafana/grafana-plugin-sdk-go/data" - "github.com/prometheus/prometheus/pkg/labels" + "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql/parser" diff --git a/pkg/services/ngalert/api/promql_compat_test.go b/pkg/services/ngalert/api/promql_compat_test.go index 351d104b9e9..2315395fdca 100644 --- a/pkg/services/ngalert/api/promql_compat_test.go +++ b/pkg/services/ngalert/api/promql_compat_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/prometheus/prometheus/pkg/labels" + "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/promql/parser" "github.com/stretchr/testify/require" ) diff --git a/pkg/services/ngalert/sender/sender.go b/pkg/services/ngalert/sender/sender.go index 2d3b25b5a5b..43bc1a1b6f6 100644 --- a/pkg/services/ngalert/sender/sender.go +++ b/pkg/services/ngalert/sender/sender.go @@ -18,8 +18,8 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/discovery" + "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/notifier" - "github.com/prometheus/prometheus/pkg/labels" "github.com/grafana/grafana/pkg/infra/log" apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" diff --git a/pkg/services/ngalert/sender/sender_test.go b/pkg/services/ngalert/sender/sender_test.go index 6fa4add1bcd..1086f56991f 100644 --- a/pkg/services/ngalert/sender/sender_test.go +++ b/pkg/services/ngalert/sender/sender_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/prometheus/alertmanager/api/v2/models" - "github.com/prometheus/prometheus/pkg/labels" + "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" ) diff --git a/pkg/services/ngalert/state/template/template.go b/pkg/services/ngalert/state/template/template.go index 86e2dad21d8..c9537e57b19 100644 --- a/pkg/services/ngalert/state/template/template.go +++ b/pkg/services/ngalert/state/template/template.go @@ -11,7 +11,7 @@ import ( "time" "github.com/prometheus/common/model" - "github.com/prometheus/prometheus/pkg/timestamp" + "github.com/prometheus/prometheus/model/timestamp" "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/template"