ci: move variables to env (#104605 )

* ci: move variables to `env` * ci: move sha to `env` * ci: import `SHA` and `PRE_COMMIT_SHA` (cherry picked from commit d19f86a736)
[release-12.0.1] App Plugins: Fix dashboard updater (#104583 ) (#104585 )
2025-04-28 12:46:25 +01:00 · 2025-04-26 01:22:28 +02:00 · 2025-04-25 20:36:30 +02:00 · 2025-04-25 11:18:17 -05:00 · 2025-04-25 17:02:35 +01:00 · 2025-04-25 16:51:48 +01:00
217 changed files with 4537 additions and 1268 deletions
@@ -2801,8 +2801,7 @@ exports[`better eslint`] = {
      [0, 0, 0, "Do not use any type assertions.", "0"]
    ],
    "public/app/features/transformers/editors/CalculateFieldTransformerEditor/ReduceRowOptionsEditor.tsx:5381": [
-      [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
+      [0, 0, 0, "Do not use any type assertions.", "0"]
    ],
    "public/app/features/transformers/editors/CalculateFieldTransformerEditor/WindowOptionsEditor.tsx:5381": [
      [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -0,0 +1,58 @@
+# Owned by grafana-delivery-squad
+# Intended to be dropped into the base repo Ex: grafana/grafana
+name: Dispatch check for patch conflicts
+run-name: dispatch-check-patch-conflicts-${{ github.base_ref }}-${{ github.head_ref }}
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+    branches:
+      - "main"
+      - "v*.*.*"
+      - "release-*"
+
+# Since this is run on a pull request, we want to apply the patches intended for the
+# target branch onto the source branch, to verify compatibility before merging.
+jobs:
+  dispatch-job:
+    env:
+      HEAD_REF: ${{ github.head_ref }}
+      BASE_REF: ${{ github.base_ref }}
+      REPO: ${{ github.repository }}
+      SENDER: ${{ github.event.sender.login }}
+      SHA: ${{ github.sha }}
+      PR_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Generate token"
+        id: generate_token
+        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
+        with:
+          # App needs Actions: Read/Write for the grafana/security-patch-actions repo
+          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
+          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
+
+      - name: "Dispatch job"
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ steps.generate_token.outputs.token }}
+          script: |
+            const {HEAD_REF, BASE_REF, REPO, SENDER, SHA, PR_COMMIT_SHA} = process.env;
+
+            await github.rest.actions.createWorkflowDispatch({
+                owner: 'grafana',
+                repo: 'security-patch-actions',
+                workflow_id: 'test-patches-event.yml',
+                ref: 'main',
+                inputs: {
+                  src_repo: REPO,
+                  src_ref: HEAD_REF,
+                  src_merge_sha: SHA,
+                  src_pr_commit_sha: PR_COMMIT_SHA,
+                  patch_repo: REPO + '-security-patches',
+                  patch_ref: BASE_REF,
+                  triggering_github_handle: SENDER
+                }
+            })
@@ -1,27 +0,0 @@
-# Owned by grafana-release-guild
-# Intended to be dropped into the base repo Ex: grafana/grafana
-name: Check for patch conflicts
-run-name: check-patch-conflicts-${{ github.base_ref }}-${{ github.head_ref }}
-on:
-  pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-    branches:
-      - "main"
-      - "v*.*.*"
-      - "release-*"
-
-# Since this is run on a pull request, we want to apply the patches intended for the
-# target branch onto the source branch, to verify compatibility before merging.
-jobs:
-  trigger_downstream_patch_check:
-    uses: grafana/security-patch-actions/.github/workflows/test-patches.yml@main
-    if: github.repository == 'grafana/grafana'
-    with:
-      src_repo: "${{ github.repository }}"
-      src_ref: "${{ github.head_ref }}" # this is the source branch name, Ex: "feature/newthing"
-      patch_repo: "${{ github.repository }}-security-patches"
-      patch_ref: "${{ github.base_ref }}" # this is the target branch name, Ex: "main"
-    secrets: inherit
@@ -0,0 +1,43 @@
+# Owned by grafana-delivery-squad
+# Intended to be dropped into the base repo, Ex: grafana/grafana
+name: Dispatch sync to mirror
+run-name: dispatch-sync-to-mirror-${{ github.ref_name }}
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "main"
+      - "v*.*.*"
+      - "release-*"
+
+# This is run after the pull request has been merged, so we'll run against the target branch
+jobs:
+  dispatch-job:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Generate token"
+        id: generate_token
+        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
+        with:
+          # App needs Actions: Read/Write for the grafana/security-patch-actions repo
+          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
+          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
+
+      - uses: actions/github-script@v7
+        if: github.repository == 'grafana/grafana'
+        with:
+          github-token: ${{ steps.generate_token.outputs.token }}
+          script: |
+            await github.rest.actions.createWorkflowDispatch({
+                owner: 'grafana',
+                repo: 'security-patch-actions',
+                workflow_id: 'mirror-branch-and-apply-patches-event.yml',
+                ref: 'main',
+                inputs: {
+                  src_ref: "${{ github.ref_name }}",
+                  src_repo: "${{ github.repository }}",
+                  src_sha: "${{ github.sha }}",
+                  dest_repo: "${{ github.repository }}-security-mirror",
+                  patch_repo: "${{ github.repository }}-security-patches"
+                }
+            })
@@ -1,25 +0,0 @@
-# Owned by grafana-release-guild
-# Intended to be dropped into the base repo, Ex: grafana/grafana
-name: Sync to mirror
-run-name: sync-to-mirror-${{ github.ref_name }}
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "main"
-      - "v*.*.*"
-      - "release-*"
-
-# This is run after the pull request has been merged, so we'll run against the target branch
-jobs:
-  trigger_downstream_patch_mirror:
-    concurrency: patch-mirror-${{ github.ref_name }}
-    uses: grafana/security-patch-actions/.github/workflows/mirror-branch-and-apply-patches.yml@main
-    if: github.repository == 'grafana/grafana'
-    with:
-      ref: "${{ github.ref_name }}" # this is the target branch name, Ex: "main"
-      src_repo: "${{ github.repository }}"
-      dest_repo: "${{ github.repository }}-security-mirror"
-      patch_repo: "${{ github.repository }}-security-patches"
-    secrets: inherit
-
@@ -148,12 +148,12 @@ gen-cue: ## Do all CUE/Thema code generation
 	@echo "generate code from .cue files"
 	go generate ./kinds/gen.go
 	go generate ./public/app/plugins/gen.go
-	@echo "// This file is managed by Grafana - DO NOT EDIT MANUALLY" > apps/dashboard/pkg/apis/dashboard/v1alpha1/dashboard_kind.cue
-	@echo "// Source: kinds/dashboard/dashboard_kind.cue" >> apps/dashboard/pkg/apis/dashboard/v1alpha1/dashboard_kind.cue
-	@echo "// To sync changes, run: make gen-cue" >> apps/dashboard/pkg/apis/dashboard/v1alpha1/dashboard_kind.cue
-	@echo "" >> apps/dashboard/pkg/apis/dashboard/v1alpha1/dashboard_kind.cue
-	@cat kinds/dashboard/dashboard_kind.cue >> apps/dashboard/pkg/apis/dashboard/v1alpha1/dashboard_kind.cue
-	@cp apps/dashboard/pkg/apis/dashboard/v1alpha1/dashboard_kind.cue apps/dashboard/pkg/apis/dashboard/v0alpha1/dashboard_kind.cue
+	@echo "// This file is managed by Grafana - DO NOT EDIT MANUALLY" > apps/dashboard/pkg/apis/dashboard/v1beta1/dashboard_kind.cue
+	@echo "// Source: kinds/dashboard/dashboard_kind.cue" >> apps/dashboard/pkg/apis/dashboard/v1beta1/dashboard_kind.cue
+	@echo "// To sync changes, run: make gen-cue" >> apps/dashboard/pkg/apis/dashboard/v1beta1/dashboard_kind.cue
+	@echo "" >> apps/dashboard/pkg/apis/dashboard/v1beta1/dashboard_kind.cue
+	@cat kinds/dashboard/dashboard_kind.cue >> apps/dashboard/pkg/apis/dashboard/v1beta1/dashboard_kind.cue
+	@cp apps/dashboard/pkg/apis/dashboard/v1beta1/dashboard_kind.cue apps/dashboard/pkg/apis/dashboard/v0alpha1/dashboard_kind.cue


 .PHONY: gen-cuev2
@@ -39,8 +39,8 @@ post-generate-cleanup: ## Clean up the generated code
 	@cp ./tshack/v0alpha1_spec_gen.ts ../../packages/grafana-schema/src/schema/dashboard/v0alpha1/types.spec.gen.ts

 	# Same for v1alpha1
-	@rm ../../packages/grafana-schema/src/schema/dashboard/v1alpha1/types.spec.gen.ts
-	@cp ./tshack/v1alpha1_spec_gen.ts ../../packages/grafana-schema/src/schema/dashboard/v1alpha1/types.spec.gen.ts
+	@rm ../../packages/grafana-schema/src/schema/dashboard/v1beta1/types.spec.gen.ts
+	@cp ./tshack/v1alpha1_spec_gen.ts ../../packages/grafana-schema/src/schema/dashboard/v1beta1/types.spec.gen.ts

 	# Remove auto-generated DeepCopy and DeepCopyInto methods for Spec for v0alpha1.
 	@sed -e '/\/\/ DeepCopy creates a full deep copy of Spec/,+5d' ./pkg/apis/dashboard/v0alpha1/dashboard_object_gen.go > ./pkg/apis/dashboard/v0alpha1/dashboard_object_gen.go.tmp
@@ -49,10 +49,10 @@ post-generate-cleanup: ## Clean up the generated code
 	@mv ./pkg/apis/dashboard/v0alpha1/dashboard_object_gen.go.tmp2 ./pkg/apis/dashboard/v0alpha1/dashboard_object_gen.go

 	# Remove auto-generated DeepCopy and DeepCopyInto methods for Spec for v1alpha1.
-	@sed -e '/\/\/ DeepCopy creates a full deep copy of Spec/,+5d' ./pkg/apis/dashboard/v1alpha1/dashboard_object_gen.go > ./pkg/apis/dashboard/v1alpha1/dashboard_object_gen.go.tmp
-	@sed -e '/\/\/ DeepCopyInto deep copies Spec into another Spec object/,+3d' ./pkg/apis/dashboard/v1alpha1/dashboard_object_gen.go.tmp > ./pkg/apis/dashboard/v1alpha1/dashboard_object_gen.go.tmp2
-	@rm ./pkg/apis/dashboard/v1alpha1/dashboard_object_gen.go.tmp
-	@mv ./pkg/apis/dashboard/v1alpha1/dashboard_object_gen.go.tmp2 ./pkg/apis/dashboard/v1alpha1/dashboard_object_gen.go
+	@sed -e '/\/\/ DeepCopy creates a full deep copy of Spec/,+5d' ./pkg/apis/dashboard/v1beta1/dashboard_object_gen.go > ./pkg/apis/dashboard/v1beta1/dashboard_object_gen.go.tmp
+	@sed -e '/\/\/ DeepCopyInto deep copies Spec into another Spec object/,+3d' ./pkg/apis/dashboard/v1beta1/dashboard_object_gen.go.tmp > ./pkg/apis/dashboard/v1beta1/dashboard_object_gen.go.tmp2
+	@rm ./pkg/apis/dashboard/v1beta1/dashboard_object_gen.go.tmp
+	@mv ./pkg/apis/dashboard/v1beta1/dashboard_object_gen.go.tmp2 ./pkg/apis/dashboard/v1beta1/dashboard_object_gen.go

 	# Copy dashboard/v2alpha1 spec so we can use it for schema validation
 	@echo "// This file is managed by grafana-app-sdk - DO NOT EDIT MANUALLY" > ./pkg/apis/dashboard/v2alpha1/dashboard_spec.cue
@@ -2,7 +2,7 @@ package kinds

 import (
 	v0 "github.com/grafana/grafana/sdkkinds/dashboard/v0alpha1"
-	v1 "github.com/grafana/grafana/sdkkinds/dashboard/v1alpha1"
+	v1 "github.com/grafana/grafana/sdkkinds/dashboard/v1beta1"
 	v2 "github.com/grafana/grafana/sdkkinds/dashboard/v2alpha1"
 )

@@ -31,7 +31,7 @@ ConversionStatus: {
 dashboard: {
 	kind:       "Dashboard"
 	pluralName: "Dashboards"
-	current:    "v0alpha1"
+	current:    "v1beta1"

 	codegen: {
 		ts: {
@@ -55,7 +55,7 @@ dashboard: {
 				status: DashboardStatus
 			}
 		}
-		"v1alpha1": {
+		"v1beta1": {
 			schema: {
 				spec:   v1.DashboardSpec
 				status: DashboardStatus
@@ -1,4 +1,4 @@
-package v1alpha1
+package v1beta1

 // TODO: this outputs nothing.
 // For now, we use unstructured for the spec,
@@ -78,7 +78,7 @@ AnnotationPanelFilter: {
 	exclude?: bool | *false

 	// Panel IDs that should be included or excluded
-	ids: [...uint8]
+	ids: [...uint32]
 }

 // "Off" for no shared crosshair or tooltip (default).
@@ -1,175 +0,0 @@
-//go:build !ignore_autogenerated
-// +build !ignore_autogenerated
-
-// SPDX-License-Identifier: AGPL-3.0-only
-
-// Code generated by conversion-gen. DO NOT EDIT.
-
-package v1alpha1
-
-import (
-	url "net/url"
-	unsafe "unsafe"
-
-	dashboard "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard"
-	conversion "k8s.io/apimachinery/pkg/conversion"
-	runtime "k8s.io/apimachinery/pkg/runtime"
-)
-
-func init() {
-	localSchemeBuilder.Register(RegisterConversions)
-}
-
-// RegisterConversions adds conversion functions to the given scheme.
-// Public to allow building arbitrary schemes.
-func RegisterConversions(s *runtime.Scheme) error {
-	if err := s.AddGeneratedConversionFunc((*AnnotationActions)(nil), (*dashboard.AnnotationActions)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1alpha1_AnnotationActions_To_dashboard_AnnotationActions(a.(*AnnotationActions), b.(*dashboard.AnnotationActions), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*dashboard.AnnotationActions)(nil), (*AnnotationActions)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_dashboard_AnnotationActions_To_v1alpha1_AnnotationActions(a.(*dashboard.AnnotationActions), b.(*AnnotationActions), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*AnnotationPermission)(nil), (*dashboard.AnnotationPermission)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1alpha1_AnnotationPermission_To_dashboard_AnnotationPermission(a.(*AnnotationPermission), b.(*dashboard.AnnotationPermission), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*dashboard.AnnotationPermission)(nil), (*AnnotationPermission)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_dashboard_AnnotationPermission_To_v1alpha1_AnnotationPermission(a.(*dashboard.AnnotationPermission), b.(*AnnotationPermission), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*DashboardAccess)(nil), (*dashboard.DashboardAccess)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1alpha1_DashboardAccess_To_dashboard_DashboardAccess(a.(*DashboardAccess), b.(*dashboard.DashboardAccess), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*dashboard.DashboardAccess)(nil), (*DashboardAccess)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_dashboard_DashboardAccess_To_v1alpha1_DashboardAccess(a.(*dashboard.DashboardAccess), b.(*DashboardAccess), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*url.Values)(nil), (*VersionsQueryOptions)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_url_Values_To_v1alpha1_VersionsQueryOptions(a.(*url.Values), b.(*VersionsQueryOptions), scope)
-	}); err != nil {
-		return err
-	}
-	return nil
-}
-
-func autoConvert_v1alpha1_AnnotationActions_To_dashboard_AnnotationActions(in *AnnotationActions, out *dashboard.AnnotationActions, s conversion.Scope) error {
-	out.CanAdd = in.CanAdd
-	out.CanEdit = in.CanEdit
-	out.CanDelete = in.CanDelete
-	return nil
-}
-
-// Convert_v1alpha1_AnnotationActions_To_dashboard_AnnotationActions is an autogenerated conversion function.
-func Convert_v1alpha1_AnnotationActions_To_dashboard_AnnotationActions(in *AnnotationActions, out *dashboard.AnnotationActions, s conversion.Scope) error {
-	return autoConvert_v1alpha1_AnnotationActions_To_dashboard_AnnotationActions(in, out, s)
-}
-
-func autoConvert_dashboard_AnnotationActions_To_v1alpha1_AnnotationActions(in *dashboard.AnnotationActions, out *AnnotationActions, s conversion.Scope) error {
-	out.CanAdd = in.CanAdd
-	out.CanEdit = in.CanEdit
-	out.CanDelete = in.CanDelete
-	return nil
-}
-
-// Convert_dashboard_AnnotationActions_To_v1alpha1_AnnotationActions is an autogenerated conversion function.
-func Convert_dashboard_AnnotationActions_To_v1alpha1_AnnotationActions(in *dashboard.AnnotationActions, out *AnnotationActions, s conversion.Scope) error {
-	return autoConvert_dashboard_AnnotationActions_To_v1alpha1_AnnotationActions(in, out, s)
-}
-
-func autoConvert_v1alpha1_AnnotationPermission_To_dashboard_AnnotationPermission(in *AnnotationPermission, out *dashboard.AnnotationPermission, s conversion.Scope) error {
-	if err := Convert_v1alpha1_AnnotationActions_To_dashboard_AnnotationActions(&in.Dashboard, &out.Dashboard, s); err != nil {
-		return err
-	}
-	if err := Convert_v1alpha1_AnnotationActions_To_dashboard_AnnotationActions(&in.Organization, &out.Organization, s); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Convert_v1alpha1_AnnotationPermission_To_dashboard_AnnotationPermission is an autogenerated conversion function.
-func Convert_v1alpha1_AnnotationPermission_To_dashboard_AnnotationPermission(in *AnnotationPermission, out *dashboard.AnnotationPermission, s conversion.Scope) error {
-	return autoConvert_v1alpha1_AnnotationPermission_To_dashboard_AnnotationPermission(in, out, s)
-}
-
-func autoConvert_dashboard_AnnotationPermission_To_v1alpha1_AnnotationPermission(in *dashboard.AnnotationPermission, out *AnnotationPermission, s conversion.Scope) error {
-	if err := Convert_dashboard_AnnotationActions_To_v1alpha1_AnnotationActions(&in.Dashboard, &out.Dashboard, s); err != nil {
-		return err
-	}
-	if err := Convert_dashboard_AnnotationActions_To_v1alpha1_AnnotationActions(&in.Organization, &out.Organization, s); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Convert_dashboard_AnnotationPermission_To_v1alpha1_AnnotationPermission is an autogenerated conversion function.
-func Convert_dashboard_AnnotationPermission_To_v1alpha1_AnnotationPermission(in *dashboard.AnnotationPermission, out *AnnotationPermission, s conversion.Scope) error {
-	return autoConvert_dashboard_AnnotationPermission_To_v1alpha1_AnnotationPermission(in, out, s)
-}
-
-func autoConvert_v1alpha1_DashboardAccess_To_dashboard_DashboardAccess(in *DashboardAccess, out *dashboard.DashboardAccess, s conversion.Scope) error {
-	out.Slug = in.Slug
-	out.Url = in.Url
-	out.CanSave = in.CanSave
-	out.CanEdit = in.CanEdit
-	out.CanAdmin = in.CanAdmin
-	out.CanStar = in.CanStar
-	out.CanDelete = in.CanDelete
-	out.AnnotationsPermissions = (*dashboard.AnnotationPermission)(unsafe.Pointer(in.AnnotationsPermissions))
-	return nil
-}
-
-// Convert_v1alpha1_DashboardAccess_To_dashboard_DashboardAccess is an autogenerated conversion function.
-func Convert_v1alpha1_DashboardAccess_To_dashboard_DashboardAccess(in *DashboardAccess, out *dashboard.DashboardAccess, s conversion.Scope) error {
-	return autoConvert_v1alpha1_DashboardAccess_To_dashboard_DashboardAccess(in, out, s)
-}
-
-func autoConvert_dashboard_DashboardAccess_To_v1alpha1_DashboardAccess(in *dashboard.DashboardAccess, out *DashboardAccess, s conversion.Scope) error {
-	out.Slug = in.Slug
-	out.Url = in.Url
-	out.CanSave = in.CanSave
-	out.CanEdit = in.CanEdit
-	out.CanAdmin = in.CanAdmin
-	out.CanStar = in.CanStar
-	out.CanDelete = in.CanDelete
-	out.AnnotationsPermissions = (*AnnotationPermission)(unsafe.Pointer(in.AnnotationsPermissions))
-	return nil
-}
-
-// Convert_dashboard_DashboardAccess_To_v1alpha1_DashboardAccess is an autogenerated conversion function.
-func Convert_dashboard_DashboardAccess_To_v1alpha1_DashboardAccess(in *dashboard.DashboardAccess, out *DashboardAccess, s conversion.Scope) error {
-	return autoConvert_dashboard_DashboardAccess_To_v1alpha1_DashboardAccess(in, out, s)
-}
-
-func autoConvert_url_Values_To_v1alpha1_VersionsQueryOptions(in *url.Values, out *VersionsQueryOptions, s conversion.Scope) error {
-	// WARNING: Field TypeMeta does not have json tag, skipping.
-
-	if values, ok := map[string][]string(*in)["path"]; ok && len(values) > 0 {
-		if err := runtime.Convert_Slice_string_To_string(&values, &out.Path, s); err != nil {
-			return err
-		}
-	} else {
-		out.Path = ""
-	}
-	if values, ok := map[string][]string(*in)["version"]; ok && len(values) > 0 {
-		if err := runtime.Convert_Slice_string_To_int64(&values, &out.Version, s); err != nil {
-			return err
-		}
-	} else {
-		out.Version = 0
-	}
-	return nil
-}
-
-// Convert_url_Values_To_v1alpha1_VersionsQueryOptions is an autogenerated conversion function.
-func Convert_url_Values_To_v1alpha1_VersionsQueryOptions(in *url.Values, out *VersionsQueryOptions, s conversion.Scope) error {
-	return autoConvert_url_Values_To_v1alpha1_VersionsQueryOptions(in, out, s)
-}
@@ -1,4 +1,4 @@
-package v1alpha1
+package v1beta1

 import "k8s.io/apimachinery/pkg/runtime/schema"

@@ -6,7 +6,7 @@ const (
 	// Group is the API group used by all kinds in this package
 	Group = "dashboard.grafana.app"
 	// Version is the API version used by all kinds in this package
-	Version = "v1alpha1"
+	Version = "v1beta1"
 )

 var (
@@ -2,7 +2,7 @@
 // Code generated by grafana-app-sdk. DO NOT EDIT.
 //

-package v1alpha1
+package v1beta1

 import (
 	"encoding/json"
@@ -1,6 +1,6 @@
 // Code generated - EDITING IS FUTILE. DO NOT EDIT.

-package v1alpha1
+package v1beta1

 import (
 	time "time"
@@ -2,7 +2,7 @@
 // Code generated by grafana-app-sdk. DO NOT EDIT.
 //

-package v1alpha1
+package v1beta1

 import (
 	"fmt"
@@ -2,7 +2,7 @@
 // Code generated by grafana-app-sdk. DO NOT EDIT.
 //

-package v1alpha1
+package v1beta1

 import (
 	"github.com/grafana/grafana-app-sdk/resource"
@@ -10,7 +10,7 @@ import (

 // schema is unexported to prevent accidental overwrites
 var (
-	schemaDashboard = resource.NewSimpleSchema("dashboard.grafana.app", "v1alpha1", &Dashboard{}, &DashboardList{}, resource.WithKind("Dashboard"),
+	schemaDashboard = resource.NewSimpleSchema("dashboard.grafana.app", "v1beta1", &Dashboard{}, &DashboardList{}, resource.WithKind("Dashboard"),
 		resource.WithPlural("dashboards"), resource.WithScope(resource.NamespacedScope))
 	kindDashboard = resource.Kind{
 		Schema: schemaDashboard,
@@ -1,4 +1,4 @@
-package v1alpha1
+package v1beta1

 import common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"

@@ -1,3 +1,3 @@
 // Code generated - EDITING IS FUTILE. DO NOT EDIT.

-package v1alpha1
+package v1beta1
@@ -1,6 +1,6 @@
 // Code generated - EDITING IS FUTILE. DO NOT EDIT.

-package v1alpha1
+package v1beta1

 // ConversionStatus is the status of the conversion of the dashboard.
 // +k8s:openapi-gen=true
@@ -7,4 +7,4 @@
 // because grafana-app-sdk already provides deepcopy functions.
 // Kinds which are not generated by the SDK are explicitly opted in to deepcopy generation.

-package v1alpha1 // import "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1"
+package v1beta1 // import "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"
@@ -1,4 +1,4 @@
-package v1alpha1
+package v1beta1

 import (
 	"fmt"
@@ -13,7 +13,7 @@ import (

 const (
 	GROUP      = "dashboard.grafana.app"
-	VERSION    = "v1alpha1"
+	VERSION    = "v1beta1"
 	APIVERSION = GROUP + "/" + VERSION

 	// Resource constants
@@ -1,4 +1,4 @@
-package v1alpha1
+package v1beta1

 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -1,4 +1,4 @@
-package v1alpha1
+package v1beta1

 import (
 	_ "embed"
@@ -13,6 +13,7 @@ import (
 	"cuelang.org/go/cue/cuecontext"
 	"cuelang.org/go/cue/errors"
 	cuejson "cuelang.org/go/encoding/json"
+
 	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
 )

@@ -0,0 +1,175 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by conversion-gen. DO NOT EDIT.
+
+package v1beta1
+
+import (
+	url "net/url"
+	unsafe "unsafe"
+
+	dashboard "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard"
+	conversion "k8s.io/apimachinery/pkg/conversion"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+func init() {
+	localSchemeBuilder.Register(RegisterConversions)
+}
+
+// RegisterConversions adds conversion functions to the given scheme.
+// Public to allow building arbitrary schemes.
+func RegisterConversions(s *runtime.Scheme) error {
+	if err := s.AddGeneratedConversionFunc((*AnnotationActions)(nil), (*dashboard.AnnotationActions)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_v1beta1_AnnotationActions_To_dashboard_AnnotationActions(a.(*AnnotationActions), b.(*dashboard.AnnotationActions), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*dashboard.AnnotationActions)(nil), (*AnnotationActions)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_dashboard_AnnotationActions_To_v1beta1_AnnotationActions(a.(*dashboard.AnnotationActions), b.(*AnnotationActions), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*AnnotationPermission)(nil), (*dashboard.AnnotationPermission)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_v1beta1_AnnotationPermission_To_dashboard_AnnotationPermission(a.(*AnnotationPermission), b.(*dashboard.AnnotationPermission), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*dashboard.AnnotationPermission)(nil), (*AnnotationPermission)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_dashboard_AnnotationPermission_To_v1beta1_AnnotationPermission(a.(*dashboard.AnnotationPermission), b.(*AnnotationPermission), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*DashboardAccess)(nil), (*dashboard.DashboardAccess)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_v1beta1_DashboardAccess_To_dashboard_DashboardAccess(a.(*DashboardAccess), b.(*dashboard.DashboardAccess), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*dashboard.DashboardAccess)(nil), (*DashboardAccess)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_dashboard_DashboardAccess_To_v1beta1_DashboardAccess(a.(*dashboard.DashboardAccess), b.(*DashboardAccess), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*url.Values)(nil), (*VersionsQueryOptions)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_url_Values_To_v1beta1_VersionsQueryOptions(a.(*url.Values), b.(*VersionsQueryOptions), scope)
+	}); err != nil {
+		return err
+	}
+	return nil
+}
+
+func autoConvert_v1beta1_AnnotationActions_To_dashboard_AnnotationActions(in *AnnotationActions, out *dashboard.AnnotationActions, s conversion.Scope) error {
+	out.CanAdd = in.CanAdd
+	out.CanEdit = in.CanEdit
+	out.CanDelete = in.CanDelete
+	return nil
+}
+
+// Convert_v1beta1_AnnotationActions_To_dashboard_AnnotationActions is an autogenerated conversion function.
+func Convert_v1beta1_AnnotationActions_To_dashboard_AnnotationActions(in *AnnotationActions, out *dashboard.AnnotationActions, s conversion.Scope) error {
+	return autoConvert_v1beta1_AnnotationActions_To_dashboard_AnnotationActions(in, out, s)
+}
+
+func autoConvert_dashboard_AnnotationActions_To_v1beta1_AnnotationActions(in *dashboard.AnnotationActions, out *AnnotationActions, s conversion.Scope) error {
+	out.CanAdd = in.CanAdd
+	out.CanEdit = in.CanEdit
+	out.CanDelete = in.CanDelete
+	return nil
+}
+
+// Convert_dashboard_AnnotationActions_To_v1beta1_AnnotationActions is an autogenerated conversion function.
+func Convert_dashboard_AnnotationActions_To_v1beta1_AnnotationActions(in *dashboard.AnnotationActions, out *AnnotationActions, s conversion.Scope) error {
+	return autoConvert_dashboard_AnnotationActions_To_v1beta1_AnnotationActions(in, out, s)
+}
+
+func autoConvert_v1beta1_AnnotationPermission_To_dashboard_AnnotationPermission(in *AnnotationPermission, out *dashboard.AnnotationPermission, s conversion.Scope) error {
+	if err := Convert_v1beta1_AnnotationActions_To_dashboard_AnnotationActions(&in.Dashboard, &out.Dashboard, s); err != nil {
+		return err
+	}
+	if err := Convert_v1beta1_AnnotationActions_To_dashboard_AnnotationActions(&in.Organization, &out.Organization, s); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Convert_v1beta1_AnnotationPermission_To_dashboard_AnnotationPermission is an autogenerated conversion function.
+func Convert_v1beta1_AnnotationPermission_To_dashboard_AnnotationPermission(in *AnnotationPermission, out *dashboard.AnnotationPermission, s conversion.Scope) error {
+	return autoConvert_v1beta1_AnnotationPermission_To_dashboard_AnnotationPermission(in, out, s)
+}
+
+func autoConvert_dashboard_AnnotationPermission_To_v1beta1_AnnotationPermission(in *dashboard.AnnotationPermission, out *AnnotationPermission, s conversion.Scope) error {
+	if err := Convert_dashboard_AnnotationActions_To_v1beta1_AnnotationActions(&in.Dashboard, &out.Dashboard, s); err != nil {
+		return err
+	}
+	if err := Convert_dashboard_AnnotationActions_To_v1beta1_AnnotationActions(&in.Organization, &out.Organization, s); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Convert_dashboard_AnnotationPermission_To_v1beta1_AnnotationPermission is an autogenerated conversion function.
+func Convert_dashboard_AnnotationPermission_To_v1beta1_AnnotationPermission(in *dashboard.AnnotationPermission, out *AnnotationPermission, s conversion.Scope) error {
+	return autoConvert_dashboard_AnnotationPermission_To_v1beta1_AnnotationPermission(in, out, s)
+}
+
+func autoConvert_v1beta1_DashboardAccess_To_dashboard_DashboardAccess(in *DashboardAccess, out *dashboard.DashboardAccess, s conversion.Scope) error {
+	out.Slug = in.Slug
+	out.Url = in.Url
+	out.CanSave = in.CanSave
+	out.CanEdit = in.CanEdit
+	out.CanAdmin = in.CanAdmin
+	out.CanStar = in.CanStar
+	out.CanDelete = in.CanDelete
+	out.AnnotationsPermissions = (*dashboard.AnnotationPermission)(unsafe.Pointer(in.AnnotationsPermissions))
+	return nil
+}
+
+// Convert_v1beta1_DashboardAccess_To_dashboard_DashboardAccess is an autogenerated conversion function.
+func Convert_v1beta1_DashboardAccess_To_dashboard_DashboardAccess(in *DashboardAccess, out *dashboard.DashboardAccess, s conversion.Scope) error {
+	return autoConvert_v1beta1_DashboardAccess_To_dashboard_DashboardAccess(in, out, s)
+}
+
+func autoConvert_dashboard_DashboardAccess_To_v1beta1_DashboardAccess(in *dashboard.DashboardAccess, out *DashboardAccess, s conversion.Scope) error {
+	out.Slug = in.Slug
+	out.Url = in.Url
+	out.CanSave = in.CanSave
+	out.CanEdit = in.CanEdit
+	out.CanAdmin = in.CanAdmin
+	out.CanStar = in.CanStar
+	out.CanDelete = in.CanDelete
+	out.AnnotationsPermissions = (*AnnotationPermission)(unsafe.Pointer(in.AnnotationsPermissions))
+	return nil
+}
+
+// Convert_dashboard_DashboardAccess_To_v1beta1_DashboardAccess is an autogenerated conversion function.
+func Convert_dashboard_DashboardAccess_To_v1beta1_DashboardAccess(in *dashboard.DashboardAccess, out *DashboardAccess, s conversion.Scope) error {
+	return autoConvert_dashboard_DashboardAccess_To_v1beta1_DashboardAccess(in, out, s)
+}
+
+func autoConvert_url_Values_To_v1beta1_VersionsQueryOptions(in *url.Values, out *VersionsQueryOptions, s conversion.Scope) error {
+	// WARNING: Field TypeMeta does not have json tag, skipping.
+
+	if values, ok := map[string][]string(*in)["path"]; ok && len(values) > 0 {
+		if err := runtime.Convert_Slice_string_To_string(&values, &out.Path, s); err != nil {
+			return err
+		}
+	} else {
+		out.Path = ""
+	}
+	if values, ok := map[string][]string(*in)["version"]; ok && len(values) > 0 {
+		if err := runtime.Convert_Slice_string_To_int64(&values, &out.Version, s); err != nil {
+			return err
+		}
+	} else {
+		out.Version = 0
+	}
+	return nil
+}
+
+// Convert_url_Values_To_v1beta1_VersionsQueryOptions is an autogenerated conversion function.
+func Convert_url_Values_To_v1beta1_VersionsQueryOptions(in *url.Values, out *VersionsQueryOptions, s conversion.Scope) error {
+	return autoConvert_url_Values_To_v1beta1_VersionsQueryOptions(in, out, s)
+}
@@ -5,7 +5,7 @@

 // Code generated by deepcopy-gen. DO NOT EDIT.

-package v1alpha1
+package v1beta1

 import (
 	v0alpha1 "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
@@ -5,7 +5,7 @@

 // Code generated by defaulter-gen. DO NOT EDIT.

-package v1alpha1
+package v1beta1

 import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -5,7 +5,7 @@

 // Code generated by openapi-gen. DO NOT EDIT.

-package v1alpha1
+package v1beta1

 import (
 	v0alpha1 "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
@@ -15,28 +15,28 @@ import (

 func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
 	return map[string]common.OpenAPIDefinition{
-		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.AnnotationActions":         schema_pkg_apis_dashboard_v1alpha1_AnnotationActions(ref),
-		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.AnnotationPermission":      schema_pkg_apis_dashboard_v1alpha1_AnnotationPermission(ref),
-		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.Dashboard":                 schema_pkg_apis_dashboard_v1alpha1_Dashboard(ref),
-		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardAccess":           schema_pkg_apis_dashboard_v1alpha1_DashboardAccess(ref),
-		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardConversionStatus": schema_pkg_apis_dashboard_v1alpha1_DashboardConversionStatus(ref),
-		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardJSONCodec":        schema_pkg_apis_dashboard_v1alpha1_DashboardJSONCodec(ref),
-		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardList":             schema_pkg_apis_dashboard_v1alpha1_DashboardList(ref),
-		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardMetadata":         schema_pkg_apis_dashboard_v1alpha1_DashboardMetadata(ref),
-		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardStatus":           schema_pkg_apis_dashboard_v1alpha1_DashboardStatus(ref),
-		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardVersionInfo":      schema_pkg_apis_dashboard_v1alpha1_DashboardVersionInfo(ref),
-		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardVersionList":      schema_pkg_apis_dashboard_v1alpha1_DashboardVersionList(ref),
-		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardWithAccessInfo":   schema_pkg_apis_dashboard_v1alpha1_DashboardWithAccessInfo(ref),
-		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.LibraryPanel":              schema_pkg_apis_dashboard_v1alpha1_LibraryPanel(ref),
-		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.LibraryPanelList":          schema_pkg_apis_dashboard_v1alpha1_LibraryPanelList(ref),
-		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.LibraryPanelSpec":          schema_pkg_apis_dashboard_v1alpha1_LibraryPanelSpec(ref),
-		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.LibraryPanelStatus":        schema_pkg_apis_dashboard_v1alpha1_LibraryPanelStatus(ref),
-		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.VersionsQueryOptions":      schema_pkg_apis_dashboard_v1alpha1_VersionsQueryOptions(ref),
-		"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured":                   v0alpha1.Unstructured{}.OpenAPIDefinition(),
+		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.AnnotationActions":         schema_pkg_apis_dashboard_v1beta1_AnnotationActions(ref),
+		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.AnnotationPermission":      schema_pkg_apis_dashboard_v1beta1_AnnotationPermission(ref),
+		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.Dashboard":                 schema_pkg_apis_dashboard_v1beta1_Dashboard(ref),
+		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardAccess":           schema_pkg_apis_dashboard_v1beta1_DashboardAccess(ref),
+		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardConversionStatus": schema_pkg_apis_dashboard_v1beta1_DashboardConversionStatus(ref),
+		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardJSONCodec":        schema_pkg_apis_dashboard_v1beta1_DashboardJSONCodec(ref),
+		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardList":             schema_pkg_apis_dashboard_v1beta1_DashboardList(ref),
+		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardMetadata":         schema_pkg_apis_dashboard_v1beta1_DashboardMetadata(ref),
+		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardStatus":           schema_pkg_apis_dashboard_v1beta1_DashboardStatus(ref),
+		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardVersionInfo":      schema_pkg_apis_dashboard_v1beta1_DashboardVersionInfo(ref),
+		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardVersionList":      schema_pkg_apis_dashboard_v1beta1_DashboardVersionList(ref),
+		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardWithAccessInfo":   schema_pkg_apis_dashboard_v1beta1_DashboardWithAccessInfo(ref),
+		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.LibraryPanel":              schema_pkg_apis_dashboard_v1beta1_LibraryPanel(ref),
+		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.LibraryPanelList":          schema_pkg_apis_dashboard_v1beta1_LibraryPanelList(ref),
+		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.LibraryPanelSpec":          schema_pkg_apis_dashboard_v1beta1_LibraryPanelSpec(ref),
+		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.LibraryPanelStatus":        schema_pkg_apis_dashboard_v1beta1_LibraryPanelStatus(ref),
+		"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.VersionsQueryOptions":      schema_pkg_apis_dashboard_v1beta1_VersionsQueryOptions(ref),
+		"github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured":                  v0alpha1.Unstructured{}.OpenAPIDefinition(),
 	}
 }

-func schema_pkg_apis_dashboard_v1alpha1_AnnotationActions(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_dashboard_v1beta1_AnnotationActions(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
@@ -70,7 +70,7 @@ func schema_pkg_apis_dashboard_v1alpha1_AnnotationActions(ref common.ReferenceCa
 	}
 }

-func schema_pkg_apis_dashboard_v1alpha1_AnnotationPermission(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_dashboard_v1beta1_AnnotationPermission(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
@@ -79,13 +79,13 @@ func schema_pkg_apis_dashboard_v1alpha1_AnnotationPermission(ref common.Referenc
 					"dashboard": {
 						SchemaProps: spec.SchemaProps{
 							Default: map[string]interface{}{},
-							Ref:     ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.AnnotationActions"),
+							Ref:     ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.AnnotationActions"),
 						},
 					},
 					"organization": {
 						SchemaProps: spec.SchemaProps{
 							Default: map[string]interface{}{},
-							Ref:     ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.AnnotationActions"),
+							Ref:     ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.AnnotationActions"),
 						},
 					},
 				},
@@ -93,11 +93,11 @@ func schema_pkg_apis_dashboard_v1alpha1_AnnotationPermission(ref common.Referenc
 			},
 		},
 		Dependencies: []string{
-			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.AnnotationActions"},
+			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.AnnotationActions"},
 	}
 }

-func schema_pkg_apis_dashboard_v1alpha1_Dashboard(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_dashboard_v1beta1_Dashboard(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
@@ -132,7 +132,7 @@ func schema_pkg_apis_dashboard_v1alpha1_Dashboard(ref common.ReferenceCallback)
 					"status": {
 						SchemaProps: spec.SchemaProps{
 							Default: map[string]interface{}{},
-							Ref:     ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardStatus"),
+							Ref:     ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardStatus"),
 						},
 					},
 				},
@@ -140,11 +140,11 @@ func schema_pkg_apis_dashboard_v1alpha1_Dashboard(ref common.ReferenceCallback)
 			},
 		},
 		Dependencies: []string{
-			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardStatus", "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardStatus", "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
 	}
 }

-func schema_pkg_apis_dashboard_v1alpha1_DashboardAccess(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_dashboard_v1beta1_DashboardAccess(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
@@ -202,7 +202,7 @@ func schema_pkg_apis_dashboard_v1alpha1_DashboardAccess(ref common.ReferenceCall
 					},
 					"annotationsPermissions": {
 						SchemaProps: spec.SchemaProps{
-							Ref: ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.AnnotationPermission"),
+							Ref: ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.AnnotationPermission"),
 						},
 					},
 				},
@@ -210,11 +210,11 @@ func schema_pkg_apis_dashboard_v1alpha1_DashboardAccess(ref common.ReferenceCall
 			},
 		},
 		Dependencies: []string{
-			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.AnnotationPermission"},
+			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.AnnotationPermission"},
 	}
 }

-func schema_pkg_apis_dashboard_v1alpha1_DashboardConversionStatus(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_dashboard_v1beta1_DashboardConversionStatus(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
@@ -252,7 +252,7 @@ func schema_pkg_apis_dashboard_v1alpha1_DashboardConversionStatus(ref common.Ref
 	}
 }

-func schema_pkg_apis_dashboard_v1alpha1_DashboardJSONCodec(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_dashboard_v1beta1_DashboardJSONCodec(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
@@ -263,7 +263,7 @@ func schema_pkg_apis_dashboard_v1alpha1_DashboardJSONCodec(ref common.ReferenceC
 	}
 }

-func schema_pkg_apis_dashboard_v1alpha1_DashboardList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_dashboard_v1beta1_DashboardList(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
@@ -296,7 +296,7 @@ func schema_pkg_apis_dashboard_v1alpha1_DashboardList(ref common.ReferenceCallba
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
 										Default: map[string]interface{}{},
-										Ref:     ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.Dashboard"),
+										Ref:     ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.Dashboard"),
 									},
 								},
 							},
@@ -307,11 +307,11 @@ func schema_pkg_apis_dashboard_v1alpha1_DashboardList(ref common.ReferenceCallba
 			},
 		},
 		Dependencies: []string{
-			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.Dashboard", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.Dashboard", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
 	}
 }

-func schema_pkg_apis_dashboard_v1alpha1_DashboardMetadata(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_dashboard_v1beta1_DashboardMetadata(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
@@ -407,7 +407,7 @@ func schema_pkg_apis_dashboard_v1alpha1_DashboardMetadata(ref common.ReferenceCa
 	}
 }

-func schema_pkg_apis_dashboard_v1alpha1_DashboardStatus(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_dashboard_v1beta1_DashboardStatus(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
@@ -416,18 +416,18 @@ func schema_pkg_apis_dashboard_v1alpha1_DashboardStatus(ref common.ReferenceCall
 					"conversion": {
 						SchemaProps: spec.SchemaProps{
 							Description: "Optional conversion status.",
-							Ref:         ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardConversionStatus"),
+							Ref:         ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardConversionStatus"),
 						},
 					},
 				},
 			},
 		},
 		Dependencies: []string{
-			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardConversionStatus"},
+			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardConversionStatus"},
 	}
 }

-func schema_pkg_apis_dashboard_v1alpha1_DashboardVersionInfo(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_dashboard_v1beta1_DashboardVersionInfo(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
@@ -477,7 +477,7 @@ func schema_pkg_apis_dashboard_v1alpha1_DashboardVersionInfo(ref common.Referenc
 	}
 }

-func schema_pkg_apis_dashboard_v1alpha1_DashboardVersionList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_dashboard_v1beta1_DashboardVersionList(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
@@ -510,7 +510,7 @@ func schema_pkg_apis_dashboard_v1alpha1_DashboardVersionList(ref common.Referenc
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
 										Default: map[string]interface{}{},
-										Ref:     ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardVersionInfo"),
+										Ref:     ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardVersionInfo"),
 									},
 								},
 							},
@@ -520,11 +520,11 @@ func schema_pkg_apis_dashboard_v1alpha1_DashboardVersionList(ref common.Referenc
 			},
 		},
 		Dependencies: []string{
-			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardVersionInfo", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardVersionInfo", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
 	}
 }

-func schema_pkg_apis_dashboard_v1alpha1_DashboardWithAccessInfo(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_dashboard_v1beta1_DashboardWithAccessInfo(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
@@ -560,13 +560,13 @@ func schema_pkg_apis_dashboard_v1alpha1_DashboardWithAccessInfo(ref common.Refer
 					"status": {
 						SchemaProps: spec.SchemaProps{
 							Default: map[string]interface{}{},
-							Ref:     ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardStatus"),
+							Ref:     ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardStatus"),
 						},
 					},
 					"access": {
 						SchemaProps: spec.SchemaProps{
 							Default: map[string]interface{}{},
-							Ref:     ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardAccess"),
+							Ref:     ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardAccess"),
 						},
 					},
 				},
@@ -574,11 +574,11 @@ func schema_pkg_apis_dashboard_v1alpha1_DashboardWithAccessInfo(ref common.Refer
 			},
 		},
 		Dependencies: []string{
-			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardAccess", "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.DashboardStatus", "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardAccess", "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.DashboardStatus", "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1.Unstructured", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
 	}
 }

-func schema_pkg_apis_dashboard_v1alpha1_LibraryPanel(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_dashboard_v1beta1_LibraryPanel(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
@@ -609,13 +609,13 @@ func schema_pkg_apis_dashboard_v1alpha1_LibraryPanel(ref common.ReferenceCallbac
 						SchemaProps: spec.SchemaProps{
 							Description: "Panel properties",
 							Default:     map[string]interface{}{},
-							Ref:         ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.LibraryPanelSpec"),
+							Ref:         ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.LibraryPanelSpec"),
 						},
 					},
 					"status": {
 						SchemaProps: spec.SchemaProps{
 							Description: "Status will show errors",
-							Ref:         ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.LibraryPanelStatus"),
+							Ref:         ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.LibraryPanelStatus"),
 						},
 					},
 				},
@@ -623,11 +623,11 @@ func schema_pkg_apis_dashboard_v1alpha1_LibraryPanel(ref common.ReferenceCallbac
 			},
 		},
 		Dependencies: []string{
-			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.LibraryPanelSpec", "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.LibraryPanelStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.LibraryPanelSpec", "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.LibraryPanelStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
 	}
 }

-func schema_pkg_apis_dashboard_v1alpha1_LibraryPanelList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_dashboard_v1beta1_LibraryPanelList(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
@@ -660,7 +660,7 @@ func schema_pkg_apis_dashboard_v1alpha1_LibraryPanelList(ref common.ReferenceCal
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
 										Default: map[string]interface{}{},
-										Ref:     ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.LibraryPanel"),
+										Ref:     ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.LibraryPanel"),
 									},
 								},
 							},
@@ -670,11 +670,11 @@ func schema_pkg_apis_dashboard_v1alpha1_LibraryPanelList(ref common.ReferenceCal
 			},
 		},
 		Dependencies: []string{
-			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1.LibraryPanel", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+			"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1.LibraryPanel", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
 	}
 }

-func schema_pkg_apis_dashboard_v1alpha1_LibraryPanelSpec(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_dashboard_v1beta1_LibraryPanelSpec(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
@@ -754,7 +754,7 @@ func schema_pkg_apis_dashboard_v1alpha1_LibraryPanelSpec(ref common.ReferenceCal
 	}
 }

-func schema_pkg_apis_dashboard_v1alpha1_LibraryPanelStatus(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_dashboard_v1beta1_LibraryPanelStatus(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
@@ -789,7 +789,7 @@ func schema_pkg_apis_dashboard_v1alpha1_LibraryPanelStatus(ref common.ReferenceC
 	}
 }

-func schema_pkg_apis_dashboard_v1alpha1_VersionsQueryOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_dashboard_v1beta1_VersionsQueryOptions(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
@@ -1,3 +1,3 @@
-API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1,DashboardMetadata,Finalizers
-API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1,LibraryPanelStatus,Warnings
+API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1,DashboardMetadata,Finalizers
+API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1,LibraryPanelStatus,Warnings
 API rule violation: names_match,github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1,Unstructured,Object
@@ -82,7 +82,7 @@ AnnotationPanelFilter: {
 	exclude?: bool | *false

 	// Panel IDs that should be included or excluded
-	ids: [...uint8]
+	ids: [...uint32]
 }

 // "Off" for no shared crosshair or tooltip (default).
@@ -73,7 +73,7 @@ type DashboardAnnotationPanelFilter struct {
 	// Should the specified panels be included or excluded
 	Exclude *bool `json:"exclude,omitempty"`
 	// Panel IDs that should be included or excluded
-	Ids []uint8 `json:"ids"`
+	Ids []uint32 `json:"ids"`
 }

 // NewDashboardAnnotationPanelFilter creates a new DashboardAnnotationPanelFilter object.
@@ -538,7 +538,7 @@ func schema_pkg_apis_dashboard_v2alpha1_DashboardAnnotationPanelFilter(ref commo
 									SchemaProps: spec.SchemaProps{
 										Default: 0,
 										Type:    []string{"integer"},
-										Format:  "byte",
+										Format:  "int64",
 									},
 								},
 							},
@@ -3,6 +3,7 @@ API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/
 API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1,DashboardAdhocVariableSpec,BaseFilters
 API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1,DashboardAdhocVariableSpec,DefaultKeys
 API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1,DashboardAdhocVariableSpec,Filters
+API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1,DashboardAnnotationPanelFilter,Ids
 API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1,DashboardAutoGridLayoutSpec,Items
 API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1,DashboardConditionalRenderingGroupSpec,Items
 API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1,DashboardCustomVariableSpec,Options
@@ -25,7 +25,7 @@ var appManifestData = app.ManifestData{
 				},

 				{
-					Name: "v1alpha1",
+					Name: "v1beta1",
 				},

 				{
@@ -5,7 +5,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"

 	dashv0 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
-	dashv1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1"
+	dashv1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"
 	dashv2 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1"
 	"github.com/grafana/grafana/apps/dashboard/pkg/migration"
 	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
@@ -10,7 +10,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"

 	dashv0 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
-	dashv1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1"
+	dashv1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"
 	dashv2 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1"
 	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
@@ -2,9 +2,9 @@ package migration

 import "github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"

-func Migrate(dash map[string]interface{}, targetVersion int) error {
+func Migrate(dash map[string]any, targetVersion int) error {
 	if dash == nil {
-		dash = map[string]interface{}{}
+		dash = map[string]any{}
 	}
 	inputVersion := schemaversion.GetSchemaVersion(dash)
 	dash["schemaVersion"] = inputVersion
@@ -1,6 +1,6 @@
 {
  "kind": "Dashboard",
-  "apiVersion": "dashboard.grafana.app/v1alpha1",
+  "apiVersion": "dashboard.grafana.app/v1beta1",
  "metadata": {
    "name": "sample-dash",
    "annotations": {
@@ -122,7 +122,7 @@
                  "sort": "none"
                }
              },
-              "pluginVersion": "12.0.0-pre"
+              "pluginVersion": "12.0.1"
            }
          }
        }
@@ -193,7 +193,7 @@
                "textMode": "auto",
                "wideLayout": true
              },
-              "pluginVersion": "12.0.0-pre"
+              "pluginVersion": "12.0.1"
            }
          }
        }
@@ -1,6 +1,6 @@
 {
  "kind": "Dashboard",
-  "apiVersion": "dashboard.grafana.app/v1alpha1",
+  "apiVersion": "dashboard.grafana.app/v1beta1",
  "metadata": {
    "name": "dashboard-nested",
    "annotations": {
@@ -191,7 +191,7 @@
          "sort": "none"
        }
      },
-      "pluginVersion": "12.0.0-pre",
+      "pluginVersion": "12.0.1",
      "targets": [
        {
          "alias": "memory",
@@ -344,7 +344,7 @@
          "sort": "none"
        }
      },
-      "pluginVersion": "12.0.0-pre",
+      "pluginVersion": "12.0.1",
      "targets": [
        {
          "alias": "logins",
@@ -436,7 +436,7 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "12.0.0-pre",
+      "pluginVersion": "12.0.1",
      "targets": [
        {
          "datasource": {
@@ -513,7 +513,7 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "12.0.0-pre",
+      "pluginVersion": "12.0.1",
      "targets": [
        {
          "datasource": {
@@ -592,7 +592,7 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "12.0.0-pre",
+      "pluginVersion": "12.0.1",
      "targets": [
        {
          "datasource": {
@@ -669,7 +669,7 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "12.0.0-pre",
+      "pluginVersion": "12.0.1",
      "targets": [
        {
          "datasource": {
@@ -824,7 +824,7 @@
          "sort": "none"
        }
      },
-      "pluginVersion": "12.0.0-pre",
+      "pluginVersion": "12.0.1",
      "targets": [
        {
          "alias": "web_server_01",
@@ -932,7 +932,7 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "12.0.0-pre",
+      "pluginVersion": "12.0.1",
      "targets": [
        {
          "datasource": {
@@ -1009,7 +1009,7 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "12.0.0-pre",
+      "pluginVersion": "12.0.1",
      "targets": [
        {
          "datasource": {
@@ -1086,7 +1086,7 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "12.0.0-pre",
+      "pluginVersion": "12.0.1",
      "targets": [
        {
          "datasource": {
@@ -1165,7 +1165,7 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "12.0.0-pre",
+      "pluginVersion": "12.0.1",
      "targets": [
        {
          "datasource": {
@@ -1305,7 +1305,7 @@
          "sort": "none"
        }
      },
-      "pluginVersion": "12.0.0-pre",
+      "pluginVersion": "12.0.1",
      "targets": [
        {
          "datasource": {
@@ -1341,4 +1341,4 @@
  "title": "TestData - Demo Dashboard",
  "uid": "000000003",
  "version": 2
-}
+}
@@ -29,10 +29,7 @@
  "liveNow": false,
  "panels": [
    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
+      "datasource": { "type": "testdata" },
      "fieldConfig": {
        "defaults": {
          "color": {
@@ -110,10 +107,7 @@
      "type": "barchart"
    },
    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
+      "datasource": { "type": "testdata" },
      "description": "Should be smaller given the longer value",
      "fieldConfig": {
        "defaults": {
@@ -193,10 +187,7 @@
      "type": "barchart"
    },
    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
+      "datasource": { "type": "testdata" },
      "fieldConfig": {
        "defaults": {
          "color": {
@@ -274,10 +265,7 @@
      "type": "barchart"
    },
    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
+      "datasource": { "type": "testdata" },
      "fieldConfig": {
        "defaults": {
          "color": {
@@ -436,10 +424,7 @@
      "type": "barchart"
    },
    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
+      "datasource": { "type": "testdata" },
      "fieldConfig": {
        "defaults": {
          "color": {
@@ -518,10 +503,7 @@
      "type": "barchart"
    },
    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
+      "datasource": { "type": "testdata" },
      "description": "",
      "fieldConfig": {
        "defaults": {
@@ -15,9 +15,9 @@ title: Migrate from Grafana OSS/Enterprise to Grafana Cloud

 When you decide to migrate from your self-managed Grafana instance to Grafana Cloud, you can benefit from the convenience of a managed observability platform, additional cloud-only features, and robust security. There are a couple of key approaches to help you transition to Grafana Cloud.

-| Migration type | Tools used                                                            | Availability                                                                                                                                                     | Migratable resources                                                                                                                                                  |
-| :------------- | :-------------------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Manual         | <ul><li>Command line utilities</li><li>The Grafana HTTP API</li></ul> | Generally available in all versions of Grafana OSS/Enterprise                                                                                                    | The entire Grafana instance                                                                                                                                           |
-| Automated      | The Grafana Cloud Migration Assistant                                 | Available in public preview from Grafana v11.2 using the `onPremToCloudMigrations` feature toggle. This toggle is enabled by default in Grafana v11.5 and later. | <ul><li>Dashboards</li><li>Folders</li><li>Data sources</li><li>App Plugins</li><li>Panel Plugins</li><li>Library Panels</li><li>Grafana Alerting resources</li></ul> |
+| Migration type | Tools used                                                            | Availability                                                                                                                                                                                                     | Migratable resources                                                                                                                                                  |
+| :------------- | :-------------------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Manual         | <ul><li>Command line utilities</li><li>The Grafana HTTP API</li></ul> | Generally available in all versions of Grafana OSS/Enterprise                                                                                                                                                    | The entire Grafana instance                                                                                                                                           |
+| Automated      | The Grafana Cloud Migration Assistant                                 | Generally available in Grafana v12 and available in public preview from Grafana v11.2 to v11.6 using the `onPremToCloudMigrations` feature toggle. This toggle is enabled by default in Grafana v11.5 and later. | <ul><li>Dashboards</li><li>Folders</li><li>Data sources</li><li>App Plugins</li><li>Panel Plugins</li><li>Library Panels</li><li>Grafana Alerting resources</li></ul> |

-Our detailed [migration guide](https://www.grafana.com/docs/grafana-cloud/account-management/migration-guide/manually-migrate-to-grafana-cloud/) explains the key steps and scripts to manually migrate your resources to Grafana Cloud, covering a comprehensive set of resources in your Grafana instance. Alternatively, the [Grafana Cloud Migration Assistant](https://www.grafana.com/docs/grafana-cloud/account-management/migration-guide/cloud-migration-assistant/), available in public preview in Grafana v11.2 and later, automates the migration process across a broad range of Grafana resources. You can use the migration assistant to migrate a large proportion of your Grafana resources and then, if needed, leverage the migration guide to migrate the rest.
+Our detailed [migration guide](https://grafana.com/docs/grafana-cloud/account-management/migration-guide/manually-migrate-to-grafana-cloud/) explains the key steps and scripts to manually migrate your resources to Grafana Cloud, covering a comprehensive set of resources in your Grafana instance. Alternatively, the [Grafana Cloud Migration Assistant](https://grafana.com/docs/grafana-cloud/account-management/migration-guide/cloud-migration-assistant/), available in public preview in Grafana v11.2 and later, automates the migration process across a broad range of Grafana resources. You can use the migration assistant to migrate a large proportion of your Grafana resources and then, if needed, leverage the migration guide to migrate the rest.
@@ -11,7 +11,7 @@ weight: 400

 # Grafana Cloud Migration Assistant

-The Grafana Cloud Migration Assistant is available in Grafana 11.2+ as a [public preview feature](https://grafana.com/docs/release-life-cycle/#public-preview) that automatically migrates resources from your Grafana OSS/Enterprise instance to Grafana Cloud. It provides the following functionalities:
+The Grafana Cloud Migration Assistant, generally available from Grafana v12.0, automatically migrates resources from your Grafana OSS/Enterprise instance to Grafana Cloud. It provides the following functionality:

 - Securely connect your self-managed instance to a Grafana Cloud instance.
 - Seamlessly migrate resources such as dashboards, data sources, and folders to your cloud instance in a few easy steps.
@@ -44,10 +44,10 @@ The following resources are supported by the migration assistant:

 To use the Grafana migration assistant, you need:

- Grafana v11.2 or above with the `onPremToCloudMigrations` feature toggle enabled. In Grafana 11.5, this is enabled by default. For more information on how to enable a feature toggle, refer to [Configure feature toggles](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/feature-toggles/#configure-feature-toggles).
+- Grafana v11.2 or above with the `onPremToCloudMigrations` feature toggle enabled. In Grafana 11.5, this is enabled by default. For more information on how to enable a feature toggle, refer to [Configure feature toggles](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/feature-toggles/#configure-feature-toggles).
 - A [Grafana Cloud Stack](https://grafana.com/docs/grafana-cloud/get-started/) you intend to migrate your resources to.
 - [`Admin`](https://grafana.com/docs/grafana-cloud/account-management/authentication-and-permissions/cloud-roles/) access to the Grafana Cloud Stack. To check your access level, go to `https://grafana.com/orgs/<YOUR-ORG-NAME>/members`.
- [Grafana server administrator](https://grafana.com/docs/grafana/latest/administration/roles-and-permissions/#grafana-server-administrators) access to your existing Grafana OSS/Enterprise instance. To check your access level, go to `https://<GRAFANA-ONPREM-URL>/admin/users`.
+- [Grafana server administrator](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/#grafana-server-administrators) access to your existing Grafana OSS/Enterprise instance. To check your access level, go to `https://<GRAFANA-ONPREM-URL>/admin/users`.
 - Internet access from your existing Grafana OSS/Enterprise instance.

 ## Access the migration assistant
@@ -59,7 +59,7 @@ In Grafana Enterprise, the server administrator has access to the migration assi
 ### Grant access in Grafana Enterprise

 {{< admonition type="important">}}
-You must [configure RBAC](https://grafana.com/docs/grafana/latest/administration/roles-and-permissions/access-control/configure-rbac/) before you can grant other administrators access to the Grafana Migration Assistant.
+You must [configure RBAC](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/access-control/configure-rbac/) before you can grant other administrators access to the Grafana Migration Assistant.
 {{< /admonition >}}

 To grant other Admins access to the migration assistant in Grafana Enterprise:
@@ -82,9 +82,6 @@ You can use the migration assistant to generate a migration token on your Grafan

 1. Navigate to **Home** > **Administration** > **General** > **Migrate to Grafana Cloud** in the cloud instance where you intend to migrate your resources.
 1. Click on the **Generate a migration token** button.
-
-   ![The Generate a migration token button in the Migrate to Grafana Cloud page in the intended Grafana Cloud Stack](/media/docs/grafana-cloud/account-management/screenshot-generate-migration-token.png)
-
 1. Make a copy of the migration token by copying to clipboard. The token is required to authenticate your self-managed instance with the Grafana Cloud Stack.

 ### Connect your self-managed Grafana instance to the Grafana Cloud Stack
@@ -93,43 +90,68 @@ You can use the migration assistant to generate a migration token on your Grafan

 1. Click the **Migrate this instance to Cloud** button.

-   ![The Migrate this instance to Cloud button in the Migrate to Grafana Cloud page on a self-managed Grafana instance](/media/docs/grafana-cloud/account-management/screenshot-migrate-to-cloud.png)
-
-1. Enter your token and click **Connect to this Stack**.
-
-   ![The Migration token field and Connect to this stack button in the Connect to a cloud stack page in a self-managed Grafana instance](/media/docs/grafana-cloud/account-management/screenshot-connect-to-a-stack.png)
+1. Enter your token in the **Migration token** field and click **Connect to this Stack**.

 ### Build a snapshot

 After connecting to the cloud stack, this is the empty state of the migration assistant. You need to create a snapshot of the self-managed Grafana instance to upload it to the cloud stack.

- Click **Build snapshot**
+1. From Grafana v12.0, select the checkbox next to each resource you want to migrate to your cloud stack.

-  ![The Build snapshot button on the Migrate to Grafana Cloud page in a self-managed Grafana instance](/media/docs/grafana-cloud/account-management/screenshot-build-a-snapshot.png)
+   {{< admonition type="note" >}}
+   Some resources can't be uploaded to your cloud stack alone because they rely on other resources:
+   | Desired resource | Requires |
+   | :---- | :---- |
+   | Dashboards | <ul><li>Library Elements</li> <li>Data Sources</li> <li>Plugins</li> <li>Folders</li></ul> |
+   | Library Elements | Folders |
+   | Data Sources | Plugins |
+   | Plugins | Nothing else |
+   | Folders | Nothing else |
+   | All Alert rule groups | All other resources |
+   | Alert Rules | <ul><li>Dashboards</li> <li>Library Elements</li> <li>Data Sources</li> <li>Plugins</li> <li>Folders</li> <li>Notification Policies</li> <li>Notification Templates</li> <li>Contact Points</li> <li>Mute Timings</li></ul> |
+   | Notification Policies | <ul><li>Notification Templates</li> <li>Contact Points</li></ul> |
+   | Notification Templates | Nothing else |
+   | Contact Points | Notification Templates |
+   | Mute Timings | Nothing else |
+   {{< /admonition >}}
+
+   In Grafana v11.2 to v11.6, you can't select specific resources to include in the snapshot, such as only dashboards. All supported resources are included by default.
+
+1. Click **Build snapshot**
+
+   ![A list of resources selected for migration and the Build snapshot button](/media/docs/grafana/screenshot-grafana-12-select-resources.png)

 ### Upload resources to the cloud

 After a snapshot is created, a list of resources appears with resource Type and Status populated with **Not yet uploaded**.

-![A list of resources with snapshots built but not yet uploaded to Grafana Cloud](/media/docs/grafana-cloud/account-management/screenshot-upload-snapshot.png)
+1. Click on **Upload snapshot** to copy the resources to the Grafana Cloud instance.

-1. Click on **Upload snapshot** to copy the resources to the Grafana Cloud instance. This also updates statuses for the list of resources. The status changes to 'Uploaded to cloud' for resources successfully copied to the cloud.
+1. Use the assistant's real-time progress tracking to monitor the migration. The status changes to 'Uploaded to cloud' for resources successfully copied to the cloud.
+
+   From Grafana v12.0, you can group and sort resources during and after the migration:
+
+   - Click **Name** to sort resources alphabetically.
+   - Click **Type** to group and sort by resource type.
+   - Click **Status** to group and sort by upload status (pending upload, uploaded successfully, or experienced errors).

   The Snapshot information also updates to inform the user of total resources, errors, and total number of successfully migrated resources.

-   ![An updates list of resources with snapshots built after attempting to upload them to Grafana Cloud](/media/docs/grafana-cloud/account-management/screenshot-updated-snapshot-page.png)
-
-1. Use the assistant's real-time progress tracking to monitor the migration.
+   ![An updates list of resources with snapshots built after attempting to upload them to Grafana Cloud](/media/docs/grafana/screenshot-grafana-12-updated-snapshot-page.png)

 1. Review error details for any issues that need manual resolution.

 ## Snapshots created by the migration assistant

-The migration assistant currently supports a subset of all resources available in Grafana. Refer to [Supported Resources](https://wwww.grafana.com/docs/grafana-cloud/account-management/cloud-migration-assistant/#supported-resources) for more details.
+The migration assistant currently supports a subset of all resources available in Grafana. Refer to [Supported Resources](https://grafana.com/docs/grafana-cloud/account-management/cloud-migration-assistant/#supported-resources) for more details.

-When you create a snapshot, the migration assistant makes a copy of all supported resources and saves them in the snapshot. The snapshot reflects the current state of the resources when the snapshot is built and is stored locally on your instance, ready to be uploaded in the last stage. It is currently not possible to select specific resources to include in the snapshot, such as only dashboards. All supported resources are included by default.
+When you create a snapshot, the migration assistant makes a copy of all the resources you select and saves them in the snapshot. The snapshot reflects the current state of the resources when the snapshot is built and is stored locally on your instance, ready to be uploaded in the last stage.

-Resources saved in the snapshot are strictly limited to the resources stored within an organization. This is important to note if there are multiple organizations used in your Grafana instance. If you want to migrate multiple organizations, refer to [Migrate multiple organizations](https://wwww.grafana.com/docs/grafana-cloud/account-management/cloud-migration-assistant/#migrate-multiple-organizations) for more information and guidance.
+{{< admonition type="note" >}}
+In Grafana v11.2 to v11.6, you can't select specific resources to include in the snapshot, such as only dashboards. All supported resources are included by default.
+{{< /admonition >}}
+
+Resources saved in the snapshot are strictly limited to the resources stored within an organization. This is important to note if there are multiple organizations used in your Grafana instance. If you want to migrate multiple organizations, refer to [Migrate multiple organizations](https://grafana.com/docs/grafana-cloud/account-management/cloud-migration-assistant/#migrate-multiple-organizations) for more information and guidance.

 ## Resource migration details

@@ -145,7 +167,7 @@ Your data sources, including credentials, are migrated securely and seamlessly t

 ### Plugins

-The migration assistant supports any plugins found in the plugins catalog. As long as the plugin is signed or is a core plugin built into Grafana, it is eligible for migration. Due to security reasons, unsigned plugins are not supported in Grafana Cloud. If you are using any unsigned private plugins, Grafana recommends you seek an alternative plugin for the catalog or work on a strategy to deprecate certain functionality from your self-managed instance.
+The migration assistant supports any plugins found in the plugins catalog. As long as the plugin is signed or is a core plugin built into Grafana, it can be migrated. Due to security reasons, unsigned plugins are not supported in Grafana Cloud. If you are using any unsigned private plugins, Grafana recommends you seek an alternative plugin from the catalog or work on a strategy to deprecate certain functionality from your self-managed instance.

 Upgrade any plugins you intend to migrate before using the migration assistant as any migrated plugins will be configured on the Grafana Cloud instance as the latest version of that plugin.

@@ -168,7 +190,13 @@ This is sufficient to have your Alerting configuration up and running in Grafana

 Migration of Silences is not supported by the migration assistant and needs to be configured manually. Alert History is also not available for migration.

-Successfully migrating Alerting resources to your Grafana Cloud instance could result in 2 sets of notifications being generated; one from your OSS/Enterprise instance and another from the newly migrated alerts in your Grafana Cloud instance. To avoid double notifications, a new `alert_rules_state` configuration option in the `custom.ini` or `grafana.ini` file controls how Alert Rules are migrated to the Grafana Cloud instance and is set to `paused` by default so you can review and test your Alerting resources in your Grafana Cloud instance without duplicate notifications.
+Successfully migrating Alerting resources to your Grafana Cloud instance could result in 2 sets of notifications being generated:
+
+1. From your OSS/Enterprise instance
+
+1. From the newly migrated alerts in your Grafana Cloud instance
+
+To avoid double notifications, a new `alert_rules_state` configuration option in the `custom.ini` or `grafana.ini` file controls how Alert Rules are migrated to the Grafana Cloud instance and is set to `paused` by default so you can review and test your Alerting resources in your Grafana Cloud instance without duplicate notifications.

 The available options for `alert_rule_state` are:

@@ -186,7 +214,7 @@ Because the migration assistant does not yet migrate teams or RBAC permissions,

 ## Migrate multiple organizations

-If you are using the [organizations](https://grafana.com/docs/grafana/latest/administration/organization-management/#about-organizations) feature on your Grafana Instance and intend to migrate to Grafana Cloud, you need to plan this aspect of the migration carefully.
+If you are using the [organizations](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/organization-management/#about-organizations) feature on your Grafana Instance and intend to migrate to Grafana Cloud, you need to plan this aspect of the migration carefully.

 The organizations feature is not supported in Grafana Cloud, but folders and RBAC can be used to protect and grant permissions to resources instead. The recommended path is to migrate multiple organizations to a single cloud stack. This is the simplest option and provides the best user experience.

@@ -198,4 +226,4 @@ The Grafana server administrator is granted access to the migration assistant by

 The main driver for setting up organizations in the first place is resource isolation. In order to achieve this in Grafana Cloud, you can organize resources into folders and set up teams and permissions that correspond to your organizations.

-For more information about configuring teams and permissions, refer to [Configure Grafana Teams](https://grafana.com/docs/grafana/latest/administration/team-management/configure-grafana-teams/).
+For more information about configuring teams and permissions, refer to [Configure Grafana Teams](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/team-management/configure-grafana-teams/).
@@ -17,6 +17,10 @@ This migration guide is designed to assist Grafana OSS/Enterprise users in seaml
 There isn't yet a standard method for importing existing data into Grafana Cloud from self-managed databases.
 {{< /admonition >}}

+{{< admonition type="tip" >}}
+You can use the [Grafana Cloud Migration Assistant](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/migration-guide/cloud-migration-assistant/), generally available in Grafana v12, to automatically migrate your resources to Grafana Cloud.
+{{< /admonition >}}
+
 ## Plan and perform a manual migration

 If you need to migrate resources beyond what is supported by the Grafana Cloud Migration Assistant, you can migrate them manually with this guide. Moving your team from Grafana OSS/Enterprise to Grafana Cloud manually involves some coordination and communication in addition to the technical migration in the following documentation.
@@ -29,13 +33,13 @@ You may choose to test Grafana Cloud for some time before migrating your entire

 When you decide to migrate, set aside a day of cutover during which users should not create new dashboards or alerts. Migrate any newly-created resources, turn on your production Alerting contact points and notification policies in Cloud and turn them off in Grafana OSS/Enterprise, and notify your users. You may also choose to redirect the Grafana OSS/Enterprise URL to your Grafana Cloud URL.

-| Component    | Migration Effort | Notes                                                                      |
-| ------------ | ---------------- | -------------------------------------------------------------------------- |
-| Folders      | Low              |                                                                            |
-| Dashboards   | Low              | Data source references might need to be renamed                            |
-| Alerts       | Medium           | Data source based alerts might need to be adapted                          |
-| Plugins      | Medium           | Depends on the feature set of the plugin                                   |
-| Data sources | High             | If the data sources references any secrets, you need to provide them again |
+| Component    | Migration Effort | Notes                                                                     |
+| ------------ | ---------------- | ------------------------------------------------------------------------- |
+| Folders      | Low              |                                                                           |
+| Dashboards   | Low              | Data source references might need to be renamed                           |
+| Alerts       | Medium           | Data source based alerts might need to be adapted                         |
+| Plugins      | Medium           | Depends on the feature set of the plugin                                  |
+| Data sources | High             | If the data sources reference any secrets, you need to provide them again |

 ## Before you begin

@@ -219,8 +219,6 @@ For more information on Cloud Access Policies and how to use them, see [Access p

 ### Grafana Alerting Notification action definitions

-To use these permissions, enable the `alertingApiServer` feature toggle.
-
 | Action                                       | Applicable scopes                  | Description                                                                                                 |
 | -------------------------------------------- | ---------------------------------- | ----------------------------------------------------------------------------------------------------------- |
 | `alert.notifications.receivers:read`         | `receivers:*`<br>`receivers:uid:*` | Read contact points.                                                                                        |
@@ -27,64 +27,44 @@ Each permission contains one or more actions and a scope.

 Grafana Alerting has the following permissions.

-| Action                                | Applicable scope                       | Description                                                                                                                                                                                                         |
-| ------------------------------------- | -------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `alert.instances.external:read`       | `datasources:*`<br>`datasources:uid:*` | Read alerts and silences in data sources that support alerting.                                                                                                                                                     |
-| `alert.instances.external:write`      | `datasources:*`<br>`datasources:uid:*` | Manage alerts and silences in data sources that support alerting.                                                                                                                                                   |
-| `alert.instances:create`              | n/a                                    | Create silences in the current organization.                                                                                                                                                                        |
-| `alert.instances:read`                | n/a                                    | Read alerts and silences in the current organization.                                                                                                                                                               |
-| `alert.instances:write`               | n/a                                    | Update and expire silences in the current organization.                                                                                                                                                             |
-| `alert.notifications.external:read`   | `datasources:*`<br>`datasources:uid:*` | Read templates, contact points, notification policies, and mute timings in data sources that support alerting.                                                                                                      |
-| `alert.notifications.external:write`  | `datasources:*`<br>`datasources:uid:*` | Manage templates, contact points, notification policies, and mute timings in data sources that support alerting.                                                                                                    |
-| `alert.notifications:write`           | n/a                                    | Manage templates, contact points, notification policies, and mute timings in the current organization.                                                                                                              |
-| `alert.notifications:read`            | n/a                                    | Read all templates, contact points, notification policies, and mute timings in the current organization.                                                                                                            |
-| `alert.rules.external:read`           | `datasources:*`<br>`datasources:uid:*` | Read alert rules in data sources that support alerting (Prometheus, Mimir, and Loki)                                                                                                                                |
-| `alert.rules.external:write`          | `datasources:*`<br>`datasources:uid:*` | Create, update, and delete alert rules in data sources that support alerting (Mimir and Loki).                                                                                                                      |
-| `alert.rules:create`                  | `folders:*`<br>`folders:uid:*`         | Create Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. |
-| `alert.rules:delete`                  | `folders:*`<br>`folders:uid:*`         | Delete Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. |
-| `alert.rules:read`                    | `folders:*`<br>`folders:uid:*`         | Read Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder.                                                                           |
-| `alert.rules:write`                   | `folders:*`<br>`folders:uid:*`         | Update Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. |
-| `alert.silences:create`               | `folders:*`<br>`folders:uid:*`         | Create rule-specific silences in a folder and its subfolders.                                                                                                                                                       |
-| `alert.silences:read`                 | `folders:*`<br>`folders:uid:*`         | Read all general silences and rule-specific silences in a folder and its subfolders.                                                                                                                                |
-| `alert.silences:write`                | `folders:*`<br>`folders:uid:*`         | Update and expire rule-specific silences in a folder and its subfolders.                                                                                                                                            |
-| `alert.provisioning:read`             | n/a                                    | Read all Grafana alert rules, notification policies, etc via provisioning API. Permissions to folders and data source are not required.                                                                             |
-| `alert.provisioning.secrets:read`     | n/a                                    | Same as `alert.provisioning:read` plus ability to export resources with decrypted secrets.                                                                                                                          |
-| `alert.provisioning:write`            | n/a                                    | Update all Grafana alert rules, notification policies, etc via provisioning API. Permissions to folders and data source are not required.                                                                           |
-| `alert.provisioning.provenance:write` | n/a                                    | Set provisioning status for alerting resources. Cannot be used alone. Requires user to have permissions to access resources                                                                                         |
-
-Contact point permissions. To enable API and user interface that use these permissions, enable the `alertingApiServer` feature toggle.
-
-| Action                                       | Applicable scope                   | Description                                                                                                 |
-| -------------------------------------------- | ---------------------------------- | ----------------------------------------------------------------------------------------------------------- |
-| `alert.notifications.receivers:read`         | `receivers:*`<br>`receivers:uid:*` | Read contact points.                                                                                        |
-| `alert.notifications.receivers.secrets:read` | `receivers:*`<br>`receivers:uid:*` | Export contact points with decrypted secrets.                                                               |
-| `alert.notifications.receivers:create`       | n/a                                | Create a new contact points. The creator is automatically granted full access to the created contact point. |
-| `alert.notifications.receivers:write`        | `receivers:*`<br>`receivers:uid:*` | Update existing contact points.                                                                             |
-| `alert.notifications.receivers:delete`       | `receivers:*`<br>`receivers:uid:*` | Update and delete existing contact points.                                                                  |
-| `receivers.permissions:read`                 | `receivers:*`<br>`receivers:uid:*` | Read permissions for contact points.                                                                        |
-| `receivers.permissions:write`                | `receivers:*`<br>`receivers:uid:*` | Manage permissions for contact points.                                                                      |
-
-Mute time interval permissions. To enable API and user interface that use these permissions, enable the `alertingApiServer` feature toggle.
-
-| Action                                      | Applicable scope | Description                                        |
-| ------------------------------------------- | ---------------- | -------------------------------------------------- |
-| `alert.notifications.time-intervals:read`   | n/a              | Read mute time intervals.                          |
-| `alert.notifications.time-intervals:write`  | n/a              | Create new or update existing mute time intervals. |
-| `alert.notifications.time-intervals:delete` | n/a              | Delete existing time intervals.                    |
-
-Notification template permissions. To enable these permissions, enable the `alertingApiServer` feature toggle.
-
-| Action                                 | Applicable scope | Description                              |
-| -------------------------------------- | ---------------- | ---------------------------------------- |
-| `alert.notifications.templates:read`   | n/a              | Read templates.                          |
-| `alert.notifications.templates:write`  | n/a              | Create new or update existing templates. |
-| `alert.notifications.templates:delete` | n/a              | Delete existing templates.               |
-
-Notification policies permissions. To enable API and user interface that use these permissions, enable the `alertingApiServer` feature toggle.
-
-| Action                             | Applicable scope | Description                                          |
-| ---------------------------------- | ---------------- | ---------------------------------------------------- |
-| `alert.notifications.routes:read`  | n/a              | Read notification policies.                          |
-| `alert.notifications.routes:write` | n/a              | Create new, update and update notification policies. |
+| Action                                       | Applicable scope                       | Description                                                                                                                                                                                                         |
+| -------------------------------------------- | -------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `alert.instances.external:read`              | `datasources:*`<br>`datasources:uid:*` | Read alerts and silences in data sources that support alerting.                                                                                                                                                     |
+| `alert.instances.external:write`             | `datasources:*`<br>`datasources:uid:*` | Manage alerts and silences in data sources that support alerting.                                                                                                                                                   |
+| `alert.instances:create`                     | n/a                                    | Create silences in the current organization.                                                                                                                                                                        |
+| `alert.instances:read`                       | n/a                                    | Read alerts and silences in the current organization.                                                                                                                                                               |
+| `alert.instances:write`                      | n/a                                    | Update and expire silences in the current organization.                                                                                                                                                             |
+| `alert.notifications.external:read`          | `datasources:*`<br>`datasources:uid:*` | Read templates, contact points, notification policies, and mute timings in data sources that support alerting.                                                                                                      |
+| `alert.notifications.external:write`         | `datasources:*`<br>`datasources:uid:*` | Manage templates, contact points, notification policies, and mute timings in data sources that support alerting.                                                                                                    |
+| `alert.notifications:write`                  | n/a                                    | Manage templates, contact points, notification policies, and mute timings in the current organization.                                                                                                              |
+| `alert.notifications:read`                   | n/a                                    | Read all templates, contact points, notification policies, and mute timings in the current organization.                                                                                                            |
+| `alert.rules.external:read`                  | `datasources:*`<br>`datasources:uid:*` | Read alert rules in data sources that support alerting (Prometheus, Mimir, and Loki)                                                                                                                                |
+| `alert.rules.external:write`                 | `datasources:*`<br>`datasources:uid:*` | Create, update, and delete alert rules in data sources that support alerting (Mimir and Loki).                                                                                                                      |
+| `alert.rules:create`                         | `folders:*`<br>`folders:uid:*`         | Create Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. |
+| `alert.rules:delete`                         | `folders:*`<br>`folders:uid:*`         | Delete Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. |
+| `alert.rules:read`                           | `folders:*`<br>`folders:uid:*`         | Read Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder.                                                                           |
+| `alert.rules:write`                          | `folders:*`<br>`folders:uid:*`         | Update Grafana alert rules in a folder and its subfolders. Combine this permission with `folders:read` in a scope that includes the folder and `datasources:query` in the scope of data sources the user can query. |
+| `alert.silences:create`                      | `folders:*`<br>`folders:uid:*`         | Create rule-specific silences in a folder and its subfolders.                                                                                                                                                       |
+| `alert.silences:read`                        | `folders:*`<br>`folders:uid:*`         | Read all general silences and rule-specific silences in a folder and its subfolders.                                                                                                                                |
+| `alert.silences:write`                       | `folders:*`<br>`folders:uid:*`         | Update and expire rule-specific silences in a folder and its subfolders.                                                                                                                                            |
+| `alert.provisioning:read`                    | n/a                                    | Read all Grafana alert rules, notification policies, etc via provisioning API. Permissions to folders and data source are not required.                                                                             |
+| `alert.provisioning.secrets:read`            | n/a                                    | Same as `alert.provisioning:read` plus ability to export resources with decrypted secrets.                                                                                                                          |
+| `alert.provisioning:write`                   | n/a                                    | Update all Grafana alert rules, notification policies, etc via provisioning API. Permissions to folders and data source are not required.                                                                           |
+| `alert.provisioning.provenance:write`        | n/a                                    | Set provisioning status for alerting resources. Cannot be used alone. Requires user to have permissions to access resources                                                                                         |
+| `alert.notifications.receivers:read`         | `receivers:*`<br>`receivers:uid:*`     | Read contact points.                                                                                                                                                                                                |
+| `alert.notifications.receivers.secrets:read` | `receivers:*`<br>`receivers:uid:*`     | Export contact points with decrypted secrets.                                                                                                                                                                       |
+| `alert.notifications.receivers:create`       | n/a                                    | Create a new contact points. The creator is automatically granted full access to the created contact point.                                                                                                         |
+| `alert.notifications.receivers:write`        | `receivers:*`<br>`receivers:uid:*`     | Update existing contact points.                                                                                                                                                                                     |
+| `alert.notifications.receivers:delete`       | `receivers:*`<br>`receivers:uid:*`     | Update and delete existing contact points.                                                                                                                                                                          |
+| `receivers.permissions:read`                 | `receivers:*`<br>`receivers:uid:*`     | Read permissions for contact points.                                                                                                                                                                                |
+| `receivers.permissions:write`                | `receivers:*`<br>`receivers:uid:*`     | Manage permissions for contact points.                                                                                                                                                                              |
+| `alert.notifications.time-intervals:read`    | n/a                                    | Read mute time intervals.                                                                                                                                                                                           |
+| `alert.notifications.time-intervals:write`   | n/a                                    | Create new or update existing mute time intervals.                                                                                                                                                                  |
+| `alert.notifications.time-intervals:delete`  | n/a                                    | Delete existing time intervals.                                                                                                                                                                                     |
+| `alert.notifications.templates:read`         | n/a                                    | Read templates.                                                                                                                                                                                                     |
+| `alert.notifications.templates:write`        | n/a                                    | Create new or update existing templates.                                                                                                                                                                            |
+| `alert.notifications.templates:delete`       | n/a                                    | Delete existing templates.                                                                                                                                                                                          |
+| `alert.notifications.routes:read`            | n/a                                    | Read notification policies.                                                                                                                                                                                         |
+| `alert.notifications.routes:write`           | n/a                                    | Create new, update and update notification policies.                                                                                                                                                                |

 To help plan your RBAC rollout strategy, refer to [Plan your RBAC rollout strategy](https://grafana.com/docs/grafana/next/administration/roles-and-permissions/access-control/plan-rbac-rollout-strategy/).
@@ -56,20 +56,15 @@ Details of the fixed roles and the access they provide for Grafana Alerting are
 | Read via Provisioning API + Export Secrets: `fixed:alerting.provisioning.secrets:reader` | `alert.provisioning:read` and `alert.provisioning.secrets:read`                                                                                                                                                                                                                                                                                 | Read alert rules, alert instances, silences, contact points, and notification policies using the provisioning API and use export with decrypted secrets. |
 | Access to alert rules provisioning API: `fixed:alerting.provisioning:writer`             | `alert.provisioning:read` and `alert.provisioning:write`                                                                                                                                                                                                                                                                                        | Manage all alert rules, notification policies, contact points, templates, in the organization using the provisioning API.                                |
 | Set provisioning status: `fixed:alerting.provisioning.status:writer`                     | `alert.provisioning.provenance:write`                                                                                                                                                                                                                                                                                                           | Set provisioning rules for Alerting resources. Should be used together with other regular roles (Notifications Writer and/or Rules Writer.)              |
-
-If you have enabled the `alertingApiServer` feature toggle, an additional set of fixed roles is available.
-
-| Display name in UI / Fixed role                               | Permissions                                                                                                                                                                                 | Description                                                                                             |
-| ------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- |
-| Contact Point Reader: `fixed:alerting.receivers:reader`       | `alert.notifications.receivers:read` for scope `receivers:*`                                                                                                                                | Read all contact points.                                                                                |
-| Contact Point Creator: `fixed:alerting.receivers:creator`     | `alert.notifications.receivers:create`                                                                                                                                                      | Create a new contact point. The user is automatically granted full access to the created contact point. |
-| Contact Point Writer: `fixed:alerting.receivers:writer`       | `alert.notifications.receivers:read`, `alert.notifications.receivers:write`, `alert.notifications.receivers:delete` for scope `receivers:*` and <br> `alert.notifications.receivers:create` | Create a new contact point and manage all existing contact points.                                      |
-| Templates Reader: `fixed:alerting.templates:reader`           | `alert.notifications.templates:read`                                                                                                                                                        | Read all notification templates.                                                                        |
-| Templates Writer: `fixed:alerting.templates:writer`           | `alert.notifications.templates:read`, `alert.notifications.templates:write`, `alert.notifications.templates:delete`                                                                         | Create new and manage existing notification templates.                                                  |
-| Time Intervals Reader: `fixed:alerting.time-intervals:reader` | `alert.notifications.time-intervals:read`                                                                                                                                                   | Read all time intervals.                                                                                |
-| Time Intervals Writer: `fixed:alerting.time-intervals:writer` | `alert.notifications.time-intervals:read`, `alert.notifications.time-intervals:write`, `alert.notifications.time-intervals:delete`                                                          | Create new and manage existing time intervals.                                                          |
-| Notification Policies Reader: `fixed:alerting.routes:reader`  | `alert.notifications.routes:read`                                                                                                                                                           | Read all time intervals.                                                                                |
-| Notification Policies Writer: `fixed:alerting.routes:writer`  | `alert.notifications.routes:read` `alert.notifications.routes:write`                                                                                                                        | Create new and manage existing time intervals.                                                          |
+| Contact Point Reader: `fixed:alerting.receivers:reader`                                  | `alert.notifications.receivers:read` for scope `receivers:*`                                                                                                                                                                                                                                                                                    | Read all contact points.                                                                                                                                 |
+| Contact Point Creator: `fixed:alerting.receivers:creator`                                | `alert.notifications.receivers:create`                                                                                                                                                                                                                                                                                                          | Create a new contact point. The user is automatically granted full access to the created contact point.                                                  |
+| Contact Point Writer: `fixed:alerting.receivers:writer`                                  | `alert.notifications.receivers:read`, `alert.notifications.receivers:write`, `alert.notifications.receivers:delete` for scope `receivers:*` and <br> `alert.notifications.receivers:create`                                                                                                                                                     | Create a new contact point and manage all existing contact points.                                                                                       |
+| Templates Reader: `fixed:alerting.templates:reader`                                      | `alert.notifications.templates:read`                                                                                                                                                                                                                                                                                                            | Read all notification templates.                                                                                                                         |
+| Templates Writer: `fixed:alerting.templates:writer`                                      | `alert.notifications.templates:read`, `alert.notifications.templates:write`, `alert.notifications.templates:delete`                                                                                                                                                                                                                             | Create new and manage existing notification templates.                                                                                                   |
+| Time Intervals Reader: `fixed:alerting.time-intervals:reader`                            | `alert.notifications.time-intervals:read`                                                                                                                                                                                                                                                                                                       | Read all time intervals.                                                                                                                                 |
+| Time Intervals Writer: `fixed:alerting.time-intervals:writer`                            | `alert.notifications.time-intervals:read`, `alert.notifications.time-intervals:write`, `alert.notifications.time-intervals:delete`                                                                                                                                                                                                              | Create new and manage existing time intervals.                                                                                                           |
+| Notification Policies Reader: `fixed:alerting.routes:reader`                             | `alert.notifications.routes:read`                                                                                                                                                                                                                                                                                                               | Read all time intervals.                                                                                                                                 |
+| Notification Policies Writer: `fixed:alerting.routes:writer`                             | `alert.notifications.routes:read` `alert.notifications.routes:write`                                                                                                                                                                                                                                                                            | Create new and manage existing time intervals.                                                                                                           |

 ## Create custom roles

@@ -69,8 +69,6 @@ To manage folder permissions, complete the following steps.

 ### Before you begin

- Enable the `alertingApiServer` feature toggle.
-
 Extend or limit the access provided by a role to contact points by assigning permissions to individual contact point.

 This allows different users, teams, or service accounts to have customized access to read or modify specific contact points.
@@ -1,7 +1,7 @@
 ---
 aliases:
  - administration/cli/
-description: Guide to using grafana cli
+description: Guide to using grafana server cli
 keywords:
  - grafana
  - cli
@@ -11,15 +11,15 @@ labels:
  products:
    - enterprise
    - oss
-title: Grafana CLI
+title: Grafana server CLI
 weight: 400
 ---

-# Grafana CLI
+# Grafana server CLI

-Grafana CLI is a small executable that's bundled with Grafana server.
+Grafana server CLI is a small executable that's bundled with Grafana server.
 You can run it on the same machine Grafana server is running on.
-Grafana CLI has `plugins` and `admin` commands, as well as global options.
+Grafana server CLI has `plugins` and `admin` commands, as well as global options.

 To list all commands and options:

@@ -27,9 +27,9 @@ To list all commands and options:
 grafana cli -h
 ```

-## Run Grafana CLI
+## Run Grafana server CLI

-To run Grafana CLI, add the path to the Grafana binaries in your `PATH` environment variable.
+To run Grafana server CLI, add the path to the Grafana binaries in your `PATH` environment variable.
 Alternately, if your current directory is the `bin` directory, run `./grafana cli`.
 Otherwise, you can specify full path to the binary.
 For example, on Linux `/usr/share/grafana/bin/grafana` and on Windows `C:\Program Files\GrafanaLabs\grafana\bin\grafana.exe`, and run it with `grafana cli`.
@@ -41,7 +41,7 @@ If you're on Windows, run Windows PowerShell as Administrator.

 ## Grafana CLI command syntax

-The general syntax for commands in Grafana CLI is:
+The general syntax for commands in Grafana server CLI is:

 ```bash
 grafana cli [global options] command [command options] [arguments...]
@@ -49,11 +49,11 @@ grafana cli [global options] command [command options] [arguments...]

 ## Global options

-Grafana CLI allows you to temporarily override certain Grafana default settings. Except for `--help` and `--version`, most global options are only used by developers.
+Grafana server CLI allows you to temporarily override certain Grafana default settings. Except for `--help` and `--version`, most global options are only used by developers.

 Each global option applies only to the command in which it is used. For example, `--pluginsDir value` does not permanently change where Grafana saves plugins. It only changes it for command in which you apply the option.

-### Display Grafana CLI help
+### Display Grafana server CLI help

 `--help` or `-h` displays the help, including default paths and Docker configuration information.

@@ -63,9 +63,9 @@ Each global option applies only to the command in which it is used. For example,
 grafana cli -h
 ```

-### Display Grafana CLI version
+### Display Grafana server CLI version

-`--version` or `-v` prints the version of Grafana CLI currently running.
+`--version` or `-v` prints the version of Grafana server CLI currently running.

 **Example:**

@@ -0,0 +1,99 @@
+---
+aliases:
+  - ../../http_api/new_api_structure/
+  - ../../http_api/new_api_structure/
+canonical: /docs/grafana/latest/developers/http_api/new_api_structure/
+description: ''
+keywords:
+  - grafana
+  - http
+  - documentation
+  - api
+labels:
+  products:
+    - enterprise
+    - oss
+title: New API Structure
+---
+
+# Grafana's New API Structure
+
+## Overview
+
+Going forward, Grafana's HTTP API will follow a standardized API structure alongside consistent API versioning.
+
+## API Path Structure
+
+All Grafana APIs follow this standardized format:
+
+```
+/apis/<group>/<version>/namespaces/<namespace>/<resource>[/<name>]
+```
+
+Where the final `/<name>` segment is used for operations on individual resources (like Get, Update, Delete) and omitted for collection operations (like List, Create).
+
+## Understanding the Components
+
+### Group (`<group>`)
+
+Groups organize related functionality into logical collections. For example `dashboard.grafana.app` will be used for all dashboard-related operations.
+
+### Version (`<version>`)
+
+These APIs will also uses semantic versioning with three stability levels:
+
+| Level | Format     | Description                                                                 | Use Case                 |
+| ----- | ---------- | --------------------------------------------------------------------------- | ------------------------ |
+| Alpha | `v1alpha1` | Early development stage. Unstable, may contain bugs, and subject to removal | For testing new features |
+| Beta  | `v1beta1`  | More stable than alpha, but may still have some changes                     | For early production use |
+| GA    | `v1`       | Generally Available. Stable with backward compatibility guarantees          | For production use       |
+
+### Namespace (`<namespace>`)
+
+Namespaces isolate resources within your Grafana instance. The format varies by deployment type:
+
+#### OSS & On-Premise Grafana
+
+- Default organization (org 1): `default`
+- Additional organizations: `org-<org_id>`
+
+#### Grafana Cloud
+
+- Format: `stacks-<stack_id>`
+- Your instance ID is the `stack_id`. You can find this value by either:
+  - Going to grafana.com, clicking on your stack, and selecting "Details" on your Grafana instance
+  - Accessing the /swagger page in your cloud instance, where the namespace will be automatically populated on the relevant endpoints
+
+### Resource (`<resource>`)
+
+Represents the core resource you want to interact with, such as:
+
+- `dashboards`
+- `playlists`
+- `folders`
+
+### Name (<name>)
+
+The `<name>` is the unique identifier for a specific instance of a resource within its namespace and resource type. `<name>` is distinct from the metadata.uid field. The URL path will always use the metadata.name.
+
+For example, to get a dashboard defined as:
+
+```
+{
+  "kind": "Dashboard",
+  "apiVersion": "dashboard.grafana.app/v1beta1",
+  "metadata": {
+    "name": "production-overview", // This value IS used in the URL path
+    "namespace": "default",
+    "uid": "a1b2c3d4-e5f6-7890-g1h2-i3j4k5l6m7n8" // This value is NOT used in the URL path
+    // ... other metadata
+  },
+  "spec": {
+    // ... dashboard spec
+  }
+}
+```
+
+You would use the following API call:
+
+`GET /apis/dashboard.grafana.app/v1beta1/namespaces/default/dashboards/production-overview`
@@ -16,22 +16,859 @@ labels:
 title: Dashboard HTTP API
 ---

-# Dashboard API
+# New Dashboard APIs

 > If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions](/docs/grafana/latest/administration/roles-and-permissions/access-control/custom-role-actions-scopes/) for more information.

-## Identifier (id) vs unique identifier (uid)
+> To view more about the new api structure, refer to [API overview]({{< ref "apis" >}}).

-The identifier (id) of a dashboard is an auto-incrementing numeric value and is only unique per Grafana install.
+## Create Dashboard

-The unique identifier (uid) of a dashboard can be used for uniquely identify a dashboard between multiple Grafana installs.
+`POST /apis/dashboard.grafana.app/v1beta1/namespaces/:namespace/dashboards`
+
+Creates a new dashboard.
+
+- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#dashboard-api" >}}) for an explanation.
+
+<!-- prettier-ignore-start -->
+| Action              | Scope                                                                                                   |
+| ------------------- | ------------------------------------------------------------------------------------------------------- |
+| `dashboards:create` | <ul><li>`folders:*`</li><li>`folders:uid:*`</li></ul>                                                   |
+| `dashboards:write`  | <ul><li>`dashboards:*`</li><li>`dashboards:uid:*`</li><li>`folders:*`</li><li>`folders:uid:*`</li></ul> |
+{ .no-spacing-list }
+<!-- prettier-ignore-end -->
+
+**Example Create Request**:
+
+```http
+POST /apis/dashboard.grafana.app/v1beta1/namespaces/default/dashboards HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+
+```
+
+JSON Body schema:
+
+- **metadata.name** – The Grafana [unique identifier]({{< ref "#identifier-id-vs-unique-identifier-uid" >}}). If you do not want to provide this, set metadata.generateName instead to the prefix you would like for the randomly generated uid (cannot be an empty string).
+- **metadata.annotations.grafana.app/folder** - Optional field, the unique identifier of the folder under which the dashboard should be created.
+- **spec** – The dashboard json.
+
+**Example Response**:
+
+```http
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=UTF-8
+Content-Length: 485
+
+```
+
+Status Codes:
+
+- **201** – Created
+- **400** – Errors (invalid json, missing or invalid fields, etc)
+- **401** – Unauthorized
+- **403** – Access denied
+- **409** – Conflict (dashboard with the same uid already exists)
+
+## Update Dashboard
+
+`PUT /apis/dashboard.grafana.app/v1beta1/namespaces/:namespace/dashboards/:uid`
+
+Updates an existing dashboard via the dashboard uid.
+
+- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+- uid: the unique identifier of the dashboard to update. this will be the _name_ in the dashboard response
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#dashboard-api" >}}) for an explanation.
+
+<!-- prettier-ignore-start -->
+| Action              | Scope                                                                                                   |
+| ------------------- | ------------------------------------------------------------------------------------------------------- |
+| `dashboards:write`  | <ul><li>`dashboards:*`</li><li>`dashboards:uid:*`</li><li>`folders:*`</li><li>`folders:uid:*`</li></ul> |
+{ .no-spacing-list }
+<!-- prettier-ignore-end -->
+
+**Example Update Request**:
+
+```http
+POST /apis/dashboard.grafana.app/v1beta1/namespaces/default/dashboards/gdxccn HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+
+```
+
+JSON Body schema:
+
+- **metadata.name** – The [unique identifier]({{< ref "#identifier-id-vs-unique-identifier-uid" >}}).
+- **metadata.annotations.grafana.app/folder** - Optional field, the unique identifier of the folder under which the dashboard should be created.
+- **metadata.annotations.grafana.app/message** - Optional field, to set a commit message for the version history.
+- **spec** – The dashboard json.
+
+**Example Response**:
+
+```http
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=UTF-8
+Content-Length: 485
+
+```
+
+Status Codes:
+
+- **200** – OK
+- **400** – Errors (invalid json, missing or invalid fields, etc)
+- **401** – Unauthorized
+- **403** – Access denied
+- **409** – Conflict (dashboard with the same version already exists)
+
+## Get Dashboard
+
+`GET /apis/dashboard.grafana.app/v1beta1/namespaces/:namespace/dashboards/:uid`
+
+Gets a dashboard via the dashboard uid.
+
+- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+- uid: the unique identifier of the dashboard to update. this will be the _name_ in the dashboard response
+
+Note: For large dashboards, add `/dto` to the end of the URL to get the full dashboard body.
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#dashboard-api" >}}) for an explanation.
+
+<!-- prettier-ignore-start -->
+| Action            | Scope                                                                                                   |
+| ----------------- | ------------------------------------------------------------------------------------------------------- |
+| `dashboards:read` | <ul><li>`dashboards:*`</li><li>`dashboards:uid:*`</li><li>`folders:*`</li><li>`folders:uid:*`</li></ul> |
+{ .no-spacing-list }
+<!-- prettier-ignore-end -->
+
+**Example Get Request**:
+
+```http
+GET /apis/dashboard.grafana.app/v1beta1/namespaces/default/dashboards/gdxccn HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=UTF-8
+Content-Length: 485
+
+```
+
+Status Codes:
+
+- **200** – OK
+- **401** – Unauthorized
+- **403** – Access denied
+- **404** – Not Found
+
+## List Dashboards
+
+`GET /apis/dashboard.grafana.app/v1beta1/namespaces/:namespace/dashboards`
+
+Lists all dashboards in the given organization. You can control the maximum number of dashboards returned through the `limit` query parameter. You can then use the `continue` token returned to fetch the next page of dashboards.
+
+- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+
+Note: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#dashboard-api" >}}) for an explanation.
+
+<!-- prettier-ignore-start -->
+| Action            | Scope                                                                                                   |
+| ----------------- | ------------------------------------------------------------------------------------------------------- |
+| `dashboards:read` | <ul><li>`dashboards:*`</li><li>`dashboards:uid:*`</li><li>`folders:*`</li><li>`folders:uid:*`</li></ul> |
+{ .no-spacing-list }
+<!-- prettier-ignore-end -->
+
+**Example Get Request**:
+
+```http
+GET /apis/dashboard.grafana.app/v1beta1/namespaces/default/dashboards?limit=1 HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=UTF-8
+Content-Length: 644
+
+```
+
+Status Codes:
+
+- **200** – OK
+- **401** – Unauthorized
+- **403** – Access denied
+
+## Delete Dashboard
+
+`DELETE /apis/dashboard.grafana.app/v1beta1/namespaces/:namespace/dashboards/:uid`
+
+Deletes a dashboard via the dashboard uid.
+
+- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+- uid: the unique identifier of the dashboard to update. this will be the _name_ in the dashboard response
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#dashboard-api" >}}) for an explanation.
+
+<!-- prettier-ignore-start -->
+| Action              | Scope                                                                                                   |
+| ------------------- | ------------------------------------------------------------------------------------------------------- |
+| `dashboards:delete` | <ul><li>`dashboards:*`</li><li>`dashboards:uid:*`</li><li>`folders:*`</li><li>`folders:uid:*`</li></ul> |
+{ .no-spacing-list }
+<!-- prettier-ignore-end -->
+
+**Example Delete Request**:
+
+```http
+DELETE /apis/dashboard.grafana.app/v1beta1/namespaces/default/dashboards/gdxccn HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=UTF-8
+Content-Length: 78
+
+```
+
+Status Codes:
+
+- **200** – OK
+- **401** – Unauthorized
+- **403** – Access denied
+- **404** – Not found
+
+## Gets the home dashboard
+
+`GET /api/dashboards/home`
+
+Will return the home dashboard.
+
+**Example Request**:
+
+```http
+GET /api/dashboards/home HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+```
+
+## Tags for Dashboard
+
+`GET /api/dashboards/tags`
+
+Get all tags of dashboards
+
+**Example Request**:
+
+```http
+GET /api/dashboards/tags HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+```
+
+## Dashboard Search
+
+See [Folder/Dashboard Search API]({{< relref "folder_dashboard_search/" >}}).
+
+## APIs
+
+### Unique identifier (uid) vs identifier (id)
+
+The unique identifier (uid) of a dashboard can be used to uniquely identify a dashboard within a given org.
+It's automatically generated if not provided when creating a dashboard. The uid allows having consistent URLs for accessing
+dashboards and when syncing dashboards between multiple Grafana installs, see [dashboard provisioning](/docs/grafana/latest/administration/provisioning/#dashboards)
+for more information. This means that changing the title of a dashboard will not break any bookmarked links to that dashboard.
+
+The uid can have a maximum length of 40 characters.
+
+The identifier (id) of a dashboard is deprecated in favor of the unique identifier (uid).
+
+### Create / Update dashboard
+
+`POST /api/dashboards/db`
+
+Creates a new dashboard or updates an existing dashboard. When updating existing dashboards, if you do not define the `folderId` or the `folderUid` property, then the dashboard(s) are moved to the root level. (You need to define only one property, not both).
+
+> **Note:** This endpoint is not intended for creating folders, use `POST /api/folders` for that.
+
+**Required permissions**
+
+See note in the [introduction](#dashboard-api) for an explanation.
+
+<!-- prettier-ignore-start -->
+| Action              | Scope                                                                                                   |
+| ------------------- | ------------------------------------------------------------------------------------------------------- |
+| `dashboards:create` | <ul><li>`folders:*`</li><li>`folders:uid:*`</li></ul>                                                   |
+| `dashboards:write`  | <ul><li>`dashboards:*`</li><li>`dashboards:uid:*`</li><li>`folders:*`</li><li>`folders:uid:*`</li></ul> |
+{ .no-spacing-list }
+<!-- prettier-ignore-end -->
+
+**Example Request for new dashboard**:
+
+```http
+POST /api/dashboards/db HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+
+```
+
+JSON Body schema:
+
+- **dashboard** – The complete dashboard model.
+- **dashboard.id** – id = null to create a new dashboard.
+- **dashboard.uid** – Optional unique identifier when creating a dashboard. uid = null will generate a new uid.
+- **dashboard.refresh** - Set the dashboard refresh interval. If this is lower than [the minimum refresh interval](/docs/grafana/latest/setup-grafana/configure-grafana/#min_refresh_interval), then Grafana will ignore it and will enforce the minimum refresh interval.
+- **folderId** – The id of the folder to save the dashboard in.
+- **folderUid** – The UID of the folder to save the dashboard in. Overrides the `folderId`.
+- **overwrite** – Set to true if you want to overwrite an existing dashboard with a given dashboard UID.
+- **message** - Set a commit message for the version history.
+
+**Example Request for updating a dashboard**:
+
+```http
+POST /api/dashboards/db HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=UTF-8
+Content-Length: 78
+
+```
+
+Status Codes:
+
+- **200** – Created
+- **400** – Errors (invalid json, missing or invalid fields, etc)
+- **401** – Unauthorized
+- **403** – Access denied
+- **412** – Precondition failed
+
+The **412** status code is used for explaining that you cannot create the dashboard and why.
+There can be different reasons for this:
+
+- The dashboard has been changed by someone else, `status=version-mismatch`
+- A dashboard with the same uid already exists, `status=name-exists`
+- The dashboard belongs to plugin `<plugin title>`, `status=plugin-dashboard`
+
+The response body will have the following properties:
+
+```http
+HTTP/1.1 412 Precondition Failed
+Content-Type: application/json; charset=UTF-8
+Content-Length: 97
+
+```
+
+### Get dashboard by uid
+
+`GET /api/dashboards/uid/:uid`
+
+Will return the dashboard given the dashboard unique identifier (uid). Information about the unique identifier of a folder containing the requested dashboard might be found in the metadata.
+
+**Required permissions**
+
+See note in the [introduction](#dashboard-api) for an explanation.
+
+<!-- prettier-ignore-start -->
+| Action            | Scope                                                                                                   |
+| ----------------- | ------------------------------------------------------------------------------------------------------- |
+| `dashboards:read` | <ul><li>`dashboards:*`</li><li>`dashboards:uid:*`</li><li>`folders:*`</li><li>`folders:uid:*`</li></ul> |
+{ .no-spacing-list }
+<!-- prettier-ignore-end -->
+
+**Example Request**:
+
+```http
+GET /api/dashboards/uid/cIBgcSjkk HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+```
+
+Status Codes:
+
+- **200** – Found
+- **401** – Unauthorized
+- **403** – Access denied
+- **404** – Not found
+
+### Delete dashboard by uid
+
+`DELETE /api/dashboards/uid/:uid`
+
+Will delete the dashboard given the specified unique identifier (uid).
+
+**Required permissions**
+
+See note in the [introduction](#dashboard-api) for an explanation.
+
+<!-- prettier-ignore-start -->
+| Action              | Scope                                                                                                   |
+| ------------------- | ------------------------------------------------------------------------------------------------------- |
+| `dashboards:delete` | <ul><li>`dashboards:*`</li><li>`dashboards:uid:*`</li><li>`folders:*`</li><li>`folders:uid:*`</li></ul> |
+{ .no-spacing-list }
+<!-- prettier-ignore-end -->
+
+**Example Request**:
+
+```http
+DELETE /api/dashboards/uid/cIBgcSjkk HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+```
+
+Status Codes:
+
+- **200** – Deleted
+- **401** – Unauthorized
+- **403** – Access denied
+- **404** – Not found
+
+## Gets the home dashboard
+
+`GET /api/dashboards/home`
+
+Will return the home dashboard.
+
+**Example Request**:
+
+```http
+GET /api/dashboards/home HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+```
+
+## Tags for Dashboard
+
+`GET /api/dashboards/tags`
+
+Get all tags of dashboards
+
+**Example Request**:
+
+```http
+GET /api/dashboards/tags HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+```
+
+## Dashboard Search
+
+See [Folder/Dashboard Search API](../folder_dashboard_search/).
+    "schemaVersion": 41,
+    "title": "New dashboard - updated",
+    ...
+  }
+}
+```
+
+Status Codes:
+
+- **200** – OK
+- **400** – Errors (invalid json, missing or invalid fields, etc)
+- **401** – Unauthorized
+- **403** – Access denied
+- **409** – Conflict (dashboard with the same version already exists)
+
+## Get Dashboard
+
+`GET /apis/dashboard.grafana.app/v1beta1/namespaces/:namespace/dashboards/:uid`
+
+Gets a dashboard via the dashboard uid.
+
+- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+- uid: the unique identifier of the dashboard to update. this will be the _name_ in the dashboard response
+
+Note: For large dashboards, add `/dto` to the end of the URL to get the full dashboard body.
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#dashboard-api" >}}) for an explanation.
+
+<!-- prettier-ignore-start -->
+| Action            | Scope                                                                                                   |
+| ----------------- | ------------------------------------------------------------------------------------------------------- |
+| `dashboards:read` | <ul><li>`dashboards:*`</li><li>`dashboards:uid:*`</li><li>`folders:*`</li><li>`folders:uid:*`</li></ul> |
+{ .no-spacing-list }
+<!-- prettier-ignore-end -->
+
+**Example Get Request**:
+
+```http
+GET /apis/dashboard.grafana.app/v1beta1/namespaces/default/dashboards/gdxccn HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=UTF-8
+Content-Length: 485
+
+{
+  "kind": "Dashboard",
+  "apiVersion": "dashboard.grafana.app/v1beta1",
+  "metadata": {
+    "name": "gdxccn",
+    "namespace": "default",
+    "uid": "Cc7fA5ffHY94NnHZyMxXvFlpFtOmkK3qkBcVZPKSPXcX",
+    "resourceVersion": "2",
+    "generation": 2,
+    "creationTimestamp": "2025-03-06T19:57:18Z",
+    "annotations": {
+      "grafana.app/createdBy": "service-account:cef2t2rfm73lsb",
+      "grafana.app/updatedBy": "service-account:cef2t2rfm73lsb",
+      "grafana.app/updatedTimestamp": "2025-03-07T02:58:36Z"
+    }
+  },
+  "spec": {
+    "schemaVersion": 41,
+    "title": "New dashboard - updated",
+    ...
+  }
+}
+```
+
+Status Codes:
+
+- **200** – OK
+- **401** – Unauthorized
+- **403** – Access denied
+- **404** – Not Found
+
+## List Dashboards
+
+`GET /apis/dashboard.grafana.app/v1beta1/namespaces/:namespace/dashboards`
+
+Lists all dashboards in the given organization. You can control the maximum number of dashboards returned through the `limit` query parameter. You can then use the `continue` token returned to fetch the next page of dashboards.
+
+- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+
+Note: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#dashboard-api" >}}) for an explanation.
+
+<!-- prettier-ignore-start -->
+| Action            | Scope                                                                                                   |
+| ----------------- | ------------------------------------------------------------------------------------------------------- |
+| `dashboards:read` | <ul><li>`dashboards:*`</li><li>`dashboards:uid:*`</li><li>`folders:*`</li><li>`folders:uid:*`</li></ul> |
+{ .no-spacing-list }
+<!-- prettier-ignore-end -->
+
+**Example Get Request**:
+
+```http
+GET /apis/dashboard.grafana.app/v1beta1/namespaces/default/dashboards?limit=1 HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=UTF-8
+Content-Length: 644
+
+{
+  "kind": "DashboardList",
+  "apiVersion": "dashboard.grafana.app/v1alpha1",
+  "metadata": {
+    "resourceVersion": "1741315830000",
+    "continue": "org:1/start:1158/folder:"
+  },
+  "items": [
+    {
+      "kind": "Dashboard",
+      "apiVersion": "dashboard.grafana.app/v1alpha1",
+      "metadata": {
+        "name": "gpqcmf",
+        "namespace": "default",
+        "uid": "VQyL7pNTpfGPNlPM6HRJSePrBg5dXmxr4iPQL7txLtwX",
+        "resourceVersion": "1",
+        "generation": 1,
+        "creationTimestamp": "2025-03-06T19:50:30Z",
+        "annotations": {
+          "grafana.app/createdBy": "service-account:cef2t2rfm73lsb",
+          "grafana.app/updatedBy": "service-account:cef2t2rfm73lsb",
+          "grafana.app/updatedTimestamp": "2025-03-06T19:50:30Z"
+        }
+      },
+      "spec": {
+        "schemaVersion": 41,
+        "title": "New dashboard",
+        "uid": "gpqcmf",
+        "version": 1,
+        ...
+      }
+    }
+  ]
+}
+```
+
+Status Codes:
+
+- **200** – OK
+- **401** – Unauthorized
+- **403** – Access denied
+
+## Delete Dashboard
+
+`DELETE /apis/dashboard.grafana.app/v1beta1/namespaces/:namespace/dashboards/:uid`
+
+Deletes a dashboard via the dashboard uid.
+
+- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+- uid: the unique identifier of the dashboard to update. this will be the _name_ in the dashboard response
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#dashboard-api" >}}) for an explanation.
+
+<!-- prettier-ignore-start -->
+| Action              | Scope                                                                                                   |
+| ------------------- | ------------------------------------------------------------------------------------------------------- |
+| `dashboards:delete` | <ul><li>`dashboards:*`</li><li>`dashboards:uid:*`</li><li>`folders:*`</li><li>`folders:uid:*`</li></ul> |
+{ .no-spacing-list }
+<!-- prettier-ignore-end -->
+
+**Example Delete Request**:
+
+```http
+DELETE /apis/dashboard.grafana.app/v1beta1/namespaces/default/dashboards/gdxccn HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=UTF-8
+Content-Length: 78
+
+{
+  "kind": "Status",
+  "apiVersion": "v1",
+  "metadata": {},
+  "status": "Success",
+  "details": {
+    "name": "gdxccn",
+    "group": "dashboard.grafana.app",
+    "kind": "dashboards",
+    "uid": "Cc7fA5ffHY94NnHZyMxXvFlpFtOmkK3qkBcVZPKSPXcX"
+  }
+}
+```
+
+Status Codes:
+
+- **200** – OK
+- **401** – Unauthorized
+- **403** – Access denied
+- **404** – Not found
+
+## Gets the home dashboard
+
+`GET /api/dashboards/home`
+
+Will return the home dashboard.
+
+**Example Request**:
+
+```http
+GET /api/dashboards/home HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+{
+  "dashboard": {
+    "editable":false,
+    "nav":[
+      {
+        "enable":false,
+        "type":"timepicker"
+      }
+    ],
+    "style":"dark",
+    "tags":[],
+    "templating":{
+      "list":[
+      ]
+    },
+    "time":{
+    },
+    "timezone":"browser",
+    "title":"Home",
+    "version":5
+  },
+  "meta":	{
+    "isHome":true,
+    "canSave":false,
+    "canEdit":false,
+    "canStar":false,
+    "url":"",
+    "expires":"0001-01-01T00:00:00Z",
+    "created":"0001-01-01T00:00:00Z"
+  }
+}
+```
+
+## Tags for Dashboard
+
+`GET /api/dashboards/tags`
+
+Get all tags of dashboards
+
+**Example Request**:
+
+```http
+GET /api/dashboards/tags HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+[
+  {
+    "term":"tag1",
+    "count":1
+  },
+  {
+    "term":"tag2",
+    "count":4
+  }
+]
+```
+
+## Dashboard Search
+
+See [Folder/Dashboard Search API]({{< relref "folder_dashboard_search/" >}}).
+
+## APIs
+
+### Unique identifier (uid) vs identifier (id)
+
+The unique identifier (uid) of a dashboard can be used to uniquely identify a dashboard within a given org.
 It's automatically generated if not provided when creating a dashboard. The uid allows having consistent URLs for accessing
 dashboards and when syncing dashboards between multiple Grafana installs, see [dashboard provisioning](/docs/grafana/latest/administration/provisioning/#dashboards)
 for more information. This means that changing the title of a dashboard will not break any bookmarked links to that dashboard.

 The uid can have a maximum length of 40 characters.

-## Create / Update dashboard
+The identifier (id) of a dashboard is deprecated in favor of the unique identifier (uid).
+
+### Create / Update dashboard

 `POST /api/dashboards/db`

@@ -155,7 +992,7 @@ Content-Length: 97
 }
 ```

-
+### Get dashboard by uid

 `GET /api/dashboards/uid/:uid`

@@ -214,7 +1051,7 @@ Status Codes:
 - **403** – Access denied
 - **404** – Not found

-```http
+### Delete dashboard by uid

 `DELETE /api/dashboards/uid/:uid`

@@ -16,19 +16,388 @@ labels:
 title: Folder HTTP API
 ---

-# Folder API
+# New Folders APIs

 > If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions](/docs/grafana/latest/administration/roles-and-permissions/access-control/custom-role-actions-scopes/) for more information.

+> To view more about the new api structure, refer to [API overview]({{< ref "apis" >}}).
+
+### Get all folders
+
+`GET /apis/folder.grafana.app/v1beta1/namespaces/:namespace/folders`
+
+Returns all folders that the authenticated user has permission to view within the given organization. Use the `limit` query parameter to control the maximum number of dashboards returned. To retrieve additional dashboards, utilize the `continue` token provided in the response to fetch the next page.
+
+- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#folder-api" >}}) for an explanation.
+
+| Action         | Scope       |
+| -------------- | ----------- |
+| `folders:read` | `folders:*` |
+
+**Example Request**:
+
+```http
+GET /apis/folder.grafana.app/v1beta1/namespaces/default/folders?limit=1 HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+{
+```
+
+Status Codes:
+
+- **200** – OK
+- **401** – Unauthorized
+- **403** – Access Denied
+
+### Get folder by uid
+
+`GET /apis/folder.grafana.app/v1beta1/namespaces/:namespace/folders/:uid`
+
+Will return the folder given the folder uid.
+
+- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+- uid: the unique identifier of the folder to update. this will be the _name_ in the folder response
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#folder-api" >}}) for an explanation.
+
+| Action         | Scope       |
+| -------------- | ----------- |
+| `folders:read` | `folders:*` |
+
+**Example Request**:
+
+```http
+GET /apis/folder.grafana.app/v1beta1/namespaces/default/folders/aef30vrzxs3y8d HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+{
+```
+
+Note the annotation `grafana.app/folder` which contains the uid of the parent folder.
+
+Status Codes:
+
+- **200** – Found
+- **401** – Unauthorized
+- **403** – Access Denied
+- **404** – Folder not found
+
+### Create folder
+
+`POST /apis/folder.grafana.app/v1beta1/namespaces/:namespace/folders`
+
+Creates a new folder.
+
+- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#folder-api" >}}) for an explanation.
+
+`folders:create` allows creating folders and subfolders. If granted with scope `folders:uid:general`, allows creating root level folders. Otherwise, allows creating subfolders under the specified folders.
+
+| Action           | Scope       |
+| ---------------- | ----------- |
+| `folders:create` | `folders:*` |
+| `folders:write`  | `folders:*` |
+
+**Example Request**:
+
+```http
+POST /apis/folder.grafana.app/v1beta1/namespaces/default/folders HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+
+```
+
+JSON Body schema:
+
+- **metadata.name** – The Grafana [unique identifier]({{< ref "#identifier-id-vs-unique-identifier-uid" >}}). If you do not want to provide this, set metadata.generateName to the prefix you would like for the uid.
+- **metadata.annotations.grafana.app/folder** - Optional field, the unique identifier of the parent folder under which the folder should be created. Requires nested folders to be enabled.
+- **spec.title** – The title of the folder.
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+{
+```
+
+Status Codes:
+
+- **201** – Created
+- **400** – Errors (invalid json, missing or invalid fields, etc)
+- **401** – Unauthorized
+- **403** – Access denied
+- **409** – Conflict (folder with the same uid already exists)
+
+### Update folder
+
+`PUT /apis/folder.grafana.app/v1beta1/namespaces/:namespace/folders/:uid`
+
+Updates an existing folder identified by uid.
+
+- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+- uid: the unique identifier of the folder to update. this will be the _name_ in the folder response
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#folder-api" >}}) for an explanation.
+
+| Action          | Scope       |
+| --------------- | ----------- |
+| `folders:write` | `folders:*` |
+
+**Example Request**:
+
+```http
+PUT /apis/folder.grafana.app/v1beta1/namespaces/default/folders/fef30w4jaxla8b HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+
+```
+
+JSON Body schema:
+
+- **metadata.name** – The [unique identifier]({{< ref "#identifier-id-vs-unique-identifier-uid" >}}) of the folder.
+- **metadata.annotations.grafana.app/folder** - Optional field, the unique identifier of the parent folder under which the folder should be - update this to move the folder under a different parent folder. Requires nested folders to be enabled.
+- **spec.title** – The title of the folder.
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+```
+
+Status Codes:
+
+- **200** – Updated
+- **400** – Errors (invalid json, missing or invalid fields, etc)
+- **401** – Unauthorized
+- **403** – Access Denied
+- **404** – Folder not found
+- **412** – Precondition failed (the folder has been changed by someone else). With this status code, the response body will have the following properties:
+
+```http
+HTTP/1.1 412 Precondition Failed
+Content-Type: application/json; charset=UTF-8
+Content-Length: 97
+
+```
+
+### Delete folder
+
+`DELETE /apis/folder.grafana.app/v1beta1/namespaces/:namespace/folders/:uid`
+
+Deletes an existing folder identified by UID along with all dashboards (and their alerts) stored in the folder. This operation cannot be reverted.
+
+If [Grafana Alerting]({{< relref "/docs/grafana/latest/alerting" >}}) is enabled, you can set an optional query parameter `forceDeleteRules=false` so that requests will fail with 400 (Bad Request) error if the folder contains any Grafana alerts. However, if this parameter is set to `true` then it will delete any Grafana alerts under this folder.
+
+- namespace: to read more about the namespace to use, see the [API overview]({{< ref "apis" >}}).
+- uid: the unique identifier of the folder to delete. this will be the _name_ in the folder response
+
+**Required permissions**
+
+See note in the [introduction]({{< ref "#folder-api" >}}) for an explanation.
+
+| Action           | Scope       |
+| ---------------- | ----------- |
+| `folders:delete` | `folders:*` |
+
+**Example Request**:
+
+```http
+DELETE /apis/folder.grafana.app/v1beta1/namespaces/default/folders/fef30w4jaxla8b HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+```
+
+Status Codes:
+
+- **200** – Deleted
+- **401** – Unauthorized
+- **400** – Bad Request
+- **403** – Access Denied
+- **404** – Folder not found
+
+## APIs
+
+## Identifier (id) vs unique identifier (uid)
+
+The unique identifier (uid) of a folder can be used for uniquely identify folders within an org. It's automatically generated if not provided when creating a folder. The uid allows having consistent URLs for accessing folders and when syncing folders between multiple Grafana installs. This means that changing the title of a folder will not break any bookmarked links to that folder.
+
+The uid can have a maximum length of 40 characters.
+
+The identifier (id) of a folder is deprecated in favor of the unique identifier (uid).
+
+### Get all folders
+
+`GET /api/folders`
+
+Returns all folders that the authenticated user has permission to view. You can control the maximum number of folders returned through the `limit` query parameter, the default is 1000. You can also pass the `page` query parameter for fetching folders from a page other than the first one.
+
+If nested folders are enabled, the operation expects an additional optional query parameter `parentUid` with the parent folder UID, and returns the immediate subfolders that the authenticated user has permission to view.
+If the parameter is not supplied, then the operation returns immediate subfolders under the root
+that the authenticated user has permission to view.
+
+**Required permissions**
+
+See note in the [introduction](#folder-api) for an explanation.
+
+| Action         | Scope       |
+| -------------- | ----------- |
+| `folders:read` | `folders:*` |
+
+**Example Request**:
+
+```http
+GET /api/folders?limit=10 HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+```
+
+### Get folder by uid
+
+`GET /api/folders/:uid`
+
+Will return the folder given the folder uid.
+
+**Required permissions**
+
+See note in the [introduction](#folder-api) for an explanation.
+
+| Action         | Scope       |
+| -------------- | ----------- |
+| `folders:read` | `folders:*` |
+
+**Example Request**:
+
+```http
+GET /api/folders/nErXDvCkzzh HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+```
+
+If nested folders are enabled, and the folder is nested (lives under another folder), then the response additionally contains:
+
+- **parentUid** - The parent folder UID.
+- **parents** - An array with the whole tree hierarchy, starting from the root going down up to the parent folder.
+
+Status Codes:
+
+- **200** – Found
+- **401** – Unauthorized
+- **403** – Access Denied
+- **404** – Folder not found
+
+### Create folder
+
+`POST /api/folders`
+
+Creates a new folder.
+
+**Required permissions**
+
+See note in the [introduction](#folder-api) for an explanation.
+
+`folders:create` allows creating folders and subfolders. If granted with scope `folders:uid:general`, allows creating root level folders. Otherwise, allows creating subfolders under the specified folders.
+
+| Action           | Scope       |
+| ---------------- | ----------- |
+| `folders:create` | `folders:*` |
+| `folders:write`  | `folders:*` |
+
+**Example Request**:
+
+```http
+POST /api/folders HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+
+```
+
+JSON Body schema:
+
+- **uid** – Optional [unique identifier](#identifier-id-vs-unique-identifier-uid).
+- **title** – The title of the folder.
+- **parentUid** - Optional field, the unique identifier of the parent folder under which the folder should be created. Requires nested folders to be enabled.
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+```
+
+If nested folders are enabled, and the folder is nested (lives under another folder) then the response additionally contains:
+
+- **parentUid** - the parent folder UID.
 - **parents** - an array with the whole tree hierarchy starting from the root going down up to the parent folder.

-The identifier (id) of a folder is an auto-incrementing numeric value and is only unique per Grafana install.
-
-The unique identifier (uid) of a folder can be used for uniquely identify folders between multiple Grafana installs. It's automatically generated if not provided when creating a folder. The uid allows having consistent URLs for accessing folders and when syncing folders between multiple Grafana installs. This means that changing the title of a folder will not break any bookmarked links to that folder.
+Status Codes:

 - **200** – Created
 - **400** – Errors (invalid json, missing or invalid fields, etc)
-## Get all folders
+- **401** – Unauthorized
+- **403** – Access Denied
+- **412** - Folder already exists

 ### Update folder

@@ -75,7 +444,7 @@ Content-Type: application/json

 Status Codes:

-| `folders:read` | `folders:*` |
+- **200** – Updated
 - **400** – Errors (invalid json, missing or invalid fields, etc)
 - **401** – Unauthorized
 - **403** – Access Denied
@@ -133,7 +502,7 @@ Status Codes:
 Status Codes:

 - **200** – Deleted
-JSON Body schema:
+- **401** – Unauthorized
 - **400** – Bad Request
 - **403** – Access Denied
 - **404** – Folder not found
@@ -207,7 +576,7 @@ Status Codes:
 - **403** – Access Denied
 - **412** - Folder already exists

- **401** – Unauthorized
+### Update folder

 `PUT /api/folders/:uid`

@@ -296,7 +665,7 @@ Content-Length: 97
 }
 ```

-
+### Delete folder

 `DELETE /api/folders/:uid`

@@ -342,7 +711,7 @@ Status Codes:
 - **403** – Access Denied
 - **404** – Folder not found

-## Move folder
+### Move folder

 `POST /api/folders/:uid/move`

@@ -855,6 +855,23 @@ Path to the default home dashboard. If this value is empty, then Grafana uses St
 On Linux, Grafana uses `/usr/share/grafana/public/dashboards/home.json` as the default home dashboard location.
 {{< /admonition >}}

+### `[dashboard_cleanup]`
+
+Settings related to cleaning up associated dashboards information if the dashboard was deleted through /apis.
+
+#### `interval`
+
+How often to run the job to cleanup associated resources. The default interval is `30s`. The minimum allowed value is `10s` to ensure the system isn't overloaded.
+
+The interval string must include a unit suffix (ms, s, m, h), e.g. 30s or 1m.
+
+#### `batch_size`
+
+Number of deleted dashboards to process in each batch during the cleanup process.
+Default: `10`, Minimum: `5`, Maximum: `200`.
+
+Increasing this value allows processing more dashboards in each cleanup cycle but may impact system performance.
+
 <hr />

 ### `[datasources]`
@@ -1,6 +1,6 @@
 {
  "name": "@test-plugins/extensions-test-app",
-  "version": "12.0.0-pre",
+  "version": "12.0.1",
  "private": true,
  "scripts": {
    "build": "webpack -c ./webpack.config.ts --env production",
@@ -1,6 +1,6 @@
 {
  "name": "@test-plugins/grafana-e2etest-datasource",
-  "version": "12.0.0-pre",
+  "version": "12.0.1",
  "private": true,
  "scripts": {
    "build": "webpack -c ./webpack.config.ts --env production",
@@ -1,5 +1,5 @@
 {
  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
  "npmClient": "yarn",
-  "version": "12.0.0-pre"
+  "version": "12.0.1"
 }
@@ -3,7 +3,7 @@
  "license": "AGPL-3.0-only",
  "private": true,
  "name": "grafana",
-  "version": "12.0.0-pre",
+  "version": "12.0.1",
  "repository": "github:grafana/grafana",
  "scripts": {
    "build": "NODE_ENV=production nx exec --verbose -- webpack --config scripts/webpack/webpack.prod.js --progress",
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/data",
-  "version": "12.0.0-pre",
+  "version": "12.0.1",
  "description": "Grafana Data Library",
  "keywords": [
    "typescript"
@@ -56,7 +56,7 @@
  },
  "dependencies": {
    "@braintree/sanitize-url": "7.0.1",
-    "@grafana/schema": "12.0.0-pre",
+    "@grafana/schema": "12.0.1",
    "@types/d3-interpolate": "^3.0.0",
    "@types/string-hash": "1.1.3",
    "@types/systemjs": "6.15.1",
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/e2e-selectors",
-  "version": "12.0.0-pre",
+  "version": "12.0.1",
  "description": "Grafana End-to-End Test Selectors Library",
  "keywords": [
    "cli",
@@ -1,7 +1,7 @@
 {
  "name": "@grafana/eslint-plugin",
  "description": "ESLint rules for use within the Grafana repo. Not suitable (or supported) for external use.",
-  "version": "12.0.0-pre",
+  "version": "12.0.1",
  "main": "./index.cjs",
  "author": "Grafana Labs",
  "license": "Apache-2.0",
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/flamegraph",
-  "version": "12.0.0-pre",
+  "version": "12.0.1",
  "description": "Grafana flamegraph visualization component",
  "keywords": [
    "grafana",
@@ -44,8 +44,8 @@
  ],
  "dependencies": {
    "@emotion/css": "11.13.5",
-    "@grafana/data": "12.0.0-pre",
-    "@grafana/ui": "12.0.0-pre",
+    "@grafana/data": "12.0.1",
+    "@grafana/ui": "12.0.1",
    "@leeoniya/ufuzzy": "1.0.18",
    "d3": "^7.8.5",
    "lodash": "4.17.21",
@@ -1,6 +1,6 @@
 {
  "name": "@grafana/saga-icons",
-  "version": "12.0.0-pre",
+  "version": "12.0.1",
  "private": true,
  "description": "Icons for Grafana",
  "author": "Grafana Labs",
@@ -3,7 +3,7 @@
  "license": "AGPL-3.0-only",
  "name": "@grafana/o11y-ds-frontend",
  "private": true,
-  "version": "12.0.0-pre",
+  "version": "12.0.1",
  "description": "Library to manage traces in Grafana.",
  "sideEffects": false,
  "repository": {
@@ -18,12 +18,12 @@
  },
  "dependencies": {
    "@emotion/css": "11.13.5",
-    "@grafana/data": "12.0.0-pre",
-    "@grafana/e2e-selectors": "12.0.0-pre",
+    "@grafana/data": "12.0.1",
+    "@grafana/e2e-selectors": "12.0.1",
    "@grafana/plugin-ui": "0.10.5",
-    "@grafana/runtime": "12.0.0-pre",
-    "@grafana/schema": "12.0.0-pre",
-    "@grafana/ui": "12.0.0-pre",
+    "@grafana/runtime": "12.0.1",
+    "@grafana/schema": "12.0.1",
+    "@grafana/ui": "12.0.1",
    "react-select": "5.10.0",
    "react-use": "17.6.0",
    "rxjs": "7.8.1",
@@ -2,7 +2,7 @@
  "name": "@grafana/plugin-configs",
  "description": "Shared dependencies and files for core plugins",
  "private": true,
-  "version": "12.0.0-pre",
+  "version": "12.0.1",
  "dependencies": {
    "tslib": "2.8.1"
  },
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "AGPL-3.0-only",
  "name": "@grafana/prometheus",
-  "version": "12.0.0-pre",
+  "version": "12.0.1",
  "description": "Grafana Prometheus Library",
  "keywords": [
    "typescript"
@@ -38,12 +38,12 @@
  "dependencies": {
    "@emotion/css": "11.13.5",
    "@floating-ui/react": "0.27.7",
-    "@grafana/data": "12.0.0-pre",
-    "@grafana/e2e-selectors": "12.0.0-pre",
+    "@grafana/data": "12.0.1",
+    "@grafana/e2e-selectors": "12.0.1",
    "@grafana/plugin-ui": "0.10.5",
-    "@grafana/runtime": "12.0.0-pre",
-    "@grafana/schema": "12.0.0-pre",
-    "@grafana/ui": "12.0.0-pre",
+    "@grafana/runtime": "12.0.1",
+    "@grafana/schema": "12.0.1",
+    "@grafana/ui": "12.0.1",
    "@hello-pangea/dnd": "17.0.0",
    "@leeoniya/ufuzzy": "1.0.18",
    "@lezer/common": "1.2.3",
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/runtime",
-  "version": "12.0.0-pre",
+  "version": "12.0.1",
  "description": "Grafana Runtime Library",
  "keywords": [
    "grafana",
@@ -53,11 +53,11 @@
    "postpack": "mv package.json.bak package.json && rimraf ./unstable"
  },
  "dependencies": {
-    "@grafana/data": "12.0.0-pre",
-    "@grafana/e2e-selectors": "12.0.0-pre",
+    "@grafana/data": "12.0.1",
+    "@grafana/e2e-selectors": "12.0.1",
    "@grafana/faro-web-sdk": "^1.13.2",
-    "@grafana/schema": "12.0.0-pre",
-    "@grafana/ui": "12.0.0-pre",
+    "@grafana/schema": "12.0.1",
+    "@grafana/ui": "12.0.1",
    "@types/systemjs": "6.15.1",
    "history": "4.10.1",
    "lodash": "4.17.21",
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/schema",
-  "version": "12.0.0-pre",
+  "version": "12.0.1",
  "description": "Grafana Schema Library",
  "keywords": [
    "typescript"
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface Options {
  limit: number;
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip, common.OptionsWithTextFormatting {
  /**
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface Options extends common.OptionsWithLegend, common.SingleStatBaseOptions {
  displayMode: common.BarGaugeDisplayMode;
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export enum VizDisplayMode {
  Candles = 'candles',
@@ -10,7 +10,7 @@

 import * as ui from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export enum HorizontalConstraint {
  Center = 'center',
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface MetricStat {
  /**
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface Options {
  /**
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface Options {
  selectedSeries: number;
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export type UpdateConfig = {
  render: boolean,
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export type BucketAggregation = (DateHistogram | Histogram | Terms | Filters | GeoHashGrid | Nested);

@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface Options extends common.SingleStatBaseOptions {
  minVizHeight: number;
@@ -10,7 +10,7 @@

 import * as ui from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface Options {
  basemap: ui.MapLayerOptions;
@@ -10,7 +10,7 @@

 import * as ui from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 /**
 * Controls the color mode of the heatmap
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
  /**
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface Options {
  dedupStrategy: common.LogsDedupStrategy;
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface Options {
  dedupStrategy: common.LogsDedupStrategy;
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export enum QueryEditorMode {
  Builder = 'builder',
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface Options {
  /**
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface ArcOption {
  /**
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 /**
 * Select the pie chart display style.
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface Options extends common.SingleStatBaseOptions {
  colorMode: common.BigValueColorMode;
@@ -10,7 +10,7 @@

 import * as ui from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
  /**
@@ -10,7 +10,7 @@

 import * as ui from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
  /**
@@ -10,7 +10,7 @@

 import * as ui from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface Options {
  /**
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export enum TextMode {
  Code = 'code',
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export interface Options extends common.OptionsWithTimezones {
  legend: common.VizLegendOptions;
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 /**
 * Identical to timeseries... except it does not have timezone settings
@@ -10,7 +10,7 @@

 import * as common from '@grafana/schema';

-export const pluginVersion = "12.0.0-pre";
+export const pluginVersion = "12.0.1";

 export enum PointShape {
  Circle = 'circle',
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sven Grossmann	3ddca4be8e	ci: move variables to `env` (#104605 ) * ci: move variables to `env` * ci: move sha to `env` * ci: import `SHA` and `PRE_COMMIT_SHA` (cherry picked from commit `d19f86a736`)	2025-04-28 12:46:25 +01:00
Stephanie Hingtgen	4620dc0b4e	[release-12.0.1] App Plugins: Fix dashboard updater (#104583 ) (#104585 )	2025-04-26 01:22:28 +02:00
Torkel Ödegaard	0716d2fc4f	[Release v12.0.1] Dashboard: Fixes issue with row repeats and first row (#104469 ) Dashboard: Fixes issue with row repeats and first row (#104265) * working * Update * Add test * Update (cherry picked from commit `c8fb66dd48`)	2025-04-25 20:36:30 +02:00
Stephanie Hingtgen	7dfb628cb4	[release-12.0.1] Provisioning: Remove warning logs for valid usage (#104555 ) (#104558 ) Provisioning: Remove warnings for valid usage (#104555)	2025-04-25 11:18:17 -05:00
Stephanie Hingtgen	549833e40d	[release-12.0.1] K8s: Dashboards: Fix transformation between v1 and v2 (#104502 ) (#104527 ) K8s: Dashboards: Fix transformation between v1 and v2 (#104502)	2025-04-25 17:02:35 +01:00
grafana-delivery-bot[bot]	f04144c742	[release-12.0.1] Rename grafana cli to grafana server cli (#104557 ) Co-authored-by: Irene Rodríguez <irene.rodriguez@grafana.com>	2025-04-25 16:51:48 +01:00
Stephanie Hingtgen	745015e74f	[release-12.0.1] K8s: Dashboards: Fix provisioned dashboard cleanup (#104504 ) (#104525 ) K8s: Dashboards: Fix provisioned dashboard cleanup (#104504)	2025-04-25 13:41:29 +01:00
Stephanie Hingtgen	cf21a9385b	[release-12.0.1] Docs: Add dashboard and folder apis docs (#101754 ) (#104529 ) Docs: Add dashboard and folder apis docs (#101754)	2025-04-25 13:33:35 +01:00
Stephanie Hingtgen	123351e3ac	[release-12.0.1] Access control: Make sure that user permission cache is cleared after new dashboard and folder creation (#104495 ) Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>	2025-04-24 15:48:04 -05:00
grafana-delivery-bot[bot]	26b81feb85	[release-12.0.1] Apply security patch 357-202503311017.patch (#104493 ) Apply security patch 357-202503311017.patch (#104490) * Sanitize paths before evaluating access to route * use util.CleanRelativePath --------- Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com> (cherry picked from commit `1f707d16ed`) Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	2025-04-24 20:40:18 +01:00
grafana-delivery-bot[bot]	8a4a68cf95	[release-12.0.1] XYChart: Coerce threshold steps to numbers (#104492 ) XYChart: Coerce threshold steps to numbers (#104485) (cherry picked from commit `a6735721bf`) Co-authored-by: Leon Sorokin <leeoniya@gmail.com>	2025-04-24 20:19:24 +01:00
grafana-delivery-bot[bot]	2fbb2d6f5d	[release-12.0.1] Provisioning: Fix requires migration condition (#104436 ) Provisioning: Fix requires migration condition (#104434) * Provisioning: Fix requires migration condition * Better error messaging (cherry picked from commit `82c291675b`) Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>	2025-04-24 07:48:02 +01:00
Stephanie Hingtgen	ed408985fa	[release-12.0.1] K8s: Dashboards: Mark as v1beta1 (#104422 ) Co-authored-by: Ryan McKinley <ryantxu@gmail.com>	2025-04-23 19:21:59 +01:00
Ryan McKinley	584593c411	DataSourceSrv: include alias in type filter (#104308 ) (#104336 )	2025-04-23 13:16:17 -05:00
Stephanie Hingtgen	b0d42f432a	[release-12.0.1] K8s: Dashboards: Add fine grained access control checks to /apis (#104419 ) K8s: Dashboards: Add fine grained access control checks to /apis (#104347) --------- Co-authored-by: Ieva <ieva.vasiljeva@grafana.com> Co-authored-by: Gabriel MABILLE <gabriel.mabille@grafana.com> Co-authored-by: Marco de Abreu <marco.deabreu@grafana.com> Co-authored-by: Georges Chaudy <chaudyg@gmail.com>	2025-04-23 18:28:10 +01:00
grafana-delivery-bot[bot]	835516f832	[release-12.0.1] DataLinks: Long link title wrapping (#104383 ) DataLinks: Long link title wrapping (#104169) chore(data-links): link text wrap (cherry picked from commit `8cee546d67`) Co-authored-by: Ihor Yeromin <yeryomin.igor@gmail.com>	2025-04-23 11:46:10 +01:00
grafana-delivery-bot[bot]	2ce8b147d7	[release-12.0.1] Provisioning: Add onboarding page graphic (#104367 ) Provisioning: Add onboarding page graphic (#104162) * Provisioning: Add onboarding page graphic * Update translations (cherry picked from commit `b6e5b5d20f`) Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>	2025-04-23 06:18:15 +01:00
grafana-delivery-bot[bot]	846f10afda	[release-12.0.1] Docs: Making some slight adjustments to migration assistant (#104319 ) Co-authored-by: Jacob Valdez <jacob.valdez@grafana.com>	2025-04-22 12:34:48 -05:00
Kevin Minehart	384ce54148	update sync-mirror action	2025-04-22 08:31:50 -05:00
Kevin Minehart	c9956ffc59	remove old PR patch check and sync mirror workflows	2025-04-22 08:28:36 -05:00
Kevin Minehart	92189eec7e	update PR patch check / sync mirror workflows	2025-04-22 08:27:23 -05:00
Stephanie Hingtgen	cde4a9dabe	[release-12.0.1] TeamMember: Treat null permission as member (#104195 ) (#104250 ) TeamMember: Treat null permission as member (#104195) Co-authored-by: Jo <joao.guerreiro@grafana.com>	2025-04-22 09:46:13 +02:00
Stephanie Hingtgen	2e878c4fdc	[release 12.0.1] Dashboards: Preserve schema version in /api (#104213 ) (#104249 ) Dashboards: Preserve schema version in /api (#104213) --------- Co-authored-by: Artur Wierzbicki <artur.wierzbicki@grafana.com>	2025-04-21 18:40:34 -05:00
Stephanie Hingtgen	4d6d46a181	[release 12.0.1] Klog: Prevent response bodies from being logged (#104247 )	2025-04-21 23:07:53 +01:00
grafana-delivery-bot[bot]	b9ee6bae38	[release-12.0.1] Alerting: Ensure field validators return the proper type (#104243 ) Alerting: Ensure field validators return the proper type (#104050) * Ensure field validators return the proper type This ensures correct error propagation through services up to the API layer. * Move error wrapping up to call site (cherry picked from commit `820c338414`) Co-authored-by: William Wernert <william.wernert@grafana.com>	2025-04-21 21:17:40 +01:00
Yuri Tseretyan	341a885a38	[release-12.0.1] Docs: Remove mention of alertingApiServer flag from alerting documentation (#104205 ) Docs: Remove mention of alertingApiServer flag from alerting documentation (#104131) (cherry picked from commit `1bafd5c807`) # Conflicts: # docs/sources/alerting/set-up/configure-rbac/_index.md	2025-04-18 15:57:29 -04:00
grafana-delivery-bot[bot]	910ce8367a	[release-12.0.1] Transformations: Wrap field names selection, prevent rendering off-screen (#104186 ) Transformations: Remove deprecated ui element and wrap pills (#104143) * Remove deprecated ui element and wrap pills * Fix for labels to fields too * Update betterer (cherry picked from commit `57fd67436e`) Co-authored-by: Kristina <kristina.durivage@grafana.com>	2025-04-18 11:52:18 -05:00
grafana-delivery-bot[bot]	a6a5c77add	[release-12.0.1] InfluxDB: Fix nested variable interpolation (#104176 ) InfluxDB: Fix nested variable interpolation (#104067) Validate query type (cherry picked from commit `519b75bd1e`) Co-authored-by: Andreas Christou <andreas.christou@grafana.com>	2025-04-17 17:29:00 +01:00
grafana-delivery-bot[bot]	e94d5f0119	[release-12.0.1] Provisioning: Add banner with more feature info (#104146 ) Provisioning: Add banner with more feature info (#104111) * Provisioning: Add experimental feature banner * translations (cherry picked from commit `d85d730d9c`) Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>	2025-04-17 07:09:33 +01:00
grafana-delivery-bot[bot]	9eb36ac222	[release-12.0.1] Docs: Updating cloud migration docs ahead of G12 (#104134 ) Co-authored-by: Michael Mandrus <41969079+mmandrus@users.noreply.github.com> Co-authored-by: Jacob Valdez <jacob.valdez@grafana.com>	2025-04-16 15:20:33 -05:00
Nick Richmond	2e6bfb76cb	MetricsDrilldown: Restore link to Metrics Drilldown from Explore (#104073 ) MetricsDrilldown: Restore link to Metrics Drilldown from Explore (#104069) fix: add missing entry in list of queryless apps	2025-04-16 12:55:28 -04:00
Laura Fernández	173db4aac7	[release-12.0.1] i18n: Move locale code behind the feature toggle in internationalization/dates.ts (#104090 )	2025-04-16 15:34:44 +02:00
Jev Forsberg	44cfb7c6b4	Chore: Update version in `release-12.0.1` branch (#104061 ) baldm0mma/ update version to 12.0.1	2025-04-15 12:29:38 -06:00