diff --git a/Makefile b/Makefile index 1057564fab1..59c5ece3702 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ WIRE_TAGS = "oss" include .bingo/Variables.mk GO = go -GO_VERSION = 1.23.7 +GO_VERSION = 1.24.1 GO_LINT_FILES ?= $(shell ./scripts/go-workspace/golangci-lint-includes.sh) GO_TEST_FILES ?= $(shell ./scripts/go-workspace/test-includes.sh) SH_FILES ?= $(shell find ./scripts -name *.sh) diff --git a/apps/advisor/go.mod b/apps/advisor/go.mod index 917e2f985b4..1318db87b74 100644 --- a/apps/advisor/go.mod +++ b/apps/advisor/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/advisor -go 1.23.7 +go 1.24.1 require ( github.com/grafana/grafana-app-sdk v0.31.0 diff --git a/apps/dashboard/go.mod b/apps/dashboard/go.mod index 1e5d5ccaf30..19fbb90fd2c 100644 --- a/apps/dashboard/go.mod +++ b/apps/dashboard/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/dashboard -go 1.23.7 +go 1.24.1 require ( github.com/grafana/grafana-app-sdk v0.31.0 diff --git a/apps/investigations/go.mod b/apps/investigations/go.mod index 54b28bd61c4..6da15491591 100644 --- a/apps/investigations/go.mod +++ b/apps/investigations/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/investigations -go 1.23.7 +go 1.24.1 require ( github.com/grafana/grafana-app-sdk v0.31.0 diff --git a/apps/playlist/go.mod b/apps/playlist/go.mod index 501d08545b1..fc7b0db0f2d 100644 --- a/apps/playlist/go.mod +++ b/apps/playlist/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/playlist -go 1.23.7 +go 1.24.1 require ( github.com/grafana/grafana-app-sdk v0.31.0 diff --git a/devenv/docker/blocks/prometheus_high_card/go.mod b/devenv/docker/blocks/prometheus_high_card/go.mod index 8dda4f5d7e2..0f2540a8a14 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.23.7 +go 1.24.1 require ( github.com/prometheus/client_golang v1.20.2 diff --git a/devenv/docker/blocks/prometheus_utf8/go.mod b/devenv/docker/blocks/prometheus_utf8/go.mod index 1202be94ed6..e79f7b99beb 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.23.7 +go 1.24.1 require ( github.com/prometheus/client_golang v1.20.5 diff --git a/devenv/docker/blocks/stateful_webhook/Dockerfile b/devenv/docker/blocks/stateful_webhook/Dockerfile index 4b671c20410..dbe4f8969ff 100644 --- a/devenv/docker/blocks/stateful_webhook/Dockerfile +++ b/devenv/docker/blocks/stateful_webhook/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.7 +FROM golang:1.24.1 ADD main.go /go/src/webhook/main.go diff --git a/hack/go.mod b/hack/go.mod index 6f1d9965457..cc5181f8dfe 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/hack -go 1.23.7 +go 1.24.1 require k8s.io/code-generator v0.32.0 diff --git a/pkg/aggregator/go.mod b/pkg/aggregator/go.mod index f893303d595..21b9ec8250d 100644 --- a/pkg/aggregator/go.mod +++ b/pkg/aggregator/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/aggregator -go 1.23.7 +go 1.24.1 require ( github.com/emicklei/go-restful/v3 v3.11.0 diff --git a/pkg/apimachinery/go.mod b/pkg/apimachinery/go.mod index 72e9166d58e..a396b81d13c 100644 --- a/pkg/apimachinery/go.mod +++ b/pkg/apimachinery/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apimachinery -go 1.23.7 +go 1.24.1 require ( github.com/grafana/authlib v0.0.0-20250305132846-37f49eb947fa // @grafana/identity-access-team diff --git a/pkg/apis/secret/go.mod b/pkg/apis/secret/go.mod index 86b6e29cf97..ed7b33b7e6e 100644 --- a/pkg/apis/secret/go.mod +++ b/pkg/apis/secret/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apis/secret -go 1.23.7 +go 1.24.1 require ( github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250314071911-14e2784e6979 diff --git a/pkg/build/go.mod b/pkg/build/go.mod index 380ae46e2c0..91c7bf947bb 100644 --- a/pkg/build/go.mod +++ b/pkg/build/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build -go 1.23.7 +go 1.24.1 // 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 4083a088d6c..d668e5ea1bf 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.23.7 +go 1.24.1 require ( github.com/google/go-cmp v0.7.0 diff --git a/pkg/codegen/go.mod b/pkg/codegen/go.mod index 76a4f6b8545..770f63c2406 100644 --- a/pkg/codegen/go.mod +++ b/pkg/codegen/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/codegen -go 1.23.7 +go 1.24.1 require ( cuelang.org/go v0.11.1 diff --git a/pkg/plugins/codegen/go.mod b/pkg/plugins/codegen/go.mod index d020ab0c981..8f5a7bc0efe 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.23.7 +go 1.24.1 replace github.com/grafana/grafana/pkg/codegen => ../../codegen diff --git a/pkg/promlib/go.mod b/pkg/promlib/go.mod index 859cbe020a1..6031bd88939 100644 --- a/pkg/promlib/go.mod +++ b/pkg/promlib/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/promlib -go 1.23.7 +go 1.24.1 require ( github.com/grafana/dskit v0.0.0-20241105154643-a6b453a88040 diff --git a/pkg/semconv/go.mod b/pkg/semconv/go.mod index d9a03085f04..1ab95a935ce 100644 --- a/pkg/semconv/go.mod +++ b/pkg/semconv/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/semconv -go 1.23.7 +go 1.24.1 require go.opentelemetry.io/otel v1.35.0 diff --git a/pkg/util/xorm/go.mod b/pkg/util/xorm/go.mod index 9a1231c42ee..9ac8c8666b4 100644 --- a/pkg/util/xorm/go.mod +++ b/pkg/util/xorm/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/util/xorm -go 1.23.7 +go 1.24.1 require ( cloud.google.com/go/spanner v1.75.0 diff --git a/scripts/build/ci-windows-test/Dockerfile b/scripts/build/ci-windows-test/Dockerfile index 150a4b1e3d6..a98f43deaa6 100644 --- a/scripts/build/ci-windows-test/Dockerfile +++ b/scripts/build/ci-windows-test/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.7-windowsservercore-1809 +FROM golang:1.24.1-windowsservercore-1809 SHELL ["powershell", "-command"] diff --git a/scripts/go-workspace/go.mod b/scripts/go-workspace/go.mod index c8134977d9f..77fcc69a7e2 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.23.7 +go 1.24.1 require golang.org/x/mod v0.20.0 diff --git a/scripts/modowners/go.mod b/scripts/modowners/go.mod index 14842f86f5b..20877601faa 100644 --- a/scripts/modowners/go.mod +++ b/scripts/modowners/go.mod @@ -1,5 +1,5 @@ module github.com/grafana/grafana/scripts/modowners -go 1.23.7 +go 1.24.1 require golang.org/x/mod v0.10.0