From 2e0ecc62280f93aff746b06d6a6a1940f5ddf985 Mon Sep 17 00:00:00 2001 From: Roberto Jimenez Sanchez Date: Wed, 3 Dec 2025 12:07:30 +0100 Subject: [PATCH] chore: restore all go module files to match origin/main exactly --- apps/alerting/alertenrichment/go.mod | 2 +- apps/alerting/historian/go.mod | 2 +- apps/alerting/notifications/go.mod | 2 +- apps/alerting/rules/go.mod | 2 +- apps/annotation/go.mod | 2 +- apps/collections/go.mod | 2 +- apps/correlations/go.mod | 2 +- apps/dashboard/go.mod | 2 +- apps/example/go.mod | 2 +- apps/folder/go.mod | 2 +- apps/investigations/go.mod | 2 +- apps/logsdrilldown/go.mod | 4 +--- apps/playlist/go.mod | 2 +- apps/plugins/go.mod | 2 +- apps/preferences/go.mod | 2 +- apps/provisioning/go.mod | 6 +++--- apps/provisioning/go.sum | 8 ++++---- apps/scope/go.mod | 2 +- apps/secret/go.mod | 2 +- apps/shorturl/go.mod | 2 +- devenv/docker/blocks/prometheus_high_card/go.mod | 2 +- devenv/docker/blocks/prometheus_utf8/go.mod | 2 +- hack/go.mod | 2 +- pkg/aggregator/go.mod | 2 +- pkg/apimachinery/go.mod | 2 +- pkg/apiserver/go.mod | 2 +- pkg/build/go.mod | 2 +- pkg/build/wire/go.mod | 2 +- pkg/codegen/go.mod | 2 +- pkg/plugins/codegen/go.mod | 2 +- pkg/promlib/go.mod | 2 +- pkg/semconv/go.mod | 2 +- scripts/go-workspace/go.mod | 2 +- scripts/modowners/go.mod | 2 +- 34 files changed, 39 insertions(+), 41 deletions(-) diff --git a/apps/alerting/alertenrichment/go.mod b/apps/alerting/alertenrichment/go.mod index 2ef56374b85..95466bad6bb 100644 --- a/apps/alerting/alertenrichment/go.mod +++ b/apps/alerting/alertenrichment/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/alerting/alertenrichment -go 1.25.3 +go 1.25.5 require ( github.com/grafana/grafana-app-sdk v0.48.4 diff --git a/apps/alerting/historian/go.mod b/apps/alerting/historian/go.mod index e4011423c47..11e0d0f2406 100644 --- a/apps/alerting/historian/go.mod +++ b/apps/alerting/historian/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/alerting/historian -go 1.25.3 +go 1.25.5 require ( github.com/grafana/grafana-app-sdk v0.48.4 diff --git a/apps/alerting/notifications/go.mod b/apps/alerting/notifications/go.mod index 2a96499613d..80dd39f9ca7 100644 --- a/apps/alerting/notifications/go.mod +++ b/apps/alerting/notifications/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/alerting/notifications -go 1.25.3 +go 1.25.5 require ( github.com/grafana/grafana-app-sdk v0.48.4 diff --git a/apps/alerting/rules/go.mod b/apps/alerting/rules/go.mod index 473349f7a27..7286ccf5376 100644 --- a/apps/alerting/rules/go.mod +++ b/apps/alerting/rules/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/alerting/rules -go 1.25.3 +go 1.25.5 require ( github.com/grafana/grafana-app-sdk v0.48.4 diff --git a/apps/annotation/go.mod b/apps/annotation/go.mod index 68538932545..a042d852413 100644 --- a/apps/annotation/go.mod +++ b/apps/annotation/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/annotation -go 1.24.0 +go 1.25.5 require ( github.com/grafana/grafana-app-sdk v0.48.4 diff --git a/apps/collections/go.mod b/apps/collections/go.mod index 4591860fef6..81872ad4505 100644 --- a/apps/collections/go.mod +++ b/apps/collections/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/collections -go 1.25.3 +go 1.25.5 require ( github.com/grafana/grafana-app-sdk v0.48.4 diff --git a/apps/correlations/go.mod b/apps/correlations/go.mod index 8504196d02c..e1c9242aa14 100644 --- a/apps/correlations/go.mod +++ b/apps/correlations/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/correlations -go 1.25.3 +go 1.25.5 require ( github.com/grafana/grafana-app-sdk v0.48.4 diff --git a/apps/dashboard/go.mod b/apps/dashboard/go.mod index 4e8a3b861d3..4baf37a3657 100644 --- a/apps/dashboard/go.mod +++ b/apps/dashboard/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/dashboard -go 1.25.3 +go 1.25.5 require ( cuelang.org/go v0.11.1 diff --git a/apps/example/go.mod b/apps/example/go.mod index 91af70d3268..deb8763474c 100644 --- a/apps/example/go.mod +++ b/apps/example/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/example -go 1.25.3 +go 1.25.5 require ( github.com/grafana/grafana-app-sdk v0.48.4 diff --git a/apps/folder/go.mod b/apps/folder/go.mod index 4059aa3b6a8..0e04414b8b8 100644 --- a/apps/folder/go.mod +++ b/apps/folder/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/folder -go 1.25.3 +go 1.25.5 require ( github.com/grafana/grafana-app-sdk v0.48.4 diff --git a/apps/investigations/go.mod b/apps/investigations/go.mod index 5516fd73923..0faf2c40efb 100644 --- a/apps/investigations/go.mod +++ b/apps/investigations/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/investigations -go 1.25.3 +go 1.25.5 require ( github.com/grafana/grafana-app-sdk v0.48.4 diff --git a/apps/logsdrilldown/go.mod b/apps/logsdrilldown/go.mod index 93000dbb281..b70fb8a42f5 100644 --- a/apps/logsdrilldown/go.mod +++ b/apps/logsdrilldown/go.mod @@ -1,8 +1,6 @@ module github.com/grafana/grafana/apps/logsdrilldown -go 1.24.0 - -toolchain go1.24.6 +go 1.25.5 require ( github.com/grafana/grafana-app-sdk v0.48.4 diff --git a/apps/playlist/go.mod b/apps/playlist/go.mod index cf67f19efc8..4bdbe8c003c 100644 --- a/apps/playlist/go.mod +++ b/apps/playlist/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/playlist -go 1.25.3 +go 1.25.5 require ( github.com/grafana/grafana-app-sdk v0.48.4 diff --git a/apps/plugins/go.mod b/apps/plugins/go.mod index 2ef7a555599..c55674cc950 100644 --- a/apps/plugins/go.mod +++ b/apps/plugins/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/plugins -go 1.25.3 +go 1.25.5 replace github.com/grafana/grafana => ../.. diff --git a/apps/preferences/go.mod b/apps/preferences/go.mod index 457b257d8fb..9a5c8088c0f 100644 --- a/apps/preferences/go.mod +++ b/apps/preferences/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/preferences -go 1.25.3 +go 1.25.5 require ( github.com/grafana/grafana-app-sdk v0.48.4 diff --git a/apps/provisioning/go.mod b/apps/provisioning/go.mod index 65293ff0f33..e84ab0d35da 100644 --- a/apps/provisioning/go.mod +++ b/apps/provisioning/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/provisioning -go 1.25.3 +go 1.25.5 require ( github.com/fsnotify/fsnotify v1.9.0 @@ -34,7 +34,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/jsonpointer v0.22.1 // indirect github.com/go-openapi/jsonreference v0.21.2 // indirect - github.com/go-openapi/swag v0.23.0 // indirect + github.com/go-openapi/swag v0.23.1 // indirect github.com/go-openapi/swag/jsonname v0.25.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/gnostic-models v0.7.0 // indirect @@ -75,7 +75,7 @@ require ( golang.org/x/term v0.37.0 // indirect golang.org/x/text v0.31.0 // indirect golang.org/x/time v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba // indirect google.golang.org/grpc v1.77.0 // indirect google.golang.org/protobuf v1.36.10 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect diff --git a/apps/provisioning/go.sum b/apps/provisioning/go.sum index 76238334303..791bf68e797 100644 --- a/apps/provisioning/go.sum +++ b/apps/provisioning/go.sum @@ -27,8 +27,8 @@ github.com/go-openapi/jsonpointer v0.22.1 h1:sHYI1He3b9NqJ4wXLoJDKmUmHkWy/L7rtEo github.com/go-openapi/jsonpointer v0.22.1/go.mod h1:pQT9OsLkfz1yWoMgYFy4x3U5GY5nUlsOn1qSBH5MkCM= github.com/go-openapi/jsonreference v0.21.2 h1:Wxjda4M/BBQllegefXrY/9aq1fxBA8sI5M/lFU6tSWU= github.com/go-openapi/jsonreference v0.21.2/go.mod h1:pp3PEjIsJ9CZDGCNOyXIQxsNuroxm8FAJ/+quA0yKzQ= -github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= -github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= +github.com/go-openapi/swag v0.23.1 h1:lpsStH0n2ittzTnbaSloVZLuB5+fvSY/+hnagBjSNZU= +github.com/go-openapi/swag v0.23.1/go.mod h1:STZs8TbRvEQQKUA+JZNAm3EWlgaOBGpyFDqQnDHMef0= github.com/go-openapi/swag/jsonname v0.25.1 h1:Sgx+qbwa4ej6AomWC6pEfXrA6uP2RkaNjA9BR8a1RJU= github.com/go-openapi/swag/jsonname v0.25.1/go.mod h1:71Tekow6UOLBD3wS7XhdT98g5J5GR13NOTQ9/6Q11Zo= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= @@ -224,8 +224,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= -google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 h1:M1rk8KBnUsBDg1oPGHNCxG4vc1f49epmTO7xscSajMk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba h1:UKgtfRM7Yh93Sya0Fo8ZzhDP4qBckrrxEr2oF5UIVb8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM= google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig= google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= diff --git a/apps/scope/go.mod b/apps/scope/go.mod index 0b8837a50d5..c54a582379f 100644 --- a/apps/scope/go.mod +++ b/apps/scope/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/scope -go 1.25.3 +go 1.25.5 require ( github.com/grafana/grafana/pkg/apimachinery v0.0.0-20251007081214-26e147d01f0a diff --git a/apps/secret/go.mod b/apps/secret/go.mod index 886852ba13c..da71ef8e666 100644 --- a/apps/secret/go.mod +++ b/apps/secret/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/secret -go 1.25.3 +go 1.25.5 require ( github.com/grafana/grafana-app-sdk v0.48.4 diff --git a/apps/shorturl/go.mod b/apps/shorturl/go.mod index 60769ba48b0..128609888ba 100644 --- a/apps/shorturl/go.mod +++ b/apps/shorturl/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/shorturl -go 1.25.3 +go 1.25.5 require ( github.com/grafana/grafana-app-sdk v0.48.4 diff --git a/devenv/docker/blocks/prometheus_high_card/go.mod b/devenv/docker/blocks/prometheus_high_card/go.mod index a2608e2cc43..1ab844f359e 100644 --- a/devenv/docker/blocks/prometheus_high_card/go.mod +++ b/devenv/docker/blocks/prometheus_high_card/go.mod @@ -1,6 +1,6 @@ module high-card -go 1.25.3 +go 1.25.5 require github.com/prometheus/client_golang v1.22.0 diff --git a/devenv/docker/blocks/prometheus_utf8/go.mod b/devenv/docker/blocks/prometheus_utf8/go.mod index b26177d8e9a..dd76a44092d 100644 --- a/devenv/docker/blocks/prometheus_utf8/go.mod +++ b/devenv/docker/blocks/prometheus_utf8/go.mod @@ -1,6 +1,6 @@ module utf8-support -go 1.25.3 +go 1.25.5 require ( github.com/prometheus/client_golang v1.22.0 diff --git a/hack/go.mod b/hack/go.mod index b35dd7f5a76..e9ecfdc60b4 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/hack -go 1.25.3 +go 1.25.5 require k8s.io/code-generator v0.34.2 diff --git a/pkg/aggregator/go.mod b/pkg/aggregator/go.mod index 6199a6b8eb3..96b596f71fb 100644 --- a/pkg/aggregator/go.mod +++ b/pkg/aggregator/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/aggregator -go 1.25.3 +go 1.25.5 require ( github.com/emicklei/go-restful/v3 v3.13.0 diff --git a/pkg/apimachinery/go.mod b/pkg/apimachinery/go.mod index 3c9fc581424..8261fc94967 100644 --- a/pkg/apimachinery/go.mod +++ b/pkg/apimachinery/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apimachinery -go 1.25.3 +go 1.25.5 require ( github.com/go-jose/go-jose/v4 v4.1.3 diff --git a/pkg/apiserver/go.mod b/pkg/apiserver/go.mod index 70c850afac8..feb659b9a0a 100644 --- a/pkg/apiserver/go.mod +++ b/pkg/apiserver/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apiserver -go 1.25.3 +go 1.25.5 require ( github.com/google/go-cmp v0.7.0 diff --git a/pkg/build/go.mod b/pkg/build/go.mod index 92e1937d716..2bc514fcfd5 100644 --- a/pkg/build/go.mod +++ b/pkg/build/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build -go 1.25.3 +go 1.25.5 // Override docker/docker to avoid: // go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires diff --git a/pkg/build/wire/go.mod b/pkg/build/wire/go.mod index 9850548f268..b3ac434ea53 100644 --- a/pkg/build/wire/go.mod +++ b/pkg/build/wire/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build/wire -go 1.25.3 +go 1.25.5 require ( github.com/google/go-cmp v0.7.0 diff --git a/pkg/codegen/go.mod b/pkg/codegen/go.mod index 36c68bcd56c..7d01f823e78 100644 --- a/pkg/codegen/go.mod +++ b/pkg/codegen/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/codegen -go 1.25.3 +go 1.25.5 require ( cuelang.org/go v0.11.1 diff --git a/pkg/plugins/codegen/go.mod b/pkg/plugins/codegen/go.mod index 1029631ef2f..b4e296c934a 100644 --- a/pkg/plugins/codegen/go.mod +++ b/pkg/plugins/codegen/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/plugins/codegen -go 1.25.3 +go 1.25.5 replace github.com/grafana/grafana/pkg/codegen => ../../codegen diff --git a/pkg/promlib/go.mod b/pkg/promlib/go.mod index 24c03355bcc..efbcd9222a6 100644 --- a/pkg/promlib/go.mod +++ b/pkg/promlib/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/promlib -go 1.25.3 +go 1.25.5 require ( github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4 diff --git a/pkg/semconv/go.mod b/pkg/semconv/go.mod index cb7a36e8e31..9998d716e35 100644 --- a/pkg/semconv/go.mod +++ b/pkg/semconv/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/semconv -go 1.25.3 +go 1.25.5 require go.opentelemetry.io/otel v1.38.0 diff --git a/scripts/go-workspace/go.mod b/scripts/go-workspace/go.mod index d511012e77b..14648f761fc 100644 --- a/scripts/go-workspace/go.mod +++ b/scripts/go-workspace/go.mod @@ -1,5 +1,5 @@ module github.com/grafana/grafana/scripts/go-workspace -go 1.25.3 +go 1.25.5 require golang.org/x/mod v0.24.0 diff --git a/scripts/modowners/go.mod b/scripts/modowners/go.mod index b1ff627f219..f98168c9d56 100644 --- a/scripts/modowners/go.mod +++ b/scripts/modowners/go.mod @@ -1,5 +1,5 @@ module github.com/grafana/grafana/scripts/modowners -go 1.25.3 +go 1.25.5 require golang.org/x/mod v0.24.0