diff --git a/.drone.yml b/.drone.yml index c2c570ddcca..1cd7adba7fa 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -75,7 +75,7 @@ steps: - go install github.com/bazelbuild/buildtools/buildifier@latest - buildifier --lint=warn -mode=check -r . depends_on: [] - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: lint-starlark trigger: event: @@ -140,7 +140,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -150,7 +150,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -159,7 +159,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: verify-gen-jsonnet - commands: - yarn install --immutable || yarn install --immutable @@ -210,7 +210,7 @@ steps: environment: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN: from_secret: dagger_token - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: rgm-package pull: always volumes: @@ -472,7 +472,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: verify-gen-cue trigger: event: @@ -542,7 +542,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: verify-gen-cue trigger: branch: main @@ -609,7 +609,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -619,7 +619,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -628,7 +628,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: verify-gen-jsonnet - commands: - yarn install --immutable || yarn install --immutable @@ -678,7 +678,7 @@ steps: environment: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN: from_secret: dagger_token - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: rgm-package pull: always volumes: @@ -1156,7 +1156,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -1286,7 +1286,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -1427,7 +1427,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - commands: - ./bin/build artifacts packages --artifacts-editions=oss --tag $${DRONE_TAG} --src-bucket @@ -1519,7 +1519,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - commands: - yarn install --immutable || yarn install --immutable @@ -1619,7 +1619,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - depends_on: - compile-build-cmd @@ -1716,7 +1716,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: compile-build-cmd - commands: - ./bin/build publish grafana-com --edition oss ${DRONE_TAG} @@ -1790,7 +1790,7 @@ steps: STORYBOOK_DESTINATION: from_secret: rgm_storybook_destination UBUNTU_BASE: ubuntu:22.04 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: rgm-build pull: always volumes: @@ -1884,7 +1884,7 @@ steps: STORYBOOK_DESTINATION: from_secret: rgm_storybook_destination UBUNTU_BASE: ubuntu:22.04 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: rgm-build pull: always volumes: @@ -2007,7 +2007,7 @@ steps: STORYBOOK_DESTINATION: from_secret: rgm_storybook_destination UBUNTU_BASE: ubuntu:22.04 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: rgm-build pull: always volumes: @@ -2114,7 +2114,7 @@ steps: STORYBOOK_DESTINATION: from_secret: rgm_storybook_destination UBUNTU_BASE: ubuntu:22.04 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: rgm-build pull: always volumes: @@ -2260,7 +2260,7 @@ steps: STORYBOOK_DESTINATION: from_secret: rgm_storybook_destination UBUNTU_BASE: ubuntu:22.04 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: rgm-publish pull: always volumes: @@ -2390,7 +2390,7 @@ steps: STORYBOOK_DESTINATION: from_secret: rgm_storybook_destination UBUNTU_BASE: ubuntu:22.04 - image: golang:1.24.5-alpine + image: golang:1.24.6-alpine name: rgm-build pull: always volumes: @@ -2732,7 +2732,7 @@ steps: - commands: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM docker:27-cli - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1 - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.24.5-alpine + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.24.6-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:22.16.0-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:22-bookworm - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0 @@ -2760,7 +2760,7 @@ steps: - commands: - trivy --exit-code 1 --severity HIGH,CRITICAL docker:27-cli - trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1 - - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.24.5-alpine + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.24.6-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:22.16.0-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:22-bookworm - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0 @@ -3007,6 +3007,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: c38baa8613d2cf1a5506f6b6568b0869204ba8b2e7281e117c31f3a64bf64447 +hmac: dcbbfb33fcbd1546e1bf3346f64fe0fd1d7c8b18bc148a93b45389273e90f6d2 ... diff --git a/Dockerfile b/Dockerfile index c3a3ba190eb..81c05fd965c 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.21.3 AS alpine-base FROM ubuntu:22.04 AS ubuntu-base -FROM golang:1.24.5-alpine AS go-builder-base +FROM golang:1.24.6-alpine AS go-builder-base FROM --platform=${JS_PLATFORM} node:22-alpine AS js-builder-base # Javascript build stage diff --git a/Makefile b/Makefile index 85eb97dd188..d4c218a2856 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ WIRE_TAGS = "oss" include .bingo/Variables.mk GO = go -GO_VERSION = 1.24.5 +GO_VERSION = 1.24.6 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/alerting/notifications/go.mod b/apps/alerting/notifications/go.mod index f870693bda9..f146b6381e5 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.24.5 +go 1.24.6 replace github.com/grafana/grafana => ../../.. diff --git a/apps/investigation/go.mod b/apps/investigation/go.mod index 58989fc8b95..da4117698b6 100644 --- a/apps/investigation/go.mod +++ b/apps/investigation/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/investigation -go 1.24.5 +go 1.24.6 require ( github.com/grafana/grafana-app-sdk v0.23.1 diff --git a/apps/playlist/go.mod b/apps/playlist/go.mod index cb1134a0e10..e9b09c7a92f 100644 --- a/apps/playlist/go.mod +++ b/apps/playlist/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/playlist -go 1.24.5 +go 1.24.6 require ( github.com/grafana/grafana-app-sdk v0.23.1 diff --git a/devenv/docker/blocks/prometheus_high_card/go.mod b/devenv/docker/blocks/prometheus_high_card/go.mod index 8bcf6d4d54f..05fcd673f30 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.24.5 +go 1.24.6 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 d238b93a8a7..2fba825017f 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.24.5 +go 1.24.6 require ( github.com/prometheus/client_golang v1.22.0 diff --git a/go.mod b/go.mod index 6c9281d19f3..e8b7a31bb1f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.24.5 +go 1.24.6 require ( buf.build/gen/go/parca-dev/parca/connectrpc/go v1.17.0-20240902100956-02fd72488966.1 // @grafana/observability-traces-and-profiling diff --git a/go.work b/go.work index 59c35618bd0..46b94ad23bc 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.24.5 +go 1.24.6 // 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 87d297af7d9..1d1b0984b11 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/hack -go 1.24.5 +go 1.24.6 require k8s.io/code-generator v0.32.0 diff --git a/kindsv2/go.mod b/kindsv2/go.mod index b69b168f4eb..75263256085 100644 --- a/kindsv2/go.mod +++ b/kindsv2/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/kindsv2 -go 1.24.5 +go 1.24.6 require github.com/grafana/cog v0.0.5 diff --git a/pkg/aggregator/go.mod b/pkg/aggregator/go.mod index d69b604efd6..caa20202469 100644 --- a/pkg/aggregator/go.mod +++ b/pkg/aggregator/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/aggregator -go 1.24.5 +go 1.24.6 require ( github.com/emicklei/go-restful/v3 v3.11.0 diff --git a/pkg/apimachinery/go.mod b/pkg/apimachinery/go.mod index 9a587dcf234..2266d76dae5 100644 --- a/pkg/apimachinery/go.mod +++ b/pkg/apimachinery/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apimachinery -go 1.24.5 +go 1.24.6 require ( github.com/grafana/authlib v0.0.0-20250108202437-7a039176d884 // @grafana/identity-access-team diff --git a/pkg/apiserver/go.mod b/pkg/apiserver/go.mod index 2d2ec81c33c..03d052d6344 100644 --- a/pkg/apiserver/go.mod +++ b/pkg/apiserver/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apiserver -go 1.24.5 +go 1.24.6 require ( github.com/google/go-cmp v0.7.0 diff --git a/pkg/build/go.mod b/pkg/build/go.mod index cc97050443a..1a092d6104a 100644 --- a/pkg/build/go.mod +++ b/pkg/build/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build -go 1.24.5 +go 1.24.6 // 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 73516c0267d..0f969304d6e 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.24.5 +go 1.24.6 require ( github.com/google/go-cmp v0.7.0 diff --git a/pkg/codegen/go.mod b/pkg/codegen/go.mod index 9cbd46fde4f..54056751355 100644 --- a/pkg/codegen/go.mod +++ b/pkg/codegen/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/codegen -go 1.24.5 +go 1.24.6 require ( cuelang.org/go v0.11.1 diff --git a/pkg/plugins/codegen/go.mod b/pkg/plugins/codegen/go.mod index 1fa22e411b1..34a76ad40c9 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.24.5 +go 1.24.6 replace github.com/grafana/grafana/pkg/codegen => ../../codegen diff --git a/pkg/promlib/go.mod b/pkg/promlib/go.mod index d41608bc369..08d54aaffb0 100644 --- a/pkg/promlib/go.mod +++ b/pkg/promlib/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/promlib -go 1.24.5 +go 1.24.6 require ( github.com/grafana/dskit v0.0.0-20241105154643-a6b453a88040 diff --git a/pkg/semconv/go.mod b/pkg/semconv/go.mod index 1e3d7616397..244307c8e06 100644 --- a/pkg/semconv/go.mod +++ b/pkg/semconv/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/semconv -go 1.24.5 +go 1.24.6 require go.opentelemetry.io/otel v1.36.0 diff --git a/pkg/storage/unified/apistore/go.mod b/pkg/storage/unified/apistore/go.mod index 877074040dd..c45bbc5b1d4 100644 --- a/pkg/storage/unified/apistore/go.mod +++ b/pkg/storage/unified/apistore/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/storage/unified/apistore -go 1.24.5 +go 1.24.6 replace ( github.com/grafana/grafana => ../../../.. diff --git a/pkg/storage/unified/resource/go.mod b/pkg/storage/unified/resource/go.mod index fc4c92984d4..60c7d9d00e6 100644 --- a/pkg/storage/unified/resource/go.mod +++ b/pkg/storage/unified/resource/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/storage/unified/resource -go 1.24.5 +go 1.24.6 replace ( github.com/grafana/grafana => ../../../.. diff --git a/pkg/util/xorm/go.mod b/pkg/util/xorm/go.mod index da655d5a83c..8d6d4d6ba65 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.24.5 +go 1.24.6 require ( github.com/mattn/go-sqlite3 v1.14.22 diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index c14e87833fd..7c45f17b75f 100644 --- a/scripts/drone/variables.star +++ b/scripts/drone/variables.star @@ -3,7 +3,7 @@ global variables """ grabpl_version = "v3.1.2" -golang_version = "1.24.5" +golang_version = "1.24.6" # nodejs_version should match what's in ".nvmrc", but without the v prefix. nodejs_version = "22.16.0" diff --git a/scripts/go-workspace/go.mod b/scripts/go-workspace/go.mod index 61239d308b3..de53d21c261 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.24.5 +go 1.24.6 require golang.org/x/mod v0.24.0 diff --git a/scripts/modowners/go.mod b/scripts/modowners/go.mod index d6dcd567649..42d4536abb0 100644 --- a/scripts/modowners/go.mod +++ b/scripts/modowners/go.mod @@ -1,5 +1,5 @@ module github.com/grafana/grafana/scripts/modowners -go 1.24.5 +go 1.24.6 require golang.org/x/mod v0.24.0