Geomap: Enforce required attributions

.citools/src/air/go.mod

@@ -1,6 +1,6 @@
 module air
 
-go 1.25.5
+go 1.25.3
 
 tool github.com/air-verse/air
 

.citools/src/bra/go.mod

@@ -1,6 +1,6 @@
 module bra
 
-go 1.25.5
+go 1.25.3
 
 tool github.com/unknwon/bra
 

.citools/src/cog/go.mod

@@ -1,6 +1,6 @@
 module cog
 
-go 1.25.5
+go 1.25.3
 
 tool github.com/grafana/cog/cmd/cli
 

.citools/src/cue/go.mod

@@ -1,6 +1,6 @@
 module cue
 
-go 1.25.5
+go 1.25.3
 
 tool cuelang.org/go/cmd/cue
 

.citools/src/golangci-lint/go.mod

@@ -1,6 +1,6 @@
 module golangci-lint
 
-go 1.25.5
+go 1.25.3
 
 tool github.com/golangci/golangci-lint/v2/cmd/golangci-lint
 

.citools/src/jb/go.mod

@@ -1,6 +1,6 @@
 module jb
 
-go 1.25.5
+go 1.25.3
 
 tool github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb
 

.citools/src/lefthook/go.mod

@@ -1,6 +1,6 @@
 module lefthook
 
-go 1.25.5
+go 1.25.3
 
 tool github.com/evilmartians/lefthook
 

.citools/src/swagger/go.mod

@@ -1,6 +1,6 @@
 module swagger
 
-go 1.25.5
+go 1.25.3
 
 tool github.com/go-swagger/go-swagger/cmd/swagger
 

.github/CODEOWNERS

@@ -41,14 +41,12 @@
 /docs/sources/                                                                    @irenerl24
 
 /docs/sources/alerting/                                                           @JohnnyK-Grafana
-/docs/sources/as-code/                                                            @urbiz-grafana
-/docs/sources/developer-resources/                                                @urbiz-grafana
 /docs/sources/datasources/                                                        @lwandz13
 /docs/sources/upgrade-guide/                                                      @jtvdez
 /docs/sources/whatsnew/                                                           @jtvdez
 
 
-/docs/sources/developer-resources/plugins/                                        @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
+/docs/sources/developers/plugins/                                                 @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
 /docs/sources/visualizations/dashboards/                                          @imatwawana
 /docs/sources/visualizations/panels-visualizations/                               @imatwawana
 
@@ -482,7 +480,6 @@ i18next.config.ts @grafana/grafana-frontend-platform
 /e2e-playwright/panels-suite/geomap-layer-types.spec.ts @grafana/dataviz-squad
 /e2e-playwright/panels-suite/geomap-map-controls.spec.ts @grafana/dataviz-squad
 /e2e-playwright/panels-suite/geomap-spatial-operations-transform.spec.ts @grafana/dataviz-squad
-/e2e-playwright/panels-suite/heatmap.spec.ts @grafana/dataviz-squad
 /e2e-playwright/panels-suite/panelEdit_base.spec.ts @grafana/dashboards-squad
 /e2e-playwright/panels-suite/panelEdit_queries.spec.ts @grafana/dashboards-squad
 /e2e-playwright/panels-suite/panelEdit_transforms.spec.ts @grafana/datapro
@@ -508,7 +505,6 @@ i18next.config.ts @grafana/grafana-frontend-platform
 /e2e-playwright/various-suite/frontend-sandbox-app.spec.ts @grafana/plugins-platform-frontend
 /e2e-playwright/various-suite/frontend-sandbox-datasource.spec.ts @grafana/plugins-platform-frontend
 /e2e-playwright/various-suite/gauge.spec.ts @grafana/dataviz-squad
-/e2e-playwright/various-suite/grafana-datasource-random-walk.spec.ts @grafana/grafana-frontend-platform
 /e2e-playwright/various-suite/graph-auto-migrate.spec.ts @grafana/dataviz-squad
 /e2e-playwright/various-suite/inspect-drawer.spec.ts @grafana/dashboards-squad
 /e2e-playwright/various-suite/keybinds.spec.ts @grafana/grafana-frontend-platform
@@ -801,7 +797,7 @@ playwright.storybook.config.ts @grafana/grafana-frontend-platform
 /public/app/core/components/ColorScale/ @grafana/dataviz-squad
 /public/app/core/components/DynamicImports/ @grafana/grafana-search-navigate-organise
 /public/app/core/components/EmptyListCTA/ @grafana/grafana-frontend-platform
-/public/app/core/components/FolderFilter/ @grafana/grafana-search-navigate-organise
+/public/app/core/components/FolderFilter/ @grafana/sharing-squad
 /public/app/core/components/Footer/ @grafana/grafana-search-navigate-organise
 /public/app/core/components/ForgottenPassword/ @grafana/grafana-search-navigate-organise
 /public/app/core/components/Form/ @grafana/grafana-frontend-platform

.github/workflows/backport-workflow.yml

@@ -36,7 +36,7 @@ jobs:
           private_key: ${{ fromJSON(steps.secrets.outputs.secrets).APP_PEM }}
 
       - name: Download PR info artifact
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v5
         id: download-pr-info
         with:
           github-token: ${{ github.token }}

.github/workflows/detect-breaking-changes-levitate.yml

@@ -141,12 +141,12 @@ jobs:
           node-version-file: '.nvmrc'
 
       - name: Get built packages from pr
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v5
         with:
           name: buildPr
 
       - name: Get built packages from base
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v5
         with:
           name: buildBase
 
@@ -225,7 +225,7 @@ jobs:
           persist-credentials: false
 
       - name: 'Download artifact'
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v5
         with:
           name: levitate
 

.github/workflows/pr-e2e-tests.yml

@@ -159,7 +159,7 @@ jobs:
         with:
           registry: 'us-docker.pkg.dev'
           environment: 'dev'
-      - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
+      - uses: actions/download-artifact@4a24838f3d5601fd639834081e118c2995d51e1c
         with:
           name: grafana-docker-tar-gz
           path: .
@@ -221,10 +221,10 @@ jobs:
       - uses: actions/checkout@v5
         with:
           persist-credentials: false
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v5
         with:
           name: grafana-tar-gz
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v5
         with:
           name: ${{ needs.build-e2e-runner.outputs.artifact }}
       - name: chmod +x
@@ -298,7 +298,7 @@ jobs:
       - uses: actions/checkout@v5
         with:
           persist-credentials: false
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v5
         with:
           name: grafana-tar-gz
       - name: Run E2E tests
@@ -360,7 +360,7 @@ jobs:
         run: |
           docker cp cpp-e2e-deploy:/outputs.json /tmp/outputs.json
 
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v5
         with:
           name: grafana-tar-gz
 
@@ -400,7 +400,7 @@ jobs:
           node-version-file: '.nvmrc'
 
       - name: Download blob reports from GitHub Actions Artifacts
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v5
         with:
           path: blobs
           pattern: playwright-blob-*
@@ -479,7 +479,7 @@ jobs:
       - uses: actions/checkout@v5
         with:
           persist-credentials: false
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v5
         with:
           name: grafana-tar-gz
       - name: Run PR a11y test
@@ -531,7 +531,7 @@ jobs:
       - name: Install dependencies
         run: yarn install --immutable
       - name: Get pa11y results
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v5
         with:
           name: pa11y-ci-results
       - name: Extract and publish metrics

.github/workflows/publish-artifact.yml

@@ -44,7 +44,7 @@ jobs:
     permissions:
       id-token: write
     steps:
-      - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
+      - uses: actions/download-artifact@4a24838f3d5601fd639834081e118c2995d51e1c
         with:
           name: ${{ inputs.name }}
           pattern: ${{ inputs.pattern }}

.github/workflows/release-build.yml

@@ -212,7 +212,6 @@ jobs:
       run-id: ${{ github.run_id }}
       bucket-path: ${{ needs.setup.outputs.version }}_${{ github.run_id }}
       environment: prod
-      runs-on: ubuntu-x64-small
 
   publish-dockerhub:
     if: github.ref_name == 'main'
@@ -225,27 +224,27 @@ jobs:
       - build
     steps:
       - uses: grafana/shared-workflows/actions/dockerhub-login@dockerhub-login/v1.0.2
-      - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
+      - uses: actions/download-artifact@4a24838f3d5601fd639834081e118c2995d51e1c
         with:
           name: artifacts-list-linux-amd64
           path: .
-      - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
+      - uses: actions/download-artifact@4a24838f3d5601fd639834081e118c2995d51e1c
         with:
           name: artifacts-list-linux-arm64
           path: .
-      - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
+      - uses: actions/download-artifact@4a24838f3d5601fd639834081e118c2995d51e1c
         with:
           name: artifacts-list-linux-armv7
           path: .
-      - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
+      - uses: actions/download-artifact@4a24838f3d5601fd639834081e118c2995d51e1c
         with:
           name: artifacts-linux-amd64
           path: dist
-      - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
+      - uses: actions/download-artifact@4a24838f3d5601fd639834081e118c2995d51e1c
         with:
           name: artifacts-linux-arm64
           path: dist
-      - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
+      - uses: actions/download-artifact@4a24838f3d5601fd639834081e118c2995d51e1c
         with:
           name: artifacts-linux-armv7
           path: dist
@@ -321,21 +320,13 @@ jobs:
           repositories: '["grafana"]'
           permissions: '{"issues": "write", "pull_requests": "write", "contents": "read"}'
       - name: Find PR
-        continue-on-error: true
-        id: find-pr
         env:
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
           GRAFANA_COMMIT: ${{ needs.setup.outputs.grafana-commit }}
-          REPO: ${{ github.repository }}
-        run: |
-          set -eo pipefail
-          gh api "/repos/${REPO}/commits/${GRAFANA_COMMIT}/pulls" | jq -r '.[0].number' | tee issue_number.txt
-          echo "ISSUE_NUMBER=$(cat issue_number.txt)" >> "$GITHUB_ENV"
+        run: echo "ISSUE_NUMBER=$(gh api "/repos/grafana/grafana/commits/${GRAFANA_COMMIT}/pulls" | jq -r '.[0].number')" >> "$GITHUB_ENV"
       - name: Find Comment
         uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3
-        if: ${{ steps.find-pr.outcome == 'success' }}
         id: fc
-        continue-on-error: true
         with:
           issue-number: ${{ env.ISSUE_NUMBER }}
           comment-author: 'grafana-delivery-bot[bot]'
@@ -343,7 +334,6 @@ jobs:
           token: ${{ steps.generate_token.outputs.token }}
       - name: Create or update comment
         uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v4
-        if: ${{ steps.find-pr.outcome == 'success' }} # Run even if comment wasn't found
         with:
           token: ${{ steps.generate_token.outputs.token }}
           comment-id: ${{ steps.fc.outputs.comment-id }}

.github/workflows/trufflehog.yml

@@ -31,6 +31,6 @@ jobs:
           persist-credentials: false
           fetch-depth: ${{ steps.fetch_depth.outputs.fetch_depth }}
       - name: Trufflehog
-        uses: trufflesecurity/trufflehog@b84c3d14d189e16da175e2c27fa8136603783ffc # v3.90.12
+        uses: trufflesecurity/trufflehog@ad6fc8fb446b8fafbf7ea8193d2d6bfd42f45690 # v3.90.11
         with:
           extra_args: --results=verified

.gitignore

