Skip to content

FEATURE BRANCH: Add v2alpha2 api version: Consolidate schema breaking changes #108172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
+7,160 −1,105
Open

FEATURE BRANCH: Add v2alpha2 api version: Consolidate schema breaking changes #108172

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
131db99
Revert "Revert: Future-proofing query and data source model in Dashbo…
dprokop Jul 16, 2025
1f5c38d
Revert "Revert "Schema V2: Simplify annotations v1<->v2 conversions" …
dprokop Jul 16, 2025
66edc91
make gen apps
dprokop Jul 16, 2025
2911267
Merge remote-tracking branch 'origin/main' into schemav2-bring-back-r…
ivanortegaalba Jul 16, 2025
ca75da2
Merge branch 'main' into schemav2-bring-back-reverts
dprokop Jul 17, 2025
57a7cb0
e2e update
dprokop Jul 17, 2025
2f0ec81
Use v2alpha2 by default (#108177)
ivanortegaalba Jul 17, 2025
4d4b053
Update imports to v2 status
ivanortegaalba Jul 17, 2025
022d439
Fix failing openapi test
dprokop Jul 17, 2025
b38d62d
Merge remote-tracking branch 'origin/main' into schemav2-bring-back-r…
dprokop Jul 17, 2025
5aa647e
Merge branch 'main' into schemav2-bring-back-reverts
dprokop Jul 18, 2025
2307a6a
Schemav2 breaking changes: conversion implementation (#108224)
dprokop Jul 18, 2025
2e9641d
Merge remote-tracking branch 'origin/main' into schemav2-bring-back-r…
dprokop Jul 22, 2025
002ef8a
Schema v2: Introduce group/datasource convention to GroupBy and AdHoc…
dprokop Jul 22, 2025
d43121f
Dashboard Schema V2: Refactor VizConfigKind to follow DataQueryKind c…
harisrozajac Jul 22, 2025
ab54567
fix k8s codegen
harisrozajac Jul 22, 2025
035cff6
Merge branch 'main' into schemav2-bring-back-reverts
harisrozajac Jul 23, 2025
a1c31c4
Update e2e-playwright/dashboards/TestV2Dashboard.json
harisrozajac Jul 24, 2025
1924c7f
Update e2e/dashboards/TestV2Dashboard.json
harisrozajac Jul 24, 2025
3bcd7c8
revert app generation for non-related apps
harisrozajac Jul 24, 2025
ac4d5da
try again
harisrozajac Jul 24, 2025
77a559c
another try
harisrozajac Jul 24, 2025
d164b93
also revert folder and secret app generation
harisrozajac Jul 24, 2025
585363b
Merge branch 'main' into schemav2-bring-back-reverts
harisrozajac Jul 24, 2025
90e72fa
v2alpha1 provisioned dashboard
dprokop Jul 25, 2025
2d941da
Fix kind
dprokop Jul 25, 2025
be8b999
Fix conversion snapshots
dprokop Jul 25, 2025
037e084
Merge branch 'main' into schemav2-bring-back-reverts
harisrozajac Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into schemav2-bring-back-r… 
…everts
  • Loading branch information
@dprokop
dprokop committed Jul 22, 2025
commit 2e9641dda84aa1043c52b88fe2d13d1de546e0f0
2 changes: 1 addition & 1 deletion apps/alerting/notifications/pkg/apis/alerting/v0alpha1/receiver_schema_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/alerting/notifications/pkg/apis/alerting/v0alpha1/templategroup_schema_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/alerting/notifications/pkg/apis/alerting/v0alpha1/timeinterval_schema_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions apps/alerting/notifications/pkg/apis/alerting_manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ import (
v0alpha1 "github.com/grafana/grafana/apps/alerting/notifications/pkg/apis/alerting/v0alpha1"
)

var ()

var appManifestData = app.ManifestData{
AppName: "alerting",
Group: "notifications.alerting.grafana.app",
Expand Down
2 changes: 0 additions & 2 deletions apps/dashboard/pkg/apis/dashboard_manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ import (
v2alpha2 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha2"
)

var ()

var appManifestData = app.ManifestData{
AppName: "dashboard",
Group: "dashboard.grafana.app",
Expand Down
2 changes: 0 additions & 2 deletions apps/folder/pkg/apis/folder_manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ import (
v1beta1 "github.com/grafana/grafana/apps/folder/pkg/apis/folder/v1beta1"
)

var ()

var appManifestData = app.ManifestData{
AppName: "folder",
Group: "folder.grafana.app",
Expand Down
2 changes: 0 additions & 2 deletions apps/secret/pkg/apis/secret_manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ import (
v1beta1 "github.com/grafana/grafana/apps/secret/pkg/apis/secret/v1beta1"
)

var ()

var appManifestData = app.ManifestData{
AppName: "secret",
Group: "secret.grafana.app",
Expand Down
6 changes: 6 additions & 0 deletions go.work.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,9 @@ github.com/envoyproxy/go-control-plane v0.13.1/go.mod h1:X45hY0mufo6Fd0KW3rqsGvQ
github.com/envoyproxy/go-control-plane/envoy v1.32.3/go.mod h1:F6hWupPfh75TBXGKA++MCT/CZHFq5r9/uwt/kQYkZfE=
github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4=
github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
github.com/expr-lang/expr v1.16.9/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
github.com/expr-lang/expr v1.17.0/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
Expand Down Expand Up @@ -927,6 +930,9 @@ github.com/grafana/alerting v0.0.0-20250403153742-418bc7118d05 h1:hMzOzI/S0nkZt0
github.com/grafana/alerting v0.0.0-20250403153742-418bc7118d05/go.mod h1:K3YAJumchx5EEZItGv4D3pCv/Ux796hmoOibP/p/eYk=
github.com/grafana/alerting v0.0.0-20250429131604-de176b4a0309 h1:H2p3XKDHnTBGkMXLCgXiqb2dFnHbQ4zPDXOwKK4Ne3Y=
github.com/grafana/alerting v0.0.0-20250429131604-de176b4a0309/go.mod h1:pMfhRxL2LZ3Pm8iy7VcVsb9CLYuBtjFYbf1oxgx7yFA=
github.com/grafana/alerting v0.0.0-20250701210250-cea2d1683945 h1:3imTbxFpZSVI6IBIB9mn+Xc40lUweWjfMaBSgXR7rLs=
github.com/grafana/alerting v0.0.0-20250701210250-cea2d1683945/go.mod h1:gtR7agmxVfJOmNKV/n2ZULgOYTYNL+PDKYB5N48tQ7Q=
github.com/grafana/alerting v0.0.0-20250709204613-c5c6f9c1653d/go.mod h1:gtR7agmxVfJOmNKV/n2ZULgOYTYNL+PDKYB5N48tQ7Q=
github.com/grafana/authlib v0.0.0-20250123104008-e99947858901/go.mod h1:/gYfphsNu9v1qYWXxpv1NSvMEMSwvdf8qb8YlgwIRl8=
github.com/grafana/authlib/types v0.0.0-20250120144156-d6737a7dc8f5/go.mod h1:qYjSd1tmJiuVoSICp7Py9/zD54O9uQQA3wuM6Gg4DFM=
github.com/grafana/authlib/types v0.0.0-20250120145936-5f0e28e7a87c/go.mod h1:qYjSd1tmJiuVoSICp7Py9/zD54O9uQQA3wuM6Gg4DFM=
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.