opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 18:52:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[main] Go: Bump to 1.24.2 (#103521)

Browse Source 
Go: Bump to 1.24.2

It is not likely we are actually affected by the CVEs, but updating proactively is not a bad idea nonetheless.

Fixes: CVE-2025-22871
Fixes: https://github.com/grafana/grafana-operator-experience-squad/issues/1311
This commit is contained in:
Mariell Hoversholm
2025-04-08 17:12:30 +02:00
committed by GitHub
parent aea8f27c59
commit 9df94718ab
31 changed files with 133 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
.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.1-alpine image: golang:1.24.2-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.1-alpine image: golang:1.24.2-alpine
name: lint-starlark name: lint-starlark
trigger: trigger:
event: event:
@ -219,7 +219,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.1-alpine image: golang:1.24.2-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.'
@ -228,21 +228,21 @@ 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.1-alpine image: golang:1.24.2-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: wire-install name: wire-install
- commands: - commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang - apk add --update build-base shared-mime-info shared-mime-info-lang
- go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: test-backend name: test-backend
- commands: - commands:
- apk add --update build-base - apk add --update build-base
@ -251,7 +251,7 @@ steps:
| grep -o '\(.*\)/' | sort -u) | grep -o '\(.*\)/' | sort -u)
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: test-backend-integration name: test-backend-integration
trigger: trigger:
event: event:
@ -306,7 +306,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- echo $(/usr/bin/github-app-external-token) > /github-app/token - echo $(/usr/bin/github-app-external-token) > /github-app/token
@ -351,16 +351,16 @@ steps:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: [] depends_on: []
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: wire-install name: wire-install
- commands: - commands:
- go run scripts/modowners/modowners.go check go.mod - go run scripts/modowners/modowners.go check go.mod
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: validate-modfile name: validate-modfile
- commands: - commands:
- apk add --update make - apk add --update make
- make swagger-validate - make swagger-validate
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: validate-openapi-spec name: validate-openapi-spec
trigger: trigger:
event: event:
@ -437,7 +437,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.1-alpine image: golang:1.24.2-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
@ -447,7 +447,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.1-alpine image: golang:1.24.2-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.'
@ -456,7 +456,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.1-alpine image: golang:1.24.2-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -494,7 +494,7 @@ steps:
- /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64
-a targz:grafana:linux/arm/v7 -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu -a targz:grafana:linux/arm/v7 -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu
-a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7 -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7
-a docker:grafana:linux/arm/v7:ubuntu --go-version=1.24.1 --yarn-cache=$$YARN_CACHE_FOLDER -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.24.2 --yarn-cache=$$YARN_CACHE_FOLDER
--build-id=$$DRONE_BUILD_NUMBER --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.21.3 --build-id=$$DRONE_BUILD_NUMBER --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.21.3
--tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --ubuntu-tag-format='{{ --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --ubuntu-tag-format='{{
.version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' --verify='false' --grafana-dir=$$PWD .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' --verify='false' --grafana-dir=$$PWD
@ -892,7 +892,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
@ -906,7 +906,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.1-alpine image: golang:1.24.2-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.'
@ -915,14 +915,14 @@ 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.1-alpine image: golang:1.24.2-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: wire-install name: wire-install
- commands: - commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s - dockerize -wait tcp://postgres:5432 -timeout 120s
@ -943,7 +943,7 @@ steps:
GRAFANA_TEST_DB: postgres GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest PGPASSWORD: grafanatest
POSTGRES_HOST: postgres POSTGRES_HOST: postgres
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: postgres-integration-tests name: postgres-integration-tests
- commands: - commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s - dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -964,7 +964,7 @@ steps:
environment: environment:
GRAFANA_TEST_DB: mysql GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80 MYSQL_HOST: mysql80
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: mysql-8.0-integration-tests name: mysql-8.0-integration-tests
- commands: - commands:
- dockerize -wait tcp://redis:6379 -timeout 120s - dockerize -wait tcp://redis:6379 -timeout 120s
@ -980,7 +980,7 @@ steps:
- wait-for-redis - wait-for-redis
environment: environment:
REDIS_URL: redis://redis:6379/0 REDIS_URL: redis://redis:6379/0
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: redis-integration-tests name: redis-integration-tests
- commands: - commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s - dockerize -wait tcp://memcached:11211 -timeout 120s
@ -996,7 +996,7 @@ steps:
- wait-for-memcached - wait-for-memcached
environment: environment:
MEMCACHED_HOSTS: memcached:11211 MEMCACHED_HOSTS: memcached:11211
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: memcached-integration-tests name: memcached-integration-tests
- commands: - commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s - dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@ -1012,7 +1012,7 @@ steps:
environment: environment:
AM_TENANT_ID: test AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080 AM_URL: http://mimir_backend:8080
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: remote-alertmanager-integration-tests name: remote-alertmanager-integration-tests
trigger: trigger:
event: event:
@ -1094,7 +1094,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.1-alpine image: golang:1.24.2-alpine
name: verify-gen-cue name: verify-gen-cue
trigger: trigger:
event: event:
@ -1215,7 +1215,7 @@ steps:
&& return 1; fi && return 1; fi
depends_on: depends_on:
- clone-enterprise - clone-enterprise
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: swagger-gen name: swagger-gen
trigger: trigger:
event: event:
@ -1320,7 +1320,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.1-alpine image: golang:1.24.2-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
@ -1331,7 +1331,7 @@ steps:
- CODEGEN_VERIFY=1 make gen-cue - CODEGEN_VERIFY=1 make gen-cue
depends_on: depends_on:
- clone-enterprise - clone-enterprise
image: golang:1.24.1-alpine image: golang:1.24.2-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.'
@ -1341,14 +1341,14 @@ steps:
- CODEGEN_VERIFY=1 make gen-jsonnet - CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: depends_on:
- clone-enterprise - clone-enterprise
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: wire-install name: wire-install
- commands: - commands:
- apk add --update build-base - apk add --update build-base
@ -1356,7 +1356,7 @@ steps:
- go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES} - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES}
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: sqlite-benchmark-integration-tests name: sqlite-benchmark-integration-tests
- commands: - commands:
- apk add --update build-base - apk add --update build-base
@ -1368,7 +1368,7 @@ steps:
GRAFANA_TEST_DB: postgres GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest PGPASSWORD: grafanatest
POSTGRES_HOST: postgres POSTGRES_HOST: postgres
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: postgres-benchmark-integration-tests name: postgres-benchmark-integration-tests
- commands: - commands:
- apk add --update build-base - apk add --update build-base
@ -1379,7 +1379,7 @@ steps:
environment: environment:
GRAFANA_TEST_DB: mysql GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80 MYSQL_HOST: mysql80
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: mysql-8.0-benchmark-integration-tests name: mysql-8.0-benchmark-integration-tests
trigger: trigger:
event: event:
@ -1451,7 +1451,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.1-alpine image: golang:1.24.2-alpine
name: verify-gen-cue name: verify-gen-cue
trigger: trigger:
branch: main branch: main
@ -1500,7 +1500,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.1-alpine image: golang:1.24.2-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.'
@ -1509,21 +1509,21 @@ 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.1-alpine image: golang:1.24.2-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: wire-install name: wire-install
- commands: - commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang - apk add --update build-base shared-mime-info shared-mime-info-lang
- go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: test-backend name: test-backend
- commands: - commands:
- apk add --update build-base - apk add --update build-base
@ -1532,7 +1532,7 @@ steps:
| grep -o '\(.*\)/' | sort -u) | grep -o '\(.*\)/' | sort -u)
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: test-backend-integration name: test-backend-integration
trigger: trigger:
branch: main branch: main
@ -1577,22 +1577,22 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: [] depends_on: []
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: wire-install name: wire-install
- commands: - commands:
- go run scripts/modowners/modowners.go check go.mod - go run scripts/modowners/modowners.go check go.mod
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: validate-modfile name: validate-modfile
- commands: - commands:
- apk add --update make - apk add --update make
- make swagger-validate - make swagger-validate
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: validate-openapi-spec name: validate-openapi-spec
- commands: - commands:
- ./bin/build verify-drone - ./bin/build verify-drone
@ -1724,7 +1724,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.1-alpine image: golang:1.24.2-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
@ -1734,7 +1734,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.1-alpine image: golang:1.24.2-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.'
@ -1743,7 +1743,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.1-alpine image: golang:1.24.2-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -1780,7 +1780,7 @@ steps:
- /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64
-a targz:grafana:linux/arm/v7 -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu -a targz:grafana:linux/arm/v7 -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu
-a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7 -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7
-a docker:grafana:linux/arm/v7:ubuntu --go-version=1.24.1 --yarn-cache=$$YARN_CACHE_FOLDER -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.24.2 --yarn-cache=$$YARN_CACHE_FOLDER
--build-id=$$DRONE_BUILD_NUMBER --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.21.3 --build-id=$$DRONE_BUILD_NUMBER --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.21.3
--tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --ubuntu-tag-format='{{ --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --ubuntu-tag-format='{{
.version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' --verify='false' --grafana-dir=$$PWD .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' --verify='false' --grafana-dir=$$PWD
@ -2255,7 +2255,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
@ -2269,7 +2269,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.1-alpine image: golang:1.24.2-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.'
@ -2278,14 +2278,14 @@ 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.1-alpine image: golang:1.24.2-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: wire-install name: wire-install
- commands: - commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s - dockerize -wait tcp://postgres:5432 -timeout 120s
@ -2306,7 +2306,7 @@ steps:
GRAFANA_TEST_DB: postgres GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest PGPASSWORD: grafanatest
POSTGRES_HOST: postgres POSTGRES_HOST: postgres
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: postgres-integration-tests name: postgres-integration-tests
- commands: - commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s - dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -2327,7 +2327,7 @@ steps:
environment: environment:
GRAFANA_TEST_DB: mysql GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80 MYSQL_HOST: mysql80
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: mysql-8.0-integration-tests name: mysql-8.0-integration-tests
- commands: - commands:
- dockerize -wait tcp://redis:6379 -timeout 120s - dockerize -wait tcp://redis:6379 -timeout 120s
@ -2343,7 +2343,7 @@ steps:
- wait-for-redis - wait-for-redis
environment: environment:
REDIS_URL: redis://redis:6379/0 REDIS_URL: redis://redis:6379/0
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: redis-integration-tests name: redis-integration-tests
- commands: - commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s - dockerize -wait tcp://memcached:11211 -timeout 120s
@ -2359,7 +2359,7 @@ steps:
- wait-for-memcached - wait-for-memcached
environment: environment:
MEMCACHED_HOSTS: memcached:11211 MEMCACHED_HOSTS: memcached:11211
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: memcached-integration-tests name: memcached-integration-tests
- commands: - commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s - dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@ -2375,7 +2375,7 @@ steps:
environment: environment:
AM_TENANT_ID: test AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080 AM_URL: http://mimir_backend:8080
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: remote-alertmanager-integration-tests name: remote-alertmanager-integration-tests
trigger: trigger:
branch: main branch: main
@ -2643,7 +2643,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.1-alpine image: golang:1.24.2-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.'
@ -2652,21 +2652,21 @@ 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.1-alpine image: golang:1.24.2-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: wire-install name: wire-install
- commands: - commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang - apk add --update build-base shared-mime-info shared-mime-info-lang
- go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: test-backend name: test-backend
- commands: - commands:
- apk add --update build-base - apk add --update build-base
@ -2675,7 +2675,7 @@ steps:
| grep -o '\(.*\)/' | sort -u) | grep -o '\(.*\)/' | sort -u)
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: test-backend-integration name: test-backend-integration
trigger: trigger:
branch: branch:
@ -2718,22 +2718,22 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: [] depends_on: []
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: wire-install name: wire-install
- commands: - commands:
- go run scripts/modowners/modowners.go check go.mod - go run scripts/modowners/modowners.go check go.mod
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: validate-modfile name: validate-modfile
- commands: - commands:
- apk add --update make - apk add --update make
- make swagger-validate - make swagger-validate
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: validate-openapi-spec name: validate-openapi-spec
trigger: trigger:
branch: branch:
@ -2812,7 +2812,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
@ -2826,7 +2826,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.1-alpine image: golang:1.24.2-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.'
@ -2835,14 +2835,14 @@ 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.1-alpine image: golang:1.24.2-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: wire-install name: wire-install
- commands: - commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s - dockerize -wait tcp://postgres:5432 -timeout 120s
@ -2863,7 +2863,7 @@ steps:
GRAFANA_TEST_DB: postgres GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest PGPASSWORD: grafanatest
POSTGRES_HOST: postgres POSTGRES_HOST: postgres
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: postgres-integration-tests name: postgres-integration-tests
- commands: - commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s - dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -2884,7 +2884,7 @@ steps:
environment: environment:
GRAFANA_TEST_DB: mysql GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80 MYSQL_HOST: mysql80
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: mysql-8.0-integration-tests name: mysql-8.0-integration-tests
- commands: - commands:
- dockerize -wait tcp://redis:6379 -timeout 120s - dockerize -wait tcp://redis:6379 -timeout 120s
@ -2900,7 +2900,7 @@ steps:
- wait-for-redis - wait-for-redis
environment: environment:
REDIS_URL: redis://redis:6379/0 REDIS_URL: redis://redis:6379/0
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: redis-integration-tests name: redis-integration-tests
- commands: - commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s - dockerize -wait tcp://memcached:11211 -timeout 120s
@ -2916,7 +2916,7 @@ steps:
- wait-for-memcached - wait-for-memcached
environment: environment:
MEMCACHED_HOSTS: memcached:11211 MEMCACHED_HOSTS: memcached:11211
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: memcached-integration-tests name: memcached-integration-tests
- commands: - commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s - dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@ -2932,7 +2932,7 @@ steps:
environment: environment:
AM_TENANT_ID: test AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080 AM_URL: http://mimir_backend:8080
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: remote-alertmanager-integration-tests name: remote-alertmanager-integration-tests
trigger: trigger:
branch: branch:
@ -3032,7 +3032,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.1-alpine image: golang:1.24.2-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
@ -3164,7 +3164,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.1-alpine image: golang:1.24.2-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
@ -3305,7 +3305,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.1-alpine image: golang:1.24.2-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
@ -3397,7 +3397,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -3497,7 +3497,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: compile-build-cmd name: compile-build-cmd
- depends_on: - depends_on:
- compile-build-cmd - compile-build-cmd
@ -3594,7 +3594,7 @@ steps:
depends_on: [] depends_on: []
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
image: golang:1.24.1-alpine image: golang:1.24.2-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}
@ -3655,7 +3655,7 @@ steps:
from_secret: grafana_api_key from_secret: grafana_api_key
GCP_KEY_BASE64: GCP_KEY_BASE64:
from_secret: gcp_key_base64 from_secret: gcp_key_base64
GO_VERSION: 1.24.1 GO_VERSION: 1.24.2
GPG_PASSPHRASE: GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY: GPG_PRIVATE_KEY:
@ -3730,7 +3730,7 @@ steps:
from_secret: grafana_api_key from_secret: grafana_api_key
GCP_KEY_BASE64: GCP_KEY_BASE64:
from_secret: gcp_key_base64 from_secret: gcp_key_base64
GO_VERSION: 1.24.1 GO_VERSION: 1.24.2
GPG_PASSPHRASE: GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY: GPG_PRIVATE_KEY:
@ -3847,7 +3847,7 @@ steps:
from_secret: grafana_api_key from_secret: grafana_api_key
GCP_KEY_BASE64: GCP_KEY_BASE64:
from_secret: gcp_key_base64 from_secret: gcp_key_base64
GO_VERSION: 1.24.1 GO_VERSION: 1.24.2
GPG_PASSPHRASE: GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY: GPG_PRIVATE_KEY:
@ -3998,7 +3998,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.1-alpine image: golang:1.24.2-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.'
@ -4007,21 +4007,21 @@ 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.1-alpine image: golang:1.24.2-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: wire-install name: wire-install
- commands: - commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang - apk add --update build-base shared-mime-info shared-mime-info-lang
- go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: test-backend name: test-backend
- commands: - commands:
- apk add --update build-base - apk add --update build-base
@ -4030,7 +4030,7 @@ steps:
| grep -o '\(.*\)/' | sort -u) | grep -o '\(.*\)/' | sort -u)
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: test-backend-integration name: test-backend-integration
trigger: trigger:
cron: cron:
@ -4084,7 +4084,7 @@ steps:
from_secret: grafana_api_key from_secret: grafana_api_key
GCP_KEY_BASE64: GCP_KEY_BASE64:
from_secret: gcp_key_base64 from_secret: gcp_key_base64
GO_VERSION: 1.24.1 GO_VERSION: 1.24.2
GPG_PASSPHRASE: GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY: GPG_PRIVATE_KEY:
@ -4228,7 +4228,7 @@ steps:
from_secret: grafana_api_key from_secret: grafana_api_key
GCP_KEY_BASE64: GCP_KEY_BASE64:
from_secret: gcp_key_base64 from_secret: gcp_key_base64
GO_VERSION: 1.24.1 GO_VERSION: 1.24.2
GPG_PASSPHRASE: GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY: GPG_PRIVATE_KEY:
@ -4335,7 +4335,7 @@ steps:
- export GITHUB_TOKEN=$(cat /github-app/token) - export GITHUB_TOKEN=$(cat /github-app/token)
- dagger run --silent /src/grafana-build artifacts -a $${ARTIFACTS} --grafana-ref=$${GRAFANA_REF} - dagger run --silent /src/grafana-build artifacts -a $${ARTIFACTS} --grafana-ref=$${GRAFANA_REF}
--enterprise-ref=$${ENTERPRISE_REF} --grafana-repo=$${GRAFANA_REPO} --version=$${VERSION} --enterprise-ref=$${ENTERPRISE_REF} --grafana-repo=$${GRAFANA_REPO} --version=$${VERSION}
--go-version=1.24.1 --go-version=1.24.2
depends_on: depends_on:
- github-app-generate-token - github-app-generate-token
environment: environment:
@ -4356,7 +4356,7 @@ steps:
from_secret: grafana_api_key from_secret: grafana_api_key
GCP_KEY_BASE64: GCP_KEY_BASE64:
from_secret: gcp_key_base64 from_secret: gcp_key_base64
GO_VERSION: 1.24.1 GO_VERSION: 1.24.2
GPG_PASSPHRASE: GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY: GPG_PRIVATE_KEY:
@ -4494,7 +4494,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.1-alpine image: golang:1.24.2-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.'
@ -4503,14 +4503,14 @@ 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.1-alpine image: golang:1.24.2-alpine
name: verify-gen-jsonnet name: verify-gen-jsonnet
- commands: - commands:
- apk add --update make - apk add --update make
- make gen-go - make gen-go
depends_on: depends_on:
- verify-gen-cue - verify-gen-cue
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: wire-install name: wire-install
- commands: - commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s - dockerize -wait tcp://postgres:5432 -timeout 120s
@ -4531,7 +4531,7 @@ steps:
GRAFANA_TEST_DB: postgres GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest PGPASSWORD: grafanatest
POSTGRES_HOST: postgres POSTGRES_HOST: postgres
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: postgres-integration-tests name: postgres-integration-tests
- commands: - commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s - dockerize -wait tcp://mysql80:3306 -timeout 120s
@ -4552,7 +4552,7 @@ steps:
environment: environment:
GRAFANA_TEST_DB: mysql GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80 MYSQL_HOST: mysql80
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: mysql-8.0-integration-tests name: mysql-8.0-integration-tests
- commands: - commands:
- dockerize -wait tcp://redis:6379 -timeout 120s - dockerize -wait tcp://redis:6379 -timeout 120s
@ -4568,7 +4568,7 @@ steps:
- wait-for-redis - wait-for-redis
environment: environment:
REDIS_URL: redis://redis:6379/0 REDIS_URL: redis://redis:6379/0
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: redis-integration-tests name: redis-integration-tests
- commands: - commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s - dockerize -wait tcp://memcached:11211 -timeout 120s
@ -4584,7 +4584,7 @@ steps:
- wait-for-memcached - wait-for-memcached
environment: environment:
MEMCACHED_HOSTS: memcached:11211 MEMCACHED_HOSTS: memcached:11211
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: memcached-integration-tests name: memcached-integration-tests
- commands: - commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s - dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@ -4600,7 +4600,7 @@ steps:
environment: environment:
AM_TENANT_ID: test AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080 AM_URL: http://mimir_backend:8080
image: golang:1.24.1-alpine image: golang:1.24.2-alpine
name: remote-alertmanager-integration-tests name: remote-alertmanager-integration-tests
trigger: trigger:
event: event:
@ -4903,7 +4903,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.1-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.24.2-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:22.11.0-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:22.11.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
@ -4941,7 +4941,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.1-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.24.2-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL node:22.11.0-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:22.11.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
@ -5210,6 +5210,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: efb7a251f741df9b3497b3c09683604b25752f1f52488aff7175fff4802e8ce3 hmac: 8e25f1f786b8de4eb21dfbeca8c5fcb9701b1e62ecf98287d9225ecc6e8c29e8
... ...

