root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 142 Packages Projects Releases Wiki Activity

[release-12.1.1] Go: Update to 1.24.6 (#109318)

This commit is contained in:
Mariell Hoversholm 2025-08-07 10:28:03 +02:00 committed by GitHub
parent 93605ed4ee
commit a844040faf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
28 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
.drone.yml
View File

@ -25,7 +25,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- ./bin/build verify-drone - ./bin/build verify-drone
@ -75,7 +75,7 @@ steps:
- go install github.com/bazelbuild/buildtools/buildifier@latest - go install github.com/bazelbuild/buildtools/buildifier@latest
- buildifier --lint=warn -mode=check -r . - buildifier --lint=warn -mode=check -r .
depends_on: [] depends_on: []
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: lint-starlark name: lint-starlark
trigger: trigger:
event: event:
@ -140,7 +140,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- '# It is required that code generated from Thema/CUE be committed and in sync - '# It is required that code generated from Thema/CUE be committed and in sync
@ -150,7 +150,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: [] depends_on: []
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: verify-gen-cue name: verify-gen-cue
- commands: - commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.' - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -159,7 +159,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet - CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: [] depends_on: []
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -210,7 +210,7 @@ steps:
environment: environment:
_EXPERIMENTAL_DAGGER_CLOUD_TOKEN: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
from_secret: dagger_token from_secret: dagger_token
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: rgm-package name: rgm-package
pull: always pull: always
volumes: volumes:
@ -472,7 +472,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: [] depends_on: []
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: verify-gen-cue name: verify-gen-cue
trigger: trigger:
event: event:
@ -542,7 +542,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: [] depends_on: []
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: verify-gen-cue name: verify-gen-cue
trigger: trigger:
branch: main branch: main
@ -609,7 +609,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- '# It is required that code generated from Thema/CUE be committed and in sync - '# It is required that code generated from Thema/CUE be committed and in sync
@ -619,7 +619,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: [] depends_on: []
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: verify-gen-cue name: verify-gen-cue
- commands: - commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.' - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@ -628,7 +628,7 @@ steps:
- apk add --update make - apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet - CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: [] depends_on: []
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -678,7 +678,7 @@ steps:
environment: environment:
_EXPERIMENTAL_DAGGER_CLOUD_TOKEN: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
from_secret: dagger_token from_secret: dagger_token
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: rgm-package name: rgm-package
pull: always pull: always
volumes: volumes:
@ -1156,7 +1156,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- ./bin/build artifacts docker fetch --edition oss - ./bin/build artifacts docker fetch --edition oss
@ -1286,7 +1286,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- ./bin/build artifacts docker fetch --edition oss - ./bin/build artifacts docker fetch --edition oss
@ -1427,7 +1427,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- ./bin/build artifacts packages --artifacts-editions=oss --tag $${DRONE_TAG} --src-bucket - ./bin/build artifacts packages --artifacts-editions=oss --tag $${DRONE_TAG} --src-bucket
@ -1519,7 +1519,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -1619,7 +1619,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: compile-build-cmd name: compile-build-cmd
- depends_on: - depends_on:
- compile-build-cmd - compile-build-cmd
@ -1716,7 +1716,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- ./bin/build publish grafana-com --edition oss ${DRONE_TAG} - ./bin/build publish grafana-com --edition oss ${DRONE_TAG}
@ -1790,7 +1790,7 @@ steps:
STORYBOOK_DESTINATION: STORYBOOK_DESTINATION:
from_secret: rgm_storybook_destination from_secret: rgm_storybook_destination
UBUNTU_BASE: ubuntu:22.04 UBUNTU_BASE: ubuntu:22.04
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: rgm-build name: rgm-build
pull: always pull: always
volumes: volumes:
@ -1884,7 +1884,7 @@ steps:
STORYBOOK_DESTINATION: STORYBOOK_DESTINATION:
from_secret: rgm_storybook_destination from_secret: rgm_storybook_destination
UBUNTU_BASE: ubuntu:22.04 UBUNTU_BASE: ubuntu:22.04
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: rgm-build name: rgm-build
pull: always pull: always
volumes: volumes:
@ -2007,7 +2007,7 @@ steps:
STORYBOOK_DESTINATION: STORYBOOK_DESTINATION:
from_secret: rgm_storybook_destination from_secret: rgm_storybook_destination
UBUNTU_BASE: ubuntu:22.04 UBUNTU_BASE: ubuntu:22.04
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: rgm-build name: rgm-build
pull: always pull: always
volumes: volumes:
@ -2114,7 +2114,7 @@ steps:
STORYBOOK_DESTINATION: STORYBOOK_DESTINATION:
from_secret: rgm_storybook_destination from_secret: rgm_storybook_destination
UBUNTU_BASE: ubuntu:22.04 UBUNTU_BASE: ubuntu:22.04
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: rgm-build name: rgm-build
pull: always pull: always
volumes: volumes:
@ -2260,7 +2260,7 @@ steps:
STORYBOOK_DESTINATION: STORYBOOK_DESTINATION:
from_secret: rgm_storybook_destination from_secret: rgm_storybook_destination
UBUNTU_BASE: ubuntu:22.04 UBUNTU_BASE: ubuntu:22.04
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: rgm-publish name: rgm-publish
pull: always pull: always
volumes: volumes:
@ -2390,7 +2390,7 @@ steps:
STORYBOOK_DESTINATION: STORYBOOK_DESTINATION:
from_secret: rgm_storybook_destination from_secret: rgm_storybook_destination
UBUNTU_BASE: ubuntu:22.04 UBUNTU_BASE: ubuntu:22.04
image: golang:1.24.4-alpine image: golang:1.24.6-alpine
name: rgm-build name: rgm-build
pull: always pull: always
volumes: volumes:
@ -2732,7 +2732,7 @@ steps:
- commands: - commands:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM docker:27-cli - 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 alpine/git:2.40.1
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.24.4-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.16.0-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:22-bookworm - 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 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0
@ -2760,7 +2760,7 @@ steps:
- commands: - commands:
- trivy --exit-code 1 --severity HIGH,CRITICAL docker:27-cli - 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 alpine/git:2.40.1
- trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.24.4-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.16.0-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL node:22-bookworm - trivy --exit-code 1 --severity HIGH,CRITICAL node:22-bookworm
- trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0 - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0
@ -3007,6 +3007,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: dce4ef9b8d45f32e1b2153b8418f668144325ed9fc0c51f2f8245fb091a4cba2 hmac: e7227aeb1bbea13606266ce540b5f0e0a63f05f56a3eb072954d54527dcc5a11
... ...

2
Dockerfile
View File

@ -16,7 +16,7 @@ ARG JS_SRC=js-builder
# By using FROM instructions we can delegate dependency updates to dependabot # By using FROM instructions we can delegate dependency updates to dependabot
FROM alpine:3.21.3 AS alpine-base FROM alpine:3.21.3 AS alpine-base
FROM ubuntu:22.04 AS ubuntu-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 FROM --platform=${JS_PLATFORM} node:22-alpine AS js-builder-base
# Javascript build stage # Javascript build stage

2
Makefile
View File

@ -9,7 +9,7 @@ include .bingo/Variables.mk
include .citools/Variables.mk include .citools/Variables.mk
GO = go GO = go
GO_VERSION = 1.24.4 GO_VERSION = 1.24.6
GO_LINT_FILES ?= $(shell ./scripts/go-workspace/golangci-lint-includes.sh) GO_LINT_FILES ?= $(shell ./scripts/go-workspace/golangci-lint-includes.sh)
GO_TEST_FILES ?= $(shell ./scripts/go-workspace/test-includes.sh) GO_TEST_FILES ?= $(shell ./scripts/go-workspace/test-includes.sh)
SH_FILES ?= $(shell find ./scripts -name *.sh) SH_FILES ?= $(shell find ./scripts -name *.sh)

2
apps/advisor/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/advisor module github.com/grafana/grafana/apps/advisor
go 1.24.4 go 1.24.6
require ( require (
github.com/grafana/grafana-app-sdk v0.39.0 github.com/grafana/grafana-app-sdk v0.39.0

2
apps/alerting/notifications/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/alerting/notifications module github.com/grafana/grafana/apps/alerting/notifications
go 1.24.4 go 1.24.6
require ( require (
github.com/grafana/grafana-app-sdk v0.39.2 github.com/grafana/grafana-app-sdk v0.39.2

2
apps/dashboard/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/dashboard module github.com/grafana/grafana/apps/dashboard
go 1.24.4 go 1.24.6
require ( require (
cuelang.org/go v0.11.1 cuelang.org/go v0.11.1

2
apps/folder/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/folder module github.com/grafana/grafana/apps/folder
go 1.24.4 go 1.24.6
require ( require (
github.com/grafana/grafana-app-sdk v0.39.2 github.com/grafana/grafana-app-sdk v0.39.2

2
apps/iam/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/iam module github.com/grafana/grafana/apps/iam
go 1.24.4 go 1.24.6
require ( require (
github.com/grafana/grafana-app-sdk v0.39.2 github.com/grafana/grafana-app-sdk v0.39.2

2
apps/investigations/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/investigations module github.com/grafana/grafana/apps/investigations
go 1.24.4 go 1.24.6
require ( require (
github.com/grafana/grafana-app-sdk v0.39.0 github.com/grafana/grafana-app-sdk v0.39.0

2
apps/playlist/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/apps/playlist module github.com/grafana/grafana/apps/playlist
go 1.24.4 go 1.24.6
require ( require (
github.com/grafana/grafana-app-sdk v0.39.2 github.com/grafana/grafana-app-sdk v0.39.2

2
devenv/docker/blocks/prometheus_high_card/go.mod
View File

@ -1,6 +1,6 @@
module high-card module high-card
go 1.24.4 go 1.24.6
require github.com/prometheus/client_golang v1.22.0 require github.com/prometheus/client_golang v1.22.0

2
devenv/docker/blocks/prometheus_utf8/go.mod
View File

@ -1,6 +1,6 @@
module utf8-support module utf8-support
go 1.24.4 go 1.24.6
require ( require (
github.com/prometheus/client_golang v1.22.0 github.com/prometheus/client_golang v1.22.0

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana module github.com/grafana/grafana
go 1.24.4 go 1.24.6
require ( require (
buf.build/gen/go/parca-dev/parca/connectrpc/go v1.18.1-20250703125925-3f0fcf4bff96.1 // @grafana/observability-traces-and-profiling buf.build/gen/go/parca-dev/parca/connectrpc/go v1.18.1-20250703125925-3f0fcf4bff96.1 // @grafana/observability-traces-and-profiling

2
go.work
View File

@ -1,4 +1,4 @@
go 1.24.4 go 1.24.6
// The `skip:golangci-lint` comment tag is used to exclude the package from the `golangci-lint` GitHub Action. // 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. // The module at the root of the repo (`.`) is excluded because ./pkg/... is included manually in the `golangci-lint` configuration.

2
hack/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/hack module github.com/grafana/grafana/hack
go 1.24.4 go 1.24.6
require k8s.io/code-generator v0.33.1 require k8s.io/code-generator v0.33.1

2
pkg/aggregator/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/aggregator module github.com/grafana/grafana/pkg/aggregator
go 1.24.4 go 1.24.6
require ( require (
github.com/emicklei/go-restful/v3 v3.11.0 github.com/emicklei/go-restful/v3 v3.11.0

2
pkg/apimachinery/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/apimachinery module github.com/grafana/grafana/pkg/apimachinery
go 1.24.4 go 1.24.6
require ( require (
github.com/go-jose/go-jose/v3 v3.0.4 // @grafana/identity-access-team github.com/go-jose/go-jose/v3 v3.0.4 // @grafana/identity-access-team

2
pkg/apis/secret/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/apis/secret module github.com/grafana/grafana/pkg/apis/secret
go 1.24.4 go 1.24.6
require ( require (
github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250514132646-acbc7b54ed9e github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250514132646-acbc7b54ed9e

2
pkg/apiserver/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/apiserver module github.com/grafana/grafana/pkg/apiserver
go 1.24.4 go 1.24.6
require ( require (
github.com/google/go-cmp v0.7.0 github.com/google/go-cmp v0.7.0

2
pkg/build/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/build module github.com/grafana/grafana/pkg/build
go 1.24.4 go 1.24.6
// Override docker/docker to avoid: // Override docker/docker to avoid:
// go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires // go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires

2
pkg/build/wire/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/build/wire module github.com/grafana/grafana/pkg/build/wire
go 1.24.4 go 1.24.6
require ( require (
github.com/google/go-cmp v0.7.0 github.com/google/go-cmp v0.7.0

2
pkg/codegen/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/codegen module github.com/grafana/grafana/pkg/codegen
go 1.24.4 go 1.24.6
require ( require (
cuelang.org/go v0.11.1 cuelang.org/go v0.11.1

2
pkg/plugins/codegen/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/plugins/codegen module github.com/grafana/grafana/pkg/plugins/codegen
go 1.24.4 go 1.24.6
replace github.com/grafana/grafana/pkg/codegen => ../../codegen replace github.com/grafana/grafana/pkg/codegen => ../../codegen

2
pkg/promlib/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/promlib module github.com/grafana/grafana/pkg/promlib
go 1.24.4 go 1.24.6
require ( require (
github.com/grafana/dskit v0.0.0-20250611075409-46f51e1ce914 github.com/grafana/dskit v0.0.0-20250611075409-46f51e1ce914

2
pkg/semconv/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/semconv module github.com/grafana/grafana/pkg/semconv
go 1.24.4 go 1.24.6
require go.opentelemetry.io/otel v1.36.0 require go.opentelemetry.io/otel v1.36.0

2
scripts/drone/variables.star
View File

@ -3,7 +3,7 @@ global variables
""" """
grabpl_version = "v3.1.2" grabpl_version = "v3.1.2"
golang_version = "1.24.4" golang_version = "1.24.6"
# nodejs_version should match what's in ".nvmrc", but without the v prefix. # nodejs_version should match what's in ".nvmrc", but without the v prefix.
nodejs_version = "22.16.0" nodejs_version = "22.16.0"

2
scripts/go-workspace/go.mod
View File

@ -1,5 +1,5 @@
module github.com/grafana/grafana/scripts/go-workspace module github.com/grafana/grafana/scripts/go-workspace
go 1.24.4 go 1.24.6
require golang.org/x/mod v0.24.0 require golang.org/x/mod v0.24.0

2
scripts/modowners/go.mod
View File

@ -1,5 +1,5 @@
module github.com/grafana/grafana/scripts/modowners module github.com/grafana/grafana/scripts/modowners
go 1.24.4 go 1.24.6
require golang.org/x/mod v0.24.0 require golang.org/x/mod v0.24.0