diff --git a/.citools/src/air/go.mod b/.citools/src/air/go.mod index 8619eb0641e..12eff786f78 100644 --- a/.citools/src/air/go.mod +++ b/.citools/src/air/go.mod @@ -1,6 +1,6 @@ module air -go 1.25.3 +go 1.25.5 tool github.com/air-verse/air diff --git a/.citools/src/bra/go.mod b/.citools/src/bra/go.mod index 43a1908f9c4..8aa38826cc4 100644 --- a/.citools/src/bra/go.mod +++ b/.citools/src/bra/go.mod @@ -1,6 +1,6 @@ module bra -go 1.25.3 +go 1.25.5 tool github.com/unknwon/bra diff --git a/.citools/src/cog/go.mod b/.citools/src/cog/go.mod index 0ee1004f974..f3dde771f5d 100644 --- a/.citools/src/cog/go.mod +++ b/.citools/src/cog/go.mod @@ -1,6 +1,6 @@ module cog -go 1.25.3 +go 1.25.5 tool github.com/grafana/cog/cmd/cli diff --git a/.citools/src/cue/go.mod b/.citools/src/cue/go.mod index d9a143c75c2..773864f88c8 100644 --- a/.citools/src/cue/go.mod +++ b/.citools/src/cue/go.mod @@ -1,6 +1,6 @@ module cue -go 1.25.3 +go 1.25.5 tool cuelang.org/go/cmd/cue diff --git a/.citools/src/golangci-lint/go.mod b/.citools/src/golangci-lint/go.mod index d3ac9b697aa..fa294ce0306 100644 --- a/.citools/src/golangci-lint/go.mod +++ b/.citools/src/golangci-lint/go.mod @@ -1,6 +1,6 @@ module golangci-lint -go 1.25.3 +go 1.25.5 tool github.com/golangci/golangci-lint/v2/cmd/golangci-lint diff --git a/.citools/src/jb/go.mod b/.citools/src/jb/go.mod index 96fe587d14f..c2e919e6e77 100644 --- a/.citools/src/jb/go.mod +++ b/.citools/src/jb/go.mod @@ -1,6 +1,6 @@ module jb -go 1.25.3 +go 1.25.5 tool github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb diff --git a/.citools/src/lefthook/go.mod b/.citools/src/lefthook/go.mod index e37e46a5ea6..b6765c72f85 100644 --- a/.citools/src/lefthook/go.mod +++ b/.citools/src/lefthook/go.mod @@ -1,6 +1,6 @@ module lefthook -go 1.25.3 +go 1.25.5 tool github.com/evilmartians/lefthook diff --git a/.citools/src/swagger/go.mod b/.citools/src/swagger/go.mod index d0ed2ce2bcf..9416fa04f50 100644 --- a/.citools/src/swagger/go.mod +++ b/.citools/src/swagger/go.mod @@ -1,6 +1,6 @@ module swagger -go 1.25.3 +go 1.25.5 tool github.com/go-swagger/go-swagger/cmd/swagger diff --git a/Dockerfile b/Dockerfile index 909281146e7..3a35b9c9e25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG JS_SRC=js-builder # By using FROM instructions we can delegate dependency updates to dependabot FROM alpine:3.22.2 AS alpine-base FROM ubuntu:22.04 AS ubuntu-base -FROM golang:1.25.3-alpine AS go-builder-base +FROM golang:1.25.5-alpine AS go-builder-base FROM --platform=${JS_PLATFORM} node:24-alpine AS js-builder-base # Javascript build stage FROM --platform=${JS_PLATFORM} ${JS_IMAGE} AS js-builder diff --git a/Makefile b/Makefile index 56c2a2c63ff..a5353e95567 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ WIRE_TAGS = "oss" include .citools/Variables.mk GO = go -GO_VERSION = 1.25.3 +GO_VERSION = 1.25.5 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 2e117701c73..97e05d88643 100644 --- a/apps/advisor/go.mod +++ b/apps/advisor/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/advisor -go 1.25.3 +go 1.25.5 require ( github.com/Masterminds/semver/v3 v3.4.0 diff --git a/apps/alerting/alertenrichment/go.mod b/apps/alerting/alertenrichment/go.mod index efab71e825e..d0a5464e7e2 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.1 diff --git a/apps/alerting/notifications/go.mod b/apps/alerting/notifications/go.mod index b4dfcef1c01..1c0b4e671aa 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.1 diff --git a/apps/alerting/rules/go.mod b/apps/alerting/rules/go.mod index f10d66be03f..e33fb8e6d05 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.1 diff --git a/apps/correlations/go.mod b/apps/correlations/go.mod index c9c1e623da6..d04206d5b11 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.1 diff --git a/apps/dashboard/go.mod b/apps/dashboard/go.mod index de0bc8b4614..ff72aa80b9e 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 2a3e75d75c0..7e9d5786210 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.1 diff --git a/apps/folder/go.mod b/apps/folder/go.mod index f87baeab415..9b5f1bc22f0 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.1 diff --git a/apps/iam/go.mod b/apps/iam/go.mod index 6585382e38f..d88062a6fec 100644 --- a/apps/iam/go.mod +++ b/apps/iam/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/iam -go 1.25.3 +go 1.25.5 replace github.com/grafana/grafana => ../../ diff --git a/apps/iam/local/Dockerfile b/apps/iam/local/Dockerfile index 4777b0a466d..c6db8475d03 100644 --- a/apps/iam/local/Dockerfile +++ b/apps/iam/local/Dockerfile @@ -1,5 +1,5 @@ # Build stage -FROM golang:1.25.3-alpine AS builder +FROM golang:1.25.5-alpine AS builder # Set working directory WORKDIR /app diff --git a/apps/investigations/go.mod b/apps/investigations/go.mod index fdf11d0b25a..a65a5559bde 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.1 diff --git a/apps/logsdrilldown/go.mod b/apps/logsdrilldown/go.mod index 6d2c5654233..0e1f3d27fc8 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.1 diff --git a/apps/playlist/go.mod b/apps/playlist/go.mod index 387d8ccd445..5d75fbe3175 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.1 diff --git a/apps/plugins/go.mod b/apps/plugins/go.mod index f0ef53718bc..24524dd913a 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 require ( github.com/grafana/grafana-app-sdk v0.48.1 diff --git a/apps/preferences/go.mod b/apps/preferences/go.mod index abd2a1ad561..c2a89025694 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.1 diff --git a/apps/provisioning/go.mod b/apps/provisioning/go.mod index ad4bf7e3143..4d0b643ef00 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 diff --git a/apps/scope/go.mod b/apps/scope/go.mod index c2efa6601d8..3332faba028 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 35e7485e080..3156b0354f1 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.1 diff --git a/apps/shorturl/go.mod b/apps/shorturl/go.mod index e17faafae16..3581a800998 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.1 diff --git a/devenv/docker/blocks/prometheus_high_card/go.mod b/devenv/docker/blocks/prometheus_high_card/go.mod index 1e3709bbe66..a68a55e794d 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 2ecc8267f24..af0a5315c20 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/devenv/docker/blocks/stateful_webhook/Dockerfile b/devenv/docker/blocks/stateful_webhook/Dockerfile index f4eaaa14256..a9eaa77b382 100644 --- a/devenv/docker/blocks/stateful_webhook/Dockerfile +++ b/devenv/docker/blocks/stateful_webhook/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25.3 +FROM golang:1.25.5 ADD main.go /go/src/webhook/main.go diff --git a/go.mod b/go.mod index 3c5f234aa85..e273b857113 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.25.3 +go 1.25.5 require ( buf.build/gen/go/parca-dev/parca/connectrpc/go v1.18.1-20250703125925-3f0fcf4bff96.1 // @grafana/observability-traces-and-profiling diff --git a/go.work b/go.work index 3fa612c2fce..13195402410 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.25.3 +go 1.25.5 // The `skip:golangci-lint` comment tag is used to exclude the package from the `golangci-lint` GitHub Action. // The module at the root of the repo (`.`) is excluded because ./pkg/... is included manually in the `golangci-lint` configuration. diff --git a/hack/go.mod b/hack/go.mod index 6234b45073e..8ff98fcb35e 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.1 diff --git a/pkg/aggregator/go.mod b/pkg/aggregator/go.mod index 82afd586730..e6beeb31fff 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 6ed1a0f5054..39425265d9e 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/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f // @grafana/identity-access-team diff --git a/pkg/apiserver/go.mod b/pkg/apiserver/go.mod index c33ac35fd40..0612556d66c 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 2cdfd52db21..8dead378fc1 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 421c9a62583..52d14872a22 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 f17dead4c51..33e7ccebb03 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 08295065017..2bf111a953f 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 c545a9b1e8a..f4d86bc986e 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