mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Prometheus: Update dependency to v0.52.0 (#87809)
* Prometheus: Update dependency to v0.52.0 * go work sync * fix panics in tests * go work sync * prometheus v0.52.0 * handle errors * Update pkg/services/ngalert/sender/sender_test.go Co-authored-by: Santiago <santiagohernandez.1997@gmail.com> * Update pkg/services/ngalert/sender/sender_test.go Co-authored-by: Santiago <santiagohernandez.1997@gmail.com> --------- Co-authored-by: Santiago <santiagohernandez.1997@gmail.com> Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
This commit is contained in:
Kyle Brandt
GitHub
41
go.mod
41
go.mod
@@ -13,7 +13,7 @@ replace cuelang.org/go => github.com/grafana/cue v0.0.0-20230926092038-971951014
|
||||
// Override Prometheus version because Prometheus v2.X is tagged as v0.X for Go modules purposes and Go assumes
|
||||
// that v1.Y is higher than v0.X, so when we resolve dependencies if any dependency imports v1.Y we'd
|
||||
// import that instead of v0.X even though v0.X is newer.
|
||||
replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.49.0
|
||||
replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.52.0
|
||||
|
||||
// Update when github.com/deepmap/oapi-codegen/v2 is updated to support later versions.
|
||||
replace github.com/getkin/kin-openapi => github.com/getkin/kin-openapi v0.122.0
|
||||
@@ -26,7 +26,7 @@ require (
|
||||
cuelang.org/go v0.6.0-0.dev // @grafana/grafana-as-code
|
||||
filippo.io/age v1.1.1 // @grafana/identity-access-team
|
||||
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // @grafana/partner-datasources
|
||||
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 // @grafana/grafana-backend-group
|
||||
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2 // @grafana/grafana-backend-group
|
||||
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.9.0 // @grafana/grafana-backend-group
|
||||
github.com/Azure/azure-storage-blob-go v0.15.0 // @grafana/grafana-backend-group
|
||||
github.com/Azure/go-autorest/autorest v0.11.29 // @grafana/grafana-backend-group
|
||||
@@ -41,7 +41,7 @@ require (
|
||||
github.com/andybalholm/brotli v1.0.5 // @grafana/partner-datasources
|
||||
github.com/apache/arrow/go/v15 v15.0.2 // @grafana/observability-metrics
|
||||
github.com/armon/go-radix v1.0.0 // @grafana/grafana-app-platform-squad
|
||||
github.com/aws/aws-sdk-go v1.50.29 // @grafana/aws-datasources
|
||||
github.com/aws/aws-sdk-go v1.51.25 // @grafana/aws-datasources
|
||||
github.com/beevik/etree v1.2.0 // @grafana/grafana-backend-group
|
||||
github.com/benbjohnson/clock v1.3.5 // @grafana/alerting-squad-backend
|
||||
github.com/blang/semver/v4 v4.0.0 // @grafana/grafana-release-guild
|
||||
@@ -55,7 +55,7 @@ require (
|
||||
github.com/dave/dst v0.27.2 // @grafana/grafana-as-code
|
||||
github.com/deepmap/oapi-codegen/v2 v2.1.0 // @grafana/grafana-as-code
|
||||
github.com/dlmiddlecote/sqlstats v1.0.2 // @grafana/grafana-backend-group
|
||||
github.com/docker/docker v24.0.7+incompatible // @grafana/grafana-release-guild
|
||||
github.com/docker/docker v26.0.1+incompatible // @grafana/grafana-release-guild
|
||||
github.com/drone/drone-cli v1.6.1 // @grafana/grafana-release-guild
|
||||
github.com/fatih/color v1.15.0 // @grafana/grafana-backend-group
|
||||
github.com/fullstorydev/grpchan v1.1.1 // @grafana/grafana-backend-group
|
||||
@@ -66,7 +66,7 @@ require (
|
||||
github.com/go-ldap/ldap/v3 v3.4.4 // @grafana/identity-access-team
|
||||
github.com/go-openapi/loads v0.21.5 // @grafana/alerting-squad-backend
|
||||
github.com/go-openapi/runtime v0.27.1 // @grafana/alerting-squad-backend
|
||||
github.com/go-openapi/strfmt v0.22.0 // @grafana/alerting-squad-backend
|
||||
github.com/go-openapi/strfmt v0.23.0 // @grafana/alerting-squad-backend
|
||||
github.com/go-redis/redis/v8 v8.11.5 // @grafana/grafana-backend-group
|
||||
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // @grafana/grafana-backend-group
|
||||
github.com/go-sql-driver/mysql v1.7.1 // @grafana/grafana-search-and-storage
|
||||
@@ -139,7 +139,7 @@ require (
|
||||
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // @grafana/grafana-operator-experience-squad
|
||||
github.com/olekukonko/tablewriter v0.0.5 // @grafana/grafana-backend-group
|
||||
github.com/patrickmn/go-cache v2.1.0+incompatible // @grafana/alerting-squad-backend
|
||||
github.com/prometheus/alertmanager v0.26.0 // @grafana/alerting-squad-backend
|
||||
github.com/prometheus/alertmanager v0.27.0 // @grafana/alerting-squad-backend
|
||||
github.com/prometheus/client_golang v1.19.0 // @grafana/alerting-squad-backend
|
||||
github.com/prometheus/client_model v0.6.1 // @grafana/grafana-backend-group
|
||||
github.com/prometheus/common v0.53.0 // @grafana/alerting-squad-backend
|
||||
@@ -175,14 +175,14 @@ require (
|
||||
go.uber.org/goleak v1.3.0 // @grafana/grafana-search-and-storage
|
||||
gocloud.dev v0.25.0 // @grafana/grafana-app-platform-squad
|
||||
golang.org/x/crypto v0.23.0 // @grafana/grafana-backend-group
|
||||
golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // @grafana/alerting-squad-backend
|
||||
golang.org/x/mod v0.15.0 // @grafana/grafana-backend-group
|
||||
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // @grafana/alerting-squad-backend
|
||||
golang.org/x/mod v0.17.0 // @grafana/grafana-backend-group
|
||||
golang.org/x/net v0.25.0 // @grafana/oss-big-tent @grafana/partner-datasources
|
||||
golang.org/x/oauth2 v0.20.0 // @grafana/identity-access-team
|
||||
golang.org/x/sync v0.7.0 // @grafana/alerting-squad-backend
|
||||
golang.org/x/text v0.15.0 // @grafana/grafana-backend-group
|
||||
golang.org/x/time v0.5.0 // @grafana/grafana-backend-group
|
||||
golang.org/x/tools v0.18.0 // @grafana/grafana-as-code
|
||||
golang.org/x/tools v0.20.0 // @grafana/grafana-as-code
|
||||
gonum.org/v1/gonum v0.12.0 // @grafana/observability-metrics
|
||||
google.golang.org/api v0.176.0 // @grafana/grafana-backend-group
|
||||
google.golang.org/grpc v1.64.0 // @grafana/plugins-platform-backend
|
||||
@@ -190,10 +190,10 @@ require (
|
||||
gopkg.in/ini.v1 v1.67.0 // @grafana/alerting-squad-backend
|
||||
gopkg.in/mail.v2 v2.3.1 // @grafana/grafana-backend-group
|
||||
gopkg.in/yaml.v3 v3.0.1 // @grafana/alerting-squad-backend
|
||||
k8s.io/api v0.29.2 // @grafana/grafana-app-platform-squad
|
||||
k8s.io/apimachinery v0.29.2 // @grafana/grafana-app-platform-squad
|
||||
k8s.io/api v0.29.3 // @grafana/grafana-app-platform-squad
|
||||
k8s.io/apimachinery v0.29.3 // @grafana/grafana-app-platform-squad
|
||||
k8s.io/apiserver v0.29.2 // @grafana/grafana-app-platform-squad
|
||||
k8s.io/client-go v0.29.2 // @grafana/grafana-app-platform-squad
|
||||
k8s.io/client-go v0.29.3 // @grafana/grafana-app-platform-squad
|
||||
k8s.io/code-generator v0.29.1 // @grafana/grafana-app-platform-squad
|
||||
k8s.io/component-base v0.29.2 // @grafana/grafana-app-platform-squad
|
||||
k8s.io/klog/v2 v2.120.1 // @grafana/grafana-app-platform-squad
|
||||
@@ -213,7 +213,7 @@ require (
|
||||
cloud.google.com/go/compute/metadata v0.3.0 // indirect
|
||||
cloud.google.com/go/iam v1.1.6 // indirect
|
||||
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
|
||||
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.10.0 // indirect
|
||||
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
|
||||
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
|
||||
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.0 // indirect
|
||||
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
|
||||
@@ -223,7 +223,7 @@ require (
|
||||
github.com/Azure/go-autorest/logger v0.2.1 // indirect
|
||||
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
|
||||
github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect
|
||||
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect
|
||||
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
|
||||
github.com/DATA-DOG/go-sqlmock v1.5.2 // @grafana/grafana-search-and-storage
|
||||
github.com/FZambia/eagle v0.1.0 // indirect
|
||||
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
|
||||
@@ -292,7 +292,7 @@ require (
|
||||
github.com/go-logr/stdr v1.2.2 // indirect
|
||||
github.com/go-logr/zapr v1.3.0 // indirect
|
||||
github.com/go-openapi/analysis v0.22.2 // indirect
|
||||
github.com/go-openapi/errors v0.21.0 // indirect
|
||||
github.com/go-openapi/errors v0.22.0 // indirect
|
||||
github.com/go-openapi/jsonpointer v0.20.2 // indirect
|
||||
github.com/go-openapi/jsonreference v0.20.4 // indirect
|
||||
github.com/go-openapi/spec v0.20.14 // indirect
|
||||
@@ -346,7 +346,7 @@ require (
|
||||
github.com/jpillora/backoff v1.0.0 // indirect
|
||||
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
|
||||
github.com/klauspost/asmfmt v1.3.2 // indirect
|
||||
github.com/klauspost/compress v1.17.4 // indirect
|
||||
github.com/klauspost/compress v1.17.8 // indirect
|
||||
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
|
||||
github.com/kr/text v0.2.0 // indirect
|
||||
github.com/kylelemons/godebug v1.1.0 // indirect
|
||||
@@ -356,7 +356,7 @@ require (
|
||||
github.com/mattn/go-colorable v0.1.13 // indirect
|
||||
github.com/mattn/go-ieproxy v0.0.3 // indirect
|
||||
github.com/mattn/go-runewidth v0.0.15 // indirect
|
||||
github.com/miekg/dns v1.1.57 // indirect
|
||||
github.com/miekg/dns v1.1.59 // indirect
|
||||
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
|
||||
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
|
||||
github.com/mitchellh/copystructure v1.2.0 // indirect
|
||||
@@ -423,7 +423,7 @@ require (
|
||||
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
|
||||
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
|
||||
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
|
||||
go.mongodb.org/mongo-driver v1.13.1 // indirect
|
||||
go.mongodb.org/mongo-driver v1.14.0 // indirect
|
||||
go.opencensus.io v0.24.0 // indirect
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
|
||||
go.opentelemetry.io/otel/metric v1.26.0 // indirect
|
||||
@@ -458,6 +458,11 @@ require (
|
||||
sigs.k8s.io/yaml v1.3.0 // indirect; @grafana-app-platform-squad
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 // indirect
|
||||
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
|
||||
)
|
||||
|
||||
// Use fork of crewjam/saml with fixes for some issues until changes get merged into upstream
|
||||
replace github.com/crewjam/saml => github.com/grafana/saml v0.4.15-0.20240523142256-cc370b98af7c
|
||||
|
||||
|
||||
Reference in New Issue
Block a user