@@ -250,12 +250,9 @@ public/mockServiceWorker.js
 /e2e-playwright/test-plugins/*/dist
 /apps/provisioning/cmd/job-controller/bin/
 
+
 # Ignore unified storage kv store files
 /grafana-kv-data
-
-# Ignore debug output from test library
-/pkg/storage/secret/metadata/testdata/rapid/TestStateMachine/
-
 /codeowners-manifest/
 
 # Ignore grafana/hippocampus local cache folder

.nvmrc

@@ -1 +1 @@
-v24.11.0
+v22.16.0

CONTRIBUTING.md

@@ -2,9 +2,7 @@
 
 Thank you for your interest in contributing to Grafana! We welcome all people who want to contribute in a healthy and constructive manner within our community. To help us create a safe and positive community experience for all, we require all participants to adhere to the [Code of Conduct](CODE_OF_CONDUCT.md).
 
-This document is a guide to help you through the process of contributing to Grafana. Be sure to check out the [Grafana Champions program](https://grafana.com/community/champions/?src=github&camp=community-cross-platform-engagement) as you start to contribute. It's designed to recognize and empower individuals who are actively contributing to the growth and success of the Grafana ecosystem.
-
-> **Help us improve!** We'd love to hear about your contributor experience. Take a moment to share your feedback in our [Open Source Contributor Experience Survey](https://gra.fan/ome). Your input helps us make contributing to Grafana better for everyone.
+This document is a guide to help you through the process of contributing to Grafana. Be sure to check out the [Grafana Champions program](https://grafana.com/community/champions/?src=github&camp=community-cross-platform-engagement) as you start to contribute. It’s designed to recognize and empower individuals who are actively contributing to the growth and success of the Grafana ecosystem.
 
 Whether you're a new contributor or a seasoned veteran, we hope these resources help you connect with the community.
 

Dockerfile

@@ -14,10 +14,10 @@ ARG JS_SRC=js-builder
 
 # Dependabot cannot update dependencies listed in ARGs
 # By using FROM instructions we can delegate dependency updates to dependabot
-FROM alpine:3.23.0 AS alpine-base
+FROM alpine:3.22.2 AS alpine-base
 FROM ubuntu:22.04 AS ubuntu-base
-FROM golang:1.25.5-alpine AS go-builder-base
-FROM --platform=${JS_PLATFORM} node:24-alpine AS js-builder-base
+FROM golang:1.25.3-alpine AS go-builder-base
+FROM --platform=${JS_PLATFORM} node:22-alpine AS js-builder-base
 # Javascript build stage
 FROM --platform=${JS_PLATFORM} ${JS_IMAGE} AS js-builder
 ARG JS_NODE_ENV=production

Makefile

@@ -8,7 +8,7 @@ WIRE_TAGS = "oss"
 include .citools/Variables.mk
 
 GO = go
-GO_VERSION = 1.25.5
+GO_VERSION = 1.25.3
 GO_LINT_FILES ?= $(shell ./scripts/go-workspace/golangci-lint-includes.sh)
 GO_TEST_FILES ?= $(shell ./scripts/go-workspace/test-includes.sh)
 SH_FILES ?= $(shell find ./scripts -name *.sh)
@@ -178,7 +178,7 @@ gen-apps: do-gen-apps gofmt ## Generate code for Grafana App SDK apps and run go
 	@if [ -n "$$CODEGEN_VERIFY" ]; then \
 		echo "Verifying generated code is up to date..."; \
 		if ! git diff --quiet; then \
-			echo "Error: Generated code is not up to date. Please run 'make gen-apps', 'make gen-cue', and 'make gen-jsonnet' to regenerate."; \
+			echo "Error: Generated apps code is not up to date. Please run 'make gen-apps' to regenerate."; \
 			git diff --name-only; \
 			exit 1; \
 		fi; \

README.md

@@ -4,6 +4,7 @@
 The open-source platform for monitoring and observability
 
 [![License](https://img.shields.io/github/license/grafana/grafana)](LICENSE)
+[![Drone](https://drone.grafana.net/api/badges/grafana/grafana/status.svg)](https://drone.grafana.net/grafana/grafana)
 [![Go Report Card](https://goreportcard.com/badge/github.com/grafana/grafana)](https://goreportcard.com/report/github.com/grafana/grafana)
 
 Grafana allows you to query, visualize, alert on and understand your metrics no matter where they are stored. Create, explore, and share dashboards with your team and foster a data-driven culture:
@@ -35,8 +36,6 @@ If you're interested in contributing to the Grafana project:
 - Explore our [beginner-friendly issues](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22).
 - Look through our [style guide and Storybook](https://developers.grafana.com/ui/latest/index.html).
 
-> Share your contributor experience in our [feedback survey](https://gra.fan/ome) to help us improve.
-
 ## Get involved
 
 - Follow [@grafana on X (formerly Twitter)](https://x.com/grafana/).

apps/advisor/Makefile

@@ -1,9 +1,5 @@
 include ../sdk.mk
 
-.PHONY: generate # Run Grafana App SDK code generation
+.PHONY: generate
 generate: install-app-sdk update-app-sdk
-	@$(APP_SDK_BIN) generate \
-		--source=./kinds/ \
-		--gogenpath=./pkg/apis \
-		--grouping=group \
-		--defencoding=none
+	@$(APP_SDK_BIN) generate -g ./pkg/apis --grouping=group --postprocess --defencoding=none --useoldmanifestkinds

apps/advisor/go.mod

@@ -1,56 +1,37 @@
 module github.com/grafana/grafana/apps/advisor
 
-go 1.25.5
+go 1.25.3
 
 require (
 	github.com/Masterminds/semver/v3 v3.4.0
-	github.com/google/go-cmp v0.7.0
 	github.com/google/go-github/v70 v70.0.0
-	github.com/grafana/authlib/types v0.0.0-20250926065801-df98203cff37
+	github.com/grafana/authlib/types v0.0.0-20250710201142-9542f2f28d43
 	github.com/grafana/grafana v0.0.0-00010101000000-000000000000
-	github.com/grafana/grafana-app-sdk v0.48.1
-	github.com/grafana/grafana-app-sdk/logging v0.48.1
-	github.com/grafana/grafana-plugin-sdk-go v0.281.0
-	github.com/grafana/grafana/pkg/apimachinery v0.0.0
-	github.com/stretchr/testify v1.11.1
-	k8s.io/apimachinery v0.34.1
-	k8s.io/apiserver v0.34.1
-	k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
+	github.com/grafana/grafana-app-sdk v0.40.2
+	github.com/grafana/grafana-app-sdk/logging v0.40.2
+	github.com/grafana/grafana-plugin-sdk-go v0.278.0
+	github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250804150913-990f1c69ecc2
+	github.com/stretchr/testify v1.10.0
+	k8s.io/apimachinery v0.33.3
+	k8s.io/apiserver v0.33.3
+	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
 )
 
 // transitive dependencies that need replaced
 // TODO: stop depending on grafana core
 replace github.com/grafana/grafana => ../..
 
-replace github.com/grafana/grafana/apps/provisioning => ../provisioning
-
-replace github.com/grafana/grafana/pkg/apimachinery => ../../pkg/apimachinery
-
-replace github.com/grafana/grafana/pkg/apiserver => ../../pkg/apiserver
-
-replace github.com/grafana/grafana/apps/dashboard => ../dashboard
-
-replace github.com/grafana/grafana/pkg/aggregator => ../../pkg/aggregator
-
-replace github.com/grafana/grafana/apps/folder => ../folder
-
-replace github.com/grafana/grafana/apps/secret => ../secret
-
-replace github.com/grafana/grafana/apps/iam => ../iam
-
-replace github.com/grafana/grafana/apps/plugins => ../plugins
-
-replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20250911094103-5456b6e45604
+replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20250620093340-be61a673dee6
 
 require (
 	cloud.google.com/go/compute/metadata v0.7.0 // indirect
 	dario.cat/mergo v1.0.2 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.12.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.1 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
 	github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect
-	github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
+	github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
 	github.com/BurntSushi/toml v1.5.0 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
@@ -59,19 +40,19 @@ require (
 	github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f // indirect
 	github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
-	github.com/apache/arrow-go/v18 v18.4.1 // indirect
+	github.com/apache/arrow-go/v18 v18.3.0 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/at-wat/mqtt-go v0.19.4 // indirect
 	github.com/aws/aws-sdk-go v1.55.7 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.38.1 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.18.6 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 // indirect
-	github.com/aws/smithy-go v1.23.1 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.36.5 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.70 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.17 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.34.0 // indirect
+	github.com/aws/smithy-go v1.22.4 // indirect
 	github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df // indirect
 	github.com/benbjohnson/clock v1.3.5 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -81,12 +62,13 @@ require (
 	github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 // indirect
 	github.com/bwmarrin/snowflake v0.3.0 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.2 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cheekybits/genny v1.0.0 // indirect
+	github.com/chromedp/cdproto v0.0.0-20250429231605-6ed5b53462d4 // indirect
 	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/diegoholiveira/jsonlogic/v3 v3.7.4 // indirect
@@ -96,97 +78,92 @@ require (
 	github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad // indirect
 	github.com/dolthub/go-mysql-server v0.19.1-0.20250410182021-5632d67cd46e // indirect
 	github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 // indirect
-	github.com/dolthub/vitess v0.0.0-20250930230441-70c2c6a98e33 // indirect
+	github.com/dolthub/vitess v0.0.0-20250410090211-143e6b272ad4 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.13.0 // indirect
+	github.com/elazarl/goproxy v1.7.2 // indirect
+	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
+	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/gchaincl/sqlhooks v1.3.0 // indirect
-	github.com/getkin/kin-openapi v0.133.0 // indirect
+	github.com/getkin/kin-openapi v0.132.0 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
-	github.com/go-jose/go-jose/v4 v4.1.2 // indirect
+	github.com/go-jose/go-jose/v3 v3.0.4 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-ldap/ldap/v3 v3.4.4 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/analysis v0.24.0 // indirect
-	github.com/go-openapi/errors v0.22.3 // indirect
-	github.com/go-openapi/jsonpointer v0.22.1 // indirect
-	github.com/go-openapi/jsonreference v0.21.2 // indirect
-	github.com/go-openapi/loads v0.23.1 // indirect
+	github.com/go-openapi/analysis v0.23.0 // indirect
+	github.com/go-openapi/errors v0.22.0 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/loads v0.22.0 // indirect
 	github.com/go-openapi/runtime v0.28.0 // indirect
-	github.com/go-openapi/spec v0.22.0 // indirect
-	github.com/go-openapi/strfmt v0.24.0 // indirect
+	github.com/go-openapi/spec v0.21.0 // indirect
+	github.com/go-openapi/strfmt v0.23.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
-	github.com/go-openapi/swag/conv v0.25.1 // indirect
-	github.com/go-openapi/swag/fileutils v0.25.1 // indirect
-	github.com/go-openapi/swag/jsonname v0.25.1 // indirect
-	github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
-	github.com/go-openapi/swag/loading v0.25.1 // indirect
-	github.com/go-openapi/swag/mangling v0.25.1 // indirect
-	github.com/go-openapi/swag/stringutils v0.25.1 // indirect
-	github.com/go-openapi/swag/typeutils v0.25.1 // indirect
-	github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
-	github.com/go-openapi/validate v0.25.0 // indirect
+	github.com/go-openapi/validate v0.24.0 // indirect
+	github.com/go-redis/redis/v8 v8.11.5 // indirect
 	github.com/go-sql-driver/mysql v1.9.3 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/gofrs/uuid v4.4.0+incompatible // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
-	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
+	github.com/golang-jwt/jwt/v5 v5.2.3 // indirect
 	github.com/golang-migrate/migrate/v4 v4.7.0 // indirect
+	github.com/golang/mock v1.7.0-rc.1 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/btree v1.1.3 // indirect
 	github.com/google/flatbuffers v25.2.10+incompatible // indirect
-	github.com/google/gnostic-models v0.7.0 // indirect
+	github.com/google/gnostic-models v0.6.9 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/google/wire v0.7.0 // indirect
-	github.com/grafana/alerting v0.0.0-20251120161053-ee90fc928c01 // indirect
-	github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f // indirect
+	github.com/google/wire v0.6.0 // indirect
+	github.com/gorilla/mux v1.8.1 // indirect
+	github.com/grafana/alerting v0.0.0-20250729175202-b4b881b7b263 // indirect
+	github.com/grafana/authlib v0.0.0-20250710201142-9542f2f28d43 // indirect
 	github.com/grafana/dataplane/sdata v0.0.9 // indirect
-	github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4 // indirect
-	github.com/grafana/grafana-aws-sdk v1.2.0 // indirect
-	github.com/grafana/grafana-azure-sdk-go/v2 v2.3.1 // indirect
-	github.com/grafana/grafana/apps/plugins v0.0.0 // indirect
-	github.com/grafana/grafana/apps/provisioning v0.0.0 // indirect
-	github.com/grafana/grafana/pkg/apiserver v0.0.0 // indirect
+	github.com/grafana/dskit v0.0.0-20250611075409-46f51e1ce914 // indirect
+	github.com/grafana/grafana-aws-sdk v1.1.0 // indirect
+	github.com/grafana/grafana-azure-sdk-go/v2 v2.2.0 // indirect
+	github.com/grafana/grafana/apps/provisioning v0.0.0-20250804150913-990f1c69ecc2 // indirect
+	github.com/grafana/grafana/pkg/apiserver v0.0.0-20250804150913-990f1c69ecc2 // indirect
 	github.com/grafana/otel-profiling-go v0.5.1 // indirect
-	github.com/grafana/pyroscope-go/godeltaprof v0.1.9 // indirect
-	github.com/grafana/sqlds/v4 v4.2.7 // indirect
+	github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
+	github.com/grafana/sqlds/v4 v4.2.4 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-hclog v1.6.3 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/go-metrics v0.5.4 // indirect
 	github.com/hashicorp/go-msgpack/v2 v2.1.2 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-plugin v1.7.0 // indirect
+	github.com/hashicorp/go-plugin v1.6.3 // indirect
 	github.com/hashicorp/go-sockaddr v1.0.7 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hashicorp/memberlist v0.5.2 // indirect
-	github.com/hashicorp/yamux v0.1.2 // indirect
+	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/jaegertracing/jaeger-idl v0.5.0 // indirect
 	github.com/jessevdk/go-flags v1.6.1 // indirect
 	github.com/jmespath-community/go-jmespath v1.1.1 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/jmoiron/sqlx v1.4.0 // indirect
+	github.com/jmoiron/sqlx v1.3.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/jszwedko/go-datemath v0.1.1-0.20230526204004-640a500621d6 // indirect
 	github.com/klauspost/compress v1.18.0 // indirect
-	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/lestrrat-go/strftime v1.0.4 // indirect
 	github.com/lib/pq v1.10.9 // indirect
@@ -196,7 +173,7 @@ require (
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
-	github.com/mattn/go-sqlite3 v1.14.32 // indirect
+	github.com/mattn/go-sqlite3 v1.14.22 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mdlayher/socket v0.4.1 // indirect
 	github.com/mdlayher/vsock v1.2.1 // indirect
@@ -211,7 +188,7 @@ require (
 	github.com/mithrandie/go-text v1.6.0 // indirect
 	github.com/mithrandie/ternary v1.1.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
@@ -222,9 +199,9 @@ require (
 	github.com/oklog/run v1.1.0 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
-	github.com/open-feature/go-sdk v1.16.0 // indirect
-	github.com/open-feature/go-sdk-contrib/providers/go-feature-flag v0.2.6 // indirect
-	github.com/open-feature/go-sdk-contrib/providers/ofrep v0.1.6 // indirect
+	github.com/open-feature/go-sdk v1.14.1 // indirect
+	github.com/open-feature/go-sdk-contrib/providers/go-feature-flag v0.2.3 // indirect
+	github.com/open-feature/go-sdk-contrib/providers/ofrep v0.1.5 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/perimeterx/marshmallow v1.1.5 // indirect
 	github.com/pierrec/lz4/v4 v4.1.22 // indirect
@@ -232,14 +209,13 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/alertmanager v0.28.0 // indirect
-	github.com/prometheus/client_golang v1.23.2 // indirect
+	github.com/prometheus/client_golang v1.22.0 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.67.1 // indirect
+	github.com/prometheus/common v0.65.0 // indirect
 	github.com/prometheus/common/sigv4 v0.1.0 // indirect
 	github.com/prometheus/exporter-toolkit v0.14.0 // indirect
 	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/puzpuzpuz/xsync/v2 v2.5.1 // indirect
-	github.com/redis/go-redis/v9 v9.14.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rs/cors v1.11.1 // indirect
@@ -247,10 +223,10 @@ require (
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect
-	github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92 // indirect
+	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/spf13/cast v1.10.0 // indirect
-	github.com/spf13/pflag v1.0.10 // indirect
+	github.com/spf13/cast v1.7.1 // indirect
+	github.com/spf13/pflag v1.0.7 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/tetratelabs/wazero v1.8.2 // indirect
 	github.com/thomaspoignant/go-feature-flag v1.42.0 // indirect
@@ -258,17 +234,16 @@ require (
 	github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect
 	github.com/unknwon/com v1.0.1 // indirect
 	github.com/unknwon/log v0.0.0-20200308114134-929b1006e34a // indirect
-	github.com/urfave/cli v1.22.17 // indirect
-	github.com/woodsbury/decimal128 v1.3.0 // indirect
+	github.com/urfave/cli v1.22.16 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/zeebo/xxh3 v1.0.2 // indirect
-	go.mongodb.org/mongo-driver v1.17.4 // indirect
+	go.mongodb.org/mongo-driver v1.17.3 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
-	go.opentelemetry.io/contrib/propagators/jaeger v1.38.0 // indirect
-	go.opentelemetry.io/contrib/samplers/jaegerremote v0.32.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.61.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
+	go.opentelemetry.io/contrib/propagators/jaeger v1.36.0 // indirect
+	go.opentelemetry.io/contrib/samplers/jaegerremote v0.30.0 // indirect
 	go.opentelemetry.io/otel v1.38.0 // indirect
 	go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
@@ -277,52 +252,48 @@ require (
 	go.opentelemetry.io/otel/metric v1.38.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
 	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.7.1 // indirect
+	go.opentelemetry.io/proto/otlp v1.7.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
-	go.uber.org/mock v0.6.0 // indirect
-	go.yaml.in/yaml/v2 v2.4.3 // indirect
-	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.43.0 // indirect
-	golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9 // indirect
-	golang.org/x/mod v0.29.0 // indirect
-	golang.org/x/net v0.46.0 // indirect
-	golang.org/x/oauth2 v0.32.0 // indirect
-	golang.org/x/sync v0.17.0 // indirect
-	golang.org/x/sys v0.37.0 // indirect
-	golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 // indirect
-	golang.org/x/term v0.36.0 // indirect
-	golang.org/x/text v0.30.0 // indirect
-	golang.org/x/time v0.14.0 // indirect
-	golang.org/x/tools v0.38.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	golang.org/x/crypto v0.40.0 // indirect
+	golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
+	golang.org/x/mod v0.26.0 // indirect
+	golang.org/x/net v0.42.0 // indirect
+	golang.org/x/oauth2 v0.30.0 // indirect
+	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/sys v0.34.0 // indirect
+	golang.org/x/term v0.33.0 // indirect
+	golang.org/x/text v0.27.0 // indirect
+	golang.org/x/time v0.11.0 // indirect
+	golang.org/x/tools v0.35.0 // indirect
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
 	gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
 	gonum.org/v1/gonum v0.16.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250908214217-97024824d090 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251002232023-7c0ddcbb5797 // indirect
-	google.golang.org/grpc v1.76.0 // indirect
-	google.golang.org/protobuf v1.36.10 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
+	google.golang.org/grpc v1.74.2 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/mail.v2 v2.3.1 // indirect
 	gopkg.in/src-d/go-errors.v1 v1.0.0 // indirect
-	gopkg.in/telebot.v3 v3.3.8 // indirect
+	gopkg.in/telebot.v3 v3.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.34.1 // indirect
-	k8s.io/apiextensions-apiserver v0.34.1 // indirect
-	k8s.io/client-go v0.34.1 // indirect
-	k8s.io/component-base v0.34.1 // indirect
+	k8s.io/api v0.33.3 // indirect
+	k8s.io/apiextensions-apiserver v0.33.3 // indirect
+	k8s.io/client-go v0.33.3 // indirect
+	k8s.io/component-base v0.33.3 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
-	modernc.org/libc v1.66.10 // indirect
+	k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
+	modernc.org/libc v1.65.0 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
-	modernc.org/memory v1.11.0 // indirect
-	modernc.org/sqlite v1.39.1 // indirect
+	modernc.org/memory v1.10.0 // indirect
+	modernc.org/sqlite v1.38.0 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
-	sigs.k8s.io/yaml v1.6.0 // indirect
-	xorm.io/builder v0.3.13 // indirect
+	sigs.k8s.io/yaml v1.5.0 // indirect
+	xorm.io/builder v0.3.6 // indirect
 )

apps/advisor/kinds/check.cue

@@ -1,49 +1,57 @@
 package advisor
 
-checkv0alpha1: {
-	kind:   "Check"
-	plural: "checks"
-	scope:  "Namespaced"
+check: {
+	kind:	   "Check"
+	pluralName: "Checks"
+	current:	"v0alpha1"
 	validation: {
 		operations: [
 			"CREATE",
 			"UPDATE",
 		]
 	}
-	schema: {
-		#Data: {
-			// Generic data input that a check can receive
-			data?: [string]: string
-		}
-		#ErrorLink: {
-			// URL to a page with more information about the error
-			url: string
-			// Human readable error message
-			message: string
-		}
-		#ReportFailure: {
-			// Severity of the failure
-			severity: "high" | "low"
-			// Step ID that the failure is associated with
-			stepID: string
-			// Human readable identifier of the item that failed
-			item: string
-			// ID of the item that failed
-			itemID: string
-			// Links to actions that can be taken to resolve the failure
-			links: [...#ErrorLink]
-			// More information about the failure, not meant to be displayed to the user. Used for LLM suggestions.
-			moreInfo?: string
-		}	
-		#Report: {
-			// Number of elements analyzed
-			count: int
-			// List of failures
-			failures: [...#ReportFailure]
-		}
-		spec: #Data
-		status: {
-			report: #Report
+	versions: {
+		"v0alpha1": {
+			codegen: {
+				ts: {enabled: false}
+				go: {enabled: true}
+			}
+			schema: {
+				#Data: {
+					// Generic data input that a check can receive
+					data?: [string]: string
+				}
+				#ErrorLink: {
+					// URL to a page with more information about the error
+					url: string
+					// Human readable error message
+					message: string
+ 				}
+				#ReportFailure: {
+					// Severity of the failure
+					severity: "high" | "low"
+					// Step ID that the failure is associated with
+					stepID: string
+					// Human readable identifier of the item that failed
+					item: string
+					// ID of the item that failed
+					itemID: string
+					// Links to actions that can be taken to resolve the failure
+					links: [...#ErrorLink]
+					// More information about the failure, not meant to be displayed to the user. Used for LLM suggestions.
+					moreInfo?: string
+				}	
+				#Report: {
+						// Number of elements analyzed
+						count: int
+						// List of failures
+						failures: [...#ReportFailure]
+				}
+				spec: #Data
+				status: {
+					report: #Report
+				}
+			}
 		}
 	}
 }

apps/advisor/kinds/checktype.cue

@@ -1,19 +1,27 @@
 package advisor
 
-checktypev0alpha1: {
-	kind:   "CheckType"
-	plural: "checktypes"
-	scope:  "Namespaced"
-	schema: {
-		#Step: {
-			title:			string
-			description:	string
-			stepID:			string
-			resolution:		string
-		}	
-		spec: {
-			name: 	string
-			steps:	[...#Step]
+checktype: {
+	kind:		"CheckType"
+	pluralName:	"CheckTypes"
+	current:	"v0alpha1"
+	versions: {
+		"v0alpha1": {
+			codegen: {
+				ts: {enabled: false}
+				go: {enabled: true}
+			}
+			schema: {
+				#Step: {
+					title:			string
+					description:	string
+					stepID:			string
+					resolution:		string
+				}	
+				spec: {
+					name: 	string
+					steps:	[...#Step]
+				}
+			}
 		}
 	}
 }

apps/advisor/kinds/manifest.cue

@@ -1,18 +1,10 @@
 package advisor
 
 manifest: {
-	appName:       "advisor"
-	groupOverride: "advisor.grafana.app"
-	versions: {
-		"v0alpha1": {
-			codegen: {
-				ts: {enabled: false}
-				go: {enabled: true}
-			}
-			kinds: [
-				checkv0alpha1,
-                checktypev0alpha1,
-			]
-		}
-	}
+	appName:		"advisor"
+	groupOverride:	"advisor.grafana.app"
+	kinds:			[
+		check,
+		checktype,
+	]
 }

apps/advisor/pkg/apis/advisor/v0alpha1/checktype_client_gen.go

@@ -1,99 +0,0 @@
-package v0alpha1
-
-import (
-	"context"
-
-	"github.com/grafana/grafana-app-sdk/resource"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-type CheckTypeClient struct {
-	client *resource.TypedClient[*CheckType, *CheckTypeList]
-}
-
-func NewCheckTypeClient(client resource.Client) *CheckTypeClient {
-	return &CheckTypeClient{
-		client: resource.NewTypedClient[*CheckType, *CheckTypeList](client, CheckTypeKind()),
-	}
-}
-
-func NewCheckTypeClientFromGenerator(generator resource.ClientGenerator) (*CheckTypeClient, error) {
-	c, err := generator.ClientFor(CheckTypeKind())
-	if err != nil {
-		return nil, err
-	}
-	return NewCheckTypeClient(c), nil
-}
-
-func (c *CheckTypeClient) Get(ctx context.Context, identifier resource.Identifier) (*CheckType, error) {
-	return c.client.Get(ctx, identifier)
-}
-
-func (c *CheckTypeClient) List(ctx context.Context, namespace string, opts resource.ListOptions) (*CheckTypeList, error) {
-	return c.client.List(ctx, namespace, opts)
-}
-
-func (c *CheckTypeClient) ListAll(ctx context.Context, namespace string, opts resource.ListOptions) (*CheckTypeList, error) {
-	resp, err := c.client.List(ctx, namespace, resource.ListOptions{
-		ResourceVersion: opts.ResourceVersion,
-		Limit:           opts.Limit,
-		LabelFilters:    opts.LabelFilters,
-		FieldSelectors:  opts.FieldSelectors,
-	})
-	if err != nil {
-		return nil, err
-	}
-	for resp.GetContinue() != "" {
-		page, err := c.client.List(ctx, namespace, resource.ListOptions{
-			Continue:        resp.GetContinue(),
-			ResourceVersion: opts.ResourceVersion,
-			Limit:           opts.Limit,
-			LabelFilters:    opts.LabelFilters,
-			FieldSelectors:  opts.FieldSelectors,
-		})
-		if err != nil {
-			return nil, err
-		}
-		resp.SetContinue(page.GetContinue())
-		resp.SetResourceVersion(page.GetResourceVersion())
-		resp.SetItems(append(resp.GetItems(), page.GetItems()...))
-	}
-	return resp, nil
-}
-
-func (c *CheckTypeClient) Create(ctx context.Context, obj *CheckType, opts resource.CreateOptions) (*CheckType, error) {
-	// Make sure apiVersion and kind are set
-	obj.APIVersion = GroupVersion.Identifier()
-	obj.Kind = CheckTypeKind().Kind()
-	return c.client.Create(ctx, obj, opts)
-}
-
-func (c *CheckTypeClient) Update(ctx context.Context, obj *CheckType, opts resource.UpdateOptions) (*CheckType, error) {
-	return c.client.Update(ctx, obj, opts)
-}
-
-func (c *CheckTypeClient) Patch(ctx context.Context, identifier resource.Identifier, req resource.PatchRequest, opts resource.PatchOptions) (*CheckType, error) {
-	return c.client.Patch(ctx, identifier, req, opts)
-}
-
-func (c *CheckTypeClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus CheckTypeStatus, opts resource.UpdateOptions) (*CheckType, error) {
-	return c.client.Update(ctx, &CheckType{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       CheckTypeKind().Kind(),
-			APIVersion: GroupVersion.Identifier(),
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			ResourceVersion: opts.ResourceVersion,
-			Namespace:       identifier.Namespace,
-			Name:            identifier.Name,
-		},
-		Status: newStatus,
-	}, resource.UpdateOptions{
-		Subresource:     "status",
-		ResourceVersion: opts.ResourceVersion,
-	})
-}
-
-func (c *CheckTypeClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
-	return c.client.Delete(ctx, identifier, opts)
-}

apps/advisor/pkg/apis/advisor_manifest.go

@@ -12,26 +12,22 @@ import (
 
 	"github.com/grafana/grafana-app-sdk/app"
 	"github.com/grafana/grafana-app-sdk/resource"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/kube-openapi/pkg/spec3"
-	"k8s.io/kube-openapi/pkg/validation/spec"
 
 	v0alpha1 "github.com/grafana/grafana/apps/advisor/pkg/apis/advisor/v0alpha1"
 )
 
 var (
-	rawSchemaCheckv0alpha1         = []byte(`{"Check":{"properties":{"spec":{"$ref":"#/components/schemas/spec"},"status":{"$ref":"#/components/schemas/status"}},"required":["spec"]},"ErrorLink":{"additionalProperties":false,"properties":{"message":{"description":"Human readable error message","type":"string"},"url":{"description":"URL to a page with more information about the error","type":"string"}},"required":["url","message"],"type":"object"},"OperatorState":{"additionalProperties":false,"properties":{"descriptiveState":{"description":"descriptiveState is an optional more descriptive state field which has no requirements on format","type":"string"},"details":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"details contains any extra information that is operator-specific","type":"object"},"lastEvaluation":{"description":"lastEvaluation is the ResourceVersion last evaluated","type":"string"},"state":{"description":"state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.","enum":["success","in_progress","failed"],"type":"string"}},"required":["lastEvaluation","state"],"type":"object"},"Report":{"additionalProperties":false,"properties":{"count":{"description":"Number of elements analyzed","type":"integer"},"failures":{"description":"List of failures","items":{"$ref":"#/components/schemas/ReportFailure"},"type":"array"}},"required":["count","failures"],"type":"object"},"ReportFailure":{"additionalProperties":false,"properties":{"item":{"description":"Human readable identifier of the item that failed","type":"string"},"itemID":{"description":"ID of the item that failed","type":"string"},"links":{"description":"Links to actions that can be taken to resolve the failure","items":{"$ref":"#/components/schemas/ErrorLink"},"type":"array"},"moreInfo":{"description":"More information about the failure, not meant to be displayed to the user. Used for LLM suggestions.","type":"string"},"severity":{"description":"Severity of the failure","enum":["high","low"],"type":"string"},"stepID":{"description":"Step ID that the failure is associated with","type":"string"}},"required":["severity","stepID","item","itemID","links"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"data":{"additionalProperties":{"type":"string"},"description":"Generic data input that a check can receive","type":"object"}},"type":"object"},"status":{"additionalProperties":false,"properties":{"additionalFields":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"additionalFields is reserved for future use","type":"object"},"operatorStates":{"additionalProperties":{"$ref":"#/components/schemas/OperatorState"},"description":"operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.","type":"object"},"report":{"$ref":"#/components/schemas/Report"}},"required":["report"],"type":"object"}}`)
+	rawSchemaCheckv0alpha1         = []byte(`{"spec":{"properties":{"data":{"additionalProperties":{"type":"string"},"description":"Generic data input that a check can receive","type":"object"}},"type":"object"},"status":{"properties":{"additionalFields":{"description":"additionalFields is reserved for future use","type":"object","x-kubernetes-preserve-unknown-fields":true},"operatorStates":{"additionalProperties":{"properties":{"descriptiveState":{"description":"descriptiveState is an optional more descriptive state field which has no requirements on format","type":"string"},"details":{"description":"details contains any extra information that is operator-specific","type":"object","x-kubernetes-preserve-unknown-fields":true},"lastEvaluation":{"description":"lastEvaluation is the ResourceVersion last evaluated","type":"string"},"state":{"description":"state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.","enum":["success","in_progress","failed"],"type":"string"}},"required":["lastEvaluation","state"],"type":"object"},"description":"operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.","type":"object"},"report":{"properties":{"count":{"description":"Number of elements analyzed","type":"integer"},"failures":{"description":"List of failures","items":{"properties":{"item":{"description":"Human readable identifier of the item that failed","type":"string"},"itemID":{"description":"ID of the item that failed","type":"string"},"links":{"description":"Links to actions that can be taken to resolve the failure","items":{"properties":{"message":{"description":"Human readable error message","type":"string"},"url":{"description":"URL to a page with more information about the error","type":"string"}},"required":["url","message"],"type":"object"},"type":"array"},"moreInfo":{"description":"More information about the failure, not meant to be displayed to the user. Used for LLM suggestions.","type":"string"},"severity":{"description":"Severity of the failure","enum":["high","low"],"type":"string"},"stepID":{"description":"Step ID that the failure is associated with","type":"string"}},"required":["severity","stepID","item","itemID","links"],"type":"object"},"type":"array"}},"required":["count","failures"],"type":"object"}},"required":["report"],"type":"object"}}`)
 	versionSchemaCheckv0alpha1     app.VersionSchema
 	_                              = json.Unmarshal(rawSchemaCheckv0alpha1, &versionSchemaCheckv0alpha1)
-	rawSchemaCheckTypev0alpha1     = []byte(`{"CheckType":{"properties":{"spec":{"$ref":"#/components/schemas/spec"},"status":{"$ref":"#/components/schemas/status"}},"required":["spec"]},"OperatorState":{"additionalProperties":false,"properties":{"descriptiveState":{"description":"descriptiveState is an optional more descriptive state field which has no requirements on format","type":"string"},"details":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"details contains any extra information that is operator-specific","type":"object"},"lastEvaluation":{"description":"lastEvaluation is the ResourceVersion last evaluated","type":"string"},"state":{"description":"state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.","enum":["success","in_progress","failed"],"type":"string"}},"required":["lastEvaluation","state"],"type":"object"},"Step":{"additionalProperties":false,"properties":{"description":{"type":"string"},"resolution":{"type":"string"},"stepID":{"type":"string"},"title":{"type":"string"}},"required":["title","description","stepID","resolution"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"name":{"type":"string"},"steps":{"items":{"$ref":"#/components/schemas/Step"},"type":"array"}},"required":["name","steps"],"type":"object"},"status":{"additionalProperties":false,"properties":{"additionalFields":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"additionalFields is reserved for future use","type":"object"},"operatorStates":{"additionalProperties":{"$ref":"#/components/schemas/OperatorState"},"description":"operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.","type":"object"}},"type":"object"}}`)
+	rawSchemaCheckTypev0alpha1     = []byte(`{"spec":{"properties":{"name":{"type":"string"},"steps":{"items":{"properties":{"description":{"type":"string"},"resolution":{"type":"string"},"stepID":{"type":"string"},"title":{"type":"string"}},"required":["title","description","stepID","resolution"],"type":"object"},"type":"array"}},"required":["name","steps"],"type":"object"},"status":{"properties":{"additionalFields":{"description":"additionalFields is reserved for future use","type":"object","x-kubernetes-preserve-unknown-fields":true},"operatorStates":{"additionalProperties":{"properties":{"descriptiveState":{"description":"descriptiveState is an optional more descriptive state field which has no requirements on format","type":"string"},"details":{"description":"details contains any extra information that is operator-specific","type":"object","x-kubernetes-preserve-unknown-fields":true},"lastEvaluation":{"description":"lastEvaluation is the ResourceVersion last evaluated","type":"string"},"state":{"description":"state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.","enum":["success","in_progress","failed"],"type":"string"}},"required":["lastEvaluation","state"],"type":"object"},"description":"operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.","type":"object"}},"type":"object"}}`)
 	versionSchemaCheckTypev0alpha1 app.VersionSchema
 	_                              = json.Unmarshal(rawSchemaCheckTypev0alpha1, &versionSchemaCheckTypev0alpha1)
 )
 
 var appManifestData = app.ManifestData{
-	AppName:          "advisor",
-	Group:            "advisor.grafana.app",
-	PreferredVersion: "v0alpha1",
+	AppName: "advisor",
+	Group:   "advisor.grafana.app",
 	Versions: []app.ManifestVersion{
 		{
 			Name:   "v0alpha1",
@@ -61,11 +57,6 @@ var appManifestData = app.ManifestData{
 					Schema:     &versionSchemaCheckTypev0alpha1,
 				},
 			},
-			Routes: app.ManifestVersionRoutes{
-				Namespaced: map[string]spec3.PathProps{},
-				Cluster:    map[string]spec3.PathProps{},
-				Schemas:    map[string]spec.Schema{},
-			},
 		},
 	},
 }
@@ -95,7 +86,6 @@ var customRouteToGoResponseType = map[string]any{}
 // ManifestCustomRouteResponsesAssociator returns the associated response go type for a given kind, version, custom route path, and method, if one exists.
 // kind may be empty for custom routes which are not kind subroutes. Leading slashes are removed from subroute paths.
 // If there is no association for the provided kind, version, custom route path, and method, exists will return false.
-// Resource routes (those without a kind) should prefix their route with "<namespace>/" if the route is namespaced (otherwise the route is assumed to be cluster-scope)
 func ManifestCustomRouteResponsesAssociator(kind, version, path, verb string) (goType any, exists bool) {
 	if len(path) > 0 && path[0] == '/' {
 		path = path[1:]
@@ -103,42 +93,3 @@ func ManifestCustomRouteResponsesAssociator(kind, version, path, verb string) (g
 	goType, exists = customRouteToGoResponseType[fmt.Sprintf("%s|%s|%s|%s", version, kind, path, strings.ToUpper(verb))]
 	return goType, exists
 }
-
-var customRouteToGoParamsType = map[string]runtime.Object{}
-
-func ManifestCustomRouteQueryAssociator(kind, version, path, verb string) (goType runtime.Object, exists bool) {
-	if len(path) > 0 && path[0] == '/' {
-		path = path[1:]
-	}
-	goType, exists = customRouteToGoParamsType[fmt.Sprintf("%s|%s|%s|%s", version, kind, path, strings.ToUpper(verb))]
-	return goType, exists
-}
-
-var customRouteToGoRequestBodyType = map[string]any{}
-
-func ManifestCustomRouteRequestBodyAssociator(kind, version, path, verb string) (goType any, exists bool) {
-	if len(path) > 0 && path[0] == '/' {
-		path = path[1:]
-	}
-	goType, exists = customRouteToGoRequestBodyType[fmt.Sprintf("%s|%s|%s|%s", version, kind, path, strings.ToUpper(verb))]
-	return goType, exists
-}
-
-type GoTypeAssociator struct{}
-
-func NewGoTypeAssociator() *GoTypeAssociator {
-	return &GoTypeAssociator{}
-}
-
-func (g *GoTypeAssociator) KindToGoType(kind, version string) (goType resource.Kind, exists bool) {
-	return ManifestGoTypeAssociator(kind, version)
-}
-func (g *GoTypeAssociator) CustomRouteReturnGoType(kind, version, path, verb string) (goType any, exists bool) {
-	return ManifestCustomRouteResponsesAssociator(kind, version, path, verb)
-}
-func (g *GoTypeAssociator) CustomRouteQueryGoType(kind, version, path, verb string) (goType runtime.Object, exists bool) {
-	return ManifestCustomRouteQueryAssociator(kind, version, path, verb)
-}
-func (g *GoTypeAssociator) CustomRouteRequestBodyGoType(kind, version, path, verb string) (goType any, exists bool) {
-	return ManifestCustomRouteRequestBodyAssociator(kind, version, path, verb)
-}

apps/alerting/alertenrichment/go.mod

@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/alerting/alertenrichment
 
-go 1.25.5
+go 1.25.3
 
 require (
 	github.com/grafana/grafana-app-sdk v0.48.1

apps/alerting/notifications/Makefile

@@ -1,11 +1,8 @@
 include ../../sdk.mk
 
-.PHONY: generate # Run Grafana App SDK code generation
-generate: install-app-sdk update-app-sdk
-	@$(APP_SDK_BIN) generate \
-		--source=./kinds/ \
-		--gogenpath=./pkg/apis \
-		--grouping=group \
-		--genoperatorstate=false \
-		--defencoding=none
-	
+.PHONY: generate
+generate: do-generate ## Run Grafana App SDK code generation
+
+.PHONY: do-generate
+do-generate: install-app-sdk update-app-sdk
+	@$(APP_SDK_BIN) generate --grouping=group --gogenpath=./pkg/apis --defencoding=yaml	--postprocess

apps/alerting/notifications/go.mod

@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/alerting/notifications
 
-go 1.25.5
+go 1.25.3
 
 require (
 	github.com/grafana/grafana-app-sdk v0.48.1

apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/receiver_client_gen.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/grafana/grafana-app-sdk/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 type ReceiverClient struct {
@@ -75,6 +76,24 @@ func (c *ReceiverClient) Patch(ctx context.Context, identifier resource.Identifi
 	return c.client.Patch(ctx, identifier, req, opts)
 }
 
+func (c *ReceiverClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus ReceiverStatus, opts resource.UpdateOptions) (*Receiver, error) {
+	return c.client.Update(ctx, &Receiver{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       ReceiverKind().Kind(),
+			APIVersion: GroupVersion.Identifier(),
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			ResourceVersion: opts.ResourceVersion,
+			Namespace:       identifier.Namespace,
+			Name:            identifier.Name,
+		},
+		Status: newStatus,
+	}, resource.UpdateOptions{
+		Subresource:     "status",
+		ResourceVersion: opts.ResourceVersion,
+	})
+}
+
 func (c *ReceiverClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
 	return c.client.Delete(ctx, identifier, opts)
 }

apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/receiver_object_gen.go

@@ -21,6 +21,8 @@ type Receiver struct {
 
 	// Spec is the spec of the Receiver
 	Spec ReceiverSpec `json:"spec" yaml:"spec"`
+
+	Status ReceiverStatus `json:"status" yaml:"status"`
 }
 
 func (o *Receiver) GetSpec() any {
@@ -37,11 +39,15 @@ func (o *Receiver) SetSpec(spec any) error {
 }
 
 func (o *Receiver) GetSubresources() map[string]any {
-	return map[string]any{}
+	return map[string]any{
+		"status": o.Status,
+	}
 }
 
 func (o *Receiver) GetSubresource(name string) (any, bool) {
 	switch name {
+	case "status":
+		return o.Status, true
 	default:
 		return nil, false
 	}
@@ -49,6 +55,13 @@ func (o *Receiver) GetSubresource(name string) (any, bool) {
 
 func (o *Receiver) SetSubresource(name string, value any) error {
 	switch name {
+	case "status":
+		cast, ok := value.(ReceiverStatus)
+		if !ok {
+			return fmt.Errorf("cannot set status type %#v, not of type ReceiverStatus", value)
+		}
+		o.Status = cast
+		return nil
 	default:
 		return fmt.Errorf("subresource '%s' does not exist", name)
 	}
@@ -220,6 +233,7 @@ func (o *Receiver) DeepCopyInto(dst *Receiver) {
 	dst.TypeMeta.Kind = o.TypeMeta.Kind
 	o.ObjectMeta.DeepCopyInto(&dst.ObjectMeta)
 	o.Spec.DeepCopyInto(&dst.Spec)
+	o.Status.DeepCopyInto(&dst.Status)
 }
 
 // Interface compliance compile-time check
@@ -291,3 +305,15 @@ func (s *ReceiverSpec) DeepCopy() *ReceiverSpec {
 func (s *ReceiverSpec) DeepCopyInto(dst *ReceiverSpec) {
 	resource.CopyObjectInto(dst, s)
 }
+
+// DeepCopy creates a full deep copy of ReceiverStatus
+func (s *ReceiverStatus) DeepCopy() *ReceiverStatus {
+	cpy := &ReceiverStatus{}
+	s.DeepCopyInto(cpy)
+	return cpy
+}
+
+// DeepCopyInto deep copies ReceiverStatus into another ReceiverStatus object
+func (s *ReceiverStatus) DeepCopyInto(dst *ReceiverStatus) {
+	resource.CopyObjectInto(dst, s)
+}

apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/receiver_status_gen.go

@@ -3,42 +3,42 @@
 package v0alpha1
 
 // +k8s:openapi-gen=true
-type PluginstatusOperatorState struct {
+type ReceiverstatusOperatorState struct {
 	// lastEvaluation is the ResourceVersion last evaluated
 	LastEvaluation string `json:"lastEvaluation"`
 	// state describes the state of the lastEvaluation.
 	// It is limited to three possible states for machine evaluation.
-	State PluginStatusOperatorStateState `json:"state"`
+	State ReceiverStatusOperatorStateState `json:"state"`
 	// descriptiveState is an optional more descriptive state field which has no requirements on format
 	DescriptiveState *string `json:"descriptiveState,omitempty"`
 	// details contains any extra information that is operator-specific
 	Details map[string]interface{} `json:"details,omitempty"`
 }
 
-// NewPluginstatusOperatorState creates a new PluginstatusOperatorState object.
-func NewPluginstatusOperatorState() *PluginstatusOperatorState {
-	return &PluginstatusOperatorState{}
+// NewReceiverstatusOperatorState creates a new ReceiverstatusOperatorState object.
+func NewReceiverstatusOperatorState() *ReceiverstatusOperatorState {
+	return &ReceiverstatusOperatorState{}
 }
 
 // +k8s:openapi-gen=true
-type PluginStatus struct {
+type ReceiverStatus struct {
 	// operatorStates is a map of operator ID to operator state evaluations.
 	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
-	OperatorStates map[string]PluginstatusOperatorState `json:"operatorStates,omitempty"`
+	OperatorStates map[string]ReceiverstatusOperatorState `json:"operatorStates,omitempty"`
 	// additionalFields is reserved for future use
 	AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
 }
 
-// NewPluginStatus creates a new PluginStatus object.
-func NewPluginStatus() *PluginStatus {
-	return &PluginStatus{}
+// NewReceiverStatus creates a new ReceiverStatus object.
+func NewReceiverStatus() *ReceiverStatus {
+	return &ReceiverStatus{}
 }
 
 // +k8s:openapi-gen=true
-type PluginStatusOperatorStateState string
+type ReceiverStatusOperatorStateState string
 
 const (
-	PluginStatusOperatorStateStateSuccess    PluginStatusOperatorStateState = "success"
-	PluginStatusOperatorStateStateInProgress PluginStatusOperatorStateState = "in_progress"
-	PluginStatusOperatorStateStateFailed     PluginStatusOperatorStateState = "failed"
+	ReceiverStatusOperatorStateStateSuccess    ReceiverStatusOperatorStateState = "success"
+	ReceiverStatusOperatorStateStateInProgress ReceiverStatusOperatorStateState = "in_progress"
+	ReceiverStatusOperatorStateStateFailed     ReceiverStatusOperatorStateState = "failed"
 )

apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/routingtree_client_gen.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/grafana/grafana-app-sdk/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 type RoutingTreeClient struct {
@@ -75,6 +76,24 @@ func (c *RoutingTreeClient) Patch(ctx context.Context, identifier resource.Ident
 	return c.client.Patch(ctx, identifier, req, opts)
 }
 
+func (c *RoutingTreeClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus RoutingTreeStatus, opts resource.UpdateOptions) (*RoutingTree, error) {
+	return c.client.Update(ctx, &RoutingTree{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       RoutingTreeKind().Kind(),
+			APIVersion: GroupVersion.Identifier(),
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			ResourceVersion: opts.ResourceVersion,
+			Namespace:       identifier.Namespace,
+			Name:            identifier.Name,
+		},
+		Status: newStatus,
+	}, resource.UpdateOptions{
+		Subresource:     "status",
+		ResourceVersion: opts.ResourceVersion,
+	})
+}
+
 func (c *RoutingTreeClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
 	return c.client.Delete(ctx, identifier, opts)
 }

apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/routingtree_object_gen.go

@@ -21,6 +21,8 @@ type RoutingTree struct {
 
 	// Spec is the spec of the RoutingTree
 	Spec RoutingTreeSpec `json:"spec" yaml:"spec"`
+
+	Status RoutingTreeStatus `json:"status" yaml:"status"`
 }
 
 func (o *RoutingTree) GetSpec() any {
@@ -37,11 +39,15 @@ func (o *RoutingTree) SetSpec(spec any) error {
 }
 
 func (o *RoutingTree) GetSubresources() map[string]any {
-	return map[string]any{}
+	return map[string]any{
+		"status": o.Status,
+	}
 }
 
 func (o *RoutingTree) GetSubresource(name string) (any, bool) {
 	switch name {
+	case "status":
+		return o.Status, true
 	default:
 		return nil, false
 	}
@@ -49,6 +55,13 @@ func (o *RoutingTree) GetSubresource(name string) (any, bool) {
 
 func (o *RoutingTree) SetSubresource(name string, value any) error {
 	switch name {
+	case "status":
+		cast, ok := value.(RoutingTreeStatus)
+		if !ok {
+			return fmt.Errorf("cannot set status type %#v, not of type RoutingTreeStatus", value)
+		}
+		o.Status = cast
+		return nil
 	default:
 		return fmt.Errorf("subresource '%s' does not exist", name)
 	}
@@ -220,6 +233,7 @@ func (o *RoutingTree) DeepCopyInto(dst *RoutingTree) {
 	dst.TypeMeta.Kind = o.TypeMeta.Kind
 	o.ObjectMeta.DeepCopyInto(&dst.ObjectMeta)
 	o.Spec.DeepCopyInto(&dst.Spec)
+	o.Status.DeepCopyInto(&dst.Status)
 }
 
 // Interface compliance compile-time check
@@ -291,3 +305,15 @@ func (s *RoutingTreeSpec) DeepCopy() *RoutingTreeSpec {
 func (s *RoutingTreeSpec) DeepCopyInto(dst *RoutingTreeSpec) {
 	resource.CopyObjectInto(dst, s)
 }
+
+// DeepCopy creates a full deep copy of RoutingTreeStatus
+func (s *RoutingTreeStatus) DeepCopy() *RoutingTreeStatus {
+	cpy := &RoutingTreeStatus{}
+	s.DeepCopyInto(cpy)
+	return cpy
+}
+
+// DeepCopyInto deep copies RoutingTreeStatus into another RoutingTreeStatus object
+func (s *RoutingTreeStatus) DeepCopyInto(dst *RoutingTreeStatus) {
+	resource.CopyObjectInto(dst, s)
+}

apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/routingtree_status_gen.go

@@ -0,0 +1,44 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v0alpha1
+
+// +k8s:openapi-gen=true
+type RoutingTreestatusOperatorState struct {
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State RoutingTreeStatusOperatorStateState `json:"state"`
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+	// details contains any extra information that is operator-specific
+	Details map[string]interface{} `json:"details,omitempty"`
+}
+
+// NewRoutingTreestatusOperatorState creates a new RoutingTreestatusOperatorState object.
+func NewRoutingTreestatusOperatorState() *RoutingTreestatusOperatorState {
+	return &RoutingTreestatusOperatorState{}
+}
+
+// +k8s:openapi-gen=true
+type RoutingTreeStatus struct {
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]RoutingTreestatusOperatorState `json:"operatorStates,omitempty"`
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
+}
+
+// NewRoutingTreeStatus creates a new RoutingTreeStatus object.
+func NewRoutingTreeStatus() *RoutingTreeStatus {
+	return &RoutingTreeStatus{}
+}
+
+// +k8s:openapi-gen=true
+type RoutingTreeStatusOperatorStateState string
+
+const (
+	RoutingTreeStatusOperatorStateStateSuccess    RoutingTreeStatusOperatorStateState = "success"
+	RoutingTreeStatusOperatorStateStateInProgress RoutingTreeStatusOperatorStateState = "in_progress"
+	RoutingTreeStatusOperatorStateStateFailed     RoutingTreeStatusOperatorStateState = "failed"
+)

apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/templategroup_client_gen.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/grafana/grafana-app-sdk/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 type TemplateGroupClient struct {
@@ -75,6 +76,24 @@ func (c *TemplateGroupClient) Patch(ctx context.Context, identifier resource.Ide
 	return c.client.Patch(ctx, identifier, req, opts)
 }
 
+func (c *TemplateGroupClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus TemplateGroupStatus, opts resource.UpdateOptions) (*TemplateGroup, error) {
+	return c.client.Update(ctx, &TemplateGroup{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       TemplateGroupKind().Kind(),
+			APIVersion: GroupVersion.Identifier(),
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			ResourceVersion: opts.ResourceVersion,
+			Namespace:       identifier.Namespace,
+			Name:            identifier.Name,
+		},
+		Status: newStatus,
+	}, resource.UpdateOptions{
+		Subresource:     "status",
+		ResourceVersion: opts.ResourceVersion,
+	})
+}
+
 func (c *TemplateGroupClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
 	return c.client.Delete(ctx, identifier, opts)
 }

apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/templategroup_object_gen.go

@@ -21,6 +21,8 @@ type TemplateGroup struct {
 
 	// Spec is the spec of the TemplateGroup
 	Spec TemplateGroupSpec `json:"spec" yaml:"spec"`
+
+	Status TemplateGroupStatus `json:"status" yaml:"status"`
 }
 
 func (o *TemplateGroup) GetSpec() any {
@@ -37,11 +39,15 @@ func (o *TemplateGroup) SetSpec(spec any) error {
 }
 
 func (o *TemplateGroup) GetSubresources() map[string]any {
-	return map[string]any{}
+	return map[string]any{
+		"status": o.Status,
+	}
 }
 
 func (o *TemplateGroup) GetSubresource(name string) (any, bool) {
 	switch name {
+	case "status":
+		return o.Status, true
 	default:
 		return nil, false
 	}
@@ -49,6 +55,13 @@ func (o *TemplateGroup) GetSubresource(name string) (any, bool) {
 
 func (o *TemplateGroup) SetSubresource(name string, value any) error {
 	switch name {
+	case "status":
+		cast, ok := value.(TemplateGroupStatus)
+		if !ok {
+			return fmt.Errorf("cannot set status type %#v, not of type TemplateGroupStatus", value)
+		}
+		o.Status = cast
+		return nil
 	default:
 		return fmt.Errorf("subresource '%s' does not exist", name)
 	}
@@ -220,6 +233,7 @@ func (o *TemplateGroup) DeepCopyInto(dst *TemplateGroup) {
 	dst.TypeMeta.Kind = o.TypeMeta.Kind
 	o.ObjectMeta.DeepCopyInto(&dst.ObjectMeta)
 	o.Spec.DeepCopyInto(&dst.Spec)
+	o.Status.DeepCopyInto(&dst.Status)
 }
 
 // Interface compliance compile-time check
@@ -291,3 +305,15 @@ func (s *TemplateGroupSpec) DeepCopy() *TemplateGroupSpec {
 func (s *TemplateGroupSpec) DeepCopyInto(dst *TemplateGroupSpec) {
 	resource.CopyObjectInto(dst, s)
 }
+
+// DeepCopy creates a full deep copy of TemplateGroupStatus
+func (s *TemplateGroupStatus) DeepCopy() *TemplateGroupStatus {
+	cpy := &TemplateGroupStatus{}
+	s.DeepCopyInto(cpy)
+	return cpy
+}
+
+// DeepCopyInto deep copies TemplateGroupStatus into another TemplateGroupStatus object
+func (s *TemplateGroupStatus) DeepCopyInto(dst *TemplateGroupStatus) {
+	resource.CopyObjectInto(dst, s)
+}

apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/templategroup_status_gen.go

@@ -0,0 +1,44 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v0alpha1
+
+// +k8s:openapi-gen=true
+type TemplateGroupstatusOperatorState struct {
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State TemplateGroupStatusOperatorStateState `json:"state"`
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+	// details contains any extra information that is operator-specific
+	Details map[string]interface{} `json:"details,omitempty"`
+}
+
+// NewTemplateGroupstatusOperatorState creates a new TemplateGroupstatusOperatorState object.
+func NewTemplateGroupstatusOperatorState() *TemplateGroupstatusOperatorState {
+	return &TemplateGroupstatusOperatorState{}
+}
+
+// +k8s:openapi-gen=true
+type TemplateGroupStatus struct {
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]TemplateGroupstatusOperatorState `json:"operatorStates,omitempty"`
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
+}
+
+// NewTemplateGroupStatus creates a new TemplateGroupStatus object.
+func NewTemplateGroupStatus() *TemplateGroupStatus {
+	return &TemplateGroupStatus{}
+}
+
+// +k8s:openapi-gen=true
+type TemplateGroupStatusOperatorStateState string
+
+const (
+	TemplateGroupStatusOperatorStateStateSuccess    TemplateGroupStatusOperatorStateState = "success"
+	TemplateGroupStatusOperatorStateStateInProgress TemplateGroupStatusOperatorStateState = "in_progress"
+	TemplateGroupStatusOperatorStateStateFailed     TemplateGroupStatusOperatorStateState = "failed"
+)

apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/timeinterval_client_gen.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/grafana/grafana-app-sdk/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 type TimeIntervalClient struct {
@@ -75,6 +76,24 @@ func (c *TimeIntervalClient) Patch(ctx context.Context, identifier resource.Iden
 	return c.client.Patch(ctx, identifier, req, opts)
 }
 
+func (c *TimeIntervalClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus TimeIntervalStatus, opts resource.UpdateOptions) (*TimeInterval, error) {
+	return c.client.Update(ctx, &TimeInterval{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       TimeIntervalKind().Kind(),
+			APIVersion: GroupVersion.Identifier(),
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			ResourceVersion: opts.ResourceVersion,
+			Namespace:       identifier.Namespace,
+			Name:            identifier.Name,
+		},
+		Status: newStatus,
+	}, resource.UpdateOptions{
+		Subresource:     "status",
+		ResourceVersion: opts.ResourceVersion,
+	})
+}
+
 func (c *TimeIntervalClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
 	return c.client.Delete(ctx, identifier, opts)
 }

apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/timeinterval_object_gen.go

@@ -21,6 +21,8 @@ type TimeInterval struct {
 
 	// Spec is the spec of the TimeInterval
 	Spec TimeIntervalSpec `json:"spec" yaml:"spec"`
+
+	Status TimeIntervalStatus `json:"status" yaml:"status"`
 }
 
 func (o *TimeInterval) GetSpec() any {
@@ -37,11 +39,15 @@ func (o *TimeInterval) SetSpec(spec any) error {
 }
 
 func (o *TimeInterval) GetSubresources() map[string]any {
-	return map[string]any{}
+	return map[string]any{
+		"status": o.Status,
+	}
 }
 
 func (o *TimeInterval) GetSubresource(name string) (any, bool) {
 	switch name {
+	case "status":
+		return o.Status, true
 	default:
 		return nil, false
 	}
@@ -49,6 +55,13 @@ func (o *TimeInterval) GetSubresource(name string) (any, bool) {
 
 func (o *TimeInterval) SetSubresource(name string, value any) error {
 	switch name {
+	case "status":
+		cast, ok := value.(TimeIntervalStatus)
+		if !ok {
+			return fmt.Errorf("cannot set status type %#v, not of type TimeIntervalStatus", value)
+		}
+		o.Status = cast
+		return nil
 	default:
 		return fmt.Errorf("subresource '%s' does not exist", name)
 	}
@@ -220,6 +233,7 @@ func (o *TimeInterval) DeepCopyInto(dst *TimeInterval) {
 	dst.TypeMeta.Kind = o.TypeMeta.Kind
 	o.ObjectMeta.DeepCopyInto(&dst.ObjectMeta)
 	o.Spec.DeepCopyInto(&dst.Spec)
+	o.Status.DeepCopyInto(&dst.Status)
 }
 
 // Interface compliance compile-time check
@@ -291,3 +305,15 @@ func (s *TimeIntervalSpec) DeepCopy() *TimeIntervalSpec {
 func (s *TimeIntervalSpec) DeepCopyInto(dst *TimeIntervalSpec) {
 	resource.CopyObjectInto(dst, s)
 }
+
+// DeepCopy creates a full deep copy of TimeIntervalStatus
+func (s *TimeIntervalStatus) DeepCopy() *TimeIntervalStatus {
+	cpy := &TimeIntervalStatus{}
+	s.DeepCopyInto(cpy)
+	return cpy
+}
+
+// DeepCopyInto deep copies TimeIntervalStatus into another TimeIntervalStatus object
+func (s *TimeIntervalStatus) DeepCopyInto(dst *TimeIntervalStatus) {
+	resource.CopyObjectInto(dst, s)
+}

apps/alerting/notifications/pkg/apis/alertingnotifications/v0alpha1/timeinterval_status_gen.go

@@ -0,0 +1,44 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v0alpha1
+
+// +k8s:openapi-gen=true
+type TimeIntervalstatusOperatorState struct {
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State TimeIntervalStatusOperatorStateState `json:"state"`
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+	// details contains any extra information that is operator-specific
+	Details map[string]interface{} `json:"details,omitempty"`
+}
+
+// NewTimeIntervalstatusOperatorState creates a new TimeIntervalstatusOperatorState object.
+func NewTimeIntervalstatusOperatorState() *TimeIntervalstatusOperatorState {
+	return &TimeIntervalstatusOperatorState{}
+}
+
+// +k8s:openapi-gen=true
+type TimeIntervalStatus struct {
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]TimeIntervalstatusOperatorState `json:"operatorStates,omitempty"`
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
+}
+
+// NewTimeIntervalStatus creates a new TimeIntervalStatus object.
+func NewTimeIntervalStatus() *TimeIntervalStatus {
+	return &TimeIntervalStatus{}
+}
+
+// +k8s:openapi-gen=true
+type TimeIntervalStatusOperatorStateState string
+
+const (
+	TimeIntervalStatusOperatorStateStateSuccess    TimeIntervalStatusOperatorStateState = "success"
+	TimeIntervalStatusOperatorStateStateInProgress TimeIntervalStatusOperatorStateState = "in_progress"
+	TimeIntervalStatusOperatorStateStateFailed     TimeIntervalStatusOperatorStateState = "failed"
+)

apps/alerting/notifications/pkg/apis/alertingnotifications_manifest.go

@@ -20,16 +20,16 @@ import (
 )
 
 var (
-	rawSchemaReceiverv0alpha1          = []byte(`{"Integration":{"additionalProperties":false,"properties":{"disableResolveMessage":{"type":"boolean"},"secureFields":{"additionalProperties":{"type":"boolean"},"type":"object"},"settings":{"additionalProperties":{"additionalProperties":{},"type":"object"},"type":"object"},"type":{"type":"string"},"uid":{"type":"string"},"version":{"type":"string"}},"required":["type","version","settings"],"type":"object"},"Receiver":{"properties":{"spec":{"$ref":"#/components/schemas/spec"}},"required":["spec"]},"spec":{"additionalProperties":false,"properties":{"integrations":{"items":{"$ref":"#/components/schemas/Integration"},"type":"array"},"title":{"type":"string"}},"required":["title","integrations"],"type":"object"}}`)
+	rawSchemaReceiverv0alpha1          = []byte(`{"Integration":{"additionalProperties":false,"properties":{"disableResolveMessage":{"type":"boolean"},"secureFields":{"additionalProperties":{"type":"boolean"},"type":"object"},"settings":{"additionalProperties":{"additionalProperties":{},"type":"object"},"type":"object"},"type":{"type":"string"},"uid":{"type":"string"},"version":{"type":"string"}},"required":["type","version","settings"],"type":"object"},"OperatorState":{"additionalProperties":false,"properties":{"descriptiveState":{"description":"descriptiveState is an optional more descriptive state field which has no requirements on format","type":"string"},"details":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"details contains any extra information that is operator-specific","type":"object"},"lastEvaluation":{"description":"lastEvaluation is the ResourceVersion last evaluated","type":"string"},"state":{"description":"state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.","enum":["success","in_progress","failed"],"type":"string"}},"required":["lastEvaluation","state"],"type":"object"},"Receiver":{"properties":{"spec":{"$ref":"#/components/schemas/spec"},"status":{"$ref":"#/components/schemas/status"}},"required":["spec"]},"spec":{"additionalProperties":false,"properties":{"integrations":{"items":{"$ref":"#/components/schemas/Integration"},"type":"array"},"title":{"type":"string"}},"required":["title","integrations"],"type":"object"},"status":{"additionalProperties":false,"properties":{"additionalFields":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"additionalFields is reserved for future use","type":"object"},"operatorStates":{"additionalProperties":{"$ref":"#/components/schemas/OperatorState"},"description":"operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.","type":"object"}},"type":"object"}}`)
 	versionSchemaReceiverv0alpha1      app.VersionSchema
 	_                                  = json.Unmarshal(rawSchemaReceiverv0alpha1, &versionSchemaReceiverv0alpha1)
-	rawSchemaRoutingTreev0alpha1       = []byte(`{"Matcher":{"additionalProperties":false,"properties":{"label":{"type":"string"},"type":{"enum":["=","!=","=~","!~"],"type":"string"},"value":{"type":"string"}},"required":["type","label","value"],"type":"object"},"Route":{"additionalProperties":false,"properties":{"active_time_intervals":{"items":{"type":"string"},"type":"array"},"continue":{"type":"boolean"},"group_by":{"items":{"type":"string"},"type":"array"},"group_interval":{"type":"string"},"group_wait":{"type":"string"},"matchers":{"items":{"$ref":"#/components/schemas/Matcher"},"type":"array"},"mute_time_intervals":{"items":{"type":"string"},"type":"array"},"receiver":{"type":"string"},"repeat_interval":{"type":"string"},"routes":{"items":{"$ref":"#/components/schemas/Route"},"type":"array"}},"required":["continue"],"type":"object"},"RouteDefaults":{"additionalProperties":false,"properties":{"group_by":{"items":{"type":"string"},"type":"array"},"group_interval":{"type":"string"},"group_wait":{"type":"string"},"receiver":{"type":"string"},"repeat_interval":{"type":"string"}},"required":["receiver"],"type":"object"},"RoutingTree":{"properties":{"spec":{"$ref":"#/components/schemas/spec"}},"required":["spec"]},"spec":{"additionalProperties":false,"properties":{"defaults":{"$ref":"#/components/schemas/RouteDefaults"},"routes":{"items":{"$ref":"#/components/schemas/Route"},"type":"array"}},"required":["defaults","routes"],"type":"object"}}`)
+	rawSchemaRoutingTreev0alpha1       = []byte(`{"Matcher":{"additionalProperties":false,"properties":{"label":{"type":"string"},"type":{"enum":["=","!=","=~","!~"],"type":"string"},"value":{"type":"string"}},"required":["type","label","value"],"type":"object"},"OperatorState":{"additionalProperties":false,"properties":{"descriptiveState":{"description":"descriptiveState is an optional more descriptive state field which has no requirements on format","type":"string"},"details":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"details contains any extra information that is operator-specific","type":"object"},"lastEvaluation":{"description":"lastEvaluation is the ResourceVersion last evaluated","type":"string"},"state":{"description":"state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.","enum":["success","in_progress","failed"],"type":"string"}},"required":["lastEvaluation","state"],"type":"object"},"Route":{"additionalProperties":false,"properties":{"active_time_intervals":{"items":{"type":"string"},"type":"array"},"continue":{"type":"boolean"},"group_by":{"items":{"type":"string"},"type":"array"},"group_interval":{"type":"string"},"group_wait":{"type":"string"},"matchers":{"items":{"$ref":"#/components/schemas/Matcher"},"type":"array"},"mute_time_intervals":{"items":{"type":"string"},"type":"array"},"receiver":{"type":"string"},"repeat_interval":{"type":"string"},"routes":{"items":{"$ref":"#/components/schemas/Route"},"type":"array"}},"required":["continue"],"type":"object"},"RouteDefaults":{"additionalProperties":false,"properties":{"group_by":{"items":{"type":"string"},"type":"array"},"group_interval":{"type":"string"},"group_wait":{"type":"string"},"receiver":{"type":"string"},"repeat_interval":{"type":"string"}},"required":["receiver"],"type":"object"},"RoutingTree":{"properties":{"spec":{"$ref":"#/components/schemas/spec"},"status":{"$ref":"#/components/schemas/status"}},"required":["spec"]},"spec":{"additionalProperties":false,"properties":{"defaults":{"$ref":"#/components/schemas/RouteDefaults"},"routes":{"items":{"$ref":"#/components/schemas/Route"},"type":"array"}},"required":["defaults","routes"],"type":"object"},"status":{"additionalProperties":false,"properties":{"additionalFields":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"additionalFields is reserved for future use","type":"object"},"operatorStates":{"additionalProperties":{"$ref":"#/components/schemas/OperatorState"},"description":"operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.","type":"object"}},"type":"object"}}`)
 	versionSchemaRoutingTreev0alpha1   app.VersionSchema
 	_                                  = json.Unmarshal(rawSchemaRoutingTreev0alpha1, &versionSchemaRoutingTreev0alpha1)
-	rawSchemaTemplateGroupv0alpha1     = []byte(`{"TemplateGroup":{"properties":{"spec":{"$ref":"#/components/schemas/spec"}},"required":["spec"]},"spec":{"additionalProperties":false,"properties":{"content":{"type":"string"},"title":{"type":"string"}},"required":["title","content"],"type":"object"}}`)
+	rawSchemaTemplateGroupv0alpha1     = []byte(`{"OperatorState":{"additionalProperties":false,"properties":{"descriptiveState":{"description":"descriptiveState is an optional more descriptive state field which has no requirements on format","type":"string"},"details":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"details contains any extra information that is operator-specific","type":"object"},"lastEvaluation":{"description":"lastEvaluation is the ResourceVersion last evaluated","type":"string"},"state":{"description":"state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.","enum":["success","in_progress","failed"],"type":"string"}},"required":["lastEvaluation","state"],"type":"object"},"TemplateGroup":{"properties":{"spec":{"$ref":"#/components/schemas/spec"},"status":{"$ref":"#/components/schemas/status"}},"required":["spec"]},"spec":{"additionalProperties":false,"properties":{"content":{"type":"string"},"title":{"type":"string"}},"required":["title","content"],"type":"object"},"status":{"additionalProperties":false,"properties":{"additionalFields":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"additionalFields is reserved for future use","type":"object"},"operatorStates":{"additionalProperties":{"$ref":"#/components/schemas/OperatorState"},"description":"operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.","type":"object"}},"type":"object"}}`)
 	versionSchemaTemplateGroupv0alpha1 app.VersionSchema
 	_                                  = json.Unmarshal(rawSchemaTemplateGroupv0alpha1, &versionSchemaTemplateGroupv0alpha1)
-	rawSchemaTimeIntervalv0alpha1      = []byte(`{"Interval":{"additionalProperties":false,"properties":{"days_of_month":{"items":{"type":"string"},"type":"array"},"location":{"type":"string"},"months":{"items":{"type":"string"},"type":"array"},"times":{"items":{"$ref":"#/components/schemas/TimeRange"},"type":"array"},"weekdays":{"items":{"type":"string"},"type":"array"},"years":{"items":{"type":"string"},"type":"array"}},"type":"object"},"TimeInterval":{"properties":{"spec":{"$ref":"#/components/schemas/spec"}},"required":["spec"]},"TimeRange":{"additionalProperties":false,"properties":{"end_time":{"type":"string"},"start_time":{"type":"string"}},"required":["start_time","end_time"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"name":{"type":"string"},"time_intervals":{"items":{"$ref":"#/components/schemas/Interval"},"type":"array"}},"required":["name","time_intervals"],"type":"object"}}`)
+	rawSchemaTimeIntervalv0alpha1      = []byte(`{"Interval":{"additionalProperties":false,"properties":{"days_of_month":{"items":{"type":"string"},"type":"array"},"location":{"type":"string"},"months":{"items":{"type":"string"},"type":"array"},"times":{"items":{"$ref":"#/components/schemas/TimeRange"},"type":"array"},"weekdays":{"items":{"type":"string"},"type":"array"},"years":{"items":{"type":"string"},"type":"array"}},"type":"object"},"OperatorState":{"additionalProperties":false,"properties":{"descriptiveState":{"description":"descriptiveState is an optional more descriptive state field which has no requirements on format","type":"string"},"details":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"details contains any extra information that is operator-specific","type":"object"},"lastEvaluation":{"description":"lastEvaluation is the ResourceVersion last evaluated","type":"string"},"state":{"description":"state describes the state of the lastEvaluation.\nIt is limited to three possible states for machine evaluation.","enum":["success","in_progress","failed"],"type":"string"}},"required":["lastEvaluation","state"],"type":"object"},"TimeInterval":{"properties":{"spec":{"$ref":"#/components/schemas/spec"},"status":{"$ref":"#/components/schemas/status"}},"required":["spec"]},"TimeRange":{"additionalProperties":false,"properties":{"end_time":{"type":"string"},"start_time":{"type":"string"}},"required":["start_time","end_time"],"type":"object"},"spec":{"additionalProperties":false,"properties":{"name":{"type":"string"},"time_intervals":{"items":{"$ref":"#/components/schemas/Interval"},"type":"array"}},"required":["name","time_intervals"],"type":"object"},"status":{"additionalProperties":false,"properties":{"additionalFields":{"additionalProperties":{"additionalProperties":{},"type":"object"},"description":"additionalFields is reserved for future use","type":"object"},"operatorStates":{"additionalProperties":{"$ref":"#/components/schemas/OperatorState"},"description":"operatorStates is a map of operator ID to operator state evaluations.\nAny operator which consumes this kind SHOULD add its state evaluation information to this field.","type":"object"}},"type":"object"}}`)
 	versionSchemaTimeIntervalv0alpha1  app.VersionSchema
 	_                                  = json.Unmarshal(rawSchemaTimeIntervalv0alpha1, &versionSchemaTimeIntervalv0alpha1)
 )

apps/alerting/rules/go.mod

@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/alerting/rules
 
-go 1.25.5
+go 1.25.3
 
 require (
 	github.com/grafana/grafana-app-sdk v0.48.1

apps/correlations/go.mod

@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/correlations
 
-go 1.25.5
+go 1.25.3
 
 require (
 	github.com/grafana/grafana-app-sdk v0.48.1

apps/dashboard/go.mod

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

apps/dashboard/kinds/v2beta1/dashboard_spec.cue

@@ -117,10 +117,6 @@ DashboardLink: {
 // - "inControlsMenu" renders the link in bottom part of the dashboard controls dropdown menu
 DashboardLinkPlacement: "inControlsMenu"
 
-// Annotation Query placement. Defines where the annotation query should be displayed.
-// - "inControlsMenu" renders the annotation query in the dashboard controls dropdown menu
-AnnotationQueryPlacement: "inControlsMenu"
-
 // A topic is attached to DataFrame metadata in query results.
 // This specifies where the data should be used.
 DataTopic: "series" | "annotations" | "alertStates" @cog(kind="enum",memberNames="Series|Annotations|AlertStates")
@@ -440,8 +436,6 @@ AnnotationQuerySpec: {
 	name:        string
 	builtIn?:    bool | *false
 	filter?:     AnnotationPanelFilter
-	// Placement can be used to display the annotation query somewhere else on the dashboard other than the default location.
-	placement?:  AnnotationQueryPlacement
 	legacyOptions?:     [string]: _ // Catch-all field for datasource-specific properties. Should not be available in as code tooling.
 }
 
@@ -458,7 +452,6 @@ QueryOptionsSpec: {
 	interval?:         string
 	cacheTimeout?:     string
 	hideTimeOverride?: bool
-	timeCompare?:      string
 }
 
 DataQueryKind: {

apps/dashboard/pkg/apis/dashboard/cuevalidator/validator.go

@@ -1,29 +0,0 @@
-package cuevalidator
-
-import (
-	"sync"
-
-	"cuelang.org/go/cue"
-	cuejson "cuelang.org/go/encoding/json"
-)
-
-// Validator provides thread-safe CUE schema validation.
-//
-// CUE is not safe for concurrent use: https://github.com/cue-lang/cue/discussions/1205#discussioncomment-1189238
-// This validator uses a mutex to protect concurrent access to the underlying CUE validation.
-type Validator struct {
-	schema cue.Value
-	mu     sync.Mutex
-}
-
-func NewValidator(schema cue.Value) *Validator {
-	return &Validator{
-		schema: schema,
-	}
-}
-
-func (v *Validator) Validate(data []byte) error {
-	v.mu.Lock()
-	defer v.mu.Unlock()
-	return cuejson.Validate(data, v.schema)
-}

apps/dashboard/pkg/apis/dashboard/v0alpha1/dashboard_kind.cue

@@ -177,9 +177,6 @@ lineage: schemas: [{
 			// Set to 1 for the standard annotation query all dashboards have by default.
 			builtIn?: number | *0
 
-			// Placement can be used to display the annotation query somewhere else on the dashboard other than the default location.
-			placement?: #AnnotationQueryPlacement
-
 			// unless datasources have migrated to the target+mapping,
 			// they just spread their query into the base object :(
 			...
@@ -305,10 +302,6 @@ lineage: schemas: [{
 		// - "inControlsMenu" renders the link in bottom part of the dashboard controls dropdown menu 
 		#DashboardLinkPlacement: "inControlsMenu" @cuetsy(kind="type")
 
-		// Annotation Query placement. Defines where the annotation query should be displayed.
-		// - "inControlsMenu" renders the annotation query in the dashboard controls dropdown menu
-		#AnnotationQueryPlacement: "inControlsMenu" @cuetsy(kind="type")
-
 		// Dashboard action type
 		#ActionType: "fetch" | "infinity" @cuetsy(kind="type")
 
@@ -677,10 +670,6 @@ lineage: schemas: [{
 			// Controls if the timeFrom or timeShift overrides are shown in the panel header
 			hideTimeOverride?: bool
 
-			// Compare the current time range with a previous period
-			// For example "1d" to compare current period but shifted back 1 day
-			timeCompare?: string
-
 			// Dynamically load the panel
 			libraryPanel?: #LibraryPanelRef
 

apps/dashboard/pkg/apis/dashboard/v0alpha1/librarypanel.go

@@ -1,91 +0,0 @@
-package v0alpha1
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
-	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
-)
-
-// +k8s:deepcopy-gen=true
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-type LibraryPanel struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata
-	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
-	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	// Panel properties
-	Spec LibraryPanelSpec `json:"spec"`
-
-	// Status will show errors
-	Status *LibraryPanelStatus `json:"status,omitempty"`
-}
-
-// +k8s:deepcopy-gen=true
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-type LibraryPanelList struct {
-	metav1.TypeMeta `json:",inline"`
-	// +optional
-	metav1.ListMeta `json:"metadata,omitempty"`
-
-	Items []LibraryPanel `json:"items"`
-}
-
-// +k8s:deepcopy-gen=true
-type LibraryPanelSpec struct {
-	// The panel type
-	Type string `json:"type"`
-
-	// The panel type
-	PluginVersion string `json:"pluginVersion,omitempty"`
-
-	// The title of the library panel
-	Title string `json:"title,omitempty"`
-
-	// The title of the panel when displayed in the dashboard
-	PanelTitle string `json:"panelTitle,omitempty"`
-
-	// Library panel description
-	Description string `json:"description,omitempty"`
-
-	// The options schema depends on the panel type
-	Options common.Unstructured `json:"options"`
-
-	// The fieldConfig schema depends on the panel type
-	FieldConfig common.Unstructured `json:"fieldConfig"`
-
-	// The default datasource type
-	Datasource *data.DataSourceRef `json:"datasource,omitempty"`
-
-	// The grid position
-	GridPos GridPos `json:"gridPos,omitempty"`
-
-	// Whether the panel is transparent
-	Transparent bool `json:"transparent,omitempty"`
-
-	// The links for the panel
-	Links []common.Unstructured `json:"links,omitempty"`
-
-	// The datasource queries
-	// +listType=atomic
-	Targets []data.DataQuery `json:"targets,omitempty"`
-}
-
-// +k8s:deepcopy-gen=true
-type GridPos struct {
-	W int `json:"w"`
-	H int `json:"h"`
-	X int `json:"x"`
-	Y int `json:"y"`
-}
-
-// +k8s:deepcopy-gen=true
-type LibraryPanelStatus struct {
-	// Translation warnings (mostly things that were in SQL columns but not found in the saved body)
-	Warnings []string `json:"warnings,omitempty"`
-
-	// The properties previously stored in SQL that are not included in this model
-	Missing common.Unstructured `json:"missing,omitempty"`
-}

apps/dashboard/pkg/apis/dashboard/v0alpha1/types.go

@@ -1,5 +1,95 @@
 package v0alpha1
 
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	data "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
+)
+
+// +k8s:deepcopy-gen=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type LibraryPanel struct {
+	metav1.TypeMeta `json:",inline"`
+	// Standard object's metadata
+	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
+	// +optional
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// Panel properties
+	Spec LibraryPanelSpec `json:"spec"`
+
+	// Status will show errors
+	Status *LibraryPanelStatus `json:"status,omitempty"`
+}
+
+// +k8s:deepcopy-gen=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type LibraryPanelList struct {
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []LibraryPanel `json:"items"`
+}
+
+// +k8s:deepcopy-gen=true
+type LibraryPanelSpec struct {
+	// The panel type
+	Type string `json:"type"`
+
+	// The panel type
+	PluginVersion string `json:"pluginVersion,omitempty"`
+
+	// The title of the library panel
+	Title string `json:"title,omitempty"`
+
+	// The title of the panel when displayed in the dashboard
+	PanelTitle string `json:"panelTitle,omitempty"`
+
+	// Library panel description
+	Description string `json:"description,omitempty"`
+
+	// The options schema depends on the panel type
+	Options common.Unstructured `json:"options"`
+
+	// The fieldConfig schema depends on the panel type
+	FieldConfig common.Unstructured `json:"fieldConfig"`
+
+	// The default datasource type
+	Datasource *data.DataSourceRef `json:"datasource,omitempty"`
+
+	// The grid position
+	GridPos GridPos `json:"gridPos,omitempty"`
+
+	// Whether the panel is transparent
+	Transparent bool `json:"transparent,omitempty"`
+
+	// The links for the panel
+	Links []common.Unstructured `json:"links,omitempty"`
+
+	// The datasource queries
+	// +listType=set
+	Targets []data.DataQuery `json:"targets,omitempty"`
+}
+
+// +k8s:deepcopy-gen=true
+type GridPos struct {
+	W int `json:"w"`
+	H int `json:"h"`
+	X int `json:"x"`
+	Y int `json:"y"`
+}
+
+// +k8s:deepcopy-gen=true
+type LibraryPanelStatus struct {
+	// Translation warnings (mostly things that were in SQL columns but not found in the saved body)
+	Warnings []string `json:"warnings,omitempty"`
+
+	// The properties previously stored in SQL that are not included in this model
+	Missing common.Unstructured `json:"missing,omitempty"`
+}
+
 // This is like the legacy DTO where access and metadata are all returned in a single call
 // +k8s:deepcopy-gen=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

apps/dashboard/pkg/apis/dashboard/v0alpha1/validation.go

@@ -7,13 +7,13 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/cuevalidator"
 	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
 	"cuelang.org/go/cue"
 	"cuelang.org/go/cue/cuecontext"
 	"cuelang.org/go/cue/errors"
+	cuejson "cuelang.org/go/encoding/json"
 )
 
 func ValidateDashboardSpec(obj *Dashboard, forceValidation bool) (field.ErrorList, field.ErrorList) {
@@ -33,7 +33,7 @@ func ValidateDashboardSpec(obj *Dashboard, forceValidation bool) (field.ErrorLis
 		}, schemaVersionError
 	}
 
-	if err := getValidator().Validate(data); err != nil {
+	if err := cuejson.Validate(data, getCueSchema()); err != nil {
 		errs := field.ErrorList{}
 
 		for _, e := range errors.Errors(err) {
@@ -71,21 +71,20 @@ func formatErrorPath(path []string) string {
 }
 
 var (
-	validator     *cuevalidator.Validator
-	getSchemaOnce sync.Once
+	compiledSchema cue.Value
+	getSchemaOnce  sync.Once
 )
 
 //go:embed dashboard_kind.cue
 var schemaSource string
 
-func getValidator() *cuevalidator.Validator {
+func getCueSchema() cue.Value {
 	getSchemaOnce.Do(func() {
 		cueCtx := cuecontext.New()
-		compiledSchema := cueCtx.CompileString(schemaSource).LookupPath(
+		compiledSchema = cueCtx.CompileString(schemaSource).LookupPath(
 			cue.ParsePath("lineage.schemas[0].schema.spec"),
 		)
-		validator = cuevalidator.NewValidator(compiledSchema)
 	})
 
-	return validator
+	return compiledSchema
 }

apps/dashboard/pkg/apis/dashboard/v0alpha1/zz_generated.openapi.go

@@ -882,7 +882,7 @@ func schema_pkg_apis_dashboard_v0alpha1_LibraryPanelSpec(ref common.ReferenceCal
 					"targets": {
 						VendorExtensible: spec.VendorExtensible{
 							Extensions: spec.Extensions{
-								"x-kubernetes-list-type": "atomic",
+								"x-kubernetes-list-type": "set",
 							},
 						},
 						SchemaProps: spec.SchemaProps{

apps/dashboard/pkg/apis/dashboard/v1beta1/dashboard_kind.cue

@@ -177,9 +177,6 @@ lineage: schemas: [{
 			// Set to 1 for the standard annotation query all dashboards have by default.
 			builtIn?: number | *0
 
-			// Placement can be used to display the annotation query somewhere else on the dashboard other than the default location.
-			placement?: #AnnotationQueryPlacement
-
 			// unless datasources have migrated to the target+mapping,
 			// they just spread their query into the base object :(
 			...
@@ -305,10 +302,6 @@ lineage: schemas: [{
 		// - "inControlsMenu" renders the link in bottom part of the dashboard controls dropdown menu 
 		#DashboardLinkPlacement: "inControlsMenu" @cuetsy(kind="type")
 
-		// Annotation Query placement. Defines where the annotation query should be displayed.
-		// - "inControlsMenu" renders the annotation query in the dashboard controls dropdown menu
-		#AnnotationQueryPlacement: "inControlsMenu" @cuetsy(kind="type")
-
 		// Dashboard action type
 		#ActionType: "fetch" | "infinity" @cuetsy(kind="type")
 
@@ -677,10 +670,6 @@ lineage: schemas: [{
 			// Controls if the timeFrom or timeShift overrides are shown in the panel header
 			hideTimeOverride?: bool
 
-			// Compare the current time range with a previous period
-			// For example "1d" to compare current period but shifted back 1 day
-			timeCompare?: string
-
 			// Dynamically load the panel
 			libraryPanel?: #LibraryPanelRef
 

apps/dashboard/pkg/apis/dashboard/v1beta1/validation.go

@@ -12,8 +12,8 @@ import (
 	"cuelang.org/go/cue"
 	"cuelang.org/go/cue/cuecontext"
 	"cuelang.org/go/cue/errors"
+	cuejson "cuelang.org/go/encoding/json"
 
-	"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/cuevalidator"
 	"github.com/grafana/grafana/apps/dashboard/pkg/migration/schemaversion"
 )
 
@@ -34,7 +34,7 @@ func ValidateDashboardSpec(obj *Dashboard, forceValidation bool) (field.ErrorLis
 		}, schemaVersionError
 	}
 
-	if err := getValidator().Validate(data); err != nil {
+	if err := cuejson.Validate(data, getCueSchema()); err != nil {
 		errs := field.ErrorList{}
 
 		for _, e := range errors.Errors(err) {
@@ -72,21 +72,20 @@ func formatErrorPath(path []string) string {
 }
 
 var (
-	validator     *cuevalidator.Validator
-	getSchemaOnce sync.Once
+	compiledSchema cue.Value
+	getSchemaOnce  sync.Once
 )
 
 //go:embed dashboard_kind.cue
 var schemaSource string
 
-func getValidator() *cuevalidator.Validator {
+func getCueSchema() cue.Value {
 	getSchemaOnce.Do(func() {
 		cueCtx := cuecontext.New()
-		compiledSchema := cueCtx.CompileString(schemaSource).LookupPath(
+		compiledSchema = cueCtx.CompileString(schemaSource).LookupPath(
 			cue.ParsePath("lineage.schemas[0].schema.spec"),
 		)
-		validator = cuevalidator.NewValidator(compiledSchema)
 	})
 
-	return validator
+	return compiledSchema
 }

apps/dashboard/pkg/apis/dashboard/v2alpha1/validation.go

@@ -12,8 +12,7 @@ import (
 	"cuelang.org/go/cue"
 	"cuelang.org/go/cue/cuecontext"
 	"cuelang.org/go/cue/errors"
-
-	"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/cuevalidator"
+	cuejson "cuelang.org/go/encoding/json"
 )
 
 func ValidateDashboardSpec(obj *Dashboard) field.ErrorList {
@@ -27,7 +26,7 @@ func ValidateDashboardSpec(obj *Dashboard) field.ErrorList {
 	// Custom validation for action query params and headers
 	validateAndTrimActionArrays(obj)
 
-	if err := getValidator().Validate(data); err != nil {
+	if err := cuejson.Validate(data, getCueSchema()); err != nil {
 		errs := field.ErrorList{}
 
 		for _, e := range errors.Errors(err) {
@@ -124,21 +123,20 @@ func formatErrorPath(path []string) string {
 }
 
 var (
-	validator     *cuevalidator.Validator
-	getSchemaOnce sync.Once
+	compiledSchema cue.Value
+	getSchemaOnce  sync.Once
 )
 
 //go:embed dashboard_spec.cue
 var schemaSource string
 
-func getValidator() *cuevalidator.Validator {
+func getCueSchema() cue.Value {
 	getSchemaOnce.Do(func() {
 		cueCtx := cuecontext.New()
-		compiledSchema := cueCtx.CompileString(schemaSource).LookupPath(
+		compiledSchema = cueCtx.CompileString(schemaSource).LookupPath(
 			cue.ParsePath("DashboardSpec"),
 		)
-		validator = cuevalidator.NewValidator(compiledSchema)
 	})
 
-	return validator
+	return compiledSchema
 }

apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec.cue

@@ -121,10 +121,6 @@ DashboardLink: {
 // - "inControlsMenu" renders the link in bottom part of the dashboard controls dropdown menu
 DashboardLinkPlacement: "inControlsMenu"
 
-// Annotation Query placement. Defines where the annotation query should be displayed.
-// - "inControlsMenu" renders the annotation query in the dashboard controls dropdown menu
-AnnotationQueryPlacement: "inControlsMenu"
-
 // A topic is attached to DataFrame metadata in query results.
 // This specifies where the data should be used.
 DataTopic: "series" | "annotations" | "alertStates" @cog(kind="enum",memberNames="Series|Annotations|AlertStates")
@@ -444,8 +440,6 @@ AnnotationQuerySpec: {
 	name:        string
 	builtIn?:    bool | *false
 	filter?:     AnnotationPanelFilter
-	// Placement can be used to display the annotation query somewhere else on the dashboard other than the default location.
-	placement?:  AnnotationQueryPlacement
 	legacyOptions?:     [string]: _ // Catch-all field for datasource-specific properties. Should not be available in as code tooling.
 }
 
@@ -462,7 +456,6 @@ QueryOptionsSpec: {
 	interval?:         string
 	cacheTimeout?:     string
 	hideTimeOverride?: bool
-	timeCompare?:      string
 }
 
 DataQueryKind: {

apps/dashboard/pkg/apis/dashboard/v2beta1/dashboard_spec_gen.go

@@ -30,8 +30,6 @@ type DashboardAnnotationQuerySpec struct {
 	Name      string                          `json:"name"`
 	BuiltIn   *bool                           `json:"builtIn,omitempty"`
 	Filter    *DashboardAnnotationPanelFilter `json:"filter,omitempty"`
-	// Placement can be used to display the annotation query somewhere else on the dashboard other than the default location.
-	Placement *string `json:"placement,omitempty"`
 	// Catch-all field for datasource-specific properties. Should not be available in as code tooling.
 	LegacyOptions map[string]interface{} `json:"legacyOptions,omitempty"`
 }
@@ -39,9 +37,8 @@ type DashboardAnnotationQuerySpec struct {
 // NewDashboardAnnotationQuerySpec creates a new DashboardAnnotationQuerySpec object.
 func NewDashboardAnnotationQuerySpec() *DashboardAnnotationQuerySpec {
 	return &DashboardAnnotationQuerySpec{
-		Query:     *NewDashboardDataQueryKind(),
-		BuiltIn:   (func(input bool) *bool { return &input })(false),
-		Placement: (func(input string) *string { return &input })(DashboardAnnotationQueryPlacement),
+		Query:   *NewDashboardDataQueryKind(),
+		BuiltIn: (func(input bool) *bool { return &input })(false),
 	}
 }
 
@@ -81,11 +78,6 @@ func NewDashboardAnnotationPanelFilter() *DashboardAnnotationPanelFilter {
 	}
 }
 
-// Annotation Query placement. Defines where the annotation query should be displayed.
-// - "inControlsMenu" renders the annotation query in the dashboard controls dropdown menu
-// +k8s:openapi-gen=true
-const DashboardAnnotationQueryPlacement = "inControlsMenu"
-
 // "Off" for no shared crosshair or tooltip (default).
 // "Crosshair" for shared crosshair.
 // "Tooltip" for shared crosshair AND shared tooltip.
@@ -286,7 +278,6 @@ type DashboardQueryOptionsSpec struct {
 	Interval         *string `json:"interval,omitempty"`
 	CacheTimeout     *string `json:"cacheTimeout,omitempty"`
 	HideTimeOverride *bool   `json:"hideTimeOverride,omitempty"`
-	TimeCompare      *string `json:"timeCompare,omitempty"`
 }
 
 // NewDashboardQueryOptionsSpec creates a new DashboardQueryOptionsSpec object.

apps/dashboard/pkg/apis/dashboard/v2beta1/validation.go

@@ -12,8 +12,7 @@ import (
 	"cuelang.org/go/cue"
 	"cuelang.org/go/cue/cuecontext"
 	"cuelang.org/go/cue/errors"
-
-	"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/cuevalidator"
+	cuejson "cuelang.org/go/encoding/json"
 )
 
 func ValidateDashboardSpec(obj *Dashboard) field.ErrorList {
@@ -27,7 +26,7 @@ func ValidateDashboardSpec(obj *Dashboard) field.ErrorList {
 	// Custom validation for action query params and headers
 	validateAndTrimActionArrays(obj)
 
-	if err := getValidator().Validate(data); err != nil {
+	if err := cuejson.Validate(data, getCueSchema()); err != nil {
 		errs := field.ErrorList{}
 
 		for _, e := range errors.Errors(err) {
@@ -124,21 +123,20 @@ func formatErrorPath(path []string) string {
 }
 
 var (
-	validator     *cuevalidator.Validator
-	getSchemaOnce sync.Once
+	compiledSchema cue.Value
+	getSchemaOnce  sync.Once
 )
 
 //go:embed dashboard_spec.cue
 var schemaSource string
 
-func getValidator() *cuevalidator.Validator {
+func getCueSchema() cue.Value {
 	getSchemaOnce.Do(func() {
 		cueCtx := cuecontext.New()
-		compiledSchema := cueCtx.CompileString(schemaSource).LookupPath(
+		compiledSchema = cueCtx.CompileString(schemaSource).LookupPath(
 			cue.ParsePath("DashboardSpec"),
 		)
-		validator = cuevalidator.NewValidator(compiledSchema)
 	})
 
-	return validator
+	return compiledSchema
 }

apps/dashboard/pkg/apis/dashboard/v2beta1/zz_generated.openapi.go

@@ -760,13 +760,6 @@ func schema_pkg_apis_dashboard_v2beta1_DashboardAnnotationQuerySpec(ref common.R
 							Ref: ref("github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2beta1.DashboardAnnotationPanelFilter"),
 						},
 					},
-					"placement": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Placement can be used to display the annotation query somewhere else on the dashboard other than the default location.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
 					"legacyOptions": {
 						SchemaProps: spec.SchemaProps{
 							Description: "Catch-all field for datasource-specific properties. Should not be available in as code tooling.",
@@ -3433,12 +3426,6 @@ func schema_pkg_apis_dashboard_v2beta1_DashboardQueryOptionsSpec(ref common.Refe
 							Format: "",
 						},
 					},
-					"timeCompare": {
-						SchemaProps: spec.SchemaProps{
-							Type:   []string{"string"},
-							Format: "",
-						},
-					},
 				},
 			},
 		},

apps/dashboard/pkg/migration/testdata/dev-dashboards-output/panel-gauge/gauge_tests_new.v42.json

@@ -36,7 +36,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -94,12 +95,13 @@
         "showThresholdMarkers": false,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "max": 100,
           "min": 1,
@@ -115,7 +117,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -173,12 +176,13 @@
         "showThresholdMarkers": false,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "max": 100,
           "min": 1,
@@ -194,7 +198,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -252,12 +257,13 @@
         "showThresholdMarkers": false,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "max": 100,
           "min": 1,
@@ -273,7 +279,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -331,12 +338,13 @@
         "showThresholdMarkers": false,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "max": 100,
           "min": 1,
@@ -352,7 +360,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -410,12 +419,13 @@
         "showThresholdMarkers": false,
         "sparkline": true
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "max": 100,
           "min": 1,
@@ -431,7 +441,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -489,12 +500,13 @@
         "showThresholdMarkers": false,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "max": 100,
           "min": 1,
@@ -510,7 +522,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -568,12 +581,13 @@
         "showThresholdMarkers": false,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "max": 100,
           "min": 1,
@@ -602,7 +616,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -660,12 +675,13 @@
         "showThresholdMarkers": false,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "max": 100,
           "min": 1,
@@ -681,7 +697,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -739,12 +756,13 @@
         "showThresholdMarkers": false,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "max": 100,
           "min": 1,
@@ -760,7 +778,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -818,12 +837,13 @@
         "showThresholdMarkers": false,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "max": 100,
           "min": 1,
@@ -839,7 +859,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -897,12 +918,13 @@
         "showThresholdMarkers": false,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "max": 100,
           "min": 1,
@@ -931,7 +953,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -993,12 +1016,13 @@
         "showThresholdMarkers": true,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "refId": "A",
           "scenarioId": "csv_metric_values",
@@ -1010,7 +1034,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -1072,12 +1097,13 @@
         "showThresholdMarkers": true,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "refId": "A",
           "scenarioId": "csv_metric_values",
@@ -1089,7 +1115,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -1151,12 +1178,13 @@
         "showThresholdMarkers": true,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "refId": "A",
           "scenarioId": "csv_metric_values",
@@ -1168,7 +1196,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -1230,12 +1259,13 @@
         "showThresholdMarkers": true,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "refId": "A",
           "scenarioId": "csv_metric_values",
@@ -1247,7 +1277,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -1309,12 +1340,13 @@
         "showThresholdMarkers": true,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "refId": "A",
           "scenarioId": "csv_metric_values",
@@ -1339,7 +1371,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -1405,12 +1438,13 @@
         "showThresholdMarkers": true,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "refId": "A",
           "scenarioId": "csv_metric_values",
@@ -1422,7 +1456,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -1488,12 +1523,13 @@
         "showThresholdMarkers": false,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "refId": "A",
           "scenarioId": "csv_metric_values",
@@ -1505,7 +1541,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
         "defaults": {
@@ -1571,12 +1608,13 @@
         "showThresholdMarkers": true,
         "sparkline": false
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "alias": "1",
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "refId": "A",
           "scenarioId": "csv_metric_values",
@@ -1601,7 +1639,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "description": "",
       "fieldConfig": {
@@ -1665,11 +1704,12 @@
         "sparkline": false,
         "spotlight": true
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "hide": false,
           "max": 98,
@@ -1687,7 +1727,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "description": "",
       "fieldConfig": {
@@ -1751,11 +1792,12 @@
         "sparkline": true,
         "spotlight": true
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "hide": false,
           "max": 98,
@@ -1786,7 +1828,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "description": "",
       "fieldConfig": {
@@ -1851,11 +1894,12 @@
         "sparkline": false,
         "spotlight": true
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "hide": false,
           "max": 8,
@@ -1873,7 +1917,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "description": "",
       "fieldConfig": {
@@ -1939,11 +1984,12 @@
         "sparkline": false,
         "spotlight": true
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "hide": false,
           "max": 12,
@@ -1961,7 +2007,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "description": "",
       "fieldConfig": {
@@ -2025,11 +2072,12 @@
         "sparkline": false,
         "spotlight": true
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "hide": false,
           "max": 100,
@@ -2047,7 +2095,8 @@
     },
     {
       "datasource": {
-        "type": "grafana-testdata-datasource"
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
       },
       "description": "",
       "fieldConfig": {
@@ -2111,11 +2160,12 @@
         "sparkline": false,
         "spotlight": true
       },
-      "pluginVersion": "13.0.0-pre",
+      "pluginVersion": "12.2.0-pre",
       "targets": [
         {
           "datasource": {
-            "type": "grafana-testdata-datasource"
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
           },
           "hide": false,
           "max": 100,
@@ -2147,4 +2197,4 @@
   "title": "Panel tests - Gauge (new)",
   "uid": "panel-tests-gauge-new",
   "weekStart": ""
-}
+}

apps/dashboard/pkg/migration/testdata/dev-dashboards-output/panel-heatmap/heatmap-x.v42.json

@@ -303,70 +303,6 @@
       ],
       "title": "Cells heatmap",
       "type": "heatmap"
-    },
-    {
-      "datasource": {
-        "type": "datasource",
-        "uid": "-- Dashboard --"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "scaleDistribution": {
-              "type": "linear"
-            }
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 17
-      },
-      "id": 7,
-      "options": {
-        "calculate": false,
-        "cellGap": 1,
-        "color": {
-          "exponent": 0.5,
-          "fill": "dark-orange",
-          "mode": "scheme",
-          "reverse": false,
-          "scale": "exponential",
-          "scheme": "Oranges",
-          "steps": 64
-        },
-        "exemplars": {
-          "color": "rgba(255,0,255,0.7)"
-        },
-        "filterValues": {
-          "le": 1e-9
-        },
-        "legend": {
-          "show": true
-        },
-        "rowsFrame": {
-          "layout": "auto"
-        },
-        "tooltip": {
-          "show": true,
-          "yHistogram": false
-        },
-        "yAxis": {
-          "axisPlacement": "left",
-          "reverse": false
-        }
-      },
-      "pluginVersion": "12.3.0-pre",
-      "title": "No data",
-      "type": "heatmap"
     }
   ],
   "refresh": "",
@@ -384,4 +320,4 @@
   "title": "Heatmap X axis",
   "uid": "5Y0jv6pVz",
   "weekStart": ""
-}
+}

apps/dashboard/pkg/migration/testdata/dev-dashboards-output/panel-table/table_sparkline_cell.v42.json

@@ -208,27 +208,7 @@
                 "value": 80
               }
             ]
-          },
-          "actions": [
-            {
-              "fetch": {
-                "body": "{}",
-                "headers": [["Content-Type", "application/json"]],
-                "method": "GET",
-                "queryParams": [],
-                "url": "/api/health"
-              },
-              "title": "Get instance health",
-              "type": "fetch"
-            }
-          ],
-          "links": [
-            {
-              "targetBlank": true,
-              "title": "Google Grafana",
-              "url": "https://google.com/search?q=grafana"
-            }
-          ]
+          }
         },
         "overrides": []
       },
@@ -612,4 +592,4 @@
   "title": "Panel Tests - Table - Sparklines",
   "uid": "d6373b49-1957-4f00-9218-ee2120d3ecd9",
   "weekStart": ""
-}
+}

apps/example/go.mod

@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/example
 
-go 1.25.5
+go 1.25.3
 
 require (
 	github.com/grafana/grafana-app-sdk v0.48.1

apps/folder/go.mod

@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/folder
 
-go 1.25.5
+go 1.25.3
 
 require (
 	github.com/grafana/grafana-app-sdk v0.48.1

apps/iam/go.mod

@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/iam
 
-go 1.25.5
+go 1.25.3
 
 replace github.com/grafana/grafana => ../../
 
@@ -59,8 +59,8 @@ require (
 
 require (
 	cel.dev/expr v0.24.0 // indirect
-	cloud.google.com/go v0.121.4 // indirect
-	cloud.google.com/go/auth v0.16.3 // indirect
+	cloud.google.com/go v0.121.1 // indirect
+	cloud.google.com/go/auth v0.16.1 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
 	cloud.google.com/go/compute/metadata v0.7.0 // indirect
 	cloud.google.com/go/iam v1.5.2 // indirect
@@ -79,8 +79,8 @@ require (
 	github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
 	github.com/BurntSushi/toml v1.5.0 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
 	github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
@@ -105,16 +105,16 @@ require (
 	github.com/aws/aws-sdk-go-v2/config v1.31.2 // indirect
 	github.com/aws/aws-sdk-go-v2/credentials v1.18.6 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.84 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.69 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.36 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17 // indirect
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.84.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.78.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 // indirect
@@ -165,7 +165,7 @@ require (
 	github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad // indirect
 	github.com/dolthub/go-mysql-server v0.19.1-0.20250410182021-5632d67cd46e // indirect
 	github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 // indirect
-	github.com/dolthub/vitess v0.0.0-20250930230441-70c2c6a98e33 // indirect
+	github.com/dolthub/vitess v0.0.0-20250410090211-143e6b272ad4 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.13.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
@@ -216,6 +216,7 @@ require (
 	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
 	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
 	github.com/golang-migrate/migrate/v4 v4.7.0 // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v1.0.0 // indirect
 	github.com/google/btree v1.1.3 // indirect
@@ -228,9 +229,9 @@ require (
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/google/wire v0.7.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
-	github.com/googleapis/gax-go/v2 v2.15.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.14.2 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
-	github.com/grafana/alerting v0.0.0-20251120161053-ee90fc928c01 // indirect
+	github.com/grafana/alerting v0.0.0-20251009192429-9427c24835ae // indirect
 	github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f // indirect
 	github.com/grafana/authlib/types v0.0.0-20250926065801-df98203cff37 // indirect
 	github.com/grafana/dataplane/sdata v0.0.9 // indirect
@@ -283,7 +284,7 @@ require (
 	github.com/jhump/protoreflect v1.17.0 // indirect
 	github.com/jmespath-community/go-jmespath v1.1.1 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/jmoiron/sqlx v1.4.0 // indirect
+	github.com/jmoiron/sqlx v1.3.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
@@ -398,9 +399,10 @@ require (
 	go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
 	go.etcd.io/etcd/client/v3 v3.6.4 // indirect
 	go.mongodb.org/mongo-driver v1.17.4 // indirect
+	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/contrib/bridges/prometheus v0.61.0 // indirect
-	go.opentelemetry.io/contrib/detectors/gcp v1.37.0 // indirect
+	go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
 	go.opentelemetry.io/contrib/exporters/autoexport v0.61.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0 // indirect
@@ -417,7 +419,7 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
 	go.opentelemetry.io/otel/exporters/prometheus v0.59.0 // indirect
 	go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.12.2 // indirect
-	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.37.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0 // indirect
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 // indirect
 	go.opentelemetry.io/otel/log v0.12.2 // indirect
 	go.opentelemetry.io/otel/metric v1.38.0 // indirect
@@ -431,7 +433,7 @@ require (
 	go.uber.org/zap v1.27.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	gocloud.dev v0.43.0 // indirect
+	gocloud.dev v0.42.0 // indirect
 	golang.org/x/crypto v0.43.0 // indirect
 	golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9 // indirect
 	golang.org/x/mod v0.29.0 // indirect
@@ -447,8 +449,8 @@ require (
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
 	gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
 	gonum.org/v1/gonum v0.16.0 // indirect
-	google.golang.org/api v0.242.0 // indirect
-	google.golang.org/genproto v0.0.0-20250715232539-7130f93afb79 // indirect
+	google.golang.org/api v0.235.0 // indirect
+	google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250908214217-97024824d090 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20251002232023-7c0ddcbb5797 // indirect
 	google.golang.org/grpc v1.76.0 // indirect
@@ -481,5 +483,5 @@ require (
 	sigs.k8s.io/randfill v1.0.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
 	sigs.k8s.io/yaml v1.6.0 // indirect
-	xorm.io/builder v0.3.13 // indirect
+	xorm.io/builder v0.3.6 // indirect
 )

apps/iam/go.sum

@@ -36,10 +36,10 @@ cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW
 cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
 cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
 cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
-cloud.google.com/go v0.121.4 h1:cVvUiY0sX0xwyxPwdSU2KsF9knOVmtRyAMt8xou0iTs=
-cloud.google.com/go v0.121.4/go.mod h1:XEBchUiHFJbz4lKBZwYBDHV/rSyfFktk737TLDU089s=
-cloud.google.com/go/auth v0.16.3 h1:kabzoQ9/bobUmnseYnBO6qQG7q4a/CffFRlJSxv2wCc=
-cloud.google.com/go/auth v0.16.3/go.mod h1:NucRGjaXfzP1ltpcQ7On/VTZ0H4kWB5Jy+Y9Dnm76fA=
+cloud.google.com/go v0.121.1 h1:S3kTQSydxmu1JfLRLpKtxRPA7rSrYPRPEUmL/PavVUw=
+cloud.google.com/go v0.121.1/go.mod h1:nRFlrHq39MNVWu+zESP2PosMWA0ryJw8KUBZ2iZpxbw=
+cloud.google.com/go/auth v0.16.1 h1:XrXauHMd30LhQYVRHLGvJiYeczweKQXZxsTbV9TiguU=
+cloud.google.com/go/auth v0.16.1/go.mod h1:1howDHJ5IETh/LwYs3ZxvlkXF48aSqqJUM+5o02dNOI=
 cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
 cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
@@ -95,8 +95,6 @@ filippo.io/age v1.2.1 h1:X0TZjehAZylOIj4DubWYU1vWQxv9bJpo+Uu2/LGhi1o=
 filippo.io/age v1.2.1/go.mod h1:JL9ew2lTN+Pyft4RiNGguFfOpewKwSHm5ayKD/A4004=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
-gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
-gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU=
 github.com/1NCE-GmbH/grpc-go-pool v0.0.0-20231117122434-2a5bb974daa2 h1:qFYgLH2zZe3WHpQgUrzeazC+ebDebwAQqS9yE1cP5Bs=
 github.com/1NCE-GmbH/grpc-go-pool v0.0.0-20231117122434-2a5bb974daa2/go.mod h1:09/ALd1AXCTCOfcJYD8+jIYKmFmi6PVCkTsipC18F7E=
 github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U=
@@ -153,12 +151,12 @@ github.com/FZambia/eagle v0.2.0 h1:1kQaZpJvbkvAXFRE/9K2ucBMuVqo+E29EMLYB74hIis=
 github.com/FZambia/eagle v0.2.0/go.mod h1:LKMYBwGYhao5sJI0TppvQ4SvvldFj9gITxrl8NvGwG0=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 h1:UQUsRi8WTzhZntp5313l+CHIAT95ojUI2lpP/ExlZa4=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0/go.mod h1:Cz6ft6Dkn3Et6l2v2a9/RpN7epQ1GtDlO6lj8bEcOvw=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 h1:owcC2UnmsZycprQ5RfRgjydWhuoxg71LUfyiQdijZuM=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0/go.mod h1:ZPpqegjbE99EPKsu3iUWV22A04wzGPcAY/ziSIQEEgs=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.53.0 h1:4LP6hvB4I5ouTbGgWtixJhgED6xdf67twf9PoY96Tbg=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.53.0/go.mod h1:jUZ5LYlw40WMd07qxcQJD5M40aUxrfwqQX1g7zxYnrQ=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 h1:Ron4zCA/yk6U7WOBXhTJcDpsUBG9npumK6xw2auFltQ=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0/go.mod h1:cSgYe11MCNYunTnRXrKiR/tHc0eoKjICUuWpNZoVCOo=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 h1:fYE9p3esPxA/C0rQ0AHhP0drtPXDRhaWiwg1DPqO7IU=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0/go.mod h1:BnBReJLvVYx2CS/UHOgVz2BXKXD9wsQPxZug20nZhd0=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.51.0 h1:OqVGm6Ei3x5+yZmSJG1Mh2NwHvpVmZ08CB5qJhT9Nuk=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.51.0/go.mod h1:SZiPHWGOOk3bl8tkevxkoiwPgsIl6CwrWcbwjfHZpdM=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 h1:6/0iUd0xrnX7qt+mLNRwg5c0PGv8wpE8K90ryANQwMI=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0/go.mod h1:otE2jQekW/PqXk1Awf5lmfokJx4uwuqcj1ab5SpGeW0=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
@@ -245,16 +243,16 @@ github.com/aws/aws-sdk-go-v2/credentials v1.18.6 h1:AmmvNEYrru7sYNJnp3pf57lGbiar
 github.com/aws/aws-sdk-go-v2/credentials v1.18.6/go.mod h1:/jdQkh1iVPa01xndfECInp1v1Wnp70v3K4MvtlLGVEc=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 h1:lpdMwTzmuDLkgW7086jE94HweHCqG+uOJwHf3LZs7T0=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4/go.mod h1:9xzb8/SV62W6gHQGC/8rrvgNXU6ZoYM3sAIJCIrXJxY=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.84 h1:cTXRdLkpBanlDwISl+5chq5ui1d1YWg4PWMR9c3kXyw=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.84/go.mod h1:kwSy5X7tfIHN39uucmjQVs2LvDdXEjQucgQQEqCggEo=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.69 h1:6VFPH/Zi9xYFMJKPQOX5URYkQoXRWeJ7V/7Y6ZDYoms=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.69/go.mod h1:GJj8mmO6YT6EqgduWocwhMoxTLFitkhIrK+owzrYL2I=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 h1:IdCLsiiIj5YJ3AFevsewURCPV+YWUlOW8JiPhoAy8vg=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4/go.mod h1:l4bdfCD7XyyZA9BolKBo1eLqgaJxl0/x91PL4Yqe0ao=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 h1:j7vjtr1YIssWQOMeOWRbh3z8g2oY/xPjnZH2gLY4sGw=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4/go.mod h1:yDmJgqOiH4EA8Hndnv4KwAo8jCGTSnM5ASG1nBI+toA=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.36 h1:GMYy2EOWfzdP3wfVAGXBNKY5vK4K8vMET4sYOYltmqs=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.36/go.mod h1:gDhdAV6wL3PmPqBhiPbnlS447GoWs8HTTOYef9/9Inw=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 h1:ZNTqv4nIdE/DiBfUUfXcLZ/Spcuz+RjeziUtNJackkM=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34/go.mod h1:zf7Vcd1ViW7cPqYWEHLHJkS50X0JS2IKz9Cgaj6ugrs=
 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.45.3 h1:Nn3qce+OHZuMj/edx4its32uxedAmquCDxtZkrdeiD4=
 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.45.3/go.mod h1:aqsLGsPs+rJfwDBwWHLcIV8F7AFcikFTPLwUD4RwORQ=
 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.51.0 h1:e5cbPZYTIY2nUEFieZUfVdINOiCTvChOMPfdLnmiLzs=
@@ -263,20 +261,20 @@ github.com/aws/aws-sdk-go-v2/service/ec2 v1.225.2 h1:IfMb3Ar8xEaWjgH/zeVHYD8izwJ
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.225.2/go.mod h1:35jGWx7ECvCwTsApqicFYzZ7JFEnBc6oHUuOQ3xIS54=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 h1:6+lZi2JeGKtCraAj1rpoZfKqnQ9SptseRZioejfUOLM=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0/go.mod h1:eb3gfbVIxIoGgJsi9pGne19dhCBpK6opTYpQqAmdy44=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.4 h1:nAP2GYbfh8dd2zGZqFRSMlq+/F6cMPBUuCsGAMkN074=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.4/go.mod h1:LT10DsiGjLWh4GbjInf9LQejkYEhBgBCjLG5+lvk4EE=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.0 h1:lguz0bmOoGzozP9XfRJR1QIayEYo+2vP/No3OfLF0pU=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.0/go.mod h1:iu6FSzgt+M2/x3Dk8zhycdIcHjEFb36IS8HVUVFoMg0=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4 h1:ueB2Te0NacDMnaC+68za9jLwkjzxGWm0KB5HTUHjLTI=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4/go.mod h1:nLEfLnVMmLvyIG58/6gsSA03F1voKGaCfHV7+lR8S7s=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17 h1:qcLWgdhq45sDM9na4cvXax9dyLitn8EYBRl8Ak4XtG4=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17/go.mod h1:M+jkjBFZ2J6DJrjMv2+vkBbuht6kxJYtJiwoVgX4p4U=
-github.com/aws/aws-sdk-go-v2/service/kms v1.41.2 h1:zJeUxFP7+XP52u23vrp4zMcVhShTWbNO8dHV6xCSvFo=
-github.com/aws/aws-sdk-go-v2/service/kms v1.41.2/go.mod h1:Pqd9k4TuespkireN206cK2QBsaBTL6X+VPAez5Qcijk=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 h1:moLQUoVq91LiqT1nbvzDukyqAlCv89ZmwaHw/ZFlFZg=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15/go.mod h1:ZH34PJUc8ApjBIfgQCFvkWcUDBtl/WTD+uiYHjd8igA=
+github.com/aws/aws-sdk-go-v2/service/kms v1.38.1 h1:tecq7+mAav5byF+Mr+iONJnCBf4B4gon8RSp4BrweSc=
+github.com/aws/aws-sdk-go-v2/service/kms v1.38.1/go.mod h1:cQn6tAF77Di6m4huxovNM7NVAozWTZLsDRp9t8Z/WYk=
 github.com/aws/aws-sdk-go-v2/service/oam v1.18.3 h1:teOWtElLARLOhpYWwupjLbY9j5I/yZ/H1I8jg41An78=
 github.com/aws/aws-sdk-go-v2/service/oam v1.18.3/go.mod h1:wGhpdyftHX6/1U4egowHkYdypwBMjpb+KjAAprv6z20=
 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.26.6 h1:PwbxovpcJvb25k019bkibvJfCpCmIANOFrXZIFPmRzk=
 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.26.6/go.mod h1:Z4xLt5mXspLKjBV92i165wAJ/3T6TIv4n7RtIS8pWV0=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.84.0 h1:0reDqfEN+tB+sozj2r92Bep8MEwBZgtAXTND1Kk9OXg=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.84.0/go.mod h1:kUklwasNoCn5YpyAqC/97r6dzTA1SRKJfKq16SXeoDU=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.78.2 h1:jIiopHEV22b4yQP2q36Y0OmwLbsxNWdWwfZRR5QRRO4=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.78.2/go.mod h1:U5SNqwhXB3Xe6F47kXvWihPl/ilGaEDe8HD/50Z9wxc=
 github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 h1:ve9dYBB8CfJGTFqcQ3ZLAAb/KXWgYlgu/2R2TZL2Ko0=
 github.com/aws/aws-sdk-go-v2/service/sso v1.28.2/go.mod h1:n9bTZFZcBa9hGGqVz3i/a6+NG0zmZgtkB9qVVFDqPA8=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2 h1:pd9G9HQaM6UZAZh19pYOkpKSQkyQQ9ftnl/LttQOcGI=
@@ -499,8 +497,8 @@ github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTE
 github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI=
 github.com/dolthub/maphash v0.1.0 h1:bsQ7JsF4FkkWyrP3oCnFJgrCUAFbFf3kOl4L/QxPDyQ=
 github.com/dolthub/maphash v0.1.0/go.mod h1:gkg4Ch4CdCDu5h6PMriVLawB7koZ+5ijb9puGMV50a4=
-github.com/dolthub/vitess v0.0.0-20250930230441-70c2c6a98e33 h1:ScHTwNbcVC6JH1OSyXzj8S4w67BIpRXwTSjrac3/PSw=
-github.com/dolthub/vitess v0.0.0-20250930230441-70c2c6a98e33/go.mod h1:8pvvk5OLaLN9LLxghyczUapn/97l+mBgIb10qC1LG84=
+github.com/dolthub/vitess v0.0.0-20250410090211-143e6b272ad4 h1:LGTt2LtYX8vaai32d+c9L0sMcP+Dg9w1kO6+lbsxxYg=
+github.com/dolthub/vitess v0.0.0-20250410090211-143e6b272ad4/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
@@ -646,7 +644,7 @@ github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq
 github.com/go-sourcemap/sourcemap v2.1.4+incompatible h1:a+iTbH5auLKxaNwQFg0B+TCYl6lbukKPc7b5x0n1s6Q=
 github.com/go-sourcemap/sourcemap v2.1.4+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
 github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
@@ -658,6 +656,8 @@ github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
 github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
 github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
 github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
+github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
@@ -695,6 +695,8 @@ github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4er
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
@@ -811,8 +813,8 @@ github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0
 github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM=
 github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
 github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
-github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo=
-github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc=
+github.com/googleapis/gax-go/v2 v2.14.2 h1:eBLnkZ9635krYIPD+ag1USrOAI0Nr0QYF3+/3GqO0k0=
+github.com/googleapis/gax-go/v2 v2.14.2/go.mod h1:ON64QhlJkhVtSqp4v1uaK92VyZ2gmvDQsweuyLV+8+w=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
@@ -824,8 +826,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
-github.com/grafana/alerting v0.0.0-20251120161053-ee90fc928c01 h1:aHR1YiJn1abDMVCT9O/nn3Cc6Ol0wiOI+v6PYSn74go=
-github.com/grafana/alerting v0.0.0-20251120161053-ee90fc928c01/go.mod h1:VGjS5gDwWEADPP6pF/drqLxEImgeuHlEW5u8E5EfIrM=
+github.com/grafana/alerting v0.0.0-20251009192429-9427c24835ae h1:NLPwY3tIP0lg0g9wTRiMcypm6VRXW6W+MOLBsq8JSVA=
+github.com/grafana/alerting v0.0.0-20251009192429-9427c24835ae/go.mod h1:VGjS5gDwWEADPP6pF/drqLxEImgeuHlEW5u8E5EfIrM=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f h1:Cbm6OKkOcJ+7CSZsGsEJzktC/SIa5bxVeYKQLuYK86o=
 github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f/go.mod h1:axY0cdOg3q0TZHwpHnIz5x16xZ8ZBxJHShsSHHXcHQg=
 github.com/grafana/authlib/types v0.0.0-20250926065801-df98203cff37 h1:qEwZ+7MbPjzRvTi31iT9w7NBhKIpKwZrFbYmOZLqkwA=
@@ -958,9 +960,8 @@ github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iP
 github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
+github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/hcl v1.0.1-vault-7 h1:ag5OxFVy3QYTFTJODRzTKVZ6xvdfLLCA1cy/Y6xGI0I=
-github.com/hashicorp/hcl v1.0.1-vault-7/go.mod h1:XYhtn6ijBSAj6n4YqAaf7RBPS4I06AItNorpy+MoQNM=
 github.com/hashicorp/hcl/v2 v2.24.0 h1:2QJdZ454DSsYGoaE6QheQZjtKZSUs9Nh2izTWiwQxvE=
 github.com/hashicorp/hcl/v2 v2.24.0/go.mod h1:oGoO1FIQYfn/AgyOhlg9qLC6/nOJPX3qGbkZpYAcqfM=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
@@ -972,8 +973,8 @@ github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpT
 github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
 github.com/hashicorp/serf v0.10.2 h1:m5IORhuNSjaxeljg5DeQVDlQyVkhRIjJDimbkCa8aAc=
 github.com/hashicorp/serf v0.10.2/go.mod h1:T1CmSGfSeGfnfNy/w0odXQUR1rfECGd2Qdsp84DjOiY=
-github.com/hashicorp/vault/api v1.20.0 h1:KQMHElgudOsr+IbJgmbjHnCTxEpKs9LnozA1D3nozU4=
-github.com/hashicorp/vault/api v1.20.0/go.mod h1:GZ4pcjfzoOWpkJ3ijHNpEoAxKEsBJnVljyTe3jM2Sms=
+github.com/hashicorp/vault/api v1.16.0 h1:nbEYGJiAPGzT9U4oWgaaB0g+Rj8E59QuHKyA5LhwQN4=
+github.com/hashicorp/vault/api v1.16.0/go.mod h1:KhuUhzOD8lDSk29AtzNjgAu2kxRA9jL9NAbkFlqvkBA=
 github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8=
 github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
@@ -1034,8 +1035,8 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
-github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
+github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
+github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
 github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbdFz6I=
 github.com/jonboulle/clockwork v0.5.0/go.mod h1:3mZlmanh0g2NDKO5TWZVJAfofYk64M7XN3SzBPjZF60=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
@@ -1145,7 +1146,6 @@ github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6T
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/mattn/go-sqlite3 v1.14.32 h1:JD12Ag3oLy1zQA+BNn74xRgaBbdhbNIDYvQUEuuErjs=
 github.com/mattn/go-sqlite3 v1.14.32/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -1600,18 +1600,20 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
+go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
+go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/collector/featuregate v1.44.0 h1:/GeGhTD8f+FNWS7C4w1Dj0Ui9Jp4v2WAdlXyW1p3uG8=
-go.opentelemetry.io/collector/featuregate v1.44.0/go.mod h1:d0tiRzVYrytB6LkcYgz2ESFTv7OktRPQe0QEQcPt1L4=
-go.opentelemetry.io/collector/pdata v1.44.0 h1:q/EfWDDKrSaf4hjTIzyPeg1ZcCRg1Uj7VTFnGfNVdk8=
-go.opentelemetry.io/collector/pdata v1.44.0/go.mod h1:LnsjYysFc3AwMVh6KGNlkGKJUF2ReuWxtD9Hb3lSMZk=
+go.opentelemetry.io/collector/featuregate v1.43.0 h1:Aq8UR5qv1zNlbbkTyqv8kLJtnoQMq/sG1/jS9o1cCJI=
+go.opentelemetry.io/collector/featuregate v1.43.0/go.mod h1:d0tiRzVYrytB6LkcYgz2ESFTv7OktRPQe0QEQcPt1L4=
+go.opentelemetry.io/collector/pdata v1.43.0 h1:zVkj2hcjiMLwX+QDDNwb7iTh3LBjNXKv2qPSgj1Rzb4=
+go.opentelemetry.io/collector/pdata v1.43.0/go.mod h1:KsJzdDG9e5BaHlmYr0sqdSEKeEiSfKzoF+rdWU7J//w=
 go.opentelemetry.io/collector/semconv v0.124.0 h1:YTdo3UFwNyDQCh9DiSm2rbzAgBuwn/9dNZ0rv454goA=
 go.opentelemetry.io/collector/semconv v0.124.0/go.mod h1:te6VQ4zZJO5Lp8dM2XIhDxDiL45mwX0YAQQWRQ0Qr9U=
 go.opentelemetry.io/contrib/bridges/prometheus v0.61.0 h1:RyrtJzu5MAmIcbRrwg75b+w3RlZCP0vJByDVzcpAe3M=
 go.opentelemetry.io/contrib/bridges/prometheus v0.61.0/go.mod h1:tirr4p9NXbzjlbruiRGp53IzlYrDk5CO2fdHj0sSSaY=
-go.opentelemetry.io/contrib/detectors/gcp v1.37.0 h1:B+WbN9RPsvobe6q4vP6KgM8/9plR/HNjgGBrfcOlweA=
-go.opentelemetry.io/contrib/detectors/gcp v1.37.0/go.mod h1:K5zQ3TT7p2ru9Qkzk0bKtCql0RGkPj9pRjpXgZJZ+rU=
+go.opentelemetry.io/contrib/detectors/gcp v1.36.0 h1:F7q2tNlCaHY9nMKHR6XH9/qkp8FktLnIcy6jJNyOCQw=
+go.opentelemetry.io/contrib/detectors/gcp v1.36.0/go.mod h1:IbBN8uAIIx734PTonTPxAxnjc2pQTxWNkwfstZ+6H2k=
 go.opentelemetry.io/contrib/exporters/autoexport v0.61.0 h1:XfzKtKSrbtYk9TNCF8dkO0Y9M7IOfb4idCwBOTwGBiI=
 go.opentelemetry.io/contrib/exporters/autoexport v0.61.0/go.mod h1:N6otC+qXTD5bAnbK2O1f/1SXq3cX+3KYSWrkBUqG0cw=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 h1:YH4g8lQroajqUwWbq/tr2QX1JFmEXaDLgG+ew9bLMWo=
@@ -1647,8 +1649,8 @@ go.opentelemetry.io/otel/exporters/prometheus v0.59.0 h1:HHf+wKS6o5++XZhS98wvILr
 go.opentelemetry.io/otel/exporters/prometheus v0.59.0/go.mod h1:R8GpRXTZrqvXHDEGVH5bF6+JqAZcK8PjJcZ5nGhEWiE=
 go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.12.2 h1:12vMqzLLNZtXuXbJhSENRg+Vvx+ynNilV8twBLBsXMY=
 go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.12.2/go.mod h1:ZccPZoPOoq8x3Trik/fCsba7DEYDUnN6yX79pgp2BUQ=
-go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.37.0 h1:6VjV6Et+1Hd2iLZEPtdV7vie80Yyqf7oikJLjQ/myi0=
-go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.37.0/go.mod h1:u8hcp8ji5gaM/RfcOo8z9NMnf1pVLfVY7lBY2VOGuUU=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0 h1:rixTyDGXFxRy1xzhKrotaHy3/KXdPhlWARrCgK+eqUY=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0/go.mod h1:dowW6UsM9MKbJq5JTz2AMVp3/5iW5I/TStsk8S+CfHw=
 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 h1:kJxSDN4SgWWTjG/hPp3O7LCGLcHXFlvS2/FFOrwL+SE=
 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0/go.mod h1:mgIOzS7iZeKJdeB8/NYHrJ48fdGc71Llo5bJ1J4DWUE=
 go.opentelemetry.io/otel/log v0.12.2 h1:yob9JVHn2ZY24byZeaXpTVoPS6l+UrrxmxmPKohXTwc=
@@ -1692,10 +1694,10 @@ go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 go4.org/netipx v0.0.0-20230125063823-8449b0a6169f h1:ketMxHg+vWm3yccyYiq+uK8D3fRmna2Fcj+awpQp84s=
 go4.org/netipx v0.0.0-20230125063823-8449b0a6169f/go.mod h1:tgPU4N2u9RByaTN3NC2p9xOzyFpte4jYwsIIRF7XlSc=
-gocloud.dev v0.43.0 h1:aW3eq4RMyehbJ54PMsh4hsp7iX8cO/98ZRzJJOzN/5M=
-gocloud.dev v0.43.0/go.mod h1:eD8rkg7LhKUHrzkEdLTZ+Ty/vgPHPCd+yMQdfelQVu4=
-gocloud.dev/secrets/hashivault v0.43.0 h1:A966rEMpCRUE9209/+k+A2HP2v2qDnrxGpQn+nIH5uY=
-gocloud.dev/secrets/hashivault v0.43.0/go.mod h1:KdWKL+TXDi0cXgEd/MTeaidKlotvyJtnTDi71B3rR9U=
+gocloud.dev v0.42.0 h1:qzG+9ItUL3RPB62/Amugws28n+4vGZXEoJEAMfjutzw=
+gocloud.dev v0.42.0/go.mod h1:zkaYAapZfQisXOA4bzhsbA4ckiStGQ3Psvs9/OQ5dPM=
+gocloud.dev/secrets/hashivault v0.42.0 h1:kPWIIu1AP6ApHf7HwUrzGrwyRJEfTd46JNUNgnbpsFA=
+gocloud.dev/secrets/hashivault v0.42.0/go.mod h1:LXprr1XLEAT7BVZ+Y66dJEHQMzDsowIExj5Ktr9HLvM=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -2089,8 +2091,8 @@ google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRR
 google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
 google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw=
 google.golang.org/api v0.81.0/go.mod h1:FA6Mb/bZxj706H2j+j2d6mHEEaHBmbbWnkfvmorOCko=
-google.golang.org/api v0.242.0 h1:7Lnb1nfnpvbkCiZek6IXKdJ0MFuAZNAJKQfA1ws62xg=
-google.golang.org/api v0.242.0/go.mod h1:cOVEm2TpdAGHL2z+UwyS+kmlGr3bVWQQ6sYEqkKje50=
+google.golang.org/api v0.235.0 h1:C3MkpQSRxS1Jy6AkzTGKKrpSCOd2WOGrezZ+icKSkKo=
+google.golang.org/api v0.235.0/go.mod h1:QpeJkemzkFKe5VCE/PMv7GsUfn9ZF+u+q1Q7w6ckxTg=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -2180,8 +2182,8 @@ google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX
 google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
 google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
 google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
-google.golang.org/genproto v0.0.0-20250715232539-7130f93afb79 h1:Nt6z9UHqSlIdIGJdz6KhTIs2VRx/iOsA5iE8bmQNcxs=
-google.golang.org/genproto v0.0.0-20250715232539-7130f93afb79/go.mod h1:kTmlBHMPqR5uCZPBvwa2B18mvubkjyY3CRLI0c6fj0s=
+google.golang.org/genproto v0.0.0-20250603155806-513f23925822 h1:rHWScKit0gvAPuOnu87KpaYtjK5zBMLcULh7gxkCXu4=
+google.golang.org/genproto v0.0.0-20250603155806-513f23925822/go.mod h1:HubltRL7rMh0LfnQPkMH4NPDFEWp0jw3vixw7jEM53s=
 google.golang.org/genproto/googleapis/api v0.0.0-20250908214217-97024824d090 h1:d8Nakh1G+ur7+P3GcMjpRDEkoLUcLW2iU92XVqR+XMQ=
 google.golang.org/genproto/googleapis/api v0.0.0-20250908214217-97024824d090/go.mod h1:U8EXRNSd8sUYyDfs/It7KVWodQr+Hf9xtxyxWudSwEw=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20251002232023-7c0ddcbb5797 h1:CirRxTOwnRWVLKzDNrs0CXAaVozJoR4G9xvdRecrdpk=
@@ -2351,5 +2353,5 @@ sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099Yo
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
 sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
-xorm.io/builder v0.3.13 h1:a3jmiVVL19psGeXx8GIurTp7p0IIgqeDmwhcR6BAOAo=
-xorm.io/builder v0.3.13/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
+xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8=
+xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU=

apps/iam/local/Dockerfile

@@ -1,5 +1,5 @@
 # Build stage
-FROM golang:1.25.5-alpine AS builder
+FROM golang:1.25.3-alpine AS builder
 
 # Set working directory
 WORKDIR /app

apps/iam/pkg/reconcilers/folder_reconciler.go

@@ -5,16 +5,15 @@ import (
 	"fmt"
 	"time"
 
-	"go.opentelemetry.io/otel"
-	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/codes"
-	"go.opentelemetry.io/otel/trace"
-
 	"github.com/grafana/grafana-app-sdk/logging"
 	"github.com/grafana/grafana-app-sdk/operator"
 	foldersKind "github.com/grafana/grafana/apps/folder/pkg/apis/folder/v1beta1"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
 	"github.com/grafana/grafana/pkg/services/authz"
+	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/codes"
+	"go.opentelemetry.io/otel/trace"
 )
 
 // PermissionStore interface for managing folder permissions
@@ -37,7 +36,7 @@ type FolderReconciler struct {
 
 func NewFolderReconciler(cfg ReconcilerConfig) (operator.Reconciler, error) {
 	// Create Zanzana client
-	zanzanaClient, err := authz.NewRemoteZanzanaClient("*", cfg.ZanzanaCfg)
+	zanzanaClient, err := authz.NewZanzanaClient("*", cfg.ZanzanaCfg)
 
 	if err != nil {
 		return nil, fmt.Errorf("unable to create zanzana client: %w", err)

apps/investigations/go.mod

@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/investigations
 
-go 1.25.5
+go 1.25.3
 
 require (
 	github.com/grafana/grafana-app-sdk v0.48.1

apps/logsdrilldown/go.mod

@@ -1,6 +1,8 @@
 module github.com/grafana/grafana/apps/logsdrilldown
 
-go 1.25.5
+go 1.24.0
+
+toolchain go1.24.6
 
 require (
 	github.com/grafana/grafana-app-sdk v0.48.1

apps/playlist/go.mod

@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/apps/playlist
 
-go 1.25.5
+go 1.25.3
 
 require (
 	github.com/grafana/grafana-app-sdk v0.48.1

apps/plugins/go.mod

@@ -1,10 +1,10 @@
 module github.com/grafana/grafana/apps/plugins
 
-go 1.25.5
+go 1.25.3
 
 require (
+	github.com/grafana/authlib/types v0.0.0-20250926065801-df98203cff37
 	github.com/grafana/grafana-app-sdk v0.48.1
-	github.com/grafana/grafana-app-sdk/logging v0.48.1
 	github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250428110029-a8ea72012bde
 	k8s.io/apimachinery v0.34.1
 	k8s.io/apiserver v0.34.1
@@ -14,6 +14,7 @@ require (
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 // indirect
 	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -36,8 +37,8 @@ require (
 	github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f // indirect
-	github.com/grafana/authlib/types v0.0.0-20250926065801-df98203cff37 // indirect
 	github.com/grafana/dskit v0.0.0-20250908063411-6b6da59b5cc4 // indirect
+	github.com/grafana/grafana-app-sdk/logging v0.48.1 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -92,6 +93,7 @@ require (
 	k8s.io/api v0.34.1 // indirect
 	k8s.io/apiextensions-apiserver v0.34.1 // indirect
 	k8s.io/client-go v0.34.1 // indirect
+	k8s.io/component-base v0.34.1 // indirect
 	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect

apps/plugins/go.sum

@@ -1,5 +1,7 @@
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
+github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 h1:N7oVaKyGp8bttX0bfZGmcGkjz7DLQXhAn3DNd3T0ous=
 github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
 github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
@@ -240,6 +242,8 @@ k8s.io/apiserver v0.34.1 h1:U3JBGdgANK3dfFcyknWde1G6X1F4bg7PXuvlqt8lITA=
 k8s.io/apiserver v0.34.1/go.mod h1:eOOc9nrVqlBI1AFCvVzsob0OxtPZUCPiUJL45JOTBG0=
 k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY=
 k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8=
+k8s.io/component-base v0.34.1 h1:v7xFgG+ONhytZNFpIz5/kecwD+sUhVE6HU7qQUiRM4A=
+k8s.io/component-base v0.34.1/go.mod h1:mknCpLlTSKHzAQJJnnHVKqjxR7gBeHRv0rPXA7gdtQ0=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE=

apps/plugins/kinds/manifest.cue

@@ -5,13 +5,14 @@ manifest: {
 	groupOverride: "plugins.grafana.app"
 	versions: {
 		"v0alpha1": {
-			served: true
+			served: false
 			codegen: {
 				ts: {enabled: false}
 				go: {enabled: true}
 			}
 			kinds: [
-				pluginV0Alpha1,
+				pluginMetaV0Alpha1,
+				pluginInstallV0Alpha1,
 			]
 		}
 	}

apps/plugins/kinds/plugininstall.cue

@@ -0,0 +1,15 @@
+package plugins
+
+pluginInstallV0Alpha1: {
+	kind: "PluginInstall"
+	plural: "plugininstalls"
+	scope: "Namespaced"
+	schema: {
+	spec: {
+		id:       string
+		version:  string
+		url?: string
+		class: "core" | "external" | "cdn"
+	}
+	}
+}

apps/plugins/kinds/pluginmeta.cue

@@ -4,33 +4,17 @@ import (
 	"time"
 )
 
-pluginV0Alpha1: {
-	kind: "Plugin"
-	plural: "plugins"
+pluginMetaV0Alpha1: {
+	kind: "PluginMeta"
+	plural: "pluginsmeta"
 	scope: "Namespaced"
 	schema: {
 		spec: {
-			id:       string
-			version:  string
-			url?: string
-			class: "core" | "external" | "cdn"
-		}
-	}
-	routes: {
-		"/meta": {
-			"GET": {
-				request: {}
-				response:  #JSONData,
-				responseMetadata: {
-					typeMeta: false
-					objectMeta: false
-				}
-			}
+			pluginJSON: #JSONData,
 		}
 	}
 }
 
-
 // JSON configuration schema for Grafana plugins
 // Converted from: https://github.com/grafana/grafana/blob/main/docs/sources/developers/plugins/plugin.schema.json
 #JSONData: {
@@ -233,4 +217,4 @@ pluginV0Alpha1: {
 		title?: string
 		description?: string
 	}]
-}
+}

apps/plugins/pkg/apis/plugins/v0alpha1/plugin_client_gen.go

@@ -1,123 +0,0 @@
-package v0alpha1
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-
-	"github.com/grafana/grafana-app-sdk/resource"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-type PluginClient struct {
-	client *resource.TypedClient[*Plugin, *PluginList]
-}
-
-func NewPluginClient(client resource.Client) *PluginClient {
-	return &PluginClient{
-		client: resource.NewTypedClient[*Plugin, *PluginList](client, PluginKind()),
-	}
-}
-
-func NewPluginClientFromGenerator(generator resource.ClientGenerator) (*PluginClient, error) {
-	c, err := generator.ClientFor(PluginKind())
-	if err != nil {
-		return nil, err
-	}
-	return NewPluginClient(c), nil
-}
-
-func (c *PluginClient) Get(ctx context.Context, identifier resource.Identifier) (*Plugin, error) {
-	return c.client.Get(ctx, identifier)
-}
-
-func (c *PluginClient) List(ctx context.Context, namespace string, opts resource.ListOptions) (*PluginList, error) {
-	return c.client.List(ctx, namespace, opts)
-}
-
-func (c *PluginClient) ListAll(ctx context.Context, namespace string, opts resource.ListOptions) (*PluginList, error) {
-	resp, err := c.client.List(ctx, namespace, resource.ListOptions{
-		ResourceVersion: opts.ResourceVersion,
-		Limit:           opts.Limit,
-		LabelFilters:    opts.LabelFilters,
-		FieldSelectors:  opts.FieldSelectors,
-	})
-	if err != nil {
-		return nil, err
-	}
-	for resp.GetContinue() != "" {
-		page, err := c.client.List(ctx, namespace, resource.ListOptions{
-			Continue:        resp.GetContinue(),
-			ResourceVersion: opts.ResourceVersion,
-			Limit:           opts.Limit,
-			LabelFilters:    opts.LabelFilters,
-			FieldSelectors:  opts.FieldSelectors,
-		})
-		if err != nil {
-			return nil, err
-		}
-		resp.SetContinue(page.GetContinue())
-		resp.SetResourceVersion(page.GetResourceVersion())
-		resp.SetItems(append(resp.GetItems(), page.GetItems()...))
-	}
-	return resp, nil
-}
-
-func (c *PluginClient) Create(ctx context.Context, obj *Plugin, opts resource.CreateOptions) (*Plugin, error) {
-	// Make sure apiVersion and kind are set
-	obj.APIVersion = GroupVersion.Identifier()
-	obj.Kind = PluginKind().Kind()
-	return c.client.Create(ctx, obj, opts)
-}
-
-func (c *PluginClient) Update(ctx context.Context, obj *Plugin, opts resource.UpdateOptions) (*Plugin, error) {
-	return c.client.Update(ctx, obj, opts)
-}
-
-func (c *PluginClient) Patch(ctx context.Context, identifier resource.Identifier, req resource.PatchRequest, opts resource.PatchOptions) (*Plugin, error) {
-	return c.client.Patch(ctx, identifier, req, opts)
-}
-
-func (c *PluginClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus PluginStatus, opts resource.UpdateOptions) (*Plugin, error) {
-	return c.client.Update(ctx, &Plugin{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       PluginKind().Kind(),
-			APIVersion: GroupVersion.Identifier(),
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			ResourceVersion: opts.ResourceVersion,
-			Namespace:       identifier.Namespace,
-			Name:            identifier.Name,
-		},
-		Status: newStatus,
-	}, resource.UpdateOptions{
-		Subresource:     "status",
-		ResourceVersion: opts.ResourceVersion,
-	})
-}
-
-func (c *PluginClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
-	return c.client.Delete(ctx, identifier, opts)
-}
-
-type GetMetaRequest struct {
-	Headers http.Header
-}
-
-func (c *PluginClient) GetMeta(ctx context.Context, identifier resource.Identifier, request GetMetaRequest) (*GetMeta, error) {
-	resp, err := c.client.SubresourceRequest(ctx, identifier, resource.CustomRouteRequestOptions{
-		Path:    "/meta",
-		Verb:    "GET",
-		Headers: request.Headers,
-	})
-	if err != nil {
-		return nil, err
-	}
-	cast := GetMeta{}
-	err = json.Unmarshal(resp, &cast)
-	if err != nil {
-		return nil, fmt.Errorf("unable to unmarshal response bytes into GetMeta: %w", err)
-	}
-	return &cast, nil
-}

apps/plugins/pkg/apis/plugins/v0alpha1/plugin_getmeta_response_types_gen.go

@@ -1,463 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-package v0alpha1
-
-import (
-	time "time"
-)
-
-// +k8s:openapi-gen=true
-type Info struct {
-	// Required fields
-	// +listType=set
-	Keywords []string          `json:"keywords"`
-	Logos    V0alpha1InfoLogos `json:"logos"`
-	Updated  time.Time         `json:"updated"`
-	Version  string            `json:"version"`
-	// Optional fields
-	Author      *V0alpha1InfoAuthor `json:"author,omitempty"`
-	Description *string             `json:"description,omitempty"`
-	// +listType=atomic
-	Links []V0alpha1InfoLinks `json:"links,omitempty"`
-	// +listType=atomic
-	Screenshots []V0alpha1InfoScreenshots `json:"screenshots,omitempty"`
-}
-
-// NewInfo creates a new Info object.
-func NewInfo() *Info {
-	return &Info{
-		Keywords: []string{},
-		Logos:    *NewV0alpha1InfoLogos(),
-	}
-}
-
-// +k8s:openapi-gen=true
-type Dependencies struct {
-	// Required field
-	GrafanaDependency string `json:"grafanaDependency"`
-	// Optional fields
-	GrafanaVersion *string `json:"grafanaVersion,omitempty"`
-	// +listType=set
-	// +listMapKey=id
-	Plugins    []V0alpha1DependenciesPlugins   `json:"plugins,omitempty"`
-	Extensions *V0alpha1DependenciesExtensions `json:"extensions,omitempty"`
-}
-
-// NewDependencies creates a new Dependencies object.
-func NewDependencies() *Dependencies {
-	return &Dependencies{}
-}
-
-// +k8s:openapi-gen=true
-type EnterpriseFeatures struct {
-	// Allow additional properties
-	HealthDiagnosticsErrors *bool `json:"healthDiagnosticsErrors,omitempty"`
-}
-
-// NewEnterpriseFeatures creates a new EnterpriseFeatures object.
-func NewEnterpriseFeatures() *EnterpriseFeatures {
-	return &EnterpriseFeatures{
-		HealthDiagnosticsErrors: (func(input bool) *bool { return &input })(false),
-	}
-}
-
-// +k8s:openapi-gen=true
-type Include struct {
-	Uid        *string      `json:"uid,omitempty"`
-	Type       *IncludeType `json:"type,omitempty"`
-	Name       *string      `json:"name,omitempty"`
-	Component  *string      `json:"component,omitempty"`
-	Role       *IncludeRole `json:"role,omitempty"`
-	Action     *string      `json:"action,omitempty"`
-	Path       *string      `json:"path,omitempty"`
-	AddToNav   *bool        `json:"addToNav,omitempty"`
-	DefaultNav *bool        `json:"defaultNav,omitempty"`
-	Icon       *string      `json:"icon,omitempty"`
-}
-
-// NewInclude creates a new Include object.
-func NewInclude() *Include {
-	return &Include{}
-}
-
-// +k8s:openapi-gen=true
-type QueryOptions struct {
-	MaxDataPoints *bool `json:"maxDataPoints,omitempty"`
-	MinInterval   *bool `json:"minInterval,omitempty"`
-	CacheTimeout  *bool `json:"cacheTimeout,omitempty"`
-}
-
-// NewQueryOptions creates a new QueryOptions object.
-func NewQueryOptions() *QueryOptions {
-	return &QueryOptions{}
-}
-
-// +k8s:openapi-gen=true
-type Route struct {
-	Path        *string `json:"path,omitempty"`
-	Method      *string `json:"method,omitempty"`
-	Url         *string `json:"url,omitempty"`
-	ReqSignedIn *bool   `json:"reqSignedIn,omitempty"`
-	ReqRole     *string `json:"reqRole,omitempty"`
-	ReqAction   *string `json:"reqAction,omitempty"`
-	// +listType=atomic
-	Headers      []string                   `json:"headers,omitempty"`
-	Body         map[string]interface{}     `json:"body,omitempty"`
-	TokenAuth    *V0alpha1RouteTokenAuth    `json:"tokenAuth,omitempty"`
-	JwtTokenAuth *V0alpha1RouteJwtTokenAuth `json:"jwtTokenAuth,omitempty"`
-	// +listType=atomic
-	UrlParams []V0alpha1RouteUrlParams `json:"urlParams,omitempty"`
-}
-
-// NewRoute creates a new Route object.
-func NewRoute() *Route {
-	return &Route{}
-}
-
-// +k8s:openapi-gen=true
-type IAM struct {
-	// +listType=atomic
-	Permissions []V0alpha1IAMPermissions `json:"permissions,omitempty"`
-}
-
-// NewIAM creates a new IAM object.
-func NewIAM() *IAM {
-	return &IAM{}
-}
-
-// +k8s:openapi-gen=true
-type Role struct {
-	Role *V0alpha1RoleRole `json:"role,omitempty"`
-	// +listType=set
-	Grants []string `json:"grants,omitempty"`
-}
-
-// NewRole creates a new Role object.
-func NewRole() *Role {
-	return &Role{}
-}
-
-// +k8s:openapi-gen=true
-type Extensions struct {
-	// +listType=atomic
-	AddedComponents []V0alpha1ExtensionsAddedComponents `json:"addedComponents,omitempty"`
-	// +listType=atomic
-	AddedLinks []V0alpha1ExtensionsAddedLinks `json:"addedLinks,omitempty"`
-	// +listType=set
-	// +listMapKey=id
-	ExposedComponents []V0alpha1ExtensionsExposedComponents `json:"exposedComponents,omitempty"`
-	// +listType=set
-	// +listMapKey=id
-	ExtensionPoints []V0alpha1ExtensionsExtensionPoints `json:"extensionPoints,omitempty"`
-}
-
-// NewExtensions creates a new Extensions object.
-func NewExtensions() *Extensions {
-	return &Extensions{}
-}
-
-// +k8s:openapi-gen=true
-type GetMeta struct {
-	// Unique name of the plugin
-	Id string `json:"id"`
-	// Plugin type
-	Type GetMetaType `json:"type"`
-	// Human-readable name of the plugin
-	Name string `json:"name"`
-	// Metadata for the plugin
-	Info Info `json:"info"`
-	// Dependency information
-	Dependencies Dependencies `json:"dependencies"`
-	// Optional fields
-	Alerting           *bool               `json:"alerting,omitempty"`
-	Annotations        *bool               `json:"annotations,omitempty"`
-	AutoEnabled        *bool               `json:"autoEnabled,omitempty"`
-	Backend            *bool               `json:"backend,omitempty"`
-	BuildMode          *string             `json:"buildMode,omitempty"`
-	BuiltIn            *bool               `json:"builtIn,omitempty"`
-	Category           *GetMetaCategory    `json:"category,omitempty"`
-	EnterpriseFeatures *EnterpriseFeatures `json:"enterpriseFeatures,omitempty"`
-	Executable         *string             `json:"executable,omitempty"`
-	HideFromList       *bool               `json:"hideFromList,omitempty"`
-	// +listType=atomic
-	Includes                  []Include     `json:"includes,omitempty"`
-	Logs                      *bool         `json:"logs,omitempty"`
-	Metrics                   *bool         `json:"metrics,omitempty"`
-	MultiValueFilterOperators *bool         `json:"multiValueFilterOperators,omitempty"`
-	PascalName                *string       `json:"pascalName,omitempty"`
-	Preload                   *bool         `json:"preload,omitempty"`
-	QueryOptions              *QueryOptions `json:"queryOptions,omitempty"`
-	// +listType=atomic
-	Routes        []Route       `json:"routes,omitempty"`
-	SkipDataQuery *bool         `json:"skipDataQuery,omitempty"`
-	State         *GetMetaState `json:"state,omitempty"`
-	Streaming     *bool         `json:"streaming,omitempty"`
-	Tracing       *bool         `json:"tracing,omitempty"`
-	Iam           *IAM          `json:"iam,omitempty"`
-	// +listType=atomic
-	Roles      []Role      `json:"roles,omitempty"`
-	Extensions *Extensions `json:"extensions,omitempty"`
-}
-
-// NewGetMeta creates a new GetMeta object.
-func NewGetMeta() *GetMeta {
-	return &GetMeta{
-		Info:         *NewInfo(),
-		Dependencies: *NewDependencies(),
-	}
-}
-
-// +k8s:openapi-gen=true
-type V0alpha1InfoLogos struct {
-	Small string `json:"small"`
-	Large string `json:"large"`
-}
-
-// NewV0alpha1InfoLogos creates a new V0alpha1InfoLogos object.
-func NewV0alpha1InfoLogos() *V0alpha1InfoLogos {
-	return &V0alpha1InfoLogos{}
-}
-
-// +k8s:openapi-gen=true
-type V0alpha1InfoAuthor struct {
-	Name  *string `json:"name,omitempty"`
-	Email *string `json:"email,omitempty"`
-	Url   *string `json:"url,omitempty"`
-}
-
-// NewV0alpha1InfoAuthor creates a new V0alpha1InfoAuthor object.
-func NewV0alpha1InfoAuthor() *V0alpha1InfoAuthor {
-	return &V0alpha1InfoAuthor{}
-}
-
-// +k8s:openapi-gen=true
-type V0alpha1InfoLinks struct {
-	Name *string `json:"name,omitempty"`
-	Url  *string `json:"url,omitempty"`
-}
-
-// NewV0alpha1InfoLinks creates a new V0alpha1InfoLinks object.
-func NewV0alpha1InfoLinks() *V0alpha1InfoLinks {
-	return &V0alpha1InfoLinks{}
-}
-
-// +k8s:openapi-gen=true
-type V0alpha1InfoScreenshots struct {
-	Name *string `json:"name,omitempty"`
-	Path *string `json:"path,omitempty"`
-}
-
-// NewV0alpha1InfoScreenshots creates a new V0alpha1InfoScreenshots object.
-func NewV0alpha1InfoScreenshots() *V0alpha1InfoScreenshots {
-	return &V0alpha1InfoScreenshots{}
-}
-
-// +k8s:openapi-gen=true
-type V0alpha1DependenciesPlugins struct {
-	Id   string                          `json:"id"`
-	Type V0alpha1DependenciesPluginsType `json:"type"`
-	Name string                          `json:"name"`
-}
-
-// NewV0alpha1DependenciesPlugins creates a new V0alpha1DependenciesPlugins object.
-func NewV0alpha1DependenciesPlugins() *V0alpha1DependenciesPlugins {
-	return &V0alpha1DependenciesPlugins{}
-}
-
-// +k8s:openapi-gen=true
-type V0alpha1DependenciesExtensions struct {
-	// +listType=set
-	ExposedComponents []string `json:"exposedComponents,omitempty"`
-}
-
-// NewV0alpha1DependenciesExtensions creates a new V0alpha1DependenciesExtensions object.
-func NewV0alpha1DependenciesExtensions() *V0alpha1DependenciesExtensions {
-	return &V0alpha1DependenciesExtensions{}
-}
-
-// +k8s:openapi-gen=true
-type V0alpha1RouteTokenAuth struct {
-	Url *string `json:"url,omitempty"`
-	// +listType=set
-	Scopes []string               `json:"scopes,omitempty"`
-	Params map[string]interface{} `json:"params,omitempty"`
-}
-
-// NewV0alpha1RouteTokenAuth creates a new V0alpha1RouteTokenAuth object.
-func NewV0alpha1RouteTokenAuth() *V0alpha1RouteTokenAuth {
-	return &V0alpha1RouteTokenAuth{}
-}
-
-// +k8s:openapi-gen=true
-type V0alpha1RouteJwtTokenAuth struct {
-	Url *string `json:"url,omitempty"`
-	// +listType=set
-	Scopes []string               `json:"scopes,omitempty"`
-	Params map[string]interface{} `json:"params,omitempty"`
-}
-
-// NewV0alpha1RouteJwtTokenAuth creates a new V0alpha1RouteJwtTokenAuth object.
-func NewV0alpha1RouteJwtTokenAuth() *V0alpha1RouteJwtTokenAuth {
-	return &V0alpha1RouteJwtTokenAuth{}
-}
-
-// +k8s:openapi-gen=true
-type V0alpha1RouteUrlParams struct {
-	Name    *string `json:"name,omitempty"`
-	Content *string `json:"content,omitempty"`
-}
-
-// NewV0alpha1RouteUrlParams creates a new V0alpha1RouteUrlParams object.
-func NewV0alpha1RouteUrlParams() *V0alpha1RouteUrlParams {
-	return &V0alpha1RouteUrlParams{}
-}
-
-// +k8s:openapi-gen=true
-type V0alpha1IAMPermissions struct {
-	Action *string `json:"action,omitempty"`
-	Scope  *string `json:"scope,omitempty"`
-}
-
-// NewV0alpha1IAMPermissions creates a new V0alpha1IAMPermissions object.
-func NewV0alpha1IAMPermissions() *V0alpha1IAMPermissions {
-	return &V0alpha1IAMPermissions{}
-}
-
-// +k8s:openapi-gen=true
-type V0alpha1RoleRolePermissions struct {
-	Action *string `json:"action,omitempty"`
-	Scope  *string `json:"scope,omitempty"`
-}
-
-// NewV0alpha1RoleRolePermissions creates a new V0alpha1RoleRolePermissions object.
-func NewV0alpha1RoleRolePermissions() *V0alpha1RoleRolePermissions {
-	return &V0alpha1RoleRolePermissions{}
-}
-
-// +k8s:openapi-gen=true
-type V0alpha1RoleRole struct {
-	Name        *string `json:"name,omitempty"`
-	Description *string `json:"description,omitempty"`
-	// +listType=atomic
-	Permissions []V0alpha1RoleRolePermissions `json:"permissions,omitempty"`
-}
-
-// NewV0alpha1RoleRole creates a new V0alpha1RoleRole object.
-func NewV0alpha1RoleRole() *V0alpha1RoleRole {
-	return &V0alpha1RoleRole{}
-}
-
-// +k8s:openapi-gen=true
-type V0alpha1ExtensionsAddedComponents struct {
-	// +listType=set
-	Targets     []string `json:"targets"`
-	Title       string   `json:"title"`
-	Description *string  `json:"description,omitempty"`
-}
-
-// NewV0alpha1ExtensionsAddedComponents creates a new V0alpha1ExtensionsAddedComponents object.
-func NewV0alpha1ExtensionsAddedComponents() *V0alpha1ExtensionsAddedComponents {
-	return &V0alpha1ExtensionsAddedComponents{
-		Targets: []string{},
-	}
-}
-
-// +k8s:openapi-gen=true
-type V0alpha1ExtensionsAddedLinks struct {
-	// +listType=set
-	Targets     []string `json:"targets"`
-	Title       string   `json:"title"`
-	Description *string  `json:"description,omitempty"`
-}
-
-// NewV0alpha1ExtensionsAddedLinks creates a new V0alpha1ExtensionsAddedLinks object.
-func NewV0alpha1ExtensionsAddedLinks() *V0alpha1ExtensionsAddedLinks {
-	return &V0alpha1ExtensionsAddedLinks{
-		Targets: []string{},
-	}
-}
-
-// +k8s:openapi-gen=true
-type V0alpha1ExtensionsExposedComponents struct {
-	Id          string  `json:"id"`
-	Title       *string `json:"title,omitempty"`
-	Description *string `json:"description,omitempty"`
-}
-
-// NewV0alpha1ExtensionsExposedComponents creates a new V0alpha1ExtensionsExposedComponents object.
-func NewV0alpha1ExtensionsExposedComponents() *V0alpha1ExtensionsExposedComponents {
-	return &V0alpha1ExtensionsExposedComponents{}
-}
-
-// +k8s:openapi-gen=true
-type V0alpha1ExtensionsExtensionPoints struct {
-	Id          string  `json:"id"`
-	Title       *string `json:"title,omitempty"`
-	Description *string `json:"description,omitempty"`
-}
-
-// NewV0alpha1ExtensionsExtensionPoints creates a new V0alpha1ExtensionsExtensionPoints object.
-func NewV0alpha1ExtensionsExtensionPoints() *V0alpha1ExtensionsExtensionPoints {
-	return &V0alpha1ExtensionsExtensionPoints{}
-}
-
-// +k8s:openapi-gen=true
-type IncludeType string
-
-const (
-	IncludeTypeDashboard  IncludeType = "dashboard"
-	IncludeTypePage       IncludeType = "page"
-	IncludeTypePanel      IncludeType = "panel"
-	IncludeTypeDatasource IncludeType = "datasource"
-)
-
-// +k8s:openapi-gen=true
-type IncludeRole string
-
-const (
-	IncludeRoleAdmin  IncludeRole = "Admin"
-	IncludeRoleEditor IncludeRole = "Editor"
-	IncludeRoleViewer IncludeRole = "Viewer"
-)
-
-// +k8s:openapi-gen=true
-type GetMetaType string
-
-const (
-	GetMetaTypeApp        GetMetaType = "app"
-	GetMetaTypeDatasource GetMetaType = "datasource"
-	GetMetaTypePanel      GetMetaType = "panel"
-	GetMetaTypeRenderer   GetMetaType = "renderer"
-)
-
-// +k8s:openapi-gen=true
-type GetMetaCategory string
-
-const (
-	GetMetaCategoryTsdb       GetMetaCategory = "tsdb"
-	GetMetaCategoryLogging    GetMetaCategory = "logging"
-	GetMetaCategoryCloud      GetMetaCategory = "cloud"
-	GetMetaCategoryTracing    GetMetaCategory = "tracing"
-	GetMetaCategoryProfiling  GetMetaCategory = "profiling"
-	GetMetaCategorySql        GetMetaCategory = "sql"
-	GetMetaCategoryEnterprise GetMetaCategory = "enterprise"
-	GetMetaCategoryIot        GetMetaCategory = "iot"
-	GetMetaCategoryOther      GetMetaCategory = "other"
-)
-
-// +k8s:openapi-gen=true
-type GetMetaState string
-
-const (
-	GetMetaStateAlpha GetMetaState = "alpha"
-	GetMetaStateBeta  GetMetaState = "beta"
-)
-
-// +k8s:openapi-gen=true
-type V0alpha1DependenciesPluginsType string
-
-const (
-	V0alpha1DependenciesPluginsTypeApp        V0alpha1DependenciesPluginsType = "app"
-	V0alpha1DependenciesPluginsTypeDatasource V0alpha1DependenciesPluginsType = "datasource"
-	V0alpha1DependenciesPluginsTypePanel      V0alpha1DependenciesPluginsType = "panel"
-)

apps/plugins/pkg/apis/plugins/v0alpha1/plugin_schema_gen.go

@@ -1,34 +0,0 @@
-//
-// Code generated by grafana-app-sdk. DO NOT EDIT.
-//
-
-package v0alpha1
-
-import (
-	"github.com/grafana/grafana-app-sdk/resource"
-)
-
-// schema is unexported to prevent accidental overwrites
-var (
-	schemaPlugin = resource.NewSimpleSchema("plugins.grafana.app", "v0alpha1", &Plugin{}, &PluginList{}, resource.WithKind("Plugin"),
-		resource.WithPlural("plugins"), resource.WithScope(resource.NamespacedScope))
-	kindPlugin = resource.Kind{
-		Schema: schemaPlugin,
-		Codecs: map[resource.KindEncoding]resource.Codec{
-			resource.KindEncodingJSON: &PluginJSONCodec{},
-		},
-	}
-)
-
-// Kind returns a resource.Kind for this Schema with a JSON codec
-func PluginKind() resource.Kind {
-	return kindPlugin
-}
-
-// Schema returns a resource.SimpleSchema representation of Plugin
-func PluginSchema() *resource.SimpleSchema {
-	return schemaPlugin
-}
-
-// Interface compliance checks
-var _ resource.Schema = kindPlugin

apps/plugins/pkg/apis/plugins/v0alpha1/plugin_spec_gen.go

@@ -1,25 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-
-package v0alpha1
-
-// +k8s:openapi-gen=true
-type PluginSpec struct {
-	Id      string          `json:"id"`
-	Version string          `json:"version"`
-	Url     *string         `json:"url,omitempty"`
-	Class   PluginSpecClass `json:"class"`
-}
-
-// NewPluginSpec creates a new PluginSpec object.
-func NewPluginSpec() *PluginSpec {
-	return &PluginSpec{}
-}
-
-// +k8s:openapi-gen=true
-type PluginSpecClass string
-
-const (
-	PluginSpecClassCore     PluginSpecClass = "core"
-	PluginSpecClassExternal PluginSpecClass = "external"
-	PluginSpecClassCdn      PluginSpecClass = "cdn"
-)

apps/plugins/pkg/apis/plugins/v0alpha1/plugininstall_client_gen.go

@@ -0,0 +1,99 @@
+package v0alpha1
+
+import (
+	"context"
+
+	"github.com/grafana/grafana-app-sdk/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+type PluginInstallClient struct {
+	client *resource.TypedClient[*PluginInstall, *PluginInstallList]
+}
+
+func NewPluginInstallClient(client resource.Client) *PluginInstallClient {
+	return &PluginInstallClient{
+		client: resource.NewTypedClient[*PluginInstall, *PluginInstallList](client, PluginInstallKind()),
+	}
+}
+
+func NewPluginInstallClientFromGenerator(generator resource.ClientGenerator) (*PluginInstallClient, error) {
+	c, err := generator.ClientFor(PluginInstallKind())
+	if err != nil {
+		return nil, err
+	}
+	return NewPluginInstallClient(c), nil
+}
+
+func (c *PluginInstallClient) Get(ctx context.Context, identifier resource.Identifier) (*PluginInstall, error) {
+	return c.client.Get(ctx, identifier)
+}
+
+func (c *PluginInstallClient) List(ctx context.Context, namespace string, opts resource.ListOptions) (*PluginInstallList, error) {
+	return c.client.List(ctx, namespace, opts)
+}
+
+func (c *PluginInstallClient) ListAll(ctx context.Context, namespace string, opts resource.ListOptions) (*PluginInstallList, error) {
+	resp, err := c.client.List(ctx, namespace, resource.ListOptions{
+		ResourceVersion: opts.ResourceVersion,
+		Limit:           opts.Limit,
+		LabelFilters:    opts.LabelFilters,
+		FieldSelectors:  opts.FieldSelectors,
+	})
+	if err != nil {
+		return nil, err
+	}
+	for resp.GetContinue() != "" {
+		page, err := c.client.List(ctx, namespace, resource.ListOptions{
+			Continue:        resp.GetContinue(),
+			ResourceVersion: opts.ResourceVersion,
+			Limit:           opts.Limit,
+			LabelFilters:    opts.LabelFilters,
+			FieldSelectors:  opts.FieldSelectors,
+		})
+		if err != nil {
+			return nil, err
+		}
+		resp.SetContinue(page.GetContinue())
+		resp.SetResourceVersion(page.GetResourceVersion())
+		resp.SetItems(append(resp.GetItems(), page.GetItems()...))
+	}
+	return resp, nil
+}
+
+func (c *PluginInstallClient) Create(ctx context.Context, obj *PluginInstall, opts resource.CreateOptions) (*PluginInstall, error) {
+	// Make sure apiVersion and kind are set
+	obj.APIVersion = GroupVersion.Identifier()
+	obj.Kind = PluginInstallKind().Kind()
+	return c.client.Create(ctx, obj, opts)
+}
+
+func (c *PluginInstallClient) Update(ctx context.Context, obj *PluginInstall, opts resource.UpdateOptions) (*PluginInstall, error) {
+	return c.client.Update(ctx, obj, opts)
+}
+
+func (c *PluginInstallClient) Patch(ctx context.Context, identifier resource.Identifier, req resource.PatchRequest, opts resource.PatchOptions) (*PluginInstall, error) {
+	return c.client.Patch(ctx, identifier, req, opts)
+}
+
+func (c *PluginInstallClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus PluginInstallStatus, opts resource.UpdateOptions) (*PluginInstall, error) {
+	return c.client.Update(ctx, &PluginInstall{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       PluginInstallKind().Kind(),
+			APIVersion: GroupVersion.Identifier(),
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			ResourceVersion: opts.ResourceVersion,
+			Namespace:       identifier.Namespace,
+			Name:            identifier.Name,
+		},
+		Status: newStatus,
+	}, resource.UpdateOptions{
+		Subresource:     "status",
+		ResourceVersion: opts.ResourceVersion,
+	})
+}
+
+func (c *PluginInstallClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
+	return c.client.Delete(ctx, identifier, opts)
+}

apps/plugins/pkg/apis/plugins/v0alpha1/plugininstall_codec_gen.go

@@ -0,0 +1,28 @@
+//
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+//
+
+package v0alpha1
+
+import (
+	"encoding/json"
+	"io"
+
+	"github.com/grafana/grafana-app-sdk/resource"
+)
+
+// PluginInstallJSONCodec is an implementation of resource.Codec for kubernetes JSON encoding
+type PluginInstallJSONCodec struct{}
+
+// Read reads JSON-encoded bytes from `reader` and unmarshals them into `into`
+func (*PluginInstallJSONCodec) Read(reader io.Reader, into resource.Object) error {
+	return json.NewDecoder(reader).Decode(into)
+}
+
+// Write writes JSON-encoded bytes into `writer` marshaled from `from`
+func (*PluginInstallJSONCodec) Write(writer io.Writer, from resource.Object) error {
+	return json.NewEncoder(writer).Encode(from)
+}
+
+// Interface compliance checks
+var _ resource.Codec = &PluginInstallJSONCodec{}

apps/plugins/pkg/apis/plugins/v0alpha1/plugininstall_metadata_gen.go

@@ -0,0 +1,31 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	time "time"
+)
+
+// metadata contains embedded CommonMetadata and can be extended with custom string fields
+// TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
+// without external reference as using the CommonMetadata reference breaks thema codegen.
+type PluginInstallMetadata struct {
+	UpdateTimestamp   time.Time         `json:"updateTimestamp"`
+	CreatedBy         string            `json:"createdBy"`
+	Uid               string            `json:"uid"`
+	CreationTimestamp time.Time         `json:"creationTimestamp"`
+	DeletionTimestamp *time.Time        `json:"deletionTimestamp,omitempty"`
+	Finalizers        []string          `json:"finalizers"`
+	ResourceVersion   string            `json:"resourceVersion"`
+	Generation        int64             `json:"generation"`
+	UpdatedBy         string            `json:"updatedBy"`
+	Labels            map[string]string `json:"labels"`
+}
+
+// NewPluginInstallMetadata creates a new PluginInstallMetadata object.
+func NewPluginInstallMetadata() *PluginInstallMetadata {
+	return &PluginInstallMetadata{
+		Finalizers: []string{},
+		Labels:     map[string]string{},
+	}
+}

apps/plugins/pkg/apis/plugins/v0alpha1/plugininstall_object_gen.go

@@ -0,0 +1,319 @@
+//
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+//
+
+package v0alpha1
+
+import (
+	"fmt"
+	"github.com/grafana/grafana-app-sdk/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"time"
+)
+
+// +k8s:openapi-gen=true
+type PluginInstall struct {
+	metav1.TypeMeta   `json:",inline" yaml:",inline"`
+	metav1.ObjectMeta `json:"metadata" yaml:"metadata"`
+
+	// Spec is the spec of the PluginInstall
+	Spec PluginInstallSpec `json:"spec" yaml:"spec"`
+
+	Status PluginInstallStatus `json:"status" yaml:"status"`
+}
+
+func (o *PluginInstall) GetSpec() any {
+	return o.Spec
+}
+
+func (o *PluginInstall) SetSpec(spec any) error {
+	cast, ok := spec.(PluginInstallSpec)
+	if !ok {
+		return fmt.Errorf("cannot set spec type %#v, not of type Spec", spec)
+	}
+	o.Spec = cast
+	return nil
+}
+
+func (o *PluginInstall) GetSubresources() map[string]any {
+	return map[string]any{
+		"status": o.Status,
+	}
+}
+
+func (o *PluginInstall) GetSubresource(name string) (any, bool) {
+	switch name {
+	case "status":
+		return o.Status, true
+	default:
+		return nil, false
+	}
+}
+
+func (o *PluginInstall) SetSubresource(name string, value any) error {
+	switch name {
+	case "status":
+		cast, ok := value.(PluginInstallStatus)
+		if !ok {
+			return fmt.Errorf("cannot set status type %#v, not of type PluginInstallStatus", value)
+		}
+		o.Status = cast
+		return nil
+	default:
+		return fmt.Errorf("subresource '%s' does not exist", name)
+	}
+}
+
+func (o *PluginInstall) GetStaticMetadata() resource.StaticMetadata {
+	gvk := o.GroupVersionKind()
+	return resource.StaticMetadata{
+		Name:      o.ObjectMeta.Name,
+		Namespace: o.ObjectMeta.Namespace,
+		Group:     gvk.Group,
+		Version:   gvk.Version,
+		Kind:      gvk.Kind,
+	}
+}
+
+func (o *PluginInstall) SetStaticMetadata(metadata resource.StaticMetadata) {
+	o.Name = metadata.Name
+	o.Namespace = metadata.Namespace
+	o.SetGroupVersionKind(schema.GroupVersionKind{
+		Group:   metadata.Group,
+		Version: metadata.Version,
+		Kind:    metadata.Kind,
+	})
+}
+
+func (o *PluginInstall) GetCommonMetadata() resource.CommonMetadata {
+	dt := o.DeletionTimestamp
+	var deletionTimestamp *time.Time
+	if dt != nil {
+		deletionTimestamp = &dt.Time
+	}
+	// Legacy ExtraFields support
+	extraFields := make(map[string]any)
+	if o.Annotations != nil {
+		extraFields["annotations"] = o.Annotations
+	}
+	if o.ManagedFields != nil {
+		extraFields["managedFields"] = o.ManagedFields
+	}
+	if o.OwnerReferences != nil {
+		extraFields["ownerReferences"] = o.OwnerReferences
+	}
+	return resource.CommonMetadata{
+		UID:               string(o.UID),
+		ResourceVersion:   o.ResourceVersion,
+		Generation:        o.Generation,
+		Labels:            o.Labels,
+		CreationTimestamp: o.CreationTimestamp.Time,
+		DeletionTimestamp: deletionTimestamp,
+		Finalizers:        o.Finalizers,
+		UpdateTimestamp:   o.GetUpdateTimestamp(),
+		CreatedBy:         o.GetCreatedBy(),
+		UpdatedBy:         o.GetUpdatedBy(),
+		ExtraFields:       extraFields,
+	}
+}
+
+func (o *PluginInstall) SetCommonMetadata(metadata resource.CommonMetadata) {
+	o.UID = types.UID(metadata.UID)
+	o.ResourceVersion = metadata.ResourceVersion
+	o.Generation = metadata.Generation
+	o.Labels = metadata.Labels
+	o.CreationTimestamp = metav1.NewTime(metadata.CreationTimestamp)
+	if metadata.DeletionTimestamp != nil {
+		dt := metav1.NewTime(*metadata.DeletionTimestamp)
+		o.DeletionTimestamp = &dt
+	} else {
+		o.DeletionTimestamp = nil
+	}
+	o.Finalizers = metadata.Finalizers
+	if o.Annotations == nil {
+		o.Annotations = make(map[string]string)
+	}
+	if !metadata.UpdateTimestamp.IsZero() {
+		o.SetUpdateTimestamp(metadata.UpdateTimestamp)
+	}
+	if metadata.CreatedBy != "" {
+		o.SetCreatedBy(metadata.CreatedBy)
+	}
+	if metadata.UpdatedBy != "" {
+		o.SetUpdatedBy(metadata.UpdatedBy)
+	}
+	// Legacy support for setting Annotations, ManagedFields, and OwnerReferences via ExtraFields
+	if metadata.ExtraFields != nil {
+		if annotations, ok := metadata.ExtraFields["annotations"]; ok {
+			if cast, ok := annotations.(map[string]string); ok {
+				o.Annotations = cast
+			}
+		}
+		if managedFields, ok := metadata.ExtraFields["managedFields"]; ok {
+			if cast, ok := managedFields.([]metav1.ManagedFieldsEntry); ok {
+				o.ManagedFields = cast
+			}
+		}
+		if ownerReferences, ok := metadata.ExtraFields["ownerReferences"]; ok {
+			if cast, ok := ownerReferences.([]metav1.OwnerReference); ok {
+				o.OwnerReferences = cast
+			}
+		}
+	}
+}
+
+func (o *PluginInstall) GetCreatedBy() string {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	return o.ObjectMeta.Annotations["grafana.com/createdBy"]
+}
+
+func (o *PluginInstall) SetCreatedBy(createdBy string) {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	o.ObjectMeta.Annotations["grafana.com/createdBy"] = createdBy
+}
+
+func (o *PluginInstall) GetUpdateTimestamp() time.Time {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	parsed, _ := time.Parse(time.RFC3339, o.ObjectMeta.Annotations["grafana.com/updateTimestamp"])
+	return parsed
+}
+
+func (o *PluginInstall) SetUpdateTimestamp(updateTimestamp time.Time) {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	o.ObjectMeta.Annotations["grafana.com/updateTimestamp"] = updateTimestamp.Format(time.RFC3339)
+}
+
+func (o *PluginInstall) GetUpdatedBy() string {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	return o.ObjectMeta.Annotations["grafana.com/updatedBy"]
+}
+
+func (o *PluginInstall) SetUpdatedBy(updatedBy string) {
+	if o.ObjectMeta.Annotations == nil {
+		o.ObjectMeta.Annotations = make(map[string]string)
+	}
+
+	o.ObjectMeta.Annotations["grafana.com/updatedBy"] = updatedBy
+}
+
+func (o *PluginInstall) Copy() resource.Object {
+	return resource.CopyObject(o)
+}
+
+func (o *PluginInstall) DeepCopyObject() runtime.Object {
+	return o.Copy()
+}
+
+func (o *PluginInstall) DeepCopy() *PluginInstall {
+	cpy := &PluginInstall{}
+	o.DeepCopyInto(cpy)
+	return cpy
+}
+
+func (o *PluginInstall) DeepCopyInto(dst *PluginInstall) {
+	dst.TypeMeta.APIVersion = o.TypeMeta.APIVersion
+	dst.TypeMeta.Kind = o.TypeMeta.Kind
+	o.ObjectMeta.DeepCopyInto(&dst.ObjectMeta)
+	o.Spec.DeepCopyInto(&dst.Spec)
+	o.Status.DeepCopyInto(&dst.Status)
+}
+
+// Interface compliance compile-time check
+var _ resource.Object = &PluginInstall{}
+
+// +k8s:openapi-gen=true
+type PluginInstallList struct {
+	metav1.TypeMeta `json:",inline" yaml:",inline"`
+	metav1.ListMeta `json:"metadata" yaml:"metadata"`
+	Items           []PluginInstall `json:"items" yaml:"items"`
+}
+
+func (o *PluginInstallList) DeepCopyObject() runtime.Object {
+	return o.Copy()
+}
+
+func (o *PluginInstallList) Copy() resource.ListObject {
+	cpy := &PluginInstallList{
+		TypeMeta: o.TypeMeta,
+		Items:    make([]PluginInstall, len(o.Items)),
+	}
+	o.ListMeta.DeepCopyInto(&cpy.ListMeta)
+	for i := 0; i < len(o.Items); i++ {
+		if item, ok := o.Items[i].Copy().(*PluginInstall); ok {
+			cpy.Items[i] = *item
+		}
+	}
+	return cpy
+}
+
+func (o *PluginInstallList) GetItems() []resource.Object {
+	items := make([]resource.Object, len(o.Items))
+	for i := 0; i < len(o.Items); i++ {
+		items[i] = &o.Items[i]
+	}
+	return items
+}
+
+func (o *PluginInstallList) SetItems(items []resource.Object) {
+	o.Items = make([]PluginInstall, len(items))
+	for i := 0; i < len(items); i++ {
+		o.Items[i] = *items[i].(*PluginInstall)
+	}
+}
+
+func (o *PluginInstallList) DeepCopy() *PluginInstallList {
+	cpy := &PluginInstallList{}
+	o.DeepCopyInto(cpy)
+	return cpy
+}
+
+func (o *PluginInstallList) DeepCopyInto(dst *PluginInstallList) {
+	resource.CopyObjectInto(dst, o)
+}
+
+// Interface compliance compile-time check
+var _ resource.ListObject = &PluginInstallList{}
+
+// Copy methods for all subresource types
+
+// DeepCopy creates a full deep copy of Spec
+func (s *PluginInstallSpec) DeepCopy() *PluginInstallSpec {
+	cpy := &PluginInstallSpec{}
+	s.DeepCopyInto(cpy)
+	return cpy
+}
+
+// DeepCopyInto deep copies Spec into another Spec object
+func (s *PluginInstallSpec) DeepCopyInto(dst *PluginInstallSpec) {
+	resource.CopyObjectInto(dst, s)
+}
+
+// DeepCopy creates a full deep copy of PluginInstallStatus
+func (s *PluginInstallStatus) DeepCopy() *PluginInstallStatus {
+	cpy := &PluginInstallStatus{}
+	s.DeepCopyInto(cpy)
+	return cpy
+}
+
+// DeepCopyInto deep copies PluginInstallStatus into another PluginInstallStatus object
+func (s *PluginInstallStatus) DeepCopyInto(dst *PluginInstallStatus) {
+	resource.CopyObjectInto(dst, s)
+}

apps/plugins/pkg/apis/plugins/v0alpha1/plugininstall_schema_gen.go

@@ -0,0 +1,34 @@
+//
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+//
+
+package v0alpha1
+
+import (
+	"github.com/grafana/grafana-app-sdk/resource"
+)
+
+// schema is unexported to prevent accidental overwrites
+var (
+	schemaPluginInstall = resource.NewSimpleSchema("plugins.grafana.app", "v0alpha1", &PluginInstall{}, &PluginInstallList{}, resource.WithKind("PluginInstall"),
+		resource.WithPlural("plugininstalls"), resource.WithScope(resource.NamespacedScope))
+	kindPluginInstall = resource.Kind{
+		Schema: schemaPluginInstall,
+		Codecs: map[resource.KindEncoding]resource.Codec{
+			resource.KindEncodingJSON: &PluginInstallJSONCodec{},
+		},
+	}
+)
+
+// Kind returns a resource.Kind for this Schema with a JSON codec
+func PluginInstallKind() resource.Kind {
+	return kindPluginInstall
+}
+
+// Schema returns a resource.SimpleSchema representation of PluginInstall
+func PluginInstallSchema() *resource.SimpleSchema {
+	return schemaPluginInstall
+}
+
+// Interface compliance checks
+var _ resource.Schema = kindPluginInstall

apps/plugins/pkg/apis/plugins/v0alpha1/plugininstall_spec_gen.go

@@ -0,0 +1,25 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v0alpha1
+
+// +k8s:openapi-gen=true
+type PluginInstallSpec struct {
+	Id      string                 `json:"id"`
+	Version string                 `json:"version"`
+	Url     *string                `json:"url,omitempty"`
+	Class   PluginInstallSpecClass `json:"class"`
+}
+
+// NewPluginInstallSpec creates a new PluginInstallSpec object.
+func NewPluginInstallSpec() *PluginInstallSpec {
+	return &PluginInstallSpec{}
+}
+
+// +k8s:openapi-gen=true
+type PluginInstallSpecClass string
+
+const (
+	PluginInstallSpecClassCore     PluginInstallSpecClass = "core"
+	PluginInstallSpecClassExternal PluginInstallSpecClass = "external"
+	PluginInstallSpecClassCdn      PluginInstallSpecClass = "cdn"
+)

apps/plugins/pkg/apis/plugins/v0alpha1/plugininstall_status_gen.go

@@ -0,0 +1,44 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v0alpha1
+
+// +k8s:openapi-gen=true
+type PluginInstallstatusOperatorState struct {
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State PluginInstallStatusOperatorStateState `json:"state"`
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+	// details contains any extra information that is operator-specific
+	Details map[string]interface{} `json:"details,omitempty"`
+}
+
+// NewPluginInstallstatusOperatorState creates a new PluginInstallstatusOperatorState object.
+func NewPluginInstallstatusOperatorState() *PluginInstallstatusOperatorState {
+	return &PluginInstallstatusOperatorState{}
+}
+
+// +k8s:openapi-gen=true
+type PluginInstallStatus struct {
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]PluginInstallstatusOperatorState `json:"operatorStates,omitempty"`
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
+}
+
+// NewPluginInstallStatus creates a new PluginInstallStatus object.
+func NewPluginInstallStatus() *PluginInstallStatus {
+	return &PluginInstallStatus{}
+}
+
+// +k8s:openapi-gen=true
+type PluginInstallStatusOperatorStateState string
+
+const (
+	PluginInstallStatusOperatorStateStateSuccess    PluginInstallStatusOperatorStateState = "success"
+	PluginInstallStatusOperatorStateStateInProgress PluginInstallStatusOperatorStateState = "in_progress"
+	PluginInstallStatusOperatorStateStateFailed     PluginInstallStatusOperatorStateState = "failed"
+)

apps/plugins/pkg/apis/plugins/v0alpha1/pluginmeta_client_gen.go

@@ -7,33 +7,33 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-type CheckClient struct {
-	client *resource.TypedClient[*Check, *CheckList]
+type PluginMetaClient struct {
+	client *resource.TypedClient[*PluginMeta, *PluginMetaList]
 }
 
-func NewCheckClient(client resource.Client) *CheckClient {
-	return &CheckClient{
-		client: resource.NewTypedClient[*Check, *CheckList](client, CheckKind()),
+func NewPluginMetaClient(client resource.Client) *PluginMetaClient {
+	return &PluginMetaClient{
+		client: resource.NewTypedClient[*PluginMeta, *PluginMetaList](client, PluginMetaKind()),
 	}
 }
 
-func NewCheckClientFromGenerator(generator resource.ClientGenerator) (*CheckClient, error) {
-	c, err := generator.ClientFor(CheckKind())
+func NewPluginMetaClientFromGenerator(generator resource.ClientGenerator) (*PluginMetaClient, error) {
+	c, err := generator.ClientFor(PluginMetaKind())
 	if err != nil {
 		return nil, err
 	}
-	return NewCheckClient(c), nil
+	return NewPluginMetaClient(c), nil
 }
 
-func (c *CheckClient) Get(ctx context.Context, identifier resource.Identifier) (*Check, error) {
+func (c *PluginMetaClient) Get(ctx context.Context, identifier resource.Identifier) (*PluginMeta, error) {
 	return c.client.Get(ctx, identifier)
 }
 
-func (c *CheckClient) List(ctx context.Context, namespace string, opts resource.ListOptions) (*CheckList, error) {
+func (c *PluginMetaClient) List(ctx context.Context, namespace string, opts resource.ListOptions) (*PluginMetaList, error) {
 	return c.client.List(ctx, namespace, opts)
 }
 
-func (c *CheckClient) ListAll(ctx context.Context, namespace string, opts resource.ListOptions) (*CheckList, error) {
+func (c *PluginMetaClient) ListAll(ctx context.Context, namespace string, opts resource.ListOptions) (*PluginMetaList, error) {
 	resp, err := c.client.List(ctx, namespace, resource.ListOptions{
 		ResourceVersion: opts.ResourceVersion,
 		Limit:           opts.Limit,
@@ -61,25 +61,25 @@ func (c *CheckClient) ListAll(ctx context.Context, namespace string, opts resour
 	return resp, nil
 }
 
-func (c *CheckClient) Create(ctx context.Context, obj *Check, opts resource.CreateOptions) (*Check, error) {
+func (c *PluginMetaClient) Create(ctx context.Context, obj *PluginMeta, opts resource.CreateOptions) (*PluginMeta, error) {
 	// Make sure apiVersion and kind are set
 	obj.APIVersion = GroupVersion.Identifier()
-	obj.Kind = CheckKind().Kind()
+	obj.Kind = PluginMetaKind().Kind()
 	return c.client.Create(ctx, obj, opts)
 }
 
-func (c *CheckClient) Update(ctx context.Context, obj *Check, opts resource.UpdateOptions) (*Check, error) {
+func (c *PluginMetaClient) Update(ctx context.Context, obj *PluginMeta, opts resource.UpdateOptions) (*PluginMeta, error) {
 	return c.client.Update(ctx, obj, opts)
 }
 
-func (c *CheckClient) Patch(ctx context.Context, identifier resource.Identifier, req resource.PatchRequest, opts resource.PatchOptions) (*Check, error) {
+func (c *PluginMetaClient) Patch(ctx context.Context, identifier resource.Identifier, req resource.PatchRequest, opts resource.PatchOptions) (*PluginMeta, error) {
 	return c.client.Patch(ctx, identifier, req, opts)
 }
 
-func (c *CheckClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus CheckStatus, opts resource.UpdateOptions) (*Check, error) {
-	return c.client.Update(ctx, &Check{
+func (c *PluginMetaClient) UpdateStatus(ctx context.Context, identifier resource.Identifier, newStatus PluginMetaStatus, opts resource.UpdateOptions) (*PluginMeta, error) {
+	return c.client.Update(ctx, &PluginMeta{
 		TypeMeta: metav1.TypeMeta{
-			Kind:       CheckKind().Kind(),
+			Kind:       PluginMetaKind().Kind(),
 			APIVersion: GroupVersion.Identifier(),
 		},
 		ObjectMeta: metav1.ObjectMeta{
@@ -94,6 +94,6 @@ func (c *CheckClient) UpdateStatus(ctx context.Context, identifier resource.Iden
 	})
 }
 
-func (c *CheckClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
+func (c *PluginMetaClient) Delete(ctx context.Context, identifier resource.Identifier, opts resource.DeleteOptions) error {
 	return c.client.Delete(ctx, identifier, opts)
 }

apps/plugins/pkg/apis/plugins/v0alpha1/pluginmeta_codec_gen.go

@@ -11,18 +11,18 @@ import (
 	"github.com/grafana/grafana-app-sdk/resource"
 )
 
-// PluginJSONCodec is an implementation of resource.Codec for kubernetes JSON encoding
-type PluginJSONCodec struct{}
+// PluginMetaJSONCodec is an implementation of resource.Codec for kubernetes JSON encoding
+type PluginMetaJSONCodec struct{}
 
 // Read reads JSON-encoded bytes from `reader` and unmarshals them into `into`
-func (*PluginJSONCodec) Read(reader io.Reader, into resource.Object) error {
+func (*PluginMetaJSONCodec) Read(reader io.Reader, into resource.Object) error {
 	return json.NewDecoder(reader).Decode(into)
 }
 
 // Write writes JSON-encoded bytes into `writer` marshaled from `from`
-func (*PluginJSONCodec) Write(writer io.Writer, from resource.Object) error {
+func (*PluginMetaJSONCodec) Write(writer io.Writer, from resource.Object) error {
 	return json.NewEncoder(writer).Encode(from)
 }
 
 // Interface compliance checks
-var _ resource.Codec = &PluginJSONCodec{}
+var _ resource.Codec = &PluginMetaJSONCodec{}

apps/plugins/pkg/apis/plugins/v0alpha1/pluginmeta_metadata_gen.go

@@ -9,7 +9,7 @@ import (
 // metadata contains embedded CommonMetadata and can be extended with custom string fields
 // TODO: use CommonMetadata instead of redefining here; currently needs to be defined here
 // without external reference as using the CommonMetadata reference breaks thema codegen.
-type PluginMetadata struct {
+type PluginMetaMetadata struct {
 	UpdateTimestamp   time.Time         `json:"updateTimestamp"`
 	CreatedBy         string            `json:"createdBy"`
 	Uid               string            `json:"uid"`
@@ -22,9 +22,9 @@ type PluginMetadata struct {
 	Labels            map[string]string `json:"labels"`
 }
 
-// NewPluginMetadata creates a new PluginMetadata object.
-func NewPluginMetadata() *PluginMetadata {
-	return &PluginMetadata{
+// NewPluginMetaMetadata creates a new PluginMetaMetadata object.
+func NewPluginMetaMetadata() *PluginMetaMetadata {
+	return &PluginMetaMetadata{
 		Finalizers: []string{},
 		Labels:     map[string]string{},
 	}

apps/plugins/pkg/apis/plugins/v0alpha1/pluginmeta_object_gen.go

@@ -15,22 +15,22 @@ import (
 )
 
 // +k8s:openapi-gen=true
-type Plugin struct {
+type PluginMeta struct {
 	metav1.TypeMeta   `json:",inline" yaml:",inline"`
 	metav1.ObjectMeta `json:"metadata" yaml:"metadata"`
 
-	// Spec is the spec of the Plugin
-	Spec PluginSpec `json:"spec" yaml:"spec"`
+	// Spec is the spec of the PluginMeta
+	Spec PluginMetaSpec `json:"spec" yaml:"spec"`
 
-	Status PluginStatus `json:"status" yaml:"status"`
+	Status PluginMetaStatus `json:"status" yaml:"status"`
 }
 
-func (o *Plugin) GetSpec() any {
+func (o *PluginMeta) GetSpec() any {
 	return o.Spec
 }
 
-func (o *Plugin) SetSpec(spec any) error {
-	cast, ok := spec.(PluginSpec)
+func (o *PluginMeta) SetSpec(spec any) error {
+	cast, ok := spec.(PluginMetaSpec)
 	if !ok {
 		return fmt.Errorf("cannot set spec type %#v, not of type Spec", spec)
 	}
@@ -38,13 +38,13 @@ func (o *Plugin) SetSpec(spec any) error {
 	return nil
 }
 
-func (o *Plugin) GetSubresources() map[string]any {
+func (o *PluginMeta) GetSubresources() map[string]any {
 	return map[string]any{
 		"status": o.Status,
 	}
 }
 
-func (o *Plugin) GetSubresource(name string) (any, bool) {
+func (o *PluginMeta) GetSubresource(name string) (any, bool) {
 	switch name {
 	case "status":
 		return o.Status, true
@@ -53,12 +53,12 @@ func (o *Plugin) GetSubresource(name string) (any, bool) {
 	}
 }
 
-func (o *Plugin) SetSubresource(name string, value any) error {
+func (o *PluginMeta) SetSubresource(name string, value any) error {
 	switch name {
 	case "status":
-		cast, ok := value.(PluginStatus)
+		cast, ok := value.(PluginMetaStatus)
 		if !ok {
-			return fmt.Errorf("cannot set status type %#v, not of type PluginStatus", value)
+			return fmt.Errorf("cannot set status type %#v, not of type PluginMetaStatus", value)
 		}
 		o.Status = cast
 		return nil
@@ -67,7 +67,7 @@ func (o *Plugin) SetSubresource(name string, value any) error {
 	}
 }
 
-func (o *Plugin) GetStaticMetadata() resource.StaticMetadata {
+func (o *PluginMeta) GetStaticMetadata() resource.StaticMetadata {
 	gvk := o.GroupVersionKind()
 	return resource.StaticMetadata{
 		Name:      o.ObjectMeta.Name,
@@ -78,7 +78,7 @@ func (o *Plugin) GetStaticMetadata() resource.StaticMetadata {
 	}
 }
 
-func (o *Plugin) SetStaticMetadata(metadata resource.StaticMetadata) {
+func (o *PluginMeta) SetStaticMetadata(metadata resource.StaticMetadata) {
 	o.Name = metadata.Name
 	o.Namespace = metadata.Namespace
 	o.SetGroupVersionKind(schema.GroupVersionKind{
@@ -88,7 +88,7 @@ func (o *Plugin) SetStaticMetadata(metadata resource.StaticMetadata) {
 	})
 }
 
-func (o *Plugin) GetCommonMetadata() resource.CommonMetadata {
+func (o *PluginMeta) GetCommonMetadata() resource.CommonMetadata {
 	dt := o.DeletionTimestamp
 	var deletionTimestamp *time.Time
 	if dt != nil {
@@ -120,7 +120,7 @@ func (o *Plugin) GetCommonMetadata() resource.CommonMetadata {
 	}
 }
 
-func (o *Plugin) SetCommonMetadata(metadata resource.CommonMetadata) {
+func (o *PluginMeta) SetCommonMetadata(metadata resource.CommonMetadata) {
 	o.UID = types.UID(metadata.UID)
 	o.ResourceVersion = metadata.ResourceVersion
 	o.Generation = metadata.Generation
@@ -165,7 +165,7 @@ func (o *Plugin) SetCommonMetadata(metadata resource.CommonMetadata) {
 	}
 }
 
-func (o *Plugin) GetCreatedBy() string {
+func (o *PluginMeta) GetCreatedBy() string {
 	if o.ObjectMeta.Annotations == nil {
 		o.ObjectMeta.Annotations = make(map[string]string)
 	}
@@ -173,7 +173,7 @@ func (o *Plugin) GetCreatedBy() string {
 	return o.ObjectMeta.Annotations["grafana.com/createdBy"]
 }
 
-func (o *Plugin) SetCreatedBy(createdBy string) {
+func (o *PluginMeta) SetCreatedBy(createdBy string) {
 	if o.ObjectMeta.Annotations == nil {
 		o.ObjectMeta.Annotations = make(map[string]string)
 	}
@@ -181,7 +181,7 @@ func (o *Plugin) SetCreatedBy(createdBy string) {
 	o.ObjectMeta.Annotations["grafana.com/createdBy"] = createdBy
 }
 
-func (o *Plugin) GetUpdateTimestamp() time.Time {
+func (o *PluginMeta) GetUpdateTimestamp() time.Time {
 	if o.ObjectMeta.Annotations == nil {
 		o.ObjectMeta.Annotations = make(map[string]string)
 	}
@@ -190,7 +190,7 @@ func (o *Plugin) GetUpdateTimestamp() time.Time {
 	return parsed
 }
 
-func (o *Plugin) SetUpdateTimestamp(updateTimestamp time.Time) {
+func (o *PluginMeta) SetUpdateTimestamp(updateTimestamp time.Time) {
 	if o.ObjectMeta.Annotations == nil {
 		o.ObjectMeta.Annotations = make(map[string]string)
 	}
@@ -198,7 +198,7 @@ func (o *Plugin) SetUpdateTimestamp(updateTimestamp time.Time) {
 	o.ObjectMeta.Annotations["grafana.com/updateTimestamp"] = updateTimestamp.Format(time.RFC3339)
 }
 
-func (o *Plugin) GetUpdatedBy() string {
+func (o *PluginMeta) GetUpdatedBy() string {
 	if o.ObjectMeta.Annotations == nil {
 		o.ObjectMeta.Annotations = make(map[string]string)
 	}
@@ -206,7 +206,7 @@ func (o *Plugin) GetUpdatedBy() string {
 	return o.ObjectMeta.Annotations["grafana.com/updatedBy"]
 }
 
-func (o *Plugin) SetUpdatedBy(updatedBy string) {
+func (o *PluginMeta) SetUpdatedBy(updatedBy string) {
 	if o.ObjectMeta.Annotations == nil {
 		o.ObjectMeta.Annotations = make(map[string]string)
 	}
@@ -214,21 +214,21 @@ func (o *Plugin) SetUpdatedBy(updatedBy string) {
 	o.ObjectMeta.Annotations["grafana.com/updatedBy"] = updatedBy
 }
 
-func (o *Plugin) Copy() resource.Object {
+func (o *PluginMeta) Copy() resource.Object {
 	return resource.CopyObject(o)
 }
 
-func (o *Plugin) DeepCopyObject() runtime.Object {
+func (o *PluginMeta) DeepCopyObject() runtime.Object {
 	return o.Copy()
 }
 
-func (o *Plugin) DeepCopy() *Plugin {
-	cpy := &Plugin{}
+func (o *PluginMeta) DeepCopy() *PluginMeta {
+	cpy := &PluginMeta{}
 	o.DeepCopyInto(cpy)
 	return cpy
 }
 
-func (o *Plugin) DeepCopyInto(dst *Plugin) {
+func (o *PluginMeta) DeepCopyInto(dst *PluginMeta) {
 	dst.TypeMeta.APIVersion = o.TypeMeta.APIVersion
 	dst.TypeMeta.Kind = o.TypeMeta.Kind
 	o.ObjectMeta.DeepCopyInto(&dst.ObjectMeta)
@@ -237,34 +237,34 @@ func (o *Plugin) DeepCopyInto(dst *Plugin) {
 }
 
 // Interface compliance compile-time check
-var _ resource.Object = &Plugin{}
+var _ resource.Object = &PluginMeta{}
 
 // +k8s:openapi-gen=true
-type PluginList struct {
+type PluginMetaList struct {
 	metav1.TypeMeta `json:",inline" yaml:",inline"`
 	metav1.ListMeta `json:"metadata" yaml:"metadata"`
-	Items           []Plugin `json:"items" yaml:"items"`
+	Items           []PluginMeta `json:"items" yaml:"items"`
 }
 
-func (o *PluginList) DeepCopyObject() runtime.Object {
+func (o *PluginMetaList) DeepCopyObject() runtime.Object {
 	return o.Copy()
 }
 
-func (o *PluginList) Copy() resource.ListObject {
-	cpy := &PluginList{
+func (o *PluginMetaList) Copy() resource.ListObject {
+	cpy := &PluginMetaList{
 		TypeMeta: o.TypeMeta,
-		Items:    make([]Plugin, len(o.Items)),
+		Items:    make([]PluginMeta, len(o.Items)),
 	}
 	o.ListMeta.DeepCopyInto(&cpy.ListMeta)
 	for i := 0; i < len(o.Items); i++ {
-		if item, ok := o.Items[i].Copy().(*Plugin); ok {
+		if item, ok := o.Items[i].Copy().(*PluginMeta); ok {
 			cpy.Items[i] = *item
 		}
 	}
 	return cpy
 }
 
-func (o *PluginList) GetItems() []resource.Object {
+func (o *PluginMetaList) GetItems() []resource.Object {
 	items := make([]resource.Object, len(o.Items))
 	for i := 0; i < len(o.Items); i++ {
 		items[i] = &o.Items[i]
@@ -272,48 +272,48 @@ func (o *PluginList) GetItems() []resource.Object {
 	return items
 }
 
-func (o *PluginList) SetItems(items []resource.Object) {
-	o.Items = make([]Plugin, len(items))
+func (o *PluginMetaList) SetItems(items []resource.Object) {
+	o.Items = make([]PluginMeta, len(items))
 	for i := 0; i < len(items); i++ {
-		o.Items[i] = *items[i].(*Plugin)
+		o.Items[i] = *items[i].(*PluginMeta)
 	}
 }
 
-func (o *PluginList) DeepCopy() *PluginList {
-	cpy := &PluginList{}
+func (o *PluginMetaList) DeepCopy() *PluginMetaList {
+	cpy := &PluginMetaList{}
 	o.DeepCopyInto(cpy)
 	return cpy
 }
 
-func (o *PluginList) DeepCopyInto(dst *PluginList) {
+func (o *PluginMetaList) DeepCopyInto(dst *PluginMetaList) {
 	resource.CopyObjectInto(dst, o)
 }
 
 // Interface compliance compile-time check
-var _ resource.ListObject = &PluginList{}
+var _ resource.ListObject = &PluginMetaList{}
 
 // Copy methods for all subresource types
 
 // DeepCopy creates a full deep copy of Spec
-func (s *PluginSpec) DeepCopy() *PluginSpec {
-	cpy := &PluginSpec{}
+func (s *PluginMetaSpec) DeepCopy() *PluginMetaSpec {
+	cpy := &PluginMetaSpec{}
 	s.DeepCopyInto(cpy)
 	return cpy
 }
 
 // DeepCopyInto deep copies Spec into another Spec object
-func (s *PluginSpec) DeepCopyInto(dst *PluginSpec) {
+func (s *PluginMetaSpec) DeepCopyInto(dst *PluginMetaSpec) {
 	resource.CopyObjectInto(dst, s)
 }
 
-// DeepCopy creates a full deep copy of PluginStatus
-func (s *PluginStatus) DeepCopy() *PluginStatus {
-	cpy := &PluginStatus{}
+// DeepCopy creates a full deep copy of PluginMetaStatus
+func (s *PluginMetaStatus) DeepCopy() *PluginMetaStatus {
+	cpy := &PluginMetaStatus{}
 	s.DeepCopyInto(cpy)
 	return cpy
 }
 
-// DeepCopyInto deep copies PluginStatus into another PluginStatus object
-func (s *PluginStatus) DeepCopyInto(dst *PluginStatus) {
+// DeepCopyInto deep copies PluginMetaStatus into another PluginMetaStatus object
+func (s *PluginMetaStatus) DeepCopyInto(dst *PluginMetaStatus) {
 	resource.CopyObjectInto(dst, s)
 }

apps/plugins/pkg/apis/plugins/v0alpha1/pluginmeta_schema_gen.go

@@ -0,0 +1,34 @@
+//
+// Code generated by grafana-app-sdk. DO NOT EDIT.
+//
+
+package v0alpha1
+
+import (
+	"github.com/grafana/grafana-app-sdk/resource"
+)
+
+// schema is unexported to prevent accidental overwrites
+var (
+	schemaPluginMeta = resource.NewSimpleSchema("plugins.grafana.app", "v0alpha1", &PluginMeta{}, &PluginMetaList{}, resource.WithKind("PluginMeta"),
+		resource.WithPlural("pluginmetas"), resource.WithScope(resource.NamespacedScope))
+	kindPluginMeta = resource.Kind{
+		Schema: schemaPluginMeta,
+		Codecs: map[resource.KindEncoding]resource.Codec{
+			resource.KindEncodingJSON: &PluginMetaJSONCodec{},
+		},
+	}
+)
+
+// Kind returns a resource.Kind for this Schema with a JSON codec
+func PluginMetaKind() resource.Kind {
+	return kindPluginMeta
+}
+
+// Schema returns a resource.SimpleSchema representation of PluginMeta
+func PluginMetaSchema() *resource.SimpleSchema {
+	return schemaPluginMeta
+}
+
+// Interface compliance checks
+var _ resource.Schema = kindPluginMeta

apps/plugins/pkg/apis/plugins/v0alpha1/pluginmeta_spec_gen.go

@@ -0,0 +1,477 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v0alpha1
+
+import (
+	time "time"
+)
+
+// JSON configuration schema for Grafana plugins
+// Converted from: https://github.com/grafana/grafana/blob/main/docs/sources/developers/plugins/plugin.schema.json
+// +k8s:openapi-gen=true
+type PluginMetaJSONData struct {
+	// Unique name of the plugin
+	Id string `json:"id"`
+	// Plugin type
+	Type PluginMetaJSONDataType `json:"type"`
+	// Human-readable name of the plugin
+	Name string `json:"name"`
+	// Metadata for the plugin
+	Info PluginMetaInfo `json:"info"`
+	// Dependency information
+	Dependencies PluginMetaDependencies `json:"dependencies"`
+	// Optional fields
+	Alerting           *bool                         `json:"alerting,omitempty"`
+	Annotations        *bool                         `json:"annotations,omitempty"`
+	AutoEnabled        *bool                         `json:"autoEnabled,omitempty"`
+	Backend            *bool                         `json:"backend,omitempty"`
+	BuildMode          *string                       `json:"buildMode,omitempty"`
+	BuiltIn            *bool                         `json:"builtIn,omitempty"`
+	Category           *PluginMetaJSONDataCategory   `json:"category,omitempty"`
+	EnterpriseFeatures *PluginMetaEnterpriseFeatures `json:"enterpriseFeatures,omitempty"`
+	Executable         *string                       `json:"executable,omitempty"`
+	HideFromList       *bool                         `json:"hideFromList,omitempty"`
+	// +listType=atomic
+	Includes                  []PluginMetaInclude     `json:"includes,omitempty"`
+	Logs                      *bool                   `json:"logs,omitempty"`
+	Metrics                   *bool                   `json:"metrics,omitempty"`
+	MultiValueFilterOperators *bool                   `json:"multiValueFilterOperators,omitempty"`
+	PascalName                *string                 `json:"pascalName,omitempty"`
+	Preload                   *bool                   `json:"preload,omitempty"`
+	QueryOptions              *PluginMetaQueryOptions `json:"queryOptions,omitempty"`
+	// +listType=atomic
+	Routes        []PluginMetaRoute        `json:"routes,omitempty"`
+	SkipDataQuery *bool                    `json:"skipDataQuery,omitempty"`
+	State         *PluginMetaJSONDataState `json:"state,omitempty"`
+	Streaming     *bool                    `json:"streaming,omitempty"`
+	Tracing       *bool                    `json:"tracing,omitempty"`
+	Iam           *PluginMetaIAM           `json:"iam,omitempty"`
+	// +listType=atomic
+	Roles      []PluginMetaRole      `json:"roles,omitempty"`
+	Extensions *PluginMetaExtensions `json:"extensions,omitempty"`
+}
+
+// NewPluginMetaJSONData creates a new PluginMetaJSONData object.
+func NewPluginMetaJSONData() *PluginMetaJSONData {
+	return &PluginMetaJSONData{
+		Info:         *NewPluginMetaInfo(),
+		Dependencies: *NewPluginMetaDependencies(),
+	}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaInfo struct {
+	// Required fields
+	// +listType=set
+	Keywords []string                    `json:"keywords"`
+	Logos    PluginMetaV0alpha1InfoLogos `json:"logos"`
+	Updated  time.Time                   `json:"updated"`
+	Version  string                      `json:"version"`
+	// Optional fields
+	Author      *PluginMetaV0alpha1InfoAuthor `json:"author,omitempty"`
+	Description *string                       `json:"description,omitempty"`
+	// +listType=atomic
+	Links []PluginMetaV0alpha1InfoLinks `json:"links,omitempty"`
+	// +listType=atomic
+	Screenshots []PluginMetaV0alpha1InfoScreenshots `json:"screenshots,omitempty"`
+}
+
+// NewPluginMetaInfo creates a new PluginMetaInfo object.
+func NewPluginMetaInfo() *PluginMetaInfo {
+	return &PluginMetaInfo{
+		Keywords: []string{},
+		Logos:    *NewPluginMetaV0alpha1InfoLogos(),
+	}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaDependencies struct {
+	// Required field
+	GrafanaDependency string `json:"grafanaDependency"`
+	// Optional fields
+	GrafanaVersion *string `json:"grafanaVersion,omitempty"`
+	// +listType=set
+	// +listMapKey=id
+	Plugins    []PluginMetaV0alpha1DependenciesPlugins   `json:"plugins,omitempty"`
+	Extensions *PluginMetaV0alpha1DependenciesExtensions `json:"extensions,omitempty"`
+}
+
+// NewPluginMetaDependencies creates a new PluginMetaDependencies object.
+func NewPluginMetaDependencies() *PluginMetaDependencies {
+	return &PluginMetaDependencies{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaEnterpriseFeatures struct {
+	// Allow additional properties
+	HealthDiagnosticsErrors *bool `json:"healthDiagnosticsErrors,omitempty"`
+}
+
+// NewPluginMetaEnterpriseFeatures creates a new PluginMetaEnterpriseFeatures object.
+func NewPluginMetaEnterpriseFeatures() *PluginMetaEnterpriseFeatures {
+	return &PluginMetaEnterpriseFeatures{
+		HealthDiagnosticsErrors: (func(input bool) *bool { return &input })(false),
+	}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaInclude struct {
+	Uid        *string                `json:"uid,omitempty"`
+	Type       *PluginMetaIncludeType `json:"type,omitempty"`
+	Name       *string                `json:"name,omitempty"`
+	Component  *string                `json:"component,omitempty"`
+	Role       *PluginMetaIncludeRole `json:"role,omitempty"`
+	Action     *string                `json:"action,omitempty"`
+	Path       *string                `json:"path,omitempty"`
+	AddToNav   *bool                  `json:"addToNav,omitempty"`
+	DefaultNav *bool                  `json:"defaultNav,omitempty"`
+	Icon       *string                `json:"icon,omitempty"`
+}
+
+// NewPluginMetaInclude creates a new PluginMetaInclude object.
+func NewPluginMetaInclude() *PluginMetaInclude {
+	return &PluginMetaInclude{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaQueryOptions struct {
+	MaxDataPoints *bool `json:"maxDataPoints,omitempty"`
+	MinInterval   *bool `json:"minInterval,omitempty"`
+	CacheTimeout  *bool `json:"cacheTimeout,omitempty"`
+}
+
+// NewPluginMetaQueryOptions creates a new PluginMetaQueryOptions object.
+func NewPluginMetaQueryOptions() *PluginMetaQueryOptions {
+	return &PluginMetaQueryOptions{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaRoute struct {
+	Path        *string `json:"path,omitempty"`
+	Method      *string `json:"method,omitempty"`
+	Url         *string `json:"url,omitempty"`
+	ReqSignedIn *bool   `json:"reqSignedIn,omitempty"`
+	ReqRole     *string `json:"reqRole,omitempty"`
+	ReqAction   *string `json:"reqAction,omitempty"`
+	// +listType=atomic
+	Headers      []string                             `json:"headers,omitempty"`
+	Body         map[string]interface{}               `json:"body,omitempty"`
+	TokenAuth    *PluginMetaV0alpha1RouteTokenAuth    `json:"tokenAuth,omitempty"`
+	JwtTokenAuth *PluginMetaV0alpha1RouteJwtTokenAuth `json:"jwtTokenAuth,omitempty"`
+	// +listType=atomic
+	UrlParams []PluginMetaV0alpha1RouteUrlParams `json:"urlParams,omitempty"`
+}
+
+// NewPluginMetaRoute creates a new PluginMetaRoute object.
+func NewPluginMetaRoute() *PluginMetaRoute {
+	return &PluginMetaRoute{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaIAM struct {
+	// +listType=atomic
+	Permissions []PluginMetaV0alpha1IAMPermissions `json:"permissions,omitempty"`
+}
+
+// NewPluginMetaIAM creates a new PluginMetaIAM object.
+func NewPluginMetaIAM() *PluginMetaIAM {
+	return &PluginMetaIAM{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaRole struct {
+	Role *PluginMetaV0alpha1RoleRole `json:"role,omitempty"`
+	// +listType=set
+	Grants []string `json:"grants,omitempty"`
+}
+
+// NewPluginMetaRole creates a new PluginMetaRole object.
+func NewPluginMetaRole() *PluginMetaRole {
+	return &PluginMetaRole{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaExtensions struct {
+	// +listType=atomic
+	AddedComponents []PluginMetaV0alpha1ExtensionsAddedComponents `json:"addedComponents,omitempty"`
+	// +listType=atomic
+	AddedLinks []PluginMetaV0alpha1ExtensionsAddedLinks `json:"addedLinks,omitempty"`
+	// +listType=set
+	// +listMapKey=id
+	ExposedComponents []PluginMetaV0alpha1ExtensionsExposedComponents `json:"exposedComponents,omitempty"`
+	// +listType=set
+	// +listMapKey=id
+	ExtensionPoints []PluginMetaV0alpha1ExtensionsExtensionPoints `json:"extensionPoints,omitempty"`
+}
+
+// NewPluginMetaExtensions creates a new PluginMetaExtensions object.
+func NewPluginMetaExtensions() *PluginMetaExtensions {
+	return &PluginMetaExtensions{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaSpec struct {
+	PluginJSON PluginMetaJSONData `json:"pluginJSON"`
+}
+
+// NewPluginMetaSpec creates a new PluginMetaSpec object.
+func NewPluginMetaSpec() *PluginMetaSpec {
+	return &PluginMetaSpec{
+		PluginJSON: *NewPluginMetaJSONData(),
+	}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1InfoLogos struct {
+	Small string `json:"small"`
+	Large string `json:"large"`
+}
+
+// NewPluginMetaV0alpha1InfoLogos creates a new PluginMetaV0alpha1InfoLogos object.
+func NewPluginMetaV0alpha1InfoLogos() *PluginMetaV0alpha1InfoLogos {
+	return &PluginMetaV0alpha1InfoLogos{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1InfoAuthor struct {
+	Name  *string `json:"name,omitempty"`
+	Email *string `json:"email,omitempty"`
+	Url   *string `json:"url,omitempty"`
+}
+
+// NewPluginMetaV0alpha1InfoAuthor creates a new PluginMetaV0alpha1InfoAuthor object.
+func NewPluginMetaV0alpha1InfoAuthor() *PluginMetaV0alpha1InfoAuthor {
+	return &PluginMetaV0alpha1InfoAuthor{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1InfoLinks struct {
+	Name *string `json:"name,omitempty"`
+	Url  *string `json:"url,omitempty"`
+}
+
+// NewPluginMetaV0alpha1InfoLinks creates a new PluginMetaV0alpha1InfoLinks object.
+func NewPluginMetaV0alpha1InfoLinks() *PluginMetaV0alpha1InfoLinks {
+	return &PluginMetaV0alpha1InfoLinks{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1InfoScreenshots struct {
+	Name *string `json:"name,omitempty"`
+	Path *string `json:"path,omitempty"`
+}
+
+// NewPluginMetaV0alpha1InfoScreenshots creates a new PluginMetaV0alpha1InfoScreenshots object.
+func NewPluginMetaV0alpha1InfoScreenshots() *PluginMetaV0alpha1InfoScreenshots {
+	return &PluginMetaV0alpha1InfoScreenshots{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1DependenciesPlugins struct {
+	Id   string                                    `json:"id"`
+	Type PluginMetaV0alpha1DependenciesPluginsType `json:"type"`
+	Name string                                    `json:"name"`
+}
+
+// NewPluginMetaV0alpha1DependenciesPlugins creates a new PluginMetaV0alpha1DependenciesPlugins object.
+func NewPluginMetaV0alpha1DependenciesPlugins() *PluginMetaV0alpha1DependenciesPlugins {
+	return &PluginMetaV0alpha1DependenciesPlugins{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1DependenciesExtensions struct {
+	// +listType=set
+	ExposedComponents []string `json:"exposedComponents,omitempty"`
+}
+
+// NewPluginMetaV0alpha1DependenciesExtensions creates a new PluginMetaV0alpha1DependenciesExtensions object.
+func NewPluginMetaV0alpha1DependenciesExtensions() *PluginMetaV0alpha1DependenciesExtensions {
+	return &PluginMetaV0alpha1DependenciesExtensions{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1RouteTokenAuth struct {
+	Url *string `json:"url,omitempty"`
+	// +listType=set
+	Scopes []string               `json:"scopes,omitempty"`
+	Params map[string]interface{} `json:"params,omitempty"`
+}
+
+// NewPluginMetaV0alpha1RouteTokenAuth creates a new PluginMetaV0alpha1RouteTokenAuth object.
+func NewPluginMetaV0alpha1RouteTokenAuth() *PluginMetaV0alpha1RouteTokenAuth {
+	return &PluginMetaV0alpha1RouteTokenAuth{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1RouteJwtTokenAuth struct {
+	Url *string `json:"url,omitempty"`
+	// +listType=set
+	Scopes []string               `json:"scopes,omitempty"`
+	Params map[string]interface{} `json:"params,omitempty"`
+}
+
+// NewPluginMetaV0alpha1RouteJwtTokenAuth creates a new PluginMetaV0alpha1RouteJwtTokenAuth object.
+func NewPluginMetaV0alpha1RouteJwtTokenAuth() *PluginMetaV0alpha1RouteJwtTokenAuth {
+	return &PluginMetaV0alpha1RouteJwtTokenAuth{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1RouteUrlParams struct {
+	Name    *string `json:"name,omitempty"`
+	Content *string `json:"content,omitempty"`
+}
+
+// NewPluginMetaV0alpha1RouteUrlParams creates a new PluginMetaV0alpha1RouteUrlParams object.
+func NewPluginMetaV0alpha1RouteUrlParams() *PluginMetaV0alpha1RouteUrlParams {
+	return &PluginMetaV0alpha1RouteUrlParams{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1IAMPermissions struct {
+	Action *string `json:"action,omitempty"`
+	Scope  *string `json:"scope,omitempty"`
+}
+
+// NewPluginMetaV0alpha1IAMPermissions creates a new PluginMetaV0alpha1IAMPermissions object.
+func NewPluginMetaV0alpha1IAMPermissions() *PluginMetaV0alpha1IAMPermissions {
+	return &PluginMetaV0alpha1IAMPermissions{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1RoleRolePermissions struct {
+	Action *string `json:"action,omitempty"`
+	Scope  *string `json:"scope,omitempty"`
+}
+
+// NewPluginMetaV0alpha1RoleRolePermissions creates a new PluginMetaV0alpha1RoleRolePermissions object.
+func NewPluginMetaV0alpha1RoleRolePermissions() *PluginMetaV0alpha1RoleRolePermissions {
+	return &PluginMetaV0alpha1RoleRolePermissions{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1RoleRole struct {
+	Name        *string `json:"name,omitempty"`
+	Description *string `json:"description,omitempty"`
+	// +listType=atomic
+	Permissions []PluginMetaV0alpha1RoleRolePermissions `json:"permissions,omitempty"`
+}
+
+// NewPluginMetaV0alpha1RoleRole creates a new PluginMetaV0alpha1RoleRole object.
+func NewPluginMetaV0alpha1RoleRole() *PluginMetaV0alpha1RoleRole {
+	return &PluginMetaV0alpha1RoleRole{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1ExtensionsAddedComponents struct {
+	// +listType=set
+	Targets     []string `json:"targets"`
+	Title       string   `json:"title"`
+	Description *string  `json:"description,omitempty"`
+}
+
+// NewPluginMetaV0alpha1ExtensionsAddedComponents creates a new PluginMetaV0alpha1ExtensionsAddedComponents object.
+func NewPluginMetaV0alpha1ExtensionsAddedComponents() *PluginMetaV0alpha1ExtensionsAddedComponents {
+	return &PluginMetaV0alpha1ExtensionsAddedComponents{
+		Targets: []string{},
+	}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1ExtensionsAddedLinks struct {
+	// +listType=set
+	Targets     []string `json:"targets"`
+	Title       string   `json:"title"`
+	Description *string  `json:"description,omitempty"`
+}
+
+// NewPluginMetaV0alpha1ExtensionsAddedLinks creates a new PluginMetaV0alpha1ExtensionsAddedLinks object.
+func NewPluginMetaV0alpha1ExtensionsAddedLinks() *PluginMetaV0alpha1ExtensionsAddedLinks {
+	return &PluginMetaV0alpha1ExtensionsAddedLinks{
+		Targets: []string{},
+	}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1ExtensionsExposedComponents struct {
+	Id          string  `json:"id"`
+	Title       *string `json:"title,omitempty"`
+	Description *string `json:"description,omitempty"`
+}
+
+// NewPluginMetaV0alpha1ExtensionsExposedComponents creates a new PluginMetaV0alpha1ExtensionsExposedComponents object.
+func NewPluginMetaV0alpha1ExtensionsExposedComponents() *PluginMetaV0alpha1ExtensionsExposedComponents {
+	return &PluginMetaV0alpha1ExtensionsExposedComponents{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1ExtensionsExtensionPoints struct {
+	Id          string  `json:"id"`
+	Title       *string `json:"title,omitempty"`
+	Description *string `json:"description,omitempty"`
+}
+
+// NewPluginMetaV0alpha1ExtensionsExtensionPoints creates a new PluginMetaV0alpha1ExtensionsExtensionPoints object.
+func NewPluginMetaV0alpha1ExtensionsExtensionPoints() *PluginMetaV0alpha1ExtensionsExtensionPoints {
+	return &PluginMetaV0alpha1ExtensionsExtensionPoints{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaJSONDataType string
+
+const (
+	PluginMetaJSONDataTypeApp        PluginMetaJSONDataType = "app"
+	PluginMetaJSONDataTypeDatasource PluginMetaJSONDataType = "datasource"
+	PluginMetaJSONDataTypePanel      PluginMetaJSONDataType = "panel"
+	PluginMetaJSONDataTypeRenderer   PluginMetaJSONDataType = "renderer"
+)
+
+// +k8s:openapi-gen=true
+type PluginMetaJSONDataCategory string
+
+const (
+	PluginMetaJSONDataCategoryTsdb       PluginMetaJSONDataCategory = "tsdb"
+	PluginMetaJSONDataCategoryLogging    PluginMetaJSONDataCategory = "logging"
+	PluginMetaJSONDataCategoryCloud      PluginMetaJSONDataCategory = "cloud"
+	PluginMetaJSONDataCategoryTracing    PluginMetaJSONDataCategory = "tracing"
+	PluginMetaJSONDataCategoryProfiling  PluginMetaJSONDataCategory = "profiling"
+	PluginMetaJSONDataCategorySql        PluginMetaJSONDataCategory = "sql"
+	PluginMetaJSONDataCategoryEnterprise PluginMetaJSONDataCategory = "enterprise"
+	PluginMetaJSONDataCategoryIot        PluginMetaJSONDataCategory = "iot"
+	PluginMetaJSONDataCategoryOther      PluginMetaJSONDataCategory = "other"
+)
+
+// +k8s:openapi-gen=true
+type PluginMetaJSONDataState string
+
+const (
+	PluginMetaJSONDataStateAlpha PluginMetaJSONDataState = "alpha"
+	PluginMetaJSONDataStateBeta  PluginMetaJSONDataState = "beta"
+)
+
+// +k8s:openapi-gen=true
+type PluginMetaIncludeType string
+
+const (
+	PluginMetaIncludeTypeDashboard  PluginMetaIncludeType = "dashboard"
+	PluginMetaIncludeTypePage       PluginMetaIncludeType = "page"
+	PluginMetaIncludeTypePanel      PluginMetaIncludeType = "panel"
+	PluginMetaIncludeTypeDatasource PluginMetaIncludeType = "datasource"
+)
+
+// +k8s:openapi-gen=true
+type PluginMetaIncludeRole string
+
+const (
+	PluginMetaIncludeRoleAdmin  PluginMetaIncludeRole = "Admin"
+	PluginMetaIncludeRoleEditor PluginMetaIncludeRole = "Editor"
+	PluginMetaIncludeRoleViewer PluginMetaIncludeRole = "Viewer"
+)
+
+// +k8s:openapi-gen=true
+type PluginMetaV0alpha1DependenciesPluginsType string
+
+const (
+	PluginMetaV0alpha1DependenciesPluginsTypeApp        PluginMetaV0alpha1DependenciesPluginsType = "app"
+	PluginMetaV0alpha1DependenciesPluginsTypeDatasource PluginMetaV0alpha1DependenciesPluginsType = "datasource"
+	PluginMetaV0alpha1DependenciesPluginsTypePanel      PluginMetaV0alpha1DependenciesPluginsType = "panel"
+)

apps/plugins/pkg/apis/plugins/v0alpha1/pluginmeta_status_gen.go

@@ -0,0 +1,44 @@
+// Code generated - EDITING IS FUTILE. DO NOT EDIT.
+
+package v0alpha1
+
+// +k8s:openapi-gen=true
+type PluginMetastatusOperatorState struct {
+	// lastEvaluation is the ResourceVersion last evaluated
+	LastEvaluation string `json:"lastEvaluation"`
+	// state describes the state of the lastEvaluation.
+	// It is limited to three possible states for machine evaluation.
+	State PluginMetaStatusOperatorStateState `json:"state"`
+	// descriptiveState is an optional more descriptive state field which has no requirements on format
+	DescriptiveState *string `json:"descriptiveState,omitempty"`
+	// details contains any extra information that is operator-specific
+	Details map[string]interface{} `json:"details,omitempty"`
+}
+
+// NewPluginMetastatusOperatorState creates a new PluginMetastatusOperatorState object.
+func NewPluginMetastatusOperatorState() *PluginMetastatusOperatorState {
+	return &PluginMetastatusOperatorState{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaStatus struct {
+	// operatorStates is a map of operator ID to operator state evaluations.
+	// Any operator which consumes this kind SHOULD add its state evaluation information to this field.
+	OperatorStates map[string]PluginMetastatusOperatorState `json:"operatorStates,omitempty"`
+	// additionalFields is reserved for future use
+	AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
+}
+
+// NewPluginMetaStatus creates a new PluginMetaStatus object.
+func NewPluginMetaStatus() *PluginMetaStatus {
+	return &PluginMetaStatus{}
+}
+
+// +k8s:openapi-gen=true
+type PluginMetaStatusOperatorStateState string
+
+const (
+	PluginMetaStatusOperatorStateStateSuccess    PluginMetaStatusOperatorStateState = "success"
+	PluginMetaStatusOperatorStateStateInProgress PluginMetaStatusOperatorStateState = "in_progress"
+	PluginMetaStatusOperatorStateStateFailed     PluginMetaStatusOperatorStateState = "failed"
+)

apps/plugins/pkg/app/app.go

@@ -2,11 +2,8 @@ package app
 
 import (
 	"context"
-	"net/http"
 
 	"github.com/grafana/grafana-app-sdk/app"
-	"github.com/grafana/grafana-app-sdk/k8s"
-	"github.com/grafana/grafana-app-sdk/logging"
 	"github.com/grafana/grafana-app-sdk/operator"
 	"github.com/grafana/grafana-app-sdk/resource"
 	"github.com/grafana/grafana-app-sdk/simple"
@@ -14,15 +11,16 @@ import (
 	"k8s.io/klog/v2"
 
 	pluginsapi "github.com/grafana/grafana/apps/plugins/pkg/apis"
-	pluginsv0alpha1 "github.com/grafana/grafana/apps/plugins/pkg/apis/plugins/v0alpha1"
 )
 
 func New(cfg app.Config) (app.App, error) {
-	cfg.KubeConfig.APIPath = "apis"
-	clientGenerator := k8s.NewClientRegistry(cfg.KubeConfig, k8s.DefaultClientConfig())
-	client, err := pluginsv0alpha1.NewPluginClientFromGenerator(clientGenerator)
-	if err != nil {
-		return nil, err
+	managedKinds := []simple.AppManagedKind{}
+	for _, kinds := range GetKinds() {
+		for _, k := range kinds {
+			managedKinds = append(managedKinds, simple.AppManagedKind{
+				Kind: k,
+			})
+		}
 	}
 
 	simpleConfig := simple.AppConfig{
@@ -35,32 +33,7 @@ func New(cfg app.Config) (app.App, error) {
 				},
 			},
 		},
-		ManagedKinds: []simple.AppManagedKind{
-			{
-				Kind: pluginsv0alpha1.PluginKind(),
-				CustomRoutes: simple.AppCustomRouteHandlers{
-					simple.AppCustomRoute{
-						Method: http.MethodGet,
-						Path:   "meta",
-					}: func(ctx context.Context, w app.CustomRouteResponseWriter, req *app.CustomRouteRequest) error {
-						plugin, err := client.Get(ctx, resource.Identifier{
-							Namespace: req.ResourceIdentifier.Namespace,
-							Name:      req.ResourceIdentifier.Name,
-						})
-						if err != nil {
-							return err
-						}
-						logging.DefaultLogger.Debug("fetched plugin", "plugin", plugin)
-						// TODO: Implement this in future PR
-						w.WriteHeader(http.StatusNotImplemented)
-						if _, err := w.Write([]byte("Not implemented")); err != nil {
-							return err
-						}
-						return nil
-					},
-				},
-			},
-		},
+		ManagedKinds: managedKinds,
 	}
 
 	a, err := simple.NewApp(simpleConfig)