2
Dockerfile
View File

@ -6,7 +6,7 @@
ARG BASE_IMAGE=alpine:3.21 ARG BASE_IMAGE=alpine:3.21
ARG JS_IMAGE=node:22-alpine ARG JS_IMAGE=node:22-alpine
ARG JS_PLATFORM=linux/amd64 ARG JS_PLATFORM=linux/amd64
ARG GO_IMAGE=golang:1.24.1-alpine ARG GO_IMAGE=golang:1.24.2-alpine
# Default to building locally # Default to building locally
ARG GO_SRC=go-builder ARG GO_SRC=go-builder

2
Makefile
View File

@ -8,7 +8,7 @@ WIRE_TAGS = "oss"
include .bingo/Variables.mk include .bingo/Variables.mk
GO = go GO = go
GO_VERSION = 1.24.1 GO_VERSION = 1.24.2
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.1 go 1.24.2
require ( require (
github.com/grafana/grafana-app-sdk v0.31.0 github.com/grafana/grafana-app-sdk v0.31.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.1 go 1.24.2
replace github.com/grafana/grafana => ../../.. replace github.com/grafana/grafana => ../../..

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.1 go 1.24.2
require ( require (
github.com/grafana/grafana-app-sdk v0.35.1 github.com/grafana/grafana-app-sdk v0.35.1

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.1 go 1.24.2
require ( require (
github.com/grafana/grafana-app-sdk v0.35.1 github.com/grafana/grafana-app-sdk v0.35.1

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.1 go 1.24.2
require ( require (
github.com/grafana/grafana-app-sdk v0.35.1 github.com/grafana/grafana-app-sdk v0.35.1

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

@ -1,6 +1,6 @@
module high-card module high-card
go 1.24.1 go 1.24.2
require ( require (
github.com/prometheus/client_golang v1.20.2 github.com/prometheus/client_golang v1.20.2

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

@ -1,6 +1,6 @@
module utf8-support module utf8-support
go 1.24.1 go 1.24.2
require ( require (
github.com/prometheus/client_golang v1.20.5 github.com/prometheus/client_golang v1.20.5

2
devenv/docker/blocks/stateful_webhook/Dockerfile
View File

@ -1,4 +1,4 @@
FROM golang:1.24.1 FROM golang:1.24.2
ADD main.go /go/src/webhook/main.go ADD main.go /go/src/webhook/main.go

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana module github.com/grafana/grafana
go 1.24.1 go 1.24.2
require ( require (
buf.build/gen/go/parca-dev/parca/connectrpc/go v1.17.0-20240902100956-02fd72488966.1 // @grafana/observability-traces-and-profiling buf.build/gen/go/parca-dev/parca/connectrpc/go v1.17.0-20240902100956-02fd72488966.1 // @grafana/observability-traces-and-profiling

2
go.work
View File

@ -1,4 +1,4 @@
go 1.24.1 go 1.24.2
// 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.1 go 1.24.2
require k8s.io/code-generator v0.32.0 require k8s.io/code-generator v0.32.0

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.1 go 1.24.2
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.1 go 1.24.2
require ( require (
github.com/grafana/authlib v0.0.0-20250325095148-d6da9c164a7d // @grafana/identity-access-team github.com/grafana/authlib v0.0.0-20250325095148-d6da9c164a7d // @grafana/identity-access-team

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

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/apis/folder module github.com/grafana/grafana/pkg/apis/folder
go 1.24.1 go 1.24.2
require ( require (
github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250401081501-6af5fbf3fff0 github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250401081501-6af5fbf3fff0

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.1 go 1.24.2
require ( require (
github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250314071911-14e2784e6979 github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250314071911-14e2784e6979

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.1 go 1.24.2
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.1 go 1.24.2
// 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.1 go 1.24.2
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.1 go 1.24.2
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.1 go 1.24.2
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.1 go 1.24.2
require ( require (
github.com/grafana/dskit v0.0.0-20241105154643-a6b453a88040 github.com/grafana/dskit v0.0.0-20241105154643-a6b453a88040

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.1 go 1.24.2
require go.opentelemetry.io/otel v1.35.0 require go.opentelemetry.io/otel v1.35.0

2
pkg/storage/unified/apistore/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/storage/unified/apistore module github.com/grafana/grafana/pkg/storage/unified/apistore
go 1.24.1 go 1.24.2
replace ( replace (
github.com/grafana/grafana => ../../../.. github.com/grafana/grafana => ../../../..

2
pkg/storage/unified/resource/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/storage/unified/resource module github.com/grafana/grafana/pkg/storage/unified/resource
go 1.24.1 go 1.24.2
replace ( replace (
github.com/grafana/grafana/pkg/apimachinery => ../../../apimachinery github.com/grafana/grafana/pkg/apimachinery => ../../../apimachinery

2
pkg/util/xorm/go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana/pkg/util/xorm module github.com/grafana/grafana/pkg/util/xorm
go 1.24.1 go 1.24.2
require ( require (
cloud.google.com/go/spanner v1.75.0 cloud.google.com/go/spanner v1.75.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.1" golang_version = "1.24.2"
# 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.11.0" nodejs_version = "22.11.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.1 go 1.24.2
require golang.org/x/mod v0.20.0 require golang.org/x/mod v0.20.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.1 go 1.24.2
require golang.org/x/mod v0.10.0 require golang.org/x/mod v0.10.0