diff --git a/.betterer.results b/.betterer.results
index 3b87f1e2d7781..051b248f9299d 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -689,6 +689,11 @@ exports[`better eslint`] = {
       [0, 0, 0, "Styles should be written using objects.", "2"],
       [0, 0, 0, "Styles should be written using objects.", "3"]
     ],
+    "packages/grafana-plugin-configs/webpack.config.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+    ],
     "packages/grafana-runtime/src/analytics/types.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -1756,11 +1761,6 @@ exports[`better eslint`] = {
     "public/app/features/admin/UserSessions.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"]
     ],
-    "public/app/features/admin/Users/OrgUnits.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
     "public/app/features/alerting/AlertTab.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
@@ -2999,6 +2999,9 @@ exports[`better eslint`] = {
     "public/app/features/dashboard-scene/inspect/InspectJsonTab.tsx:5381": [
       [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
     ],
+    "public/app/features/dashboard-scene/scene/setDashboardPanelContext.test.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
     "public/app/features/dashboard-scene/serialization/angularMigration.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
@@ -3109,14 +3112,13 @@ exports[`better eslint`] = {
     ],
     "public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Do not use any type assertions.", "3"],
       [0, 0, 0, "Do not use any type assertions.", "4"],
-      [0, 0, 0, "Do not use any type assertions.", "5"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "6"],
-      [0, 0, 0, "Do not use any type assertions.", "7"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "8"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"],
+      [0, 0, 0, "Do not use any type assertions.", "6"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "7"]
     ],
     "public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -3249,11 +3251,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "4"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
     ],
-    "public/app/features/dashboard/components/PublicDashboardFooter/PublicDashboardsFooter.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
-    ],
     "public/app/features/dashboard/components/PublicDashboardNotAvailable/PublicDashboardNotAvailable.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
       [0, 0, 0, "Styles should be written using objects.", "1"],
@@ -3364,23 +3361,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "2"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
       [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"],
-      [0, 0, 0, "Styles should be written using objects.", "11"],
-      [0, 0, 0, "Styles should be written using objects.", "12"],
-      [0, 0, 0, "Styles should be written using objects.", "13"],
-      [0, 0, 0, "Styles should be written using objects.", "14"],
-      [0, 0, 0, "Styles should be written using objects.", "15"],
-      [0, 0, 0, "Styles should be written using objects.", "16"],
-      [0, 0, 0, "Styles should be written using objects.", "17"],
-      [0, 0, 0, "Styles should be written using objects.", "18"],
-      [0, 0, 0, "Styles should be written using objects.", "19"],
-      [0, 0, 0, "Styles should be written using objects.", "20"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "21"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
     ],
     "public/app/features/dashboard/components/VersionHistory/DiffGroup.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -3547,13 +3528,8 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "23"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "24"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "25"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "26"],
-      [0, 0, 0, "Do not use any type assertions.", "27"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "28"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "29"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "30"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "31"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "32"]
+      [0, 0, 0, "Do not use any type assertions.", "26"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "27"]
     ],
     "public/app/features/dashboard/state/PanelModel.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -3794,10 +3770,8 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "public/app/features/explore/Explore.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"]
+    "public/app/features/explore/ContentOutline/ContentOutline.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
     "public/app/features/explore/ExploreDrawer.tsx:5381": [
       [0, 0, 0, "Styles should be written using objects.", "0"],
@@ -5213,9 +5187,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
       [0, 0, 0, "Do not use any type assertions.", "15"]
     ],
-    "public/app/features/transformers/FilterByValueTransformer/FilterByValueTransformerEditor.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
     "public/app/features/transformers/FilterByValueTransformer/ValueMatchers/BasicMatcherEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -6706,7 +6677,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "11"]
     ],
-    "public/app/plugins/datasource/prometheus/datasource.tsx:5381": [
+    "public/app/plugins/datasource/prometheus/datasource.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
@@ -7274,39 +7245,10 @@ exports[`better eslint`] = {
     "public/app/plugins/panel/gauge/GaugeMigrations.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/plugins/panel/geomap/GeomapOverlay.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"]
-    ],
-    "public/app/plugins/panel/geomap/GeomapPanel.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"]
-    ],
-    "public/app/plugins/panel/geomap/components/DebugOverlay.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
-    ],
     "public/app/plugins/panel/geomap/components/MarkersLegend.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"],
-      [0, 0, 0, "Styles should be written using objects.", "7"],
-      [0, 0, 0, "Styles should be written using objects.", "8"],
-      [0, 0, 0, "Styles should be written using objects.", "9"],
-      [0, 0, 0, "Styles should be written using objects.", "10"]
-    ],
-    "public/app/plugins/panel/geomap/components/MeasureOverlay.tsx:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"],
-      [0, 0, 0, "Styles should be written using objects.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
     ],
     "public/app/plugins/panel/geomap/editor/GeomapStyleRulesEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -7328,15 +7270,7 @@ exports[`better eslint`] = {
     ],
     "public/app/plugins/panel/geomap/editor/StyleRuleEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Styles should be written using objects.", "2"],
-      [0, 0, 0, "Styles should be written using objects.", "3"],
-      [0, 0, 0, "Styles should be written using objects.", "4"],
-      [0, 0, 0, "Styles should be written using objects.", "5"],
-      [0, 0, 0, "Styles should be written using objects.", "6"]
-    ],
-    "public/app/plugins/panel/geomap/globalStyles.ts:5381": [
-      [0, 0, 0, "Styles should be written using objects.", "0"]
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/plugins/panel/geomap/layers/basemaps/esri.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
diff --git a/.drone.yml b/.drone.yml
index 9af5f9fb069a9..8af3f0826ad7f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -542,37 +542,6 @@ steps:
     NODE_OPTIONS: --max_old_space_size=8192
   image: node:18.12.0-alpine
   name: build-frontend-packages
-- commands:
-  - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
-    --depth=1
-  - cd grafana-enterprise
-  - git fetch origin "refs/tags/*:refs/tags/*" --quiet
-  - if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git
-    push --delete origin $${TEST_TAG}; fi
-  - git tag $${TEST_TAG} && git push origin $${TEST_TAG}
-  - cd -
-  - git fetch https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git "refs/tags/*:refs/tags/*"
-    --quiet && git fetch --quiet
-  - if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git
-    push --delete https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG};
-    fi
-  - git tag $${TEST_TAG} && git push https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git
-    $${TEST_TAG}
-  environment:
-    GITHUB_TOKEN:
-      from_secret: github_token
-    TEST_TAG: v0.0.0-test
-  failure: ignore
-  image: alpine/git:2.40.1
-  name: trigger-test-release
-  when:
-    branch: main
-    paths:
-      include:
-      - .drone.yml
-      - pkg/build/**
-    repo:
-    - grafana/grafana
 - failure: ignore
   image: grafana/drone-downstream
   name: trigger-enterprise-downstream
@@ -831,7 +800,7 @@ services:
   - /bin/mimir -target=backend
   environment: {}
   image: grafana/mimir:latest
-  name: mimir
+  name: mimir_backend
 - environment: {}
   image: redis:6.2.11-alpine
   name: redis
@@ -997,16 +966,20 @@ steps:
   image: golang:1.20.10-alpine
   name: memcached-integration-tests
 - commands:
-  - dockerize -wait tcp://mimir:8080 -timeout 120s
+  - dockerize -wait tcp://mimir_backend:8080 -timeout 120s
   image: jwilder/dockerize:0.6.1
   name: wait-for-remote-alertmanager
 - commands:
   - apk add --update build-base
   - go clean -testcache
-  - go test -run IntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/...
+  - go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/notifier/...
   depends_on:
   - wire-install
   - wait-for-remote-alertmanager
+  environment:
+    AM_PASSWORD: test
+    AM_TENANT_ID: test
+    AM_URL: http://mimir_backend:8080
   image: golang:1.20.10-alpine
   name: remote-alertmanager-integration-tests
 trigger:
@@ -1209,7 +1182,7 @@ services:
   - /bin/mimir -target=backend
   environment: {}
   image: grafana/mimir:latest
-  name: mimir
+  name: mimir_backend
 - environment: {}
   image: redis:6.2.11-alpine
   name: redis
@@ -2134,7 +2107,7 @@ services:
   - /bin/mimir -target=backend
   environment: {}
   image: grafana/mimir:latest
-  name: mimir
+  name: mimir_backend
 - environment: {}
   image: redis:6.2.11-alpine
   name: redis
@@ -2279,16 +2252,20 @@ steps:
   image: golang:1.20.10-alpine
   name: memcached-integration-tests
 - commands:
-  - dockerize -wait tcp://mimir:8080 -timeout 120s
+  - dockerize -wait tcp://mimir_backend:8080 -timeout 120s
   image: jwilder/dockerize:0.6.1
   name: wait-for-remote-alertmanager
 - commands:
   - apk add --update build-base
   - go clean -testcache
-  - go test -run IntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/...
+  - go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/notifier/...
   depends_on:
   - wire-install
   - wait-for-remote-alertmanager
+  environment:
+    AM_PASSWORD: test
+    AM_TENANT_ID: test
+    AM_URL: http://mimir_backend:8080
   image: golang:1.20.10-alpine
   name: remote-alertmanager-integration-tests
 trigger:
@@ -2363,38 +2340,6 @@ volumes:
     path: //./pipe/docker_engine/
   name: docker
 ---
-clone:
-  retries: 3
-depends_on: []
-kind: pipeline
-name: notify-drone-changes
-platform:
-  arch: amd64
-  os: linux
-steps:
-- image: plugins/slack
-  name: slack
-  settings:
-    channel: slack-webhooks-test
-    template: "`.drone.yml` and `starlark` files have been changed on the OSS repo,
-      by: {{build.author}}. \nBranch: <https://github.com/{{ repo.owner }}/{{ repo.name
-      }}/commits/{{ build.branch }}|{{ build.branch }}>\nCommit hash: <https://github.com/{{repo.owner}}/{{repo.name}}/commit/{{build.commit}}|{{
-      truncate build.commit 8 }}>"
-    webhook:
-      from_secret: drone-changes-webhook
-trigger:
-  branch: main
-  event:
-  - push
-  paths:
-    exclude:
-    - exclude
-    include:
-    - .drone.yml
-  repo:
-  - grafana/grafana
-type: docker
----
 clone:
   retries: 3
 depends_on:
@@ -3143,14 +3088,12 @@ services: []
 steps:
 - commands:
   - echo $env:DRONE_RUNNER_NAME
-  failure: ignore
   image: mcr.microsoft.com/windows:1809
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
   - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/windows/grabpl.exe
     -OutFile grabpl.exe
-  failure: ignore
   image: grafana/ci-wix:0.1.1
   name: windows-init
 - commands:
@@ -3175,7 +3118,6 @@ steps:
       from_secret: github_token
     PRERELEASE_BUCKET:
       from_secret: prerelease_bucket
-  failure: ignore
   image: grafana/ci-wix:0.1.1
   name: build-windows-installer
 trigger:
@@ -3825,7 +3767,7 @@ services:
   - /bin/mimir -target=backend
   environment: {}
   image: grafana/mimir:latest
-  name: mimir
+  name: mimir_backend
 - environment: {}
   image: redis:6.2.11-alpine
   name: redis
@@ -3963,16 +3905,20 @@ steps:
   image: golang:1.20.10-alpine
   name: memcached-integration-tests
 - commands:
-  - dockerize -wait tcp://mimir:8080 -timeout 120s
+  - dockerize -wait tcp://mimir_backend:8080 -timeout 120s
   image: jwilder/dockerize:0.6.1
   name: wait-for-remote-alertmanager
 - commands:
   - apk add --update build-base
   - go clean -testcache
-  - go test -run IntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/...
+  - go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/notifier/...
   depends_on:
   - wire-install
   - wait-for-remote-alertmanager
+  environment:
+    AM_PASSWORD: test
+    AM_TENANT_ID: test
+    AM_URL: http://mimir_backend:8080
   image: golang:1.20.10-alpine
   name: remote-alertmanager-integration-tests
 trigger:
@@ -4661,6 +4607,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: efc8706531a40b72753d483d3d8a7ba4941b5f54e0b21a68bcf47556a97a9ede
+hmac: a7032573772937b59787f5c01c113b02afb07a9febf15664a68cbcee1458acc9
 
 ...
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5aa99db1f04ee..b7e4f1e67d122 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -187,6 +187,7 @@
 /devenv/docker/blocks/maildev/ @grafana/alerting-frontend
 /devenv/docker/blocks/mariadb/ @grafana/grafana-bi-squad
 /devenv/docker/blocks/memcached/ @grafana/backend-platform
+/devenv/docker/blocks/mimir_backend/ @grafana/alerting-backend-product
 /devenv/docker/blocks/mssql/ @grafana/grafana-bi-squad
 /devenv/docker/blocks/mssql_arm64/ @grafana/grafana-bi-squad
 /devenv/docker/blocks/mssql_tests/ @grafana/grafana-bi-squad
@@ -506,6 +507,7 @@ cypress.config.js @grafana/grafana-frontend-platform
 /scripts/trigger_windows_build.sh @grafana/grafana-delivery
 /scripts/cleanup-husky.sh @grafana/frontend-ops
 /scripts/verify-repo-update/ @grafana/grafana-delivery
+scripts/generate-icon-bundle.js @grafana/plugins-platform-frontend @grafana/grafana-frontend-platform
 
 /scripts/webpack/ @grafana/frontend-ops
 /scripts/generate-a11y-report.sh @grafana/grafana-frontend-platform
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 2908208124703..6f64cde93fdf8 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -18,7 +18,7 @@
     "@locker/near-membrane-shared", // critical library. we need to bump this only intentionally
     "@locker/near-membrane-shared-dom", // critical library. we need to bump this only intentionally
   ],
-  "includePaths": ["package.json", "packages/**"],
+  "includePaths": ["package.json", "packages/**", "public/app/plugins/**"],
   "ignorePaths": ["emails/**", "plugins-bundled/**", "**/mocks/**"],
   "labels": ["area/frontend", "dependencies", "no-backport", "no-changelog"],
   "postUpdateOptions": ["yarnDedupeHighest"],
diff --git a/.gitignore b/.gitignore
index e7580cc5fb814..b8b8a3ffed0bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,7 @@ tsconfig.tsbuildinfo
 __debug_bin*
 
 # Yarn
-.yarn/*
+.yarn/
 !.yarn/patches
 !.yarn/releases
 !.yarn/plugins
@@ -200,3 +200,6 @@ deployment_tools_config.json
 
 # Temporary file for backporting PRs
 .pr-body.txt
+
+# Core plugin builds
+public/app/plugins/**/dist/
\ No newline at end of file
diff --git a/.yarn/sdks/eslint/package.json b/.yarn/sdks/eslint/package.json
index 06e74e37b48f7..0f987e359a811 100644
--- a/.yarn/sdks/eslint/package.json
+++ b/.yarn/sdks/eslint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "8.44.0-sdk",
+  "version": "8.51.0-sdk",
   "main": "./lib/api.js",
   "type": "commonjs"
 }
diff --git a/Dockerfile b/Dockerfile
index 22e1f1025839c..fc73ee1d659cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,6 +18,7 @@ COPY package.json yarn.lock .yarnrc.yml ./
 COPY .yarn .yarn
 COPY packages packages
 COPY plugins-bundled plugins-bundled
+COPY public public
 
 RUN yarn install --immutable
 
diff --git a/Makefile b/Makefile
index 54287b0ff0951..114f0e5c29c7c 100644
--- a/Makefile
+++ b/Makefile
@@ -164,6 +164,13 @@ test-go-integration: ## Run integration tests for backend with flags.
 	@echo "test backend integration tests"
 	$(GO) test -count=1 -run "^TestIntegration" -covermode=atomic -timeout=5m $(GO_INTEGRATION_TESTS)
 
+.PHONY: test-go-integration-alertmanager
+test-go-integration-alertmanager: ## Run integration tests for the remote alertmanager (config taken from the mimir_backend block).
+	@echo "test remote alertmanager integration tests"
+	$(GO) clean -testcache
+	AM_URL=http://localhost:8080 AM_TENANT_ID=test AM_PASSWORD=test \
+	$(GO) test -count=1 -run "^TestIntegrationRemoteAlertmanager" -covermode=atomic -timeout=5m ./pkg/services/ngalert/notifier/...
+
 .PHONY: test-go-integration-postgres
 test-go-integration-postgres: devenv-postgres ## Run integration tests for postgres backend with flags.
 	@echo "test backend integration postgres tests"
diff --git a/contribute/create-pull-request.md b/contribute/create-pull-request.md
index b5b70abd56945..7fe1023a8979e 100644
--- a/contribute/create-pull-request.md
+++ b/contribute/create-pull-request.md
@@ -8,7 +8,7 @@ We know you're excited to create your first pull request. Before we get started,
 
 - Learn how to start [Contributing to Grafana](/CONTRIBUTING.md).
 - Make sure your code follows the relevant [style guides](/contribute/style-guides).
-- It's recommened you [set up precommit hooks](/contribute/developer-guide.md) to auto-format when you commit
+- It's recommended you [set up precommit hooks](/contribute/developer-guide.md) to auto-format when you commit
 
 ## Your first pull request
 
diff --git a/contribute/feature-toggles.md b/contribute/feature-toggles.md
index 26d13d3847e82..79e0178392da5 100644
--- a/contribute/feature-toggles.md
+++ b/contribute/feature-toggles.md
@@ -5,7 +5,7 @@ This guide helps you get started adding your feature behind a feature flag in Gr
 ## Steps to adding a feature toggle
 
 1. Define the feature toggle in [registry.go](../pkg/services/featuremgmt/registry.go). To see what each feature stage means, look at the comments [here](../pkg/services/featuremgmt/features.go). If you are a community member, use the [CODEOWNERS](../.github/CODEOWNERS) file to determine which team owns the package you are updating.
-2. Run the go tests mentioned at the top of [this file](../pkg/services/featuremgmt/toggles_gen.go). This will generate all the additional files needed: `toggles_gen` for the backend, `grafana-data` for the frontend, and docs. You can run the test by running `go test ./pkg/services/featuremgmt/...`. This will say the tests failed the first time, but it will have generated the right code. If you re-run the testss, it will pass.
+2. Run the go tests mentioned at the top of [this file](../pkg/services/featuremgmt/toggles_gen.go). This will generate all the additional files needed: `toggles_gen` for the backend, `grafana-data` for the frontend, and docs. You can run the test by running `go test ./pkg/services/featuremgmt/...`. This will say the tests failed the first time, but it will have generated the right code. If you re-run the tests, it will pass.
 
 ## How to use it in the code
 
diff --git a/contribute/merge-pull-request.md b/contribute/merge-pull-request.md
index e58947d94ff0f..ac81ef130ce48 100644
--- a/contribute/merge-pull-request.md
+++ b/contribute/merge-pull-request.md
@@ -48,7 +48,7 @@ Instead, when it is merged & closed then a bot will look for the most appropriat
 
 That milestone should always reflect the branch that the pull request is merged into.
 For every major and minor release there is a milestone ending with `.x` (e.g. `10.0.x` for the 10.0.x releases).
-Pull requests targetting `main` should use the `.x` milestone of the next minor (or major) version (you can find that version number inside the `package.json` file).
+Pull requests targeting `main` should use the `.x` milestone of the next minor (or major) version (you can find that version number inside the `package.json` file).
 Backport pull requests should use the version of the target branch (e.g. `9.4.x` for the `v9.4.x` branch).
 
 ### Include in changelog and release notes?
diff --git a/contribute/style-guides/themes.md b/contribute/style-guides/themes.md
index f6118bd1d2375..5d4a2e0f877bb 100644
--- a/contribute/style-guides/themes.md
+++ b/contribute/style-guides/themes.md
@@ -126,7 +126,7 @@ For font family, font sizes and line heights use the variables under `theme.typo
 #### Using `ThemeContext` directly
 
 ```tsx
-import { ThemeContext } from '@grafana/ui';
+import { ThemeContext } from '@grafana/data';
 
 <ThemeContext.Consumer>{(theme) => <Foo theme={theme} />}</ThemeContext.Consumer>;
 ```
diff --git a/devenv/dev-dashboards/panel-table/table_tests_new.json b/devenv/dev-dashboards/panel-table/table_tests_new.json
index d3dfb294fb166..ba7632bc5f569 100644
--- a/devenv/dev-dashboards/panel-table/table_tests_new.json
+++ b/devenv/dev-dashboards/panel-table/table_tests_new.json
@@ -393,6 +393,10 @@
                 "value": {
                   "mode": "continuous-GrYlRd"
                 }
+              },
+              {
+                "id": "unit",
+                "value": "r/sec"
               }
             ]
           },
@@ -538,6 +542,10 @@
                   "fixedColor": "red",
                   "mode": "fixed"
                 }
+              },
+              {
+                "id": "unit",
+                "value": "r/sec"
               }
             ]
           },
@@ -563,6 +571,10 @@
                   "fixedColor": "purple",
                   "mode": "fixed"
                 }
+              },
+              {
+                "id": "unit",
+                "value": "ms"
               }
             ]
           },
diff --git a/devenv/docker/blocks/mimir_backend/docker-compose.yaml b/devenv/docker/blocks/mimir_backend/docker-compose.yaml
new file mode 100644
index 0000000000000..8666ab093cce5
--- /dev/null
+++ b/devenv/docker/blocks/mimir_backend/docker-compose.yaml
@@ -0,0 +1,16 @@
+  mimir_backend:
+    image: grafana/mimir
+    container_name: mimir_backend
+    command:
+      - -target=backend
+  nginx:
+    environment:
+      - NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx
+      - MIMIR_BACKEND_URL=mimir_backend:8080
+    hostname: nginx
+    image: nginxinc/nginx-unprivileged:1.22-alpine
+    ports:
+      - 8080:8080
+    volumes:
+      - "./docker/blocks/mimir_backend/nginx/nginx.conf.template:/etc/nginx/templates/nginx.conf.template"
+      - "./docker/blocks/mimir_backend/nginx/.htpasswd:/etc/nginx/.htpasswd"
\ No newline at end of file
diff --git a/devenv/docker/blocks/mimir_backend/nginx/.htpasswd b/devenv/docker/blocks/mimir_backend/nginx/.htpasswd
new file mode 100644
index 0000000000000..f2af629df1aeb
--- /dev/null
+++ b/devenv/docker/blocks/mimir_backend/nginx/.htpasswd
@@ -0,0 +1,2 @@
+// test:test
+test:$apr1$fzP1qWUA$gGOojmRicBlNiSdiSGjwv1
diff --git a/devenv/docker/blocks/mimir_backend/nginx/nginx.conf.template b/devenv/docker/blocks/mimir_backend/nginx/nginx.conf.template
new file mode 100644
index 0000000000000..ba1125456439b
--- /dev/null
+++ b/devenv/docker/blocks/mimir_backend/nginx/nginx.conf.template
@@ -0,0 +1,18 @@
+pid /tmp/nginx.pid;
+
+events {}
+
+http {
+  resolver 127.0.0.11 ipv6=off;  
+
+  server {
+    listen 8080;
+    proxy_set_header X-Scope-OrgID $http_x_scope_orgid;
+
+    location / {
+      auth_basic "Mimir Backend";
+      auth_basic_user_file /etc/nginx/.htpasswd;
+      proxy_pass http://${MIMIR_BACKEND_URL};
+    }
+  }
+}
\ No newline at end of file
diff --git a/devenv/docker/blocks/postgres/docker-compose.yaml b/devenv/docker/blocks/postgres/docker-compose.yaml
index 7e05b29e8b190..86384988d011f 100644
--- a/devenv/docker/blocks/postgres/docker-compose.yaml
+++ b/devenv/docker/blocks/postgres/docker-compose.yaml
@@ -6,7 +6,7 @@
       POSTGRES_DB: grafana
     ports:
       - "5432:5432"
-    command: postgres -c log_connections=on -c logging_collector=on -c log_destination=stderr -c log_directory=/var/log/postgresql
+    command: postgres -c log_connections=on -c log_disconnections=on -c log_destination=stderr
     healthcheck:
       test: [ "CMD", "pg_isready", "-q", "-d", "grafana", "-U", "grafana" ]
       timeout: 45s
diff --git a/docs/sources/administration/correlations/correlation-configuration/index.md b/docs/sources/administration/correlations/correlation-configuration/index.md
index 34298a847efca..4c63080b65e7b 100644
--- a/docs/sources/administration/correlations/correlation-configuration/index.md
+++ b/docs/sources/administration/correlations/correlation-configuration/index.md
@@ -55,6 +55,8 @@ In addition to mapping field values to shorter variable names, more correlation
 
 For more details, please see the example in [Use variables and transformations in a correlation]({{< relref "./use-variables-and-transformations" >}}).
 
+Correlation creates a data link only if all variables have values in the selected data row. [Global variables]({{< relref "/docs/grafana/latest/dashboards/variables/add-template-variables#global-variables" >}}) are exception to this rule and are not required to be filled in from the returned data. These variables are interpolated automatically by data sources.
+
 ### Correlation Transformations
 
 Correlations provide a way to extract more variables out of field values. The output of transformations is a set of new variables that can be accessed as any other variable.
diff --git a/docs/sources/administration/correlations/create-a-new-correlation/index.md b/docs/sources/administration/correlations/create-a-new-correlation/index.md
index edac5cf1747d8..c8f389f3dbf6f 100644
--- a/docs/sources/administration/correlations/create-a-new-correlation/index.md
+++ b/docs/sources/administration/correlations/create-a-new-correlation/index.md
@@ -13,6 +13,25 @@ weight: 40
 
 Make sure you have permission to add new correlations. Only users with write permissions to data sources can define new correlations.
 
+## Create a correlation in Explore's Correlations Editor
+
+1. Go to Explore page.
+1. Select a data source that you would like to be [the source data source]({{< relref "/docs/grafana/latest/administration/correlations/correlation-configuration#source-data-source-and-result-field" >}}) for a new correlation.
+1. Run a query producing data in [a supported visualization]({{< relref "/docs/grafana/latest/administration/correlations/#correlations" >}}).
+1. Click "+ Add" button in the top toolbar and select "Add correlation" (you can also select "Correlations Editor" from the [Command Palette]({{< relref "/docs/grafana/latest/search/#command-palette" >}})).
+1. Explore is now in Correlations Editor mode indicated by a blue border and top bar. You can exit Correlations Editor using the Exit button in the top bar.
+1. The visualization is enriched with links allowing to create new correlations. Links are attached to the data that you can use to build a new query:
+   - Logs: links are displayed next to field values inside log details for each log row
+   - Table: every table cell is a link
+1. Click on a link to begin adding new correlation. Links are associated with a field that will be used as [a results field of a correlation]({{< relref "/docs/grafana/latest/administration/correlations/correlation-configuration" >}}). This means the correlation link will be created on the link you select once the correlation is saved.
+1. Explore opens a split view. Use the right pane to setup [the target query source of the correlation]({{< relref "/docs/grafana/latest/administration/correlations/correlation-configuration#target-query" >}}).
+1. Build target query using [variables syntax]({{< relref "/docs/grafana/latest/dashboards/variables/variable-syntax" >}}) with variables from the list provided at the top of the pane. The list contains sample values from the selected data row.
+1. Provide optional label and description. Label is used as the name of the link inside the visualization. It can contain variables.
+1. Click "Save" button in the top bar to save the correlation and exit Correlations Editor mode.
+1. The link used to create the correlation will be replaced with a data link in each row. The variables will be dynamically replaced with values from a selected row.
+
+Please check [an example]({{< relref "/docs/grafana/latest/administration/correlations/use-correlations-editor-in-explore" >}}) to see how to create a sample correlation using test data source.
+
 ## Create a correlation in Administration page
 
 1. Go to the Administration section in Grafana.
diff --git a/docs/sources/administration/correlations/use-correlations-editor-in-explore/index.md b/docs/sources/administration/correlations/use-correlations-editor-in-explore/index.md
new file mode 100644
index 0000000000000..6144b9954b5f7
--- /dev/null
+++ b/docs/sources/administration/correlations/use-correlations-editor-in-explore/index.md
@@ -0,0 +1,57 @@
+---
+labels:
+  products:
+    - enterprise
+    - oss
+title: Use Correlations Editor in Explore
+weight: 70
+---
+
+# Use Correlations Editor in Explore
+
+## Before you begin
+
+This example shows how to create a correlation using Correlations Editor in Explore.
+
+Correlations allow you to use results of one query to run a new query in any data source. In this example you will run a query that renders tabular data. The data will be used to run a different query that yields a graph result.
+
+Please make sure you have setup up [a test data source]({{< relref "/docs/grafana/latest/datasources/testdata/#testdata-data-source" >}}).
+
+## Create a new correlation
+
+1. Go to Explore.
+1. Select `test data source`.
+1. Click on "+ Add" dropdown and select "Add correlation" button.
+1. Explore is now in Correlations Editor mode indicated by a blue border.
+1. Select scenario: `CSV File`.
+1. Select file: `population_by_state.csv`.
+1. Note that each cell is a link that you can click on to start creating a new correlation.
+
+   {{< figure src="/static/img/docs/correlations/screenshot-correlations-editor-source-10.2.png" max-width="600px" caption="Selecting the source of a correlation" >}}
+
+1. Create new correlation that attaches a data link in the `State` column: click on any cell in the `State` column, e.g. "California".
+1. Explore opens in split view. Select the same data source you selected in the left pane.
+1. The helper above the query editor contains all available variables you can use the target query. Variables contain all data fields (table columns) from the selected row.
+1. Select Scenario: `CSV Metric Values`.
+1. In the Query Editor's `String Input` field provide variables with population values for each year: `${1980},${2000},${2020}`. This will generate a graph using variable values.
+1. In the Query Editor's `Alias` field, write `${State}`
+
+   {{< figure src="/static/img/docs/correlations/screenshot-correlations-editor-target-10.2.png" max-width="600px" caption="Setting up the target of a correlation" >}}
+
+1. Run a query to see that it produces a graph using sample values from the variables.
+1. Save the correlation using "Save" button in the top.
+
+## Test a newly created correlations
+
+1. Once the correlation is saved Explore will exit Correlations Editor automatically and re-rerun the query in the left pane.
+1. Click on a state name. Note how values from the row are inserted into the query on the right and the graph changes using the values for each row. The query is rerun with updates values every time you click on a state name.
+
+   {{< figure src="/static/img/docs/correlations/screenshot-correlations-example-link-10.2.png" max-width="600px" caption="Result of clicking on a data link" >}}
+
+You can apply the same steps to any data source. Correlations allow you to create links in visualizations to run dynamic queries based on selected data. In this example we used data returned by a query to build a new query generating different visualization using the same data source. However, you can create correlations between any data sources to create custom exploration flows.
+
+## Correlations in the logs panel
+
+Correlations links in the logs panel show slightly differently than the table panel. When you enter the Correlation Editor mode when looking at logs, you will need to expand a log line to see the button that serves as the correlation link.
+
+{{< figure src="/static/img/docs/correlations/screenshot-correlations-editor-logs-10.2.png" max-width="600px" caption="Logs panel in the Correlations Editor" >}}
diff --git a/docs/sources/alerting/fundamentals/contact-points/index.md b/docs/sources/alerting/fundamentals/contact-points/index.md
index 3286e32ac2b05..3c28c0c5df57b 100644
--- a/docs/sources/alerting/fundamentals/contact-points/index.md
+++ b/docs/sources/alerting/fundamentals/contact-points/index.md
@@ -47,7 +47,7 @@ The following table lists the contact point integrations supported by Grafana.
 | [Google Chat](https://chat.google.com/)          | `googlechat`              | Supported            | N/A                                                                                                      |
 | [Kafka](https://kafka.apache.org/)               | `kafka`                   | Supported            | N/A                                                                                                      |
 | [Line](https://line.me/en/)                      | `line`                    | Supported            | N/A                                                                                                      |
-| [Microsoft Teams](https://teams.microsoft.com/)  | `teams`                   | Supported            | N/A                                                                                                      |
+| [Microsoft Teams](https://teams.microsoft.com/)  | `teams`                   | Supported            | Supported                                                                                                |
 | [Opsgenie](https://atlassian.com/opsgenie/)      | `opsgenie`                | Supported            | Supported                                                                                                |
 | [Pagerduty](https://www.pagerduty.com/)          | `pagerduty`               | Supported            | Supported                                                                                                |
 | [Prometheus Alertmanager](https://prometheus.io) | `prometheus-alertmanager` | Supported            | N/A                                                                                                      |
diff --git a/docs/sources/dashboards/build-dashboards/annotate-visualizations/index.md b/docs/sources/dashboards/build-dashboards/annotate-visualizations/index.md
index 28aa183baeaa5..6eedd05a43e9e 100644
--- a/docs/sources/dashboards/build-dashboards/annotate-visualizations/index.md
+++ b/docs/sources/dashboards/build-dashboards/annotate-visualizations/index.md
@@ -136,7 +136,7 @@ You can stop annotations from being fetched and drawn by taking the following st
 1. Find and click the **Annotations & Alerts (Built-in)** query to open it.
 1. Click the **Enabled** toggle to turn it off.
 
-When you copy a dashboard using the **Save As** feature it will get a new dashboard id, so annotations created on source dashboard will no longer be visible on the copy. You can still show them if you add a new **Annotation Query** and filter by tags. However, this only works if the annotations on the source dashboard had tags to filter by.
+When you copy a dashboard using the **Save As** feature it will get a new dashboard id, so annotations created on the source dashboard will no longer be visible on the copy. You can still show them if you add a new **Annotation Query** and filter by tags. However, this only works if the annotations on the source dashboard had tags to filter by.
 
 Following are some query options specific to the built-in annotation query.
 
diff --git a/docs/sources/dashboards/dashboard-public/index.md b/docs/sources/dashboards/dashboard-public/index.md
index 15286cd890592..80b9a2ee75311 100644
--- a/docs/sources/dashboards/dashboard-public/index.md
+++ b/docs/sources/dashboards/dashboard-public/index.md
@@ -13,12 +13,6 @@ weight: 8
 
 # Public dashboards
 
-{{% admonition type="note" %}}
-
-This feature is in [public preview](/docs/release-life-cycle/).
-
-{{% /admonition %}}
-
 > **Warning:** Making your dashboard public could result in a large number of queries to the data sources used by your dashboard.
 > This can be mitigated by utilizing the enterprise [caching][] and/or rate limiting features.
 
diff --git a/docs/sources/dashboards/manage-dashboards/index.md b/docs/sources/dashboards/manage-dashboards/index.md
index 04711802967b4..c9ddc5dfaa3f2 100644
--- a/docs/sources/dashboards/manage-dashboards/index.md
+++ b/docs/sources/dashboards/manage-dashboards/index.md
@@ -32,10 +32,6 @@ weight: 8
 
 # Manage dashboards
 
-A dashboard is a set of one or more [panels][] that visually presents your data in one or more rows.
-
-For more information about creating dashboards, refer to [Add and organize panels](../add-organize-panels).
-
 This topic includes techniques you can use to manage your Grafana dashboards, including:
 
 - [Creating and managing dashboard folders](#create-and-manage-dashboard-folders)
@@ -43,48 +39,60 @@ This topic includes techniques you can use to manage your Grafana dashboards, in
 - [Organizing dashboards](#organize-a-dashboard)
 - [Troubleshooting dashboards](#troubleshoot-dashboards)
 
+For more information about creating dashboards, refer to [Add and organize panels](../add-organize-panels).
+
+## Browse dashboards
+
+On the **Dashboards** page, you can browse and manage folders and dashboards. This includes the options to:
+
+- Create folders and dashboards
+- Move dashboards between folders
+- Delete multiple dashboards and folders
+- Navigate to a folder
+- Manage folder permissions. For more information, refer to [Dashboard permissions](https://grafana.com/docs/grafana/<GRAFANA VERSION>/administration/roles-and-permissions/#dashboard-permissions).
+
+{{% admonition type="note" %}}
+As of Grafana 10.2, there is no longer a special **General** folder. Dashboards without a folder are now shown at the top level alongside folders.
+{{% /admonition %}}
+
 ## Create a dashboard folder
 
 Folders help you organize and group dashboards, which is useful when you have many dashboards or multiple teams using the same Grafana instance.
 
-**Before you begin:**
-
-- Ensure that you have Grafana Admin or Super Admin permissions. For more information about dashboard permissions, refer to [Dashboard permissions][].
+> **Before you begin:** Ensure you have Editor permissions or greater to create folders. For more information about dashboard permissions, refer to [Dashboard permissions][].
 
 **To create a dashboard folder:**
 
-1. Sign in to Grafana.
-1. Click **Dashboards** in the left-side menu.
-1. On the Dashboards page, click **New** and select **New folder** in the dropdown.
+1. Click **Dashboards** in the main menu.
+1. On the **Dashboards** page, click **New** and select **New folder** in the drop-down.
 1. Enter a unique name and click **Create**.
 
-   Do not use the name of a folder that has already been provisioned (such as "General") and avoid special characters (except underscores and hyphens).
-
 When you save a dashboard, you can either select a folder for the dashboard to be saved in or create a new folder.
 
-## Manage dashboards
+{{% admonition type="note" %}}
+Alerts cannot be placed in folders with slashes (\ /) in the name. If you wish to place alerts in the folder, do not use slashes in the folder name.
+{{% /admonition %}}
 
-On the Dashboards page, you can:
+**To edit the name of a folder:**
 
-- create a folder
-- create a dashboard
-- move dashboards into folders
-- delete multiple dashboards
-- navigate to a folder page where you can assign folder and dashboard permissions
+1. Click **Dashboards** in the main menu.
+1. Navigate to the folder by selecting it in the list, or searching for it.
+1. Click the pencil icon labelled **Edit title** in the header and update the name of the folder.
 
-### Dashboard folder page
+The new folder name is automatically saved.
 
-You can complete the following tasks on a dashboard folder page:
+### Folder permissions
 
-- Move or delete dashboards in a folder
-- Rename a folder (available on the Settings tab)
-- Assign permissions to folders (which are inherited by the dashboards in the folder)
+You can assign permissions to a folder. Any permissions you assign are inherited by the dashboards in the folder. You can assign permissions to organization roles, teams, and users.
 
-To navigate to the dashboard folder page, hover over the name of the folder and click **Go to folder** in the dashboard search result list or on the Dashboards page.
+**To modify permissions for a folder:**
 
-### Dashboard permissions
+1. Click **Dashboards** in the main menu.
+1. Navigate to the folder by selecting it in the list, or searching for it.
+1. On the folder's page, click **Folder actions** and select **Manage permissions** in the drop-down.
+1. Update the permissions as desired.
 
-You can assign permissions to a folder. Any permissions you assign are inherited by the dashboards in the folder. An Access Control List (ACL) is used where **Organization Role**, **Team**, and a **User** can be assigned permissions.
+Changes are saved automatically.
 
 For more information about dashboard permissions, refer to [Dashboard permissions][].
 
@@ -96,10 +104,13 @@ You can use the Grafana UI or the [HTTP API][] to export and import dashboards.
 
 The dashboard export action creates a Grafana JSON file that contains everything you need, including layout, variables, styles, data sources, queries, and so on, so that you can later import the dashboard.
 
-1. Click **Dashboards** in the left-side menu.
+1. Click **Dashboards** in the main menu.
 1. Open the dashboard you want to export.
-1. Click the **Share** icon.
+1. Click the **Share** icon in the top navigation bar.
 1. Click **Export**.
+
+   If you're exporting the dashboard to use in another instance, with different data source UIDs, enable the **Export for sharing externally** switch.
+
 1. Click **Save to file**.
 
 Grafana downloads a JSON file to your local machine.
diff --git a/docs/sources/developers/angular_deprecation/angular-plugins.md b/docs/sources/developers/angular_deprecation/angular-plugins.md
index 81fe7e45fb2d6..4b1e0eb810f2e 100644
--- a/docs/sources/developers/angular_deprecation/angular-plugins.md
+++ b/docs/sources/developers/angular_deprecation/angular-plugins.md
@@ -136,10 +136,6 @@ Latest Version: v0.0.6 | Signature: Community | Last Updated: 2021
 
 > **Migration available - plugin superseded:** The original plugin only claims support for Grafana v4.x.x, it was replaced with a [new plugin](https://grafana.com/grafana/plugins/grafadruid-druid-datasource/) based on React.
 
-### [Cognite Data Fusion](https://grafana.com/grafana/plugins/cognitedata-datasource/)
-
-Latest Version: 3.1.0 | Signature: Commercial | Last Updated: 2023
-
 ### [Akumuli](https://grafana.com/grafana/plugins/akumuli-datasource/)
 
 Latest Version: 1.3.12 | Signature: Community | Last Updated: 2021
diff --git a/docs/sources/developers/kinds/composable/table/panelcfg/schema-reference.md b/docs/sources/developers/kinds/composable/table/panelcfg/schema-reference.md
index 6ec9c79f28b7c..0fbc39fba0104 100644
--- a/docs/sources/developers/kinds/composable/table/panelcfg/schema-reference.md
+++ b/docs/sources/developers/kinds/composable/table/panelcfg/schema-reference.md
@@ -170,6 +170,7 @@ It extends [GraphFieldConfig](#graphfieldconfig).
 | `fillOpacity`       | number                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
 | `gradientMode`      | string                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>TODO docs<br/>Possible values are: `none`, `opacity`, `hue`, `scheme`.                                                                                                                                                       |
 | `hideFrom`          | [HideSeriesConfig](#hideseriesconfig)                     | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>TODO docs                                                                                                                                                                                                                    |
+| `hideValue`         | boolean                                                   | No       |         |                                                                                                                                                                                                                                                                                           |
 | `lineColor`         | string                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*                                                                                                                                                                                                                                  |
 | `lineInterpolation` | string                                                    | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>TODO docs<br/>Possible values are: `linear`, `smooth`, `stepBefore`, `stepAfter`.                                                                                                                                            |
 | `lineStyle`         | [LineStyle](#linestyle)                                   | No       |         | *(Inherited from [GraphFieldConfig](#graphfieldconfig))*<br/>TODO docs                                                                                                                                                                                                                    |
diff --git a/docs/sources/developers/kinds/core/dashboard/schema-reference.md b/docs/sources/developers/kinds/core/dashboard/schema-reference.md
index 37206a725c2e3..42b36f9f4865e 100644
--- a/docs/sources/developers/kinds/core/dashboard/schema-reference.md
+++ b/docs/sources/developers/kinds/core/dashboard/schema-reference.md
@@ -117,6 +117,7 @@ FROM: AnnotationQuery in grafana-data/src/types/annotations.ts
 | `enable`     | boolean                                         | **Yes**  | `true`  | When enabled the annotation query is issued with every dashboard refresh                                                                                                     |
 | `iconColor`  | string                                          | **Yes**  |         | Color to use for the annotation event markers                                                                                                                                |
 | `name`       | string                                          | **Yes**  |         | Name of annotation.                                                                                                                                                          |
+| `builtIn`    | number                                          | No       | `0`     | Set to 1 for the standard annotation query all dashboards have by default.                                                                                                   |
 | `filter`     | [AnnotationPanelFilter](#annotationpanelfilter) | No       |         |                                                                                                                                                                              |
 | `hide`       | boolean                                         | No       | `false` | Annotation queries can be toggled on or off at the top of the dashboard.<br/>When hide is true, the toggle is not shown in the dashboard.                                    |
 | `target`     | [AnnotationTarget](#annotationtarget)           | No       |         | TODO: this should be a regular DataQuery that depends on the selected dashboard<br/>these match the properties of the "grafana" datasouce that is default in most dashboards |
diff --git a/docs/sources/developers/kinds/core/playlist/schema-reference.md b/docs/sources/developers/kinds/core/playlist/schema-reference.md
deleted file mode 100644
index 6864981b00c26..0000000000000
--- a/docs/sources/developers/kinds/core/playlist/schema-reference.md
+++ /dev/null
@@ -1,117 +0,0 @@
----
-keywords:
-  - grafana
-  - schema
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Playlist kind
----
-> Both documentation generation and kinds schemas are in active development and subject to change without prior notice.
-
-## Playlist
-
-#### Maturity: [merged](../../../maturity/#merged)
-#### Version: 0.0
-
-A playlist is a series of dashboards that is automatically rotated in the browser, on a configurable interval.
-
-| Property   | Type                | Required | Default | Description                                                                                                                                                                                                                                                                    |
-|------------|---------------------|----------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `metadata` | [object](#metadata) | **Yes**  |         | metadata contains embedded CommonMetadata and can be extended with custom string fields<br/>TODO: use CommonMetadata instead of redefining here; currently needs to be defined here<br/>without external reference as using the CommonMetadata reference breaks thema codegen. |
-| `spec`     | [object](#spec)     | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-| `status`   | [object](#status)   | **Yes**  |         |                                                                                                                                                                                                                                                                                |
-
-### Metadata
-
-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.
-
-It extends [_kubeObjectMetadata](#_kubeobjectmetadata).
-
-| Property            | Type                   | Required | Default | Description                                                                                                                             |
-|---------------------|------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `createdBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `creationTimestamp` | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `extraFields`       | [object](#extrafields) | **Yes**  |         | extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata |
-| `finalizers`        | string[]               | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `labels`            | map[string]string      | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `resourceVersion`   | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `uid`               | string                 | **Yes**  |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-| `updateTimestamp`   | string                 | **Yes**  |         |                                                                                                                                         |
-| `updatedBy`         | string                 | **Yes**  |         |                                                                                                                                         |
-| `deletionTimestamp` | string                 | No       |         | *(Inherited from [_kubeObjectMetadata](#_kubeobjectmetadata))*                                                                          |
-
-### _kubeObjectMetadata
-
-_kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
-It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
-As it is also intended to be generic enough to function with any API Server.
-
-| Property            | Type              | Required | Default | Description |
-|---------------------|-------------------|----------|---------|-------------|
-| `creationTimestamp` | string            | **Yes**  |         |             |
-| `finalizers`        | string[]          | **Yes**  |         |             |
-| `labels`            | map[string]string | **Yes**  |         |             |
-| `resourceVersion`   | string            | **Yes**  |         |             |
-| `uid`               | string            | **Yes**  |         |             |
-| `deletionTimestamp` | string            | No       |         |             |
-
-### ExtraFields
-
-extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Spec
-
-| Property   | Type                            | Required | Default | Description                                                                                                                                                          |
-|------------|---------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `interval` | string                          | **Yes**  | `5m`    | Interval sets the time between switching views in a playlist.<br/>FIXME: Is this based on a standardized format or what options are available? Can datemath be used? |
-| `name`     | string                          | **Yes**  |         | Name of the playlist.                                                                                                                                                |
-| `uid`      | string                          | **Yes**  |         | Unique playlist identifier. Generated on creation, either by the<br/>creator of the playlist of by the application.                                                  |
-| `items`    | [PlaylistItem](#playlistitem)[] | No       |         | The ordered list of items that the playlist will iterate over.<br/>FIXME! This should not be optional, but changing it makes the godegen awkward                     |
-
-### PlaylistItem
-
-| Property | Type   | Required | Default | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-|----------|--------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `type`   | string | **Yes**  |         | Type of the item.<br/>Possible values are: `dashboard_by_uid`, `dashboard_by_id`, `dashboard_by_tag`.                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| `value`  | string | **Yes**  |         | Value depends on type and describes the playlist item.<br/><br/> - dashboard_by_id: The value is an internal numerical identifier set by Grafana. This<br/> is not portable as the numerical identifier is non-deterministic between different instances.<br/> Will be replaced by dashboard_by_uid in the future. (deprecated)<br/> - dashboard_by_tag: The value is a tag which is set on any number of dashboards. All<br/> dashboards behind the tag will be added to the playlist.<br/> - dashboard_by_uid: The value is the dashboard UID |
-| `title`  | string | No       |         | Title is an unused property -- it will be removed in the future                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-
-### Status
-
-| Property           | Type                                                       | Required | Default | Description                                                                                                                                                                |
-|--------------------|------------------------------------------------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `additionalFields` | [object](#additionalfields)                                | No       |         | additionalFields is reserved for future use                                                                                                                                |
-| `operatorStates`   | map[string][status.#OperatorState](#status.#operatorstate) | No       |         | operatorStates is a map of operator ID to operator state evaluations.<br/>Any operator which consumes this kind SHOULD add its state evaluation information to this field. |
-
-### AdditionalFields
-
-additionalFields is reserved for future use
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-### Status.#OperatorState
-
-| Property           | Type               | Required | Default | Description                                                                                                                                                                      |
-|--------------------|--------------------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `lastEvaluation`   | string             | **Yes**  |         | lastEvaluation is the ResourceVersion last evaluated                                                                                                                             |
-| `state`            | string             | **Yes**  |         | state describes the state of the lastEvaluation.<br/>It is limited to three possible states for machine evaluation.<br/>Possible values are: `success`, `in_progress`, `failed`. |
-| `descriptiveState` | string             | No       |         | descriptiveState is an optional more descriptive state field which has no requirements on format                                                                                 |
-| `details`          | [object](#details) | No       |         | details contains any extra information that is operator-specific                                                                                                                 |
-
-### Details
-
-details contains any extra information that is operator-specific
-
-| Property | Type | Required | Default | Description |
-|----------|------|----------|---------|-------------|
-
-
diff --git a/docs/sources/explore/_index.md b/docs/sources/explore/_index.md
index a0795f7c3a6a3..a6175ec073b4d 100644
--- a/docs/sources/explore/_index.md
+++ b/docs/sources/explore/_index.md
@@ -67,6 +67,18 @@ In split view, timepickers for both panels can be linked (if you change one, the
 
 To close the newly created query, click on the Close Split button.
 
+## Content outline
+
+The content outline is a side navigation bar that keeps track of the queries and visualization panels you created in Explore. It allows you to navigate between them quickly.
+
+The content outline also works in a split view. When you are in split view, the content outline is generated for each pane.
+
+To open the content outline:
+
+1. Click the Outline button in the top left corner of the Explore screen.
+
+You can then click on any panel icon in the content outline to navigate to that panel.
+
 ## Share Explore URLs
 
 When using Explore, the URL in the browser address bar updates as you make changes to the queries. You can share or bookmark this URL.
diff --git a/docs/sources/panels-visualizations/configure-data-links/index.md b/docs/sources/panels-visualizations/configure-data-links/index.md
index af4b8bad8eaf2..da954089d97f5 100644
--- a/docs/sources/panels-visualizations/configure-data-links/index.md
+++ b/docs/sources/panels-visualizations/configure-data-links/index.md
@@ -50,7 +50,7 @@ These variables allow you to include the current time range in the data link URL
 
 ## Series variables
 
-Series specific variables are available under `__series` namespace:
+Series-specific variables are available under `__series` namespace:
 
 - `__series.name` - series name to the URL
 
@@ -71,6 +71,17 @@ Value-specific variables are available under `__value` namespace:
 - `__value.text` - text representation of a value
 - `__value.calc` - calculation name if the value is result of calculation
 
+Using value-specific variables in data links can show different results depending on the set option of Tooltip mode.
+
+## Data variables
+
+To access values and labels from other fields use:
+
+- `${__data.fields[i]}` - value of field `i` (on the same row)
+- `${__data.fields["NameOfField"]}` - value of field using name instead of index
+- `${__data.fields["NameOfField"]}` - value of field using name instead of index
+- `${__data.fields[1].labels.cluster}` - access labels of another field
+
 ## Template variables
 
 When linking to another dashboard that uses template variables, select variable values for whoever clicks the link.
diff --git a/docs/sources/panels-visualizations/query-transform-data/transform-data/index.md b/docs/sources/panels-visualizations/query-transform-data/transform-data/index.md
index c7ac4e7dc098a..a0895c8acdd6b 100644
--- a/docs/sources/panels-visualizations/query-transform-data/transform-data/index.md
+++ b/docs/sources/panels-visualizations/query-transform-data/transform-data/index.md
@@ -995,11 +995,10 @@ Here is the result after adding a Limit transformation with a value of '3':
 
 ### Time series to table transform
 
-> **Note:** This transformation is available in Grafana 9.5+ as an opt-in beta feature.
-> Modify Grafana [configuration file][] to enable the `timeSeriesTable` [feature toggle][] to use it.
-
 Use this transformation to convert time series result into a table, converting time series data frame into a "Trend" field. "Trend" field can then be rendered using [sparkline cell type][], producing an inline sparkline for each table row. If there are multiple time series queries, each will result in a separate table data frame. These can be joined using join or merge transforms to produce a single table with multiple sparklines per row.
 
+For each generated "Trend" field value calculation function can be selected. Default is "last non null value". This value will be displayed next to the sparkline and used for sorting table rows.
+
 ### Format Time
 
 {{% admonition type="note" %}}
@@ -1008,6 +1007,23 @@ This transformation is available in Grafana 10.1+ as an alpha feature.
 
 Use this transformation to format the output of a time field. Output can be formatted using (Moment.js format strings)[https://momentjs.com/docs/#/displaying/]. For instance, if you would like to display only the year of a time field the format string `YYYY` can be used to show the calendar year (e.g. 1999, 2012, etc.).
 
+### Format string
+
+> **Note:** This transformation is an experimental feature. Engineering and on-call support is not available. Documentation is either limited or not provided outside of code comments. No SLA is provided. Enable the `formatString` in Grafana to use this feature. Contact Grafana Support to enable this feature in Grafana Cloud.
+
+Use this transformation to format the output of a string field. You can format output in the following ways:
+
+- Upper case - Formats the entire string in upper case characters.
+- Lower case - Formats the entire string in lower case characters.
+- Sentence case - Formats the the first character of the string in upper case.
+- Title case - Formats the first character of each word in the string in upper case.
+- Pascal case - Formats the first character of each word in the string in upper case and doesn't include spaces between words.
+- Camel case - Formats the first character of each word in the string in upper case, except the first word, and doesn't include spaces between words.
+- Snake case - Formats all characters in the string in lower case and uses underscores instead of spaces between words.
+- Kebab case - Formats all characters in the string in lower case and uses dashes instead of spaces between words.
+- Trim - Removes all leading and trailing spaces from the string.
+- Substring - Returns a substring of the string, using the specified start and end positions.
+
 {{% docs/reference %}}
 [Table panel]: "/docs/grafana/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table"
 [Table panel]: "/docs/grafana-cloud/ -> /docs/grafana/<GRAFANA VERSION>/panels-visualizations/visualizations/table"
diff --git a/docs/sources/panels-visualizations/visualizations/table/index.md b/docs/sources/panels-visualizations/visualizations/table/index.md
index 2f63da7e8251a..8459bf2b13f62 100644
--- a/docs/sources/panels-visualizations/visualizations/table/index.md
+++ b/docs/sources/panels-visualizations/visualizations/table/index.md
@@ -148,12 +148,9 @@ If you have a field value that is an image URL or a base64 encoded image you can
 
 ### Sparkline
 
-> **Note:** This cell type is available in Grafana 9.5+ as an opt-in beta feature.
-> Modify Grafana [configuration file][] to enable the `timeSeriesTable` [feature toggle][] to use it.
-
 Shows value rendered as a sparkline. Requires [time series to table][] data transform.
 
-{{< figure src="/static/img/docs/tables/sparkline.png" max-width="500px" caption="Sparkline" class="docs-image--no-shadow" >}}
+{{< figure src="/static/img/docs/tables/sparkline2.png" max-width="500px" caption="Sparkline" class="docs-image--no-shadow" >}}
 
 ## Cell value inspect
 
diff --git a/docs/sources/setup-grafana/configure-grafana/configure-custom-branding/index.md b/docs/sources/setup-grafana/configure-grafana/configure-custom-branding/index.md
index ff0634252eb50..f85ebfd30ee21 100644
--- a/docs/sources/setup-grafana/configure-grafana/configure-custom-branding/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/configure-custom-branding/index.md
@@ -120,18 +120,22 @@ To customize the footer of a public dashboard, add the following section to the
 ```ini
 [white_labeling.public_dashboards]
 
-# Hides the footer for the public dashboards if set to "true". If
+# Hides the footer for the public dashboards if set to `true`.
 # example: footer_hide = "true"
 ;footer_hide =
 
 # Set to text shown in the footer
 ;footer_text =
 
-# Set to complete url to override public dashboard footer logo
+# Set to complete url to override public dashboard footer logo. Default is `grafana-logo` and will display the Grafana logo.
+# An empty value will hide the footer logo.
 ;footer_logo =
 
 # Set to link for the footer
 ;footer_link =
+
+# Set to `true` to hide the Grafana logo next to the title
+;header_logo_hide =
 ```
 
 If you specify `footer_hide` to `true`, all the other values are ignored because the footer will not be shown.
diff --git a/docs/sources/setup-grafana/configure-grafana/enterprise-configuration/index.md b/docs/sources/setup-grafana/configure-grafana/enterprise-configuration/index.md
index 986fb532aebdf..08da0da11bbdd 100644
--- a/docs/sources/setup-grafana/configure-grafana/enterprise-configuration/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/enterprise-configuration/index.md
@@ -316,6 +316,10 @@ List of comma- or space-separated organizations. Each user must be a member of a
 
 List of comma- or space-separated Organization:OrgId:Role mappings. Organization can be `*` meaning "All users". Role is optional and can have the following values: `Admin`, `Editor` ,`Viewer` or `None`.
 
+### role_values_none
+
+List of comma- or space-separated roles that will be mapped to the None role.
+
 ### role_values_editor
 
 List of comma- or space-separated roles that will be mapped to the Editor role.
diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index a2631cd9f0494..553de14518a73 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -19,38 +19,40 @@ This page contains a list of available feature toggles. To learn how to turn on
 
 Some features are enabled by default. You can disable these feature by setting the feature flag to "false" in the configuration.
 
-| Feature toggle name                              | Description                                                                                                                                                                                         | Enabled by default |
-| ------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
-| `disableEnvelopeEncryption`                      | Disable envelope encryption (emergency only)                                                                                                                                                        |                    |
-| `featureHighlights`                              | Highlight Grafana Enterprise features                                                                                                                                                               |                    |
-| `dataConnectionsConsole`                         | Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins.                        | Yes                |
-| `cloudWatchCrossAccountQuerying`                 | Enables cross-account querying in CloudWatch datasources                                                                                                                                            | Yes                |
-| `redshiftAsyncQueryDataSupport`                  | Enable async query data support for Redshift                                                                                                                                                        | Yes                |
-| `athenaAsyncQueryDataSupport`                    | Enable async query data support for Athena                                                                                                                                                          | Yes                |
-| `cloudwatchNewRegionsHandler`                    | Refactor of /regions endpoint, no user-facing changes                                                                                                                                               | Yes                |
-| `nestedFolderPicker`                             | Enables the new folder picker to work with nested folders. Requires the nestedFolders feature flag                                                                                                  | Yes                |
-| `accessTokenExpirationCheck`                     | Enable OAuth access_token expiration check and token refresh using the refresh_token                                                                                                                |                    |
-| `emptyDashboardPage`                             | Enable the redesigned user interface of a dashboard page that includes no panels                                                                                                                    | Yes                |
-| `disablePrometheusExemplarSampling`              | Disable Prometheus exemplar sampling                                                                                                                                                                |                    |
-| `logsContextDatasourceUi`                        | Allow datasource to provide custom UI for context view                                                                                                                                              | Yes                |
-| `gcomOnlyExternalOrgRoleSync`                    | Prohibits a user from changing organization roles synced with Grafana Cloud auth provider                                                                                                           |                    |
-| `prometheusMetricEncyclopedia`                   | Adds the metrics explorer component to the Prometheus query builder as an option in metric select                                                                                                   | Yes                |
-| `prometheusDataplane`                            | Changes responses to from Prometheus to be compliant with the dataplane specification. In particular it sets the numeric Field.Name from 'Value' to the value of the `__name__` label when present. | Yes                |
-| `lokiMetricDataplane`                            | Changes metric responses from Loki to be compliant with the dataplane specification.                                                                                                                | Yes                |
-| `dataplaneFrontendFallback`                      | Support dataplane contract field name change for transformations and field name matchers where the name is different                                                                                | Yes                |
-| `alertingNotificationsPoliciesMatchingInstances` | Enables the preview of matching instances for notification policies                                                                                                                                 | Yes                |
-| `useCachingService`                              | When turned on, the new query and resource caching implementation using a wire service inject will be used in place of the previous middleware implementation                                       |                    |
-| `enableElasticsearchBackendQuerying`             | Enable the processing of queries and responses in the Elasticsearch data source through backend                                                                                                     | Yes                |
-| `advancedDataSourcePicker`                       | Enable a new data source picker with contextual information, recently used order and advanced mode                                                                                                  | Yes                |
-| `cloudWatchLogsMonacoEditor`                     | Enables the Monaco editor for CloudWatch Logs queries                                                                                                                                               | Yes                |
-| `recordedQueriesMulti`                           | Enables writing multiple items from a single query within Recorded Queries                                                                                                                          | Yes                |
-| `transformationsRedesign`                        | Enables the transformations redesign                                                                                                                                                                | Yes                |
-| `toggleLabelsInLogsUI`                           | Enable toggleable filters in log details view                                                                                                                                                       | Yes                |
-| `azureMonitorDataplane`                          | Adds dataplane compliant frame metadata in the Azure Monitor datasource                                                                                                                             | Yes                |
-| `prometheusConfigOverhaulAuth`                   | Update the Prometheus configuration page with the new auth component                                                                                                                                | Yes                |
-| `newBrowseDashboards`                            | New browse/manage dashboards UI                                                                                                                                                                     | Yes                |
-| `alertingInsights`                               | Show the new alerting insights landing page                                                                                                                                                         | Yes                |
-| `cloudWatchWildCardDimensionValues`              | Fetches dimension values from CloudWatch to correctly label wildcard dimensions                                                                                                                     | Yes                |
+| Feature toggle name                              | Description                                                                                                                                                                                                                  | Enabled by default |
+| ------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
+| `disableEnvelopeEncryption`                      | Disable envelope encryption (emergency only)                                                                                                                                                                                 |                    |
+| `publicDashboards`                               | Enables public access to dashboards                                                                                                                                                                                          | Yes                |
+| `featureHighlights`                              | Highlight Grafana Enterprise features                                                                                                                                                                                        |                    |
+| `exploreContentOutline`                          | Content outline sidebar                                                                                                                                                                                                      | Yes                |
+| `dataConnectionsConsole`                         | Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins.                                                 | Yes                |
+| `cloudWatchCrossAccountQuerying`                 | Enables cross-account querying in CloudWatch datasources                                                                                                                                                                     | Yes                |
+| `redshiftAsyncQueryDataSupport`                  | Enable async query data support for Redshift                                                                                                                                                                                 | Yes                |
+| `athenaAsyncQueryDataSupport`                    | Enable async query data support for Athena                                                                                                                                                                                   | Yes                |
+| `nestedFolderPicker`                             | Enables the new folder picker to work with nested folders. Requires the nestedFolders feature toggle                                                                                                                         | Yes                |
+| `accessTokenExpirationCheck`                     | Enable OAuth access_token expiration check and token refresh using the refresh_token                                                                                                                                         |                    |
+| `emptyDashboardPage`                             | Enable the redesigned user interface of a dashboard page that includes no panels                                                                                                                                             | Yes                |
+| `disablePrometheusExemplarSampling`              | Disable Prometheus exemplar sampling                                                                                                                                                                                         |                    |
+| `logsContextDatasourceUi`                        | Allow datasource to provide custom UI for context view                                                                                                                                                                       | Yes                |
+| `gcomOnlyExternalOrgRoleSync`                    | Prohibits a user from changing organization roles synced with Grafana Cloud auth provider                                                                                                                                    |                    |
+| `prometheusMetricEncyclopedia`                   | Adds the metrics explorer component to the Prometheus query builder as an option in metric select                                                                                                                            | Yes                |
+| `influxdbBackendMigration`                       | Query InfluxDB InfluxQL without the proxy                                                                                                                                                                                    | Yes                |
+| `prometheusDataplane`                            | Changes responses to from Prometheus to be compliant with the dataplane specification. In particular, when this feature toggle is active, the numeric `Field.Name` is set from 'Value' to the value of the `__name__` label. | Yes                |
+| `lokiMetricDataplane`                            | Changes metric responses from Loki to be compliant with the dataplane specification.                                                                                                                                         | Yes                |
+| `dataplaneFrontendFallback`                      | Support dataplane contract field name change for transformations and field name matchers where the name is different                                                                                                         | Yes                |
+| `alertingNotificationsPoliciesMatchingInstances` | Enables the preview of matching instances for notification policies                                                                                                                                                          | Yes                |
+| `useCachingService`                              | When active, the new query and resource caching implementation using a wire service inject replaces the previous middleware implementation.                                                                                  |                    |
+| `enableElasticsearchBackendQuerying`             | Enable the processing of queries and responses in the Elasticsearch data source through backend                                                                                                                              | Yes                |
+| `advancedDataSourcePicker`                       | Enable a new data source picker with contextual information, recently used order and advanced mode                                                                                                                           | Yes                |
+| `cloudWatchLogsMonacoEditor`                     | Enables the Monaco editor for CloudWatch Logs queries                                                                                                                                                                        | Yes                |
+| `recordedQueriesMulti`                           | Enables writing multiple items from a single query within Recorded Queries                                                                                                                                                   | Yes                |
+| `transformationsRedesign`                        | Enables the transformations redesign                                                                                                                                                                                         | Yes                |
+| `toggleLabelsInLogsUI`                           | Enable toggleable filters in log details view                                                                                                                                                                                | Yes                |
+| `azureMonitorDataplane`                          | Adds dataplane compliant frame metadata in the Azure Monitor datasource                                                                                                                                                      | Yes                |
+| `prometheusConfigOverhaulAuth`                   | Update the Prometheus configuration page with the new auth component                                                                                                                                                         | Yes                |
+| `newBrowseDashboards`                            | New browse/manage dashboards UI                                                                                                                                                                                              | Yes                |
+| `alertingInsights`                               | Show the new alerting insights landing page                                                                                                                                                                                  | Yes                |
+| `cloudWatchWildCardDimensionValues`              | Fetches dimension values from CloudWatch to correctly label wildcard dimensions                                                                                                                                              | Yes                |
 
 ## Preview feature toggles
 
@@ -58,7 +60,6 @@ Some features are enabled by default. You can disable these feature by setting t
 | -------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `trimDefaults`                   | Use cue schema to remove values that will be applied automatically                                                                                                                           |
 | `panelTitleSearch`               | Search for dashboards using panel title                                                                                                                                                      |
-| `publicDashboards`               | Enables public access to dashboards                                                                                                                                                          |
 | `migrationLocking`               | Lock database during migrations                                                                                                                                                              |
 | `correlations`                   | Correlations page                                                                                                                                                                            |
 | `newDBLibrary`                   | Use jmoiron/sqlx rather than xorm for a few backend services                                                                                                                                 |
@@ -68,7 +69,6 @@ Some features are enabled by default. You can disable these feature by setting t
 | `accessControlOnCall`            | Access control primitives for OnCall                                                                                                                                                         |
 | `nestedFolders`                  | Enable folder nesting                                                                                                                                                                        |
 | `alertingNoNormalState`          | Stop maintaining state of alerts that are not firing                                                                                                                                         |
-| `influxdbBackendMigration`       | Query InfluxDB InfluxQL without the proxy                                                                                                                                                    |
 | `renderAuthJWT`                  | Uses JWT-based auth for rendering instead of relying on remote cache                                                                                                                         |
 | `refactorVariablesTimeRange`     | Refactor time range variables flow to reduce number of API calls made when query variables are chained                                                                                       |
 | `faroDatasourceSelector`         | Enable the data source selector within the Frontend Apps section of the Frontend Observability                                                                                               |
@@ -84,71 +84,75 @@ Some features are enabled by default. You can disable these feature by setting t
 These features are early in their development lifecycle and so are not yet supported in Grafana Cloud.
 Experimental features might be changed or removed without prior notice.
 
-| Feature toggle name                         | Description                                                                                                  |
-| ------------------------------------------- | ------------------------------------------------------------------------------------------------------------ |
-| `live-service-web-worker`                   | This will use a webworker thread to processes events rather than the main thread                             |
-| `queryOverLive`                             | Use Grafana Live WebSocket to execute backend queries                                                        |
-| `lokiExperimentalStreaming`                 | Support new streaming approach for loki (prototype, needs special loki build)                                |
-| `storage`                                   | Configurable storage for dashboards, datasources, and resources                                              |
-| `datasourceQueryMultiStatus`                | Introduce HTTP 207 Multi Status for api/ds/query                                                             |
-| `traceToMetrics`                            | Enable trace to metrics links                                                                                |
-| `canvasPanelNesting`                        | Allow elements nesting                                                                                       |
-| `scenes`                                    | Experimental framework to build interactive dashboards                                                       |
-| `disableSecretsCompatibility`               | Disable duplicated secret storage in legacy tables                                                           |
-| `logRequestsInstrumentedAsUnknown`          | Logs the path for requests that are instrumented as unknown                                                  |
-| `dockedMegaMenu`                            | Enable support for a persistent (docked) navigation menu                                                     |
-| `showDashboardValidationWarnings`           | Show warnings when dashboards do not validate against the schema                                             |
-| `mysqlAnsiQuotes`                           | Use double quotes to escape keyword in a MySQL query                                                         |
-| `alertingBacktesting`                       | Rule backtesting API for alerting                                                                            |
-| `editPanelCSVDragAndDrop`                   | Enables drag and drop for CSV and Excel files                                                                |
-| `lokiQuerySplitting`                        | Split large interval queries into subqueries with smaller time intervals                                     |
-| `lokiQuerySplittingConfig`                  | Give users the option to configure split durations for Loki queries                                          |
-| `individualCookiePreferences`               | Support overriding cookie preferences per user                                                               |
-| `timeSeriesTable`                           | Enable time series table transformer & sparkline cell type                                                   |
-| `clientTokenRotation`                       | Replaces the current in-request token rotation so that the client initiates the rotation                     |
-| `lokiLogsDataplane`                         | Changes logs responses from Loki to be compliant with the dataplane specification.                           |
-| `disableSSEDataplane`                       | Disables dataplane specific processing in server side expressions.                                           |
-| `alertStateHistoryLokiSecondary`            | Enable Grafana to write alert state history to an external Loki instance in addition to Grafana annotations. |
-| `alertStateHistoryLokiPrimary`              | Enable a remote Loki instance as the primary source for state history reads.                                 |
-| `alertStateHistoryLokiOnly`                 | Disable Grafana alerts from emitting annotations when a remote Loki instance is available.                   |
-| `unifiedRequestLog`                         | Writes error logs to the request logger                                                                      |
-| `extraThemes`                               | Enables extra themes                                                                                         |
-| `lokiPredefinedOperations`                  | Adds predefined query operations to Loki query editor                                                        |
-| `pluginsFrontendSandbox`                    | Enables the plugins frontend sandbox                                                                         |
-| `dashboardEmbed`                            | Allow embedding dashboard for external use in Code editors                                                   |
-| `frontendSandboxMonitorOnly`                | Enables monitor only in the plugin frontend sandbox (if enabled)                                             |
-| `lokiFormatQuery`                           | Enables the ability to format Loki queries                                                                   |
-| `exploreScrollableLogsContainer`            | Improves the scrolling behavior of logs in Explore                                                           |
-| `pluginsDynamicAngularDetectionPatterns`    | Enables fetching Angular detection patterns for plugins from GCOM and fallback to hardcoded ones             |
-| `vizAndWidgetSplit`                         | Split panels between visualizations and widgets                                                              |
-| `prometheusIncrementalQueryInstrumentation` | Adds RudderStack events to incremental queries                                                               |
-| `logsExploreTableVisualisation`             | A table visualisation for logs in Explore                                                                    |
-| `awsDatasourcesTempCredentials`             | Support temporary security credentials in AWS plugins for Grafana Cloud customers                            |
-| `mlExpressions`                             | Enable support for Machine Learning in server-side expressions                                               |
-| `traceQLStreaming`                          | Enables response streaming of TraceQL queries of the Tempo data source                                       |
-| `metricsSummary`                            | Enables metrics summary queries in the Tempo data source                                                     |
-| `grafanaAPIServer`                          | Enable Kubernetes API Server for Grafana resources                                                           |
-| `grafanaAPIServerWithExperimentalAPIs`      | Register experimental APIs with the k8s API server                                                           |
-| `featureToggleAdminPage`                    | Enable admin page for managing feature toggles from the Grafana front-end                                    |
-| `permissionsFilterRemoveSubquery`           | Alternative permission filter implementation that does not use subqueries for fetching the dashboard folder  |
-| `influxdbSqlSupport`                        | Enable InfluxDB SQL query language support with new querying UI                                              |
-| `angularDeprecationUI`                      | Display new Angular deprecation-related UI features                                                          |
-| `dashgpt`                                   | Enable AI powered features in dashboards                                                                     |
-| `sseGroupByDatasource`                      | Send query to the same datasource in a single request when using server side expressions                     |
-| `requestInstrumentationStatusSource`        | Include a status source label for request metrics and logs                                                   |
-| `libraryPanelRBAC`                          | Enables RBAC support for library panels                                                                      |
-| `wargamesTesting`                           | Placeholder feature flag for internal testing                                                                |
-| `externalCorePlugins`                       | Allow core plugins to be loaded as external                                                                  |
-| `pluginsAPIMetrics`                         | Sends metrics of public grafana packages usage by plugins                                                    |
-| `httpSLOLevels`                             | Adds SLO level to http request metrics                                                                       |
-| `alertingModifiedExport`                    | Enables using UI for provisioned rules modification and export                                               |
-| `panelMonitoring`                           | Enables panel monitoring through logs and measurements                                                       |
-| `enableNativeHTTPHistogram`                 | Enables native HTTP Histograms                                                                               |
-| `transformationsVariableSupport`            | Allows using variables in transformations                                                                    |
-| `kubernetesPlaylists`                       | Use the kubernetes API in the frontend for playlists                                                         |
-| `navAdminSubsections`                       | Splits the administration section of the nav tree into subsections                                           |
-| `recoveryThreshold`                         | Enables feature recovery threshold (aka hysteresis) for threshold server-side expression                     |
-| `awsDatasourcesNewFormStyling`              | Applies new form styling for configuration and query editors in AWS plugins                                  |
+| Feature toggle name                         | Description                                                                                                                                                                                                                                                                       |
+| ------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `live-service-web-worker`                   | This will use a webworker thread to processes events rather than the main thread                                                                                                                                                                                                  |
+| `queryOverLive`                             | Use Grafana Live WebSocket to execute backend queries                                                                                                                                                                                                                             |
+| `lokiExperimentalStreaming`                 | Support new streaming approach for loki (prototype, needs special loki build)                                                                                                                                                                                                     |
+| `storage`                                   | Configurable storage for dashboards, datasources, and resources                                                                                                                                                                                                                   |
+| `datasourceQueryMultiStatus`                | Introduce HTTP 207 Multi Status for api/ds/query                                                                                                                                                                                                                                  |
+| `traceToMetrics`                            | Enable trace to metrics links                                                                                                                                                                                                                                                     |
+| `canvasPanelNesting`                        | Allow elements nesting                                                                                                                                                                                                                                                            |
+| `scenes`                                    | Experimental framework to build interactive dashboards                                                                                                                                                                                                                            |
+| `disableSecretsCompatibility`               | Disable duplicated secret storage in legacy tables                                                                                                                                                                                                                                |
+| `logRequestsInstrumentedAsUnknown`          | Logs the path for requests that are instrumented as unknown                                                                                                                                                                                                                       |
+| `dockedMegaMenu`                            | Enable support for a persistent (docked) navigation menu                                                                                                                                                                                                                          |
+| `cloudwatchNewRegionsHandler`               | Refactor of /regions endpoint, no user-facing changes                                                                                                                                                                                                                             |
+| `showDashboardValidationWarnings`           | Show warnings when dashboards do not validate against the schema                                                                                                                                                                                                                  |
+| `mysqlAnsiQuotes`                           | Use double quotes to escape keyword in a MySQL query                                                                                                                                                                                                                              |
+| `alertingBacktesting`                       | Rule backtesting API for alerting                                                                                                                                                                                                                                                 |
+| `editPanelCSVDragAndDrop`                   | Enables drag and drop for CSV and Excel files                                                                                                                                                                                                                                     |
+| `lokiQuerySplitting`                        | Split large interval queries into subqueries with smaller time intervals                                                                                                                                                                                                          |
+| `lokiQuerySplittingConfig`                  | Give users the option to configure split durations for Loki queries                                                                                                                                                                                                               |
+| `individualCookiePreferences`               | Support overriding cookie preferences per user                                                                                                                                                                                                                                    |
+| `clientTokenRotation`                       | Replaces the current in-request token rotation so that the client initiates the rotation                                                                                                                                                                                          |
+| `lokiLogsDataplane`                         | Changes logs responses from Loki to be compliant with the dataplane specification.                                                                                                                                                                                                |
+| `disableSSEDataplane`                       | Disables dataplane specific processing in server side expressions.                                                                                                                                                                                                                |
+| `alertStateHistoryLokiSecondary`            | Enable Grafana to write alert state history to an external Loki instance in addition to Grafana annotations.                                                                                                                                                                      |
+| `alertStateHistoryLokiPrimary`              | Enable a remote Loki instance as the primary source for state history reads.                                                                                                                                                                                                      |
+| `alertStateHistoryLokiOnly`                 | Disable Grafana alerts from emitting annotations when a remote Loki instance is available.                                                                                                                                                                                        |
+| `unifiedRequestLog`                         | Writes error logs to the request logger                                                                                                                                                                                                                                           |
+| `extraThemes`                               | Enables extra themes                                                                                                                                                                                                                                                              |
+| `lokiPredefinedOperations`                  | Adds predefined query operations to Loki query editor                                                                                                                                                                                                                             |
+| `pluginsFrontendSandbox`                    | Enables the plugins frontend sandbox                                                                                                                                                                                                                                              |
+| `dashboardEmbed`                            | Allow embedding dashboard for external use in Code editors                                                                                                                                                                                                                        |
+| `frontendSandboxMonitorOnly`                | Enables monitor only in the plugin frontend sandbox (if enabled)                                                                                                                                                                                                                  |
+| `lokiFormatQuery`                           | Enables the ability to format Loki queries                                                                                                                                                                                                                                        |
+| `exploreScrollableLogsContainer`            | Improves the scrolling behavior of logs in Explore                                                                                                                                                                                                                                |
+| `pluginsDynamicAngularDetectionPatterns`    | Enables fetching Angular detection patterns for plugins from GCOM and fallback to hardcoded ones                                                                                                                                                                                  |
+| `vizAndWidgetSplit`                         | Split panels between visualizations and widgets                                                                                                                                                                                                                                   |
+| `prometheusIncrementalQueryInstrumentation` | Adds RudderStack events to incremental queries                                                                                                                                                                                                                                    |
+| `logsExploreTableVisualisation`             | A table visualisation for logs in Explore                                                                                                                                                                                                                                         |
+| `awsDatasourcesTempCredentials`             | Support temporary security credentials in AWS plugins for Grafana Cloud customers                                                                                                                                                                                                 |
+| `mlExpressions`                             | Enable support for Machine Learning in server-side expressions                                                                                                                                                                                                                    |
+| `traceQLStreaming`                          | Enables response streaming of TraceQL queries of the Tempo data source                                                                                                                                                                                                            |
+| `metricsSummary`                            | Enables metrics summary queries in the Tempo data source                                                                                                                                                                                                                          |
+| `grafanaAPIServer`                          | Enable Kubernetes API Server for Grafana resources                                                                                                                                                                                                                                |
+| `grafanaAPIServerWithExperimentalAPIs`      | Register experimental APIs with the k8s API server                                                                                                                                                                                                                                |
+| `featureToggleAdminPage`                    | Enable admin page for managing feature toggles from the Grafana front-end                                                                                                                                                                                                         |
+| `permissionsFilterRemoveSubquery`           | Alternative permission filter implementation that does not use subqueries for fetching the dashboard folder                                                                                                                                                                       |
+| `influxdbSqlSupport`                        | Enable InfluxDB SQL query language support with new querying UI                                                                                                                                                                                                                   |
+| `angularDeprecationUI`                      | Display new Angular deprecation-related UI features                                                                                                                                                                                                                               |
+| `dashgpt`                                   | Enable AI powered features in dashboards                                                                                                                                                                                                                                          |
+| `sseGroupByDatasource`                      | Send query to the same datasource in a single request when using server side expressions                                                                                                                                                                                          |
+| `requestInstrumentationStatusSource`        | Include a status source label for request metrics and logs                                                                                                                                                                                                                        |
+| `libraryPanelRBAC`                          | Enables RBAC support for library panels                                                                                                                                                                                                                                           |
+| `wargamesTesting`                           | Placeholder feature flag for internal testing                                                                                                                                                                                                                                     |
+| `externalCorePlugins`                       | Allow core plugins to be loaded as external                                                                                                                                                                                                                                       |
+| `pluginsAPIMetrics`                         | Sends metrics of public grafana packages usage by plugins                                                                                                                                                                                                                         |
+| `httpSLOLevels`                             | Adds SLO level to http request metrics                                                                                                                                                                                                                                            |
+| `panelMonitoring`                           | Enables panel monitoring through logs and measurements                                                                                                                                                                                                                            |
+| `enableNativeHTTPHistogram`                 | Enables native HTTP Histograms                                                                                                                                                                                                                                                    |
+| `formatString`                              | Enable format string transformer                                                                                                                                                                                                                                                  |
+| `transformationsVariableSupport`            | Allows using variables in transformations                                                                                                                                                                                                                                         |
+| `kubernetesPlaylists`                       | Use the kubernetes API in the frontend for playlists                                                                                                                                                                                                                              |
+| `navAdminSubsections`                       | Splits the administration section of the nav tree into subsections                                                                                                                                                                                                                |
+| `recoveryThreshold`                         | Enables feature recovery threshold (aka hysteresis) for threshold server-side expression                                                                                                                                                                                          |
+| `teamHttpHeaders`                           | Enables datasources to apply team headers to the client requests                                                                                                                                                                                                                  |
+| `awsDatasourcesNewFormStyling`              | Applies new form styling for configuration and query editors in AWS plugins                                                                                                                                                                                                       |
+| `cachingOptimizeSerializationMemoryUsage`   | If enabled, the caching backend gradually serializes query responses for the cache, comparing against the configured `[caching]max_value_mb` value as it goes. This can can help prevent Grafana from running out of memory while attempting to cache very large query responses. |
+| `pluginsInstrumentationStatusSource`        | Include a status source label for plugin request metrics and logs                                                                                                                                                                                                                 |
+| `costManagementUi`                          | Toggles the display of the cost management ui plugin                                                                                                                                                                                                                              |
 
 ## Development feature toggles
 
@@ -160,3 +164,4 @@ The following toggles require explicitly setting Grafana's [app mode]({{< relref
 | `externalServiceAuth`     | Starts an OAuth2 authentication provider for external services                               |
 | `idForwarding`            | Generate signed id token for identity that can be forwarded to plugins and external services |
 | `externalServiceAccounts` | Automatic service account and token setup for plugins                                        |
+| `panelTitleSearchInV1`    | Enable searching for dashboards using panel title in search v1                               |
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md
index b4372fb706838..99c6ccd74be2f 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md
@@ -194,6 +194,7 @@ The table below describes all SAML configuration options. Continue reading below
 | `assertion_attribute_org`                                  | No       | Friendly name or name of the attribute within the SAML assertion to use as the user organization                                                                                                             |                                                       |
 | `allowed_organizations`                                    | No       | List of comma- or space-separated organizations. User should be a member of at least one organization to log in.                                                                                             |                                                       |
 | `org_mapping`                                              | No       | List of comma- or space-separated Organization:OrgId:Role mappings. Organization can be `*` meaning "All users". Role is optional and can have the following values: `Viewer`, `Editor` or `Admin`.          |                                                       |
+| `role_values_none`                                         | No       | List of comma- or space-separated roles which will be mapped into the None role                                                                                                                              |                                                       |
 | `role_values_editor`                                       | No       | List of comma- or space-separated roles which will be mapped into the Editor role                                                                                                                            |                                                       |
 | `role_values_admin`                                        | No       | List of comma- or space-separated roles which will be mapped into the Admin role                                                                                                                             |                                                       |
 | `role_values_grafana_admin`                                | No       | List of comma- or space-separated roles which will be mapped into the Grafana Admin (Super Admin) role                                                                                                       |                                                       |
@@ -364,6 +365,7 @@ Available in Grafana version 7.0 and later.
 Role sync allows you to map user roles from an identity provider to Grafana. To enable role sync, configure role attribute and possible values for the Editor, Admin, and Grafana Admin roles. For more information about user roles, refer to [Roles and permissions]({{< relref "../../../../administration/roles-and-permissions" >}}).
 
 1. In the configuration file, set [`assertion_attribute_role`]({{< relref "../../../configure-grafana/enterprise-configuration#assertion_attribute_role" >}}) option to the attribute name where the role information will be extracted from.
+1. Set the [`role_values_none`]({{< relref "../../../configure-grafana/enterprise-configuration#role_values_none" >}}) option to the values mapped to the `None` role.
 1. Set the [`role_values_editor`]({{< relref "../../../configure-grafana/enterprise-configuration#role_values_editor" >}}) option to the values mapped to the `Editor` role.
 1. Set the [`role_values_admin`]({{< relref "../../../configure-grafana/enterprise-configuration#role_values_admin" >}}) option to the values mapped to the organization `Admin` role.
 1. Set the [`role_values_grafana_admin`]({{< relref "../../../configure-grafana/enterprise-configuration#role_values_grafana_admin" >}}) option to the values mapped to the `Grafana Admin` role.
@@ -377,6 +379,7 @@ Example configuration:
 ```ini
 [auth.saml]
 assertion_attribute_role = role
+role_values_none = none, external
 role_values_editor = editor, developer
 role_values_admin = admin, operator
 role_values_grafana_admin = superadmin
diff --git a/docs/sources/setup-grafana/installation/docker/index.md b/docs/sources/setup-grafana/installation/docker/index.md
index a2232db127791..31ae58ffe544e 100644
--- a/docs/sources/setup-grafana/installation/docker/index.md
+++ b/docs/sources/setup-grafana/installation/docker/index.md
@@ -38,15 +38,11 @@ docker run -d -p 3000:3000 --name=grafana grafana/grafana-enterprise
 
 Where:
 
-run = run directly from the command line
-
-`d` = run in the background
-
-`p` = assign the port number, which in this case is `3000`
-
-`name` = assign a logical name to the container, for example, `grafana`
-
-`grafana/grafana-enterprise` = the image to run in the container
+- [`docker run`](https://docs.docker.com/engine/reference/commandline/run/) is a Docker CLI command that runs a new container from an image
+- `-d` (`--detach`) runs the container in the background
+- `-p <host-port>:<container-port>` (`--publish`) publish a container's port(s) to the host, allowing you to reach the container's port via a host port. In this case, we can reach the container's port `3000` via the host's port `3000`
+- `--name` assign a logical name to the container (e.g. `grafana`). This allows you to refer to the container by name instead of by ID.
+- `grafana/grafana-enterprise` is the image to run
 
 ### Stop the Grafana container
 
@@ -68,24 +64,24 @@ docker stop grafana
 
 ### Save your Grafana data
 
-When you use Docker containers, their data is temporary by default. If you don't specify where to store the information, all the Grafana data will be lost when you stop the Docker container. To avoid losing your data, you can set up [persistent storage](https://docs.docker.com/storage/volumes/) or [bind mounts](https://docs.docker.com/storage/bind-mounts/) for your container.
+By default, Grafana uses an embedded SQLite version 3 database to store configuration, users, dashboards, and other data. When you run Docker images as containers, changes to these Grafana data are written to the filesystem within the container, which will only persist for as long as the container exists. If you stop and remove the container, any filesystem changes (i.e. the Grafana data) will be discarded. To avoid losing your data, you can set up persistent storage using [Docker volumes](https://docs.docker.com/storage/volumes/) or [bind mounts](https://docs.docker.com/storage/bind-mounts/) for your container.
 
 > **Note:** Though both methods are similar, there is a slight difference. If you want your storage to be fully managed by Docker and accessed only through Docker containers and the Docker CLI, you should choose to use persistent storage. However, if you need full control of the storage and want to allow other processes besides Docker to access or modify the storage layer, then bind mounts is the right choice for your environment.
 
-#### Use persistent storage (recommended)
+#### Use Docker volumes (recommended)
 
-It is recommended to have persistent storage because, without it, all data will be lost once the container is shut down. Use this method when you want the Docker service to manage the storage volume fully.
+Use Docker volumes when you want the Docker Engine to manage the storage volume.
 
-To use persistent storage, complete the following steps:
+To use Docker volumes for persistent storage, complete the following steps:
 
-1. Create a Grafana Docker volume `grafana-storage` by running the following commands:
+1. Create a Docker volume to be used by the Grafana container, giving it a descriptive name (e.g. `grafana-storage`). Run the following command:
 
    ```bash
    # create a persistent volume for your data
    docker volume create grafana-storage
 
    # verify that the volume was created correctly
-   # you should see a json output
+   # you should see some JSON output
    docker volume inspect grafana-storage
    ```
 
@@ -99,15 +95,15 @@ To use persistent storage, complete the following steps:
 
 #### Use bind mounts
 
-If you plan to use folders on your host for the database or configuration when running Grafana in Docker, you must start the container with a user with permission to access and write to the folder you map.
+If you plan to use directories on your host for the database or configuration when running Grafana in Docker, you must start the container with a user with permission to access and write to the directory you map.
 
 To use bind mounts, run the following command:
 
 ```bash
-# create a folder for your data
+# create a directory for your data
 mkdir data
 
-# start grafana with your user id and using the data folder
+# start grafana with your user id and using the data directory
 docker run -d -p 3000:3000 --name=grafana \
   --user "$(id -u)" \
   --volume "$PWD/data:/var/lib/grafana" \
@@ -158,7 +154,7 @@ To install plugins in the Docker container, complete the following steps:
 
    > **Note:** If you do not specify a version number, the latest version is used.
 
-1. To install a plugin from a custom URL, use the following convention to specify the URL: `<url to plugin zip>;<plugin install folder name>`.
+1. To install a plugin from a custom URL, use the following convention to specify the URL: `<url to plugin zip>;<plugin install directory name>`.
 
    For example:
 
@@ -170,7 +166,7 @@ To install plugins in the Docker container, complete the following steps:
 
 ## Example
 
-The following example runs the latest stable version of Grafana, listening on port 3000, with the container named `grafana`, persistent storage in the grafana-storage docker volume, the server root URL set, and the official [clock panel](/grafana/plugins/grafana-clock-panel) plugin installed.
+The following example runs the latest stable version of Grafana, listening on port 3000, with the container named `grafana`, persistent storage in the `grafana-storage` docker volume, the server root URL set, and the official [clock panel](/grafana/plugins/grafana-clock-panel) plugin installed.
 
 ```bash
 # create a persistent volume for your data
@@ -212,7 +208,7 @@ To run the latest stable version of Grafana using Docker Compose, complete the f
 
    ```bash
    # first go into the directory where you have created this docker-compose.yaml file
-   cd /path/to/docker-compose-folder
+   cd /path/to/docker-compose-directory
 
    # now create the docker-compose.yaml file
    touch docker-compose.yaml
@@ -260,19 +256,19 @@ docker compose down
 
 ### Save your Grafana data
 
-When you use Docker containers, their data is temporary by default. If you don't specify where to store the information, all the Grafana data will be lost when you stop the Docker container. To avoid losing your data, you can set up [persistent storage](https://docs.docker.com/storage/volumes/) or [bind mounts](https://docs.docker.com/storage/bind-mounts/) for your container.
+By default, Grafana uses an embedded SQLite version 3 database to store configuration, users, dashboards, and other data. When you run Docker images as containers, changes to these Grafana data are written to the filesystem within the container, which will only persist for as long as the container exists. If you stop and remove the container, any filesystem changes (i.e. the Grafana data) will be discarded. To avoid losing your data, you can set up persistent storage using [Docker volumes](https://docs.docker.com/storage/volumes/) or [bind mounts](https://docs.docker.com/storage/bind-mounts/) for your container.
 
-#### Use persistent storage (recommended)
+#### Use Docker volumes (recommended)
 
-It is recommended to have persistent storage because without it, all data will be lost once the container is shut down. Use this method when you want the Docker service to fully manage the storage volume.
+Use Docker volumes when you want the Docker Engine to manage the storage volume.
 
-Complete the following steps to use persistent storage.
+To use Docker volumes for persistent storage, complete the following steps:
 
 1. Create a `docker-compose.yaml` file
 
    ```bash
    # first go into the directory where you have created this docker-compose.yaml file
-   cd /path/to/docker-compose-folder
+   cd /path/to/docker-compose-directory
 
    # now create the docker-compose.yaml file
    touch docker-compose.yaml
@@ -290,9 +286,9 @@ Complete the following steps to use persistent storage.
        ports:
          - '3000:3000'
        volumes:
-         - grafana_data:/var/lib/grafana
+         - grafana-storage:/var/lib/grafana
    volumes:
-     grafana_data: {}
+     grafana-storage: {}
    ```
 
 1. Save the file and run the following command:
@@ -303,7 +299,7 @@ Complete the following steps to use persistent storage.
 
 #### Use bind mounts
 
-If you plan to use folders on your host for the database or configuration when running Grafana in Docker, you must start the container with a user that has the permission to access and write to the folder you map.
+If you plan to use directories on your host for the database or configuration when running Grafana in Docker, you must start the container with a user that has the permission to access and write to the directory you map.
 
 To use bind mounts, complete the following steps:
 
@@ -311,13 +307,13 @@ To use bind mounts, complete the following steps:
 
    ```bash
    # first go into the directory where you have created this docker-compose.yaml file
-   cd /path/to/docker-compose-folder
+   cd /path/to/docker-compose-directory
 
    # now create the docker-compose.yaml file
    touch docker-compose.yaml
    ```
 
-1. Create the folder where you will be mounting your data, in this case is `/data` e.g. in your current working directory:
+1. Create the directory where you will be mounting your data, in this case is `/data` e.g. in your current working directory:
 
    ```bash
    mkdir $PWD/data
@@ -350,7 +346,7 @@ To use bind mounts, complete the following steps:
 
 ### Example
 
-The following example runs the latest stable version of Grafana, listening on port 3000, with the container named `grafana`, persistent storage in the grafana-storage docker volume, the server root URL set, and the official [clock panel](/grafana/plugins/grafana-clock-panel) plugin installed.
+The following example runs the latest stable version of Grafana, listening on port 3000, with the container named `grafana`, persistent storage in the `grafana-storage` docker volume, the server root URL set, and the official [clock panel](/grafana/plugins/grafana-clock-panel/) plugin installed.
 
 ```bash
 version: "3.8"
diff --git a/docs/sources/whatsnew/whats-new-next/README.md b/docs/sources/whatsnew/whats-new-next/README.md
index f0bbaa6ee75b3..2fbaf560b8e74 100644
--- a/docs/sources/whatsnew/whats-new-next/README.md
+++ b/docs/sources/whatsnew/whats-new-next/README.md
@@ -10,6 +10,8 @@ Use the following template, replace any `<VARIABLE>` with the appropriate text (
 <!-- <CONTRIBUTOR> -->
 <!-- <ON-PREMISE OFFERING> -->
 
+<DATE>
+
 _Available in <CLOUD AVAILABILITY> in Grafana <CLOUD OFFERING>_
 
 <DESCRIPTION>
@@ -31,6 +33,10 @@ Intended availability of the feature when released outside of Grafana Cloud.
 The information is intentionally commented out so that it isn't displayed in the published page.
 If the feature is not going to be released outside of Grafana Cloud, omit the HTML comment entirely.
 
+## _`DATE`_
+
+The release date of the feature, fully written out. For example: September 12, 2023.
+
 ## _`CLOUD AVAILABILITY`_
 
 One of the following [release life cycle stages](https://grafana.com/docs/release-life-cycle/):
@@ -72,6 +78,8 @@ For example, using the partial URL `/docs/grafana/next/explore/` to link to the
 <!-- Jack Baldry -->
 <!-- OSS, Enterprise -->
 
+September 12, 2023
+
 _Available in public preview in Grafana Cloud Pro and Advanced_
 
 The navigation in Grafana Cloud has been updated in the following ways...
diff --git a/docs/sources/whatsnew/whats-new-next/index.md b/docs/sources/whatsnew/whats-new-next/index.md
index 724719b637cbc..63cfe1541d410 100644
--- a/docs/sources/whatsnew/whats-new-next/index.md
+++ b/docs/sources/whatsnew/whats-new-next/index.md
@@ -18,10 +18,226 @@ weight: -37
 
 Welcome to Grafana Cloud! Read on to learn about the newest changes to Grafana Cloud.
 
+## Alerting insights
+
+<!-- George Robinson -->
+
+October 30, 2023
+
+_Generally available in Grafana Cloud_
+
+Use Alerting insights to monitor your alerting data, discover key trends about your organization’s alert management performance, and find patterns in why things go wrong.
+
+## Correlations editor in Explore
+
+<!-- Kristina Durivage -->
+<!-- OSS, Enterprise -->
+<!-- already in on-prem -->
+
+October 3, 2023
+
+_Available in public preview in Grafana Cloud_
+
+Creating correlations has just become easier. Try out our new correlations editor in **Explore** by selecting the **+ Add > Add correlation** option from the top bar or from the command palette. The editor shows all possible places where you can place data links and guides you through building and testing target queries. For more information, refer to [the documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/correlations/).
+
+To enable this feature, contact Grafana Support.
+
+## Create correlations for provisioned data sources
+
+<!-- Piotr Jamróz -->
+<!-- OSS, Enterprise -->
+<!-- already in on-prem -->
+
+September 13, 2023
+
+_Available in public preview in Grafana Cloud_
+
+You can now create correlations using either the **Administration** page or provisioning, regardless of whether a data source was provisioned or not. In previous versions of Grafana, if a data source was provisioned, the only way to add correlations to it was also with provisioning. Now, that's no longer the case, and you can easily create new correlations mixing both methods—using the **Administration** page or provisioning.
+
+To enable this feature, contact Grafana Support.
+
+## Tempo data source: "Aggregate By" Search option to compute RED metrics over spans aggregated by attribute
+
+<!-- Joey Tawadrous, Jen Villa -->
+<!-- available in on-prem, both open source Grafana and Grafana Enterprise, starting with Grafana 10.2, but also requires Tempo or Grafana Enterprise Traces (GET) v2.2 or greater -->
+
+October 24, 2023
+
+_Experimental in Grafana Cloud_
+
+We've added an **Aggregate By** option to the [TraceQL query editor](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/tempo/query-editor/traceql-search/#write-traceql-queries-using-search) to leverage Grafana Cloud Traces' [metrics summary API](https://grafana.com/docs/grafana-cloud/monitor-infrastructure/traces/metrics-summary-api/). You can calculate RED metrics (total span count, percent erroring spans, and latency information) for spans of `kind=server` received in the last hour that match your filter criteria, grouped by whatever attributes you specify.
+
+This feature is disabled by default. To enable it, file contact Grafana Support.
+
+For more information, refer to the [documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/tempo/query-editor/traceql-search/#optional-use-aggregate-by).
+
+{{< figure src="/media/docs/tempo/metrics-summary-10-2.png" caption="Aggregate by" >}}
+
+## No basic role
+
+<!-- Eric Leijonmarck -->
+<!-- OSS, Enterprise -->
+
+October 12, 2023
+
+_Generally available in Grafana Cloud_
+
+We're excited to introduce the "No basic role," a new basic role with no permissions. A basic role in Grafana dictates the set of actions a user or entity can perform, known as permissions. This new role is especially beneficial if you're aiming for tailored, customized RBAC permissions for your service accounts or users. You can set this as a basic role through the API or UI.
+
+Previously, permissions were granted based on predefined sets of capabilities. Now, with the "No basic role," you have the flexibility to be even more granular.
+
+For more details on basic roles and permissions, refer to the [documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/).
+
+To assign the "No basic role" in your Grafana Cloud stack, contact Grafana Support and ask them to enable the `skip_org_role_sync` feature toggle. You'll be able to change basic roles that are synced using GCom.
+
+## Content outline
+
+<!-- Thanos Karachalios -->
+<!-- OSS,Enterprise -->
+
+October 12, 2023
+
+_Generally Available in Grafana Cloud_
+
+Introducing Content Outline in Grafana **Explore**. We recognized the challenges of complex mixed queries, as well as, lengthy logs and traces results, leading to time-consuming navigation and the loss of context. Content outline is our first step towards seamless navigation from log lines to traces and back to queries ensuring quicker searches while preserving context. Experience efficient, contextual investigations with this update in Grafana Explore. To learn more, refer to the [Content outline documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/explore/#content-outline), as well as the following video demo.
+
+{{< video-embed src="/media/docs/grafana/explore/content-outline-demo.mp4" >}}
+
+## Issues snapshot in Kubernetes Monitoring
+
+<!-- Beverly Buchanan -->
+
+September 29, 2023
+
+_Generally available in Grafana Cloud_
+
+To provide quicker identification and troubleshooting, the home page contains a snapshot of issues that reach the following thresholds:
+
+- Pods that have been in a non-running state for more than 15 minutes
+- Nodes with CPU usage above 90% for more than five minutes
+- Nodes using more than 90% of memory for more than five minutes
+- Persistent Volumes with capacity above 90%
+- Node disks with capacity above 90%
+
+(Release 1.3.1)
+{{< figure max-width="80%" src="/media/docs/grafana-cloud/k8s/K8smon-snapshotview.png" caption="Home page snapshot view" >}}
+
+## Tabs navigation in Kubernetes Monitoring
+
+<!-- Beverly Buchanan -->
+
+September 14, 2023
+
+_Generally available in Grafana Cloud_
+
+Quickly switch between the Cluster, namespace, workload, and Node views on the **Cluster Navigation** page using tabs. (Release 1.3.0)
+
+{{< figure max-width="40%" src="/media/docs/grafana-cloud/k8s/k8smon-clusternav-tabs.png" caption="Tabs on **Cluster Navigation** page" >}}
+
+## Data source menu on Cost and Efficiency views in Kubernetes Monitoring
+
+<!-- Beverly Buchanan -->
+
+September 14, 2023
+
+_Generally available in Grafana Cloud_
+
+You can change the data source you are viewing on the **Cost** and **Efficiency** views. (Release 1.2.1)
+
+## Predict namespace memory usage in Kubernetes Monitoring
+
+<!-- Beverly Buchanan -->
+
+September 14, 2023
+
+_Generally available in Grafana Cloud_
+
+Click **Predict Memory usage** to predict namespace memory usage on the namespace detail page. (Release 1.2.1)
+
+{{< figure max-width="50%" src="/media/docs/grafana-cloud/k8s/k8smon-predict-memusage-namespace.png" caption="**Predict Memory usage** button" >}}
+
+## Streamlined configuration of Kubernetes Monitoring
+
+<!-- Beverly Buchanan -->
+
+September 15, 2023
+
+_Generally available in Grafana Cloud_
+
+Configure with [Grafana Kubernetes Monitoring Helm chart](https://grafana.com/docs/grafana-cloud/monitor-infrastructure/kubernetes-monitoring/configuration/config-k8s-agent-flow) using a streamlined process. With this method, you can set on/off switches to gather metrics, logs, events, traces, and cost metrics. (Release 1.2.0)
+
+{{< figure max-width="60%" src="/media/docs/grafana-cloud/k8s/k8smon-config-wizard.png" caption="Configuration wizard" >}}
+
+## Traces collection with Kubernetes Monitoring
+
+<!-- Beverly Buchanan -->
+
+September 14, 2023
+
+_Generally available in Grafana Cloud_
+
+Collect traces when you configure Kubernetes Monitoring, and then use Tempo to create search queries. Refer to [Navigate to traces](/docs/grafana-cloud/monitor-infrastructure/kubernetes-monitoring/navigate-k8s-monitoring/#navigate-to-traces) for more information. (Release 1.3.0)
+
+## Kafka integration in Kubernetes Monitoring
+
+<!-- Beverly Buchanan -->
+
+September 14, 2023
+
+_Generally available in Grafana Cloud_
+
+The Kafka integration is available for use in Kubernetes Monitoring. (Release 1.3.6)
+
+## Public dashboards
+
+<!-- Thanos Karachalios -->
+<!-- Enterprise -->
+
+October 12, 2023
+
+_Generally Available in Grafana Cloud_
+
+Public dashboards allow you to share your visualizations and insights to a broader audience without the requirement of a login. You can effortlessly use our current sharing model and create a public dashboard URL to share with anyone using the generated public URL link. To learn more, refer to the [Public dashboards documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/dashboard-public/), as well as the following video demo:
+
+{{< video-embed src="/media/docs/grafana/dashboards/public-dashboards-demo.mp4" >}}
+
+## Support for dashboard variables in transformations
+
+<!-- Oscar Kilhed, Victor Marin -->
+<!-- already in on-prem -->
+
+October 24, 2023
+
+_Experimental in Grafana Cloud_
+
+Previously, the only transformation that supported [dashboard variables](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/variables/) was the **Add field from calculation** transformation. We've now extended the support for variables to the **Filter by value**, **Create heatmap**, **Histogram**, **Sort by**, **Limit**, **Filter by name**, and **Join by field** transformations.
+
+We've also made it easier to find the correct dashboard variable by displaying available variables in the fields that support them, either in the drop-down or as a suggestion when you type **$** or press Ctrl + Space:
+
+{{< figure src="/media/docs/grafana/transformations/completion.png" caption="Input with dashboard variable suggestions" >}}
+
+## Role mapping support for Google OIDC
+
+<!-- Jo Guerreiro -->
+<!-- already in on-prem -->
+
+October 24, 2023
+
+_Generally available in Grafana Cloud_
+
+You can now map Google groups to Grafana organizational roles when using Google OIDC.
+This is useful if you want to limit the access users have to your Grafana instance.
+
+We've also added support for controlling allowed groups when using Google OIDC.
+
+Refer to the [Google Authentication documentation](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-security/configure-authentication/google/) to learn how to use these new options.
+
 ## Distributed tracing in Grafana Cloud k6
 
 <!-- Heitor Tashiro Sergent -->
 
+September 19, 2023
+
 _Generally available in Grafana Cloud_
 
 You can now use the Grafana Cloud Traces integration with Grafana Cloud k6 to quickly debug failed performance tests and proactively improve application reliability.
@@ -40,6 +256,8 @@ To learn more, refer to the [Integration with Grafana Cloud Traces documentation
 <!-- Miguel Palau -->
 <!-- OSS, Enterprise -->
 
+September 25, 2023
+
 _Generally available in Grafana Cloud_
 
 The SAP HANA® data source now supports tenant databases connections by using the database name and/or instance number. For more information, refer to [SAP HANA® configuration](/docs/plugins/grafana-saphana-datasource/latest/#configuration).
@@ -51,6 +269,8 @@ The SAP HANA® data source now supports tenant databases connections by using th
 <!-- Taewoo Kim -->
 <!-- OSS, Enterprise -->
 
+August 31, 2023
+
 _Generally available in Grafana Cloud_
 
 The Datadog data source now supports log aggregation. This feature helps aggregate logs/events into buckets and compute metrics and time series. For more information, refer to [Datadog log aggregation](/docs/plugins/grafana-datadog-datasource/latest#logs-analytics--aggregation).
@@ -62,6 +282,8 @@ The Datadog data source now supports log aggregation. This feature helps aggrega
 <!-- Taewoo Kim -->
 <!-- OSS, Enterprise -->
 
+September 1, 2023
+
 _Generally available in Grafana Cloud_
 
 The Datadog data source supports blocking API requests based on upstream rate limits (for metric queries). With this update, you can set a rate limit percentage at which the plugin stops sending queries.
@@ -75,6 +297,8 @@ To learn more, refer to [Datadog data source settings](/docs/plugins/grafana-dat
 <!-- Fabrizio Casati -->
 <!-- OSS, Enterprise -->
 
+August 24, 2023
+
 _Generally available in Grafana Cloud_
 
 The Tempo data source now supports query-type template variables. With this update, you can create variables for which the values are a list of attribute names or attribute values seen on spans received by Tempo.
@@ -88,6 +312,8 @@ To learn more, refer to the following video demo, as well as the [Grafana Variab
 <!-- Fabrizio Casati -->
 <!-- OSS, Enterprise -->
 
+October 3, 2023
+
 _Generally available in Grafana Cloud_
 
 The [TraceQL query editor](https://grafana.com/docs/tempo/latest/traceql/#traceql-query-editor) has been improved to facilitate the creation of TraceQL queries. In particular, it now features improved autocompletion, syntax highlighting, and error reporting.
@@ -99,32 +325,77 @@ The [TraceQL query editor](https://grafana.com/docs/tempo/latest/traceql/#traceq
 <!-- Brenda Muir -->
 <!-- OSS, Enterprise -->
 
+September 13, 2023
+
 _Generally available in Grafana Cloud_
 
 Use the Grafana Alerting - Grafana OnCall integration to effortlessly connect alerts generated by Grafana Alerting with Grafana OnCall. From there, you can route them according to defined escalation chains and schedules.
 
 To learn more, refer to the [Grafana OnCall integration for Alerting documentation](/docs/grafana/next/alerting/alerting-rules/manage-contact-points/configure-oncall/).
 
-## New browse dashboards view
+## New browse dashboards
 
 <!-- Yaelle Chaudy for Frontend Platform -->
 <!-- OSS, Enterprise -->
 
-_Available in public preview in Grafana Cloud_
+September 19, 2023
+
+_Generally available in Grafana Cloud_
 
-We are gradually rolling out our new browse dashboards user interface. With this new feature, we removed the **General** folder, and dashboards now sit at the root level. The feature also provides easier editing functionality, as well as faster search renders.
+The new browse dashboards interface features a more compact design, making it easier to navigate, search for, and manage for your folders and dashboards. The new interface also has many performance improvements, especially for instances with a large number of folders and dashboards.
+
+To make using folders easier and more consistent, there is no longer a special **General** folder. Dashboards without a folder, or dashboards previously in **General**, are now shown at the root level.
 
 To learn more, refer to the following video demo.
 
 {{< video-embed src="/media/docs/grafana/2023-09-11-New-Browse-Dashboards-Enablement-Video.mp4" >}}
 
+## Multiple spansets per trace
+
+<!-- Joey Tawadrous -->
+<!-- OSS, Enterprise -->
+
+October 24, 2023
+
+_Generally available in Grafana Cloud_
+
+The [TraceQL query editor](https://grafana.com/docs/tempo/<TEMPO_VERSION>/traceql/#traceql-query-editor) has been improved to facilitate the grouping of multiple spans per trace in TraceQL queries. For example, when the following `by(resource.service.name)` is added to your TraceQL query, it will group the spans in each trace by `resource.service.name`.
+
+{{< figure src="/media/docs/tempo/multiple-spansets-per-trace-10-2.png" max-width="750px" caption="Multiple spansets per trace" >}}
+
 ## Temporary credentials in CloudWatch data source
 
 <!-- Michael Mandrus, Ida Štambuk, Sarah Zinger  -->
 <!-- Cloud -->
 
+October 24, 2023
+
 _Available in private preview in Grafana Cloud_
 
 The Grafana Assume Role authentication provider lets Grafana Cloud users of the CloudWatch data source authenticate with AWS without having to create and maintain long term AWS Users. Using the new assume role authentication method, you no longer have to rotate access and secret keys in your CloudWatch data source. Instead, Grafana Cloud users can create an identity access and management (IAM) role that has a trust relationship with Grafana's AWS account; Grafana's AWS account will then use AWS Secure Token Service (STS) to create temporary credentials to access the user's AWS data.
 
 To learn more, refer to the [CloudWatch authentication documentation](/docs/grafana/next/datasources/aws-cloudwatch/aws-authentication).
+
+## Recorded queries: Record multiple metrics from a single query
+
+<!-- Kyle Brandt, Observability Metrics -->
+<!-- Enterprise -->
+
+October 3, 2023
+
+_Generally available in Grafana Cloud_
+
+With recorded queries, a single recorded query can now record multiple metrics.
+
+## Permission validation on custom role creation and update
+
+<!-- Mihaly Gyongyosi -->
+<!-- Cloud -->
+
+<!-- already in on-prem -->
+
+August 25, 2023
+
+_Generally available in Grafana Cloud_
+
+With the current release, we enabled RBAC permission validation (`rbac.permission_validation_enabled` setting) by default. This means that the permissions provided in the request during custom role creation or update are validated against the list of [available permissions and their scopes](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/access-control/custom-role-actions-scopes/#action-definitions). If the request contains a permission that is not available or the scope of the permission is not valid, the request is rejected with an error message.
diff --git a/e2e/custom-plugins/frontend-sandbox-panel-test/module.js b/e2e/custom-plugins/frontend-sandbox-panel-test/module.js
index daf8a51d576e5..c30c97c2cf4d6 100644
--- a/e2e/custom-plugins/frontend-sandbox-panel-test/module.js
+++ b/e2e/custom-plugins/frontend-sandbox-panel-test/module.js
@@ -19,7 +19,8 @@ define(['react', '@grafana/data'], function (React, grafanaData) {
     });
   }
 
-  const HelloWorld = () => {
+  const PanelComponent = () => {
+    const [testedGlobals, setTestedGlobals] = React.useState([]);
     const createIframe = () => {
       // direct iframe creation
       const iframe = document.createElement('iframe');
@@ -122,6 +123,41 @@ define(['react', '@grafana/data'], function (React, grafanaData) {
       outsideEl.dataset.sandboxTest = 'true';
     };
 
+    // a function for each global we want to test
+    const globalTests = [
+      function () {
+        try {
+          console.log(window.Prism.languages);
+          return 'Prism';
+        } catch (e) {}
+      },
+      function () {
+        try {
+          console.log(window.jQuery.fn.jquery);
+          console.log(window.$.fn.jquery);
+          return 'jQuery';
+        } catch (e) {}
+      },
+      function () {
+        try {
+          console.log(window.locationSandbox);
+          return 'location';
+        } catch (e) {}
+      },
+    ];
+
+    // it'll assign a variable with one attribute of the Globals
+    // and create a new element with the name of the global.
+    const testGlobals = () => {
+      const results = globalTests.map((test) => test());
+      setTestedGlobals(results);
+    };
+
+    const elements = testedGlobals.map((item) => {
+      const attributes = { 'data-sandbox-global': `${item}` };
+      return React.createElement('div', attributes, item);
+    });
+
     return React.createElement(
       'div',
       { className: 'frontend-sandbox-test' },
@@ -130,11 +166,13 @@ define(['react', '@grafana/data'], function (React, grafanaData) {
         { onClick: createIframe, 'data-testid': 'button-create-iframes' },
         'Create iframes'
       ),
-      React.createElement('button', { onClick: reachOut, 'data-testid': 'button-reach-out' }, 'Reach out')
+      React.createElement('button', { onClick: reachOut, 'data-testid': 'button-reach-out' }, 'Reach out'),
+      React.createElement('button', { onClick: testGlobals, 'data-testid': 'button-test-globals' }, 'Test Globals'),
+      React.createElement('div', null, elements)
     );
   };
 
-  const plugin = new grafanaData.PanelPlugin(HelloWorld);
+  const plugin = new grafanaData.PanelPlugin(PanelComponent);
 
   plugin.setPanelOptions((builder) => {
     builder.addCustomEditor({
diff --git a/e2e/panels-suite/frontend-sandbox-panel.spec.ts b/e2e/panels-suite/frontend-sandbox-panel.spec.ts
index fb237f6f54e4c..bab59b99866a2 100644
--- a/e2e/panels-suite/frontend-sandbox-panel.spec.ts
+++ b/e2e/panels-suite/frontend-sandbox-panel.spec.ts
@@ -11,12 +11,10 @@ describe('Panel sandbox', () => {
 
   describe('Sandbox disabled', () => {
     beforeEach(() => {
-      e2e.flows.openDashboard({
-        uid: DASHBOARD_ID,
-        queryParams: {
-          '__feature.pluginsFrontendSandbox': false,
-        },
+      cy.window().then((win) => {
+        win.localStorage.setItem('grafana.featureToggles', 'pluginsFrontendSandbox=0');
       });
+      cy.reload();
     });
 
     it('Add iframes to body', () => {
@@ -51,7 +49,6 @@ describe('Panel sandbox', () => {
       e2e.flows.openDashboard({
         uid: DASHBOARD_ID,
         queryParams: {
-          '__feature.pluginsFrontendSandbox': false,
           editPanel: 1,
         },
       });
@@ -64,15 +61,10 @@ describe('Panel sandbox', () => {
 
   describe('Sandbox enabled', () => {
     beforeEach(() => {
-      e2e.flows.openDashboard({
-        uid: DASHBOARD_ID,
-        queryParams: {
-          '__feature.pluginsFrontendSandbox': true,
-        },
-      });
       cy.window().then((win) => {
         win.localStorage.setItem('grafana.featureToggles', 'pluginsFrontendSandbox=1');
       });
+      cy.reload();
     });
 
     it('Does not add iframes to body', () => {
@@ -108,7 +100,6 @@ describe('Panel sandbox', () => {
       e2e.flows.openDashboard({
         uid: DASHBOARD_ID,
         queryParams: {
-          '__feature.pluginsFrontendSandbox': false,
           editPanel: 1,
         },
       });
@@ -118,6 +109,13 @@ describe('Panel sandbox', () => {
       cy.wait(100); // small delay to prevent false positives from too fast tests
       cy.get('[data-sandbox-test="panel-editor"]').should('not.exist');
     });
+
+    it('Can access specific window global variables', () => {
+      cy.get('[data-testid="button-test-globals"]').click();
+      cy.get('[data-sandbox-global="Prism"]').should('be.visible');
+      cy.get('[data-sandbox-global="jQuery"]').should('be.visible');
+      cy.get('[data-sandbox-global="location"]').should('be.visible');
+    });
   });
 
   afterEach(() => {
diff --git a/go.mod b/go.mod
index 11835080ef7e6..8273280fcf4d3 100644
--- a/go.mod
+++ b/go.mod
@@ -12,13 +12,12 @@ replace cuelang.org/go => github.com/grafana/cue v0.0.0-20230926092038-971951014
 
 // TODO: following otel replaces to pin the libraries so k8s.io/apiserver doesn't downgrade us inadvertantly
 // will need bumps as we upgrade otel in Grafana
-replace go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // @grafana/backend-platform
-
-replace go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.16.0 // @grafana/backend-platform
-
-replace go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.16.0 // @grafana/backend-platform
-
-replace go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.16.0 // @grafana/backend-platform
+replace (
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // @grafana/backend-platform
+	go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.19.0 // @grafana/backend-platform
+	go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.19.0 // @grafana/backend-platform
+	go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.19.0 // @grafana/backend-platform
+)
 
 // Override Prometheus version because Prometheus v2.X is tagged as v0.X for Go modules purposes and Go assumes
 // that v1.Y is higher than v0.X, so when we resolve dependencies if any dependency imports v1.Y we'd
@@ -34,10 +33,9 @@ require (
 	cuelang.org/go v0.6.0-0.dev // @grafana/grafana-as-code
 	github.com/Azure/azure-sdk-for-go v65.0.0+incompatible // @grafana/backend-platform
 	github.com/Azure/go-autorest/autorest v0.11.28 // @grafana/backend-platform
-	github.com/BurntSushi/toml v1.2.1 // @grafana/grafana-authnz-team
+	github.com/BurntSushi/toml v1.3.2 // @grafana/grafana-authnz-team
 	github.com/Masterminds/semver v1.5.0 // @grafana/backend-platform
 	github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f // @grafana/backend-platform
-	github.com/apache/arrow/go/v12 v12.0.1 // @grafana/observability-metrics
 	github.com/aws/aws-sdk-go v1.44.325 // @grafana/aws-datasources
 	github.com/beevik/etree v1.2.0 // @grafana/backend-platform
 	github.com/benbjohnson/clock v1.3.5 // @grafana/alerting-squad-backend
@@ -63,11 +61,11 @@ require (
 	github.com/google/uuid v1.3.1 // @grafana/backend-platform
 	github.com/google/wire v0.5.0 // @grafana/backend-platform
 	github.com/gorilla/websocket v1.5.0 // @grafana/grafana-app-platform-squad
-	github.com/grafana/alerting v0.0.0-20231005194306-939f55779e5f // @grafana/alerting-squad-backend
+	github.com/grafana/alerting v0.0.0-20231017091417-a53b5db2235d // @grafana/alerting-squad-backend
 	github.com/grafana/cuetsy v0.1.10 // @grafana/grafana-as-code
 	github.com/grafana/grafana-aws-sdk v0.19.1 // @grafana/aws-datasources
 	github.com/grafana/grafana-azure-sdk-go v1.9.0 // @grafana/backend-platform
-	github.com/grafana/grafana-plugin-sdk-go v0.180.0 // @grafana/plugins-platform-backend
+	github.com/grafana/grafana-plugin-sdk-go v0.185.0 // @grafana/plugins-platform-backend
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // @grafana/backend-platform
 	github.com/hashicorp/go-hclog v1.5.0 // @grafana/plugins-platform-backend
 	github.com/hashicorp/go-plugin v1.4.9 // @grafana/plugins-platform-backend
@@ -105,27 +103,27 @@ require (
 	github.com/yalue/merged_fs v1.2.2 // @grafana/grafana-as-code
 	github.com/yudai/gojsondiff v1.0.0 // @grafana/backend-platform
 	go.opentelemetry.io/collector/pdata v1.0.0-rc8 // @grafana/backend-platform
-	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.42.0 // @grafana/grafana-operator-experience-squad
+	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.45.0 // @grafana/grafana-operator-experience-squad
 	go.opentelemetry.io/otel/exporters/jaeger v1.10.0 // @grafana/backend-platform
-	go.opentelemetry.io/otel/sdk v1.16.0 // @grafana/backend-platform
-	go.opentelemetry.io/otel/trace v1.16.0 // @grafana/backend-platform
-	golang.org/x/crypto v0.12.0 // @grafana/backend-platform
+	go.opentelemetry.io/otel/sdk v1.19.0 // @grafana/backend-platform
+	go.opentelemetry.io/otel/trace v1.19.0 // @grafana/backend-platform
+	golang.org/x/crypto v0.14.0 // @grafana/backend-platform
 	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // @grafana/alerting-squad-backend
-	golang.org/x/net v0.14.0 // @grafana/grafana-bi-squad
+	golang.org/x/net v0.17.0 // @grafana/grafana-bi-squad
 	golang.org/x/oauth2 v0.10.0 // @grafana/grafana-authnz-team
 	golang.org/x/sync v0.3.0 // @grafana/alerting-squad-backend
 	golang.org/x/time v0.3.0 // @grafana/backend-platform
 	golang.org/x/tools v0.12.0 // @grafana/grafana-as-code
 	gonum.org/v1/gonum v0.12.0 // @grafana/observability-metrics
 	google.golang.org/api v0.126.0 // @grafana/backend-platform
-	google.golang.org/grpc v1.57.0 // @grafana/plugins-platform-backend
+	google.golang.org/grpc v1.58.2 // @grafana/plugins-platform-backend
 	google.golang.org/protobuf v1.31.0 // @grafana/plugins-platform-backend
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/ini.v1 v1.67.0 // @grafana/alerting-squad-backend
 	gopkg.in/mail.v2 v2.3.1 // @grafana/backend-platform
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // @grafana/alerting-squad-backend
-	xorm.io/builder v0.3.6 // @grafana/backend-platform
+	xorm.io/builder v0.3.6 // indirect; @grafana/backend-platform
 	xorm.io/core v0.7.3 // @grafana/backend-platform
 	xorm.io/xorm v0.8.2 // @grafana/alerting-squad-backend
 )
@@ -177,7 +175,7 @@ require (
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-msgpack v0.5.5 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // @grafana/grafana-as-code
+	github.com/hashicorp/go-multierror v1.1.1 // indirect; @grafana/alerting-squad
 	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
 	github.com/hashicorp/golang-lru v0.6.0 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
@@ -193,7 +191,7 @@ require (
 	github.com/miekg/dns v1.1.51 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/modern-go/reflect2 v1.0.2 // @grafana/alerting-squad-backend
 	github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect
 	github.com/oklog/run v1.1.0 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
@@ -218,8 +216,8 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.11.0 // @grafana/alerting-squad-backend
 	go.uber.org/goleak v1.2.1 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/text v0.12.0 // @grafana/backend-platform
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // @grafana/backend-platform
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230731193218-e0aa005b6bdf // indirect; @grafana/backend-platform
@@ -245,11 +243,11 @@ require (
 	github.com/huandu/xstrings v1.3.1 // @grafana/partner-datasources
 	github.com/jmoiron/sqlx v1.3.5 // @grafana/backend-platform
 	github.com/matryer/is v1.4.0 // @grafana/grafana-as-code
-	github.com/urfave/cli v1.22.12 // @grafana/backend-platform
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // @grafana/plugins-platform-backend
-	go.opentelemetry.io/contrib/propagators/jaeger v1.17.0 // @grafana/backend-platform
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // @grafana/backend-platform
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // @grafana/backend-platform
+	github.com/urfave/cli v1.22.14 // @grafana/backend-platform
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 // @grafana/plugins-platform-backend
+	go.opentelemetry.io/contrib/propagators/jaeger v1.20.0 // @grafana/backend-platform
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // @grafana/backend-platform
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // @grafana/backend-platform
 	gocloud.dev v0.25.0 // @grafana/grafana-app-platform-squad
 )
 
@@ -278,7 +276,7 @@ require (
 
 require (
 	github.com/grafana/grafana-apiserver v0.0.0-20230713001719-88a9ed41992d // @grafana/grafana-app-platform-squad
-	go.opentelemetry.io/otel v1.16.0 // @grafana/backend-platform
+	go.opentelemetry.io/otel v1.19.0 // @grafana/backend-platform
 	k8s.io/apimachinery v0.27.1 // @grafana/grafana-app-platform-squad
 	k8s.io/apiserver v0.27.1 // @grafana/grafana-app-platform-squad
 	k8s.io/client-go v0.27.1 // @grafana/grafana-app-platform-squad
@@ -290,6 +288,8 @@ require github.com/grafana/gofpdf v0.0.0-20231002120153-857cc45be447 // @grafana
 
 require github.com/grafana/pyroscope/api v0.2.0 // @grafana/observability-traces-and-profiling
 
+require github.com/apache/arrow/go/v13 v13.0.0 // @grafana/observability-metrics
+
 require (
 	cloud.google.com/go v0.110.6 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
@@ -300,8 +300,6 @@ require (
 	github.com/agext/levenshtein v1.2.1 // indirect
 	github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
 	github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
-	github.com/apache/arrow/go/v13 v13.0.0 // indirect
-	github.com/apache/thrift v0.18.1 // indirect
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
@@ -354,7 +352,6 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/invopop/yaml v0.2.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/klauspost/asmfmt v1.3.2 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
@@ -362,8 +359,6 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-ieproxy v0.0.3 // indirect
 	github.com/mattn/goveralls v0.0.6 // indirect
-	github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
-	github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
@@ -404,12 +399,12 @@ require (
 	go.etcd.io/etcd/api/v3 v3.5.7 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
 	go.etcd.io/etcd/client/v3 v3.5.7 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
-	go.opentelemetry.io/otel/metric v1.16.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
+	go.opentelemetry.io/otel/metric v1.19.0 // indirect
 	go.starlark.net v0.0.0-20221020143700-22309ac47eac // indirect
 	go.uber.org/multierr v1.10.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/term v0.11.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230731193218-e0aa005b6bdf // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230731193218-e0aa005b6bdf // indirect
 	gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
@@ -484,7 +479,6 @@ require (
 	github.com/wk8/go-ordered-map v1.0.0 // @grafana/backend-platform
 	github.com/xanzy/ssh-agent v0.3.0 // indirect
 	github.com/xlab/treeprint v1.2.0 // @grafana/observability-traces-and-profiling
-	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )
@@ -507,7 +501,4 @@ replace xorm.io/xorm => github.com/grafana/xorm v0.8.3-0.20230627081928-d04aa38a
 // This is required in order to get notification delivery errors from the receivers API.
 replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20230918083811-3513be6760b7
 
-// grpc v1.46.0 removed "WithBalancerName()" API, still in use by weaveworks/commons.
-replace google.golang.org/grpc => google.golang.org/grpc v1.45.0
-
 exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible
diff --git a/go.sum b/go.sum
index 85c749bd5d87c..e68097965cda4 100644
--- a/go.sum
+++ b/go.sum
@@ -4,6 +4,7 @@ buf.build/gen/go/parca-dev/parca/bufbuild/connect-go v1.4.1-20221222094228-8b1d3
 buf.build/gen/go/parca-dev/parca/bufbuild/connect-go v1.4.1-20221222094228-8b1d3d0f62e6.1/go.mod h1:VYzBTKhjl92cl3sv+xznQcJHCezU7qnI0FhBAUb4n8c=
 buf.build/gen/go/parca-dev/parca/protocolbuffers/go v1.28.1-20221222094228-8b1d3d0f62e6.4 h1:3ThI7dcndwVLimMCxuiaVqMJEx5FfMXydD7flXlnDkQ=
 buf.build/gen/go/parca-dev/parca/protocolbuffers/go v1.28.1-20221222094228-8b1d3d0f62e6.4/go.mod h1:7dY08PsClUI7xt/6lEMJERgOcdf3d5Gnchm8qScIhRg=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -155,6 +156,7 @@ cloud.google.com/go/compute v1.12.0/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x
 cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU=
 cloud.google.com/go/compute v1.13.0/go.mod h1:5aPTS0cUNMIc1CE546K+Th6weJUNQErARyZtRXDJ8GE=
 cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvjxega5vAdo=
+cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63rR+SXhcpA=
 cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs=
 cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY=
 cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=
@@ -613,8 +615,8 @@ github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e/go.mod h1:chxPXzS
 github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 h1:OBhqkivkhkMqLPymWEppkm7vgPQY2XsHoEkaMQ0AdZY=
 github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0/go.mod h1:kgDmCTgBzIEPFElEF+FK0SdjAor06dRq2Go927dnQ6o=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
-github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
+github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
 github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
@@ -627,7 +629,6 @@ github.com/GoogleCloudPlatform/cloudsql-proxy v1.29.0/go.mod h1:spvB9eLJH9dutlbP
 github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
 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/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU=
 github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
 github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
@@ -702,15 +703,11 @@ github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 h1:yL7+Jz0jTC6yykIK/Wh74gnTJnrG
 github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
 github.com/apache/arrow/go/arrow v0.0.0-20210223225224-5bea62493d91/go.mod h1:c9sxoIT3YgLxH4UhLOCKaBlEojuMhVYpk4Ntv3opUTQ=
 github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0=
-github.com/apache/arrow/go/v12 v12.0.1 h1:JsR2+hzYYjgSUkBSaahpqCetqZMr76djX80fF/DiJbg=
-github.com/apache/arrow/go/v12 v12.0.1/go.mod h1:weuTY7JvTG/HDPtMQxEUp7pU73vkLWMLpY67QwZ/WWw=
 github.com/apache/arrow/go/v13 v13.0.0 h1:kELrvDQuKZo8csdWYqBQfyi431x6Zs/YJTEgUuSVcWk=
 github.com/apache/arrow/go/v13 v13.0.0/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
-github.com/apache/thrift v0.18.1 h1:lNhK/1nqjbwbiOPDBPFJVKxgDEGSepKuTh6OLiXW8kg=
-github.com/apache/thrift v0.18.1/go.mod h1:rdQn/dCcDKEWjjylUeueum4vQEjG2v8v2PqriUnbr+I=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
 github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
@@ -886,16 +883,23 @@ github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6D
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng=
 github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs=
 github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
+github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
+github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20230112175826-46e39c7b9b43 h1:XP+uhjN0yBCN/tPkr8Z0BNDc5rZam9RG6UWyf2FrSQ0=
+github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20230112175826-46e39c7b9b43/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E=
 github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw=
@@ -1062,13 +1066,23 @@ github.com/emicklei/proto v1.10.0 h1:pDGyFRVV5RvV+nkBK9iy3q67FBy9Xa7vwrOTE+g5aGw
 github.com/emicklei/proto v1.10.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
 github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
 github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
+github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
-github.com/envoyproxy/go-control-plane v0.11.0 h1:jtLewhRR2vMRNnq2ZZUoCjUlgut+Y0+sDDWPOfwOi1o=
+github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34=
 github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI=
+github.com/envoyproxy/go-control-plane v0.11.1 h1:wSUXTlLfiAQRWs2F+p+EKOY9rUyis1MyGqJ2DIk5HpM=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v0.9.1 h1:PS7VIOgmSVhWUEeZwTe7z7zouA22Cr590PzXKbZHOVY=
+github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo=
 github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w=
+github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA=
 github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
 github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
 github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
@@ -1782,8 +1796,8 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gotestyourself/gotestyourself v1.3.0/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY=
 github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY=
-github.com/grafana/alerting v0.0.0-20231005194306-939f55779e5f h1:zz5YocNyxQ9X8Bvm2ezPOCGKxngrXX1XGLfywqk5+vU=
-github.com/grafana/alerting v0.0.0-20231005194306-939f55779e5f/go.mod h1:6BES5CyEqz7fDAG3MYvJLe0hqGwvIoGDN8A1aNrLGus=
+github.com/grafana/alerting v0.0.0-20231017091417-a53b5db2235d h1:fxHDUyKFc1mfyJAtW+Qxi66dMahYu+o5/lH+f8SoMHg=
+github.com/grafana/alerting v0.0.0-20231017091417-a53b5db2235d/go.mod h1:6BES5CyEqz7fDAG3MYvJLe0hqGwvIoGDN8A1aNrLGus=
 github.com/grafana/codejen v0.0.3 h1:tAWxoTUuhgmEqxJPOLtJoxlPBbMULFwKFOcRsPRPXDw=
 github.com/grafana/codejen v0.0.3/go.mod h1:zmwwM/DRyQB7pfuBjTWII3CWtxcXh8LTwAYGfDfpR6s=
 github.com/grafana/cue v0.0.0-20230926092038-971951014e3f h1:TmYAMnqg3d5KYEAaT6PtTguL2GjLfvr6wnAX8Azw6tQ=
@@ -1808,8 +1822,8 @@ github.com/grafana/grafana-google-sdk-go v0.1.0 h1:LKGY8z2DSxKjYfr2flZsWgTRTZ6HG
 github.com/grafana/grafana-google-sdk-go v0.1.0/go.mod h1:Vo2TKWfDVmNTELBUM+3lkrZvFtBws0qSZdXhQxRdJrE=
 github.com/grafana/grafana-plugin-sdk-go v0.94.0/go.mod h1:3VXz4nCv6wH5SfgB3mlW39s+c+LetqSCjFj7xxPC5+M=
 github.com/grafana/grafana-plugin-sdk-go v0.114.0/go.mod h1:D7x3ah+1d4phNXpbnOaxa/osSaZlwh9/ZUnGGzegRbk=
-github.com/grafana/grafana-plugin-sdk-go v0.180.0 h1:+5aFolBj2H7ze7oejIUjrkmZ9lSydnsbo3e4Kn1CN1Y=
-github.com/grafana/grafana-plugin-sdk-go v0.180.0/go.mod h1:fPX9spPWEzyUg0BLTQbdXCCq7PVSJZGNVKfNpiTQUts=
+github.com/grafana/grafana-plugin-sdk-go v0.185.0 h1:wfnCx53gQO4PMTHvNlifzSU5iIrGSnhjOApIzMrbtGw=
+github.com/grafana/grafana-plugin-sdk-go v0.185.0/go.mod h1:PHK8eQOz3ES28RmImdTHNOTxBZaH6mb/ytJGxk7VVJc=
 github.com/grafana/kindsys v0.0.0-20230508162304-452481b63482 h1:1YNoeIhii4UIIQpCPU+EXidnqf449d0C3ZntAEt4KSo=
 github.com/grafana/kindsys v0.0.0-20230508162304-452481b63482/go.mod h1:GNcfpy5+SY6RVbNGQW264gC0r336Dm+0zgQ5vt6+M8Y=
 github.com/grafana/prometheus-alertmanager v0.25.1-0.20230918083811-3513be6760b7 h1:7gsywzIb39SYZEp9qOnNaxD4d9OOkAfJGvnRUQUtlTM=
@@ -2109,7 +2123,6 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4=
 github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
 github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
@@ -2178,7 +2191,9 @@ github.com/linode/linodego v1.14.1/go.mod h1:NJlzvlNtdMRRkXb0oN6UWzUkj6t+IBsyveH
 github.com/luna-duclos/instrumentedsql v0.0.0-20181127104832-b7d587d28109/go.mod h1:PWUIzhtavmOR965zfawVsHXbEuU1G29BPZ/CB3C7jXk=
 github.com/luna-duclos/instrumentedsql v1.1.2/go.mod h1:4LGbEqDnopzNAiyxPPDXhLspyunZxgPTMJBKtC6U0BQ=
 github.com/luna-duclos/instrumentedsql v1.1.3/go.mod h1:9J1njvFds+zN7y85EDhN9XNQLANWwZt2ULeIC8yMNYs=
+github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
 github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
+github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
 github.com/m3db/prometheus_remote_client_golang v0.4.4 h1:DsAIjVKoCp7Ym35tAOFL1OuMLIdIikAEHeNPHY+yyM8=
 github.com/m3db/prometheus_remote_client_golang v0.4.4/go.mod h1:wHfVbA3eAK6dQvKjCkHhusWYegCk3bDGkA15zymSHdc=
 github.com/magefile/mage v1.11.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
@@ -2282,9 +2297,7 @@ github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJys
 github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
 github.com/miekg/dns v1.1.51 h1:0+Xg7vObnhrz/4ZCZcZh7zPXlmU0aveS2HDBd0m0qSo=
 github.com/miekg/dns v1.1.51/go.mod h1:2Z9d3CP1LQWihRZUf29mQ19yDThaI4DAYzte2CaQW5c=
-github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs=
 github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
-github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI=
 github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
 github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
 github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
@@ -2730,6 +2743,7 @@ github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B
 github.com/spf13/afero v1.2.0/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
+github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
 github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
 github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
@@ -2790,7 +2804,6 @@ github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/subosito/gotenv v1.1.1/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
@@ -2844,8 +2857,8 @@ github.com/unrolled/secure v0.0.0-20180918153822-f340ee86eb8b/go.mod h1:mnPT77IA
 github.com/unrolled/secure v0.0.0-20181005190816-ff9db2ff917f/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/urfave/cli v1.22.12 h1:igJgVw1JdKH+trcLWLeLwZjU9fEfPesQ+9/e4MQ44S8=
-github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8=
+github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk=
+github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA=
 github.com/urfave/cli/v2 v2.25.0 h1:ykdZKuQey2zq0yin/l7JOm9Mh+pg72ngYMeB0ABn6q8=
 github.com/urfave/cli/v2 v2.25.0/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
@@ -2978,40 +2991,39 @@ go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/collector/pdata v1.0.0-rc8 h1:vBikWdZFsRiT5dVsLQhnE99w3edM7eem3Q9dSqMlStE=
 go.opentelemetry.io/collector/pdata v1.0.0-rc8/go.mod h1:BVCBhWgclYCh7Oi6BkMiQfRa6MXv1uRTlKXuL5oBby8=
 go.opentelemetry.io/contrib v0.18.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 h1:ZOLJc06r4CB42laIXg/7udr0pbZyuAihN10A/XuiQRY=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0/go.mod h1:5z+/ZWJQKXa9YT34fQNx5K8Hd1EoIhvtUygUQPqEOgQ=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 h1:RsQi0qJ2imFfCvZabqzM9cNXBG8k6gXMv1A0cXRmH6A=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0/go.mod h1:vsh3ySueQCiKPxFLvjWC4Z135gIa34TQ/NSqkDTZYUM=
 go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.18.0/go.mod h1:iK1G0FgHurSJ/aYLg5LpnPI0pqdanM73S3dhyDp0Lk4=
-go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.42.0 h1:0vzgiFDsCh/jxRCR1xcRrtMoeCu2itXz/PsXst5P8rI=
-go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.42.0/go.mod h1:y0vOY2OKFMOTvwxKfurStPayUUKGHlNeVqNneHmFXr0=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8=
-go.opentelemetry.io/contrib/propagators/jaeger v1.17.0 h1:Zbpbmwav32Ea5jSotpmkWEl3a6Xvd4tw/3xxGO1i05Y=
-go.opentelemetry.io/contrib/propagators/jaeger v1.17.0/go.mod h1:tcTUAlmO8nuInPDSBVfG+CP6Mzjy5+gNV4mPxMbL0IA=
+go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.45.0 h1:2ea0IkZBsWH+HA2GkD+7+hRw2u97jzdFyRtXuO14a1s=
+go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.45.0/go.mod h1:4m3RnBBb+7dB9d21y510oO1pdB1V4J6smNf14WXcBFQ=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 h1:x8Z78aZx8cOF0+Kkazoc7lwUNMGy0LrzEMxTm4BbTxg=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0/go.mod h1:62CPTSry9QZtOaSsE3tOzhx6LzDhHnXJ6xHeMNNiM6Q=
+go.opentelemetry.io/contrib/propagators/jaeger v1.20.0 h1:iVhNKkMIpzyZqxk8jkDU2n4DFTD+FbpGacvooxEvyyc=
+go.opentelemetry.io/contrib/propagators/jaeger v1.20.0/go.mod h1:cpSABr0cm/AH/HhbJjn+AudBVUMgZWdfN3Gb+ZqxSZc=
 go.opentelemetry.io/contrib/samplers/jaegerremote v0.9.0 h1:zRi6a8uX+cJGTPLXRPjFEzN27a26k5R7LiLK87ntXgg=
 go.opentelemetry.io/contrib/samplers/jaegerremote v0.9.0/go.mod h1:pzJOLTppaPbiPjPZEwGRf0VWx6G07hhOqznjKXIMkEk=
-go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s=
-go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4=
+go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
+go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
 go.opentelemetry.io/otel/exporters/jaeger v1.10.0 h1:7W3aVVjEYayu/GOqOVF4mbTvnCuxF1wWu3eRxFGQXvw=
 go.opentelemetry.io/otel/exporters/jaeger v1.10.0/go.mod h1:n9IGyx0fgyXXZ/i0foLHNxtET9CzXHzZeKCucvRBFgA=
 go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0/go.mod h1:UFG7EBMRdXyFstOwH028U0sVf+AvukSGhF0g8+dmNG8=
-go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 h1:t4ZwRPU+emrcvM2e9DHd0Fsf0JTPVcbfa/BhTDF03d0=
-go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0/go.mod h1:vLarbg68dH2Wa77g71zmKQqlQ8+8Rq3GRG31uc0WcWI=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0/go.mod h1:HrbCVv40OOLTABmOn1ZWty6CHXkU8DK/Urc43tHug70=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 h1:cbsD4cUcviQGXdw8+bo5x2wazq10SKz8hEbtCRPcU78=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0/go.mod h1:JgXSGah17croqhJfhByOLVY719k1emAXC8MVhCIJlRs=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0/go.mod h1:5w41DY6S9gZrbjuq6Y+753e96WfPha5IcsOSZTtullM=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 h1:TVQp/bboR4mhZSav+MdgXB8FaRho1RC8UwVn3T0vjVc=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0/go.mod h1:I33vtIe0sR96wfrUcilIzLoA3mLHhRmz9S9Te0S3gDo=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 h1:3d+S281UTjM+AbF31XSOYn1qXn3BgIdWl8HNEpx08Jk=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0/go.mod h1:0+KuTDyKL4gjKCF75pHOX4wuzYDUZYfAQdSu43o+Z2I=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.14.0/go.mod h1:+N7zNjIJv4K+DeX67XXET0P+eIciESgaFDBqh+ZJFS4=
-go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo=
-go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4=
+go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
+go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
 go.opentelemetry.io/otel/oteltest v0.18.0/go.mod h1:NyierCU3/G8DLTva7KRzGii2fdxdR89zXKH1bNWY7Bo=
 go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM=
-go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE=
-go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4=
-go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs=
-go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0=
+go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=
+go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A=
+go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
+go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
 go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
 go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
 go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
@@ -3123,8 +3135,9 @@ golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
 golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
-golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
 golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -3158,6 +3171,7 @@ golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeap
 golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -3193,6 +3207,7 @@ golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180816102801-aaf60122140d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180921000356-2f5d2388922f/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180926154720-4dfa2610cdf3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -3265,6 +3280,7 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@@ -3298,8 +3314,9 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
 golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181003184128-c57b0facaced/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -3330,6 +3347,7 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri
 golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec=
 golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=
 golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
 golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
@@ -3475,6 +3493,7 @@ golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -3522,8 +3541,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -3536,8 +3555,9 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0=
 golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -3554,8 +3574,9 @@ golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
 golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -3572,6 +3593,7 @@ golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181003024731-2f84ea8ef872/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181006002542-f60d9635b16a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -3596,6 +3618,7 @@ golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20190102213336-ca9055ed7d04/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190104182027-498d95493402/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190111214448-fc1d57b08d7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190118193359-16909d206f00/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -3786,6 +3809,7 @@ google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60c
 google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0=
 google.golang.org/api v0.126.0 h1:q4GJq+cAdMAC7XP7njvQ4tvohGLiSlytuL4BQxbIZ+o=
 google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 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=
@@ -3891,6 +3915,7 @@ google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2
 google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
 google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
 google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E=
+google.golang.org/genproto v0.0.0-20220329172620-7be39ac1afc7/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
 google.golang.org/genproto v0.0.0-20220401170504-314d38edb7de/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
 google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
 google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
@@ -3954,8 +3979,57 @@ google.golang.org/genproto/googleapis/api v0.0.0-20230731193218-e0aa005b6bdf h1:
 google.golang.org/genproto/googleapis/api v0.0.0-20230731193218-e0aa005b6bdf/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230731193218-e0aa005b6bdf h1:guOdSPaeFgN+jEJwTo1dQ71hdBm+yKSCCKuTRkJzcVo=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230731193218-e0aa005b6bdf/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I=
-google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M=
+google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
+google.golang.org/grpc v1.18.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
+google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
+google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
+google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
 google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
+google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
+google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
+google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
+google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
+google.golang.org/grpc v1.52.0/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY=
+google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
+google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I=
+google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v0.0.0-20200910201057-6591123024b3/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/grpc/examples v0.0.0-20210304020650-930c79186c99/go.mod h1:Ly7ZA/ARzg8fnPU9TyZIxoz33sEUuWX7txiqs8lPTgE=
@@ -4052,6 +4126,7 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=
 gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/kinds/dashboard/dashboard_kind.cue b/kinds/dashboard/dashboard_kind.cue
index 0b32ebff3dad0..1fb8337316605 100644
--- a/kinds/dashboard/dashboard_kind.cue
+++ b/kinds/dashboard/dashboard_kind.cue
@@ -176,6 +176,9 @@ lineage: schemas: [{
 			// TODO -- this should not exist here, it is based on the --grafana-- datasource
 			type?: string @grafanamaturity(NeedsExpertReview)
 
+			// Set to 1 for the standard annotation query all dashboards have by default.
+			builtIn?: number | *0
+
 			// unless datasources have migrated to the target+mapping,
 			// they just spread their query into the base object :(
 			...
diff --git a/kinds/playlist/playlist_kind.cue b/kinds/playlist/playlist_kind.cue
deleted file mode 100644
index a87e1c01a1e95..0000000000000
--- a/kinds/playlist/playlist_kind.cue
+++ /dev/null
@@ -1,47 +0,0 @@
-package kind
-
-name:        "Playlist"
-maturity:    "merged"
-description: "A playlist is a series of dashboards that is automatically rotated in the browser, on a configurable interval."
-
-lineage: schemas: [{
-	version: [0, 0]
-	schema: {
-		spec: {
-			// Unique playlist identifier. Generated on creation, either by the
-			// creator of the playlist of by the application.
-			uid: string
-
-			// Name of the playlist.
-			name: string
-
-			// Interval sets the time between switching views in a playlist.
-			// FIXME: Is this based on a standardized format or what options are available? Can datemath be used?
-			interval: string | *"5m"
-
-			// The ordered list of items that the playlist will iterate over.
-			// FIXME! This should not be optional, but changing it makes the godegen awkward
-			items?: [...#PlaylistItem]
-		} @cuetsy(kind="interface")
-
-		///////////////////////////////////////
-		// Definitions (referenced above) are declared below
-
-		#PlaylistItem: {
-			// Type of the item.
-			type: "dashboard_by_uid" | "dashboard_by_id" | "dashboard_by_tag"
-			// Value depends on type and describes the playlist item.
-			//
-			//  - dashboard_by_id: The value is an internal numerical identifier set by Grafana. This
-			//  is not portable as the numerical identifier is non-deterministic between different instances.
-			//  Will be replaced by dashboard_by_uid in the future. (deprecated)
-			//  - dashboard_by_tag: The value is a tag which is set on any number of dashboards. All
-			//  dashboards behind the tag will be added to the playlist.
-			//  - dashboard_by_uid: The value is the dashboard UID
-			value: string
-
-			// Title is an unused property -- it will be removed in the future
-			title?: string
-		} @cuetsy(kind="interface")
-	}
-}]
diff --git a/lerna.json b/lerna.json
index ea142398f5341..c6ce7b48bd92b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,8 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "packages": ["packages/*"],
-  "version": "10.2.0-pre"
+  "packages": [
+    "packages/*"
+  ],
+  "version": "10.3.0-pre"
 }
diff --git a/package.json b/package.json
index 55027d7d34a55..abe2e821b63ca 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "license": "AGPL-3.0-only",
   "private": true,
   "name": "grafana",
-  "version": "10.2.0-pre",
+  "version": "10.3.0-pre",
   "repository": "github:grafana/grafana",
   "scripts": {
     "build": "yarn i18n:compile && NODE_ENV=production webpack --progress --config scripts/webpack/webpack.prod.js",
@@ -25,7 +25,7 @@
     "lint:sass": "yarn stylelint '{public/sass,packages}/**/*.scss' --cache",
     "test:ci": "yarn i18n:compile && mkdir -p reports/junit && JEST_JUNIT_OUTPUT_DIR=reports/junit jest --ci --reporters=default --reporters=jest-junit -w ${TEST_MAX_WORKERS:-100%}",
     "lint:fix": "yarn lint:ts --fix",
-    "packages:build": "lerna run build --ignore @grafana-plugins/input-datasource",
+    "packages:build": "lerna run build --ignore '@grafana-plugins/*'",
     "packages:clean": "rimraf ./npm-artifacts && lerna run clean --parallel",
     "packages:prepare": "lerna version --no-push --no-git-tag-version --force-publish --exact",
     "packages:pack": "mkdir -p ./npm-artifacts && lerna exec --no-private -- yarn pack --out \"../../npm-artifacts/%s-%v.tgz\"",
@@ -53,7 +53,11 @@
     "betterer": "betterer",
     "betterer:merge": "betterer merge",
     "betterer:stats": "ts-node --transpile-only --project ./scripts/cli/tsconfig.json ./scripts/cli/reportBettererStats.ts",
-    "betterer:issues": "ts-node --transpile-only --project ./scripts/cli/tsconfig.json ./scripts/cli/generateBettererIssues.ts"
+    "betterer:issues": "ts-node --transpile-only --project ./scripts/cli/tsconfig.json ./scripts/cli/generateBettererIssues.ts",
+    "generate-icons-bundle-cache-file": "node ./scripts/generate-icon-bundle.js",
+    "plugin:build": "lerna run build --ignore=\"@grafana/*\"",
+    "plugin:build:commit": "lerna run build:commit --ignore=\"@grafana/*\"",
+    "plugin:build:dev": "lerna run dev --ignore=\"@grafana/*\""
   },
   "grafana": {
     "whatsNewUrl": "https://grafana.com/docs/grafana/next/whatsnew/whats-new-in-v10-1/",
@@ -67,9 +71,9 @@
     "@babel/plugin-proposal-optional-chaining": "7.21.0",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
     "@babel/plugin-transform-react-constant-elements": "7.22.5",
-    "@babel/plugin-transform-runtime": "7.22.9",
+    "@babel/plugin-transform-runtime": "7.23.2",
     "@babel/plugin-transform-typescript": "7.22.9",
-    "@babel/preset-env": "7.22.9",
+    "@babel/preset-env": "7.23.2",
     "@babel/preset-react": "7.22.5",
     "@babel/preset-typescript": "7.23.0",
     "@babel/runtime": "7.23.1",
@@ -102,6 +106,7 @@
     "@types/d3-force": "^3.0.0",
     "@types/d3-scale-chromatic": "3.0.0",
     "@types/debounce-promise": "3.1.6",
+    "@types/diff": "^5",
     "@types/eslint": "8.44.0",
     "@types/file-saver": "2.0.5",
     "@types/glob": "^8.0.0",
@@ -168,14 +173,14 @@
     "esbuild": "0.18.12",
     "esbuild-loader": "3.0.1",
     "esbuild-plugin-browserslist": "^0.8.0",
-    "eslint": "8.44.0",
+    "eslint": "8.51.0",
     "eslint-config-prettier": "8.8.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "27.2.3",
-    "eslint-plugin-jsdoc": "46.4.3",
+    "eslint-plugin-jest": "27.4.2",
+    "eslint-plugin-jsdoc": "46.8.2",
     "eslint-plugin-jsx-a11y": "6.7.1",
     "eslint-plugin-lodash": "7.4.0",
-    "eslint-plugin-react": "7.32.2",
+    "eslint-plugin-react": "7.33.2",
     "eslint-plugin-react-hooks": "4.6.0",
     "eslint-webpack-plugin": "4.0.1",
     "expose-loader": "4.1.0",
@@ -194,7 +199,7 @@
     "jest-matcher-utils": "29.3.1",
     "lerna": "5.5.4",
     "mini-css-extract-plugin": "2.7.6",
-    "msw": "1.2.2",
+    "msw": "1.3.2",
     "mutationobserver-shim": "0.3.7",
     "ngtemplate-loader": "2.1.0",
     "node-notifier": "10.0.1",
@@ -239,7 +244,8 @@
     "@emotion/react": "11.11.1",
     "@fingerprintjs/fingerprintjs": "^3.4.2",
     "@glideapps/glide-data-grid": "^5.2.1",
-    "@grafana/aws-sdk": "0.1.3",
+    "@grafana-plugins/grafana-testdata-datasource": "workspace:*",
+    "@grafana/aws-sdk": "0.2.0",
     "@grafana/data": "workspace:*",
     "@grafana/e2e-selectors": "workspace:*",
     "@grafana/experimental": "1.7.0",
@@ -247,11 +253,11 @@
     "@grafana/faro-web-sdk": "1.2.1",
     "@grafana/flamegraph": "workspace:*",
     "@grafana/google-sdk": "0.1.1",
-    "@grafana/lezer-logql": "0.2.0",
+    "@grafana/lezer-logql": "0.2.1",
     "@grafana/lezer-traceql": "0.0.7",
     "@grafana/monaco-logql": "^0.0.7",
     "@grafana/runtime": "workspace:*",
-    "@grafana/scenes": "^1.15.0",
+    "@grafana/scenes": "^1.18.0",
     "@grafana/schema": "workspace:*",
     "@grafana/ui": "workspace:*",
     "@kusto/monaco-kusto": "^7.4.0",
@@ -313,6 +319,7 @@
     "dangerously-set-html-content": "1.0.9",
     "date-fns": "2.30.0",
     "debounce-promise": "3.1.2",
+    "diff": "^5.1.0",
     "emotion": "11.0.0",
     "eventemitter3": "5.0.1",
     "fast-deep-equal": "^3.1.3",
@@ -354,11 +361,11 @@
     "prismjs": "1.29.0",
     "prop-types": "15.8.1",
     "pseudoizer": "^0.1.0",
-    "rc-cascader": "3.12.1",
-    "rc-drawer": "6.3.0",
-    "rc-slider": "10.2.1",
+    "rc-cascader": "3.18.1",
+    "rc-drawer": "6.5.2",
+    "rc-slider": "10.3.1",
     "rc-time-picker": "3.7.3",
-    "rc-tree": "5.7.9",
+    "rc-tree": "5.8.0",
     "re-resizable": "6.9.9",
     "react": "18.2.0",
     "react-beautiful-dnd": "13.1.1",
@@ -431,7 +438,8 @@
   "workspaces": {
     "packages": [
       "packages/*",
-      "plugins-bundled/internal/*"
+      "plugins-bundled/internal/*",
+      "public/app/plugins/*/*"
     ]
   },
   "engines": {
diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index 3315e50bc6edb..3706832ac1eac 100644
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/data",
-  "version": "10.2.0-pre",
+  "version": "10.3.0-pre",
   "description": "Grafana Data Library",
   "keywords": [
     "typescript"
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@braintree/sanitize-url": "6.0.2",
-    "@grafana/schema": "10.2.0-pre",
+    "@grafana/schema": "10.3.0-pre",
     "@types/d3-interpolate": "^3.0.0",
     "@types/string-hash": "1.1.1",
     "d3-interpolate": "3.0.1",
diff --git a/packages/grafana-data/src/dataframe/processDataFrame.ts b/packages/grafana-data/src/dataframe/processDataFrame.ts
index 402f4962508f5..a0e95a773b6c8 100644
--- a/packages/grafana-data/src/dataframe/processDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/processDataFrame.ts
@@ -23,6 +23,7 @@ import {
   PanelData,
   LoadingState,
   GraphSeriesValue,
+  DataFrameWithValue,
 } from '../types/index';
 
 import { arrayToDataFrame } from './ArrayDataFrame';
@@ -303,6 +304,9 @@ export const isTableData = (data: unknown): data is DataFrame => Boolean(data &&
 
 export const isDataFrame = (data: unknown): data is DataFrame => Boolean(data && data.hasOwnProperty('fields'));
 
+export const isDataFrameWithValue = (data: unknown): data is DataFrameWithValue =>
+  Boolean(isDataFrame(data) && data.hasOwnProperty('value'));
+
 /**
  * Inspect any object and return the results as a DataFrame
  */
diff --git a/packages/grafana-data/src/datetime/common.ts b/packages/grafana-data/src/datetime/common.ts
index fa7fb9454ecdd..9f9b3722f3e99 100644
--- a/packages/grafana-data/src/datetime/common.ts
+++ b/packages/grafana-data/src/datetime/common.ts
@@ -1,3 +1,5 @@
+import { isEmpty } from 'lodash';
+
 import { TimeZone, DefaultTimeZone } from '../types/time';
 
 /**
@@ -57,5 +59,8 @@ export const setTimeZoneResolver = (resolver: TimeZoneResolver) => {
  * @public
  */
 export const getTimeZone = <T extends TimeZoneOptions>(options?: T): TimeZone => {
-  return options?.timeZone ?? defaultTimeZoneResolver() ?? DefaultTimeZone;
+  if (options?.timeZone && !isEmpty(options.timeZone)) {
+    return options.timeZone;
+  }
+  return defaultTimeZoneResolver() ?? DefaultTimeZone;
 };
diff --git a/packages/grafana-data/src/datetime/formatter.test.ts b/packages/grafana-data/src/datetime/formatter.test.ts
index 888f3d07c8e1d..18bea1cde7889 100644
--- a/packages/grafana-data/src/datetime/formatter.test.ts
+++ b/packages/grafana-data/src/datetime/formatter.test.ts
@@ -97,17 +97,9 @@ describe('dateTimeFormat', () => {
   });
 
   describe('dateTimeFormatTimeAgo', () => {
-    it('should return the correct format for 3 years ago', () => {
+    it('should return the correct format for years ago', () => {
       const options = { timeZone: 'Europe/Stockholm' };
-      expect(dateTimeFormatTimeAgo(1587126975779, options)).toBe('3 years ago');
-    });
-    it('should return the correct format for 2 year ago', () => {
-      const options = { timeZone: 'Europe/Stockholm' };
-      expect(dateTimeFormatTimeAgo(1626154993000, options)).toBe('2 years ago');
-    });
-    it('should return the correct format for 1 year ago', () => {
-      const options = { timeZone: 'Europe/Stockholm' };
-      expect(dateTimeFormatTimeAgo(1657731795000, options)).toBe('a year ago');
+      expect(dateTimeFormatTimeAgo(1587126975779, options)).toContain('years ago');
     });
   });
   describe('dateTimeFormatWithAbbreviation', () => {
diff --git a/packages/grafana-data/src/themes/context.tsx b/packages/grafana-data/src/themes/context.tsx
new file mode 100644
index 0000000000000..dc87729e9fb76
--- /dev/null
+++ b/packages/grafana-data/src/themes/context.tsx
@@ -0,0 +1,8 @@
+import React from 'react';
+
+import { createTheme } from './createTheme';
+
+/** @public */
+export const ThemeContext = React.createContext(createTheme());
+
+ThemeContext.displayName = 'ThemeContext';
diff --git a/packages/grafana-data/src/themes/index.ts b/packages/grafana-data/src/themes/index.ts
index 80fbed882cdc0..519dc9083d849 100644
--- a/packages/grafana-data/src/themes/index.ts
+++ b/packages/grafana-data/src/themes/index.ts
@@ -15,3 +15,4 @@ export type { ThemeVisualizationColors, ThemeVizColor, ThemeVizHue } from './cre
 /** Exporting the module like this to be able to generate docs properly. */
 import * as colorManipulator from './colorManipulator';
 export { colorManipulator };
+export { ThemeContext } from './context';
diff --git a/packages/grafana-data/src/transformations/fieldReducer.ts b/packages/grafana-data/src/transformations/fieldReducer.ts
index 8bd3076701550..8e2eea0f791e9 100644
--- a/packages/grafana-data/src/transformations/fieldReducer.ts
+++ b/packages/grafana-data/src/transformations/fieldReducer.ts
@@ -30,6 +30,10 @@ export enum ReducerID {
   uniqueValues = 'uniqueValues',
 }
 
+export function isReducerID(id: string): id is ReducerID {
+  return Object.keys(ReducerID).includes(id);
+}
+
 // Internal function
 type FieldReducer = (field: Field, ignoreNulls: boolean, nullAsZero: boolean) => FieldCalcs;
 
diff --git a/packages/grafana-data/src/transformations/transformers.ts b/packages/grafana-data/src/transformations/transformers.ts
index a087bd9a467ef..4086a5613fece 100644
--- a/packages/grafana-data/src/transformations/transformers.ts
+++ b/packages/grafana-data/src/transformations/transformers.ts
@@ -6,6 +6,7 @@ import { filterFieldsTransformer, filterFramesTransformer } from './transformers
 import { filterFieldsByNameTransformer } from './transformers/filterByName';
 import { filterFramesByRefIdTransformer } from './transformers/filterByRefId';
 import { filterByValueTransformer } from './transformers/filterByValue';
+import { formatStringTransformer } from './transformers/formatString';
 import { formatTimeTransformer } from './transformers/formatTime';
 import { groupByTransformer } from './transformers/groupBy';
 import { groupingToMatrixTransformer } from './transformers/groupingToMatrix';
@@ -30,6 +31,7 @@ export const standardTransformers = {
   filterFramesTransformer,
   filterFramesByRefIdTransformer,
   filterByValueTransformer,
+  formatStringTransformer,
   formatTimeTransformer,
   orderFieldsTransformer,
   organizeFieldsTransformer,
diff --git a/packages/grafana-data/src/transformations/transformers/convertFieldType.ts b/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
index 5225d77d4f0a9..f4ef713c709fa 100644
--- a/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
+++ b/packages/grafana-data/src/transformations/transformers/convertFieldType.ts
@@ -1,6 +1,8 @@
 import { map } from 'rxjs/operators';
 
-import { dateTimeParse } from '../../datetime';
+import { TimeZone } from '@grafana/schema';
+
+import { DateTimeOptionsWhenParsing, dateTimeParse } from '../../datetime';
 import { SynchronousDataTransformerInfo } from '../../types';
 import { DataFrame, EnumFieldConfig, Field, FieldType } from '../../types/dataFrame';
 import { fieldMatchers } from '../matchers';
@@ -25,8 +27,13 @@ export interface ConvertFieldTypeOptions {
    * Date format to parse a string datetime
    */
   dateFormat?: string;
-
-  /** When converting to an enumeration, this is the target config */
+  /**
+   * When converting a date to a string an option timezone.
+   */
+  timezone?: TimeZone;
+  /**
+   * When converting to an enumeration, this is the target config
+   */
   enumConfig?: EnumFieldConfig;
 }
 
@@ -36,7 +43,7 @@ export const convertFieldTypeTransformer: SynchronousDataTransformerInfo<Convert
   description: 'Convert a field to a specified field type.',
   defaultOptions: {
     fields: {},
-    conversions: [{ targetField: undefined, destinationType: undefined, dateFormat: undefined }],
+    conversions: [{ targetField: undefined, destinationType: undefined, dateFormat: undefined, timezone: undefined }],
   },
 
   operator: (options, ctx) => (source) =>
@@ -96,7 +103,7 @@ export function convertFieldType(field: Field, opts: ConvertFieldTypeOptions): F
     case FieldType.number:
       return fieldToNumberField(field);
     case FieldType.string:
-      return fieldToStringField(field, opts.dateFormat);
+      return fieldToStringField(field, opts.dateFormat, { timeZone: opts.timezone });
     case FieldType.boolean:
       return fieldToBooleanField(field);
     case FieldType.enum:
@@ -179,12 +186,19 @@ function fieldToBooleanField(field: Field): Field {
   };
 }
 
-function fieldToStringField(field: Field, dateFormat?: string): Field {
+/**
+ * @internal
+ */
+export function fieldToStringField(
+  field: Field,
+  dateFormat?: string,
+  parseOptions?: DateTimeOptionsWhenParsing
+): Field {
   let values = field.values;
 
   switch (field.type) {
     case FieldType.time:
-      values = values.map((v) => dateTimeParse(v).format(dateFormat));
+      values = values.map((v) => dateTimeParse(v, parseOptions).format(dateFormat));
       break;
 
     case FieldType.other:
diff --git a/packages/grafana-data/src/transformations/transformers/formatString.test.ts b/packages/grafana-data/src/transformations/transformers/formatString.test.ts
new file mode 100644
index 0000000000000..ea0eb1325e569
--- /dev/null
+++ b/packages/grafana-data/src/transformations/transformers/formatString.test.ts
@@ -0,0 +1,85 @@
+import { toDataFrame } from '../../dataframe/processDataFrame';
+import { FieldType } from '../../types/dataFrame';
+import { mockTransformationsRegistry } from '../../utils/tests/mockTransformationsRegistry';
+import { fieldMatchers } from '../matchers';
+import { FieldMatcherID } from '../matchers/ids';
+
+import {
+  createStringFormatter,
+  FormatStringOutput,
+  formatStringTransformer,
+  getFormatStringFunction,
+} from './formatString';
+
+const frame = toDataFrame({
+  fields: [
+    {
+      name: 'names',
+      type: FieldType.string,
+      values: ['alice', 'BOB', '  charliE  ', 'david frederick attenborough', 'Emma Fakename', ''],
+    },
+  ],
+});
+
+const fieldMatches = fieldMatchers.get(FieldMatcherID.byName).get('names');
+
+const options = (format: FormatStringOutput, substringStart?: number, substringEnd?: number) => {
+  return {
+    stringField: 'names',
+    substringStart: substringStart ?? 0,
+    substringEnd: substringEnd ?? 100,
+    outputFormat: format,
+  };
+};
+
+describe('Format String Transformer', () => {
+  beforeAll(() => {
+    mockTransformationsRegistry([formatStringTransformer]);
+  });
+
+  it('will convert string to each case', () => {
+    const formats = [
+      FormatStringOutput.UpperCase,
+      FormatStringOutput.LowerCase,
+      FormatStringOutput.SentenceCase,
+      FormatStringOutput.TitleCase,
+      FormatStringOutput.PascalCase,
+      FormatStringOutput.CamelCase,
+      FormatStringOutput.SnakeCase,
+      FormatStringOutput.KebabCase,
+      FormatStringOutput.Trim,
+    ];
+    const newValues = [];
+
+    for (let i = 0; i < formats.length; i++) {
+      const formatter = createStringFormatter(fieldMatches, getFormatStringFunction(options(formats[i])));
+      const newFrame = formatter(frame, [frame]);
+      newValues.push(newFrame[0].values);
+    }
+
+    const answers = [
+      ['ALICE', 'BOB', '  CHARLIE  ', 'DAVID FREDERICK ATTENBOROUGH', 'EMMA FAKENAME', ''], // Upper Case
+      ['alice', 'bob', '  charlie  ', 'david frederick attenborough', 'emma fakename', ''], // Lower Case
+      ['Alice', 'BOB', '  charliE  ', 'David frederick attenborough', 'Emma Fakename', ''], // Sentence Case
+      ['Alice', 'Bob', '  Charlie  ', 'David Frederick Attenborough', 'Emma Fakename', ''], // Title Case
+      ['Alice', 'Bob', 'Charlie', 'DavidFrederickAttenborough', 'EmmaFakename', ''], // Pascal Case
+      ['alice', 'bob', 'charlie', 'davidFrederickAttenborough', 'emmaFakename', ''], // Camel Case
+      ['alice', 'bob', '__charlie__', 'david_frederick_attenborough', 'emma_fakename', ''], // Snake Case
+      ['alice', 'bob', '--charlie--', 'david-frederick-attenborough', 'emma-fakename', ''], // Kebab Case
+      ['alice', 'BOB', 'charliE', 'david frederick attenborough', 'Emma Fakename', ''], // Trim
+    ];
+
+    expect(newValues).toEqual(answers);
+  });
+
+  it('will convert string to substring', () => {
+    const formatter = createStringFormatter(
+      fieldMatches,
+      getFormatStringFunction(options(FormatStringOutput.Substring, 2, 5))
+    );
+    const newFrame = formatter(frame, [frame]);
+    const newValues = newFrame[0].values;
+
+    expect(newValues).toEqual(['ice', 'B', 'cha', 'vid', 'ma ', '']);
+  });
+});
diff --git a/packages/grafana-data/src/transformations/transformers/formatString.ts b/packages/grafana-data/src/transformations/transformers/formatString.ts
new file mode 100644
index 0000000000000..fb72dd4df0e10
--- /dev/null
+++ b/packages/grafana-data/src/transformations/transformers/formatString.ts
@@ -0,0 +1,112 @@
+import { map } from 'rxjs/operators';
+
+import { DataFrame, Field, FieldType } from '../../types';
+import { DataTransformerInfo, FieldMatcher } from '../../types/transformations';
+import { fieldMatchers } from '../matchers';
+import { FieldMatcherID } from '../matchers/ids';
+
+import { DataTransformerID } from './ids';
+
+export enum FormatStringOutput {
+  UpperCase = 'Upper Case',
+  LowerCase = 'Lower Case',
+  SentenceCase = 'Sentence Case',
+  TitleCase = 'Title Case',
+  PascalCase = 'Pascal Case',
+  CamelCase = 'Camel Case',
+  SnakeCase = 'Snake Case',
+  KebabCase = 'Kebab Case',
+  Trim = 'Trim',
+  Substring = 'Substring',
+}
+
+export interface FormatStringTransformerOptions {
+  stringField: string;
+  substringStart: number;
+  substringEnd: number;
+  outputFormat: FormatStringOutput;
+}
+
+const splitToCapitalWords = (input: string) => {
+  const arr = input.split(' ');
+  for (let i = 0; i < arr.length; i++) {
+    arr[i] = arr[i].charAt(0).toUpperCase() + arr[i].slice(1).toLowerCase();
+  }
+  return arr;
+};
+
+export const getFormatStringFunction = (options: FormatStringTransformerOptions) => {
+  return (field: Field) =>
+    field.values.map((value: string) => {
+      switch (options.outputFormat) {
+        case FormatStringOutput.UpperCase:
+          return value.toUpperCase();
+        case FormatStringOutput.LowerCase:
+          return value.toLowerCase();
+        case FormatStringOutput.SentenceCase:
+          return value.charAt(0).toUpperCase() + value.slice(1);
+        case FormatStringOutput.TitleCase:
+          return splitToCapitalWords(value).join(' ');
+        case FormatStringOutput.PascalCase:
+          return splitToCapitalWords(value).join('');
+        case FormatStringOutput.CamelCase:
+          value = splitToCapitalWords(value).join('');
+          return value.charAt(0).toLowerCase() + value.slice(1);
+        case FormatStringOutput.SnakeCase:
+          return value.toLowerCase().split(' ').join('_');
+        case FormatStringOutput.KebabCase:
+          return value.toLowerCase().split(' ').join('-');
+        case FormatStringOutput.Trim:
+          return value.trim();
+        case FormatStringOutput.Substring:
+          return value.substring(options.substringStart, options.substringEnd);
+      }
+    });
+};
+
+export const formatStringTransformer: DataTransformerInfo<FormatStringTransformerOptions> = {
+  id: DataTransformerID.formatString,
+  name: 'Format string',
+  description: 'Manipulate string fields formatting',
+  defaultOptions: { stringField: '', outputFormat: FormatStringOutput.UpperCase },
+  operator: (options) => (source) =>
+    source.pipe(
+      map((data) => {
+        if (data.length === 0) {
+          return data;
+        }
+
+        const fieldMatches = fieldMatchers.get(FieldMatcherID.byName).get(options.stringField);
+        const formatStringFunction = getFormatStringFunction(options);
+
+        const formatter = createStringFormatter(fieldMatches, formatStringFunction);
+
+        return data.map((frame) => ({
+          ...frame,
+          fields: formatter(frame, data),
+        }));
+      })
+    ),
+};
+
+/**
+ * @internal
+ */
+export const createStringFormatter =
+  (fieldMatches: FieldMatcher, formatStringFunction: (field: Field) => string[]) =>
+  (frame: DataFrame, allFrames: DataFrame[]) => {
+    return frame.fields.map((field) => {
+      // Find the configured field
+      if (fieldMatches(field, frame, allFrames)) {
+        const newVals = formatStringFunction(field);
+
+        return {
+          ...field,
+          type: FieldType.string,
+          values: newVals,
+        };
+      }
+
+      return field;
+    });
+  };
diff --git a/packages/grafana-data/src/transformations/transformers/formatTime.test.ts b/packages/grafana-data/src/transformations/transformers/formatTime.test.ts
index 5a63b53bfe7f7..bf3700418a39a 100644
--- a/packages/grafana-data/src/transformations/transformers/formatTime.test.ts
+++ b/packages/grafana-data/src/transformations/transformers/formatTime.test.ts
@@ -13,10 +13,10 @@ describe('Format Time Transformer', () => {
     const options = {
       timeField: 'time',
       outputFormat: 'YYYY-MM',
-      useTimezone: false,
+      timezone: 'utc',
     };
 
-    const formatter = createTimeFormatter(options.timeField, options.outputFormat, options.useTimezone);
+    const formatter = createTimeFormatter(options.timeField, options.outputFormat, options.timezone);
     const frame = toDataFrame({
       fields: [
         {
@@ -35,10 +35,10 @@ describe('Format Time Transformer', () => {
     const options = {
       timeField: 'time',
       outputFormat: 'YYYY-MM h:mm:ss a',
-      useTimezone: false,
+      timezone: 'utc',
     };
 
-    const formatter = createTimeFormatter(options.timeField, options.outputFormat, options.useTimezone);
+    const formatter = createTimeFormatter(options.timeField, options.outputFormat, options.timezone);
     const frame = toDataFrame({
       fields: [
         {
@@ -51,11 +51,11 @@ describe('Format Time Transformer', () => {
 
     const newFrame = formatter(frame.fields);
     expect(newFrame[0].values).toEqual([
-      '2021-02 1:46:40 am',
-      '2023-07 2:00:00 pm',
-      '2023-04 3:20:00 pm',
-      '2023-07 5:34:49 pm',
-      '2023-08 3:20:00 pm',
+      '2021-02 6:46:40 am',
+      '2023-07 8:00:00 pm',
+      '2023-04 9:20:00 pm',
+      '2023-07 11:34:49 pm',
+      '2023-08 9:20:00 pm',
     ]);
   });
 
@@ -63,10 +63,10 @@ describe('Format Time Transformer', () => {
     const options = {
       timeField: 'time',
       outputFormat: 'YYYY-MM h:mm:ss a',
-      useTimezone: false,
+      timezone: 'utc',
     };
 
-    const formatter = createTimeFormatter(options.timeField, options.outputFormat, options.useTimezone);
+    const formatter = createTimeFormatter(options.timeField, options.outputFormat, options.timezone);
     const frame = toDataFrame({
       fields: [
         {
@@ -79,10 +79,10 @@ describe('Format Time Transformer', () => {
 
     const newFrame = formatter(frame.fields);
     expect(newFrame[0].values).toEqual([
-      '2021-02 1:46:40 am',
-      '2023-07 2:00:00 pm',
-      '2023-04 3:20:00 pm',
-      '2023-07 5:34:49 pm',
+      '2021-02 6:46:40 am',
+      '2023-07 8:00:00 pm',
+      '2023-04 9:20:00 pm',
+      '2023-07 11:34:49 pm',
       'Invalid date',
     ]);
   });
diff --git a/packages/grafana-data/src/transformations/transformers/formatTime.ts b/packages/grafana-data/src/transformations/transformers/formatTime.ts
index 66406f0ef4863..bd5a496562b32 100644
--- a/packages/grafana-data/src/transformations/transformers/formatTime.ts
+++ b/packages/grafana-data/src/transformations/transformers/formatTime.ts
@@ -1,29 +1,45 @@
-import moment from 'moment-timezone';
 import { map } from 'rxjs/operators';
 
-import { getTimeZone, getTimeZoneInfo } from '../../datetime';
-import { Field, FieldType } from '../../types';
+import { TimeZone } from '@grafana/schema';
+
+import { DataFrame, Field, TransformationApplicabilityLevels } from '../../types';
 import { DataTransformerInfo } from '../../types/transformations';
 
+import { fieldToStringField } from './convertFieldType';
 import { DataTransformerID } from './ids';
 
 export interface FormatTimeTransformerOptions {
   timeField: string;
   outputFormat: string;
-  useTimezone: boolean;
+  timezone: TimeZone;
 }
 
 export const formatTimeTransformer: DataTransformerInfo<FormatTimeTransformerOptions> = {
   id: DataTransformerID.formatTime,
-  name: 'Format Time',
+  name: 'Format time',
   description: 'Set the output format of a time field',
   defaultOptions: { timeField: '', outputFormat: '', useTimezone: true },
+  isApplicable: (data: DataFrame[]) => {
+    // Search for a time field
+    // if there is one then we can use this transformation
+    for (const frame of data) {
+      for (const field of frame.fields) {
+        if (field.type === 'time') {
+          return TransformationApplicabilityLevels.Applicable;
+        }
+      }
+    }
+
+    return TransformationApplicabilityLevels.NotApplicable;
+  },
+  isApplicableDescription:
+    'The Format time transformation requires a time field to work. No time field could be found.',
   operator: (options) => (source) =>
     source.pipe(
       map((data) => {
         // If a field and a format are configured
         // then format the time output
-        const formatter = createTimeFormatter(options.timeField, options.outputFormat, options.useTimezone);
+        const formatter = createTimeFormatter(options.timeField, options.outputFormat, options.timezone);
 
         if (!Array.isArray(data) || data.length === 0) {
           return data;
@@ -40,37 +56,21 @@ export const formatTimeTransformer: DataTransformerInfo<FormatTimeTransformerOpt
 /**
  * @internal
  */
-export const createTimeFormatter =
-  (timeField: string, outputFormat: string, useTimezone: boolean) => (fields: Field[]) => {
-    const tz = getTimeZone();
-
-    return fields.map((field) => {
-      // Find the configured field
-      if (field.name === timeField) {
-        // Update values to use the configured format
-        const newVals = field.values.map((value) => {
-          const date = moment(value);
-
-          // Apply configured timezone if the
-          // option has been set. Otherwise
-          // use the date directly
-          if (useTimezone) {
-            const info = getTimeZoneInfo(tz, value);
-            const realTz = info !== undefined ? info.ianaName : 'UTC';
-
-            return date.tz(realTz).format(outputFormat);
-          } else {
-            return date.format(outputFormat);
-          }
-        });
-
-        return {
-          ...field,
-          type: FieldType.string,
-          values: newVals,
-        };
+export const createTimeFormatter = (timeField: string, outputFormat: string, timezone: string) => (fields: Field[]) => {
+  return fields.map((field) => {
+    // Find the configured field
+    if (field.name === timeField) {
+      // Update values to use the configured format
+      let formattedField = null;
+      if (timezone) {
+        formattedField = fieldToStringField(field, outputFormat, { timeZone: timezone });
+      } else {
+        formattedField = fieldToStringField(field, outputFormat);
       }
 
-      return field;
-    });
-  };
+      return formattedField;
+    }
+
+    return field;
+  });
+};
diff --git a/packages/grafana-data/src/transformations/transformers/groupBy.ts b/packages/grafana-data/src/transformations/transformers/groupBy.ts
index 61b68a98508d0..e57d15ed9b303 100644
--- a/packages/grafana-data/src/transformations/transformers/groupBy.ts
+++ b/packages/grafana-data/src/transformations/transformers/groupBy.ts
@@ -2,7 +2,7 @@ import { map } from 'rxjs/operators';
 
 import { guessFieldTypeForField } from '../../dataframe/processDataFrame';
 import { getFieldDisplayName } from '../../field/fieldState';
-import { DataFrame, Field, FieldType } from '../../types/dataFrame';
+import { DataFrame, Field, FieldType, TransformationApplicabilityLevels } from '../../types';
 import { DataTransformerInfo } from '../../types/transformations';
 import { reduceField, ReducerID } from '../fieldReducer';
 
@@ -29,7 +29,34 @@ export const groupByTransformer: DataTransformerInfo<GroupByTransformerOptions>
   defaultOptions: {
     fields: {},
   },
+  isApplicable: (data: DataFrame[]) => {
+    let maxFields = 0;
+
+    // Group by needs at least two fields
+    // a field to group on and a field to aggregate
+    // We make sure that at least one frame has at
+    // least two fields
+    for (const frame of data) {
+      if (frame.fields.length > maxFields) {
+        maxFields = frame.fields.length;
+      }
+    }
+
+    return maxFields >= 2
+      ? TransformationApplicabilityLevels.Applicable
+      : TransformationApplicabilityLevels.NotApplicable;
+  },
+  isApplicableDescription: (data: DataFrame[]) => {
+    let maxFields = 0;
+
+    for (const frame of data) {
+      if (frame.fields.length > maxFields) {
+        maxFields = frame.fields.length;
+      }
+    }
 
+    return `The Group by transformation requires a series with at least two fields to work. The maximum number of fields found on a series is ${maxFields}`;
+  },
   /**
    * Return a modified copy of the series. If the transform is not or should not
    * be applied, just return the input series
diff --git a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
index 741c2a50adf56..f600b5ee7ba10 100644
--- a/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
+++ b/packages/grafana-data/src/transformations/transformers/groupingToMatrix.ts
@@ -1,7 +1,14 @@
 import { map } from 'rxjs/operators';
 
 import { getFieldDisplayName } from '../../field/fieldState';
-import { DataFrame, DataTransformerInfo, Field, FieldType, SpecialValue } from '../../types';
+import {
+  DataFrame,
+  DataTransformerInfo,
+  Field,
+  FieldType,
+  SpecialValue,
+  TransformationApplicabilityLevels,
+} from '../../types';
 import { fieldMatchers } from '../matchers';
 import { FieldMatcherID } from '../matchers/ids';
 
@@ -33,7 +40,29 @@ export const groupingToMatrixTransformer: DataTransformerInfo<GroupingToMatrixTr
     rowField: DEFAULT_ROW_FIELD,
     valueField: DEFAULT_VALUE_FIELD,
   },
+  /**
+   * Grouping to matrix requires at least 3 fields to work.
+   */
+  isApplicable: (data: DataFrame[]) => {
+    let numFields = 0;
+
+    for (const frame of data) {
+      numFields += frame.fields.length;
+    }
+
+    return numFields >= 3
+      ? TransformationApplicabilityLevels.Applicable
+      : TransformationApplicabilityLevels.NotApplicable;
+  },
+  isApplicableDescription: (data: DataFrame[]) => {
+    let numFields = 0;
 
+    for (const frame of data) {
+      numFields += frame.fields.length;
+    }
+
+    return `Grouping to matrix requiers at least 3 fields to work. Currently there are ${numFields} fields.`;
+  },
   operator: (options) => (source) =>
     source.pipe(
       map((data) => {
diff --git a/packages/grafana-data/src/transformations/transformers/ids.ts b/packages/grafana-data/src/transformations/transformers/ids.ts
index b3cb08dce242a..efcc57804c48e 100644
--- a/packages/grafana-data/src/transformations/transformers/ids.ts
+++ b/packages/grafana-data/src/transformations/transformers/ids.ts
@@ -38,4 +38,5 @@ export enum DataTransformerID {
   partitionByValues = 'partitionByValues',
   timeSeriesTable = 'timeSeriesTable',
   formatTime = 'formatTime',
+  formatString = 'formatString',
 }
diff --git a/packages/grafana-data/src/transformations/transformers/merge.ts b/packages/grafana-data/src/transformations/transformers/merge.ts
index d1f23459922a8..5abf270b6e5c8 100644
--- a/packages/grafana-data/src/transformations/transformers/merge.ts
+++ b/packages/grafana-data/src/transformations/transformers/merge.ts
@@ -3,7 +3,7 @@ import { map } from 'rxjs/operators';
 
 import { MutableDataFrame } from '../../dataframe';
 import { DataFrame, Field } from '../../types/dataFrame';
-import { DataTransformerInfo } from '../../types/transformations';
+import { DataTransformerInfo, TransformationApplicabilityLevels } from '../../types/transformations';
 
 import { DataTransformerID } from './ids';
 
@@ -19,6 +19,14 @@ export const mergeTransformer: DataTransformerInfo<MergeTransformerOptions> = {
   name: 'Merge series/tables',
   description: 'Merges multiple series/tables into a single serie/table',
   defaultOptions: {},
+  isApplicable: (data: DataFrame[]) => {
+    return data.length > 1
+      ? TransformationApplicabilityLevels.Applicable
+      : TransformationApplicabilityLevels.NotApplicable;
+  },
+  isApplicableDescription: (data: DataFrame[]) => {
+    return `The merge transformation requires at least 2 data series to work. There is currently ${data.length} data series.`;
+  },
   operator: (options) => (source) =>
     source.pipe(
       map((dataFrames) => {
diff --git a/packages/grafana-data/src/transformations/transformers/organize.ts b/packages/grafana-data/src/transformations/transformers/organize.ts
index f910c600e1802..3eb8b04e709c1 100644
--- a/packages/grafana-data/src/transformations/transformers/organize.ts
+++ b/packages/grafana-data/src/transformations/transformers/organize.ts
@@ -1,4 +1,4 @@
-import { DataTransformerInfo } from '../../types/transformations';
+import { DataFrame, DataTransformerInfo, TransformationApplicabilityLevels } from '../../types';
 
 import { filterFieldsByNameTransformer } from './filterByName';
 import { DataTransformerID } from './ids';
@@ -20,7 +20,11 @@ export const organizeFieldsTransformer: DataTransformerInfo<OrganizeFieldsTransf
     indexByName: {},
     renameByName: {},
   },
-
+  isApplicable: (data: DataFrame[]) => {
+    return data.length > 1
+      ? TransformationApplicabilityLevels.NotPossible
+      : TransformationApplicabilityLevels.Applicable;
+  },
   /**
    * Return a modified copy of the series. If the transform is not or should not
    * be applied, just return the input series
diff --git a/packages/grafana-data/src/types/dataFrame.ts b/packages/grafana-data/src/types/dataFrame.ts
index 0154d8014c92f..c4712e91ac47d 100644
--- a/packages/grafana-data/src/types/dataFrame.ts
+++ b/packages/grafana-data/src/types/dataFrame.ts
@@ -247,6 +247,11 @@ export interface DataFrame extends QueryResultBase {
   length: number;
 }
 
+// Data frame that include aggregate value, for use by timeSeriesTableTransformer / chart cell type
+export interface DataFrameWithValue extends DataFrame {
+  value: number | null;
+}
+
 /**
  * @public
  * Like a field, but properties are optional and values may be a simple array
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 345e9fbd3fde1..e4b4ea317d217 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -30,6 +30,7 @@ export interface FeatureToggles {
   migrationLocking?: boolean;
   storage?: boolean;
   correlations?: boolean;
+  exploreContentOutline?: boolean;
   datasourceQueryMultiStatus?: boolean;
   traceToMetrics?: boolean;
   newDBLibrary?: boolean;
@@ -65,7 +66,6 @@ export interface FeatureToggles {
   individualCookiePreferences?: boolean;
   gcomOnlyExternalOrgRoleSync?: boolean;
   prometheusMetricEncyclopedia?: boolean;
-  timeSeriesTable?: boolean;
   influxdbBackendMigration?: boolean;
   clientTokenRotation?: boolean;
   prometheusDataplane?: boolean;
@@ -134,12 +134,17 @@ export interface FeatureToggles {
   idForwarding?: boolean;
   cloudWatchWildCardDimensionValues?: boolean;
   externalServiceAccounts?: boolean;
-  alertingModifiedExport?: boolean;
   panelMonitoring?: boolean;
   enableNativeHTTPHistogram?: boolean;
+  formatString?: boolean;
   transformationsVariableSupport?: boolean;
   kubernetesPlaylists?: boolean;
   navAdminSubsections?: boolean;
   recoveryThreshold?: boolean;
+  teamHttpHeaders?: boolean;
   awsDatasourcesNewFormStyling?: boolean;
+  cachingOptimizeSerializationMemoryUsage?: boolean;
+  panelTitleSearchInV1?: boolean;
+  pluginsInstrumentationStatusSource?: boolean;
+  costManagementUi?: boolean;
 }
diff --git a/packages/grafana-data/src/types/transformations.ts b/packages/grafana-data/src/types/transformations.ts
index 1f9b3be2c47a8..37501f7d98209 100644
--- a/packages/grafana-data/src/types/transformations.ts
+++ b/packages/grafana-data/src/types/transformations.ts
@@ -17,6 +17,21 @@ export interface DataTransformContext {
   interpolate: InterpolateFunction;
 }
 
+/**
+ * We score for how applicable a given transformation is.
+ * Currently :
+ *  0 is considered as not-applicable
+ *  1 is considered applicable
+ *  2 is considered as highly applicable (i.e. should be highlighted)
+ */
+export type TransformationApplicabilityScore = number;
+export enum TransformationApplicabilityLevels {
+  NotPossible = -1,
+  NotApplicable = 0,
+  Applicable = 1,
+  HighlyApplicable = 2,
+}
+
 /**
  * Function that transform data frames (AKA transformer)
  *
@@ -28,6 +43,18 @@ export interface DataTransformerInfo<TOptions = any> extends RegistryItemWithOpt
    * @param options
    */
   operator: (options: TOptions, context: DataTransformContext) => MonoTypeOperatorFunction<DataFrame[]>;
+  /**
+   * Function that is present will indicate whether a transformation is applicable
+   * given the current data.
+   * @param options
+   */
+  isApplicable?: (data: DataFrame[]) => TransformationApplicabilityScore;
+  /**
+   * A description of the applicator. Can either simply be a string
+   * or function which when given the current dataset returns a string.
+   * This way descriptions can be tailored relative to the underlying data.
+   */
+  isApplicableDescription?: string | ((data: DataFrame[]) => string);
 }
 
 /**
diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json
index 8f5c597e1d528..a14c3e70282ed 100644
--- a/packages/grafana-e2e-selectors/package.json
+++ b/packages/grafana-e2e-selectors/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/e2e-selectors",
-  "version": "10.2.0-pre",
+  "version": "10.3.0-pre",
   "description": "Grafana End-to-End Test Selectors Library",
   "keywords": [
     "cli",
diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json
index 9948eefc6b0b5..8098d0f2de3ab 100644
--- a/packages/grafana-e2e/package.json
+++ b/packages/grafana-e2e/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/e2e",
-  "version": "10.2.0-pre",
+  "version": "10.3.0-pre",
   "description": "Grafana End-to-End Test Library",
   "keywords": [
     "cli",
@@ -61,10 +61,10 @@
   },
   "dependencies": {
     "@babel/core": "7.23.0",
-    "@babel/preset-env": "7.22.9",
+    "@babel/preset-env": "7.23.2",
     "@cypress/webpack-preprocessor": "5.17.1",
-    "@grafana/e2e-selectors": "10.2.0-pre",
-    "@grafana/schema": "10.2.0-pre",
+    "@grafana/e2e-selectors": "10.3.0-pre",
+    "@grafana/schema": "10.3.0-pre",
     "@grafana/tsconfig": "^1.2.0-rc1",
     "@mochajs/json-file-reporter": "^1.2.0",
     "babel-loader": "9.1.3",
diff --git a/packages/grafana-eslint-rules/package.json b/packages/grafana-eslint-rules/package.json
index 2ccf7d256552b..061e1debae375 100644
--- a/packages/grafana-eslint-rules/package.json
+++ b/packages/grafana-eslint-rules/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@grafana/eslint-plugin",
   "description": "ESLint rules for use within the Grafana repo. Not suitable (or supported) for external use.",
-  "version": "10.2.0-pre",
+  "version": "10.3.0-pre",
   "main": "./index.cjs",
   "author": "Grafana Labs",
   "license": "Apache-2.0",
@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "@typescript-eslint/types": "^5.46.1",
-    "eslint": "8.44.0",
+    "eslint": "8.51.0",
     "tslib": "2.6.0"
   },
   "private": true
diff --git a/packages/grafana-flamegraph/package.json b/packages/grafana-flamegraph/package.json
index 74da889295b77..105166db5198f 100644
--- a/packages/grafana-flamegraph/package.json
+++ b/packages/grafana-flamegraph/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/flamegraph",
-  "version": "10.2.0-pre",
+  "version": "10.3.0-pre",
   "description": "Grafana flamegraph visualization component",
   "keywords": [
     "grafana",
@@ -44,8 +44,8 @@
   ],
   "dependencies": {
     "@emotion/css": "11.11.2",
-    "@grafana/data": "10.2.0-pre",
-    "@grafana/ui": "10.2.0-pre",
+    "@grafana/data": "10.3.0-pre",
+    "@grafana/ui": "10.3.0-pre",
     "@leeoniya/ufuzzy": "1.0.8",
     "d3": "^7.8.5",
     "lodash": "4.17.21",
@@ -57,7 +57,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.23.0",
-    "@babel/preset-env": "7.22.9",
+    "@babel/preset-env": "7.23.2",
     "@babel/preset-react": "7.22.5",
     "@grafana/tsconfig": "^1.2.0-rc1",
     "@rollup/plugin-node-resolve": "15.2.3",
diff --git a/packages/grafana-plugin-configs/constants.ts b/packages/grafana-plugin-configs/constants.ts
new file mode 100644
index 0000000000000..4ad1a179e18f3
--- /dev/null
+++ b/packages/grafana-plugin-configs/constants.ts
@@ -0,0 +1 @@
+export const DIST_DIR = 'dist';
diff --git a/packages/grafana-plugin-configs/package.json b/packages/grafana-plugin-configs/package.json
new file mode 100644
index 0000000000000..a66637ad320d4
--- /dev/null
+++ b/packages/grafana-plugin-configs/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "@grafana/plugin-configs",
+  "description": "Shared dependencies and files for core plugins",
+  "private": true,
+  "version": "10.3.0-pre",
+  "dependencies": {
+    "tslib": "2.6.0"
+  },
+  "devDependencies": {
+    "@grafana/tsconfig": "^1.2.0-rc1",
+    "copy-webpack-plugin": "11.0.0",
+    "eslint-webpack-plugin": "4.0.1",
+    "fork-ts-checker-webpack-plugin": "8.0.0",
+    "glob": "10.3.3",
+    "replace-in-file-webpack-plugin": "1.0.6",
+    "webpack": "5.88.1"
+  },
+  "packageManager": "yarn@3.6.0"
+}
diff --git a/packages/grafana-plugin-configs/tsconfig.json b/packages/grafana-plugin-configs/tsconfig.json
new file mode 100644
index 0000000000000..5fa5336e958c0
--- /dev/null
+++ b/packages/grafana-plugin-configs/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "alwaysStrict": true,
+    "declaration": false,
+    "resolveJsonModule": true
+  },
+  "ts-node": {
+    "compilerOptions": {
+      "module": "commonjs",
+      "target": "es5",
+      "esModuleInterop": true
+    },
+    "transpileOnly": true
+  },
+  "extends": "@grafana/tsconfig",
+
+  "exclude": ["**/*.test.ts", "**/*.test.tsx", "**/*.spec.ts", "**/*.spec.tsx"],
+  "include": ["./types", "."]
+}
diff --git a/packages/grafana-plugin-configs/types/custom.d.ts b/packages/grafana-plugin-configs/types/custom.d.ts
new file mode 100644
index 0000000000000..64e6eaa6f2391
--- /dev/null
+++ b/packages/grafana-plugin-configs/types/custom.d.ts
@@ -0,0 +1,37 @@
+// Image declarations
+declare module '*.gif' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.jpg' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.jpeg' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.png' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.webp' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.svg' {
+  const content: string;
+  export default content;
+}
+
+// Font declarations
+declare module '*.woff';
+declare module '*.woff2';
+declare module '*.eot';
+declare module '*.ttf';
+declare module '*.otf';
diff --git a/packages/grafana-plugin-configs/utils.ts b/packages/grafana-plugin-configs/utils.ts
new file mode 100644
index 0000000000000..a02a2d8d16f14
--- /dev/null
+++ b/packages/grafana-plugin-configs/utils.ts
@@ -0,0 +1,26 @@
+import fs from 'fs';
+import { glob } from 'glob';
+import path from 'path';
+import process from 'process';
+
+export function getPackageJson() {
+  return require(path.resolve(process.cwd(), 'package.json'));
+}
+
+export function getPluginJson() {
+  return require(path.resolve(process.cwd(), 'plugin.json'));
+}
+
+export async function getEntries(): Promise<Record<string, string>> {
+  const pluginModules = await glob(path.resolve(process.cwd(), `module.{ts,tsx}`));
+  if (pluginModules.length > 0) {
+    return {
+      module: pluginModules[0],
+    };
+  }
+  throw new Error('Could not find module.ts or module.tsx file');
+}
+
+export function hasLicense() {
+  return fs.existsSync(path.resolve(process.cwd(), 'LICENSE'));
+}
diff --git a/packages/grafana-plugin-configs/webpack.config.ts b/packages/grafana-plugin-configs/webpack.config.ts
new file mode 100644
index 0000000000000..243cf76d3087e
--- /dev/null
+++ b/packages/grafana-plugin-configs/webpack.config.ts
@@ -0,0 +1,208 @@
+import CopyWebpackPlugin from 'copy-webpack-plugin';
+import ESLintPlugin from 'eslint-webpack-plugin';
+import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
+import path from 'path';
+import ReplaceInFileWebpackPlugin from 'replace-in-file-webpack-plugin';
+import { Configuration } from 'webpack';
+
+import { DIST_DIR } from './constants';
+import { getPackageJson, getPluginJson, getEntries, hasLicense } from './utils';
+
+function skipFiles(f: string): boolean {
+  if (f.includes('/dist/')) {
+    // avoid copying files already in dist
+    return false;
+  }
+  if (f.includes('/tsconfig.json')) {
+    // avoid copying tsconfig.json
+    return false;
+  }
+  return true;
+}
+
+const config = async (env: any): Promise<Configuration> => {
+  const pluginJson = getPluginJson();
+  const baseConfig: Configuration = {
+    cache: {
+      type: 'filesystem',
+      buildDependencies: {
+        config: [__filename],
+      },
+    },
+
+    context: process.cwd(),
+
+    devtool: env.production ? 'source-map' : 'eval-source-map',
+
+    entry: await getEntries(),
+
+    externals: [
+      'lodash',
+      'jquery',
+      'moment',
+      'slate',
+      'emotion',
+      '@emotion/react',
+      '@emotion/css',
+      'prismjs',
+      'slate-plain-serializer',
+      '@grafana/slate-react',
+      'react',
+      'react-dom',
+      'react-redux',
+      'redux',
+      'rxjs',
+      'react-router',
+      'react-router-dom',
+      'd3',
+      'angular',
+      '@grafana/ui',
+      '@grafana/runtime',
+      '@grafana/data',
+
+      // Mark legacy SDK imports as external if their name starts with the "grafana/" prefix
+      ({ request }, callback) => {
+        const prefix = 'grafana/';
+        const hasPrefix = (request: any) => request.indexOf(prefix) === 0;
+        const stripPrefix = (request: any) => request.substr(prefix.length);
+
+        if (hasPrefix(request)) {
+          return callback(undefined, stripPrefix(request));
+        }
+
+        callback();
+      },
+    ],
+
+    mode: env.production ? 'production' : 'development',
+
+    module: {
+      rules: [
+        {
+          exclude: /(node_modules)/,
+          test: /\.[tj]sx?$/,
+          use: {
+            loader: 'swc-loader',
+            options: {
+              jsc: {
+                baseUrl: '.',
+                target: 'es2015',
+                loose: false,
+                parser: {
+                  syntax: 'typescript',
+                  tsx: true,
+                  decorators: false,
+                  dynamicImport: true,
+                },
+              },
+            },
+          },
+        },
+        {
+          test: /\.css$/,
+          use: ['style-loader', 'css-loader'],
+        },
+        {
+          test: /\.s[ac]ss$/,
+          use: ['style-loader', 'css-loader', 'sass-loader'],
+        },
+        {
+          test: /\.(png|jpe?g|gif|svg)$/,
+          type: 'asset/resource',
+          generator: {
+            // Keep publicPath relative for host.com/grafana/ deployments
+            publicPath: `public/plugins/${pluginJson.id}/img/`,
+            outputPath: 'img/',
+            filename: Boolean(env.production) ? '[hash][ext]' : '[name][ext]',
+          },
+        },
+        {
+          test: /\.(woff|woff2|eot|ttf|otf)(\?v=\d+\.\d+\.\d+)?$/,
+          type: 'asset/resource',
+          generator: {
+            // Keep publicPath relative for host.com/grafana/ deployments
+            publicPath: `public/plugins/${pluginJson.id}/fonts/`,
+            outputPath: 'fonts/',
+            filename: Boolean(env.production) ? '[hash][ext]' : '[name][ext]',
+          },
+        },
+      ],
+    },
+
+    output: {
+      clean: {
+        keep: new RegExp(`(.*?_(amd64|arm(64)?)(.exe)?|go_plugin_build_manifest)`),
+      },
+      filename: '[name].js',
+      library: {
+        type: 'amd',
+      },
+      path: path.resolve(process.cwd(), DIST_DIR),
+      publicPath: `public/plugins/${pluginJson.id}/`,
+    },
+
+    plugins: [
+      new CopyWebpackPlugin({
+        patterns: [
+          // To `compiler.options.output`
+          { from: 'README.md', to: '.', force: true },
+          { from: 'plugin.json', to: '.' },
+          { from: hasLicense() ? 'LICENSE' : '../../../../../LICENSE', to: '.' }, // Point to Grafana License by default
+          { from: 'CHANGELOG.md', to: '.', force: true },
+          { from: '**/*.json', to: '.', filter: skipFiles }, // TODO<Add an error for checking the basic structure of the repo>
+          { from: '**/*.svg', to: '.', noErrorOnMissing: true, filter: skipFiles }, // Optional
+          { from: '**/*.png', to: '.', noErrorOnMissing: true, filter: skipFiles }, // Optional
+          { from: '**/*.html', to: '.', noErrorOnMissing: true, filter: skipFiles }, // Optional
+          { from: 'img/**/*', to: '.', noErrorOnMissing: true, filter: skipFiles }, // Optional
+          { from: 'libs/**/*', to: '.', noErrorOnMissing: true, filter: skipFiles }, // Optional
+          { from: 'static/**/*', to: '.', noErrorOnMissing: true, filter: skipFiles }, // Optional
+        ],
+      }),
+      // Replace certain template-variables in the README and plugin.json
+      new ReplaceInFileWebpackPlugin([
+        {
+          dir: path.resolve(DIST_DIR),
+          files: ['plugin.json', 'README.md'],
+          rules: [
+            {
+              search: /\%VERSION\%/g,
+              replace: env.commit ? `${getPackageJson().version}-${env.commit}` : getPackageJson().version,
+            },
+            {
+              search: /\%TODAY\%/g,
+              replace: new Date().toISOString().substring(0, 10),
+            },
+            {
+              search: /\%PLUGIN_ID\%/g,
+              replace: pluginJson.id,
+            },
+          ],
+        },
+      ]),
+      new ForkTsCheckerWebpackPlugin({
+        async: Boolean(env.development),
+        issue: {
+          include: [{ file: '**/*.{ts,tsx}' }],
+        },
+        typescript: { configFile: path.join(process.cwd(), 'tsconfig.json') },
+      }),
+      new ESLintPlugin({
+        extensions: ['.ts', '.tsx'],
+        lintDirtyModulesOnly: Boolean(env.development), // don't lint on start, only lint changed files
+      }),
+    ],
+
+    resolve: {
+      extensions: ['.js', '.jsx', '.ts', '.tsx'],
+      unsafeCache: true,
+    },
+
+    watchOptions: {
+      ignored: ['**/node_modules', '**/dist', '**/.yarn'],
+    },
+  };
+
+  return baseConfig;
+};
+
+export default config;
diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json
index c5284ff0dd6a6..a0ca950c78a88 100644
--- a/packages/grafana-runtime/package.json
+++ b/packages/grafana-runtime/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/runtime",
-  "version": "10.2.0-pre",
+  "version": "10.3.0-pre",
   "description": "Grafana Runtime Library",
   "keywords": [
     "grafana",
@@ -37,10 +37,10 @@
     "postpack": "mv package.json.bak package.json"
   },
   "dependencies": {
-    "@grafana/data": "10.2.0-pre",
-    "@grafana/e2e-selectors": "10.2.0-pre",
+    "@grafana/data": "10.3.0-pre",
+    "@grafana/e2e-selectors": "10.3.0-pre",
     "@grafana/faro-web-sdk": "1.2.1",
-    "@grafana/ui": "10.2.0-pre",
+    "@grafana/ui": "10.3.0-pre",
     "history": "4.10.1",
     "lodash": "4.17.21",
     "rxjs": "7.8.1",
diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json
index dcb04f54b5c92..6ec2b9cf88dd6 100644
--- a/packages/grafana-schema/package.json
+++ b/packages/grafana-schema/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/schema",
-  "version": "10.2.0-pre",
+  "version": "10.3.0-pre",
   "description": "Grafana Schema Library",
   "keywords": [
     "typescript"
diff --git a/packages/grafana-schema/src/common/common.gen.ts b/packages/grafana-schema/src/common/common.gen.ts
index 1c034f48a77e3..76676b232cc19 100644
--- a/packages/grafana-schema/src/common/common.gen.ts
+++ b/packages/grafana-schema/src/common/common.gen.ts
@@ -756,6 +756,7 @@ export interface TableBarGaugeCellOptions {
  * Sparkline cell options
  */
 export interface TableSparklineCellOptions extends GraphFieldConfig {
+  hideValue?: boolean;
   type: TableCellDisplayMode.Sparkline;
 }
 
diff --git a/packages/grafana-schema/src/common/table.cue b/packages/grafana-schema/src/common/table.cue
index 8f703604a7317..27026f6d79b13 100644
--- a/packages/grafana-schema/src/common/table.cue
+++ b/packages/grafana-schema/src/common/table.cue
@@ -59,6 +59,7 @@ TableBarGaugeCellOptions: {
 TableSparklineCellOptions: {
 	GraphFieldConfig
 	type: TableCellDisplayMode & "sparkline"
+  hideValue?: bool
 } @cuetsy(kind="interface")
 
 // Colored background cell options
diff --git a/packages/grafana-schema/src/index.gen.ts b/packages/grafana-schema/src/index.gen.ts
index 7d1d3d050681b..6576c1ce63f92 100644
--- a/packages/grafana-schema/src/index.gen.ts
+++ b/packages/grafana-schema/src/index.gen.ts
@@ -124,15 +124,6 @@ export type {
 // TODO generate code such that tsc enforces type compatibility between raw and veneer decls
 export type { LibraryPanel } from './veneer/librarypanel.types';
 
-// Raw generated types from Playlist kind.
-export type {
-  Playlist,
-  PlaylistItem
-} from './raw/playlist/x/playlist_types.gen';
-
-// Raw generated enums and default consts from playlist kind.
-export { defaultPlaylist } from './raw/playlist/x/playlist_types.gen';
-
 // Raw generated types from Preferences kind.
 export type {
   Preferences,
diff --git a/packages/grafana-schema/src/raw/composable/alertgroups/panelcfg/x/AlertGroupsPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/alertgroups/panelcfg/x/AlertGroupsPanelCfg_types.gen.ts
index 637ae0fe9430c..a4186f57bc535 100644
--- a/packages/grafana-schema/src/raw/composable/alertgroups/panelcfg/x/AlertGroupsPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/alertgroups/panelcfg/x/AlertGroupsPanelCfg_types.gen.ts
@@ -9,7 +9,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface Options {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts
index 8f90a5613c257..08803997ade75 100644
--- a/packages/grafana-schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts
@@ -9,7 +9,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface Options {
   limit: number;
diff --git a/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts
index 69a5ce4b39733..c86a3d75477aa 100644
--- a/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip, common.OptionsWithTextFormatting {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts
index ffbcc1e6115d4..c4513a6f2dc2a 100644
--- a/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface Options extends common.SingleStatBaseOptions {
   displayMode: common.BarGaugeDisplayMode;
diff --git a/packages/grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts
index 60507742e2496..d1550e115a4ac 100644
--- a/packages/grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export enum VizDisplayMode {
   Candles = 'candles',
diff --git a/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts
index 2f69328fb084b..b5835e56f0d1b 100644
--- a/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export enum HorizontalConstraint {
   Center = 'center',
diff --git a/packages/grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts
index 627d55686dc44..70dc8cebf2df1 100644
--- a/packages/grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface MetricStat {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts
index 946075837d44f..1fe577db3c610 100644
--- a/packages/grafana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts
@@ -9,7 +9,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface Options {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts
index acbfd5312b23b..3f353f364a835 100644
--- a/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts
@@ -9,7 +9,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface Options {
   selectedSeries: number;
diff --git a/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts
index 2ee9860577b7d..ff1ca55673819 100644
--- a/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts
@@ -9,7 +9,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export type UpdateConfig = {
   render: boolean,
diff --git a/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts
index e23aae27ea297..bd1acb20ba2f6 100644
--- a/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export type BucketAggregation = (DateHistogram | Histogram | Terms | Filters | GeoHashGrid | Nested);
 
diff --git a/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts
index 2f69f4ac27692..b00ca10dee6b5 100644
--- a/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface Options extends common.SingleStatBaseOptions {
   minVizHeight: number;
diff --git a/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts
index 86c579785397b..871d8ca1e6a80 100644
--- a/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface Options {
   basemap: ui.MapLayerOptions;
diff --git a/packages/grafana-schema/src/raw/composable/grafanapyroscope/dataquery/x/GrafanaPyroscopeDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/grafanapyroscope/dataquery/x/GrafanaPyroscopeDataQuery_types.gen.ts
index 2d37e3d2087f2..08d7d682b9398 100644
--- a/packages/grafana-schema/src/raw/composable/grafanapyroscope/dataquery/x/GrafanaPyroscopeDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/grafanapyroscope/dataquery/x/GrafanaPyroscopeDataQuery_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export type PyroscopeQueryType = ('metrics' | 'profile' | 'both');
 
diff --git a/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts
index 4879f20dc24c1..f1909d68ff05a 100644
--- a/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 /**
  * Controls the color mode of the heatmap
diff --git a/packages/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts
index cab0e48a19309..9f8052b21bf76 100644
--- a/packages/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts
index 0b68effc85ecf..8ff4bf643a74b 100644
--- a/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface Options {
   dedupStrategy: common.LogsDedupStrategy;
diff --git a/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts
index 5b8c5c60772bb..c1ed7748d119b 100644
--- a/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export enum QueryEditorMode {
   Builder = 'builder',
diff --git a/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts
index 5386a44ad5976..b0c436d796604 100644
--- a/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts
@@ -9,7 +9,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface Options {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts
index 897977ea96e64..bbc7bf9a6ad19 100644
--- a/packages/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts
@@ -9,7 +9,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface ArcOption {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/parca/dataquery/x/ParcaDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/parca/dataquery/x/ParcaDataQuery_types.gen.ts
index e02d1b3e8aae8..725eae429b40c 100644
--- a/packages/grafana-schema/src/raw/composable/parca/dataquery/x/ParcaDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/parca/dataquery/x/ParcaDataQuery_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export type ParcaQueryType = ('metrics' | 'profile' | 'both');
 
diff --git a/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts
index 61ff9f688baaa..ec27259305fb7 100644
--- a/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 /**
  * Select the pie chart display style.
diff --git a/packages/grafana-schema/src/raw/composable/prometheus/dataquery/x/PrometheusDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/prometheus/dataquery/x/PrometheusDataQuery_types.gen.ts
index 71d33de6a0ff9..4b0ccc7fa7c61 100644
--- a/packages/grafana-schema/src/raw/composable/prometheus/dataquery/x/PrometheusDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/prometheus/dataquery/x/PrometheusDataQuery_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export enum QueryEditorMode {
   Builder = 'builder',
diff --git a/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts
index 15d0cc419a81a..842651d79f4e9 100644
--- a/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface Options extends common.SingleStatBaseOptions {
   colorMode: common.BigValueColorMode;
diff --git a/packages/grafana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts
index 5b538683870f5..e4493d028493a 100644
--- a/packages/grafana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts
index 86a56a27ab103..0dc31c87435c8 100644
--- a/packages/grafana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts
index 37ce8b9cd107e..c891a59b1a485 100644
--- a/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface Options {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/tempo/dataquery/x/TempoDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/tempo/dataquery/x/TempoDataQuery_types.gen.ts
index 91f136e78f6d4..539dc05c02259 100644
--- a/packages/grafana-schema/src/raw/composable/tempo/dataquery/x/TempoDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/tempo/dataquery/x/TempoDataQuery_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface TempoQuery extends common.DataQuery {
   filters: Array<TraceqlFilter>;
diff --git a/packages/grafana-schema/src/raw/composable/testdata/dataquery/x/TestDataDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/testdata/dataquery/x/TestDataDataQuery_types.gen.ts
index c8fb0c9fcd543..de0ca9740f027 100644
--- a/packages/grafana-schema/src/raw/composable/testdata/dataquery/x/TestDataDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/testdata/dataquery/x/TestDataDataQuery_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "%VERSION%";
 
 export enum TestDataQueryType {
   Annotations = 'annotations',
diff --git a/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts
index 1d0b5bede3d46..10a6554136953 100644
--- a/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts
@@ -9,7 +9,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export enum TextMode {
   Code = 'code',
diff --git a/packages/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts
index 8f7ffde9faa02..98cc40cd5eeea 100644
--- a/packages/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export interface Options extends common.OptionsWithTimezones {
   legend: common.VizLegendOptions;
diff --git a/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts
index a695474024522..7d981861db206 100644
--- a/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 /**
  * Identical to timeseries... except it does not have timezone settings
diff --git a/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts
index a070d6c1d39c8..32dda0292b416 100644
--- a/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts
@@ -11,7 +11,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "10.2.0-pre";
+export const pluginVersion = "10.3.0-pre";
 
 export enum SeriesMapping {
   Auto = 'auto',
diff --git a/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts b/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
index 99c9b16090d5c..d16491351f700 100644
--- a/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
+++ b/packages/grafana-schema/src/raw/dashboard/x/dashboard_types.gen.ts
@@ -77,6 +77,10 @@ export const defaultAnnotationContainer: Partial<AnnotationContainer> = {
  * FROM: AnnotationQuery in grafana-data/src/types/annotations.ts
  */
 export interface AnnotationQuery {
+  /**
+   * Set to 1 for the standard annotation query all dashboards have by default.
+   */
+  builtIn?: number;
   /**
    * Datasource where the annotations data is
    */
@@ -113,6 +117,7 @@ export interface AnnotationQuery {
 }
 
 export const defaultAnnotationQuery: Partial<AnnotationQuery> = {
+  builtIn: 0,
   enable: true,
   hide: false,
 };
diff --git a/packages/grafana-schema/src/raw/playlist/x/playlist_types.gen.ts b/packages/grafana-schema/src/raw/playlist/x/playlist_types.gen.ts
deleted file mode 100644
index 4f98abe19bfb0..0000000000000
--- a/packages/grafana-schema/src/raw/playlist/x/playlist_types.gen.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     TSResourceJenny
-//     LatestMajorsOrXJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-export interface PlaylistItem {
-  /**
-   * Title is an unused property -- it will be removed in the future
-   */
-  title?: string;
-  /**
-   * Type of the item.
-   */
-  type: ('dashboard_by_uid' | 'dashboard_by_id' | 'dashboard_by_tag');
-  /**
-   * Value depends on type and describes the playlist item.
-   * 
-   *  - dashboard_by_id: The value is an internal numerical identifier set by Grafana. This
-   *  is not portable as the numerical identifier is non-deterministic between different instances.
-   *  Will be replaced by dashboard_by_uid in the future. (deprecated)
-   *  - dashboard_by_tag: The value is a tag which is set on any number of dashboards. All
-   *  dashboards behind the tag will be added to the playlist.
-   *  - dashboard_by_uid: The value is the dashboard UID
-   */
-  value: string;
-}
-
-export interface Playlist {
-  /**
-   * Interval sets the time between switching views in a playlist.
-   * FIXME: Is this based on a standardized format or what options are available? Can datemath be used?
-   */
-  interval: string;
-  /**
-   * The ordered list of items that the playlist will iterate over.
-   * FIXME! This should not be optional, but changing it makes the godegen awkward
-   */
-  items?: Array<PlaylistItem>;
-  /**
-   * Name of the playlist.
-   */
-  name: string;
-  /**
-   * Unique playlist identifier. Generated on creation, either by the
-   * creator of the playlist of by the application.
-   */
-  uid: string;
-}
-
-export const defaultPlaylist: Partial<Playlist> = {
-  interval: '5m',
-  items: [],
-};
diff --git a/packages/grafana-ui/.storybook/storybookTheme.ts b/packages/grafana-ui/.storybook/storybookTheme.ts
index 3a2123c2a0094..debe4713bf7ee 100644
--- a/packages/grafana-ui/.storybook/storybookTheme.ts
+++ b/packages/grafana-ui/.storybook/storybookTheme.ts
@@ -1,7 +1,7 @@
 import { GrafanaTheme2, createTheme } from '@grafana/data';
 //@ts-ignore
 import { create } from '@storybook/theming';
-import '../src/components/Icon/iconBundle';
+import '../../../public/app/core/icons/iconBundle';
 
 const createStorybookTheme = (theme: GrafanaTheme2) => {
   return create({
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 49f17edc3777a..d6444345e3440 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/ui",
-  "version": "10.2.0-pre",
+  "version": "10.3.0-pre",
   "description": "Grafana Components Library",
   "keywords": [
     "grafana",
@@ -49,10 +49,10 @@
   "dependencies": {
     "@emotion/css": "11.11.2",
     "@emotion/react": "11.11.1",
-    "@grafana/data": "10.2.0-pre",
-    "@grafana/e2e-selectors": "10.2.0-pre",
+    "@grafana/data": "10.3.0-pre",
+    "@grafana/e2e-selectors": "10.3.0-pre",
     "@grafana/faro-web-sdk": "1.2.1",
-    "@grafana/schema": "10.2.0-pre",
+    "@grafana/schema": "10.3.0-pre",
     "@leeoniya/ufuzzy": "1.0.8",
     "@monaco-editor/react": "4.6.0",
     "@popperjs/core": "2.11.8",
@@ -81,13 +81,13 @@
     "monaco-editor": "0.34.0",
     "ol": "7.4.0",
     "prismjs": "1.29.0",
-    "rc-cascader": "3.12.1",
-    "rc-drawer": "6.3.0",
-    "rc-slider": "10.2.1",
+    "rc-cascader": "3.18.1",
+    "rc-drawer": "6.5.2",
+    "rc-slider": "10.3.1",
     "rc-time-picker": "^3.7.3",
-    "rc-tooltip": "6.0.1",
+    "rc-tooltip": "6.1.1",
     "react-beautiful-dnd": "13.1.1",
-    "react-calendar": "4.3.0",
+    "react-calendar": "4.6.0",
     "react-colorful": "5.6.1",
     "react-custom-scrollbars-2": "4.5.0",
     "react-dropzone": "14.2.3",
@@ -177,10 +177,10 @@
     "react-test-renderer": "18.2.0",
     "rimraf": "5.0.1",
     "rollup": "2.79.1",
+    "rollup-plugin-copy": "3.5.0",
     "rollup-plugin-dts": "^5.0.0",
     "rollup-plugin-esbuild": "5.0.0",
     "rollup-plugin-node-externals": "^5.0.0",
-    "rollup-plugin-svg-import": "^1.6.0",
     "sass-loader": "13.3.2",
     "storybook": "7.4.5",
     "storybook-addon-turbo-build": "2.0.1",
diff --git a/packages/grafana-ui/rollup.config.ts b/packages/grafana-ui/rollup.config.ts
index 0e80f43744914..3659a42c58bee 100644
--- a/packages/grafana-ui/rollup.config.ts
+++ b/packages/grafana-ui/rollup.config.ts
@@ -1,16 +1,30 @@
 import resolve from '@rollup/plugin-node-resolve';
 import path from 'path';
+import copy from 'rollup-plugin-copy';
 import dts from 'rollup-plugin-dts';
 import esbuild from 'rollup-plugin-esbuild';
 import { externals } from 'rollup-plugin-node-externals';
-import svg from 'rollup-plugin-svg-import';
+
+const icons = require('../../public/app/core/icons/cached.json');
 
 const pkg = require('./package.json');
 
+const iconSrcPaths = icons.map((iconSubPath) => {
+  return `../../public/img/icons/${iconSubPath}.svg`;
+});
+
 export default [
   {
     input: 'src/index.ts',
-    plugins: [externals({ deps: true, packagePath: './package.json' }), resolve(), svg({ stringify: true }), esbuild()],
+    plugins: [
+      externals({ deps: true, packagePath: './package.json' }),
+      resolve(),
+      copy({
+        targets: [{ src: iconSrcPaths, dest: './dist/public/' }],
+        flatten: false,
+      }),
+      esbuild(),
+    ],
     output: [
       {
         format: 'cjs',
diff --git a/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx b/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx
index b8ee928a1ae9a..76f65a3b726cd 100644
--- a/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx
+++ b/packages/grafana-ui/src/components/Forms/Legacy/Select/Select.tsx
@@ -6,9 +6,8 @@ import { default as ReactAsyncSelect } from 'react-select/async';
 import Creatable from 'react-select/creatable';
 
 // Components
-import { SelectableValue } from '@grafana/data';
+import { SelectableValue, ThemeContext } from '@grafana/data';
 
-import { ThemeContext } from '../../../../themes';
 import { CustomScrollbar } from '../../../CustomScrollbar/CustomScrollbar';
 import { SelectOptionGroup } from '../../../Select/SelectOptionGroup';
 import { SingleValue } from '../../../Select/SingleValue';
diff --git a/packages/grafana-ui/src/components/Icon/Icon.tsx b/packages/grafana-ui/src/components/Icon/Icon.tsx
index 48f75cbb11a8f..ab1feb1c055ef 100644
--- a/packages/grafana-ui/src/components/Icon/Icon.tsx
+++ b/packages/grafana-ui/src/components/Icon/Icon.tsx
@@ -7,8 +7,7 @@ import { GrafanaTheme2, isIconName } from '@grafana/data';
 import { useStyles2 } from '../../themes/ThemeContext';
 import { IconName, IconType, IconSize } from '../../types/icon';
 
-import { cacheInitialized, initIconCache, iconRoot } from './iconBundle';
-import { getIconSubDir, getSvgSize } from './utils';
+import { getIconRoot, getIconSubDir, getSvgSize } from './utils';
 
 export interface IconProps extends React.HTMLAttributes<HTMLDivElement> {
   name: IconName;
@@ -45,10 +44,6 @@ export const Icon = React.forwardRef<HTMLDivElement, IconProps>(
       return <i className={getFontAwesomeIconStyles(name, className)} {...divElementProps} style={style} />;
     }
 
-    if (!cacheInitialized) {
-      initIconCache();
-    }
-
     if (!isIconName(name)) {
       console.warn('Icon component passed an invalid icon name', name);
     }
@@ -57,6 +52,7 @@ export const Icon = React.forwardRef<HTMLDivElement, IconProps>(
       return <div ref={ref}>invalid icon name</div>;
     }
 
+    const iconRoot = getIconRoot();
     const svgSize = getSvgSize(size);
     const svgHgt = svgSize;
     const svgWid = name.startsWith('gf-bar-align') ? 16 : name.startsWith('gf-interp') ? 30 : svgSize;
diff --git a/packages/grafana-ui/src/components/Icon/iconBundle.ts b/packages/grafana-ui/src/components/Icon/iconBundle.ts
deleted file mode 100644
index 18c6499f9c90c..0000000000000
--- a/packages/grafana-ui/src/components/Icon/iconBundle.ts
+++ /dev/null
@@ -1,378 +0,0 @@
-/* eslint-disable import/order */
-// DO NOT EDIT THIS FILE
-// This file is automatically generated  (do not edit it here)
-// see @grafana/ui/scripts/generate-icon-bundle.js
-
-import { cacheStore } from 'react-inlinesvg';
-
-// do not edit this list directly
-// the list of icons live here: @grafana/ui/components/Icon/cached.json
-import u1000 from '../../../../../public/img/icons/unicons/at.svg';
-import u1001 from '../../../../../public/img/icons/unicons/adjust-circle.svg';
-import u1002 from '../../../../../public/img/icons/unicons/align-left.svg';
-import u1003 from '../../../../../public/img/icons/unicons/align-right.svg';
-import u1004 from '../../../../../public/img/icons/unicons/angle-double-down.svg';
-import u1005 from '../../../../../public/img/icons/unicons/angle-double-right.svg';
-import u1006 from '../../../../../public/img/icons/unicons/angle-down.svg';
-import u1007 from '../../../../../public/img/icons/unicons/angle-left.svg';
-import u1008 from '../../../../../public/img/icons/unicons/angle-right.svg';
-import u1009 from '../../../../../public/img/icons/unicons/angle-up.svg';
-import u1010 from '../../../../../public/img/icons/unicons/apps.svg';
-import u1011 from '../../../../../public/img/icons/unicons/arrow.svg';
-import u1012 from '../../../../../public/img/icons/unicons/arrow-down.svg';
-import u1013 from '../../../../../public/img/icons/unicons/arrow-from-right.svg';
-import u1014 from '../../../../../public/img/icons/unicons/arrow-left.svg';
-import u1015 from '../../../../../public/img/icons/unicons/arrow-random.svg';
-import u1016 from '../../../../../public/img/icons/unicons/arrow-right.svg';
-import u1017 from '../../../../../public/img/icons/unicons/arrow-to-right.svg';
-import u1018 from '../../../../../public/img/icons/unicons/arrow-up.svg';
-import u1019 from '../../../../../public/img/icons/unicons/arrows-h.svg';
-import u1020 from '../../../../../public/img/icons/unicons/backward.svg';
-import u1021 from '../../../../../public/img/icons/unicons/bars.svg';
-import u1022 from '../../../../../public/img/icons/unicons/bell.svg';
-import u1023 from '../../../../../public/img/icons/unicons/bell-slash.svg';
-import u1024 from '../../../../../public/img/icons/unicons/bolt.svg';
-import u1025 from '../../../../../public/img/icons/unicons/book.svg';
-import u1026 from '../../../../../public/img/icons/unicons/book-open.svg';
-import u1027 from '../../../../../public/img/icons/unicons/brackets-curly.svg';
-import u1028 from '../../../../../public/img/icons/unicons/bug.svg';
-import u1029 from '../../../../../public/img/icons/unicons/building.svg';
-import u1030 from '../../../../../public/img/icons/unicons/calculator-alt.svg';
-import u1031 from '../../../../../public/img/icons/unicons/calendar-alt.svg';
-import u1032 from '../../../../../public/img/icons/unicons/calendar-slash.svg';
-import u1033 from '../../../../../public/img/icons/unicons/camera.svg';
-import u1034 from '../../../../../public/img/icons/unicons/channel-add.svg';
-import u1035 from '../../../../../public/img/icons/unicons/chart-line.svg';
-import u1036 from '../../../../../public/img/icons/unicons/check.svg';
-import u1037 from '../../../../../public/img/icons/unicons/check-circle.svg';
-import u1038 from '../../../../../public/img/icons/unicons/circle.svg';
-import u1039 from '../../../../../public/img/icons/unicons/clipboard-alt.svg';
-import u1040 from '../../../../../public/img/icons/unicons/clock-nine.svg';
-import u1041 from '../../../../../public/img/icons/unicons/cloud.svg';
-import u1042 from '../../../../../public/img/icons/unicons/cloud-download.svg';
-import u1043 from '../../../../../public/img/icons/unicons/code-branch.svg';
-import u1044 from '../../../../../public/img/icons/unicons/cog.svg';
-import u1045 from '../../../../../public/img/icons/unicons/columns.svg';
-import u1046 from '../../../../../public/img/icons/unicons/comment-alt.svg';
-import u1047 from '../../../../../public/img/icons/unicons/comment-alt-share.svg';
-import u1048 from '../../../../../public/img/icons/unicons/comments-alt.svg';
-import u1049 from '../../../../../public/img/icons/unicons/compass.svg';
-import u1050 from '../../../../../public/img/icons/unicons/copy.svg';
-import u1051 from '../../../../../public/img/icons/unicons/corner-down-right-alt.svg';
-import u1052 from '../../../../../public/img/icons/unicons/cube.svg';
-import u1053 from '../../../../../public/img/icons/unicons/dashboard.svg';
-import u1054 from '../../../../../public/img/icons/unicons/database.svg';
-import u1055 from '../../../../../public/img/icons/unicons/document-info.svg';
-import u1056 from '../../../../../public/img/icons/unicons/download-alt.svg';
-import u1057 from '../../../../../public/img/icons/unicons/draggabledots.svg';
-import u1058 from '../../../../../public/img/icons/unicons/edit.svg';
-import u1059 from '../../../../../public/img/icons/unicons/ellipsis-v.svg';
-import u1060 from '../../../../../public/img/icons/unicons/ellipsis-h.svg';
-import u1061 from '../../../../../public/img/icons/unicons/envelope.svg';
-import u1062 from '../../../../../public/img/icons/unicons/exchange-alt.svg';
-import u1063 from '../../../../../public/img/icons/unicons/exclamation-circle.svg';
-import u1064 from '../../../../../public/img/icons/unicons/exclamation-triangle.svg';
-import u1065 from '../../../../../public/img/icons/unicons/external-link-alt.svg';
-import u1066 from '../../../../../public/img/icons/unicons/eye.svg';
-import u1067 from '../../../../../public/img/icons/unicons/eye-slash.svg';
-import u1068 from '../../../../../public/img/icons/unicons/file-alt.svg';
-import u1069 from '../../../../../public/img/icons/unicons/file-blank.svg';
-import u1070 from '../../../../../public/img/icons/unicons/filter.svg';
-import u1071 from '../../../../../public/img/icons/unicons/folder.svg';
-import u1072 from '../../../../../public/img/icons/unicons/folder-open.svg';
-import u1073 from '../../../../../public/img/icons/unicons/folder-plus.svg';
-import u1074 from '../../../../../public/img/icons/unicons/folder-upload.svg';
-import u1075 from '../../../../../public/img/icons/unicons/forward.svg';
-import u1076 from '../../../../../public/img/icons/unicons/graph-bar.svg';
-import u1077 from '../../../../../public/img/icons/unicons/history.svg';
-import u1078 from '../../../../../public/img/icons/unicons/history-alt.svg';
-import u1079 from '../../../../../public/img/icons/unicons/home-alt.svg';
-import u1080 from '../../../../../public/img/icons/unicons/import.svg';
-import u1081 from '../../../../../public/img/icons/unicons/info.svg';
-import u1082 from '../../../../../public/img/icons/unicons/info-circle.svg';
-import u1083 from '../../../../../public/img/icons/unicons/k6.svg';
-import u1084 from '../../../../../public/img/icons/unicons/key-skeleton-alt.svg';
-import u1085 from '../../../../../public/img/icons/unicons/keyboard.svg';
-import u1086 from '../../../../../public/img/icons/unicons/link.svg';
-import u1087 from '../../../../../public/img/icons/unicons/list-ul.svg';
-import u1088 from '../../../../../public/img/icons/unicons/lock.svg';
-import u1089 from '../../../../../public/img/icons/unicons/minus.svg';
-import u1090 from '../../../../../public/img/icons/unicons/minus-circle.svg';
-import u1091 from '../../../../../public/img/icons/unicons/mobile-android.svg';
-import u1092 from '../../../../../public/img/icons/unicons/monitor.svg';
-import u1093 from '../../../../../public/img/icons/unicons/pause.svg';
-import u1094 from '../../../../../public/img/icons/unicons/pen.svg';
-import u1095 from '../../../../../public/img/icons/unicons/play.svg';
-import u1096 from '../../../../../public/img/icons/unicons/plug.svg';
-import u1097 from '../../../../../public/img/icons/unicons/plus.svg';
-import u1098 from '../../../../../public/img/icons/unicons/plus-circle.svg';
-import u1099 from '../../../../../public/img/icons/unicons/power.svg';
-import u1100 from '../../../../../public/img/icons/unicons/presentation-play.svg';
-import u1101 from '../../../../../public/img/icons/unicons/process.svg';
-import u1102 from '../../../../../public/img/icons/unicons/question-circle.svg';
-import u1103 from '../../../../../public/img/icons/unicons/repeat.svg';
-import u1104 from '../../../../../public/img/icons/unicons/rocket.svg';
-import u1105 from '../../../../../public/img/icons/unicons/rss.svg';
-import u1106 from '../../../../../public/img/icons/unicons/save.svg';
-import u1107 from '../../../../../public/img/icons/unicons/search.svg';
-import u1108 from '../../../../../public/img/icons/unicons/search-minus.svg';
-import u1109 from '../../../../../public/img/icons/unicons/search-plus.svg';
-import u1110 from '../../../../../public/img/icons/unicons/share-alt.svg';
-import u1111 from '../../../../../public/img/icons/unicons/shield.svg';
-import u1112 from '../../../../../public/img/icons/unicons/signal.svg';
-import u1113 from '../../../../../public/img/icons/unicons/signin.svg';
-import u1114 from '../../../../../public/img/icons/unicons/signout.svg';
-import u1115 from '../../../../../public/img/icons/unicons/sitemap.svg';
-import u1116 from '../../../../../public/img/icons/unicons/slack.svg';
-import u1117 from '../../../../../public/img/icons/unicons/sliders-v-alt.svg';
-import u1118 from '../../../../../public/img/icons/unicons/sort-amount-down.svg';
-import u1119 from '../../../../../public/img/icons/unicons/sort-amount-up.svg';
-import u1120 from '../../../../../public/img/icons/unicons/square-shape.svg';
-import u1121 from '../../../../../public/img/icons/unicons/star.svg';
-import u1122 from '../../../../../public/img/icons/unicons/step-backward.svg';
-import u1123 from '../../../../../public/img/icons/unicons/sync.svg';
-import u1124 from '../../../../../public/img/icons/unicons/stopwatch.svg';
-import u1125 from '../../../../../public/img/icons/unicons/table.svg';
-import u1126 from '../../../../../public/img/icons/unicons/tag-alt.svg';
-import u1127 from '../../../../../public/img/icons/unicons/times.svg';
-import u1128 from '../../../../../public/img/icons/unicons/trash-alt.svg';
-import u1129 from '../../../../../public/img/icons/unicons/unlock.svg';
-import u1130 from '../../../../../public/img/icons/unicons/upload.svg';
-import u1131 from '../../../../../public/img/icons/unicons/user.svg';
-import u1132 from '../../../../../public/img/icons/unicons/users-alt.svg';
-import u1133 from '../../../../../public/img/icons/unicons/wrap-text.svg';
-import u1134 from '../../../../../public/img/icons/unicons/cloud-upload.svg';
-import u1135 from '../../../../../public/img/icons/unicons/credit-card.svg';
-import u1136 from '../../../../../public/img/icons/unicons/file-copy-alt.svg';
-import u1137 from '../../../../../public/img/icons/unicons/fire.svg';
-import u1138 from '../../../../../public/img/icons/unicons/hourglass.svg';
-import u1139 from '../../../../../public/img/icons/unicons/layer-group.svg';
-import u1140 from '../../../../../public/img/icons/unicons/layers-alt.svg';
-import u1141 from '../../../../../public/img/icons/unicons/line-alt.svg';
-import u1142 from '../../../../../public/img/icons/unicons/list-ui-alt.svg';
-import u1143 from '../../../../../public/img/icons/unicons/message.svg';
-import u1144 from '../../../../../public/img/icons/unicons/palette.svg';
-import u1145 from '../../../../../public/img/icons/unicons/percentage.svg';
-import u1146 from '../../../../../public/img/icons/unicons/shield-exclamation.svg';
-import u1147 from '../../../../../public/img/icons/unicons/plus-square.svg';
-import u1148 from '../../../../../public/img/icons/unicons/x.svg';
-import u1149 from '../../../../../public/img/icons/unicons/capture.svg';
-import u1150 from '../../../../../public/img/icons/custom/gf-grid.svg';
-import u1151 from '../../../../../public/img/icons/custom/gf-landscape.svg';
-import u1152 from '../../../../../public/img/icons/custom/gf-layout-simple.svg';
-import u1153 from '../../../../../public/img/icons/custom/gf-portrait.svg';
-import u1154 from '../../../../../public/img/icons/custom/gf-show-context.svg';
-import u1155 from '../../../../../public/img/icons/custom/gf-bar-alignment-after.svg';
-import u1156 from '../../../../../public/img/icons/custom/gf-bar-alignment-before.svg';
-import u1157 from '../../../../../public/img/icons/custom/gf-bar-alignment-center.svg';
-import u1158 from '../../../../../public/img/icons/custom/gf-interpolation-linear.svg';
-import u1159 from '../../../../../public/img/icons/custom/gf-interpolation-smooth.svg';
-import u1160 from '../../../../../public/img/icons/custom/gf-interpolation-step-after.svg';
-import u1161 from '../../../../../public/img/icons/custom/gf-interpolation-step-before.svg';
-import u1162 from '../../../../../public/img/icons/custom/gf-logs.svg';
-import u1163 from '../../../../../public/img/icons/custom/gf-movepane-left.svg';
-import u1164 from '../../../../../public/img/icons/custom/gf-movepane-right.svg';
-import u1165 from '../../../../../public/img/icons/mono/favorite.svg';
-import u1166 from '../../../../../public/img/icons/mono/grafana.svg';
-import u1167 from '../../../../../public/img/icons/mono/heart.svg';
-import u1168 from '../../../../../public/img/icons/mono/heart-break.svg';
-import u1169 from '../../../../../public/img/icons/mono/panel-add.svg';
-import u1170 from '../../../../../public/img/icons/mono/library-panel.svg';
-import u1171 from '../../../../../public/img/icons/unicons/record-audio.svg';
-// do not edit this list directly
-// the list of icons live here: @grafana/ui/components/Icon/cached.json
-
-export let cacheInitialized = false;
-export let iconRoot = 'public/img/icons/';
-
-export function cacheItem(content: string, path: string) {
-  cacheStore[iconRoot + path] = { content, status: 'loaded' };
-}
-
-export function initIconCache() {
-  cacheInitialized = true;
-
-  // This function needs to be called after index.js loads to give the
-  // application time to modify __webpack_public_path__ with a CDN path
-  const grafanaPublicPath = typeof window !== 'undefined' && window.__grafana_public_path__;
-  if (grafanaPublicPath) {
-    iconRoot = grafanaPublicPath + 'img/icons/';
-  }
-
-  // do not edit this list directly
-  // the list of icons live here: @grafana/ui/components/Icon/cached.json
-  cacheItem(u1000, 'unicons/at.svg');
-  cacheItem(u1001, 'unicons/adjust-circle.svg');
-  cacheItem(u1002, 'unicons/align-left.svg');
-  cacheItem(u1003, 'unicons/align-right.svg');
-  cacheItem(u1004, 'unicons/angle-double-down.svg');
-  cacheItem(u1005, 'unicons/angle-double-right.svg');
-  cacheItem(u1006, 'unicons/angle-down.svg');
-  cacheItem(u1007, 'unicons/angle-left.svg');
-  cacheItem(u1008, 'unicons/angle-right.svg');
-  cacheItem(u1009, 'unicons/angle-up.svg');
-  cacheItem(u1010, 'unicons/apps.svg');
-  cacheItem(u1011, 'unicons/arrow.svg');
-  cacheItem(u1012, 'unicons/arrow-down.svg');
-  cacheItem(u1013, 'unicons/arrow-from-right.svg');
-  cacheItem(u1014, 'unicons/arrow-left.svg');
-  cacheItem(u1015, 'unicons/arrow-random.svg');
-  cacheItem(u1016, 'unicons/arrow-right.svg');
-  cacheItem(u1017, 'unicons/arrow-to-right.svg');
-  cacheItem(u1018, 'unicons/arrow-up.svg');
-  cacheItem(u1019, 'unicons/arrows-h.svg');
-  cacheItem(u1020, 'unicons/backward.svg');
-  cacheItem(u1021, 'unicons/bars.svg');
-  cacheItem(u1022, 'unicons/bell.svg');
-  cacheItem(u1023, 'unicons/bell-slash.svg');
-  cacheItem(u1024, 'unicons/bolt.svg');
-  cacheItem(u1025, 'unicons/book.svg');
-  cacheItem(u1026, 'unicons/book-open.svg');
-  cacheItem(u1027, 'unicons/brackets-curly.svg');
-  cacheItem(u1028, 'unicons/bug.svg');
-  cacheItem(u1029, 'unicons/building.svg');
-  cacheItem(u1030, 'unicons/calculator-alt.svg');
-  cacheItem(u1031, 'unicons/calendar-alt.svg');
-  cacheItem(u1032, 'unicons/calendar-slash.svg');
-  cacheItem(u1033, 'unicons/camera.svg');
-  cacheItem(u1034, 'unicons/channel-add.svg');
-  cacheItem(u1035, 'unicons/chart-line.svg');
-  cacheItem(u1036, 'unicons/check.svg');
-  cacheItem(u1037, 'unicons/check-circle.svg');
-  cacheItem(u1038, 'unicons/circle.svg');
-  cacheItem(u1039, 'unicons/clipboard-alt.svg');
-  cacheItem(u1040, 'unicons/clock-nine.svg');
-  cacheItem(u1041, 'unicons/cloud.svg');
-  cacheItem(u1042, 'unicons/cloud-download.svg');
-  cacheItem(u1043, 'unicons/code-branch.svg');
-  cacheItem(u1044, 'unicons/cog.svg');
-  cacheItem(u1045, 'unicons/columns.svg');
-  cacheItem(u1046, 'unicons/comment-alt.svg');
-  cacheItem(u1047, 'unicons/comment-alt-share.svg');
-  cacheItem(u1048, 'unicons/comments-alt.svg');
-  cacheItem(u1049, 'unicons/compass.svg');
-  cacheItem(u1050, 'unicons/copy.svg');
-  cacheItem(u1051, 'unicons/corner-down-right-alt.svg');
-  cacheItem(u1052, 'unicons/cube.svg');
-  cacheItem(u1053, 'unicons/dashboard.svg');
-  cacheItem(u1054, 'unicons/database.svg');
-  cacheItem(u1055, 'unicons/document-info.svg');
-  cacheItem(u1056, 'unicons/download-alt.svg');
-  cacheItem(u1057, 'unicons/draggabledots.svg');
-  cacheItem(u1058, 'unicons/edit.svg');
-  cacheItem(u1059, 'unicons/ellipsis-v.svg');
-  cacheItem(u1060, 'unicons/ellipsis-h.svg');
-  cacheItem(u1061, 'unicons/envelope.svg');
-  cacheItem(u1062, 'unicons/exchange-alt.svg');
-  cacheItem(u1063, 'unicons/exclamation-circle.svg');
-  cacheItem(u1064, 'unicons/exclamation-triangle.svg');
-  cacheItem(u1065, 'unicons/external-link-alt.svg');
-  cacheItem(u1066, 'unicons/eye.svg');
-  cacheItem(u1067, 'unicons/eye-slash.svg');
-  cacheItem(u1068, 'unicons/file-alt.svg');
-  cacheItem(u1069, 'unicons/file-blank.svg');
-  cacheItem(u1070, 'unicons/filter.svg');
-  cacheItem(u1071, 'unicons/folder.svg');
-  cacheItem(u1072, 'unicons/folder-open.svg');
-  cacheItem(u1073, 'unicons/folder-plus.svg');
-  cacheItem(u1074, 'unicons/folder-upload.svg');
-  cacheItem(u1075, 'unicons/forward.svg');
-  cacheItem(u1076, 'unicons/graph-bar.svg');
-  cacheItem(u1077, 'unicons/history.svg');
-  cacheItem(u1078, 'unicons/history-alt.svg');
-  cacheItem(u1079, 'unicons/home-alt.svg');
-  cacheItem(u1080, 'unicons/import.svg');
-  cacheItem(u1081, 'unicons/info.svg');
-  cacheItem(u1082, 'unicons/info-circle.svg');
-  cacheItem(u1083, 'unicons/k6.svg');
-  cacheItem(u1084, 'unicons/key-skeleton-alt.svg');
-  cacheItem(u1085, 'unicons/keyboard.svg');
-  cacheItem(u1086, 'unicons/link.svg');
-  cacheItem(u1087, 'unicons/list-ul.svg');
-  cacheItem(u1088, 'unicons/lock.svg');
-  cacheItem(u1089, 'unicons/minus.svg');
-  cacheItem(u1090, 'unicons/minus-circle.svg');
-  cacheItem(u1091, 'unicons/mobile-android.svg');
-  cacheItem(u1092, 'unicons/monitor.svg');
-  cacheItem(u1093, 'unicons/pause.svg');
-  cacheItem(u1094, 'unicons/pen.svg');
-  cacheItem(u1095, 'unicons/play.svg');
-  cacheItem(u1096, 'unicons/plug.svg');
-  cacheItem(u1097, 'unicons/plus.svg');
-  cacheItem(u1098, 'unicons/plus-circle.svg');
-  cacheItem(u1099, 'unicons/power.svg');
-  cacheItem(u1100, 'unicons/presentation-play.svg');
-  cacheItem(u1101, 'unicons/process.svg');
-  cacheItem(u1102, 'unicons/question-circle.svg');
-  cacheItem(u1103, 'unicons/repeat.svg');
-  cacheItem(u1104, 'unicons/rocket.svg');
-  cacheItem(u1105, 'unicons/rss.svg');
-  cacheItem(u1106, 'unicons/save.svg');
-  cacheItem(u1107, 'unicons/search.svg');
-  cacheItem(u1108, 'unicons/search-minus.svg');
-  cacheItem(u1109, 'unicons/search-plus.svg');
-  cacheItem(u1110, 'unicons/share-alt.svg');
-  cacheItem(u1111, 'unicons/shield.svg');
-  cacheItem(u1112, 'unicons/signal.svg');
-  cacheItem(u1113, 'unicons/signin.svg');
-  cacheItem(u1114, 'unicons/signout.svg');
-  cacheItem(u1115, 'unicons/sitemap.svg');
-  cacheItem(u1116, 'unicons/slack.svg');
-  cacheItem(u1117, 'unicons/sliders-v-alt.svg');
-  cacheItem(u1118, 'unicons/sort-amount-down.svg');
-  cacheItem(u1119, 'unicons/sort-amount-up.svg');
-  cacheItem(u1120, 'unicons/square-shape.svg');
-  cacheItem(u1121, 'unicons/star.svg');
-  cacheItem(u1122, 'unicons/step-backward.svg');
-  cacheItem(u1123, 'unicons/sync.svg');
-  cacheItem(u1124, 'unicons/stopwatch.svg');
-  cacheItem(u1125, 'unicons/table.svg');
-  cacheItem(u1126, 'unicons/tag-alt.svg');
-  cacheItem(u1127, 'unicons/times.svg');
-  cacheItem(u1128, 'unicons/trash-alt.svg');
-  cacheItem(u1129, 'unicons/unlock.svg');
-  cacheItem(u1130, 'unicons/upload.svg');
-  cacheItem(u1131, 'unicons/user.svg');
-  cacheItem(u1132, 'unicons/users-alt.svg');
-  cacheItem(u1133, 'unicons/wrap-text.svg');
-  cacheItem(u1134, 'unicons/cloud-upload.svg');
-  cacheItem(u1135, 'unicons/credit-card.svg');
-  cacheItem(u1136, 'unicons/file-copy-alt.svg');
-  cacheItem(u1137, 'unicons/fire.svg');
-  cacheItem(u1138, 'unicons/hourglass.svg');
-  cacheItem(u1139, 'unicons/layer-group.svg');
-  cacheItem(u1140, 'unicons/layers-alt.svg');
-  cacheItem(u1141, 'unicons/line-alt.svg');
-  cacheItem(u1142, 'unicons/list-ui-alt.svg');
-  cacheItem(u1143, 'unicons/message.svg');
-  cacheItem(u1144, 'unicons/palette.svg');
-  cacheItem(u1145, 'unicons/percentage.svg');
-  cacheItem(u1146, 'unicons/shield-exclamation.svg');
-  cacheItem(u1147, 'unicons/plus-square.svg');
-  cacheItem(u1148, 'unicons/x.svg');
-  cacheItem(u1149, 'unicons/capture.svg');
-  cacheItem(u1150, 'custom/gf-grid.svg');
-  cacheItem(u1151, 'custom/gf-landscape.svg');
-  cacheItem(u1152, 'custom/gf-layout-simple.svg');
-  cacheItem(u1153, 'custom/gf-portrait.svg');
-  cacheItem(u1154, 'custom/gf-show-context.svg');
-  cacheItem(u1155, 'custom/gf-bar-alignment-after.svg');
-  cacheItem(u1156, 'custom/gf-bar-alignment-before.svg');
-  cacheItem(u1157, 'custom/gf-bar-alignment-center.svg');
-  cacheItem(u1158, 'custom/gf-interpolation-linear.svg');
-  cacheItem(u1159, 'custom/gf-interpolation-smooth.svg');
-  cacheItem(u1160, 'custom/gf-interpolation-step-after.svg');
-  cacheItem(u1161, 'custom/gf-interpolation-step-before.svg');
-  cacheItem(u1162, 'custom/gf-logs.svg');
-  cacheItem(u1163, 'custom/gf-movepane-left.svg');
-  cacheItem(u1164, 'custom/gf-movepane-right.svg');
-  cacheItem(u1165, 'mono/favorite.svg');
-  cacheItem(u1166, 'mono/grafana.svg');
-  cacheItem(u1167, 'mono/heart.svg');
-  cacheItem(u1168, 'mono/heart-break.svg');
-  cacheItem(u1169, 'mono/panel-add.svg');
-  cacheItem(u1170, 'mono/library-panel.svg');
-  cacheItem(u1171, 'unicons/record-audio.svg');
-  // do not edit this list directly
-  // the list of icons live here: @grafana/ui/components/Icon/cached.json
-}
diff --git a/packages/grafana-ui/src/components/Icon/utils.test.ts b/packages/grafana-ui/src/components/Icon/utils.test.ts
index 493cf1505bdeb..2898856086e8c 100644
--- a/packages/grafana-ui/src/components/Icon/utils.test.ts
+++ b/packages/grafana-ui/src/components/Icon/utils.test.ts
@@ -15,4 +15,35 @@ describe('Icon utils', () => {
       expect(iconSubDir).toEqual(expected);
     });
   });
+
+  describe('getIconRoot', () => {
+    beforeEach(() => {
+      // will reset the iconRoot cached value
+      jest.resetModules();
+    });
+
+    describe('when public path is configured', () => {
+      beforeAll(() => {
+        //@ts-ignore
+        window.__grafana_public_path__ = 'somepath/public/';
+      });
+
+      it('should return icon root based on __grafana_public_path__', () => {
+        const { getIconRoot } = require('./utils');
+        expect(getIconRoot()).toEqual('somepath/public/img/icons/');
+      });
+    });
+
+    describe('when public path is not configured', () => {
+      beforeAll(() => {
+        //@ts-ignore
+        window.__grafana_public_path__ = undefined;
+      });
+
+      it('should return default icon root', () => {
+        const { getIconRoot } = require('./utils');
+        expect(getIconRoot()).toEqual('public/img/icons/');
+      });
+    });
+  });
 });
diff --git a/packages/grafana-ui/src/components/Icon/utils.ts b/packages/grafana-ui/src/components/Icon/utils.ts
index d31311a54d59f..0d379f36c7a25 100644
--- a/packages/grafana-ui/src/components/Icon/utils.ts
+++ b/packages/grafana-ui/src/components/Icon/utils.ts
@@ -43,3 +43,20 @@ export function getSvgSize(size: IconSize) {
       return 48;
   }
 }
+
+let iconRoot: string | undefined;
+
+export function getIconRoot(): string {
+  if (iconRoot) {
+    return iconRoot;
+  }
+
+  const grafanaPublicPath = typeof window !== 'undefined' && window.__grafana_public_path__;
+  if (grafanaPublicPath) {
+    iconRoot = grafanaPublicPath + 'img/icons/';
+  } else {
+    iconRoot = 'public/img/icons/';
+  }
+
+  return iconRoot;
+}
diff --git a/packages/grafana-ui/src/components/Layout/Box/Box.tsx b/packages/grafana-ui/src/components/Layout/Box/Box.tsx
index 51527ca877ed8..97a9f54abdabf 100644
--- a/packages/grafana-ui/src/components/Layout/Box/Box.tsx
+++ b/packages/grafana-ui/src/components/Layout/Box/Box.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import React, { ElementType } from 'react';
+import React, { ElementType, forwardRef, PropsWithChildren } from 'react';
 
 import { GrafanaTheme2, ThemeSpacingTokens, ThemeShape, ThemeShadows } from '@grafana/data';
 
@@ -14,7 +14,7 @@ export type BorderColor = keyof GrafanaTheme2['colors']['border'] | 'error' | 's
 export type BorderRadius = keyof ThemeShape['radius'];
 export type BoxShadow = keyof ThemeShadows;
 
-interface BoxProps {
+interface BoxProps extends Omit<React.HTMLAttributes<HTMLElement>, 'className' | 'style'> {
   // Margin props
   /** Sets the property `margin` */
   margin?: ResponsiveProp<ThemeSpacingTokens>;
@@ -68,34 +68,36 @@ interface BoxProps {
   element?: ElementType;
 }
 
-export const Box = ({
-  children,
-  margin,
-  marginX,
-  marginY,
-  marginTop,
-  marginBottom,
-  marginLeft,
-  marginRight,
-  padding,
-  paddingX,
-  paddingY,
-  paddingTop,
-  paddingBottom,
-  paddingLeft,
-  paddingRight,
-  display,
-  backgroundColor,
-  grow,
-  shrink,
-  borderColor,
-  borderStyle,
-  borderRadius,
-  justifyContent,
-  alignItems,
-  boxShadow,
-  element,
-}: React.PropsWithChildren<BoxProps>) => {
+export const Box = forwardRef<HTMLElement, PropsWithChildren<BoxProps>>((props, ref) => {
+  const {
+    children,
+    margin,
+    marginX,
+    marginY,
+    marginTop,
+    marginBottom,
+    marginLeft,
+    marginRight,
+    padding,
+    paddingX,
+    paddingY,
+    paddingTop,
+    paddingBottom,
+    paddingLeft,
+    paddingRight,
+    display,
+    backgroundColor,
+    grow,
+    shrink,
+    borderColor,
+    borderStyle,
+    borderRadius,
+    justifyContent,
+    alignItems,
+    boxShadow,
+    element,
+    ...rest
+  } = props;
   const styles = useStyles2(
     getStyles,
     margin,
@@ -125,8 +127,12 @@ export const Box = ({
   );
   const Element = element ?? 'div';
 
-  return <Element className={styles.root}>{children}</Element>;
-};
+  return (
+    <Element ref={ref} className={styles.root} {...rest}>
+      {children}
+    </Element>
+  );
+});
 
 Box.displayName = 'Box';
 
diff --git a/packages/grafana-ui/src/components/Layout/Flex/Flex.tsx b/packages/grafana-ui/src/components/Layout/Flex/Flex.tsx
index 11cf92082052b..b54bce575b48a 100644
--- a/packages/grafana-ui/src/components/Layout/Flex/Flex.tsx
+++ b/packages/grafana-ui/src/components/Layout/Flex/Flex.tsx
@@ -33,7 +33,7 @@ export type Direction = 'row' | 'row-reverse' | 'column' | 'column-reverse';
 
 export type Wrap = 'nowrap' | 'wrap' | 'wrap-reverse';
 
-interface FlexProps {
+interface FlexProps extends Omit<React.HTMLAttributes<HTMLElement>, 'className' | 'style'> {
   gap?: ResponsiveProp<ThemeSpacingTokens>;
   alignItems?: ResponsiveProp<AlignItems>;
   justifyContent?: ResponsiveProp<JustifyContent>;
@@ -43,11 +43,11 @@ interface FlexProps {
 }
 
 export const Flex = React.forwardRef<HTMLDivElement, FlexProps>(
-  ({ gap = 1, alignItems, justifyContent, direction, wrap, children }, ref) => {
+  ({ gap = 1, alignItems, justifyContent, direction, wrap, children, ...rest }, ref) => {
     const styles = useStyles2(getStyles, gap, alignItems, justifyContent, direction, wrap);
 
     return (
-      <div ref={ref} className={styles.flex}>
+      <div ref={ref} className={styles.flex} {...rest}>
         {children}
       </div>
     );
diff --git a/packages/grafana-ui/src/components/Layout/Grid/Grid.tsx b/packages/grafana-ui/src/components/Layout/Grid/Grid.tsx
index 00be87bda87b6..2ed66247af605 100644
--- a/packages/grafana-ui/src/components/Layout/Grid/Grid.tsx
+++ b/packages/grafana-ui/src/components/Layout/Grid/Grid.tsx
@@ -5,7 +5,7 @@ import { GrafanaTheme2, ThemeSpacingTokens } from '@grafana/data';
 
 import { useStyles2 } from '../../../themes';
 
-interface GridProps extends Omit<HTMLAttributes<HTMLDivElement>, 'className'> {
+interface GridProps extends Omit<HTMLAttributes<HTMLDivElement>, 'className' | 'style'> {
   children: NonNullable<React.ReactNode>;
 
   /** Specifies the gutters between columns and rows. It is overwritten when a column or row gap has a value */
diff --git a/packages/grafana-ui/src/components/Layout/Stack/HorizontalStack.tsx b/packages/grafana-ui/src/components/Layout/Stack/HorizontalStack.tsx
index cfeb9cb729da7..57944ad2946c0 100644
--- a/packages/grafana-ui/src/components/Layout/Stack/HorizontalStack.tsx
+++ b/packages/grafana-ui/src/components/Layout/Stack/HorizontalStack.tsx
@@ -6,12 +6,15 @@ import { ResponsiveProp } from '../utils/responsiveness';
 
 import { Stack } from './Stack';
 
-export const HorizontalStack = React.forwardRef<
-  HTMLDivElement,
-  React.PropsWithChildren<{ gap?: ResponsiveProp<ThemeSpacingTokens> }>
->(({ children, gap = 1 }, ref) => (
-  <Stack ref={ref} direction="row" gap={gap}>
-    {children}
-  </Stack>
-));
+interface HorizontalStackProps extends Omit<React.HTMLAttributes<HTMLElement>, 'className' | 'style'> {
+  gap?: ResponsiveProp<ThemeSpacingTokens>;
+}
+
+export const HorizontalStack = React.forwardRef<HTMLDivElement, React.PropsWithChildren<HorizontalStackProps>>(
+  ({ children, gap = 1, ...rest }, ref) => (
+    <Stack ref={ref} direction="row" gap={gap} {...rest}>
+      {children}
+    </Stack>
+  )
+);
 HorizontalStack.displayName = 'HorizontalStack';
diff --git a/packages/grafana-ui/src/components/Layout/Stack/Stack.tsx b/packages/grafana-ui/src/components/Layout/Stack/Stack.tsx
index 2395610b3a128..2e24f2332f9d3 100644
--- a/packages/grafana-ui/src/components/Layout/Stack/Stack.tsx
+++ b/packages/grafana-ui/src/components/Layout/Stack/Stack.tsx
@@ -4,18 +4,20 @@ import { ThemeSpacingTokens } from '@grafana/data';
 
 import { Flex } from '../Flex/Flex';
 import { ResponsiveProp } from '../utils/responsiveness';
-interface StackProps {
+interface StackProps extends Omit<React.HTMLAttributes<HTMLElement>, 'className' | 'style'> {
   direction?: ResponsiveProp<'column' | 'row'>;
   gap?: ResponsiveProp<ThemeSpacingTokens>;
 }
 
 export const Stack = React.forwardRef<HTMLDivElement, React.PropsWithChildren<StackProps>>(
-  ({ gap = 1, direction = 'column', children }, ref) => {
+  ({ gap = 1, direction = 'column', children, ...rest }, ref) => {
     return (
-      <Flex ref={ref} gap={gap} direction={direction} wrap="wrap">
-        {React.Children.map(children, (child) => (
-          <div>{child}</div>
-        ))}
+      <Flex ref={ref} gap={gap} direction={direction} wrap="wrap" {...rest}>
+        {React.Children.toArray(children)
+          .filter(Boolean)
+          .map((child, index) => (
+            <div key={index}>{child}</div>
+          ))}
       </Flex>
     );
   }
diff --git a/packages/grafana-ui/src/components/Monaco/ReactMonacoEditor.tsx b/packages/grafana-ui/src/components/Monaco/ReactMonacoEditor.tsx
index 5e38bd3c26e9d..a6db1ce5fc346 100644
--- a/packages/grafana-ui/src/components/Monaco/ReactMonacoEditor.tsx
+++ b/packages/grafana-ui/src/components/Monaco/ReactMonacoEditor.tsx
@@ -1,47 +1,34 @@
-import MonacoEditor, { loader as monacoEditorLoader, useMonaco } from '@monaco-editor/react';
-import React, { useEffect } from 'react';
+import MonacoEditor, { loader as monacoEditorLoader, Monaco } from '@monaco-editor/react';
+import React, { useCallback } from 'react';
 
 import { useTheme2 } from '../../themes';
 
 import defineThemes from './theme';
 import type { ReactMonacoEditorProps } from './types';
 
-let initalized = false;
-function initMonaco() {
-  if (initalized) {
-    return;
-  }
-
-  monacoEditorLoader.config({
-    paths: {
-      vs: (window.__grafana_public_path__ ?? 'public/') + 'lib/monaco/min/vs',
-    },
-  });
-  initalized = true;
-  monacoEditorLoader.init().then((monaco) => {
-    // this call makes sure the themes exist.
-    // they will not have the correct colors,
-    // but we need them to exist since the beginning,
-    // because if we start a monaco instance with
-    // a theme that does not exist, it will not work well.
-    defineThemes(monaco);
-  });
-}
+monacoEditorLoader.config({
+  paths: {
+    vs: (window.__grafana_public_path__ ?? 'public/') + 'lib/monaco/min/vs',
+  },
+});
 
 export const ReactMonacoEditor = (props: ReactMonacoEditorProps) => {
-  const theme = useTheme2();
-  const monaco = useMonaco();
+  const { beforeMount } = props;
 
-  useEffect(() => {
-    // monaco can be null or undefined at the beginning, because it is loaded in asynchronously
-    if (monaco != null) {
+  const theme = useTheme2();
+  const onMonacoBeforeMount = useCallback(
+    (monaco: Monaco) => {
       defineThemes(monaco, theme);
-    }
-  }, [monaco, theme]);
-
-  initMonaco();
-
-  const monacoTheme = theme.isDark ? 'grafana-dark' : 'grafana-light';
-
-  return <MonacoEditor theme={monacoTheme} {...props} />;
+      beforeMount?.(monaco);
+    },
+    [beforeMount, theme]
+  );
+
+  return (
+    <MonacoEditor
+      {...props}
+      theme={theme.isDark ? 'grafana-dark' : 'grafana-light'}
+      beforeMount={onMonacoBeforeMount}
+    />
+  );
 };
diff --git a/packages/grafana-ui/src/components/StatsPicker/StatsPicker.tsx b/packages/grafana-ui/src/components/StatsPicker/StatsPicker.tsx
index 47797c619f660..895f849104f78 100644
--- a/packages/grafana-ui/src/components/StatsPicker/StatsPicker.tsx
+++ b/packages/grafana-ui/src/components/StatsPicker/StatsPicker.tsx
@@ -1,7 +1,7 @@
 import { difference } from 'lodash';
 import React, { PureComponent } from 'react';
 
-import { fieldReducers, SelectableValue } from '@grafana/data';
+import { fieldReducers, SelectableValue, FieldReducerInfo } from '@grafana/data';
 
 import { Select } from '../Select/Select';
 
@@ -15,6 +15,7 @@ export interface Props {
   width?: number;
   menuPlacement?: 'auto' | 'bottom' | 'top';
   inputId?: string;
+  filterOptions?: (ext: FieldReducerInfo) => boolean;
 }
 
 export class StatsPicker extends PureComponent<Props> {
@@ -63,9 +64,10 @@ export class StatsPicker extends PureComponent<Props> {
   };
 
   render() {
-    const { stats, allowMultiple, defaultStat, placeholder, className, menuPlacement, width, inputId } = this.props;
+    const { stats, allowMultiple, defaultStat, placeholder, className, menuPlacement, width, inputId, filterOptions } =
+      this.props;
 
-    const select = fieldReducers.selectOptions(stats);
+    const select = fieldReducers.selectOptions(stats, filterOptions);
     return (
       <Select
         value={select.current}
diff --git a/packages/grafana-ui/src/components/Table/BarGaugeCell.tsx b/packages/grafana-ui/src/components/Table/BarGaugeCell.tsx
index 0fd4ae8458918..4580c37ae6b1a 100644
--- a/packages/grafana-ui/src/components/Table/BarGaugeCell.tsx
+++ b/packages/grafana-ui/src/components/Table/BarGaugeCell.tsx
@@ -1,22 +1,14 @@
 import { isFunction } from 'lodash';
 import React from 'react';
 
-import {
-  ThresholdsConfig,
-  ThresholdsMode,
-  VizOrientation,
-  getFieldConfigWithMinMax,
-  DisplayValueAlignmentFactors,
-  Field,
-  DisplayValue,
-} from '@grafana/data';
+import { ThresholdsConfig, ThresholdsMode, VizOrientation, getFieldConfigWithMinMax } from '@grafana/data';
 import { BarGaugeDisplayMode, BarGaugeValueMode, TableCellDisplayMode } from '@grafana/schema';
 
 import { BarGauge } from '../BarGauge/BarGauge';
 import { DataLinksContextMenu, DataLinksContextMenuApi } from '../DataLinks/DataLinksContextMenu';
 
 import { TableCellProps } from './types';
-import { getCellOptions } from './utils';
+import { getAlignmentFactor, getCellOptions } from './utils';
 
 const defaultScale: ThresholdsConfig = {
   mode: ThresholdsMode.Absolute,
@@ -102,40 +94,3 @@ export const BarGaugeCell = (props: TableCellProps) => {
     </div>
   );
 };
-
-/**
- * Getting gauge values to align is very tricky without looking at all values and passing them through display processor. For very large tables that
- * could pretty expensive. So this is kind of a compromise. We look at the first 1000 rows and cache the longest value.
- * If we have a cached value we just check if the current value is longer and update the alignmentFactor. This can obviously still lead to
- * unaligned gauges but it should a lot less common.
- **/
-function getAlignmentFactor(field: Field, displayValue: DisplayValue, rowIndex: number): DisplayValueAlignmentFactors {
-  let alignmentFactor = field.state?.alignmentFactors;
-
-  if (alignmentFactor) {
-    // check if current alignmentFactor is still the longest
-    if (alignmentFactor.text.length < displayValue.text.length) {
-      alignmentFactor.text = displayValue.text;
-    }
-    return alignmentFactor;
-  } else {
-    // look at the next 100 rows
-    alignmentFactor = { ...displayValue };
-    const maxIndex = Math.min(field.values.length, rowIndex + 1000);
-
-    for (let i = rowIndex + 1; i < maxIndex; i++) {
-      const nextDisplayValue = field.display!(field.values[i]);
-      if (nextDisplayValue.text.length > alignmentFactor.text.length) {
-        alignmentFactor.text = displayValue.text;
-      }
-    }
-
-    if (field.state) {
-      field.state.alignmentFactors = alignmentFactor;
-    } else {
-      field.state = { alignmentFactors: alignmentFactor };
-    }
-
-    return alignmentFactor;
-  }
-}
diff --git a/packages/grafana-ui/src/components/Table/SparklineCell.tsx b/packages/grafana-ui/src/components/Table/SparklineCell.tsx
index f9f4db6b91527..bfb1b8e5eb017 100644
--- a/packages/grafana-ui/src/components/Table/SparklineCell.tsx
+++ b/packages/grafana-ui/src/components/Table/SparklineCell.tsx
@@ -1,6 +1,14 @@
 import React from 'react';
 
-import { FieldType, FieldConfig, getMinMaxAndDelta, FieldSparkline, isDataFrame, Field } from '@grafana/data';
+import {
+  FieldType,
+  FieldConfig,
+  getMinMaxAndDelta,
+  FieldSparkline,
+  isDataFrame,
+  Field,
+  isDataFrameWithValue,
+} from '@grafana/data';
 import {
   BarAlignment,
   GraphDrawStyle,
@@ -12,12 +20,16 @@ import {
   VisibilityMode,
 } from '@grafana/schema';
 
+import { useTheme2 } from '../../themes';
+import { measureText } from '../../utils';
+import { FormattedValueDisplay } from '../FormattedValueDisplay/FormattedValueDisplay';
 import { Sparkline } from '../Sparkline/Sparkline';
 
 import { TableCellProps } from './types';
-import { getCellOptions } from './utils';
+import { getAlignmentFactor, getCellOptions } from './utils';
 
-export const defaultSparklineCellConfig: GraphFieldConfig = {
+export const defaultSparklineCellConfig: TableSparklineCellOptions = {
+  type: TableCellDisplayMode.Sparkline,
   drawStyle: GraphDrawStyle.Line,
   lineInterpolation: LineInterpolation.Smooth,
   lineWidth: 1,
@@ -26,11 +38,13 @@ export const defaultSparklineCellConfig: GraphFieldConfig = {
   pointSize: 2,
   barAlignment: BarAlignment.Center,
   showPoints: VisibilityMode.Never,
+  hideValue: false,
 };
 
 export const SparklineCell = (props: TableCellProps) => {
   const { field, innerWidth, tableStyles, cell, cellProps, timeRange } = props;
   const sparkline = getSparkline(cell.value);
+  const theme = useTheme2();
 
   if (!sparkline) {
     return (
@@ -70,15 +84,42 @@ export const SparklineCell = (props: TableCellProps) => {
     },
   };
 
+  const hideValue = field.config.custom?.cellOptions?.hideValue;
+  let valueWidth = 0;
+  let valueElement: React.ReactNode = null;
+  if (!hideValue) {
+    const value = isDataFrameWithValue(cell.value) ? cell.value.value : null;
+    const displayValue = field.display!(value);
+    const alignmentFactor = getAlignmentFactor(field, displayValue, cell.row.index);
+
+    valueWidth =
+      measureText(`${alignmentFactor.prefix ?? ''}${alignmentFactor.text}${alignmentFactor.suffix ?? ''}`, 16).width +
+      theme.spacing.gridSize;
+
+    valueElement = (
+      <FormattedValueDisplay
+        style={{
+          width: `${valueWidth - theme.spacing.gridSize}px`,
+          textAlign: 'right',
+          marginRight: theme.spacing(1),
+        }}
+        value={displayValue}
+      />
+    );
+  }
+
   return (
     <div {...cellProps} className={tableStyles.cellContainer}>
-      <Sparkline
-        width={innerWidth}
-        height={tableStyles.cellHeightInner}
-        sparkline={sparkline}
-        config={config}
-        theme={tableStyles.theme}
-      />
+      {valueElement}
+      <div>
+        <Sparkline
+          width={innerWidth - valueWidth}
+          height={tableStyles.cellHeightInner}
+          sparkline={sparkline}
+          config={config}
+          theme={tableStyles.theme}
+        />
+      </div>
     </div>
   );
 };
diff --git a/packages/grafana-ui/src/components/Table/utils.ts b/packages/grafana-ui/src/components/Table/utils.ts
index f237b8b7c80a4..91c18ebc02997 100644
--- a/packages/grafana-ui/src/components/Table/utils.ts
+++ b/packages/grafana-ui/src/components/Table/utils.ts
@@ -15,7 +15,10 @@ import {
   reduceField,
   GrafanaTheme2,
   isDataFrame,
+  isDataFrameWithValue,
   isTimeSeriesFrame,
+  DisplayValueAlignmentFactors,
+  DisplayValue,
 } from '@grafana/data';
 import {
   BarGaugeDisplayMode,
@@ -115,6 +118,7 @@ export function getColumns(
     const selectSortType = (type: FieldType) => {
       switch (type) {
         case FieldType.number:
+        case FieldType.frame:
           return 'number';
         case FieldType.time:
           return 'basic';
@@ -131,9 +135,7 @@ export function getColumns(
       id: fieldIndex.toString(),
       field: field,
       Header: fieldTableOptions.hideHeader ? '' : getFieldDisplayName(field, data),
-      accessor: (_row, i) => {
-        return field.values[i];
-      },
+      accessor: (_row, i) => field.values[i],
       sortType: selectSortType(field.type),
       width: fieldTableOptions.width,
       minWidth: fieldTableOptions.minWidth ?? columnMinWidth,
@@ -305,6 +307,10 @@ export function sortNumber(rowA: Row, rowB: Row, id: string) {
 }
 
 function toNumber(value: any): number {
+  if (isDataFrameWithValue(value)) {
+    return value.value ?? Number.NEGATIVE_INFINITY;
+  }
+
   if (value === null || value === undefined || value === '' || isNaN(value)) {
     return Number.NEGATIVE_INFINITY;
   }
@@ -486,3 +492,44 @@ function addMissingColumnIndex(columns: Array<{ id: string; field?: Field } | un
   // Recurse
   addMissingColumnIndex(columns);
 }
+
+/**
+ * Getting gauge or sparkline values to align is very tricky without looking at all values and passing them through display processor.
+ * For very large tables that could pretty expensive. So this is kind of a compromise. We look at the first 1000 rows and cache the longest value.
+ * If we have a cached value we just check if the current value is longer and update the alignmentFactor. This can obviously still lead to
+ * unaligned gauges but it should a lot less common.
+ **/
+export function getAlignmentFactor(
+  field: Field,
+  displayValue: DisplayValue,
+  rowIndex: number
+): DisplayValueAlignmentFactors {
+  let alignmentFactor = field.state?.alignmentFactors;
+
+  if (alignmentFactor) {
+    // check if current alignmentFactor is still the longest
+    if (alignmentFactor.text.length < displayValue.text.length) {
+      alignmentFactor.text = displayValue.text;
+    }
+    return alignmentFactor;
+  } else {
+    // look at the next 1000 rows
+    alignmentFactor = { ...displayValue };
+    const maxIndex = Math.min(field.values.length, rowIndex + 1000);
+
+    for (let i = rowIndex + 1; i < maxIndex; i++) {
+      const nextDisplayValue = field.display!(field.values[i]);
+      if (nextDisplayValue.text.length > alignmentFactor.text.length) {
+        alignmentFactor.text = displayValue.text;
+      }
+    }
+
+    if (field.state) {
+      field.state.alignmentFactors = alignmentFactor;
+    } else {
+      field.state = { alignmentFactors: alignmentFactor };
+    }
+
+    return alignmentFactor;
+  }
+}
diff --git a/packages/grafana-ui/src/components/Typeahead/Typeahead.tsx b/packages/grafana-ui/src/components/Typeahead/Typeahead.tsx
index 44e24336e12a7..63f4ed4a10e63 100644
--- a/packages/grafana-ui/src/components/Typeahead/Typeahead.tsx
+++ b/packages/grafana-ui/src/components/Typeahead/Typeahead.tsx
@@ -3,7 +3,8 @@ import React, { createRef, PureComponent } from 'react';
 import ReactDOM from 'react-dom';
 import { FixedSizeList } from 'react-window';
 
-import { ThemeContext } from '../../themes/ThemeContext';
+import { ThemeContext } from '@grafana/data';
+
 import { CompletionItem, CompletionItemGroup, CompletionItemKind } from '../../types/completion';
 import { flattenGroupItems, calculateLongestLabel, calculateListSizes } from '../../utils/typeahead';
 
diff --git a/packages/grafana-ui/src/components/UsersIndicator/Avatar.mdx b/packages/grafana-ui/src/components/UsersIndicator/Avatar.mdx
new file mode 100644
index 0000000000000..b2f333dd0ef30
--- /dev/null
+++ b/packages/grafana-ui/src/components/UsersIndicator/Avatar.mdx
@@ -0,0 +1,27 @@
+import { Meta, ArgTypes } from '@storybook/blocks';
+import { Avatar } from './Avatar';
+
+<Meta title="MDX|Avatar" component={Avatar} />
+
+# Avatar
+
+A basic component for displaying a user's avatar. The default dimensions (width and height) of this component are set to 24 pixels, but these can be overridden by passing a `width` and `height` prop. Both props are `ThemeSpacingTokens`, meaning that instead of passing a specific pixel value, you should pass a token value which will be converted into pixels by multiplying it with the base spacing value - `8`.
+
+## Usage
+
+```jsx
+import { Avatar } from '@grafana/ui';
+
+const user = {
+  id: 5,
+  name: 'Admin',
+  email: 'admin@org.com',
+  avatarUrl: 'https://secure.gravatar.com/avatar',
+};
+
+const Example = () => {
+  return <Avatar src={user.avatarUrl} alt={`Avatar for the user ${user.name}`} width={4} height={4} />;
+};
+```
+
+<ArgTypes of={Avatar} />
diff --git a/packages/grafana-ui/src/components/UsersIndicator/Avatar.story.tsx b/packages/grafana-ui/src/components/UsersIndicator/Avatar.story.tsx
new file mode 100644
index 0000000000000..23aec35c4096c
--- /dev/null
+++ b/packages/grafana-ui/src/components/UsersIndicator/Avatar.story.tsx
@@ -0,0 +1,32 @@
+import { Meta, StoryFn } from '@storybook/react';
+import React from 'react';
+
+import { Avatar } from '@grafana/ui';
+
+import mdx from './Avatar.mdx';
+
+const meta: Meta<typeof Avatar> = {
+  title: 'General/UsersIndicator/Avatar',
+  component: Avatar,
+  parameters: {
+    docs: { page: mdx },
+    controls: { exclude: ['alt'] },
+  },
+  argTypes: {
+    width: { control: 'number' },
+    height: { control: 'number' },
+  },
+};
+
+const Template: StoryFn<typeof Avatar> = (args) => <Avatar {...args} />;
+
+export const Basic = Template.bind({});
+
+Basic.args = {
+  src: 'https://secure.gravatar.com/avatar',
+  alt: 'User avatar',
+  width: 3,
+  height: 3,
+};
+
+export default meta;
diff --git a/packages/grafana-ui/src/components/UsersIndicator/Avatar.tsx b/packages/grafana-ui/src/components/UsersIndicator/Avatar.tsx
new file mode 100644
index 0000000000000..c5485058094f8
--- /dev/null
+++ b/packages/grafana-ui/src/components/UsersIndicator/Avatar.tsx
@@ -0,0 +1,33 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2, ThemeSpacingTokens } from '@grafana/data';
+
+import { useStyles2 } from '../../themes';
+import { getResponsiveStyle, ResponsiveProp } from '../Layout/utils/responsiveness';
+
+export interface AvatarProps {
+  src: string;
+  alt: string;
+  width?: ResponsiveProp<ThemeSpacingTokens>;
+  height?: ResponsiveProp<ThemeSpacingTokens>;
+}
+export const Avatar = ({ src, alt, width, height }: AvatarProps) => {
+  const styles = useStyles2(getStyles, width, height);
+
+  return <img className={styles.image} src={src} alt={alt} />;
+};
+
+const getStyles = (theme: GrafanaTheme2, width: AvatarProps['width'] = 3, height: AvatarProps['height'] = 3) => {
+  return {
+    image: css([
+      getResponsiveStyle(theme, width, (val) => ({
+        width: theme.spacing(val),
+      })),
+      getResponsiveStyle(theme, height, (val) => ({
+        height: theme.spacing(val),
+      })),
+      { borderRadius: theme.shape.radius.circle },
+    ]),
+  };
+};
diff --git a/packages/grafana-ui/src/components/VizLegend/VizLegendList.tsx b/packages/grafana-ui/src/components/VizLegend/VizLegendList.tsx
index eb7558d1e6df9..8bba52a7f3756 100644
--- a/packages/grafana-ui/src/components/VizLegend/VizLegendList.tsx
+++ b/packages/grafana-ui/src/components/VizLegend/VizLegendList.tsx
@@ -109,6 +109,7 @@ const getStyles = (theme: GrafanaTheme2) => {
       justifyContent: 'space-between',
       width: '100%',
       paddingLeft: theme.spacing(0.5),
+      gap: '15px 25px',
     }),
     section: css({
       display: 'flex',
@@ -116,6 +117,7 @@ const getStyles = (theme: GrafanaTheme2) => {
     sectionRight: css({
       justifyContent: 'flex-end',
       flexGrow: 1,
+      flexBasis: '50%',
     }),
   };
 };
diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts
index 1a7f161adcf59..3d967e90118b1 100644
--- a/packages/grafana-ui/src/components/index.ts
+++ b/packages/grafana-ui/src/components/index.ts
@@ -261,6 +261,7 @@ export { Dropdown } from './Dropdown/Dropdown';
 export { PluginSignatureBadge, type PluginSignatureBadgeProps } from './PluginSignatureBadge/PluginSignatureBadge';
 export { UserIcon, type UserIconProps } from './UsersIndicator/UserIcon';
 export { type UserView } from './UsersIndicator/types';
+export { Avatar } from './UsersIndicator/Avatar';
 // Export this until we've figured out a good approach to inline form styles.
 export { InlineFormLabel } from './FormLabel/FormLabel';
 export { Divider } from './Divider/Divider';
diff --git a/packages/grafana-ui/src/components/uPlot/plugins/ZoomPlugin.tsx b/packages/grafana-ui/src/components/uPlot/plugins/ZoomPlugin.tsx
index 02f539dd3eefa..faed1ae95a9a0 100644
--- a/packages/grafana-ui/src/components/uPlot/plugins/ZoomPlugin.tsx
+++ b/packages/grafana-ui/src/components/uPlot/plugins/ZoomPlugin.tsx
@@ -51,31 +51,31 @@ export const ZoomPlugin = ({ onZoom, config, withZoomY = false }: ZoomPluginProp
     }
 
     config.addHook('setSelect', (u) => {
-      if (!maybeZoomAction(u.cursor!.event)) {
-        return;
-      }
-
-      if (withZoomY && yDrag) {
-        if (u.select.height >= MIN_ZOOM_DIST) {
-          for (let key in u.scales!) {
-            if (key !== 'x') {
-              const maxY = u.posToVal(u.select.top, key);
-              const minY = u.posToVal(u.select.top + u.select.height, key);
+      if (maybeZoomAction(u.cursor!.event)) {
+        if (withZoomY && yDrag) {
+          if (u.select.height >= MIN_ZOOM_DIST) {
+            for (let key in u.scales!) {
+              if (key !== 'x') {
+                const maxY = u.posToVal(u.select.top, key);
+                const minY = u.posToVal(u.select.top + u.select.height, key);
 
-              u.setScale(key, { min: minY, max: maxY });
+                u.setScale(key, { min: minY, max: maxY });
+              }
             }
+
+            yZoomed = true;
           }
 
-          yZoomed = true;
-        }
+          yDrag = false;
+        } else {
+          if (u.select.width >= MIN_ZOOM_DIST) {
+            const minX = u.posToVal(u.select.left, 'x');
+            const maxX = u.posToVal(u.select.left + u.select.width, 'x');
 
-        yDrag = false;
-      } else {
-        if (u.select.width >= MIN_ZOOM_DIST) {
-          const minX = u.posToVal(u.select.left, 'x');
-          const maxX = u.posToVal(u.select.left + u.select.width, 'x');
+            onZoom({ from: minX, to: maxX });
 
-          onZoom({ from: minX, to: maxX });
+            yZoomed = false;
+          }
         }
       }
 
diff --git a/packages/grafana-ui/src/themes/ThemeContext.tsx b/packages/grafana-ui/src/themes/ThemeContext.tsx
index 7c1f532b9f32c..5a953458698be 100644
--- a/packages/grafana-ui/src/themes/ThemeContext.tsx
+++ b/packages/grafana-ui/src/themes/ThemeContext.tsx
@@ -2,7 +2,7 @@ import hoistNonReactStatics from 'hoist-non-react-statics';
 import memoize from 'micro-memoize';
 import React, { useContext } from 'react';
 
-import { createTheme, GrafanaTheme, GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme, GrafanaTheme2, ThemeContext } from '@grafana/data';
 
 import { Themeable, Themeable2 } from '../types/theme';
 
@@ -19,12 +19,6 @@ let ThemeContextMock: React.Context<GrafanaTheme2> | null = null;
 // Used by useStyles()
 export const memoizedStyleCreators = new WeakMap();
 
-// Use Grafana Dark theme by default
-/** @public */
-export const ThemeContext = React.createContext(createTheme());
-
-ThemeContext.displayName = 'ThemeContext';
-
 /** @deprecated use withTheme2 */
 /** @public */
 export const withTheme = <P extends Themeable, S extends {} = {}>(Component: React.ComponentType<P>) => {
diff --git a/packages/grafana-ui/src/themes/index.ts b/packages/grafana-ui/src/themes/index.ts
index 4be9327ffb69f..31d4208cf8ac7 100644
--- a/packages/grafana-ui/src/themes/index.ts
+++ b/packages/grafana-ui/src/themes/index.ts
@@ -1,13 +1,7 @@
-export {
-  ThemeContext,
-  withTheme,
-  withTheme2,
-  useTheme,
-  useTheme2,
-  useStyles,
-  useStyles2,
-  mockThemeContext,
-} from './ThemeContext';
+// @deprecated use ThemeContext from @grafana/data instead
+export { ThemeContext } from '@grafana/data';
+
+export { withTheme, withTheme2, useTheme, useTheme2, useStyles, useStyles2, mockThemeContext } from './ThemeContext';
 export { getTheme, mockTheme } from './getTheme';
 export { stylesFactory } from './stylesFactory';
 export { GlobalStyles } from './GlobalStyles/GlobalStyles';
diff --git a/packages/grafana-ui/src/utils/storybook/withTheme.tsx b/packages/grafana-ui/src/utils/storybook/withTheme.tsx
index 9c1d14c00d139..d16bc69929864 100644
--- a/packages/grafana-ui/src/utils/storybook/withTheme.tsx
+++ b/packages/grafana-ui/src/utils/storybook/withTheme.tsx
@@ -2,10 +2,9 @@ import { DecoratorFn } from '@storybook/react';
 import React from 'react';
 import { useDarkMode } from 'storybook-dark-mode';
 
-import { createTheme, GrafanaTheme2 } from '@grafana/data';
+import { createTheme, GrafanaTheme2, ThemeContext } from '@grafana/data';
 
 import { GlobalStyles } from '../../themes/GlobalStyles/GlobalStyles';
-import { ThemeContext } from '../../themes/ThemeContext';
 
 type SassThemeChangeHandler = (theme: GrafanaTheme2) => void;
 const ThemeableStory = ({
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 9ff293280604d..437499a6f54f2 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -412,6 +412,7 @@ func (hs *HTTPServer) registerRoutes() {
 
 		if hs.Features.IsEnabled(featuremgmt.FlagFeatureToggleAdminPage) {
 			apiRoute.Group("/featuremgmt", func(featuremgmtRoute routing.RouteRegister) {
+				featuremgmtRoute.Get("/state", authorize(ac.EvalPermission(ac.ActionFeatureManagementRead)), hs.GetFeatureMgmtState)
 				featuremgmtRoute.Get("/", authorize(ac.EvalPermission(ac.ActionFeatureManagementRead)), hs.GetFeatureToggles)
 				featuremgmtRoute.Post("/", authorize(ac.EvalPermission(ac.ActionFeatureManagementWrite)), hs.UpdateFeatureToggle)
 			})
diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
index c6ebed9cf84f4..aa917cf00f145 100644
--- a/pkg/api/datasources.go
+++ b/pkg/api/datasources.go
@@ -18,6 +18,7 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/contexthandler"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/setting"
@@ -333,7 +334,7 @@ func validateURL(cmdType string, url string) response.Response {
 // validateJSONData prevents the user from adding a custom header with name that matches the auth proxy header name.
 // This is done to prevent data source proxy from being used to circumvent auth proxy.
 // For more context take a look at CVE-2022-35957
-func validateJSONData(jsonData *simplejson.Json, cfg *setting.Cfg) error {
+func validateJSONData(ctx context.Context, jsonData *simplejson.Json, cfg *setting.Cfg) error {
 	if jsonData == nil || !cfg.AuthProxyEnabled {
 		return nil
 	}
@@ -347,6 +348,34 @@ func validateJSONData(jsonData *simplejson.Json, cfg *setting.Cfg) error {
 			}
 		}
 	}
+
+	// Prevent adding a data source team header with a name that matches the auth proxy header name
+	list := contexthandler.AuthHTTPHeaderListFromContext(ctx)
+	if list == nil {
+		return nil
+	}
+	teamHTTPHeadersJSON := datasources.TeamHTTPHeadersJSONData{}
+	if jsonData != nil {
+		jsonData, err := jsonData.MarshalJSON()
+		if err != nil {
+			return err
+		}
+		err = json.Unmarshal(jsonData, &teamHTTPHeadersJSON)
+		if err != nil {
+			return err
+		}
+		for _, headers := range teamHTTPHeadersJSON.TeamHTTPHeaders {
+			for _, header := range headers {
+				for _, name := range list.Items {
+					if http.CanonicalHeaderKey(header.Header) == http.CanonicalHeaderKey(name) {
+						datasourcesLogger.Error("Cannot add a data source team header with a used by our proxy header", "headerName", header.Header)
+						return errors.New("validation error, invalid header name specified")
+					}
+				}
+			}
+		}
+	}
+
 	return nil
 }
 
@@ -387,7 +416,7 @@ func (hs *HTTPServer) AddDataSource(c *contextmodel.ReqContext) response.Respons
 			return resp
 		}
 	}
-	if err := validateJSONData(cmd.JsonData, hs.Cfg); err != nil {
+	if err := validateJSONData(c.Req.Context(), cmd.JsonData, hs.Cfg); err != nil {
 		return response.Error(http.StatusBadRequest, "Failed to add datasource", err)
 	}
 
@@ -452,7 +481,7 @@ func (hs *HTTPServer) UpdateDataSourceByID(c *contextmodel.ReqContext) response.
 	if resp := validateURL(cmd.Type, cmd.URL); resp != nil {
 		return resp
 	}
-	if err := validateJSONData(cmd.JsonData, hs.Cfg); err != nil {
+	if err := validateJSONData(c.Req.Context(), cmd.JsonData, hs.Cfg); err != nil {
 		return response.Error(http.StatusBadRequest, "Failed to update datasource", err)
 	}
 
@@ -492,7 +521,7 @@ func (hs *HTTPServer) UpdateDataSourceByUID(c *contextmodel.ReqContext) response
 	if resp := validateURL(cmd.Type, cmd.URL); resp != nil {
 		return resp
 	}
-	if err := validateJSONData(cmd.JsonData, hs.Cfg); err != nil {
+	if err := validateJSONData(c.Req.Context(), cmd.JsonData, hs.Cfg); err != nil {
 		return response.Error(http.StatusBadRequest, "Failed to update datasource", err)
 	}
 
diff --git a/pkg/api/datasources_test.go b/pkg/api/datasources_test.go
index 767c3fd2863fd..966522685ded0 100644
--- a/pkg/api/datasources_test.go
+++ b/pkg/api/datasources_test.go
@@ -221,6 +221,47 @@ func TestUpdateDataSource_InvalidJSONData(t *testing.T) {
 	assert.Equal(t, 400, sc.resp.Code)
 }
 
+// Using a team HTTP header whose name matches the name specified for auth proxy header should fail
+func TestUpdateDataSourceTeamHTTPHeaders_InvalidJSONData(t *testing.T) {
+	hs := &HTTPServer{
+		DataSourcesService: &dataSourcesServiceMock{},
+		Cfg:                setting.NewCfg(),
+	}
+	sc := setupScenarioContext(t, "/api/datasources/1234")
+
+	data := datasources.TeamHTTPHeaders{
+		"1234": []datasources.TeamHTTPHeader{
+			// Authorization is used by the auth proxy
+			// As part of
+			// contexthandler.AuthHTTPHeaderListFromContext(ctx)
+			{
+				Header: "Authorization",
+				Value:  "Could be anything",
+			},
+		},
+	}
+
+	hs.Cfg.AuthProxyEnabled = true
+	jsonData := simplejson.New()
+	jsonData.Set("teamHTTPHeaders", data)
+
+	sc.m.Put(sc.url, routing.Wrap(func(c *contextmodel.ReqContext) response.Response {
+		c.Req.Body = mockRequestBody(datasources.AddDataSourceCommand{
+			Name:     "Test",
+			URL:      "localhost:5432",
+			Access:   "direct",
+			Type:     "test",
+			JsonData: jsonData,
+		})
+		c.SignedInUser = authedUserWithPermissions(1, 1, []ac.Permission{})
+		return hs.AddDataSource(c)
+	}))
+
+	sc.fakeReqWithParams("PUT", sc.url, map[string]string{}).exec()
+
+	assert.Equal(t, 400, sc.resp.Code)
+}
+
 // Updating data sources with URLs not specifying protocol should work.
 func TestUpdateDataSource_URLWithoutProtocol(t *testing.T) {
 	const name = "Test"
diff --git a/pkg/api/dtos/frontend_settings.go b/pkg/api/dtos/frontend_settings.go
index 529ddd08cef86..35d6ee536896d 100644
--- a/pkg/api/dtos/frontend_settings.go
+++ b/pkg/api/dtos/frontend_settings.go
@@ -93,27 +93,27 @@ type FrontendSettingsFooterConfigItemDTO struct {
 }
 
 // Enterprise-only
-type FrontendSettingsPublicDashboardFooterConfigDTO struct {
-	Hide bool   `json:"hide"`
-	Text string `json:"text"`
-	Logo string `json:"logo"`
-	Link string `json:"link"`
+type FrontendSettingsPublicDashboardConfigDTO struct {
+	FooterHide     bool   `json:"footerHide"`
+	FooterText     string `json:"footerText"`
+	FooterLogo     string `json:"footerLogo"`
+	FooterLink     string `json:"footerLink"`
+	HeaderLogoHide bool   `json:"headerLogoHide"`
 }
 
 // Enterprise-only
 type FrontendSettingsWhitelabelingDTO struct {
-	Links      []FrontendSettingsFooterConfigItemDTO `json:"links"`
-	LoginTitle string                                `json:"loginTitle"`
-
-	AppTitle              *string                                         `json:"appTitle,omitempty"`
-	LoginLogo             *string                                         `json:"loginLogo,omitempty"`
-	MenuLogo              *string                                         `json:"menuLogo,omitempty"`
-	LoginBackground       *string                                         `json:"loginBackground,omitempty"`
-	LoginSubtitle         *string                                         `json:"loginSubtitle,omitempty"`
-	LoginBoxBackground    *string                                         `json:"loginBoxBackground,omitempty"`
-	LoadingLogo           *string                                         `json:"loadingLogo,omitempty"`
-	HideEdition           *bool                                           `json:"hideEdition,omitempty"`
-	PublicDashboardFooter *FrontendSettingsPublicDashboardFooterConfigDTO `json:"publicDashboardFooter,omitempty"` // PR TODO: type this properly
+	Links              []FrontendSettingsFooterConfigItemDTO     `json:"links"`
+	LoginTitle         string                                    `json:"loginTitle"`
+	AppTitle           *string                                   `json:"appTitle,omitempty"`
+	LoginLogo          *string                                   `json:"loginLogo,omitempty"`
+	MenuLogo           *string                                   `json:"menuLogo,omitempty"`
+	LoginBackground    *string                                   `json:"loginBackground,omitempty"`
+	LoginSubtitle      *string                                   `json:"loginSubtitle,omitempty"`
+	LoginBoxBackground *string                                   `json:"loginBoxBackground,omitempty"`
+	LoadingLogo        *string                                   `json:"loadingLogo,omitempty"`
+	HideEdition        *bool                                     `json:"hideEdition,omitempty"`
+	PublicDashboard    *FrontendSettingsPublicDashboardConfigDTO `json:"publicDashboard,omitempty"`
 }
 
 type FrontendSettingsSqlConnectionLimitsDTO struct {
diff --git a/pkg/api/featuremgmt.go b/pkg/api/featuremgmt.go
index a3fd71826663e..d9586a98d67e4 100644
--- a/pkg/api/featuremgmt.go
+++ b/pkg/api/featuremgmt.go
@@ -78,9 +78,16 @@ func (hs *HTTPServer) UpdateFeatureToggle(ctx *contextmodel.ReqContext) response
 		return response.Respond(http.StatusBadRequest, "Failed to perform webhook request")
 	}
 
+	hs.Features.SetRestartRequired()
+
 	return response.Respond(http.StatusOK, "feature toggles updated successfully")
 }
 
+func (hs *HTTPServer) GetFeatureMgmtState(ctx *contextmodel.ReqContext) response.Response {
+	fmState := hs.Features.GetState()
+	return response.Respond(http.StatusOK, fmState)
+}
+
 // isFeatureHidden returns whether a toggle should be hidden from the admin page.
 // filters out statuses Unknown, Experimental, and Private Preview
 func isFeatureHidden(flag featuremgmt.FeatureFlag, hideCfg map[string]struct{}) bool {
diff --git a/pkg/api/org_test.go b/pkg/api/org_test.go
index 777c82b4031e7..48ec23aab37e7 100644
--- a/pkg/api/org_test.go
+++ b/pkg/api/org_test.go
@@ -249,11 +249,11 @@ func TestAPIEndpoint_GetOrg(t *testing.T) {
 			server := SetupAPITestServer(t, func(hs *HTTPServer) {
 				hs.Cfg = setting.NewCfg()
 				hs.orgService = &orgtest.FakeOrgService{ExpectedOrg: &org.Org{}}
-				hs.userService = &usertest.FakeUserService{ExpectedSignedInUser: &user.SignedInUser{OrgID: 0}}
+				hs.userService = &usertest.FakeUserService{ExpectedSignedInUser: &user.SignedInUser{OrgID: 1}}
 				hs.accesscontrolService = &actest.FakeService{ExpectedPermissions: tt.permissions}
 			})
 			verify := func(path string) {
-				req := webtest.RequestWithSignedInUser(server.NewGetRequest(path), userWithPermissions(2, tt.permissions))
+				req := webtest.RequestWithSignedInUser(server.NewGetRequest(path), authedUserWithPermissions(1, 1, tt.permissions))
 				res, err := server.Send(req)
 				require.NoError(t, err)
 				assert.Equal(t, tt.expectedCode, res.StatusCode)
diff --git a/pkg/api/pluginproxy/ds_proxy.go b/pkg/api/pluginproxy/ds_proxy.go
index 35c1ca2efc559..10afcf13bc27c 100644
--- a/pkg/api/pluginproxy/ds_proxy.go
+++ b/pkg/api/pluginproxy/ds_proxy.go
@@ -272,6 +272,15 @@ func (proxy *DataSourceProxy) director(req *http.Request) {
 	if proxy.features.IsEnabled(featuremgmt.FlagIdForwarding) {
 		proxyutil.ApplyForwardIDHeader(req, proxy.ctx.SignedInUser)
 	}
+
+	if proxy.features.IsEnabled(featuremgmt.FlagTeamHttpHeaders) {
+		err := proxyutil.ApplyTeamHTTPHeaders(req, proxy.ds, proxy.ctx.Teams)
+		if err != nil {
+			// NOTE: could downgrade the errors to warnings
+			ctxLogger.Error("Error applying teamHTTPHeaders", "error", err)
+			return
+		}
+	}
 }
 
 func (proxy *DataSourceProxy) validateRequest() error {
diff --git a/pkg/api/pluginproxy/ds_proxy_test.go b/pkg/api/pluginproxy/ds_proxy_test.go
index c6531c561840c..9bc1739c82f77 100644
--- a/pkg/api/pluginproxy/ds_proxy_test.go
+++ b/pkg/api/pluginproxy/ds_proxy_test.go
@@ -37,6 +37,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/oauthtoken"
 	"github.com/grafana/grafana/pkg/services/oauthtoken/oauthtokentest"
 	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/secrets"
 	"github.com/grafana/grafana/pkg/services/secrets/fakes"
@@ -789,7 +790,7 @@ func getDatasourceProxiedRequest(t *testing.T, ctx *contextmodel.ReqContext, cfg
 	secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 	features := featuremgmt.WithFeatures()
 	quotaService := quotatest.New(false, nil)
-	dsService, err := datasourceservice.ProvideService(nil, secretsService, secretsStore, cfg, features, acimpl.ProvideAccessControl(cfg), &actest.FakePermissionsService{}, quotaService)
+	dsService, err := datasourceservice.ProvideService(nil, secretsService, secretsStore, cfg, features, acimpl.ProvideAccessControl(cfg), &actest.FakePermissionsService{}, quotaService, &pluginstore.FakePluginStore{})
 	require.NoError(t, err)
 	proxy, err := NewDataSourceProxy(ds, routes, ctx, "", cfg, httpclient.NewProvider(), &oauthtoken.Service{}, dsService, tracer, features)
 	require.NoError(t, err)
@@ -909,7 +910,7 @@ func runDatasourceAuthTest(t *testing.T, secretsService secrets.Service, secrets
 	var routes []*plugins.Route
 	features := featuremgmt.WithFeatures()
 	quotaService := quotatest.New(false, nil)
-	dsService, err := datasourceservice.ProvideService(nil, secretsService, secretsStore, cfg, features, acimpl.ProvideAccessControl(cfg), &actest.FakePermissionsService{}, quotaService)
+	dsService, err := datasourceservice.ProvideService(nil, secretsService, secretsStore, cfg, features, acimpl.ProvideAccessControl(cfg), &actest.FakePermissionsService{}, quotaService, &pluginstore.FakePluginStore{})
 	require.NoError(t, err)
 	proxy, err := NewDataSourceProxy(test.datasource, routes, ctx, "", &setting.Cfg{}, httpclient.NewProvider(), &oauthtoken.Service{}, dsService, tracer, features)
 	require.NoError(t, err)
@@ -963,7 +964,7 @@ func setupDSProxyTest(t *testing.T, ctx *contextmodel.ReqContext, ds *datasource
 	secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
 	secretsStore := secretskvs.NewSQLSecretsKVStore(dbtest.NewFakeDB(), secretsService, log.NewNopLogger())
 	features := featuremgmt.WithFeatures()
-	dsService, err := datasourceservice.ProvideService(nil, secretsService, secretsStore, cfg, features, acimpl.ProvideAccessControl(cfg), &actest.FakePermissionsService{}, quotatest.New(false, nil))
+	dsService, err := datasourceservice.ProvideService(nil, secretsService, secretsStore, cfg, features, acimpl.ProvideAccessControl(cfg), &actest.FakePermissionsService{}, quotatest.New(false, nil), &pluginstore.FakePluginStore{})
 	require.NoError(t, err)
 
 	tracer := tracing.InitializeTracerForTest()
diff --git a/pkg/apis/playlist/v0alpha1/conversions.go b/pkg/apis/playlist/v0alpha1/conversions.go
new file mode 100644
index 0000000000000..c3cb0b95222d3
--- /dev/null
+++ b/pkg/apis/playlist/v0alpha1/conversions.go
@@ -0,0 +1,55 @@
+package v0alpha1
+
+import (
+	"fmt"
+	"time"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+
+	"github.com/grafana/grafana/pkg/services/playlist"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+type namespaceMapper = func(orgId int64) string
+
+func orgNamespaceMapper(orgId int64) string {
+	if orgId == 1 {
+		return "default"
+	}
+	return fmt.Sprintf("org-%d", orgId)
+}
+
+func getNamespaceMapper(cfg *setting.Cfg) namespaceMapper {
+	if cfg.StackID != "" {
+		return func(orgId int64) string { return "stack-" + cfg.StackID }
+	}
+	return orgNamespaceMapper
+}
+
+func convertToK8sResource(v *playlist.PlaylistDTO, namespacer namespaceMapper) *Playlist {
+	spec := Spec{
+		Title:    v.Name,
+		Interval: v.Interval,
+	}
+	for _, item := range v.Items {
+		spec.Items = append(spec.Items, Item{
+			Type:  ItemType(item.Type),
+			Value: item.Value,
+		})
+	}
+	return &Playlist{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Playlist",
+			APIVersion: APIVersion,
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:              v.Uid,
+			UID:               types.UID(v.Uid),
+			ResourceVersion:   fmt.Sprintf("%d", v.UpdatedAt),
+			CreationTimestamp: metav1.NewTime(time.UnixMilli(v.CreatedAt)),
+			Namespace:         namespacer(v.OrgID),
+		},
+		Spec: spec,
+	}
+}
diff --git a/pkg/apis/playlist/v0alpha1/conversions_test.go b/pkg/apis/playlist/v0alpha1/conversions_test.go
new file mode 100644
index 0000000000000..f8809ca050c5d
--- /dev/null
+++ b/pkg/apis/playlist/v0alpha1/conversions_test.go
@@ -0,0 +1,98 @@
+package v0alpha1
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/services/playlist"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func TestPlaylistConversion(t *testing.T) {
+	src := &playlist.PlaylistDTO{
+		OrgID:     3,
+		Uid:       "abc",         // becomes k8s name
+		Name:      "MyPlaylists", // becomes title
+		Interval:  "10s",
+		CreatedAt: 12345,
+		UpdatedAt: 54321,
+		Items: []playlist.PlaylistItemDTO{
+			{Type: "dashboard_by_uid", Value: "UID0"},
+			{Type: "dashboard_by_tag", Value: "tagA"},
+			{Type: "dashboard_by_id", Value: "123"}, // deprecated
+		},
+	}
+	dst := convertToK8sResource(src, orgNamespaceMapper)
+
+	require.Equal(t, "abc", src.Uid)
+	require.Equal(t, "abc", dst.Name)
+	require.Equal(t, src.Name, dst.Spec.Title)
+
+	out, err := json.MarshalIndent(dst, "", "  ")
+	require.NoError(t, err)
+	//fmt.Printf("%s", string(out))
+	require.JSONEq(t, `{
+		"kind": "Playlist",
+		"apiVersion": "playlist.x.grafana.com/v0alpha1",
+		"metadata": {
+		  "name": "abc",
+		  "namespace": "org-3",
+		  "uid": "abc",
+		  "resourceVersion": "54321",
+		  "creationTimestamp": "1970-01-01T00:00:12Z"
+		},
+		"spec": {
+		  "title": "MyPlaylists",
+		  "interval": "10s",
+		  "items": [
+			{
+			  "type": "dashboard_by_uid",
+			  "value": "UID0"
+			},
+			{
+			  "type": "dashboard_by_tag",
+			  "value": "tagA"
+			},
+			{
+			  "type": "dashboard_by_id",
+			  "value": "123"
+			}
+		  ]
+		}
+	  }`, string(out))
+}
+
+func TestNamespaceMapper(t *testing.T) {
+	tests := []struct {
+		name     string
+		cfg      string
+		orgId    int64
+		expected string
+	}{
+		{
+			name:     "default namespace",
+			orgId:    1,
+			expected: "default",
+		},
+		{
+			name:     "with org",
+			orgId:    123,
+			expected: "org-123",
+		},
+		{
+			name:     "with stackId",
+			cfg:      "abc",
+			orgId:    123, // ignored
+			expected: "stack-abc",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			mapper := getNamespaceMapper(&setting.Cfg{StackID: tt.cfg})
+			require.Equal(t, tt.expected, mapper(tt.orgId))
+		})
+	}
+}
diff --git a/pkg/apis/playlist/v0alpha1/legacy_storage.go b/pkg/apis/playlist/v0alpha1/legacy_storage.go
index 1880499ce4fa2..11af780645789 100644
--- a/pkg/apis/playlist/v0alpha1/legacy_storage.go
+++ b/pkg/apis/playlist/v0alpha1/legacy_storage.go
@@ -9,7 +9,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apiserver/pkg/registry/rest"
 
-	playlistkind "github.com/grafana/grafana/pkg/kinds/playlist"
 	grafanarequest "github.com/grafana/grafana/pkg/services/grafana-apiserver/endpoints/request"
 	"github.com/grafana/grafana/pkg/services/playlist"
 )
@@ -23,13 +22,8 @@ var (
 )
 
 type legacyStorage struct {
-	service playlist.Service
-}
-
-func newLegacyStorage(s playlist.Service) *legacyStorage {
-	return &legacyStorage{
-		service: s,
-	}
+	service    playlist.Service
+	namespacer namespaceMapper
 }
 
 func (s *legacyStorage) New() runtime.Object {
@@ -57,9 +51,9 @@ func (s *legacyStorage) ConvertToTable(ctx context.Context, object runtime.Objec
 func (s *legacyStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
 	// TODO: handle fetching all available orgs when no namespace is specified
 	// To test: kubectl get playlists --all-namespaces
-	orgId, ok := grafanarequest.OrgIDFrom(ctx)
-	if !ok {
-		orgId = 1 // TODO: default org ID 1 for now
+	info, err := grafanarequest.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
 	}
 
 	limit := 100
@@ -67,7 +61,7 @@ func (s *legacyStorage) List(ctx context.Context, options *internalversion.ListO
 		limit = int(options.Limit)
 	}
 	res, err := s.service.Search(ctx, &playlist.GetPlaylistsQuery{
-		OrgId: orgId,
+		OrgId: info.OrgID,
 		Limit: limit,
 	})
 	if err != nil {
@@ -81,21 +75,14 @@ func (s *legacyStorage) List(ctx context.Context, options *internalversion.ListO
 		},
 	}
 	for _, v := range res {
-		p := Playlist{
-			TypeMeta: metav1.TypeMeta{
-				Kind:       "Playlist",
-				APIVersion: APIVersion,
-			},
-			ObjectMeta: metav1.ObjectMeta{
-				Name: v.UID,
-			},
-			Spec: playlistkind.Spec{
-				Name:     v.Name,
-				Uid:      v.UID,
-				Interval: v.Interval,
-			},
+		p, err := s.service.Get(ctx, &playlist.GetPlaylistByUidQuery{
+			UID:   v.UID,
+			OrgId: info.OrgID,
+		})
+		if err != nil {
+			return nil, err
 		}
-		list.Items = append(list.Items, p)
+		list.Items = append(list.Items, *convertToK8sResource(p, s.namespacer))
 	}
 	if len(list.Items) == limit {
 		list.Continue = "<more>" // TODO?
@@ -104,35 +91,21 @@ func (s *legacyStorage) List(ctx context.Context, options *internalversion.ListO
 }
 
 func (s *legacyStorage) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
-	orgId, ok := grafanarequest.OrgIDFrom(ctx)
-	if !ok {
-		orgId = 1 // TODO: default org ID 1 for now
+	info, err := grafanarequest.NamespaceInfoFrom(ctx, true)
+	if err != nil {
+		return nil, err
 	}
 
-	p, err := s.service.Get(ctx, &playlist.GetPlaylistByUidQuery{
+	dto, err := s.service.Get(ctx, &playlist.GetPlaylistByUidQuery{
 		UID:   name,
-		OrgId: orgId,
+		OrgId: info.OrgID,
 	})
 	if err != nil {
 		return nil, err
 	}
-	if p == nil {
+	if dto == nil {
 		return nil, fmt.Errorf("not found?")
 	}
 
-	return &Playlist{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Playlist",
-			APIVersion: APIVersion,
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name: p.Uid,
-		},
-		Spec: playlistkind.Spec{
-			Name:     p.Name,
-			Uid:      p.Uid,
-			Interval: p.Interval,
-			Items:    p.Items,
-		},
-	}, nil
+	return convertToK8sResource(dto, s.namespacer), nil
 }
diff --git a/pkg/apis/playlist/v0alpha1/openapi.go b/pkg/apis/playlist/v0alpha1/openapi.go
deleted file mode 100644
index 6b7123d06fa10..0000000000000
--- a/pkg/apis/playlist/v0alpha1/openapi.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package v0alpha1
-
-import (
-	common "k8s.io/kube-openapi/pkg/common"
-	spec "k8s.io/kube-openapi/pkg/validation/spec"
-)
-
-// NOTE: this must match the golang fully qualifid name!
-const kindKey = "github.com/grafana/grafana/pkg/apis/playlist/v0alpha1.Playlist"
-
-func getOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
-	return map[string]common.OpenAPIDefinition{
-		kindKey:          schema_pkg_Playlist(ref),
-		kindKey + "List": schema_pkg_PlaylistList(ref),
-	}
-}
-
-func schema_pkg_Playlist(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "Playlist",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"metadata": {
-						SchemaProps: spec.SchemaProps{
-							Default: map[string]interface{}{},
-							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
-						},
-					},
-					// TODO!  add a real spec here
-					// "spec": {
-					// 	SchemaProps: spec.SchemaProps{
-					// 		Default: map[string]interface{}{},
-					// 		Ref:     ref("github.com/grafana/google-sheets-datasource/pkg/apis/googlesheets/v1.DatasourceSpec"),
-					// 	},
-					// },
-					// "status": {
-					// 	SchemaProps: spec.SchemaProps{
-					// 		Default: map[string]interface{}{},
-					// 		Ref:     ref("github.com/grafana/google-sheets-datasource/pkg/apis/googlesheets/v1.DatasourceStatus"),
-					// 	},
-					// },
-				},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta",
-		},
-	}
-}
-
-func schema_pkg_PlaylistList(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "PlaylistList",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"metadata": {
-						SchemaProps: spec.SchemaProps{
-							Default: map[string]interface{}{},
-							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
-						},
-					},
-					"items": {
-						SchemaProps: spec.SchemaProps{
-							Type: []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref(kindKey),
-									},
-								},
-							},
-						},
-					},
-				},
-				Required: []string{"items"},
-			},
-		},
-		Dependencies: []string{
-			kindKey,
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
-	}
-}
diff --git a/pkg/apis/playlist/v0alpha1/register.go b/pkg/apis/playlist/v0alpha1/register.go
index 1c0e59edd4b6a..f77d0148ea848 100644
--- a/pkg/apis/playlist/v0alpha1/register.go
+++ b/pkg/apis/playlist/v0alpha1/register.go
@@ -13,23 +13,24 @@ import (
 	grafanaapiserver "github.com/grafana/grafana/pkg/services/grafana-apiserver"
 	grafanarest "github.com/grafana/grafana/pkg/services/grafana-apiserver/rest"
 	"github.com/grafana/grafana/pkg/services/playlist"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
-// GroupName is the group name for this API.
-const GroupName = "playlist.x.grafana.com"
-const VersionID = "v0alpha1" //
-const APIVersion = GroupName + "/" + VersionID
-
 var _ grafanaapiserver.APIGroupBuilder = (*PlaylistAPIBuilder)(nil)
 
 // This is used just so wire has something unique to return
 type PlaylistAPIBuilder struct {
-	service playlist.Service
+	service    playlist.Service
+	namespacer namespaceMapper
 }
 
-func RegisterAPIService(p playlist.Service, apiregistration grafanaapiserver.APIRegistrar) *PlaylistAPIBuilder {
+func RegisterAPIService(p playlist.Service,
+	apiregistration grafanaapiserver.APIRegistrar,
+	cfg *setting.Cfg,
+) *PlaylistAPIBuilder {
 	builder := &PlaylistAPIBuilder{
-		service: p,
+		service:    p,
+		namespacer: getNamespaceMapper(cfg),
 	}
 	apiregistration.RegisterAPI(builder)
 	return builder
@@ -55,7 +56,10 @@ func (b *PlaylistAPIBuilder) GetAPIGroupInfo(
 	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(GroupName, scheme, metav1.ParameterCodec, codecs)
 	storage := map[string]rest.Storage{}
 
-	legacyStore := newLegacyStorage(b.service)
+	legacyStore := &legacyStorage{
+		service:    b.service,
+		namespacer: b.namespacer,
+	}
 	storage["playlists"] = legacyStore
 
 	// enable dual writes if a RESTOptionsGetter is provided
diff --git a/pkg/apis/playlist/v0alpha1/types.go b/pkg/apis/playlist/v0alpha1/types.go
index 2e94bd84f44d8..7a8a147fb2f5d 100644
--- a/pkg/apis/playlist/v0alpha1/types.go
+++ b/pkg/apis/playlist/v0alpha1/types.go
@@ -2,10 +2,13 @@ package v0alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	"github.com/grafana/grafana/pkg/kinds/playlist"
 )
 
+// GroupName is the group name for this API.
+const GroupName = "playlist.x.grafana.com"
+const VersionID = "v0alpha1" //
+const APIVersion = GroupName + "/" + VersionID
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type Playlist struct {
 	metav1.TypeMeta `json:",inline"`
@@ -14,7 +17,7 @@ type Playlist struct {
 	// +optional
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec playlist.Spec `json:"spec,omitempty"`
+	Spec Spec `json:"spec,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -23,5 +26,45 @@ type PlaylistList struct {
 	// +optional
 	metav1.ListMeta `json:"metadata,omitempty"`
 
-	Items []Playlist `json:"playlists,omitempty"`
+	Items []Playlist `json:"items,omitempty"`
 }
+
+// Spec defines model for Spec.
+type Spec struct {
+	// Name of the playlist.
+	Title string `json:"title"`
+
+	// Interval sets the time between switching views in a playlist.
+	Interval string `json:"interval"`
+
+	// The ordered list of items that the playlist will iterate over.
+	Items []Item `json:"items,omitempty"`
+}
+
+// Defines values for ItemType.
+const (
+	ItemTypeDashboardByTag ItemType = "dashboard_by_tag"
+	ItemTypeDashboardByUid ItemType = "dashboard_by_uid"
+
+	// deprecated -- should use UID
+	ItemTypeDashboardById ItemType = "dashboard_by_id"
+)
+
+// Item defines model for Item.
+type Item struct {
+	// Type of the item.
+	Type ItemType `json:"type"`
+
+	// Value depends on type and describes the playlist item.
+	//
+	//  - dashboard_by_id: The value is an internal numerical identifier set by Grafana. This
+	//  is not portable as the numerical identifier is non-deterministic between different instances.
+	//  Will be replaced by dashboard_by_uid in the future. (deprecated)
+	//  - dashboard_by_tag: The value is a tag which is set on any number of dashboards. All
+	//  dashboards behind the tag will be added to the playlist.
+	//  - dashboard_by_uid: The value is the dashboard UID
+	Value string `json:"value"`
+}
+
+// Type of the item.
+type ItemType string
diff --git a/pkg/apis/playlist/v0alpha1/types_test.go b/pkg/apis/playlist/v0alpha1/types_test.go
new file mode 100644
index 0000000000000..8303335987248
--- /dev/null
+++ b/pkg/apis/playlist/v0alpha1/types_test.go
@@ -0,0 +1,42 @@
+package v0alpha1
+
+import (
+	"encoding/json"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func TestPlaylistClone(t *testing.T) {
+	src := Playlist{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Playlist",
+			APIVersion: APIVersion,
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:              "TheUID",
+			ResourceVersion:   "12345",
+			CreationTimestamp: metav1.NewTime(time.Now()),
+			Annotations: map[string]string{
+				"grafana.com/updatedTime": time.Now().Format(time.RFC3339),
+			},
+		},
+		Spec: Spec{
+			Title:    "A title",
+			Interval: "20s",
+			Items: []Item{
+				{Type: ItemTypeDashboardByTag, Value: "graph-ng"},
+			},
+		},
+	}
+	copy := src.DeepCopyObject()
+
+	json0, err := json.Marshal(src)
+	require.NoError(t, err)
+	json1, err := json.Marshal(copy)
+	require.NoError(t, err)
+
+	require.JSONEq(t, string(json0), string(json1))
+}
diff --git a/pkg/apis/playlist/v0alpha1/zz_generated.deepcopy.go b/pkg/apis/playlist/v0alpha1/zz_generated.deepcopy.go
index 66da954054f8f..74637ae2fb4fc 100644
--- a/pkg/apis/playlist/v0alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/playlist/v0alpha1/zz_generated.deepcopy.go
@@ -1,6 +1,8 @@
 //go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
+// SPDX-License-Identifier: AGPL-3.0-only
+
 // Code generated by deepcopy-gen. DO NOT EDIT.
 
 package v0alpha1
@@ -9,11 +11,28 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Item) DeepCopyInto(out *Item) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Item.
+func (in *Item) DeepCopy() *Item {
+	if in == nil {
+		return nil
+	}
+	out := new(Item)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Playlist) DeepCopyInto(out *Playlist) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
 	return
 }
 
@@ -69,17 +88,22 @@ func (in *PlaylistList) DeepCopyObject() runtime.Object {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *legacyStorage) DeepCopyInto(out *legacyStorage) {
+func (in *Spec) DeepCopyInto(out *Spec) {
 	*out = *in
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Item, len(*in))
+		copy(*out, *in)
+	}
 	return
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Storage.
-func (in *legacyStorage) DeepCopy() *legacyStorage {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Spec.
+func (in *Spec) DeepCopy() *Spec {
 	if in == nil {
 		return nil
 	}
-	out := new(legacyStorage)
+	out := new(Spec)
 	in.DeepCopyInto(out)
 	return out
 }
diff --git a/pkg/apis/playlist/v0alpha1/zz_generated.openapi.go b/pkg/apis/playlist/v0alpha1/zz_generated.openapi.go
new file mode 100644
index 0000000000000..4be50c3a8f743
--- /dev/null
+++ b/pkg/apis/playlist/v0alpha1/zz_generated.openapi.go
@@ -0,0 +1,188 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+// SPDX-License-Identifier: AGPL-3.0-only
+
+// Code generated by openapi-gen. DO NOT EDIT.
+
+// This file was autogenerated by openapi-gen. Do not edit it manually!
+
+package v0alpha1
+
+import (
+	common "k8s.io/kube-openapi/pkg/common"
+	spec "k8s.io/kube-openapi/pkg/validation/spec"
+)
+
+func getOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
+	return map[string]common.OpenAPIDefinition{
+		"github.com/grafana/grafana/pkg/apis/playlist/v0alpha1.Item":         schema_pkg_apis_playlist_v0alpha1_Item(ref),
+		"github.com/grafana/grafana/pkg/apis/playlist/v0alpha1.Playlist":     schema_pkg_apis_playlist_v0alpha1_Playlist(ref),
+		"github.com/grafana/grafana/pkg/apis/playlist/v0alpha1.PlaylistList": schema_pkg_apis_playlist_v0alpha1_PlaylistList(ref),
+		"github.com/grafana/grafana/pkg/apis/playlist/v0alpha1.Spec":         schema_pkg_apis_playlist_v0alpha1_Spec(ref),
+	}
+}
+
+func schema_pkg_apis_playlist_v0alpha1_Item(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Item defines model for Item.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"type": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Type of the item.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"value": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Value depends on type and describes the playlist item.\n\n - dashboard_by_id: The value is an internal numerical identifier set by Grafana. This\n is not portable as the numerical identifier is non-deterministic between different instances.\n Will be replaced by dashboard_by_uid in the future. (deprecated)\n - dashboard_by_tag: The value is a tag which is set on any number of dashboards. All\n dashboards behind the tag will be added to the playlist.\n - dashboard_by_uid: The value is the dashboard UID",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"type", "value"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_playlist_v0alpha1_Playlist(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Standard object's metadata More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
+							Default:     map[string]interface{}{},
+							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("github.com/grafana/grafana/pkg/apis/playlist/v0alpha1.Spec"),
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/playlist/v0alpha1.Spec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+	}
+}
+
+func schema_pkg_apis_playlist_v0alpha1_PlaylistList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/playlist/v0alpha1.Playlist"),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/playlist/v0alpha1.Playlist", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+	}
+}
+
+func schema_pkg_apis_playlist_v0alpha1_Spec(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Spec defines model for Spec.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"title": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Name of the playlist.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"interval": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Interval sets the time between switching views in a playlist.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The ordered list of items that the playlist will iterate over.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Default: map[string]interface{}{},
+										Ref:     ref("github.com/grafana/grafana/pkg/apis/playlist/v0alpha1.Item"),
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"title", "interval"},
+			},
+		},
+		Dependencies: []string{
+			"github.com/grafana/grafana/pkg/apis/playlist/v0alpha1.Item"},
+	}
+}
diff --git a/pkg/kinds/dashboard/dashboard_spec_gen.go b/pkg/kinds/dashboard/dashboard_spec_gen.go
index ca5b81891a39e..e5be145cffabe 100644
--- a/pkg/kinds/dashboard/dashboard_spec_gen.go
+++ b/pkg/kinds/dashboard/dashboard_spec_gen.go
@@ -187,6 +187,9 @@ type AnnotationPanelFilter struct {
 // TODO docs
 // FROM: AnnotationQuery in grafana-data/src/types/annotations.ts
 type AnnotationQuery struct {
+	// Set to 1 for the standard annotation query all dashboards have by default.
+	BuiltIn *float32 `json:"builtIn,omitempty"`
+
 	// Ref to a DataSource instance
 	Datasource DataSourceRef `json:"datasource"`
 
diff --git a/pkg/kinds/playlist/playlist_gen.go b/pkg/kinds/playlist/playlist_gen.go
deleted file mode 100644
index 289e3cb5785c2..0000000000000
--- a/pkg/kinds/playlist/playlist_gen.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     GoTypesJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package playlist
-
-import (
-	"github.com/grafana/grafana/pkg/kinds"
-)
-
-// Resource is the kubernetes style representation of Playlist. (TODO be better)
-type K8sResource = kinds.GrafanaResource[Spec, Status]
-
-// NewResource creates a new instance of the resource with a given name (UID)
-func NewK8sResource(name string, s *Spec) K8sResource {
-	return K8sResource{
-		Kind:       "Playlist",
-		APIVersion: "v0-0-alpha",
-		Metadata: kinds.GrafanaResourceMetadata{
-			Name:        name,
-			Annotations: make(map[string]string),
-			Labels:      make(map[string]string),
-		},
-		Spec: s,
-	}
-}
-
-// Resource is the wire representation of Playlist.
-// It currently will soon be merged into the k8s flavor (TODO be better)
-type Resource struct {
-	Metadata Metadata `json:"metadata"`
-	Spec     Spec     `json:"spec"`
-	Status   Status   `json:"status"`
-}
diff --git a/pkg/kinds/playlist/playlist_kind_gen.go b/pkg/kinds/playlist/playlist_kind_gen.go
deleted file mode 100644
index d2f2a04cf4b65..0000000000000
--- a/pkg/kinds/playlist/playlist_kind_gen.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     CoreKindJenny
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package playlist
-
-import (
-	"github.com/grafana/kindsys"
-	"github.com/grafana/thema"
-	"github.com/grafana/thema/vmux"
-
-	"github.com/grafana/grafana/pkg/cuectx"
-)
-
-// rootrel is the relative path from the grafana repository root to the
-// directory containing the .cue files in which this kind is defined. Necessary
-// for runtime errors related to the definition and/or lineage to provide
-// a real path to the correct .cue file.
-const rootrel string = "kinds/playlist"
-
-// TODO standard generated docs
-type Kind struct {
-	kindsys.Core
-	lin    thema.ConvergentLineage[*Resource]
-	jcodec vmux.Codec
-	valmux vmux.ValueMux[*Resource]
-}
-
-// type guard - ensure generated Kind type satisfies the kindsys.Core interface
-var _ kindsys.Core = &Kind{}
-
-// TODO standard generated docs
-func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
-	def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	k := &Kind{}
-	k.Core, err = kindsys.BindCore(rt, def, opts...)
-	if err != nil {
-		return nil, err
-	}
-	// Get the thema.Schema that the meta says is in the current version (which
-	// codegen ensures is always the latest)
-	cursch := thema.SchemaP(k.Core.Lineage(), def.Properties.CurrentVersion)
-	tsch, err := thema.BindType(cursch, &Resource{})
-	if err != nil {
-		// Should be unreachable, modulo bugs in the Thema->Go code generator
-		return nil, err
-	}
-
-	k.jcodec = vmux.NewJSONCodec("playlist.json")
-	k.lin = tsch.ConvergentLineage()
-	k.valmux = vmux.NewValueMux(k.lin.TypedSchema(), k.jcodec)
-	return k, nil
-}
-
-// ConvergentLineage returns the same [thema.Lineage] as Lineage, but bound (see [thema.BindType])
-// to the the Playlist [Resource] type generated from the current schema, v0.0.
-func (k *Kind) ConvergentLineage() thema.ConvergentLineage[*Resource] {
-	return k.lin
-}
-
-// JSONValueMux is a version multiplexer that maps a []byte containing JSON data
-// at any schematized dashboard version to an instance of Playlist [Resource].
-//
-// Validation and translation errors emitted from this func will identify the
-// input bytes as "dashboard.json".
-//
-// This is a thin wrapper around Thema's [vmux.ValueMux].
-func (k *Kind) JSONValueMux(b []byte) (*Resource, thema.TranslationLacunas, error) {
-	return k.valmux(b)
-}
diff --git a/pkg/kinds/playlist/playlist_metadata_gen.go b/pkg/kinds/playlist/playlist_metadata_gen.go
deleted file mode 100644
index f97a4b6eb0123..0000000000000
--- a/pkg/kinds/playlist/playlist_metadata_gen.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     GoResourceTypes
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package playlist
-
-import (
-	"time"
-)
-
-// Metadata defines model for Metadata.
-type Metadata struct {
-	CreatedBy         string     `json:"createdBy"`
-	CreationTimestamp time.Time  `json:"creationTimestamp"`
-	DeletionTimestamp *time.Time `json:"deletionTimestamp,omitempty"`
-
-	// extraFields is reserved for any fields that are pulled from the API server metadata but do not have concrete fields in the CUE metadata
-	ExtraFields     map[string]any    `json:"extraFields"`
-	Finalizers      []string          `json:"finalizers"`
-	Labels          map[string]string `json:"labels"`
-	ResourceVersion string            `json:"resourceVersion"`
-	Uid             string            `json:"uid"`
-	UpdateTimestamp time.Time         `json:"updateTimestamp"`
-	UpdatedBy       string            `json:"updatedBy"`
-}
-
-// _kubeObjectMetadata is metadata found in a kubernetes object's metadata field.
-// It is not exhaustive and only includes fields which may be relevant to a kind's implementation,
-// As it is also intended to be generic enough to function with any API Server.
-type KubeObjectMetadata struct {
-	CreationTimestamp time.Time         `json:"creationTimestamp"`
-	DeletionTimestamp *time.Time        `json:"deletionTimestamp,omitempty"`
-	Finalizers        []string          `json:"finalizers"`
-	Labels            map[string]string `json:"labels"`
-	ResourceVersion   string            `json:"resourceVersion"`
-	Uid               string            `json:"uid"`
-}
diff --git a/pkg/kinds/playlist/playlist_spec_gen.go b/pkg/kinds/playlist/playlist_spec_gen.go
deleted file mode 100644
index 211fb577b7f13..0000000000000
--- a/pkg/kinds/playlist/playlist_spec_gen.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     GoResourceTypes
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package playlist
-
-// Defines values for ItemType.
-const (
-	ItemTypeDashboardById  ItemType = "dashboard_by_id"
-	ItemTypeDashboardByTag ItemType = "dashboard_by_tag"
-	ItemTypeDashboardByUid ItemType = "dashboard_by_uid"
-)
-
-// Item defines model for Item.
-type Item struct {
-	// Title is an unused property -- it will be removed in the future
-	Title *string `json:"title,omitempty"`
-
-	// Type of the item.
-	Type ItemType `json:"type"`
-
-	// Value depends on type and describes the playlist item.
-	//
-	//  - dashboard_by_id: The value is an internal numerical identifier set by Grafana. This
-	//  is not portable as the numerical identifier is non-deterministic between different instances.
-	//  Will be replaced by dashboard_by_uid in the future. (deprecated)
-	//  - dashboard_by_tag: The value is a tag which is set on any number of dashboards. All
-	//  dashboards behind the tag will be added to the playlist.
-	//  - dashboard_by_uid: The value is the dashboard UID
-	Value string `json:"value"`
-}
-
-// Type of the item.
-type ItemType string
-
-// Spec defines model for Spec.
-type Spec struct {
-	// Interval sets the time between switching views in a playlist.
-	// FIXME: Is this based on a standardized format or what options are available? Can datemath be used?
-	Interval string `json:"interval"`
-
-	// The ordered list of items that the playlist will iterate over.
-	// FIXME! This should not be optional, but changing it makes the godegen awkward
-	Items []Item `json:"items,omitempty"`
-
-	// Name of the playlist.
-	Name string `json:"name"`
-
-	// Unique playlist identifier. Generated on creation, either by the
-	// creator of the playlist of by the application.
-	Uid string `json:"uid"`
-}
diff --git a/pkg/kinds/playlist/playlist_status_gen.go b/pkg/kinds/playlist/playlist_status_gen.go
deleted file mode 100644
index 33644fe4a8702..0000000000000
--- a/pkg/kinds/playlist/playlist_status_gen.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Code generated - EDITING IS FUTILE. DO NOT EDIT.
-//
-// Generated by:
-//     kinds/gen.go
-// Using jennies:
-//     GoResourceTypes
-//
-// Run 'make gen-cue' from repository root to regenerate.
-
-package playlist
-
-// Defines values for OperatorStateState.
-const (
-	OperatorStateStateFailed     OperatorStateState = "failed"
-	OperatorStateStateInProgress OperatorStateState = "in_progress"
-	OperatorStateStateSuccess    OperatorStateState = "success"
-)
-
-// Defines values for StatusOperatorStateState.
-const (
-	StatusOperatorStateStateFailed     StatusOperatorStateState = "failed"
-	StatusOperatorStateStateInProgress StatusOperatorStateState = "in_progress"
-	StatusOperatorStateStateSuccess    StatusOperatorStateState = "success"
-)
-
-// OperatorState defines model for OperatorState.
-type OperatorState struct {
-	// 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]any `json:"details,omitempty"`
-
-	// 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 OperatorStateState `json:"state"`
-}
-
-// OperatorStateState state describes the state of the lastEvaluation.
-// It is limited to three possible states for machine evaluation.
-type OperatorStateState string
-
-// Status defines model for Status.
-type Status struct {
-	// additionalFields is reserved for future use
-	AdditionalFields map[string]any `json:"additionalFields,omitempty"`
-
-	// 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]StatusOperatorState `json:"operatorStates,omitempty"`
-}
-
-// StatusOperatorState defines model for status.#OperatorState.
-type StatusOperatorState struct {
-	// 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]any `json:"details,omitempty"`
-
-	// 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 StatusOperatorStateState `json:"state"`
-}
-
-// StatusOperatorStateState state describes the state of the lastEvaluation.
-// It is limited to three possible states for machine evaluation.
-type StatusOperatorStateState string
diff --git a/pkg/kindsysreport/codegen/report.json b/pkg/kindsysreport/codegen/report.json
index 2aee0908d05c7..dca8c8bd03f92 100644
--- a/pkg/kindsysreport/codegen/report.json
+++ b/pkg/kindsysreport/codegen/report.json
@@ -1322,31 +1322,26 @@
     },
     "playlist": {
       "category": "core",
-      "codeowners": [
-        "grafana/grafana-as-code",
-        "grafana/grafana-frontend-platform",
-        "grafana/plugins-platform-frontend"
-      ],
+      "codeowners": [],
       "crd": {
         "dummySchema": false,
-        "group": "playlist.core.grafana.com",
-        "scope": "Namespaced"
+        "group": "",
+        "scope": ""
       },
       "currentVersion": [
         0,
         0
       ],
-      "description": "A playlist is a series of dashboards that is automatically rotated in the browser, on a configurable interval.",
       "grafanaMaturityCount": 0,
       "lineageIsGroup": false,
       "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/playlist/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/kinds/playlist",
-        "schema": "https://github.com/grafana/grafana/tree/main/kinds/playlist/playlist_kind.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/packages/grafana-schema/src/raw/playlist/x/playlist_types.gen.ts"
+        "docs": "n/a",
+        "go": "n/a",
+        "schema": "n/a",
+        "ts": "n/a"
       },
       "machineName": "playlist",
-      "maturity": "merged",
+      "maturity": "planned",
       "name": "Playlist",
       "pluralMachineName": "playlists",
       "pluralName": "Playlists"
@@ -2277,7 +2272,6 @@
           "folder",
           "googlecloudmonitoringdataquery",
           "heatmappanelcfg",
-          "playlist",
           "preferences",
           "publicdashboard",
           "role",
@@ -2286,7 +2280,7 @@
           "timeseriespanelcfg",
           "trendpanelcfg"
         ],
-        "count": 14
+        "count": 13
       },
       "planned": {
         "name": "planned",
@@ -2319,6 +2313,7 @@
           "mysqldataquery",
           "mysqldatasourcecfg",
           "parcadatasourcecfg",
+          "playlist",
           "postgresqldataquery",
           "postgresqldatasourcecfg",
           "prometheusdatasourcecfg",
@@ -2335,7 +2330,7 @@
           "zipkindataquery",
           "zipkindatasourcecfg"
         ],
-        "count": 43
+        "count": 44
       },
       "stable": {
         "name": "stable",
diff --git a/pkg/login/social/generic_oauth.go b/pkg/login/social/generic_oauth.go
index a5d76514a6683..57cab0dee5792 100644
--- a/pkg/login/social/generic_oauth.go
+++ b/pkg/login/social/generic_oauth.go
@@ -228,7 +228,7 @@ func (s *SocialGenericOAuth) extractFromToken(token *oauth2.Token) *UserInfoJson
 
 	var data UserInfoJson
 	if err := json.Unmarshal(rawJSON, &data); err != nil {
-		s.log.Error("Error decoding id_token JSON", "raw_json", string(data.rawJSON), "error", err)
+		s.log.Error("Error decoding id_token JSON", "raw_json", string(rawJSON), "error", err)
 		return nil
 	}
 
diff --git a/pkg/plugins/backendplugin/coreplugin/core_plugin.go b/pkg/plugins/backendplugin/coreplugin/core_plugin.go
index 9bd670967385e..e57d730ab3436 100644
--- a/pkg/plugins/backendplugin/coreplugin/core_plugin.go
+++ b/pkg/plugins/backendplugin/coreplugin/core_plugin.go
@@ -76,6 +76,7 @@ func (cp *corePlugin) CollectMetrics(_ context.Context, _ *backend.CollectMetric
 
 func (cp *corePlugin) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
 	if cp.CheckHealthHandler != nil {
+		ctx = backend.WithGrafanaConfig(ctx, req.PluginContext.GrafanaConfig)
 		return cp.CheckHealthHandler.CheckHealth(ctx, req)
 	}
 
@@ -84,6 +85,7 @@ func (cp *corePlugin) CheckHealth(ctx context.Context, req *backend.CheckHealthR
 
 func (cp *corePlugin) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
 	if cp.QueryDataHandler != nil {
+		ctx = backend.WithGrafanaConfig(ctx, req.PluginContext.GrafanaConfig)
 		return cp.QueryDataHandler.QueryData(ctx, req)
 	}
 
@@ -92,6 +94,7 @@ func (cp *corePlugin) QueryData(ctx context.Context, req *backend.QueryDataReque
 
 func (cp *corePlugin) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
 	if cp.CallResourceHandler != nil {
+		ctx = backend.WithGrafanaConfig(ctx, req.PluginContext.GrafanaConfig)
 		return cp.CallResourceHandler.CallResource(ctx, req, sender)
 	}
 
@@ -100,6 +103,7 @@ func (cp *corePlugin) CallResource(ctx context.Context, req *backend.CallResourc
 
 func (cp *corePlugin) SubscribeStream(ctx context.Context, req *backend.SubscribeStreamRequest) (*backend.SubscribeStreamResponse, error) {
 	if cp.StreamHandler != nil {
+		ctx = backend.WithGrafanaConfig(ctx, req.PluginContext.GrafanaConfig)
 		return cp.StreamHandler.SubscribeStream(ctx, req)
 	}
 	return nil, plugins.ErrMethodNotImplemented
@@ -107,6 +111,7 @@ func (cp *corePlugin) SubscribeStream(ctx context.Context, req *backend.Subscrib
 
 func (cp *corePlugin) PublishStream(ctx context.Context, req *backend.PublishStreamRequest) (*backend.PublishStreamResponse, error) {
 	if cp.StreamHandler != nil {
+		ctx = backend.WithGrafanaConfig(ctx, req.PluginContext.GrafanaConfig)
 		return cp.StreamHandler.PublishStream(ctx, req)
 	}
 	return nil, plugins.ErrMethodNotImplemented
@@ -114,6 +119,7 @@ func (cp *corePlugin) PublishStream(ctx context.Context, req *backend.PublishStr
 
 func (cp *corePlugin) RunStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender) error {
 	if cp.StreamHandler != nil {
+		ctx = backend.WithGrafanaConfig(ctx, req.PluginContext.GrafanaConfig)
 		return cp.StreamHandler.RunStream(ctx, req, sender)
 	}
 	return plugins.ErrMethodNotImplemented
diff --git a/pkg/plugins/envvars/envvars.go b/pkg/plugins/envvars/envvars.go
index 3bd03d561dd81..57259ca28db56 100644
--- a/pkg/plugins/envvars/envvars.go
+++ b/pkg/plugins/envvars/envvars.go
@@ -59,8 +59,10 @@ func (s *Service) Get(ctx context.Context, p *plugins.Plugin) []string {
 			fmt.Sprintf("GF_APP_URL=%s", s.cfg.GrafanaAppURL),
 			fmt.Sprintf("GF_PLUGIN_APP_CLIENT_ID=%s", p.ExternalService.ClientID),
 			fmt.Sprintf("GF_PLUGIN_APP_CLIENT_SECRET=%s", p.ExternalService.ClientSecret),
-			fmt.Sprintf("GF_PLUGIN_APP_PRIVATE_KEY=%s", p.ExternalService.PrivateKey),
 		)
+		if p.ExternalService.PrivateKey != "" {
+			hostEnv = append(hostEnv, fmt.Sprintf("GF_PLUGIN_APP_PRIVATE_KEY=%s", p.ExternalService.PrivateKey))
+		}
 	}
 
 	hostEnv = append(hostEnv, s.featureToggleEnableVar(ctx)...)
diff --git a/pkg/plugins/envvars/envvars_test.go b/pkg/plugins/envvars/envvars_test.go
index a1654ab1d708f..46cc8b56e527d 100644
--- a/pkg/plugins/envvars/envvars_test.go
+++ b/pkg/plugins/envvars/envvars_test.go
@@ -306,8 +306,8 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
 	}
 }
 
-func TestInitializer_oauthEnvVars(t *testing.T) {
-	t.Run("backend datasource with oauth registration", func(t *testing.T) {
+func TestInitializer_authEnvVars(t *testing.T) {
+	t.Run("backend datasource with auth registration", func(t *testing.T) {
 		p := &plugins.Plugin{
 			JSONData: plugins.JSONData{
 				ID:                          "test",
@@ -322,7 +322,6 @@ func TestInitializer_oauthEnvVars(t *testing.T) {
 
 		envVarsProvider := NewProvider(&config.Cfg{
 			GrafanaAppURL: "https://myorg.com/",
-			Features:      featuremgmt.WithFeatures(featuremgmt.FlagExternalServiceAuth),
 		}, nil)
 		envVars := envVarsProvider.Get(context.Background(), p)
 		assert.Equal(t, "GF_VERSION=", envVars[0])
diff --git a/pkg/plugins/errors.go b/pkg/plugins/errors.go
index 470e25e3ac409..b9c86bdf2b549 100644
--- a/pkg/plugins/errors.go
+++ b/pkg/plugins/errors.go
@@ -24,7 +24,7 @@ var (
 		errutil.WithPublicMessage("Plugin health check failed"),
 		errutil.WithDownstream())
 
-	// ErrPluginDownstreamError error returned when a plugin request fails.
+	// ErrPluginDownstreamErrorBase error returned when a plugin request fails.
 	// Exposed as a base error to wrap it with plugin downstream errors.
 	ErrPluginDownstreamErrorBase = errutil.Internal("plugin.downstreamError",
 		errutil.WithPublicMessage("An error occurred within the plugin"),
diff --git a/pkg/plugins/manager/client/clienttest/clienttest.go b/pkg/plugins/manager/client/clienttest/clienttest.go
index 6b3be014cdf65..d7e538ac0872f 100644
--- a/pkg/plugins/manager/client/clienttest/clienttest.go
+++ b/pkg/plugins/manager/client/clienttest/clienttest.go
@@ -8,13 +8,14 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/stretchr/testify/require"
+
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/manager/client"
 	"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/web"
-	"github.com/stretchr/testify/require"
 )
 
 type TestClient struct {
diff --git a/pkg/plugins/manager/loader/assetpath/assetpath.go b/pkg/plugins/manager/loader/assetpath/assetpath.go
index bcdbc1a627d89..0306c823f4f5c 100644
--- a/pkg/plugins/manager/loader/assetpath/assetpath.go
+++ b/pkg/plugins/manager/loader/assetpath/assetpath.go
@@ -45,7 +45,8 @@ func DefaultService(cfg *config.Cfg) *Service {
 // Base returns the base path for the specified plugin.
 func (s *Service) Base(n PluginInfo) (string, error) {
 	if n.class == plugins.ClassCore {
-		return path.Join("/", s.cfg.GrafanaAppSubURL, "/public/app/plugins", string(n.pluginJSON.Type), filepath.Base(n.dir)), nil
+		baseDir := getBaseDir(n.dir)
+		return path.Join("/", s.cfg.GrafanaAppSubURL, "/public/app/plugins", string(n.pluginJSON.Type), baseDir), nil
 	}
 	if s.cdn.PluginSupported(n.pluginJSON.ID) {
 		return s.cdn.AssetURL(n.pluginJSON.ID, n.pluginJSON.Info.Version, "")
@@ -56,7 +57,8 @@ func (s *Service) Base(n PluginInfo) (string, error) {
 // Module returns the module.js path for the specified plugin.
 func (s *Service) Module(n PluginInfo) (string, error) {
 	if n.class == plugins.ClassCore {
-		return path.Join("core:plugin", filepath.Base(n.dir)), nil
+		baseDir := getBaseDir(n.dir)
+		return path.Join("core:plugin", baseDir), nil
 	}
 	if s.cdn.PluginSupported(n.pluginJSON.ID) {
 		return s.cdn.AssetURL(n.pluginJSON.ID, n.pluginJSON.Info.Version, "module.js")
@@ -94,3 +96,12 @@ func (s *Service) RelativeURL(n PluginInfo, pathStr string) (string, error) {
 func (s *Service) DefaultLogoPath(pluginType plugins.Type) string {
 	return path.Join("/", s.cfg.GrafanaAppSubURL, fmt.Sprintf("/public/img/icn-%s.svg", string(pluginType)))
 }
+
+func getBaseDir(pluginDir string) string {
+	baseDir := filepath.Base(pluginDir)
+	// Decoupled core plugins will be suffixed with "dist" if they have been built
+	if baseDir == "dist" {
+		return filepath.Base(strings.TrimSuffix(pluginDir, baseDir))
+	}
+	return baseDir
+}
diff --git a/pkg/plugins/manager/testdata/external-registration/plugin.json b/pkg/plugins/manager/testdata/external-registration/plugin.json
index c98f26d78a94e..7021001580378 100644
--- a/pkg/plugins/manager/testdata/external-registration/plugin.json
+++ b/pkg/plugins/manager/testdata/external-registration/plugin.json
@@ -18,24 +18,11 @@
     "version": "1.0.0"
   },
   "externalServiceRegistration": {
-    "impersonation": {
-      "enabled" : true,
-      "groups" : true,
-      "permissions" :  [
-        {
-          "action": "read",
-          "scope": "datasource"
-        }
-      ]
-    },
-    "self": {
-      "enabled" : true,
-      "permissions" :  [
-        {
-          "action": "read",
-          "scope": "datasource"
-        }
-      ]
-    }
+    "permissions" :  [
+      {
+        "action": "read",
+        "scope": "datasource"
+      }
+    ]
   }
 }
diff --git a/pkg/plugins/manager/testdata/oauth-external-registration/plugin.json b/pkg/plugins/manager/testdata/oauth-external-registration/plugin.json
new file mode 100644
index 0000000000000..c09e9ea5d0d52
--- /dev/null
+++ b/pkg/plugins/manager/testdata/oauth-external-registration/plugin.json
@@ -0,0 +1,38 @@
+{
+  "id": "grafana-test-datasource",
+  "type": "datasource",
+  "name": "Test",
+  "backend": true,
+  "executable": "gpx_test_datasource",
+  "info": {
+    "author": {
+      "name": "Grafana Labs",
+      "url": "https://grafana.com"
+    },
+    "logos": {
+      "large": "img/ds.svg",
+      "small": "img/ds.svg"
+    },
+    "screenshots": [],
+    "updated": "2023-08-03",
+    "version": "1.0.0"
+  },
+  "externalServiceRegistration": {
+    "impersonation": {
+      "enabled" : true,
+      "groups" : true,
+      "permissions" :  [
+        {
+          "action": "read",
+          "scope": "datasource"
+        }
+      ]
+    },
+    "permissions" :  [
+      {
+        "action": "read",
+        "scope": "datasource"
+      }
+    ]
+  }
+}
diff --git a/pkg/plugins/pfs/pfs_test.go b/pkg/plugins/pfs/pfs_test.go
index 13b4ee61cd197..92d25d74b3b37 100644
--- a/pkg/plugins/pfs/pfs_test.go
+++ b/pkg/plugins/pfs/pfs_test.go
@@ -134,6 +134,9 @@ func TestParsePluginTestdata(t *testing.T) {
 		"external-registration": {
 			rootid: "grafana-test-datasource",
 		},
+		"oauth-external-registration": {
+			rootid: "grafana-test-datasource",
+		},
 	}
 
 	staticRootPath, err := filepath.Abs("../manager/testdata")
diff --git a/pkg/plugins/plugindef/plugindef.cue b/pkg/plugins/plugindef/plugindef.cue
index cc5685514ad9c..bd7026e6c93ab 100644
--- a/pkg/plugins/plugindef/plugindef.cue
+++ b/pkg/plugins/plugindef/plugindef.cue
@@ -413,11 +413,15 @@ schemas: [{
 		// External service registration information
 		externalServiceRegistration: #ExternalServiceRegistration
 
+		// ExternalServiceRegistration allows the service to get a service account token
+		// (or to use the client_credentials grant if the token provider is the OAuth2 Server)
 		#ExternalServiceRegistration: {
+			// Permissions are the permissions that the external service needs its associated service account to have.
+			permissions?: [...#Permission]
+
 			// Impersonation describes the permissions that the external service will have on behalf of the user
+			// This is only available with the OAuth2 Server
 			impersonation?: #Impersonation
-			// Self describes the permissions that the external service will have on behalf of itself
-			self?: 		#Self
 		}
 
 		#Impersonation: {
@@ -432,14 +436,6 @@ schemas: [{
 			// gain more privileges than the impersonated user has.
 			permissions?: [...#Permission]
 		}
-
-		#Self: {
-			// Enabled allows the service to request access tokens for itself using the client_credentials grant
-			// Defaults to true.
-			enabled?: bool
-			// Permissions are the permissions that the external service needs its associated service account to have.
-			permissions?: [...#Permission]
-		}
 	}
 }]
 lenses: []
diff --git a/pkg/plugins/plugindef/plugindef_types_gen.go b/pkg/plugins/plugindef/plugindef_types_gen.go
index d306736a37b64..20b04cebbf6fe 100644
--- a/pkg/plugins/plugindef/plugindef_types_gen.go
+++ b/pkg/plugins/plugindef/plugindef_types_gen.go
@@ -122,10 +122,13 @@ type Dependency struct {
 // DependencyType defines model for Dependency.Type.
 type DependencyType string
 
-// ExternalServiceRegistration defines model for ExternalServiceRegistration.
+// ExternalServiceRegistration allows the service to get a service account token
+// (or to use the client_credentials grant if the token provider is the OAuth2 Server)
 type ExternalServiceRegistration struct {
 	Impersonation *Impersonation `json:"impersonation,omitempty"`
-	Self          *Self          `json:"self,omitempty"`
+
+	// Permissions are the permissions that the external service needs its associated service account to have.
+	Permissions []Permission `json:"permissions,omitempty"`
 }
 
 // Header describes an HTTP header that is forwarded with a proxied request for
@@ -314,7 +317,10 @@ type PluginDef struct {
 	// $GOARCH><.exe for Windows>`, e.g. `plugin_linux_amd64`.
 	// Combination of $GOOS and $GOARCH can be found here:
 	// https://golang.org/doc/install/source#environment.
-	Executable                  *string                     `json:"executable,omitempty"`
+	Executable *string `json:"executable,omitempty"`
+
+	// ExternalServiceRegistration allows the service to get a service account token
+	// (or to use the client_credentials grant if the token provider is the OAuth2 Server)
 	ExternalServiceRegistration ExternalServiceRegistration `json:"externalServiceRegistration"`
 
 	// [internal only] Excludes the plugin from listings in Grafana's UI. Only
@@ -472,16 +478,6 @@ type Route struct {
 	UrlParams []URLParam `json:"urlParams,omitempty"`
 }
 
-// Self defines model for Self.
-type Self struct {
-	// Enabled allows the service to request access tokens for itself using the client_credentials grant
-	// Defaults to true.
-	Enabled *bool `json:"enabled,omitempty"`
-
-	// Permissions are the permissions that the external service needs its associated service account to have.
-	Permissions []Permission `json:"permissions,omitempty"`
-}
-
 // TODO docs
 type TokenAuth struct {
 	// Parameters for the token authentication request.
diff --git a/pkg/plugins/pluginrequestmeta/plugin_request_meta.go b/pkg/plugins/pluginrequestmeta/plugin_request_meta.go
new file mode 100644
index 0000000000000..cc3f414379096
--- /dev/null
+++ b/pkg/plugins/pluginrequestmeta/plugin_request_meta.go
@@ -0,0 +1,44 @@
+package pluginrequestmeta
+
+import (
+	"context"
+	"errors"
+)
+
+// StatusSource is an enum-like string value representing the source of a
+// plugin query data response status code
+type StatusSource string
+
+const (
+	StatusSourcePlugin     StatusSource = "plugin"
+	StatusSourceDownstream StatusSource = "downstream"
+)
+
+type statusSourceCtxKey struct{}
+
+// StatusSourceFromContext returns the plugin request status source stored in the context.
+// If no plugin request status source is stored in the context, [StatusSourcePlugin] is returned.
+func StatusSourceFromContext(ctx context.Context) StatusSource {
+	value, ok := ctx.Value(statusSourceCtxKey{}).(*StatusSource)
+	if ok {
+		return *value
+	}
+	return StatusSourcePlugin
+}
+
+// WithStatusSource sets the plugin request status source for the context.
+func WithStatusSource(ctx context.Context, s StatusSource) context.Context {
+	return context.WithValue(ctx, statusSourceCtxKey{}, &s)
+}
+
+// WithDownstreamStatusSource mutates the provided context by setting the plugin request status source to
+// StatusSourceDownstream. If the provided context does not have a plugin request status source, the context
+// will not be mutated. This means that [WithStatusSource] has to be called before this function.
+func WithDownstreamStatusSource(ctx context.Context) error {
+	v, ok := ctx.Value(statusSourceCtxKey{}).(*StatusSource)
+	if !ok {
+		return errors.New("the provided context does not have a plugin request status source")
+	}
+	*v = StatusSourceDownstream
+	return nil
+}
diff --git a/pkg/plugins/pluginrequestmeta/plugin_request_meta_test.go b/pkg/plugins/pluginrequestmeta/plugin_request_meta_test.go
new file mode 100644
index 0000000000000..ffec48c1e3021
--- /dev/null
+++ b/pkg/plugins/pluginrequestmeta/plugin_request_meta_test.go
@@ -0,0 +1,50 @@
+package pluginrequestmeta
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestStatusSource(t *testing.T) {
+	t.Run("WithStatusSource", func(t *testing.T) {
+		ctx := context.Background()
+		ss := StatusSourceFromContext(ctx)
+		require.Equal(t, StatusSourcePlugin, ss)
+
+		ctx = WithStatusSource(ctx, StatusSourceDownstream)
+		ss = StatusSourceFromContext(ctx)
+		require.Equal(t, StatusSourceDownstream, ss)
+	})
+
+	t.Run("WithDownstreamStatusSource", func(t *testing.T) {
+		t.Run("Returns error if no status source is set", func(t *testing.T) {
+			ctx := context.Background()
+			err := WithDownstreamStatusSource(ctx)
+			require.Error(t, err)
+			require.Equal(t, StatusSourcePlugin, StatusSourceFromContext(ctx))
+		})
+
+		t.Run("Should mutate context if status source is set", func(t *testing.T) {
+			ctx := WithStatusSource(context.Background(), StatusSourcePlugin)
+			err := WithDownstreamStatusSource(ctx)
+			require.NoError(t, err)
+			require.Equal(t, StatusSourceDownstream, StatusSourceFromContext(ctx))
+		})
+	})
+
+	t.Run("StatusSourceFromContext", func(t *testing.T) {
+		t.Run("Background returns StatusSourcePlugin", func(t *testing.T) {
+			ctx := context.Background()
+			ss := StatusSourceFromContext(ctx)
+			require.Equal(t, StatusSourcePlugin, ss)
+		})
+
+		t.Run("Context with status source returns the set status source", func(t *testing.T) {
+			ctx := WithStatusSource(context.Background(), StatusSourcePlugin)
+			ss := StatusSourceFromContext(ctx)
+			require.Equal(t, StatusSourcePlugin, ss)
+		})
+	})
+}
diff --git a/pkg/registry/corekind/base_gen.go b/pkg/registry/corekind/base_gen.go
index f969ff245eae4..5f72862b04a0e 100644
--- a/pkg/registry/corekind/base_gen.go
+++ b/pkg/registry/corekind/base_gen.go
@@ -16,7 +16,6 @@ import (
 	"github.com/grafana/grafana/pkg/kinds/dashboard"
 	"github.com/grafana/grafana/pkg/kinds/folder"
 	"github.com/grafana/grafana/pkg/kinds/librarypanel"
-	"github.com/grafana/grafana/pkg/kinds/playlist"
 	"github.com/grafana/grafana/pkg/kinds/preferences"
 	"github.com/grafana/grafana/pkg/kinds/publicdashboard"
 	"github.com/grafana/grafana/pkg/kinds/role"
@@ -47,7 +46,6 @@ type Base struct {
 	dashboard       *dashboard.Kind
 	folder          *folder.Kind
 	librarypanel    *librarypanel.Kind
-	playlist        *playlist.Kind
 	preferences     *preferences.Kind
 	publicdashboard *publicdashboard.Kind
 	role            *role.Kind
@@ -61,7 +59,6 @@ var (
 	_ kindsys.Core = &dashboard.Kind{}
 	_ kindsys.Core = &folder.Kind{}
 	_ kindsys.Core = &librarypanel.Kind{}
-	_ kindsys.Core = &playlist.Kind{}
 	_ kindsys.Core = &preferences.Kind{}
 	_ kindsys.Core = &publicdashboard.Kind{}
 	_ kindsys.Core = &role.Kind{}
@@ -89,11 +86,6 @@ func (b *Base) LibraryPanel() *librarypanel.Kind {
 	return b.librarypanel
 }
 
-// Playlist returns the [kindsys.Interface] implementation for the playlist kind.
-func (b *Base) Playlist() *playlist.Kind {
-	return b.playlist
-}
-
 // Preferences returns the [kindsys.Interface] implementation for the preferences kind.
 func (b *Base) Preferences() *preferences.Kind {
 	return b.preferences
@@ -147,12 +139,6 @@ func doNewBase(rt *thema.Runtime) *Base {
 	}
 	reg.all = append(reg.all, reg.librarypanel)
 
-	reg.playlist, err = playlist.NewKind(rt)
-	if err != nil {
-		panic(fmt.Sprintf("error while initializing the playlist Kind: %s", err))
-	}
-	reg.all = append(reg.all, reg.playlist)
-
 	reg.preferences, err = preferences.NewKind(rt)
 	if err != nil {
 		panic(fmt.Sprintf("error while initializing the preferences Kind: %s", err))
diff --git a/pkg/services/accesscontrol/acimpl/service.go b/pkg/services/accesscontrol/acimpl/service.go
index 6eddb33209892..9a649d60bf781 100644
--- a/pkg/services/accesscontrol/acimpl/service.go
+++ b/pkg/services/accesscontrol/acimpl/service.go
@@ -397,7 +397,7 @@ func PermissionMatchesSearchOptions(permission accesscontrol.Permission, searchO
 }
 
 func (s *Service) SaveExternalServiceRole(ctx context.Context, cmd accesscontrol.SaveExternalServiceRoleCommand) error {
-	if !s.features.IsEnabled(featuremgmt.FlagExternalServiceAuth) {
+	if !(s.features.IsEnabled(featuremgmt.FlagExternalServiceAuth) || s.features.IsEnabled(featuremgmt.FlagExternalServiceAccounts)) {
 		s.log.Debug("Registering an external service role is behind a feature flag, enable it to use this feature.")
 		return nil
 	}
@@ -410,7 +410,7 @@ func (s *Service) SaveExternalServiceRole(ctx context.Context, cmd accesscontrol
 }
 
 func (s *Service) DeleteExternalServiceRole(ctx context.Context, externalServiceID string) error {
-	if !s.features.IsEnabled(featuremgmt.FlagExternalServiceAuth) {
+	if !(s.features.IsEnabled(featuremgmt.FlagExternalServiceAuth) || s.features.IsEnabled(featuremgmt.FlagExternalServiceAccounts)) {
 		s.log.Debug("Deleting an external service role is behind a feature flag, enable it to use this feature.")
 		return nil
 	}
diff --git a/pkg/services/accesscontrol/acimpl/service_test.go b/pkg/services/accesscontrol/acimpl/service_test.go
index 808db85efb2f1..14c61d6015d6a 100644
--- a/pkg/services/accesscontrol/acimpl/service_test.go
+++ b/pkg/services/accesscontrol/acimpl/service_test.go
@@ -815,7 +815,7 @@ func TestService_SaveExternalServiceRole(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			ctx := context.Background()
 			ac := setupTestEnv(t)
-			ac.features = featuremgmt.WithFeatures(featuremgmt.FlagExternalServiceAuth)
+			ac.features = featuremgmt.WithFeatures(featuremgmt.FlagExternalServiceAuth, featuremgmt.FlagExternalServiceAccounts)
 			for _, r := range tt.runs {
 				err := ac.SaveExternalServiceRole(ctx, r.cmd)
 				if r.wantErr {
@@ -861,7 +861,7 @@ func TestService_DeleteExternalServiceRole(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			ctx := context.Background()
 			ac := setupTestEnv(t)
-			ac.features = featuremgmt.WithFeatures(featuremgmt.FlagExternalServiceAuth)
+			ac.features = featuremgmt.WithFeatures(featuremgmt.FlagExternalServiceAuth, featuremgmt.FlagExternalServiceAccounts)
 
 			if tt.initCmd != nil {
 				err := ac.SaveExternalServiceRole(ctx, *tt.initCmd)
diff --git a/pkg/services/accesscontrol/authorize_in_org_test.go b/pkg/services/accesscontrol/authorize_in_org_test.go
index 4893e8b88eeac..0af24186f16ff 100644
--- a/pkg/services/accesscontrol/authorize_in_org_test.go
+++ b/pkg/services/accesscontrol/authorize_in_org_test.go
@@ -35,16 +35,18 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) {
 		expectedStatus  int
 	}{
 		{
-			name: "should authorize user with global org ID - no fetch",
+			name: "should authorize user with global org ID - fetch",
 			orgIDGetter: func(c *contextmodel.ReqContext) (int64, error) {
 				return accesscontrol.GlobalOrgID, nil
 			},
 			evaluator:       accesscontrol.EvalPermission("users:read", "users:*"),
 			accessControl:   ac,
-			acService:       &actest.FakeService{},
 			userCache:       &usertest.FakeUserService{},
 			ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}},
-			expectedStatus:  http.StatusOK,
+			acService: &actest.FakeService{
+				ExpectedPermissions: []accesscontrol.Permission{{Action: "users:read", Scope: "users:*"}},
+			},
+			expectedStatus: http.StatusOK,
 		},
 		{
 			name: "should authorize user with non-global org ID - no fetch",
@@ -70,6 +72,30 @@ func TestAuthorizeInOrgMiddleware(t *testing.T) {
 			acService:       &actest.FakeService{},
 			expectedStatus:  http.StatusForbidden,
 		},
+		{
+			name: "should return 200 when user has permissions for a global org",
+			orgIDGetter: func(c *contextmodel.ReqContext) (int64, error) {
+				return accesscontrol.GlobalOrgID, nil
+			},
+			evaluator:       accesscontrol.EvalPermission("users:read", "users:*"),
+			accessControl:   ac,
+			userCache:       &usertest.FakeUserService{},
+			ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{accesscontrol.GlobalOrgID: {"users:read": {"users:*"}}}},
+			acService:       &actest.FakeService{},
+			expectedStatus:  http.StatusOK,
+		},
+		{
+			name: "should return 403 when user has no permissions for a global org",
+			orgIDGetter: func(c *contextmodel.ReqContext) (int64, error) {
+				return accesscontrol.GlobalOrgID, nil
+			},
+			evaluator:       accesscontrol.EvalPermission("users:read", "users:*"),
+			accessControl:   ac,
+			userCache:       &usertest.FakeUserService{},
+			ctxSignedInUser: &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {"users:read": {"users:*"}}}},
+			acService:       &actest.FakeService{},
+			expectedStatus:  http.StatusForbidden,
+		},
 		{
 			name: "should return 403 when user org ID doesn't match and user does not exist in org 2",
 			orgIDGetter: func(c *contextmodel.ReqContext) (int64, error) {
diff --git a/pkg/services/accesscontrol/database/externalservices.go b/pkg/services/accesscontrol/database/externalservices.go
index 9acadc786d73f..4335b57334894 100644
--- a/pkg/services/accesscontrol/database/externalservices.go
+++ b/pkg/services/accesscontrol/database/externalservices.go
@@ -2,9 +2,7 @@ package database
 
 import (
 	"context"
-	// #nosec G505 Used only for generating a 160 bit hash, it's not used for security purposes
-	"crypto/sha1"
-	"encoding/hex"
+
 	"errors"
 	"fmt"
 	"time"
@@ -13,24 +11,13 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 )
 
-// extServiceRoleUID generates a 160 bit unique ID using SHA-1 that fits within the 40 characters limit of the role UID.
-func extServiceRoleUID(externalServiceID string) string {
-	uid := fmt.Sprintf("%s%s_permissions", accesscontrol.ExternalServiceRoleUIDPrefix, externalServiceID)
-	// #nosec G505 Used only for generating a 160 bit hash, it's not used for security purposes
-	hasher := sha1.New()
-	hasher.Write([]byte(uid))
-
-	return hex.EncodeToString(hasher.Sum(nil))
-}
-
 func extServiceRoleName(externalServiceID string) string {
 	name := fmt.Sprintf("%s%s:permissions", accesscontrol.ExternalServiceRolePrefix, externalServiceID)
 	return name
 }
 
 func (s *AccessControlStore) DeleteExternalServiceRole(ctx context.Context, externalServiceID string) error {
-	uid := extServiceRoleUID(externalServiceID)
-
+	uid := accesscontrol.PrefixedRoleUID(extServiceRoleName(externalServiceID))
 	return s.sql.WithDbSession(ctx, func(sess *db.Session) error {
 		stored, errGet := getRoleByUID(ctx, sess, uid)
 		if errGet != nil {
@@ -90,11 +77,12 @@ func (s *AccessControlStore) SaveExternalServiceRole(ctx context.Context, cmd ac
 }
 
 func genExternalServiceRole(cmd accesscontrol.SaveExternalServiceRoleCommand) accesscontrol.Role {
+	name := extServiceRoleName(cmd.ExternalServiceID)
 	role := accesscontrol.Role{
 		OrgID:       cmd.OrgID,
 		Version:     1,
-		Name:        extServiceRoleName(cmd.ExternalServiceID),
-		UID:         extServiceRoleUID(cmd.ExternalServiceID),
+		Name:        name,
+		UID:         accesscontrol.PrefixedRoleUID(name),
 		DisplayName: fmt.Sprintf("External Service %s Permissions", cmd.ExternalServiceID),
 		Description: fmt.Sprintf("External Service %s permissions", cmd.ExternalServiceID),
 		Group:       "External Service",
diff --git a/pkg/services/accesscontrol/database/externalservices_test.go b/pkg/services/accesscontrol/database/externalservices_test.go
index 219506f962274..b782e791ff829 100644
--- a/pkg/services/accesscontrol/database/externalservices_test.go
+++ b/pkg/services/accesscontrol/database/externalservices_test.go
@@ -3,10 +3,8 @@ package database
 import (
 	"context"
 	// #nosec G505 Used only for generating a 160 bit hash, it's not used for security purposes
-	"crypto/sha1"
-	"encoding/hex"
+
 	"errors"
-	"fmt"
 	"testing"
 
 	"github.com/grafana/grafana/pkg/infra/db"
@@ -166,7 +164,7 @@ func TestAccessControlStore_SaveExternalServiceRole(t *testing.T) {
 				require.NoError(t, err)
 
 				errDBSession := s.sql.WithDbSession(ctx, func(sess *db.Session) error {
-					storedRole, err := getRoleByUID(ctx, sess, sha1Hash(fmt.Sprintf("externalservice_%s_permissions", tt.runs[i].cmd.ExternalServiceID)))
+					storedRole, err := getRoleByUID(ctx, sess, accesscontrol.PrefixedRoleUID(extServiceRoleName(tt.runs[i].cmd.ExternalServiceID)))
 					require.NoError(t, err)
 					require.NotNil(t, storedRole)
 					require.Equal(t, tt.runs[i].cmd.Global, storedRole.Global(), "Incorrect global state of the role")
@@ -253,7 +251,7 @@ func TestAccessControlStore_DeleteExternalServiceRole(t *testing.T) {
 			}
 			roleID := int64(-1)
 			err := s.sql.WithDbSession(ctx, func(sess *db.Session) error {
-				role, err := getRoleByUID(ctx, sess, extServiceRoleUID(tt.id))
+				role, err := getRoleByUID(ctx, sess, accesscontrol.PrefixedRoleUID(extServiceRoleName(tt.id)))
 				if err != nil && !errors.Is(err, accesscontrol.ErrRoleNotFound) {
 					return err
 				}
@@ -295,7 +293,7 @@ func TestAccessControlStore_DeleteExternalServiceRole(t *testing.T) {
 
 			// Role should be deleted
 			_ = s.sql.WithDbSession(ctx, func(sess *db.Session) error {
-				storedRole, err := getRoleByUID(ctx, sess, extServiceRoleUID(tt.id))
+				storedRole, err := getRoleByUID(ctx, sess, accesscontrol.PrefixedRoleUID(extServiceRoleName(tt.id)))
 				require.ErrorIs(t, err, accesscontrol.ErrRoleNotFound)
 				require.Nil(t, storedRole)
 				return nil
@@ -303,9 +301,3 @@ func TestAccessControlStore_DeleteExternalServiceRole(t *testing.T) {
 		})
 	}
 }
-
-func sha1Hash(text string) string {
-	h := sha1.New()
-	_, _ = h.Write([]byte(text))
-	return hex.EncodeToString(h.Sum(nil))
-}
diff --git a/pkg/services/accesscontrol/middleware.go b/pkg/services/accesscontrol/middleware.go
index 2de725671810b..9902f0146ea17 100644
--- a/pkg/services/accesscontrol/middleware.go
+++ b/pkg/services/accesscontrol/middleware.go
@@ -190,19 +190,26 @@ func AuthorizeInOrgMiddleware(ac AccessControl, service Service, cache userCache
 				return
 			}
 
-			if targetOrgID != GlobalOrgID && userCopy.Permissions[targetOrgID] == nil {
-				query := user.GetSignedInUserQuery{UserID: c.UserID, OrgID: targetOrgID}
-				queryResult, err := cache.GetSignedInUserWithCacheCtx(c.Req.Context(), &query)
-				if err != nil {
-					deny(c, nil, fmt.Errorf("failed to authenticate user in target org: %w", err))
-					return
+			if userCopy.OrgID != targetOrgID {
+				switch targetOrgID {
+				case GlobalOrgID:
+					userCopy.OrgID = GlobalOrgID
+					userCopy.OrgRole = org.RoleNone
+					userCopy.OrgName = ""
+				default:
+					query := user.GetSignedInUserQuery{UserID: c.UserID, OrgID: targetOrgID}
+					queryResult, err := cache.GetSignedInUserWithCacheCtx(c.Req.Context(), &query)
+					if err != nil {
+						deny(c, nil, fmt.Errorf("failed to authenticate user in target org: %w", err))
+						return
+					}
+					userCopy.OrgID = queryResult.OrgID
+					userCopy.OrgName = queryResult.OrgName
+					userCopy.OrgRole = queryResult.OrgRole
 				}
-				userCopy.OrgID = queryResult.OrgID
-				userCopy.OrgName = queryResult.OrgName
-				userCopy.OrgRole = queryResult.OrgRole
 			}
 
-			if userCopy.Permissions[userCopy.OrgID] == nil {
+			if userCopy.Permissions[targetOrgID] == nil {
 				permissions, err := service.GetUserPermissions(c.Req.Context(), &userCopy, Options{})
 				if err != nil {
 					deny(c, nil, fmt.Errorf("failed to authenticate user in target org: %w", err))
@@ -212,7 +219,7 @@ func AuthorizeInOrgMiddleware(ac AccessControl, service Service, cache userCache
 				if userCopy.Permissions == nil {
 					userCopy.Permissions = make(map[int64]map[string][]string)
 				}
-				userCopy.Permissions[userCopy.OrgID] = GroupScopesByAction(permissions)
+				userCopy.Permissions[targetOrgID] = GroupScopesByAction(permissions)
 			}
 
 			authorize(c, ac, &userCopy, evaluator)
@@ -221,7 +228,7 @@ func AuthorizeInOrgMiddleware(ac AccessControl, service Service, cache userCache
 			if c.SignedInUser.Permissions == nil {
 				c.SignedInUser.Permissions = make(map[int64]map[string][]string)
 			}
-			c.SignedInUser.Permissions[userCopy.OrgID] = userCopy.Permissions[userCopy.OrgID]
+			c.SignedInUser.Permissions[targetOrgID] = userCopy.Permissions[targetOrgID]
 		}
 	}
 }
diff --git a/pkg/services/accesscontrol/models.go b/pkg/services/accesscontrol/models.go
index a5b0a6ed08b0e..6dc73b6015839 100644
--- a/pkg/services/accesscontrol/models.go
+++ b/pkg/services/accesscontrol/models.go
@@ -319,22 +319,9 @@ func (cmd *SaveExternalServiceRoleCommand) Validate() error {
 }
 
 const (
-	GlobalOrgID                  = 0
-	FixedRolePrefix              = "fixed:"
-	FixedRoleUIDPrefix           = "fixed_"
-	ManagedRolePrefix            = "managed:"
-	BasicRolePrefix              = "basic:"
-	PluginRolePrefix             = "plugins:"
-	ExternalServiceRolePrefix    = "externalservice:"
-	BasicRoleUIDPrefix           = "basic_"
-	ExternalServiceRoleUIDPrefix = "externalservice_"
-	RoleGrafanaAdmin             = "Grafana Admin"
-
+	GlobalOrgID      = 0
 	GeneralFolderUID = "general"
-
-	// Basic Role None
-	BasicRoleNoneUID  = "basic_none"
-	BasicRoleNoneName = "basic:none"
+	RoleGrafanaAdmin = "Grafana Admin"
 
 	// Permission actions
 
diff --git a/pkg/services/accesscontrol/roles.go b/pkg/services/accesscontrol/roles.go
index 6f6a8822ddeee..e4fc58ce2430d 100644
--- a/pkg/services/accesscontrol/roles.go
+++ b/pkg/services/accesscontrol/roles.go
@@ -12,6 +12,24 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 )
 
+const (
+	BasicRolePrefix    = "basic:"
+	BasicRoleUIDPrefix = "basic_"
+
+	ExternalServiceRolePrefix    = "extsvc:"
+	ExternalServiceRoleUIDPrefix = "extsvc_"
+
+	FixedRolePrefix    = "fixed:"
+	FixedRoleUIDPrefix = "fixed_"
+
+	ManagedRolePrefix = "managed:"
+
+	PluginRolePrefix = "plugins:"
+
+	BasicRoleNoneUID  = "basic_none"
+	BasicRoleNoneName = "basic:none"
+)
+
 // Roles definition
 var (
 	ldapReaderRole = RoleDTO{
@@ -256,13 +274,16 @@ func ConcatPermissions(permissions ...[]Permission) []Permission {
 	return perms
 }
 
-// FixedRoleUID generates a UID of 34 bytes: "fixed_" + base64(sha1(roleName))
-func FixedRoleUID(roleName string) string {
+// PrefixedRoleUID generates a uid from name with the same prefix.
+// Generated uid is 28 bytes + length of prefix: <prefix>_base64(sha1(roleName))
+func PrefixedRoleUID(roleName string) string {
+	prefix := strings.Split(roleName, ":")[0] + "_"
+
 	// #nosec G505 Used only for generating a 160 bit hash, it's not used for security purposes
 	hasher := sha1.New()
 	hasher.Write([]byte(roleName))
 
-	return fmt.Sprintf("%s%s", FixedRoleUIDPrefix, base64.RawURLEncoding.EncodeToString(hasher.Sum(nil)))
+	return fmt.Sprintf("%s%s", prefix, base64.RawURLEncoding.EncodeToString(hasher.Sum(nil)))
 }
 
 // ValidateFixedRole errors when a fixed role does not match expected pattern
diff --git a/pkg/services/auth/idimpl/service.go b/pkg/services/auth/idimpl/service.go
index 08b65b4df412f..92074df5c3350 100644
--- a/pkg/services/auth/idimpl/service.go
+++ b/pkg/services/auth/idimpl/service.go
@@ -6,6 +6,9 @@ import (
 	"time"
 
 	"github.com/go-jose/go-jose/v3/jwt"
+	"github.com/prometheus/client_golang/prometheus"
+	"golang.org/x/sync/singleflight"
+
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/remotecache"
 	"github.com/grafana/grafana/pkg/services/auth"
@@ -13,7 +16,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/prometheus/client_golang/prometheus"
 )
 
 const (
@@ -28,7 +30,7 @@ func ProvideService(
 	cfg *setting.Cfg, signer auth.IDSigner, cache remotecache.CacheStorage,
 	features featuremgmt.FeatureToggles, authnService authn.Service, reg prometheus.Registerer,
 ) *Service {
-	s := &Service{cfg, log.New("id-service"), signer, cache, newMetrics(reg)}
+	s := &Service{cfg: cfg, logger: log.New("id-service"), signer: signer, cache: cache, metrics: newMetrics(reg)}
 
 	if features.IsEnabled(featuremgmt.FlagIdForwarding) {
 		authnService.RegisterPostAuthHook(s.hook, 140)
@@ -42,6 +44,7 @@ type Service struct {
 	logger  log.Logger
 	signer  auth.IDSigner
 	cache   remotecache.CacheStorage
+	si      singleflight.Group
 	metrics *metrics
 }
 
@@ -50,40 +53,49 @@ func (s *Service) SignIdentity(ctx context.Context, id identity.Requester) (stri
 		s.metrics.tokenSigningDurationHistogram.Observe(time.Since(t).Seconds())
 	}(time.Now())
 
-	namespace, identifier := id.GetNamespacedID()
-
 	cacheKey := prefixCacheKey(id.GetCacheKey())
-	cachedToken, err := s.cache.Get(ctx, cacheKey)
-	if err == nil {
-		s.metrics.tokenSigningFromCacheCounter.Inc()
-		s.logger.Debug("Cached token found", "namespace", namespace, "id", identifier)
-		return string(cachedToken), nil
-	}
 
-	s.metrics.tokenSigningCounter.Inc()
-	s.logger.Debug("Sign new id token", "namespace", namespace, "id", identifier)
-
-	now := time.Now()
-	token, err := s.signer.SignIDToken(ctx, &auth.IDClaims{
-		Claims: jwt.Claims{
-			Issuer:   s.cfg.AppURL,
-			Audience: getAudience(id.GetOrgID()),
-			Subject:  getSubject(namespace, identifier),
-			Expiry:   jwt.NewNumericDate(now.Add(tokenTTL)),
-			IssuedAt: jwt.NewNumericDate(now),
-		},
+	result, err, _ := s.si.Do(cacheKey, func() (interface{}, error) {
+		namespace, identifier := id.GetNamespacedID()
+
+		cachedToken, err := s.cache.Get(ctx, cacheKey)
+		if err == nil {
+			s.metrics.tokenSigningFromCacheCounter.Inc()
+			s.logger.Debug("Cached token found", "namespace", namespace, "id", identifier)
+			return string(cachedToken), nil
+		}
+
+		s.metrics.tokenSigningCounter.Inc()
+		s.logger.Debug("Sign new id token", "namespace", namespace, "id", identifier)
+
+		now := time.Now()
+		token, err := s.signer.SignIDToken(ctx, &auth.IDClaims{
+			Claims: jwt.Claims{
+				Issuer:   s.cfg.AppURL,
+				Audience: getAudience(id.GetOrgID()),
+				Subject:  getSubject(namespace, identifier),
+				Expiry:   jwt.NewNumericDate(now.Add(tokenTTL)),
+				IssuedAt: jwt.NewNumericDate(now),
+			},
+		})
+
+		if err != nil {
+			s.metrics.failedTokenSigningCounter.Inc()
+			return "", err
+		}
+
+		if err := s.cache.Set(ctx, cacheKey, []byte(token), cacheTTL); err != nil {
+			s.logger.Error("Failed to add id token to cache", "error", err)
+		}
+
+		return token, nil
 	})
 
 	if err != nil {
-		s.metrics.failedTokenSigningCounter.Inc()
 		return "", err
 	}
 
-	if err := s.cache.Set(ctx, cacheKey, []byte(token), cacheTTL); err != nil {
-		s.logger.Error("Failed to add id token to cache", "error", err)
-	}
-
-	return token, nil
+	return result.(string), nil
 }
 
 func (s *Service) hook(ctx context.Context, identity *authn.Identity, _ *authn.Request) error {
diff --git a/pkg/services/authn/authnimpl/service.go b/pkg/services/authn/authnimpl/service.go
index 4c50c97e9ff2e..5b364343db7fe 100644
--- a/pkg/services/authn/authnimpl/service.go
+++ b/pkg/services/authn/authnimpl/service.go
@@ -90,7 +90,7 @@ func ProvideService(
 	s.RegisterClient(clients.ProvideAPIKey(apikeyService, userService))
 
 	if cfg.LoginCookieName != "" {
-		s.RegisterClient(clients.ProvideSession(cfg, sessionService, features))
+		s.RegisterClient(clients.ProvideSession(cfg, features, sessionService, oauthTokenService, socialService))
 	}
 
 	var proxyClients []authn.ProxyClient
@@ -157,14 +157,9 @@ func ProvideService(
 	s.RegisterPostAuthHook(userSyncService.SyncUserHook, 10)
 	s.RegisterPostAuthHook(userSyncService.EnableUserHook, 20)
 	s.RegisterPostAuthHook(orgUserSyncService.SyncOrgRolesHook, 30)
-	s.RegisterPostAuthHook(userSyncService.SyncLastSeenHook, 120)
-
-	if features.IsEnabled(featuremgmt.FlagAccessTokenExpirationCheck) {
-		s.RegisterPostAuthHook(sync.ProvideOAuthTokenSync(oauthTokenService, sessionService, socialService).SyncOauthTokenHook, 60)
-	}
-
 	s.RegisterPostAuthHook(userSyncService.FetchSyncedUserHook, 100)
 	s.RegisterPostAuthHook(sync.ProvidePermissionsSync(accessControlService).SyncPermissionsHook, 110)
+	s.RegisterPostAuthHook(userSyncService.SyncLastSeenHook, 120)
 
 	return s
 }
diff --git a/pkg/services/authn/authnimpl/sync/oauth_token_sync.go b/pkg/services/authn/authnimpl/sync/oauth_token_sync.go
deleted file mode 100644
index cfe3978b5cee4..0000000000000
--- a/pkg/services/authn/authnimpl/sync/oauth_token_sync.go
+++ /dev/null
@@ -1,174 +0,0 @@
-package sync
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/go-jose/go-jose/v3/jwt"
-
-	"github.com/grafana/grafana/pkg/infra/localcache"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/login/social"
-	"github.com/grafana/grafana/pkg/services/auth"
-	"github.com/grafana/grafana/pkg/services/authn"
-	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/oauthtoken"
-	"github.com/grafana/grafana/pkg/services/user"
-)
-
-func ProvideOAuthTokenSync(service oauthtoken.OAuthTokenService, sessionService auth.UserTokenService, socialService social.Service) *OAuthTokenSync {
-	return &OAuthTokenSync{
-		log.New("oauth_token.sync"),
-		localcache.New(maxOAuthTokenCacheTTL, 15*time.Minute),
-		service,
-		sessionService,
-		socialService,
-	}
-}
-
-type OAuthTokenSync struct {
-	log            log.Logger
-	cache          *localcache.CacheService
-	service        oauthtoken.OAuthTokenService
-	sessionService auth.UserTokenService
-	socialService  social.Service
-}
-
-func (s *OAuthTokenSync) SyncOauthTokenHook(ctx context.Context, identity *authn.Identity, _ *authn.Request) error {
-	namespace, id := identity.NamespacedID()
-	// only perform oauth token check if identity is a user
-	if namespace != authn.NamespaceUser {
-		return nil
-	}
-
-	// not authenticated through session tokens, so we can skip this hook
-	if identity.SessionToken == nil {
-		return nil
-	}
-
-	// if we recently have performed this it would be cached, so we can skip the hook
-	if _, ok := s.cache.Get(identity.ID); ok {
-		return nil
-	}
-
-	token, exists, _ := s.service.HasOAuthEntry(ctx, &user.SignedInUser{UserID: id})
-	// user is not authenticated through oauth so skip further checks
-	if !exists {
-		return nil
-	}
-
-	idTokenExpiry, err := getIDTokenExpiry(token)
-	if err != nil {
-		s.log.FromContext(ctx).Error("Failed to extract expiry of ID token", "id", identity.ID, "error", err)
-	}
-
-	// token has no expire time configured, so we don't have to refresh it
-	if token.OAuthExpiry.IsZero() {
-		// cache the token check, so we don't perform it on every request
-		s.cache.Set(identity.ID, struct{}{}, getOAuthTokenCacheTTL(token.OAuthExpiry, idTokenExpiry))
-		return nil
-	}
-
-	// get the token's auth provider (f.e. azuread)
-	provider := strings.TrimPrefix(token.AuthModule, "oauth_")
-	currentOAuthInfo := s.socialService.GetOAuthInfoProvider(provider)
-	if currentOAuthInfo == nil {
-		s.log.Warn("OAuth provider not found", "provider", provider)
-		return nil
-	}
-
-	// if refresh token handling is disabled for this provider, we can skip the hook
-	if !currentOAuthInfo.UseRefreshToken {
-		return nil
-	}
-
-	accessTokenExpires := token.OAuthExpiry.Round(0).Add(-oauthtoken.ExpiryDelta)
-
-	hasIdTokenExpired := false
-	idTokenExpires := time.Time{}
-
-	if !idTokenExpiry.IsZero() {
-		idTokenExpires = idTokenExpiry.Round(0).Add(-oauthtoken.ExpiryDelta)
-		hasIdTokenExpired = idTokenExpires.Before(time.Now())
-	}
-	// token has not expired, so we don't have to refresh it
-	if !accessTokenExpires.Before(time.Now()) && !hasIdTokenExpired {
-		// cache the token check, so we don't perform it on every request
-		s.cache.Set(identity.ID, struct{}{}, getOAuthTokenCacheTTL(accessTokenExpires, idTokenExpires))
-		return nil
-	}
-	// FIXME: Consider using context.WithoutCancel instead of context.Background after Go 1.21 update
-	updateCtx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
-	defer cancel()
-
-	if err := s.service.TryTokenRefresh(updateCtx, token); err != nil {
-		if errors.Is(err, context.Canceled) {
-			return nil
-		}
-		if !errors.Is(err, oauthtoken.ErrNoRefreshTokenFound) {
-			s.log.Error("Failed to refresh OAuth access token", "id", identity.ID, "error", err)
-		}
-
-		if err := s.service.InvalidateOAuthTokens(ctx, token); err != nil {
-			s.log.Warn("Failed to invalidate OAuth tokens", "id", identity.ID, "error", err)
-		}
-
-		if err := s.sessionService.RevokeToken(ctx, identity.SessionToken, false); err != nil {
-			s.log.Warn("Failed to revoke session token", "id", identity.ID, "tokenId", identity.SessionToken.Id, "error", err)
-		}
-
-		return authn.ErrExpiredAccessToken.Errorf("oauth access token could not be refreshed: %w", err)
-	}
-
-	return nil
-}
-
-const maxOAuthTokenCacheTTL = 10 * time.Minute
-
-func getOAuthTokenCacheTTL(accessTokenExpiry, idTokenExpiry time.Time) time.Duration {
-	if accessTokenExpiry.IsZero() && idTokenExpiry.IsZero() {
-		return maxOAuthTokenCacheTTL
-	}
-
-	min := func(a, b time.Duration) time.Duration {
-		if a <= b {
-			return a
-		}
-		return b
-	}
-
-	if accessTokenExpiry.IsZero() && !idTokenExpiry.IsZero() {
-		return min(time.Until(idTokenExpiry), maxOAuthTokenCacheTTL)
-	}
-
-	if !accessTokenExpiry.IsZero() && idTokenExpiry.IsZero() {
-		return min(time.Until(accessTokenExpiry), maxOAuthTokenCacheTTL)
-	}
-
-	return min(min(time.Until(accessTokenExpiry), time.Until(idTokenExpiry)), maxOAuthTokenCacheTTL)
-}
-
-// getIDTokenExpiry extracts the expiry time from the ID token
-func getIDTokenExpiry(token *login.UserAuth) (time.Time, error) {
-	if token.OAuthIdToken == "" {
-		return time.Time{}, nil
-	}
-
-	parsedToken, err := jwt.ParseSigned(token.OAuthIdToken)
-	if err != nil {
-		return time.Time{}, fmt.Errorf("error parsing id token: %w", err)
-	}
-
-	type Claims struct {
-		Exp int64 `json:"exp"`
-	}
-	var claims Claims
-	if err := parsedToken.UnsafeClaimsWithoutVerification(&claims); err != nil {
-		return time.Time{}, fmt.Errorf("error getting claims from id token: %w", err)
-	}
-
-	return time.Unix(claims.Exp, 0), nil
-}
diff --git a/pkg/services/authn/authnimpl/sync/oauth_token_sync_test.go b/pkg/services/authn/authnimpl/sync/oauth_token_sync_test.go
deleted file mode 100644
index 7d479e15ee4e6..0000000000000
--- a/pkg/services/authn/authnimpl/sync/oauth_token_sync_test.go
+++ /dev/null
@@ -1,258 +0,0 @@
-package sync
-
-import (
-	"context"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/infra/localcache"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/login/social"
-	"github.com/grafana/grafana/pkg/login/socialtest"
-	"github.com/grafana/grafana/pkg/services/auth"
-	"github.com/grafana/grafana/pkg/services/auth/authtest"
-	"github.com/grafana/grafana/pkg/services/auth/identity"
-	"github.com/grafana/grafana/pkg/services/authn"
-	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/oauthtoken/oauthtokentest"
-)
-
-func TestOAuthTokenSync_SyncOAuthTokenHook(t *testing.T) {
-	type testCase struct {
-		desc      string
-		identity  *authn.Identity
-		oauthInfo *social.OAuthInfo
-
-		expectedHasEntryToken *login.UserAuth
-		expectHasEntryCalled  bool
-
-		expectedTryRefreshErr       error
-		expectTryRefreshTokenCalled bool
-
-		expectRevokeTokenCalled           bool
-		expectInvalidateOauthTokensCalled bool
-
-		expectedErr error
-	}
-
-	tests := []testCase{
-		{
-			desc:     "should skip sync when identity is not a user",
-			identity: &authn.Identity{ID: "service-account:1"},
-		},
-		{
-			desc:     "should skip sync when identity is a user but is not authenticated with session token",
-			identity: &authn.Identity{ID: "user:1"},
-		},
-		{
-			desc:                 "should skip sync when user has session but is not authenticated with oauth",
-			identity:             &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
-			expectHasEntryCalled: true,
-		},
-		{
-			desc:                  "should skip sync for when access token don't have expire time",
-			identity:              &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
-			expectHasEntryCalled:  true,
-			expectedHasEntryToken: &login.UserAuth{},
-		},
-		{
-			desc:                  "should skip sync when access token has no expired yet",
-			identity:              &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
-			expectHasEntryCalled:  true,
-			expectedHasEntryToken: &login.UserAuth{OAuthExpiry: time.Now().Add(10 * time.Minute)},
-		},
-		{
-			desc:                  "should skip sync when access token has no expired yet",
-			identity:              &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
-			expectHasEntryCalled:  true,
-			expectedHasEntryToken: &login.UserAuth{OAuthExpiry: time.Now().Add(10 * time.Minute)},
-		},
-		{
-			desc:                        "should refresh access token when is has expired",
-			identity:                    &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
-			expectHasEntryCalled:        true,
-			expectTryRefreshTokenCalled: true,
-			expectedHasEntryToken:       &login.UserAuth{OAuthExpiry: time.Now().Add(-10 * time.Minute)},
-		},
-		{
-			desc:                              "should invalidate access token and session token if access token can't be refreshed",
-			identity:                          &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
-			expectHasEntryCalled:              true,
-			expectedTryRefreshErr:             errors.New("some err"),
-			expectTryRefreshTokenCalled:       true,
-			expectInvalidateOauthTokensCalled: true,
-			expectRevokeTokenCalled:           true,
-			expectedHasEntryToken:             &login.UserAuth{OAuthExpiry: time.Now().Add(-10 * time.Minute)},
-			expectedErr:                       authn.ErrExpiredAccessToken,
-		}, {
-			desc:                        "should skip sync when use_refresh_token is disabled",
-			identity:                    &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}, AuthenticatedBy: login.GitLabAuthModule},
-			expectHasEntryCalled:        true,
-			expectTryRefreshTokenCalled: false,
-			expectedHasEntryToken:       &login.UserAuth{OAuthExpiry: time.Now().Add(-10 * time.Minute)},
-			oauthInfo:                   &social.OAuthInfo{UseRefreshToken: false},
-		},
-		{
-			desc:                        "should refresh access token when ID token has expired",
-			identity:                    &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
-			expectHasEntryCalled:        true,
-			expectTryRefreshTokenCalled: true,
-			expectedHasEntryToken:       &login.UserAuth{OAuthExpiry: time.Now().Add(10 * time.Minute), OAuthIdToken: fakeIDToken(t, time.Now().Add(-10*time.Minute))},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.desc, func(t *testing.T) {
-			var (
-				hasEntryCalled         bool
-				tryRefreshCalled       bool
-				invalidateTokensCalled bool
-				revokeTokenCalled      bool
-			)
-
-			service := &oauthtokentest.MockOauthTokenService{
-				HasOAuthEntryFunc: func(ctx context.Context, usr identity.Requester) (*login.UserAuth, bool, error) {
-					hasEntryCalled = true
-					return tt.expectedHasEntryToken, tt.expectedHasEntryToken != nil, nil
-				},
-				InvalidateOAuthTokensFunc: func(ctx context.Context, usr *login.UserAuth) error {
-					invalidateTokensCalled = true
-					return nil
-				},
-				TryTokenRefreshFunc: func(ctx context.Context, usr *login.UserAuth) error {
-					tryRefreshCalled = true
-					return tt.expectedTryRefreshErr
-				},
-			}
-
-			sessionService := &authtest.FakeUserAuthTokenService{
-				RevokeTokenProvider: func(ctx context.Context, token *auth.UserToken, soft bool) error {
-					revokeTokenCalled = true
-					return nil
-				},
-			}
-
-			if tt.oauthInfo == nil {
-				tt.oauthInfo = &social.OAuthInfo{
-					UseRefreshToken: true,
-				}
-			}
-
-			socialService := &socialtest.FakeSocialService{
-				ExpectedAuthInfoProvider: tt.oauthInfo,
-			}
-
-			sync := &OAuthTokenSync{
-				log:            log.NewNopLogger(),
-				cache:          localcache.New(0, 0),
-				service:        service,
-				sessionService: sessionService,
-				socialService:  socialService,
-			}
-
-			err := sync.SyncOauthTokenHook(context.Background(), tt.identity, nil)
-			assert.ErrorIs(t, err, tt.expectedErr)
-			assert.Equal(t, tt.expectHasEntryCalled, hasEntryCalled)
-			assert.Equal(t, tt.expectTryRefreshTokenCalled, tryRefreshCalled)
-			assert.Equal(t, tt.expectInvalidateOauthTokensCalled, invalidateTokensCalled)
-			assert.Equal(t, tt.expectRevokeTokenCalled, revokeTokenCalled)
-		})
-	}
-}
-
-// fakeIDToken is used to create a fake invalid token to verify expiry logic
-func fakeIDToken(t *testing.T, expiryDate time.Time) string {
-	type Header struct {
-		Kid string `json:"kid"`
-		Alg string `json:"alg"`
-	}
-	type Payload struct {
-		Iss string `json:"iss"`
-		Sub string `json:"sub"`
-		Exp int64  `json:"exp"`
-	}
-
-	header, err := json.Marshal(Header{Kid: "123", Alg: "none"})
-	require.NoError(t, err)
-	u := expiryDate.UTC().Unix()
-	payload, err := json.Marshal(Payload{Iss: "fake", Sub: "a-sub", Exp: u})
-	require.NoError(t, err)
-
-	fakeSignature := []byte("6ICJm")
-	return fmt.Sprintf("%s.%s.%s", base64.RawURLEncoding.EncodeToString(header), base64.RawURLEncoding.EncodeToString(payload), base64.RawURLEncoding.EncodeToString(fakeSignature))
-}
-
-func TestOAuthTokenSync_getOAuthTokenCacheTTL(t *testing.T) {
-	defaultTime := time.Now()
-	tests := []struct {
-		name              string
-		accessTokenExpiry time.Time
-		idTokenExpiry     time.Time
-		want              time.Duration
-	}{
-		{
-			name:              "should return maxOAuthTokenCacheTTL when no expiry is given",
-			accessTokenExpiry: time.Time{},
-			idTokenExpiry:     time.Time{},
-
-			want: maxOAuthTokenCacheTTL,
-		},
-		{
-			name:              "should return maxOAuthTokenCacheTTL when access token is not given and id token expiry is greater than max cache ttl",
-			accessTokenExpiry: time.Time{},
-			idTokenExpiry:     defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
-
-			want: maxOAuthTokenCacheTTL,
-		},
-		{
-			name:              "should return idTokenExpiry when access token is not given and id token expiry is less than max cache ttl",
-			accessTokenExpiry: time.Time{},
-			idTokenExpiry:     defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL),
-			want:              time.Until(defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL)),
-		},
-		{
-			name:              "should return maxOAuthTokenCacheTTL when access token expiry is greater than max cache ttl and id token is not given",
-			accessTokenExpiry: defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
-			idTokenExpiry:     time.Time{},
-			want:              maxOAuthTokenCacheTTL,
-		},
-		{
-			name:              "should return accessTokenExpiry when access token expiry is less than max cache ttl and id token is not given",
-			accessTokenExpiry: defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL),
-			idTokenExpiry:     time.Time{},
-			want:              time.Until(defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL)),
-		},
-		{
-			name:              "should return accessTokenExpiry when access token expiry is less than max cache ttl and less than id token expiry",
-			accessTokenExpiry: defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL),
-			idTokenExpiry:     defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
-			want:              time.Until(defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL)),
-		},
-		{
-			name:              "should return idTokenExpiry when id token expiry is less than max cache ttl and less than access token expiry",
-			accessTokenExpiry: defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
-			idTokenExpiry:     defaultTime.Add(-3*time.Minute + maxOAuthTokenCacheTTL),
-			want:              time.Until(defaultTime.Add(-3*time.Minute + maxOAuthTokenCacheTTL)),
-		},
-		{
-			name:              "should return maxOAuthTokenCacheTTL when access token expiry is greater than max cache ttl and id token expiry is greater than max cache ttl",
-			accessTokenExpiry: defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
-			idTokenExpiry:     defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
-			want:              maxOAuthTokenCacheTTL,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := getOAuthTokenCacheTTL(tt.accessTokenExpiry, tt.idTokenExpiry)
-
-			assert.Equal(t, tt.want.Round(time.Second), got.Round(time.Second))
-		})
-	}
-}
diff --git a/pkg/services/authn/authnimpl/sync/user_sync.go b/pkg/services/authn/authnimpl/sync/user_sync.go
index 0b0a5b09b912d..dda54e8a2f0e9 100644
--- a/pkg/services/authn/authnimpl/sync/user_sync.go
+++ b/pkg/services/authn/authnimpl/sync/user_sync.go
@@ -394,4 +394,5 @@ func syncSignedInUserToIdentity(usr *user.SignedInUser, identity *authn.Identity
 	identity.LastSeenAt = usr.LastSeenAt
 	identity.IsDisabled = usr.IsDisabled
 	identity.IsGrafanaAdmin = &usr.IsGrafanaAdmin
+	identity.AuthenticatedBy = usr.AuthenticatedBy
 }
diff --git a/pkg/services/authn/clients/session.go b/pkg/services/authn/clients/session.go
index c97a87d27f190..135a801c85696 100644
--- a/pkg/services/authn/clients/session.go
+++ b/pkg/services/authn/clients/session.go
@@ -3,14 +3,23 @@ package clients
 import (
 	"context"
 	"errors"
+	"fmt"
 	"net/url"
+	"strings"
 	"time"
 
+	"github.com/go-jose/go-jose/v3/jwt"
+
+	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/network"
+	"github.com/grafana/grafana/pkg/login/social"
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/login"
+	"github.com/grafana/grafana/pkg/services/oauthtoken"
+	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
 )
@@ -18,21 +27,31 @@ import (
 var _ authn.HookClient = new(Session)
 var _ authn.ContextAwareClient = new(Session)
 
-func ProvideSession(cfg *setting.Cfg, sessionService auth.UserTokenService,
-	features *featuremgmt.FeatureManager) *Session {
+func ProvideSession(
+	cfg *setting.Cfg, features *featuremgmt.FeatureManager, sessionService auth.UserTokenService,
+	oauthTokenService oauthtoken.OAuthTokenService, socialService social.Service,
+) *Session {
 	return &Session{
-		cfg:            cfg,
-		features:       features,
-		sessionService: sessionService,
-		log:            log.New(authn.ClientSession),
+		cfg:               cfg,
+		features:          features,
+		sessionService:    sessionService,
+		oauthTokenService: oauthTokenService,
+		socialService:     socialService,
+		log:               log.New(authn.ClientSession),
+		cache:             localcache.New(maxOAuthTokenCacheTTL, 15*time.Minute),
 	}
 }
 
 type Session struct {
-	cfg            *setting.Cfg
-	features       *featuremgmt.FeatureManager
-	sessionService auth.UserTokenService
-	log            log.Logger
+	log      log.Logger
+	cfg      *setting.Cfg
+	features *featuremgmt.FeatureManager
+
+	socialService     social.Service
+	sessionService    auth.UserTokenService
+	oauthTokenService oauthtoken.OAuthTokenService
+
+	cache *localcache.CacheService
 }
 
 func (s *Session) Name() string {
@@ -88,7 +107,19 @@ func (s *Session) Priority() uint {
 }
 
 func (s *Session) Hook(ctx context.Context, identity *authn.Identity, r *authn.Request) error {
-	if identity.SessionToken == nil || s.features.IsEnabled(featuremgmt.FlagClientTokenRotation) {
+	if identity.SessionToken == nil {
+		return nil
+	}
+
+	if err := s.rotateTokenHook(ctx, identity, r); err != nil {
+		return err
+	}
+
+	return s.syncOAuthTokenHook(ctx, identity, r)
+}
+
+func (s *Session) rotateTokenHook(ctx context.Context, identity *authn.Identity, r *authn.Request) error {
+	if s.features.IsEnabled(featuremgmt.FlagClientTokenRotation) {
 		return nil
 	}
 
@@ -123,3 +154,143 @@ func (s *Session) Hook(ctx context.Context, identity *authn.Identity, r *authn.R
 
 	return nil
 }
+
+func (s *Session) syncOAuthTokenHook(ctx context.Context, identity *authn.Identity, _ *authn.Request) error {
+	if !s.features.IsEnabled(featuremgmt.FlagAccessTokenExpirationCheck) {
+		return nil
+	}
+
+	namespace, id := identity.NamespacedID()
+	// only perform oauth token check if identity is a user
+	if namespace != authn.NamespaceUser {
+		return nil
+	}
+
+	// if we recently have performed this it would be cached, so we can skip the hook
+	if _, ok := s.cache.Get(identity.ID); ok {
+		return nil
+	}
+
+	token, exists, _ := s.oauthTokenService.HasOAuthEntry(ctx, &user.SignedInUser{UserID: id})
+	// user is not authenticated through oauth so skip further checks
+	if !exists {
+		// if user is not authenticated through oauth we can skip this check by adding the id to the cache
+		s.cache.Set(identity.ID, struct{}{}, maxOAuthTokenCacheTTL)
+		return nil
+	}
+
+	// get the token's auth provider (f.e. azuread)
+	provider := strings.TrimPrefix(token.AuthModule, "oauth_")
+	currentOAuthInfo := s.socialService.GetOAuthInfoProvider(provider)
+	if currentOAuthInfo == nil {
+		s.log.Warn("OAuth provider not found", "provider", provider)
+		return nil
+	}
+
+	// if refresh token handling is disabled for this provider, we can skip the hook
+	if !currentOAuthInfo.UseRefreshToken {
+		// refresh token is not configured for provider so we can skip this check by adding the id to the cache
+		s.cache.Set(identity.ID, struct{}{}, maxOAuthTokenCacheTTL)
+		return nil
+	}
+
+	idTokenExpiry, err := getIDTokenExpiry(token)
+	if err != nil {
+		s.log.FromContext(ctx).Error("Failed to extract expiry of ID token", "id", identity.ID, "error", err)
+	}
+
+	// token has no expire time configured, so we don't have to refresh it
+	if token.OAuthExpiry.IsZero() {
+		// cache the token check, so we don't perform it on every request
+		s.cache.Set(identity.ID, struct{}{}, getOAuthTokenCacheTTL(token.OAuthExpiry, idTokenExpiry))
+		return nil
+	}
+
+	accessTokenExpires := token.OAuthExpiry.Round(0).Add(-oauthtoken.ExpiryDelta)
+
+	hasIdTokenExpired := false
+	idTokenExpires := time.Time{}
+
+	if !idTokenExpiry.IsZero() {
+		idTokenExpires = idTokenExpiry.Round(0).Add(-oauthtoken.ExpiryDelta)
+		hasIdTokenExpired = idTokenExpires.Before(time.Now())
+	}
+
+	// token has not expired, so we don't have to refresh it
+	if !accessTokenExpires.Before(time.Now()) && !hasIdTokenExpired {
+		// cache the token check, so we don't perform it on every request
+		s.cache.Set(identity.ID, struct{}{}, getOAuthTokenCacheTTL(accessTokenExpires, idTokenExpires))
+		return nil
+	}
+	// FIXME: Consider using context.WithoutCancel instead of context.Background after Go 1.21 update
+	updateCtx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
+	defer cancel()
+
+	if err := s.oauthTokenService.TryTokenRefresh(updateCtx, token); err != nil {
+		if errors.Is(err, context.Canceled) {
+			return nil
+		}
+		if !errors.Is(err, oauthtoken.ErrNoRefreshTokenFound) {
+			s.log.Error("Failed to refresh OAuth access token", "id", identity.ID, "error", err)
+		}
+
+		if err := s.oauthTokenService.InvalidateOAuthTokens(ctx, token); err != nil {
+			s.log.Warn("Failed to invalidate OAuth tokens", "id", identity.ID, "error", err)
+		}
+
+		if err := s.sessionService.RevokeToken(ctx, identity.SessionToken, false); err != nil {
+			s.log.Warn("Failed to revoke session token", "id", identity.ID, "tokenId", identity.SessionToken.Id, "error", err)
+		}
+
+		return authn.ErrExpiredAccessToken.Errorf("oauth access token could not be refreshed: %w", err)
+	}
+
+	return nil
+}
+
+const maxOAuthTokenCacheTTL = 10 * time.Minute
+
+func getOAuthTokenCacheTTL(accessTokenExpiry, idTokenExpiry time.Time) time.Duration {
+	if accessTokenExpiry.IsZero() && idTokenExpiry.IsZero() {
+		return maxOAuthTokenCacheTTL
+	}
+
+	min := func(a, b time.Duration) time.Duration {
+		if a <= b {
+			return a
+		}
+		return b
+	}
+
+	if accessTokenExpiry.IsZero() && !idTokenExpiry.IsZero() {
+		return min(time.Until(idTokenExpiry), maxOAuthTokenCacheTTL)
+	}
+
+	if !accessTokenExpiry.IsZero() && idTokenExpiry.IsZero() {
+		return min(time.Until(accessTokenExpiry), maxOAuthTokenCacheTTL)
+	}
+
+	return min(min(time.Until(accessTokenExpiry), time.Until(idTokenExpiry)), maxOAuthTokenCacheTTL)
+}
+
+// getIDTokenExpiry extracts the expiry time from the ID token
+func getIDTokenExpiry(token *login.UserAuth) (time.Time, error) {
+	if token.OAuthIdToken == "" {
+		return time.Time{}, nil
+	}
+
+	parsedToken, err := jwt.ParseSigned(token.OAuthIdToken)
+	if err != nil {
+		return time.Time{}, fmt.Errorf("error parsing id token: %w", err)
+	}
+
+	type Claims struct {
+		Exp int64 `json:"exp"`
+	}
+	var claims Claims
+	if err := parsedToken.UnsafeClaimsWithoutVerification(&claims); err != nil {
+		return time.Time{}, fmt.Errorf("error getting claims from id token: %w", err)
+	}
+
+	return time.Unix(claims.Exp, 0), nil
+}
diff --git a/pkg/services/authn/clients/session_test.go b/pkg/services/authn/clients/session_test.go
index 8dd7555cd269b..f15fed8e749be 100644
--- a/pkg/services/authn/clients/session_test.go
+++ b/pkg/services/authn/clients/session_test.go
@@ -2,6 +2,10 @@ package clients
 
 import (
 	"context"
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"fmt"
 	"net"
 	"net/http"
 	"testing"
@@ -10,11 +14,16 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/login/social"
+	"github.com/grafana/grafana/pkg/login/socialtest"
 	"github.com/grafana/grafana/pkg/models/usertoken"
 	"github.com/grafana/grafana/pkg/services/auth"
 	"github.com/grafana/grafana/pkg/services/auth/authtest"
+	"github.com/grafana/grafana/pkg/services/auth/identity"
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/login"
+	"github.com/grafana/grafana/pkg/services/oauthtoken/oauthtokentest"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
 )
@@ -29,7 +38,7 @@ func TestSession_Test(t *testing.T) {
 	cfg := setting.NewCfg()
 	cfg.LoginCookieName = ""
 	cfg.LoginMaxLifetime = 20 * time.Second
-	s := ProvideSession(cfg, &authtest.FakeUserAuthTokenService{}, featuremgmt.WithFeatures())
+	s := ProvideSession(cfg, featuremgmt.WithFeatures(), &authtest.FakeUserAuthTokenService{}, nil, nil)
 
 	disabled := s.Test(context.Background(), &authn.Request{HTTPRequest: validHTTPReq})
 	assert.False(t, disabled)
@@ -145,7 +154,7 @@ func TestSession_Authenticate(t *testing.T) {
 			cfg.LoginCookieName = cookieName
 			cfg.TokenRotationIntervalMinutes = 10
 			cfg.LoginMaxLifetime = 20 * time.Second
-			s := ProvideSession(cfg, tt.fields.sessionService, tt.fields.features)
+			s := ProvideSession(cfg, tt.fields.features, tt.fields.sessionService, nil, nil)
 
 			got, err := s.Authenticate(context.Background(), tt.args.r)
 			require.True(t, (err != nil) == tt.wantErr, err)
@@ -175,17 +184,17 @@ func (f *fakeResponseWriter) WriteHeader(statusCode int) {
 	f.Status = statusCode
 }
 
-func TestSession_Hook(t *testing.T) {
+func TestSession_RotateSessionHook(t *testing.T) {
 	t.Run("should rotate token", func(t *testing.T) {
 		cfg := setting.NewCfg()
 		cfg.LoginCookieName = "grafana-session"
 		cfg.LoginMaxLifetime = 20 * time.Second
-		s := ProvideSession(cfg, &authtest.FakeUserAuthTokenService{
-			TryRotateTokenProvider: func(ctx context.Context, token *auth.UserToken, clientIP net.IP, userAgent string) (bool, *auth.UserToken, error) {
+		s := ProvideSession(cfg, featuremgmt.WithFeatures(), &authtest.FakeUserAuthTokenService{
+			TryRotateTokenProvider: func(_ context.Context, token *auth.UserToken, _ net.IP, _ string) (bool, *auth.UserToken, error) {
 				token.UnhashedToken = "new-token"
 				return true, token, nil
 			},
-		}, featuremgmt.WithFeatures())
+		}, nil, nil)
 
 		sampleID := &authn.Identity{
 			SessionToken: &auth.UserToken{
@@ -206,7 +215,7 @@ func TestSession_Hook(t *testing.T) {
 			Resp: web.NewResponseWriter(http.MethodConnect, mockResponseWriter),
 		}
 
-		err := s.Hook(context.Background(), sampleID, resp)
+		err := s.rotateTokenHook(context.Background(), sampleID, resp)
 		require.NoError(t, err)
 
 		resp.Resp.WriteHeader(201)
@@ -219,7 +228,7 @@ func TestSession_Hook(t *testing.T) {
 	})
 
 	t.Run("should not rotate token with feature flag", func(t *testing.T) {
-		s := ProvideSession(setting.NewCfg(), nil, featuremgmt.WithFeatures(featuremgmt.FlagClientTokenRotation))
+		s := ProvideSession(setting.NewCfg(), featuremgmt.WithFeatures(featuremgmt.FlagClientTokenRotation), nil, nil, nil)
 
 		req := &authn.Request{}
 		identity := &authn.Identity{}
@@ -227,3 +236,226 @@ func TestSession_Hook(t *testing.T) {
 		require.NoError(t, err)
 	})
 }
+
+func TestSession_SyncOAuthTokenHook(t *testing.T) {
+	type testCase struct {
+		desc      string
+		identity  *authn.Identity
+		oauthInfo *social.OAuthInfo
+
+		expectedHasEntryToken *login.UserAuth
+		expectHasEntryCalled  bool
+
+		expectedTryRefreshErr       error
+		expectTryRefreshTokenCalled bool
+
+		expectRevokeTokenCalled           bool
+		expectInvalidateOauthTokensCalled bool
+
+		expectedErr error
+	}
+
+	tests := []testCase{
+		{
+			desc:     "should skip sync when identity is not a user",
+			identity: &authn.Identity{ID: "service-account:1"},
+		},
+		{
+			desc:                 "should skip sync when user has session but is not authenticated with oauth",
+			identity:             &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
+			expectHasEntryCalled: true,
+		},
+		{
+			desc:                  "should skip sync for when access token don't have expire time",
+			identity:              &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
+			expectHasEntryCalled:  true,
+			expectedHasEntryToken: &login.UserAuth{},
+		},
+		{
+			desc:                  "should skip sync when access token has no expired yet",
+			identity:              &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
+			expectHasEntryCalled:  true,
+			expectedHasEntryToken: &login.UserAuth{OAuthExpiry: time.Now().Add(10 * time.Minute)},
+		},
+		{
+			desc:                  "should skip sync when access token has no expired yet",
+			identity:              &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
+			expectHasEntryCalled:  true,
+			expectedHasEntryToken: &login.UserAuth{OAuthExpiry: time.Now().Add(10 * time.Minute)},
+		},
+		{
+			desc:                        "should refresh access token when is has expired",
+			identity:                    &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
+			expectHasEntryCalled:        true,
+			expectTryRefreshTokenCalled: true,
+			expectedHasEntryToken:       &login.UserAuth{OAuthExpiry: time.Now().Add(-10 * time.Minute)},
+		},
+		{
+			desc:                              "should invalidate access token and session token if access token can't be refreshed",
+			identity:                          &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
+			expectHasEntryCalled:              true,
+			expectedTryRefreshErr:             errors.New("some err"),
+			expectTryRefreshTokenCalled:       true,
+			expectInvalidateOauthTokensCalled: true,
+			expectRevokeTokenCalled:           true,
+			expectedHasEntryToken:             &login.UserAuth{OAuthExpiry: time.Now().Add(-10 * time.Minute)},
+			expectedErr:                       authn.ErrExpiredAccessToken,
+		}, {
+			desc:                        "should skip sync when use_refresh_token is disabled",
+			identity:                    &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}, AuthenticatedBy: login.GitLabAuthModule},
+			expectHasEntryCalled:        true,
+			expectTryRefreshTokenCalled: false,
+			expectedHasEntryToken:       &login.UserAuth{OAuthExpiry: time.Now().Add(-10 * time.Minute)},
+			oauthInfo:                   &social.OAuthInfo{UseRefreshToken: false},
+		},
+		{
+			desc:                        "should refresh access token when ID token has expired",
+			identity:                    &authn.Identity{ID: "user:1", SessionToken: &auth.UserToken{}},
+			expectHasEntryCalled:        true,
+			expectTryRefreshTokenCalled: true,
+			expectedHasEntryToken:       &login.UserAuth{OAuthExpiry: time.Now().Add(10 * time.Minute), OAuthIdToken: fakeIDToken(t, time.Now().Add(-10*time.Minute))},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.desc, func(t *testing.T) {
+			var (
+				hasEntryCalled         bool
+				tryRefreshCalled       bool
+				invalidateTokensCalled bool
+				revokeTokenCalled      bool
+			)
+
+			oauthTokenService := &oauthtokentest.MockOauthTokenService{
+				HasOAuthEntryFunc: func(_ context.Context, _ identity.Requester) (*login.UserAuth, bool, error) {
+					hasEntryCalled = true
+					return tt.expectedHasEntryToken, tt.expectedHasEntryToken != nil, nil
+				},
+				InvalidateOAuthTokensFunc: func(_ context.Context, _ *login.UserAuth) error {
+					invalidateTokensCalled = true
+					return nil
+				},
+				TryTokenRefreshFunc: func(_ context.Context, _ *login.UserAuth) error {
+					tryRefreshCalled = true
+					return tt.expectedTryRefreshErr
+				},
+			}
+
+			sessionService := &authtest.FakeUserAuthTokenService{
+				RevokeTokenProvider: func(_ context.Context, _ *auth.UserToken, _ bool) error {
+					revokeTokenCalled = true
+					return nil
+				},
+			}
+
+			if tt.oauthInfo == nil {
+				tt.oauthInfo = &social.OAuthInfo{
+					UseRefreshToken: true,
+				}
+			}
+
+			socialService := &socialtest.FakeSocialService{
+				ExpectedAuthInfoProvider: tt.oauthInfo,
+			}
+
+			client := ProvideSession(setting.NewCfg(), featuremgmt.WithFeatures(featuremgmt.FlagAccessTokenExpirationCheck), sessionService, oauthTokenService, socialService)
+
+			err := client.syncOAuthTokenHook(context.Background(), tt.identity, nil)
+			assert.ErrorIs(t, err, tt.expectedErr)
+			assert.Equal(t, tt.expectHasEntryCalled, hasEntryCalled)
+			assert.Equal(t, tt.expectTryRefreshTokenCalled, tryRefreshCalled)
+			assert.Equal(t, tt.expectInvalidateOauthTokensCalled, invalidateTokensCalled)
+			assert.Equal(t, tt.expectRevokeTokenCalled, revokeTokenCalled)
+		})
+	}
+}
+
+// fakeIDToken is used to create sa fake invalid token to verify expiry logic
+func fakeIDToken(t *testing.T, expiryDate time.Time) string {
+	type Header struct {
+		Kid string `json:"kid"`
+		Alg string `json:"alg"`
+	}
+	type Payload struct {
+		Iss string `json:"iss"`
+		Sub string `json:"sub"`
+		Exp int64  `json:"exp"`
+	}
+
+	header, err := json.Marshal(Header{Kid: "123", Alg: "none"})
+	require.NoError(t, err)
+	u := expiryDate.UTC().Unix()
+	payload, err := json.Marshal(Payload{Iss: "fake", Sub: "a-sub", Exp: u})
+	require.NoError(t, err)
+
+	fakeSignature := []byte("6ICJm")
+	return fmt.Sprintf("%s.%s.%s", base64.RawURLEncoding.EncodeToString(header), base64.RawURLEncoding.EncodeToString(payload), base64.RawURLEncoding.EncodeToString(fakeSignature))
+}
+
+func TestGetOAuthTokenCacheTTL(t *testing.T) {
+	defaultTime := time.Now()
+	tests := []struct {
+		name              string
+		accessTokenExpiry time.Time
+		idTokenExpiry     time.Time
+		want              time.Duration
+	}{
+		{
+			name:              "should return maxOAuthTokenCacheTTL when no expiry is given",
+			accessTokenExpiry: time.Time{},
+			idTokenExpiry:     time.Time{},
+
+			want: maxOAuthTokenCacheTTL,
+		},
+		{
+			name:              "should return maxOAuthTokenCacheTTL when access token is not given and id token expiry is greater than max cache ttl",
+			accessTokenExpiry: time.Time{},
+			idTokenExpiry:     defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
+
+			want: maxOAuthTokenCacheTTL,
+		},
+		{
+			name:              "should return idTokenExpiry when access token is not given and id token expiry is less than max cache ttl",
+			accessTokenExpiry: time.Time{},
+			idTokenExpiry:     defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL),
+			want:              time.Until(defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL)),
+		},
+		{
+			name:              "should return maxOAuthTokenCacheTTL when access token expiry is greater than max cache ttl and id token is not given",
+			accessTokenExpiry: defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
+			idTokenExpiry:     time.Time{},
+			want:              maxOAuthTokenCacheTTL,
+		},
+		{
+			name:              "should return accessTokenExpiry when access token expiry is less than max cache ttl and id token is not given",
+			accessTokenExpiry: defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL),
+			idTokenExpiry:     time.Time{},
+			want:              time.Until(defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL)),
+		},
+		{
+			name:              "should return accessTokenExpiry when access token expiry is less than max cache ttl and less than id token expiry",
+			accessTokenExpiry: defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL),
+			idTokenExpiry:     defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
+			want:              time.Until(defaultTime.Add(-5*time.Minute + maxOAuthTokenCacheTTL)),
+		},
+		{
+			name:              "should return idTokenExpiry when id token expiry is less than max cache ttl and less than access token expiry",
+			accessTokenExpiry: defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
+			idTokenExpiry:     defaultTime.Add(-3*time.Minute + maxOAuthTokenCacheTTL),
+			want:              time.Until(defaultTime.Add(-3*time.Minute + maxOAuthTokenCacheTTL)),
+		},
+		{
+			name:              "should return maxOAuthTokenCacheTTL when access token expiry is greater than max cache ttl and id token expiry is greater than max cache ttl",
+			accessTokenExpiry: defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
+			idTokenExpiry:     defaultTime.Add(5*time.Minute + maxOAuthTokenCacheTTL),
+			want:              maxOAuthTokenCacheTTL,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := getOAuthTokenCacheTTL(tt.accessTokenExpiry, tt.idTokenExpiry)
+
+			assert.Equal(t, tt.want.Round(time.Second), got.Round(time.Second))
+		})
+	}
+}
diff --git a/pkg/services/datasources/models.go b/pkg/services/datasources/models.go
index de0211af3532e..4a5465db2de4c 100644
--- a/pkg/services/datasources/models.go
+++ b/pkg/services/datasources/models.go
@@ -1,6 +1,7 @@
 package datasources
 
 import (
+	"encoding/json"
 	"time"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
@@ -65,6 +66,33 @@ type DataSource struct {
 	Updated time.Time `json:"updated,omitempty"`
 }
 
+type TeamHTTPHeadersJSONData struct {
+	TeamHTTPHeaders TeamHTTPHeaders `json:"teamHttpHeaders"`
+}
+
+type TeamHTTPHeaders map[string][]TeamHTTPHeader
+
+type TeamHTTPHeader struct {
+	Header string `json:"header"`
+	Value  string `json:"value"`
+}
+
+func (ds DataSource) TeamHTTPHeaders() (TeamHTTPHeaders, error) {
+	teamHTTPHeadersJSON := TeamHTTPHeadersJSONData{}
+	if ds.JsonData != nil {
+		jsonData, err := ds.JsonData.MarshalJSON()
+		if err != nil {
+			return nil, err
+		}
+		err = json.Unmarshal(jsonData, &teamHTTPHeadersJSON)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return teamHTTPHeadersJSON.TeamHTTPHeaders, nil
+}
+
 // AllowedCookies parses the jsondata.keepCookies and returns a list of
 // allowed cookies, otherwise an empty list.
 func (ds DataSource) AllowedCookies() []string {
@@ -172,8 +200,9 @@ type GetDataSourcesQuery struct {
 type GetAllDataSourcesQuery struct{}
 
 type GetDataSourcesByTypeQuery struct {
-	OrgID int64 // optional: filter by org_id
-	Type  string
+	OrgID    int64 // optional: filter by org_id
+	Type     string
+	AliasIDs []string
 }
 
 type GetDefaultDataSourceQuery struct {
diff --git a/pkg/services/datasources/models_test.go b/pkg/services/datasources/models_test.go
index 69f2f2a957082..c6838447440b3 100644
--- a/pkg/services/datasources/models_test.go
+++ b/pkg/services/datasources/models_test.go
@@ -58,3 +58,45 @@ func TestAllowedCookies(t *testing.T) {
 		})
 	}
 }
+
+func TestTeamHTTPHeaders(t *testing.T) {
+	testCases := []struct {
+		desc  string
+		given string
+		want  TeamHTTPHeaders
+	}{
+		{
+			desc:  "Usual json data with teamHttpHeaders",
+			given: `{"teamHttpHeaders": {"101": [{"header": "X-CUSTOM-HEADER", "value": "foo"}]}}`,
+			want: TeamHTTPHeaders{
+				"101": {
+					{Header: "X-CUSTOM-HEADER", Value: "foo"},
+				},
+			},
+		},
+		{
+			desc:  "Json data without teamHttpHeaders",
+			given: `{"foo": "bar"}`,
+			want:  nil,
+		},
+	}
+
+	for _, test := range testCases {
+		t.Run(test.desc, func(t *testing.T) {
+			jsonDataBytes := []byte(test.given)
+			jsonData, err := simplejson.NewJson(jsonDataBytes)
+			require.NoError(t, err)
+
+			ds := DataSource{
+				ID:       1235,
+				JsonData: jsonData,
+				UID:      "test",
+			}
+
+			actual, err := ds.TeamHTTPHeaders()
+			assert.NoError(t, err)
+			assert.Equal(t, test.want, actual)
+			assert.EqualValues(t, test.want, actual)
+		})
+	}
+}
diff --git a/pkg/services/datasources/service/datasource.go b/pkg/services/datasources/service/datasource.go
index 6761b71ceb088..5d6f6925796ed 100644
--- a/pkg/services/datasources/service/datasource.go
+++ b/pkg/services/datasources/service/datasource.go
@@ -22,6 +22,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/services/secrets"
 	"github.com/grafana/grafana/pkg/services/secrets/kvstore"
@@ -43,6 +44,7 @@ type Service struct {
 	ac                 accesscontrol.AccessControl
 	logger             log.Logger
 	db                 db.DB
+	pluginStore        pluginstore.Store
 
 	ptc proxyTransportCache
 }
@@ -60,7 +62,7 @@ type cachedRoundTripper struct {
 func ProvideService(
 	db db.DB, secretsService secrets.Service, secretsStore kvstore.SecretsKVStore, cfg *setting.Cfg,
 	features featuremgmt.FeatureToggles, ac accesscontrol.AccessControl, datasourcePermissionsService accesscontrol.DatasourcePermissionsService,
-	quotaService quota.Service,
+	quotaService quota.Service, pluginStore pluginstore.Store,
 ) (*Service, error) {
 	dslogger := log.New("datasources")
 	store := &SqlStore{db: db, logger: dslogger}
@@ -77,6 +79,7 @@ func ProvideService(
 		ac:                 ac,
 		logger:             dslogger,
 		db:                 db,
+		pluginStore:        pluginStore,
 	}
 
 	ac.RegisterScopeAttributeResolver(NewNameScopeResolver(store))
@@ -173,6 +176,14 @@ func (s *Service) GetAllDataSources(ctx context.Context, query *datasources.GetA
 }
 
 func (s *Service) GetDataSourcesByType(ctx context.Context, query *datasources.GetDataSourcesByTypeQuery) ([]*datasources.DataSource, error) {
+	if query.AliasIDs == nil {
+		// Populate alias IDs from plugin store
+		p, found := s.pluginStore.Plugin(ctx, query.Type)
+		if !found {
+			return nil, fmt.Errorf("plugin %s not found", query.Type)
+		}
+		query.AliasIDs = p.AliasIDs
+	}
 	return s.SQLStore.GetDataSourcesByType(ctx, query)
 }
 
@@ -485,6 +496,13 @@ func (s *Service) httpClientOptions(ctx context.Context, ds *datasources.DataSou
 				Username: ds.JsonData.Get("secureSocksProxyUsername").MustString(ds.UID),
 			},
 			Timeouts: &sdkproxy.DefaultTimeoutOptions,
+			ClientCfg: &sdkproxy.ClientCfg{
+				ClientCert:   s.cfg.SecureSocksDSProxy.ClientCert,
+				ClientKey:    s.cfg.SecureSocksDSProxy.ClientKey,
+				RootCA:       s.cfg.SecureSocksDSProxy.RootCA,
+				ProxyAddress: s.cfg.SecureSocksDSProxy.ProxyAddress,
+				ServerName:   s.cfg.SecureSocksDSProxy.ServerName,
+			},
 		}
 
 		if val, exists, err := s.DecryptedValue(ctx, ds, "secureSocksProxyPassword"); err == nil && exists {
diff --git a/pkg/services/datasources/service/datasource_test.go b/pkg/services/datasources/service/datasource_test.go
index f40e2f3f966fe..3ebfbaeb0d40d 100644
--- a/pkg/services/datasources/service/datasource_test.go
+++ b/pkg/services/datasources/service/datasource_test.go
@@ -24,6 +24,7 @@ import (
 	acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/secrets"
 	"github.com/grafana/grafana/pkg/services/secrets/fakes"
@@ -57,7 +58,7 @@ func TestService_AddDataSource(t *testing.T) {
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		quotaService := quotatest.New(false, nil)
 		mockPermission := acmock.NewMockedPermissionsService()
-		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), actest.FakeAccessControl{}, mockPermission, quotaService)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), actest.FakeAccessControl{}, mockPermission, quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		cmd := &datasources.AddDataSourceCommand{
@@ -87,7 +88,7 @@ func TestService_UpdateDataSource(t *testing.T) {
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		quotaService := quotatest.New(false, nil)
 		mockPermission := acmock.NewMockedPermissionsService()
-		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), actest.FakeAccessControl{}, mockPermission, quotaService)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), actest.FakeAccessControl{}, mockPermission, quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		cmd := &datasources.UpdateDataSourceCommand{
@@ -106,7 +107,7 @@ func TestService_UpdateDataSource(t *testing.T) {
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		quotaService := quotatest.New(false, nil)
 		mockPermission := acmock.NewMockedPermissionsService()
-		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), actest.FakeAccessControl{}, mockPermission, quotaService)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), actest.FakeAccessControl{}, mockPermission, quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		cmd := &datasources.UpdateDataSourceCommand{
@@ -134,7 +135,7 @@ func TestService_UpdateDataSource(t *testing.T) {
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		quotaService := quotatest.New(false, nil)
 		mockPermission := acmock.NewMockedPermissionsService()
-		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), actest.FakeAccessControl{}, mockPermission, quotaService)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), actest.FakeAccessControl{}, mockPermission, quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		mockPermission.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
@@ -161,7 +162,7 @@ func TestService_UpdateDataSource(t *testing.T) {
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		quotaService := quotatest.New(false, nil)
 		mockPermission := acmock.NewMockedPermissionsService()
-		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), actest.FakeAccessControl{}, mockPermission, quotaService)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), actest.FakeAccessControl{}, mockPermission, quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		mockPermission.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
@@ -194,7 +195,7 @@ func TestService_UpdateDataSource(t *testing.T) {
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		quotaService := quotatest.New(false, nil)
 		mockPermission := acmock.NewMockedPermissionsService()
-		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), actest.FakeAccessControl{}, mockPermission, quotaService)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), actest.FakeAccessControl{}, mockPermission, quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		mockPermission.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
@@ -238,7 +239,7 @@ func TestService_UpdateDataSource(t *testing.T) {
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		quotaService := quotatest.New(false, nil)
 		mockPermission := acmock.NewMockedPermissionsService()
-		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), actest.FakeAccessControl{}, mockPermission, quotaService)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), actest.FakeAccessControl{}, mockPermission, quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		mockPermission.On("SetPermissions", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]accesscontrol.ResourcePermission{}, nil)
@@ -500,7 +501,7 @@ func TestService_GetHttpTransport(t *testing.T) {
 		secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		quotaService := quotatest.New(false, nil)
-		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		rt1, err := dsService.GetHTTPTransport(context.Background(), &ds, provider)
@@ -537,7 +538,7 @@ func TestService_GetHttpTransport(t *testing.T) {
 		secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		quotaService := quotatest.New(false, nil)
-		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		ds := datasources.DataSource{
@@ -588,7 +589,7 @@ func TestService_GetHttpTransport(t *testing.T) {
 		secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		quotaService := quotatest.New(false, nil)
-		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		ds := datasources.DataSource{
@@ -636,7 +637,7 @@ func TestService_GetHttpTransport(t *testing.T) {
 		secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		quotaService := quotatest.New(false, nil)
-		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		ds := datasources.DataSource{
@@ -692,7 +693,7 @@ func TestService_GetHttpTransport(t *testing.T) {
 		secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		quotaService := quotatest.New(false, nil)
-		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		ds := datasources.DataSource{
@@ -727,7 +728,7 @@ func TestService_GetHttpTransport(t *testing.T) {
 		secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		quotaService := quotatest.New(false, nil)
-		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		ds := datasources.DataSource{
@@ -796,7 +797,7 @@ func TestService_GetHttpTransport(t *testing.T) {
 		secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		quotaService := quotatest.New(false, nil)
-		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 		ds := datasources.DataSource{
 			ID:       1,
@@ -832,7 +833,7 @@ func TestService_GetHttpTransport(t *testing.T) {
 		secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		quotaService := quotatest.New(false, nil)
-		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		ds := datasources.DataSource{
@@ -853,7 +854,7 @@ func TestService_getProxySettings(t *testing.T) {
 	secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
 	secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 	quotaService := quotatest.New(false, nil)
-	dsService, err := ProvideService(sqlStore, secretsService, secretsStore, &setting.Cfg{}, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService)
+	dsService, err := ProvideService(sqlStore, secretsService, secretsStore, &setting.Cfg{}, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService, &pluginstore.FakePluginStore{})
 	require.NoError(t, err)
 
 	t.Run("Should default to disabled", func(t *testing.T) {
@@ -949,7 +950,7 @@ func TestService_getTimeout(t *testing.T) {
 	secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
 	secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 	quotaService := quotatest.New(false, nil)
-	dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService)
+	dsService, err := ProvideService(sqlStore, secretsService, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService, &pluginstore.FakePluginStore{})
 	require.NoError(t, err)
 
 	for _, tc := range testCases {
@@ -972,7 +973,7 @@ func TestService_GetDecryptedValues(t *testing.T) {
 		secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		quotaService := quotatest.New(false, nil)
-		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, nil, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, nil, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		jsonData := map[string]string{
@@ -1000,7 +1001,7 @@ func TestService_GetDecryptedValues(t *testing.T) {
 		secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		quotaService := quotatest.New(false, nil)
-		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, nil, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService)
+		dsService, err := ProvideService(sqlStore, secretsService, secretsStore, nil, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		jsonData := map[string]string{
@@ -1024,7 +1025,7 @@ func TestDataSource_CustomHeaders(t *testing.T) {
 	secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
 	secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 	quotaService := quotatest.New(false, nil)
-	dsService, err := ProvideService(sqlStore, secretsService, secretsStore, nil, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService)
+	dsService, err := ProvideService(sqlStore, secretsService, secretsStore, nil, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService, &pluginstore.FakePluginStore{})
 	require.NoError(t, err)
 
 	dsService.cfg = setting.NewCfg()
diff --git a/pkg/services/datasources/service/store.go b/pkg/services/datasources/service/store.go
index ccc7b7ba381ee..23ba2ceb66e1a 100644
--- a/pkg/services/datasources/service/store.go
+++ b/pkg/services/datasources/service/store.go
@@ -107,12 +107,21 @@ func (ss *SqlStore) GetDataSourcesByType(ctx context.Context, query *datasources
 		return nil, fmt.Errorf("datasource type cannot be empty")
 	}
 
+	typeQuery := "type=?"
+	args := []interface{}{query.Type}
+	for _, alias := range query.AliasIDs {
+		typeQuery += " OR type=?"
+		args = append(args, alias)
+	}
+	typeQuery = "(" + typeQuery + ")"
+
 	dataSources := make([]*datasources.DataSource, 0)
 	return dataSources, ss.db.WithDbSession(ctx, func(sess *db.Session) error {
 		if query.OrgID > 0 {
-			return sess.Where("type=? AND org_id=?", query.Type, query.OrgID).Asc("id").Find(&dataSources)
+			args = append([]interface{}{query.OrgID}, args...)
+			return sess.Where("org_id=? AND "+typeQuery, args...).Asc("id").Find(&dataSources)
 		}
-		return sess.Where("type=?", query.Type).Asc("id").Find(&dataSources)
+		return sess.Where(typeQuery, args...).Asc("id").Find(&dataSources)
 	})
 }
 
diff --git a/pkg/services/datasources/service/store_test.go b/pkg/services/datasources/service/store_test.go
index ad8f14eca0a7e..1dfdb42c3cb35 100644
--- a/pkg/services/datasources/service/store_test.go
+++ b/pkg/services/datasources/service/store_test.go
@@ -467,6 +467,29 @@ func TestIntegrationDataAccess(t *testing.T) {
 
 			require.Error(t, err)
 		})
+
+		t.Run("Returns datasources based on alias", func(t *testing.T) {
+			db := db.InitTestDB(t)
+			ss := SqlStore{db: db}
+
+			_, err := ss.AddDataSource(context.Background(), &datasources.AddDataSourceCommand{
+				OrgID:    10,
+				Name:     "Elasticsearch",
+				Type:     "other",
+				Access:   datasources.DS_ACCESS_DIRECT,
+				URL:      "http://test",
+				Database: "site",
+				ReadOnly: true,
+			})
+			require.NoError(t, err)
+
+			query := datasources.GetDataSourcesByTypeQuery{Type: datasources.DS_ES, AliasIDs: []string{"other"}}
+
+			dataSources, err := ss.GetDataSourcesByType(context.Background(), &query)
+
+			require.NoError(t, err)
+			require.Equal(t, 1, len(dataSources))
+		})
 	})
 }
 
diff --git a/pkg/services/extsvcauth/errors.go b/pkg/services/extsvcauth/errors.go
index f1af61f4f0c29..c605dd3f7ab9b 100644
--- a/pkg/services/extsvcauth/errors.go
+++ b/pkg/services/extsvcauth/errors.go
@@ -3,5 +3,6 @@ package extsvcauth
 import "github.com/grafana/grafana/pkg/util/errutil"
 
 var (
-	ErrUnknownProvider = errutil.BadRequest("extsvcauth.unknown-provider")
+	ErrUnknownProvider     = errutil.BadRequest("extsvcauth.unknown-provider")
+	ErrCredentialsNotFound = errutil.NotFound("extsvcauth.credentials-not-found")
 )
diff --git a/pkg/services/extsvcauth/extsvcaccounts/models.go b/pkg/services/extsvcauth/extsvcaccounts/models.go
index 536d6432f32a5..621513e0d210f 100644
--- a/pkg/services/extsvcauth/extsvcaccounts/models.go
+++ b/pkg/services/extsvcauth/extsvcaccounts/models.go
@@ -5,7 +5,24 @@ import (
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 )
 
-type saveExtSvcAccountCmd struct {
+const (
+	kvStoreType = "extsvc-token"
+	// #nosec G101 - this is not a hardcoded secret
+	tokenNamePrefix = "extsvc-token"
+)
+
+// Credentials represents the credentials associated to an external service
+type Credentials struct {
+	Secret string
+}
+
+type SaveCredentialsCmd struct {
+	ExtSvcSlug string
+	OrgID      int64
+	Secret     string
+}
+
+type saveCmd struct {
 	ExtSvcSlug  string
 	OrgID       int64
 	Permissions []ac.Permission
diff --git a/pkg/services/extsvcauth/extsvcaccounts/service.go b/pkg/services/extsvcauth/extsvcaccounts/service.go
index 6bc60ace2c51b..3041cf653a910 100644
--- a/pkg/services/extsvcauth/extsvcaccounts/service.go
+++ b/pkg/services/extsvcauth/extsvcaccounts/service.go
@@ -4,24 +4,32 @@ import (
 	"context"
 	"errors"
 
+	"github.com/grafana/grafana/pkg/components/satokengen"
+	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/slugify"
 	"github.com/grafana/grafana/pkg/models/roletype"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/extsvcauth"
+	"github.com/grafana/grafana/pkg/services/secrets"
+	"github.com/grafana/grafana/pkg/services/secrets/kvstore"
 	sa "github.com/grafana/grafana/pkg/services/serviceaccounts"
 )
 
 type ExtSvcAccountsService struct {
-	acSvc  ac.Service
-	logger log.Logger
-	saSvc  sa.Service
+	acSvc    ac.Service
+	logger   log.Logger
+	saSvc    sa.Service
+	skvStore kvstore.SecretsKVStore
 }
 
-func ProvideExtSvcAccountsService(acSvc ac.Service, saSvc sa.Service) *ExtSvcAccountsService {
+func ProvideExtSvcAccountsService(acSvc ac.Service, saSvc sa.Service, db db.DB, secretsSvc secrets.Service) *ExtSvcAccountsService {
+	logger := log.New("serviceauth.extsvcaccounts")
 	return &ExtSvcAccountsService{
-		acSvc:  acSvc,
-		logger: log.New("serviceauth.extsvcaccounts"),
-		saSvc:  saSvc,
+		acSvc:    acSvc,
+		logger:   logger,
+		saSvc:    saSvc,
+		skvStore: kvstore.NewSQLSecretsKVStore(db, secretsSvc, logger), // Using SQL store to avoid a cyclic dependency
 	}
 }
 
@@ -41,6 +49,46 @@ func (esa *ExtSvcAccountsService) RetrieveExtSvcAccount(ctx context.Context, org
 	}, nil
 }
 
+// SaveExternalService creates, updates or delete a service account (and its token) with the requested permissions.
+func (esa *ExtSvcAccountsService) SaveExternalService(ctx context.Context, cmd *extsvcauth.ExternalServiceRegistration) (*extsvcauth.ExternalService, error) {
+	if cmd == nil {
+		esa.logger.Warn("Received no input")
+		return nil, nil
+	}
+
+	slug := slugify.Slugify(cmd.Name)
+
+	if cmd.Impersonation.Enabled {
+		esa.logger.Warn("Impersonation setup skipped. It is not possible to impersonate with a service account token.", "service", slug)
+	}
+
+	saID, err := esa.ManageExtSvcAccount(ctx, &extsvcauth.ManageExtSvcAccountCmd{
+		ExtSvcSlug:  slug,
+		Enabled:     cmd.Self.Enabled,
+		OrgID:       extsvcauth.TmpOrgID,
+		Permissions: cmd.Self.Permissions,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	// No need for a token if we don't have a service account
+	if saID <= 0 {
+		esa.logger.Debug("Skipping service account token creation", "service", slug)
+		return nil, nil
+	}
+
+	token, err := esa.getExtSvcAccountToken(ctx, extsvcauth.TmpOrgID, saID, slug)
+	if err != nil {
+		esa.logger.Error("Could not get the external svc token",
+			"service", slug,
+			"saID", saID,
+			"error", err.Error())
+		return nil, err
+	}
+	return &extsvcauth.ExternalService{Name: cmd.Name, ID: slug, Secret: token}, nil
+}
+
 // ManageExtSvcAccount creates, updates or deletes the service account associated with an external service
 func (esa *ExtSvcAccountsService) ManageExtSvcAccount(ctx context.Context, cmd *extsvcauth.ManageExtSvcAccountCmd) (int64, error) {
 	if cmd == nil {
@@ -71,7 +119,7 @@ func (esa *ExtSvcAccountsService) ManageExtSvcAccount(ctx context.Context, cmd *
 		return 0, nil
 	}
 
-	saID, errSave := esa.saveExtSvcAccount(ctx, &saveExtSvcAccountCmd{
+	saID, errSave := esa.saveExtSvcAccount(ctx, &saveCmd{
 		ExtSvcSlug:  cmd.ExtSvcSlug,
 		OrgID:       cmd.OrgID,
 		Permissions: cmd.Permissions,
@@ -86,7 +134,7 @@ func (esa *ExtSvcAccountsService) ManageExtSvcAccount(ctx context.Context, cmd *
 }
 
 // saveExtSvcAccount creates or updates the service account associated with an external service
-func (esa *ExtSvcAccountsService) saveExtSvcAccount(ctx context.Context, cmd *saveExtSvcAccountCmd) (int64, error) {
+func (esa *ExtSvcAccountsService) saveExtSvcAccount(ctx context.Context, cmd *saveCmd) (int64, error) {
 	if cmd.SaID <= 0 {
 		// Create a service account
 		esa.logger.Debug("Create service account", "service", cmd.ExtSvcSlug, "orgID", cmd.OrgID)
@@ -118,9 +166,75 @@ func (esa *ExtSvcAccountsService) saveExtSvcAccount(ctx context.Context, cmd *sa
 
 // deleteExtSvcAccount deletes a service account by ID and removes its associated role
 func (esa *ExtSvcAccountsService) deleteExtSvcAccount(ctx context.Context, orgID int64, slug string, saID int64) error {
-	esa.logger.Info("Delete service account", "service", slug, "saID", saID)
+	esa.logger.Info("Delete service account", "service", slug, "orgID", orgID, "saID", saID)
 	if err := esa.saSvc.DeleteServiceAccount(ctx, orgID, saID); err != nil {
 		return err
 	}
-	return esa.acSvc.DeleteExternalServiceRole(ctx, slug)
+	if err := esa.acSvc.DeleteExternalServiceRole(ctx, slug); err != nil {
+		return err
+	}
+	return esa.DeleteExtSvcCredentials(ctx, orgID, slug)
+}
+
+// getExtSvcAccountToken get or create the token of an External Service
+func (esa *ExtSvcAccountsService) getExtSvcAccountToken(ctx context.Context, orgID, saID int64, extSvcSlug string) (string, error) {
+	// Get credentials from store
+	credentials, err := esa.GetExtSvcCredentials(ctx, orgID, extSvcSlug)
+	if err != nil && !errors.Is(err, extsvcauth.ErrCredentialsNotFound) {
+		return "", err
+	}
+	if credentials != nil {
+		return credentials.Secret, nil
+	}
+
+	// Generate token
+	esa.logger.Info("Generate new service account token", "service", extSvcSlug, "orgID", orgID)
+	newKeyInfo, err := satokengen.New(extSvcSlug)
+	if err != nil {
+		return "", err
+	}
+
+	esa.logger.Debug("Add service account token", "service", extSvcSlug, "orgID", orgID)
+	if _, err := esa.saSvc.AddServiceAccountToken(ctx, saID, &sa.AddServiceAccountTokenCommand{
+		Name:  tokenNamePrefix + "-" + extSvcSlug,
+		OrgId: orgID,
+		Key:   newKeyInfo.HashedKey,
+	}); err != nil {
+		return "", err
+	}
+
+	if err := esa.SaveExtSvcCredentials(ctx, &SaveCredentialsCmd{
+		ExtSvcSlug: extSvcSlug,
+		OrgID:      orgID,
+		Secret:     newKeyInfo.ClientSecret,
+	}); err != nil {
+		return "", err
+	}
+
+	return newKeyInfo.ClientSecret, nil
+}
+
+// GetExtSvcCredentials get the credentials of an External Service from an encrypted storage
+func (esa *ExtSvcAccountsService) GetExtSvcCredentials(ctx context.Context, orgID int64, extSvcSlug string) (*Credentials, error) {
+	esa.logger.Debug("Get service account token from skv", "service", extSvcSlug, "orgID", orgID)
+	token, ok, err := esa.skvStore.Get(ctx, orgID, extSvcSlug, kvStoreType)
+	if err != nil {
+		return nil, err
+	}
+	if !ok {
+		return nil, extsvcauth.ErrCredentialsNotFound.Errorf("No credential found for in store %v", extSvcSlug)
+	}
+	return &Credentials{Secret: token}, nil
+}
+
+// SaveExtSvcCredentials stores the credentials of an External Service in an encrypted storage
+func (esa *ExtSvcAccountsService) SaveExtSvcCredentials(ctx context.Context, cmd *SaveCredentialsCmd) error {
+	esa.logger.Debug("Save service account token in skv", "service", cmd.ExtSvcSlug, "orgID", cmd.OrgID)
+	return esa.skvStore.Set(ctx, cmd.OrgID, cmd.ExtSvcSlug, kvStoreType, cmd.Secret)
+}
+
+// DeleteExtSvcCredentials removes the credentials of an External Service from an encrypted storage
+func (esa *ExtSvcAccountsService) DeleteExtSvcCredentials(ctx context.Context, orgID int64, extSvcSlug string) error {
+	esa.logger.Debug("Delete service account token from skv", "service", extSvcSlug, "orgID", orgID)
+	return esa.skvStore.Del(ctx, orgID, extSvcSlug, kvStoreType)
 }
diff --git a/pkg/services/extsvcauth/extsvcaccounts/service_test.go b/pkg/services/extsvcauth/extsvcaccounts/service_test.go
index 0cb27a557291a..51dcd58cc6628 100644
--- a/pkg/services/extsvcauth/extsvcaccounts/service_test.go
+++ b/pkg/services/extsvcauth/extsvcaccounts/service_test.go
@@ -10,8 +10,10 @@ import (
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
+	"github.com/grafana/grafana/pkg/services/apikey"
 	"github.com/grafana/grafana/pkg/services/extsvcauth"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/secrets/kvstore"
 	sa "github.com/grafana/grafana/pkg/services/serviceaccounts"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts/tests"
 	"github.com/grafana/grafana/pkg/setting"
@@ -20,25 +22,28 @@ import (
 )
 
 type TestEnv struct {
-	S       *ExtSvcAccountsService
-	AcStore *actest.MockStore
-	SaSvc   *tests.MockServiceAccountService
+	S        *ExtSvcAccountsService
+	AcStore  *actest.MockStore
+	SaSvc    *tests.MockServiceAccountService
+	SkvStore *kvstore.FakeSecretsKVStore
 }
 
 func setupTestEnv(t *testing.T) *TestEnv {
 	t.Helper()
 
 	cfg := setting.NewCfg()
-	fmgt := featuremgmt.WithFeatures(featuremgmt.FlagExternalServiceAuth)
+	fmgt := featuremgmt.WithFeatures(featuremgmt.FlagExternalServiceAccounts)
 
 	env := &TestEnv{
-		AcStore: &actest.MockStore{},
-		SaSvc:   &tests.MockServiceAccountService{},
+		AcStore:  &actest.MockStore{},
+		SaSvc:    &tests.MockServiceAccountService{},
+		SkvStore: kvstore.NewFakeSecretsKVStore(),
 	}
 	env.S = &ExtSvcAccountsService{
-		acSvc:  acimpl.ProvideOSSService(cfg, env.AcStore, localcache.New(0, 0), fmgt),
-		logger: log.New("extsvcaccounts.test"),
-		saSvc:  env.SaSvc,
+		acSvc:    acimpl.ProvideOSSService(cfg, env.AcStore, localcache.New(0, 0), fmgt),
+		logger:   log.New("extsvcaccounts.test"),
+		saSvc:    env.SaSvc,
+		skvStore: env.SkvStore,
 	}
 	return env
 }
@@ -209,3 +214,196 @@ func TestExtSvcAccountsService_ManageExtSvcAccount(t *testing.T) {
 		})
 	}
 }
+
+func TestExtSvcAccountsService_SaveExternalService(t *testing.T) {
+	extSvcSlug := "grafana-test-app"
+	tmpOrgID := int64(1)
+	extSvcAccID := int64(10)
+	extSvcPerms := []ac.Permission{{Action: ac.ActionUsersRead, Scope: ac.ScopeUsersAll}}
+	extSvcAccount := &sa.ServiceAccountDTO{
+		Id:         extSvcAccID,
+		Name:       extSvcSlug,
+		Login:      extSvcSlug,
+		OrgId:      tmpOrgID,
+		IsDisabled: false,
+		Role:       string(roletype.RoleNone),
+	}
+
+	tests := []struct {
+		name    string
+		init    func(env *TestEnv)
+		cmd     extsvcauth.ExternalServiceRegistration
+		checks  func(t *testing.T, env *TestEnv)
+		want    *extsvcauth.ExternalService
+		wantErr bool
+	}{
+		{
+			name: "should remove service account when disabled",
+			init: func(env *TestEnv) {
+				// A previous service account was attached to this slug
+				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, mock.Anything, mock.Anything).Return(extSvcAccID, nil)
+				env.SaSvc.On("DeleteServiceAccount", mock.Anything, mock.Anything, mock.Anything).Return(nil)
+				env.AcStore.On("DeleteExternalServiceRole", mock.Anything, mock.Anything).Return(nil)
+				// A token was previously stored in the secret store
+				_ = env.SkvStore.Set(context.Background(), tmpOrgID, extSvcSlug, kvStoreType, "ExtSvcSecretToken")
+			},
+			cmd: extsvcauth.ExternalServiceRegistration{
+				Name: extSvcSlug,
+				Self: extsvcauth.SelfCfg{
+					Enabled:     false,
+					Permissions: extSvcPerms,
+				},
+			},
+			checks: func(t *testing.T, env *TestEnv) {
+				env.SaSvc.AssertCalled(t, "RetrieveServiceAccountIdByName", mock.Anything,
+					mock.MatchedBy(func(orgID int64) bool { return orgID == tmpOrgID }),
+					mock.MatchedBy(func(slug string) bool { return slug == extSvcSlug }))
+				env.SaSvc.AssertCalled(t, "DeleteServiceAccount", mock.Anything,
+					mock.MatchedBy(func(orgID int64) bool { return orgID == tmpOrgID }),
+					mock.MatchedBy(func(saID int64) bool { return saID == extSvcAccID }))
+				env.AcStore.AssertCalled(t, "DeleteExternalServiceRole", mock.Anything,
+					mock.MatchedBy(func(slug string) bool { return slug == extSvcSlug }))
+				_, ok, _ := env.SkvStore.Get(context.Background(), tmpOrgID, extSvcSlug, kvStoreType)
+				require.False(t, ok, "secret should have been removed from store")
+			},
+			want:    nil,
+			wantErr: false,
+		},
+		{
+			name: "should remove service account when no permission",
+			init: func(env *TestEnv) {
+				// A previous service account was attached to this slug
+				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, mock.Anything, mock.Anything).Return(extSvcAccID, nil)
+				env.SaSvc.On("DeleteServiceAccount", mock.Anything, mock.Anything, mock.Anything).Return(nil)
+				env.AcStore.On("DeleteExternalServiceRole", mock.Anything, mock.Anything).Return(nil)
+			},
+			cmd: extsvcauth.ExternalServiceRegistration{
+				Name: extSvcSlug,
+				Self: extsvcauth.SelfCfg{
+					Enabled:     true,
+					Permissions: []ac.Permission{},
+				},
+			},
+			checks: func(t *testing.T, env *TestEnv) {
+				env.SaSvc.AssertCalled(t, "RetrieveServiceAccountIdByName", mock.Anything,
+					mock.MatchedBy(func(orgID int64) bool { return orgID == tmpOrgID }),
+					mock.MatchedBy(func(slug string) bool { return slug == extSvcSlug }))
+				env.SaSvc.AssertCalled(t, "DeleteServiceAccount", mock.Anything,
+					mock.MatchedBy(func(orgID int64) bool { return orgID == tmpOrgID }),
+					mock.MatchedBy(func(saID int64) bool { return saID == extSvcAccID }))
+				env.AcStore.AssertCalled(t, "DeleteExternalServiceRole", mock.Anything,
+					mock.MatchedBy(func(slug string) bool { return slug == extSvcSlug }))
+			},
+			want:    nil,
+			wantErr: false,
+		},
+		{
+			name: "should create new service account",
+			init: func(env *TestEnv) {
+				// No previous service account was attached to this slug
+				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, mock.Anything, mock.Anything).
+					Return(int64(0), sa.ErrServiceAccountNotFound.Errorf("mock"))
+				env.SaSvc.On("CreateServiceAccount", mock.Anything, mock.Anything, mock.Anything).
+					Return(extSvcAccount, nil)
+				// Api Key was added without problem
+				env.SaSvc.On("AddServiceAccountToken", mock.Anything, mock.Anything, mock.Anything).Return(&apikey.APIKey{}, nil)
+				env.AcStore.On("SaveExternalServiceRole", mock.Anything, mock.Anything).Return(nil)
+			},
+			cmd: extsvcauth.ExternalServiceRegistration{
+				Name: extSvcSlug,
+				Self: extsvcauth.SelfCfg{
+					Enabled:     true,
+					Permissions: extSvcPerms,
+				},
+			},
+			checks: func(t *testing.T, env *TestEnv) {
+				env.SaSvc.AssertCalled(t, "RetrieveServiceAccountIdByName", mock.Anything,
+					mock.MatchedBy(func(orgID int64) bool { return orgID == tmpOrgID }),
+					mock.MatchedBy(func(slug string) bool { return slug == extSvcSlug }))
+				env.SaSvc.AssertCalled(t, "CreateServiceAccount", mock.Anything,
+					mock.MatchedBy(func(orgID int64) bool { return orgID == tmpOrgID }),
+					mock.MatchedBy(func(cmd *sa.CreateServiceAccountForm) bool {
+						return cmd.Name == extSvcSlug && *cmd.Role == roletype.RoleNone
+					}),
+				)
+				env.AcStore.AssertCalled(t, "SaveExternalServiceRole", mock.Anything,
+					mock.MatchedBy(func(cmd ac.SaveExternalServiceRoleCommand) bool {
+						return cmd.ServiceAccountID == extSvcAccount.Id && cmd.ExternalServiceID == extSvcSlug &&
+							cmd.OrgID == int64(ac.GlobalOrgID) && len(cmd.Permissions) == 1 &&
+							cmd.Permissions[0] == extSvcPerms[0]
+					}))
+			},
+			want: &extsvcauth.ExternalService{
+				Name:   extSvcSlug,
+				ID:     extSvcSlug,
+				Secret: "not empty",
+			},
+			wantErr: false,
+		},
+		{
+			name: "should update service account",
+			init: func(env *TestEnv) {
+				// A previous service account was attached to this slug
+				env.SaSvc.On("RetrieveServiceAccountIdByName", mock.Anything, mock.Anything, mock.Anything).
+					Return(int64(11), nil)
+				env.AcStore.On("SaveExternalServiceRole", mock.Anything, mock.Anything).Return(nil)
+				// This time we don't add a token but rely on the secret store
+				_ = env.SkvStore.Set(context.Background(), tmpOrgID, extSvcSlug, kvStoreType, "ExtSvcSecretToken")
+			},
+			cmd: extsvcauth.ExternalServiceRegistration{
+				Name: extSvcSlug,
+				Self: extsvcauth.SelfCfg{
+					Enabled:     true,
+					Permissions: extSvcPerms,
+				},
+			},
+			checks: func(t *testing.T, env *TestEnv) {
+				env.SaSvc.AssertCalled(t, "RetrieveServiceAccountIdByName", mock.Anything,
+					mock.MatchedBy(func(orgID int64) bool { return orgID == tmpOrgID }),
+					mock.MatchedBy(func(slug string) bool { return slug == extSvcSlug }))
+				env.AcStore.AssertCalled(t, "SaveExternalServiceRole", mock.Anything,
+					mock.MatchedBy(func(cmd ac.SaveExternalServiceRoleCommand) bool {
+						return cmd.ServiceAccountID == int64(11) && cmd.ExternalServiceID == extSvcSlug &&
+							cmd.OrgID == int64(ac.GlobalOrgID) && len(cmd.Permissions) == 1 &&
+							cmd.Permissions[0] == extSvcPerms[0]
+					}))
+			},
+			want: &extsvcauth.ExternalService{
+				Name:   extSvcSlug,
+				ID:     extSvcSlug,
+				Secret: "not empty",
+			},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctx := context.Background()
+
+			env := setupTestEnv(t)
+			if tt.init != nil {
+				tt.init(env)
+			}
+
+			got, err := env.S.SaveExternalService(ctx, &tt.cmd)
+
+			if tt.wantErr {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+
+			if tt.checks != nil {
+				tt.checks(t, env)
+			}
+
+			// Only check that there is a secret, not it's actual value
+			if tt.want != nil && len(tt.want.Secret) > 0 {
+				require.NotEmpty(t, got.Secret)
+				tt.want.Secret = got.Secret
+			}
+
+			require.Equal(t, tt.want, got)
+		})
+	}
+}
diff --git a/pkg/services/extsvcauth/models.go b/pkg/services/extsvcauth/models.go
index cb82ed08ef7ae..e316aa6b7b8ff 100644
--- a/pkg/services/extsvcauth/models.go
+++ b/pkg/services/extsvcauth/models.go
@@ -8,7 +8,11 @@ import (
 )
 
 const (
-	OAuth2Server AuthProvider = "OAuth2Server"
+	OAuth2Server    AuthProvider = "OAuth2Server"
+	ServiceAccounts AuthProvider = "ServiceAccounts"
+
+	// TmpOrgID is the orgID we use while global service accounts are not supported.
+	TmpOrgID int64 = 1
 )
 
 type AuthProvider string
diff --git a/pkg/services/extsvcauth/registry/service.go b/pkg/services/extsvcauth/registry/service.go
index d8cf77a37b6fb..0cb3b9db911bd 100644
--- a/pkg/services/extsvcauth/registry/service.go
+++ b/pkg/services/extsvcauth/registry/service.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/extsvcauth"
+	"github.com/grafana/grafana/pkg/services/extsvcauth/extsvcaccounts"
 	"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 )
@@ -15,13 +16,15 @@ type Registry struct {
 	features    featuremgmt.FeatureToggles
 	logger      log.Logger
 	oauthServer oauthserver.OAuth2Server
+	saSvc       *extsvcaccounts.ExtSvcAccountsService
 }
 
-func ProvideExtSvcRegistry(oauthServer oauthserver.OAuth2Server, features featuremgmt.FeatureToggles) *Registry {
+func ProvideExtSvcRegistry(oauthServer oauthserver.OAuth2Server, saSvc *extsvcaccounts.ExtSvcAccountsService, features featuremgmt.FeatureToggles) *Registry {
 	return &Registry{
 		features:    features,
 		logger:      log.New("extsvcauth.registry"),
 		oauthServer: oauthServer,
+		saSvc:       saSvc,
 	}
 }
 
@@ -30,6 +33,13 @@ func ProvideExtSvcRegistry(oauthServer oauthserver.OAuth2Server, features featur
 // associated service account has the correct permissions.
 func (r *Registry) SaveExternalService(ctx context.Context, cmd *extsvcauth.ExternalServiceRegistration) (*extsvcauth.ExternalService, error) {
 	switch cmd.AuthProvider {
+	case extsvcauth.ServiceAccounts:
+		if !r.features.IsEnabled(featuremgmt.FlagExternalServiceAccounts) {
+			r.logger.Warn("Skipping external service authentication, flag disabled", "service", cmd.Name, "flag", featuremgmt.FlagExternalServiceAccounts)
+			return nil, nil
+		}
+		r.logger.Debug("Routing the External Service registration to the External Service Account service", "service", cmd.Name)
+		return r.saSvc.SaveExternalService(ctx, cmd)
 	case extsvcauth.OAuth2Server:
 		if !r.features.IsEnabled(featuremgmt.FlagExternalServiceAuth) {
 			r.logger.Warn("Skipping external service authentication, flag disabled", "service", cmd.Name, "flag", featuremgmt.FlagExternalServiceAuth)
diff --git a/pkg/services/featuremgmt/codeowners.go b/pkg/services/featuremgmt/codeowners.go
index 1be0dd2be2396..2a555a2906ec9 100644
--- a/pkg/services/featuremgmt/codeowners.go
+++ b/pkg/services/featuremgmt/codeowners.go
@@ -26,4 +26,5 @@ const (
 	grafanaOperatorExperienceSquad              codeowner = "@grafana/grafana-operator-experience-squad"
 	enterpriseDatasourcesSquad                  codeowner = "@grafana/enterprise-datasources"
 	grafanaSharingSquad                         codeowner = "@grafana/sharing-squad"
+	grafanaDatabasesFrontend                    codeowner = "@grafana/databases-frontend"
 )
diff --git a/pkg/services/featuremgmt/manager.go b/pkg/services/featuremgmt/manager.go
index 6e82d2936cc2c..c4e47adcc3d7b 100644
--- a/pkg/services/featuremgmt/manager.go
+++ b/pkg/services/featuremgmt/manager.go
@@ -14,13 +14,14 @@ var (
 )
 
 type FeatureManager struct {
-	isDevMod  bool
-	licensing licensing.Licensing
-	flags     map[string]*FeatureFlag
-	enabled   map[string]bool // only the "on" values
-	config    string          // path to config file
-	vars      map[string]any
-	log       log.Logger
+	isDevMod        bool
+	restartRequired bool
+	licensing       licensing.Licensing
+	flags           map[string]*FeatureFlag
+	enabled         map[string]bool // only the "on" values
+	config          string          // path to config file
+	vars            map[string]any
+	log             log.Logger
 }
 
 // This will merge the flags with the current configuration
@@ -148,6 +149,14 @@ func (fm *FeatureManager) GetFlags() []FeatureFlag {
 	return v
 }
 
+func (fm *FeatureManager) GetState() *FeatureManagerState {
+	return &FeatureManagerState{RestartRequired: fm.restartRequired}
+}
+
+func (fm *FeatureManager) SetRestartRequired() {
+	fm.restartRequired = true
+}
+
 // Check to see if a feature toggle exists by name
 func (fm *FeatureManager) LookupFlag(name string) (FeatureFlag, bool) {
 	f, ok := fm.flags[name]
diff --git a/pkg/services/featuremgmt/models.go b/pkg/services/featuremgmt/models.go
index 59c1e66cdf2aa..0666ed9a2cef8 100644
--- a/pkg/services/featuremgmt/models.go
+++ b/pkg/services/featuremgmt/models.go
@@ -127,3 +127,7 @@ type FeatureToggleDTO struct {
 	Enabled     bool   `json:"enabled"`
 	ReadOnly    bool   `json:"readOnly,omitempty"`
 }
+
+type FeatureManagerState struct {
+	RestartRequired bool `json:"restartRequired"`
+}
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 5810fdb840aa4..7d1a04917559a 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -44,8 +44,9 @@ var (
 		{
 			Name:        "publicDashboards",
 			Description: "Enables public access to dashboards",
-			Stage:       FeatureStagePublicPreview,
+			Stage:       FeatureStageGeneralAvailability,
 			Owner:       grafanaSharingSquad,
+			Expression:  "true", // enabled by default
 		},
 		{
 			Name:            "publicDashboardsEmailSharing",
@@ -85,6 +86,14 @@ var (
 			Stage:       FeatureStagePublicPreview,
 			Owner:       grafanaExploreSquad,
 		},
+		{
+			Name:         "exploreContentOutline",
+			Description:  "Content outline sidebar",
+			Stage:        FeatureStageGeneralAvailability,
+			Owner:        grafanaExploreSquad,
+			Expression:   "true", // enabled by default
+			FrontendOnly: true,
+		},
 		{
 			Name:        "datasourceQueryMultiStatus",
 			Description: "Introduce HTTP 207 Multi Status for api/ds/query",
@@ -206,8 +215,7 @@ var (
 		{
 			Name:        "cloudwatchNewRegionsHandler",
 			Description: "Refactor of /regions endpoint, no user-facing changes",
-			Stage:       FeatureStageGeneralAvailability,
-			Expression:  "true", // enabled by default
+			Stage:       FeatureStageExperimental,
 			Owner:       awsDatasourcesSquad,
 		},
 		{
@@ -236,7 +244,7 @@ var (
 		},
 		{
 			Name:         "nestedFolderPicker",
-			Description:  "Enables the new folder picker to work with nested folders. Requires the nestedFolders feature flag",
+			Description:  "Enables the new folder picker to work with nested folders. Requires the nestedFolders feature toggle",
 			Stage:        FeatureStageGeneralAvailability,
 			Owner:        grafanaFrontendPlatformSquad,
 			FrontendOnly: true,
@@ -324,19 +332,13 @@ var (
 			FrontendOnly: true,
 			Owner:        grafanaObservabilityMetricsSquad,
 		},
-		{
-			Name:         "timeSeriesTable",
-			Description:  "Enable time series table transformer & sparkline cell type",
-			Stage:        FeatureStageExperimental,
-			FrontendOnly: true,
-			Owner:        appO11ySquad,
-		},
 		{
 			Name:         "influxdbBackendMigration",
 			Description:  "Query InfluxDB InfluxQL without the proxy",
-			Stage:        FeatureStagePublicPreview,
+			Stage:        FeatureStageGeneralAvailability,
 			FrontendOnly: true,
 			Owner:        grafanaObservabilityMetricsSquad,
+			Expression:   "true", // enabled by default
 		},
 		{
 			Name:        "clientTokenRotation",
@@ -346,7 +348,7 @@ var (
 		},
 		{
 			Name:        "prometheusDataplane",
-			Description: "Changes responses to from Prometheus to be compliant with the dataplane specification. In particular it sets the numeric Field.Name from 'Value' to the value of the `__name__` label when present.",
+			Description: "Changes responses to from Prometheus to be compliant with the dataplane specification. In particular, when this feature toggle is active, the numeric `Field.Name` is set from 'Value' to the value of the `__name__` label.",
 			Expression:  "true",
 			Stage:       FeatureStageGeneralAvailability,
 			Owner:       grafanaObservabilityMetricsSquad,
@@ -431,7 +433,7 @@ var (
 		},
 		{
 			Name:            "useCachingService",
-			Description:     "When turned on, the new query and resource caching implementation using a wire service inject will be used in place of the previous middleware implementation",
+			Description:     "When active, the new query and resource caching implementation using a wire service inject replaces the previous middleware implementation.",
 			Stage:           FeatureStageGeneralAvailability,
 			Owner:           grafanaOperatorExperienceSquad,
 			RequiresRestart: true,
@@ -810,13 +812,6 @@ var (
 			RequiresDevMode: true,
 			Owner:           grafanaAuthnzSquad,
 		},
-		{
-			Name:         "alertingModifiedExport",
-			Description:  "Enables using UI for provisioned rules modification and export",
-			Stage:        FeatureStageExperimental,
-			FrontendOnly: false,
-			Owner:        grafanaAlertingSquad,
-		},
 		{
 			Name:         "panelMonitoring",
 			Description:  "Enables panel monitoring through logs and measurements",
@@ -831,6 +826,13 @@ var (
 			FrontendOnly: false,
 			Owner:        hostedGrafanaTeam,
 		},
+		{
+			Name:         "formatString",
+			Description:  "Enable format string transformer",
+			Stage:        FeatureStageExperimental,
+			FrontendOnly: true,
+			Owner:        grafanaBiSquad,
+		},
 		{
 			Name:         "transformationsVariableSupport",
 			Description:  "Allows using variables in transformations",
@@ -860,6 +862,13 @@ var (
 			Owner:           grafanaAlertingSquad,
 			RequiresRestart: true,
 		},
+		{
+			Name:         "teamHttpHeaders",
+			Description:  "Enables datasources to apply team headers to the client requests",
+			Stage:        FeatureStageExperimental,
+			FrontendOnly: false,
+			Owner:        grafanaAuthnzSquad,
+		},
 		{
 			Name:         "awsDatasourcesNewFormStyling",
 			Description:  "Applies new form styling for configuration and query editors in AWS plugins",
@@ -867,5 +876,33 @@ var (
 			FrontendOnly: true,
 			Owner:        awsDatasourcesSquad,
 		},
+		{
+			Name:         "cachingOptimizeSerializationMemoryUsage",
+			Description:  "If enabled, the caching backend gradually serializes query responses for the cache, comparing against the configured `[caching]max_value_mb` value as it goes. This can can help prevent Grafana from running out of memory while attempting to cache very large query responses.",
+			Stage:        FeatureStageExperimental,
+			Owner:        grafanaOperatorExperienceSquad,
+			FrontendOnly: false,
+		},
+		{
+			Name:            "panelTitleSearchInV1",
+			Description:     "Enable searching for dashboards using panel title in search v1",
+			RequiresDevMode: true,
+			Stage:           FeatureStageExperimental,
+			Owner:           grafanaBackendPlatformSquad,
+		},
+		{
+			Name:         "pluginsInstrumentationStatusSource",
+			Description:  "Include a status source label for plugin request metrics and logs",
+			FrontendOnly: false,
+			Stage:        FeatureStageExperimental,
+			Owner:        grafanaPluginsPlatformSquad,
+		},
+		{
+			Name:         "costManagementUi",
+			Description:  "Toggles the display of the cost management ui plugin",
+			Stage:        FeatureStageExperimental,
+			FrontendOnly: false,
+			Owner:        grafanaDatabasesFrontend,
+		},
 	}
 )
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 3c928a69c9907..3b336f4891eac 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -4,13 +4,14 @@ disableEnvelopeEncryption,GA,@grafana/grafana-as-code,false,false,false,false
 live-service-web-worker,experimental,@grafana/grafana-app-platform-squad,false,false,false,true
 queryOverLive,experimental,@grafana/grafana-app-platform-squad,false,false,false,true
 panelTitleSearch,preview,@grafana/grafana-app-platform-squad,false,false,false,false
-publicDashboards,preview,@grafana/sharing-squad,false,false,false,false
+publicDashboards,GA,@grafana/sharing-squad,false,false,false,false
 publicDashboardsEmailSharing,preview,@grafana/sharing-squad,false,true,false,false
 lokiExperimentalStreaming,experimental,@grafana/observability-logs,false,false,false,false
 featureHighlights,GA,@grafana/grafana-as-code,false,false,false,false
 migrationLocking,preview,@grafana/backend-platform,false,false,false,false
 storage,experimental,@grafana/grafana-app-platform-squad,false,false,false,false
 correlations,preview,@grafana/explore-squad,false,false,false,false
+exploreContentOutline,GA,@grafana/explore-squad,false,false,false,true
 datasourceQueryMultiStatus,experimental,@grafana/plugins-platform-backend,false,false,false,false
 traceToMetrics,experimental,@grafana/observability-traces-and-profiling,false,false,false,true
 newDBLibrary,preview,@grafana/backend-platform,false,false,false,false
@@ -28,7 +29,7 @@ entityStore,experimental,@grafana/grafana-app-platform-squad,true,false,false,fa
 cloudWatchCrossAccountQuerying,GA,@grafana/aws-datasources,false,false,false,false
 redshiftAsyncQueryDataSupport,GA,@grafana/aws-datasources,false,false,false,false
 athenaAsyncQueryDataSupport,GA,@grafana/aws-datasources,false,false,false,true
-cloudwatchNewRegionsHandler,GA,@grafana/aws-datasources,false,false,false,false
+cloudwatchNewRegionsHandler,experimental,@grafana/aws-datasources,false,false,false,false
 showDashboardValidationWarnings,experimental,@grafana/dashboards-squad,false,false,false,false
 mysqlAnsiQuotes,experimental,@grafana/backend-platform,false,false,false,false
 accessControlOnCall,preview,@grafana/grafana-authnz-team,false,false,false,false
@@ -46,8 +47,7 @@ lokiQuerySplittingConfig,experimental,@grafana/observability-logs,false,false,fa
 individualCookiePreferences,experimental,@grafana/backend-platform,false,false,false,false
 gcomOnlyExternalOrgRoleSync,GA,@grafana/grafana-authnz-team,false,false,false,false
 prometheusMetricEncyclopedia,GA,@grafana/observability-metrics,false,false,false,true
-timeSeriesTable,experimental,@grafana/app-o11y,false,false,false,true
-influxdbBackendMigration,preview,@grafana/observability-metrics,false,false,false,true
+influxdbBackendMigration,GA,@grafana/observability-metrics,false,false,false,true
 clientTokenRotation,experimental,@grafana/grafana-authnz-team,false,false,false,false
 prometheusDataplane,GA,@grafana/observability-metrics,false,false,false,false
 lokiMetricDataplane,GA,@grafana/observability-logs,false,false,false,false
@@ -115,11 +115,16 @@ httpSLOLevels,experimental,@grafana/hosted-grafana-team,false,false,true,false
 idForwarding,experimental,@grafana/grafana-authnz-team,true,false,false,false
 cloudWatchWildCardDimensionValues,GA,@grafana/aws-datasources,false,false,false,false
 externalServiceAccounts,experimental,@grafana/grafana-authnz-team,true,false,false,false
-alertingModifiedExport,experimental,@grafana/alerting-squad,false,false,false,false
 panelMonitoring,experimental,@grafana/dataviz-squad,false,false,false,true
 enableNativeHTTPHistogram,experimental,@grafana/hosted-grafana-team,false,false,false,false
+formatString,experimental,@grafana/grafana-bi-squad,false,false,false,true
 transformationsVariableSupport,experimental,@grafana/grafana-bi-squad,false,false,false,true
 kubernetesPlaylists,experimental,@grafana/grafana-app-platform-squad,false,false,false,true
 navAdminSubsections,experimental,@grafana/grafana-frontend-platform,false,false,false,false
 recoveryThreshold,experimental,@grafana/alerting-squad,false,false,true,false
+teamHttpHeaders,experimental,@grafana/grafana-authnz-team,false,false,false,false
 awsDatasourcesNewFormStyling,experimental,@grafana/aws-datasources,false,false,false,true
+cachingOptimizeSerializationMemoryUsage,experimental,@grafana/grafana-operator-experience-squad,false,false,false,false
+panelTitleSearchInV1,experimental,@grafana/backend-platform,true,false,false,false
+pluginsInstrumentationStatusSource,experimental,@grafana/plugins-platform-backend,false,false,false,false
+costManagementUi,experimental,@grafana/databases-frontend,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 3240b12583354..dc2756aec2ae4 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -55,6 +55,10 @@ const (
 	// Correlations page
 	FlagCorrelations = "correlations"
 
+	// FlagExploreContentOutline
+	// Content outline sidebar
+	FlagExploreContentOutline = "exploreContentOutline"
+
 	// FlagDatasourceQueryMultiStatus
 	// Introduce HTTP 207 Multi Status for api/ds/query
 	FlagDatasourceQueryMultiStatus = "datasourceQueryMultiStatus"
@@ -144,7 +148,7 @@ const (
 	FlagNestedFolders = "nestedFolders"
 
 	// FlagNestedFolderPicker
-	// Enables the new folder picker to work with nested folders. Requires the nestedFolders feature flag
+	// Enables the new folder picker to work with nested folders. Requires the nestedFolders feature toggle
 	FlagNestedFolderPicker = "nestedFolderPicker"
 
 	// FlagAccessTokenExpirationCheck
@@ -195,10 +199,6 @@ const (
 	// Adds the metrics explorer component to the Prometheus query builder as an option in metric select
 	FlagPrometheusMetricEncyclopedia = "prometheusMetricEncyclopedia"
 
-	// FlagTimeSeriesTable
-	// Enable time series table transformer &amp; sparkline cell type
-	FlagTimeSeriesTable = "timeSeriesTable"
-
 	// FlagInfluxdbBackendMigration
 	// Query InfluxDB InfluxQL without the proxy
 	FlagInfluxdbBackendMigration = "influxdbBackendMigration"
@@ -208,7 +208,7 @@ const (
 	FlagClientTokenRotation = "clientTokenRotation"
 
 	// FlagPrometheusDataplane
-	// Changes responses to from Prometheus to be compliant with the dataplane specification. In particular it sets the numeric Field.Name from &#39;Value&#39; to the value of the `__name__` label when present.
+	// Changes responses to from Prometheus to be compliant with the dataplane specification. In particular, when this feature toggle is active, the numeric `Field.Name` is set from &#39;Value&#39; to the value of the `__name__` label.
 	FlagPrometheusDataplane = "prometheusDataplane"
 
 	// FlagLokiMetricDataplane
@@ -260,7 +260,7 @@ const (
 	FlagRefactorVariablesTimeRange = "refactorVariablesTimeRange"
 
 	// FlagUseCachingService
-	// When turned on, the new query and resource caching implementation using a wire service inject will be used in place of the previous middleware implementation
+	// When active, the new query and resource caching implementation using a wire service inject replaces the previous middleware implementation.
 	FlagUseCachingService = "useCachingService"
 
 	// FlagEnableElasticsearchBackendQuerying
@@ -471,10 +471,6 @@ const (
 	// Automatic service account and token setup for plugins
 	FlagExternalServiceAccounts = "externalServiceAccounts"
 
-	// FlagAlertingModifiedExport
-	// Enables using UI for provisioned rules modification and export
-	FlagAlertingModifiedExport = "alertingModifiedExport"
-
 	// FlagPanelMonitoring
 	// Enables panel monitoring through logs and measurements
 	FlagPanelMonitoring = "panelMonitoring"
@@ -483,6 +479,10 @@ const (
 	// Enables native HTTP Histograms
 	FlagEnableNativeHTTPHistogram = "enableNativeHTTPHistogram"
 
+	// FlagFormatString
+	// Enable format string transformer
+	FlagFormatString = "formatString"
+
 	// FlagTransformationsVariableSupport
 	// Allows using variables in transformations
 	FlagTransformationsVariableSupport = "transformationsVariableSupport"
@@ -499,7 +499,27 @@ const (
 	// Enables feature recovery threshold (aka hysteresis) for threshold server-side expression
 	FlagRecoveryThreshold = "recoveryThreshold"
 
+	// FlagTeamHttpHeaders
+	// Enables datasources to apply team headers to the client requests
+	FlagTeamHttpHeaders = "teamHttpHeaders"
+
 	// FlagAwsDatasourcesNewFormStyling
 	// Applies new form styling for configuration and query editors in AWS plugins
 	FlagAwsDatasourcesNewFormStyling = "awsDatasourcesNewFormStyling"
+
+	// FlagCachingOptimizeSerializationMemoryUsage
+	// If enabled, the caching backend gradually serializes query responses for the cache, comparing against the configured `[caching]max_value_mb` value as it goes. This can can help prevent Grafana from running out of memory while attempting to cache very large query responses.
+	FlagCachingOptimizeSerializationMemoryUsage = "cachingOptimizeSerializationMemoryUsage"
+
+	// FlagPanelTitleSearchInV1
+	// Enable searching for dashboards using panel title in search v1
+	FlagPanelTitleSearchInV1 = "panelTitleSearchInV1"
+
+	// FlagPluginsInstrumentationStatusSource
+	// Include a status source label for plugin request metrics and logs
+	FlagPluginsInstrumentationStatusSource = "pluginsInstrumentationStatusSource"
+
+	// FlagCostManagementUi
+	// Toggles the display of the cost management ui plugin
+	FlagCostManagementUi = "costManagementUi"
 )
diff --git a/pkg/services/folder/folderimpl/folder.go b/pkg/services/folder/folderimpl/folder.go
index 6276f91bf0017..bb1d941034200 100644
--- a/pkg/services/folder/folderimpl/folder.go
+++ b/pkg/services/folder/folderimpl/folder.go
@@ -76,16 +76,35 @@ func (s *Service) DBMigration(db db.DB) {
 	err := db.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
 		var err error
 		if db.GetDialect().DriverName() == migrator.SQLite {
-			_, err = sess.Exec("INSERT OR IGNORE INTO folder (id, uid, org_id, title, created, updated) SELECT id, uid, org_id, title, created, updated FROM dashboard WHERE is_folder = 1")
+			_, err = sess.Exec(`
+				INSERT INTO folder (uid, org_id, title, created, updated)
+				SELECT uid, org_id, title, created, updated FROM dashboard WHERE is_folder = 1
+				ON CONFLICT DO UPDATE SET title=excluded.title, updated=excluded.updated
+			`)
 		} else if db.GetDialect().DriverName() == migrator.Postgres {
-			_, err = sess.Exec("INSERT INTO folder (id, uid, org_id, title, created, updated) SELECT id, uid, org_id, title, created, updated FROM dashboard WHERE is_folder = true ON CONFLICT DO NOTHING")
+			_, err = sess.Exec(`
+				INSERT INTO folder (uid, org_id, title, created, updated)
+				SELECT uid, org_id, title, created, updated FROM dashboard WHERE is_folder = true
+				ON CONFLICT(uid, org_id) DO UPDATE SET title=excluded.title, updated=excluded.updated
+			`)
 		} else {
-			_, err = sess.Exec("INSERT IGNORE INTO folder (id, uid, org_id, title, created, updated) SELECT id, uid, org_id, title, created, updated FROM dashboard WHERE is_folder = 1")
+			_, err = sess.Exec(`
+				INSERT INTO folder (uid, org_id, title, created, updated)
+				SELECT * FROM (SELECT uid, org_id, title, created, updated FROM dashboard WHERE is_folder = 1) AS derived
+				ON DUPLICATE KEY UPDATE title=derived.title, updated=derived.updated
+			`)
 		}
+		if err != nil {
+			return err
+		}
+		_, err = sess.Exec(`
+			DELETE FROM folder WHERE NOT EXISTS
+				(SELECT 1 FROM dashboard WHERE dashboard.uid = folder.uid AND dashboard.org_id = folder.org_id AND dashboard.is_folder = true)
+		`)
 		return err
 	})
 	if err != nil {
-		s.log.Error("DB migration on folder service start failed.")
+		s.log.Error("DB migration on folder service start failed.", "err", err)
 	}
 }
 
diff --git a/pkg/services/folder/folderimpl/sqlstore.go b/pkg/services/folder/folderimpl/sqlstore.go
index dee0ceedf8d8f..7bac08fe0d74c 100644
--- a/pkg/services/folder/folderimpl/sqlstore.go
+++ b/pkg/services/folder/folderimpl/sqlstore.go
@@ -166,15 +166,7 @@ func (ss *sqlStore) Get(ctx context.Context, q folder.GetFolderQuery) (*folder.F
 		case q.ID != nil:
 			exists, err = sess.SQL("SELECT * FROM folder WHERE id = ?", q.ID).Get(foldr)
 		case q.Title != nil:
-			args := []any{*q.Title, q.OrgID}
-			s := "SELECT * FROM folder WHERE title = ? AND org_id = ?"
-			if q.ParentUID != nil {
-				s = s + " AND parent_uid = ?"
-				args = append(args, *q.ParentUID)
-			} else {
-				s = s + " AND parent_uid IS NULL"
-			}
-			exists, err = sess.SQL(s, args...).Get(foldr)
+			exists, err = sess.SQL("SELECT * FROM folder WHERE title = ? AND org_id = ?", q.Title, q.OrgID).Get(foldr)
 		default:
 			return folder.ErrBadRequest.Errorf("one of ID, UID, or Title must be included in the command")
 		}
diff --git a/pkg/services/folder/folderimpl/sqlstore_test.go b/pkg/services/folder/folderimpl/sqlstore_test.go
index 82d32cd325923..21f7ba880099d 100644
--- a/pkg/services/folder/folderimpl/sqlstore_test.go
+++ b/pkg/services/folder/folderimpl/sqlstore_test.go
@@ -384,17 +384,6 @@ func TestIntegrationGet(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	// create subfolder with same title
-	subfolderUID := util.GenerateShortUID()
-	subfolder, err := folderStore.Create(context.Background(), folder.CreateFolderCommand{
-		Title:       folderTitle,
-		Description: folderDsc,
-		OrgID:       orgID,
-		UID:         subfolderUID,
-		ParentUID:   f.UID,
-	})
-	require.NoError(t, err)
-
 	t.Cleanup(func() {
 		err := folderStore.Delete(context.Background(), f.UID, orgID)
 		require.NoError(t, err)
@@ -416,14 +405,15 @@ func TestIntegrationGet(t *testing.T) {
 		assert.Equal(t, f.OrgID, ff.OrgID)
 		assert.Equal(t, f.Title, ff.Title)
 		assert.Equal(t, f.Description, ff.Description)
+		//assert.Equal(t, folder.GeneralFolderUID, ff.ParentUID)
 		assert.NotEmpty(t, ff.Created)
 		assert.NotEmpty(t, ff.Updated)
 		assert.NotEmpty(t, ff.URL)
 	})
 
-	t.Run("get folder by title should return folder under root", func(t *testing.T) {
+	t.Run("get folder by title should succeed", func(t *testing.T) {
 		ff, err := folderStore.Get(context.Background(), folder.GetFolderQuery{
-			Title: &folderTitle,
+			Title: &f.Title,
 			OrgID: orgID,
 		})
 		require.NoError(t, err)
@@ -432,30 +422,13 @@ func TestIntegrationGet(t *testing.T) {
 		assert.Equal(t, f.OrgID, ff.OrgID)
 		assert.Equal(t, f.Title, ff.Title)
 		assert.Equal(t, f.Description, ff.Description)
+		//assert.Equal(t, folder.GeneralFolderUID, ff.ParentUID)
 		assert.NotEmpty(t, ff.Created)
 		assert.NotEmpty(t, ff.Updated)
 		assert.NotEmpty(t, ff.URL)
 	})
 
-	t.Run("get folder by title and parent UID should return subfolder", func(t *testing.T) {
-		ff, err := folderStore.Get(context.Background(), folder.GetFolderQuery{
-			Title:     &folderTitle,
-			OrgID:     orgID,
-			ParentUID: &f.UID,
-		})
-		require.NoError(t, err)
-		assert.Equal(t, subfolder.ID, ff.ID)
-		assert.Equal(t, subfolder.UID, ff.UID)
-		assert.Equal(t, subfolder.OrgID, ff.OrgID)
-		assert.Equal(t, subfolder.Title, ff.Title)
-		assert.Equal(t, subfolder.Description, ff.Description)
-		assert.Equal(t, subfolder.ParentUID, ff.ParentUID)
-		assert.NotEmpty(t, subfolder.Created)
-		assert.NotEmpty(t, subfolder.Updated)
-		assert.NotEmpty(t, subfolder.URL)
-	})
-
-	t.Run("get folder by ID should succeed", func(t *testing.T) {
+	t.Run("get folder by title should succeed", func(t *testing.T) {
 		ff, err := folderStore.Get(context.Background(), folder.GetFolderQuery{
 			ID: &f.ID,
 		})
@@ -465,6 +438,7 @@ func TestIntegrationGet(t *testing.T) {
 		assert.Equal(t, f.OrgID, ff.OrgID)
 		assert.Equal(t, f.Title, ff.Title)
 		assert.Equal(t, f.Description, ff.Description)
+		//assert.Equal(t, folder.GeneralFolderUID, ff.ParentUID)
 		assert.NotEmpty(t, ff.Created)
 		assert.NotEmpty(t, ff.Updated)
 		assert.NotEmpty(t, ff.URL)
diff --git a/pkg/services/folder/model.go b/pkg/services/folder/model.go
index 13e62c196cac2..b2674134bc392 100644
--- a/pkg/services/folder/model.go
+++ b/pkg/services/folder/model.go
@@ -125,15 +125,13 @@ type DeleteFolderCommand struct {
 
 // GetFolderQuery is used for all folder Get requests. Only one of UID, ID, or
 // Title should be set; if multiple fields are set by the caller the dashboard
-// service will select the field with the most specificity, in order: UID, ID
-// Title. If Title is set, it will fetch the folder in the root folder.
-// Callers can additionally set the ParentUID field to fetch a folder by title under a specific folder.
+// service will select the field with the most specificity, in order: ID, UID,
+// Title.
 type GetFolderQuery struct {
-	UID       *string
-	ParentUID *string
-	ID        *int64
-	Title     *string
-	OrgID     int64
+	UID   *string
+	ID    *int64
+	Title *string
+	OrgID int64
 
 	SignedInUser identity.Requester `json:"-"`
 }
diff --git a/pkg/services/folder/service.go b/pkg/services/folder/service.go
index f3dda822d652e..0d7a8218651f4 100644
--- a/pkg/services/folder/service.go
+++ b/pkg/services/folder/service.go
@@ -15,10 +15,7 @@ type Service interface {
 	// GetFolder takes a GetFolderCommand and returns a folder matching the
 	// request. One of ID, UID, or Title must be included. If multiple values
 	// are included in the request, Grafana will select one in order of
-	// specificity (UID, ID,Title).
-	// If Title is set, it will fetch the folder in the root folder.
-	// If nested folders are enabled, callers can additionally set the ParentUID field
-	// to fetch a folder by title under a specific folder.
+	// specificity (ID, UID, Title).
 	Get(ctx context.Context, cmd *GetFolderQuery) (*Folder, error)
 
 	// Update is used to update a folder's UID, Title and Description. To change
diff --git a/pkg/services/grafana-apiserver/auth/authorizer/org/org_id.go b/pkg/services/grafana-apiserver/auth/authorizer/org/org_id.go
index b070af3fb68f5..fc0fc887fa53a 100644
--- a/pkg/services/grafana-apiserver/auth/authorizer/org/org_id.go
+++ b/pkg/services/grafana-apiserver/auth/authorizer/org/org_id.go
@@ -20,7 +20,10 @@ type OrgIDAuthorizer struct {
 }
 
 func ProvideOrgIDAuthorizer(orgService org.Service) *OrgIDAuthorizer {
-	return &OrgIDAuthorizer{log: log.New("grafana-apiserver.authorizer.orgid"), org: orgService}
+	return &OrgIDAuthorizer{
+		log: log.New("grafana-apiserver.authorizer.orgid"),
+		org: orgService,
+	}
 }
 
 func (auth OrgIDAuthorizer) Authorize(ctx context.Context, a authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) {
@@ -29,11 +32,26 @@ func (auth OrgIDAuthorizer) Authorize(ctx context.Context, a authorizer.Attribut
 		return authorizer.DecisionDeny, fmt.Sprintf("error getting signed in user: %v", err), nil
 	}
 
-	orgID, ok := grafanarequest.ParseOrgID(a.GetNamespace())
-	if !ok {
+	info, err := grafanarequest.ParseNamespace(a.GetNamespace())
+	if err != nil {
+		return authorizer.DecisionDeny, fmt.Sprintf("error reading namespace: %v", err), nil
+	}
+
+	// No opinion when the namespace is arbitrary
+	if info.OrgID == -1 {
 		return authorizer.DecisionNoOpinion, "", nil
 	}
 
+	if info.StackID != "" {
+		return authorizer.DecisionDeny, "using a stack namespace requires deployment with a fixed stack id", nil
+	}
+
+	// Quick check that the same org is used
+	if signedInUser.OrgID == info.OrgID {
+		return authorizer.DecisionAllow, "", nil
+	}
+
+	// Check if the user has access to the specified org
 	query := org.GetUserOrgListQuery{UserID: signedInUser.UserID}
 	result, err := auth.org.GetUserOrgList(ctx, &query)
 	if err != nil {
@@ -41,10 +59,10 @@ func (auth OrgIDAuthorizer) Authorize(ctx context.Context, a authorizer.Attribut
 	}
 
 	for _, org := range result {
-		if org.OrgID == orgID {
+		if org.OrgID == info.OrgID {
 			return authorizer.DecisionAllow, "", nil
 		}
 	}
 
-	return authorizer.DecisionDeny, fmt.Sprintf("user %d is not a member of org %d", signedInUser.UserID, orgID), nil
+	return authorizer.DecisionDeny, fmt.Sprintf("user %d is not a member of org %d", signedInUser.UserID, info.OrgID), nil
 }
diff --git a/pkg/services/grafana-apiserver/auth/authorizer/org/org_role.go b/pkg/services/grafana-apiserver/auth/authorizer/org/org_role.go
index d9d8f29f11b7d..b2571c4909a3a 100644
--- a/pkg/services/grafana-apiserver/auth/authorizer/org/org_role.go
+++ b/pkg/services/grafana-apiserver/auth/authorizer/org/org_role.go
@@ -4,22 +4,20 @@ import (
 	"context"
 	"fmt"
 
-	"k8s.io/apiserver/pkg/authorization/authorizer"
-
 	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/org"
+	"k8s.io/apiserver/pkg/authorization/authorizer"
 )
 
 var _ authorizer.Authorizer = &OrgIDAuthorizer{}
 
 type OrgRoleAuthorizer struct {
 	log log.Logger
-	org org.Service
 }
 
 func ProvideOrgRoleAuthorizer(orgService org.Service) *OrgRoleAuthorizer {
-	return &OrgRoleAuthorizer{log: log.New("grafana-apiserver.authorizer.orgrole"), org: orgService}
+	return &OrgRoleAuthorizer{log: log.New("grafana-apiserver.authorizer.orgrole")}
 }
 
 func (auth OrgRoleAuthorizer) Authorize(ctx context.Context, a authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) {
diff --git a/pkg/services/grafana-apiserver/auth/authorizer/provider.go b/pkg/services/grafana-apiserver/auth/authorizer/provider.go
index debff38df733c..306b7e4e2856f 100644
--- a/pkg/services/grafana-apiserver/auth/authorizer/provider.go
+++ b/pkg/services/grafana-apiserver/auth/authorizer/provider.go
@@ -7,16 +7,28 @@ import (
 	"k8s.io/apiserver/pkg/authorization/union"
 
 	"github.com/grafana/grafana/pkg/services/grafana-apiserver/auth/authorizer/org"
+	"github.com/grafana/grafana/pkg/services/grafana-apiserver/auth/authorizer/stack"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 func ProvideAuthorizer(
 	orgIDAuthorizer *org.OrgIDAuthorizer,
 	orgRoleAuthorizer *org.OrgRoleAuthorizer,
+	stackIDAuthorizer *stack.StackIDAuthorizer,
+	cfg *setting.Cfg,
 ) authorizer.Authorizer {
 	authorizers := []authorizer.Authorizer{
 		authorizerfactory.NewPrivilegedGroups(user.SystemPrivilegedGroup),
-		orgIDAuthorizer,
-		orgRoleAuthorizer,
 	}
+
+	// In Hosted grafana, the StackID replaces the orgID as a valid namespace
+	if cfg.StackID != "" {
+		authorizers = append(authorizers, stackIDAuthorizer)
+	} else {
+		authorizers = append(authorizers, orgIDAuthorizer)
+	}
+
+	authorizers = append(authorizers, orgRoleAuthorizer)
+
 	return union.New(authorizers...)
 }
diff --git a/pkg/services/grafana-apiserver/auth/authorizer/stack/stack_id.go b/pkg/services/grafana-apiserver/auth/authorizer/stack/stack_id.go
new file mode 100644
index 0000000000000..86b3acb008dca
--- /dev/null
+++ b/pkg/services/grafana-apiserver/auth/authorizer/stack/stack_id.go
@@ -0,0 +1,56 @@
+package stack
+
+import (
+	"context"
+	"fmt"
+
+	"k8s.io/apiserver/pkg/authorization/authorizer"
+
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/infra/log"
+	grafanarequest "github.com/grafana/grafana/pkg/services/grafana-apiserver/endpoints/request"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+var _ authorizer.Authorizer = &StackIDAuthorizer{}
+
+type StackIDAuthorizer struct {
+	log     log.Logger
+	stackID string
+}
+
+func ProvideStackIDAuthorizer(cfg *setting.Cfg) *StackIDAuthorizer {
+	return &StackIDAuthorizer{
+		log:     log.New("grafana-apiserver.authorizer.stackid"),
+		stackID: cfg.StackID, // this lets a single tenant grafana validate stack id (rather than orgs)
+	}
+}
+
+func (auth StackIDAuthorizer) Authorize(ctx context.Context, a authorizer.Attributes) (authorized authorizer.Decision, reason string, err error) {
+	signedInUser, err := appcontext.User(ctx)
+	if err != nil {
+		return authorizer.DecisionDeny, fmt.Sprintf("error getting signed in user: %v", err), nil
+	}
+
+	info, err := grafanarequest.ParseNamespace(a.GetNamespace())
+	if err != nil {
+		return authorizer.DecisionDeny, fmt.Sprintf("error reading namespace: %v", err), nil
+	}
+
+	// No opinion when the namespace is arbitrary
+	if info.OrgID == -1 {
+		return authorizer.DecisionNoOpinion, "", nil
+	}
+
+	if info.StackID != auth.stackID {
+		return authorizer.DecisionDeny, "wrong stack id is selected", nil
+	}
+	if info.OrgID != 1 {
+		return authorizer.DecisionDeny, "cloud instance requires org 1", nil
+	}
+	if signedInUser.OrgID != 1 {
+		return authorizer.DecisionDeny, "user must be in org 1", nil
+	}
+
+	return authorizer.DecisionAllow, "", nil
+}
diff --git a/pkg/services/grafana-apiserver/auth/authorizer/stack/wireset.go b/pkg/services/grafana-apiserver/auth/authorizer/stack/wireset.go
new file mode 100644
index 0000000000000..fe1a183c79f00
--- /dev/null
+++ b/pkg/services/grafana-apiserver/auth/authorizer/stack/wireset.go
@@ -0,0 +1,7 @@
+package stack
+
+import "github.com/google/wire"
+
+var WireSet = wire.NewSet(
+	ProvideStackIDAuthorizer,
+)
diff --git a/pkg/services/grafana-apiserver/auth/authorizer/wireset.go b/pkg/services/grafana-apiserver/auth/authorizer/wireset.go
index 5216c1d57ccc1..ae2d31200a3e0 100644
--- a/pkg/services/grafana-apiserver/auth/authorizer/wireset.go
+++ b/pkg/services/grafana-apiserver/auth/authorizer/wireset.go
@@ -4,9 +4,11 @@ import (
 	"github.com/google/wire"
 
 	"github.com/grafana/grafana/pkg/services/grafana-apiserver/auth/authorizer/org"
+	"github.com/grafana/grafana/pkg/services/grafana-apiserver/auth/authorizer/stack"
 )
 
 var WireSet = wire.NewSet(
 	org.WireSet,
+	stack.WireSet,
 	ProvideAuthorizer,
 )
diff --git a/pkg/services/grafana-apiserver/config.go b/pkg/services/grafana-apiserver/config.go
new file mode 100644
index 0000000000000..3287718c9714e
--- /dev/null
+++ b/pkg/services/grafana-apiserver/config.go
@@ -0,0 +1,38 @@
+package grafanaapiserver
+
+import (
+	"fmt"
+	"path/filepath"
+
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+type config struct {
+	enabled bool
+	devMode bool
+
+	host        string
+	appURL      string
+	etcdServers []string
+	dataPath    string
+
+	logLevel int
+}
+
+func newConfig(cfg *setting.Cfg) *config {
+	defaultLogLevel := 0
+	if cfg.Env == setting.Dev {
+		defaultLogLevel = 10
+	}
+
+	return &config{
+		enabled:     cfg.IsFeatureToggleEnabled(featuremgmt.FlagGrafanaAPIServer),
+		devMode:     cfg.Env == setting.Dev,
+		dataPath:    filepath.Join(cfg.DataPath, "grafana-apiserver"),
+		host:        fmt.Sprintf("%s:%s", cfg.HTTPAddr, cfg.HTTPPort),
+		logLevel:    cfg.SectionWithEnvOverrides("grafana-apiserver").Key("log_level").MustInt(defaultLogLevel),
+		etcdServers: cfg.SectionWithEnvOverrides("grafana-apiserver").Key("etcd_servers").Strings(","),
+		appURL:      cfg.AppURL,
+	}
+}
diff --git a/pkg/services/grafana-apiserver/config_test.go b/pkg/services/grafana-apiserver/config_test.go
new file mode 100644
index 0000000000000..dfd4e68ca1c57
--- /dev/null
+++ b/pkg/services/grafana-apiserver/config_test.go
@@ -0,0 +1,36 @@
+package grafanaapiserver
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+func TestNewConfig(t *testing.T) {
+	cfg := setting.NewCfg()
+	cfg.Env = setting.Dev
+	cfg.DataPath = "/tmp/grafana"
+	cfg.HTTPAddr = "test"
+	cfg.HTTPPort = "4000"
+	cfg.IsFeatureToggleEnabled = func(_ string) bool { return true }
+	cfg.AppURL = "http://test:4000"
+
+	section := cfg.Raw.Section("grafana-apiserver")
+	section.Key("log_level").SetValue("5")
+	section.Key("etcd_servers").SetValue("http://localhost:2379")
+
+	actual := newConfig(cfg)
+
+	expected := &config{
+		enabled:     true,
+		devMode:     true,
+		etcdServers: []string{"http://localhost:2379"},
+		appURL:      "http://test:4000",
+		host:        "test:4000",
+		dataPath:    "/tmp/grafana/grafana-apiserver",
+		logLevel:    5,
+	}
+	require.Equal(t, expected, actual)
+}
diff --git a/pkg/services/grafana-apiserver/endpoints/request/request.go b/pkg/services/grafana-apiserver/endpoints/request/request.go
index df8994bccb641..1c12b0f789396 100644
--- a/pkg/services/grafana-apiserver/endpoints/request/request.go
+++ b/pkg/services/grafana-apiserver/endpoints/request/request.go
@@ -2,25 +2,58 @@ package request
 
 import (
 	"context"
+	"fmt"
 	"strconv"
+	"strings"
 
 	"k8s.io/apiserver/pkg/endpoints/request"
 )
 
-func OrgIDFrom(ctx context.Context) (int64, bool) {
-	ns := request.NamespaceValue(ctx)
-	return ParseOrgID(ns)
+type NamespaceInfo struct {
+	// OrgID defined in namespace (1 when using stack ids)
+	OrgID int64
+
+	// The cloud stack ID (must match the value in cfg.Settings)
+	StackID string
+
+	// The original namespace string regardless the input
+	Value string
+}
+
+func NamespaceInfoFrom(ctx context.Context, requireOrgID bool) (NamespaceInfo, error) {
+	info, err := ParseNamespace(request.NamespaceValue(ctx))
+	if err == nil && requireOrgID && info.OrgID < 1 {
+		return info, fmt.Errorf("expected valid orgId")
+	}
+	return info, err
 }
 
-func ParseOrgID(ns string) (int64, bool) {
-	if len(ns) < 5 || ns[:4] != "org-" {
-		return 0, false
+func ParseNamespace(ns string) (NamespaceInfo, error) {
+	info := NamespaceInfo{Value: ns, OrgID: -1}
+	if ns == "default" {
+		info.OrgID = 1
+		return info, nil
 	}
 
-	orgID, err := strconv.Atoi(ns[4:])
-	if err != nil {
-		return 0, false
+	if strings.HasPrefix(ns, "org-") {
+		id, err := strconv.Atoi(ns[4:])
+		if id < 1 {
+			return info, fmt.Errorf("invalid org id")
+		}
+		if id == 1 {
+			return info, fmt.Errorf("use default rather than org-1")
+		}
+		info.OrgID = int64(id)
+		return info, err
 	}
 
-	return int64(orgID), true
+	if strings.HasPrefix(ns, "stack-") {
+		info.StackID = ns[6:]
+		if len(info.StackID) < 2 {
+			return info, fmt.Errorf("invalid stack id")
+		}
+		info.OrgID = 1
+		return info, nil
+	}
+	return info, nil
 }
diff --git a/pkg/services/grafana-apiserver/endpoints/request/request_test.go b/pkg/services/grafana-apiserver/endpoints/request/request_test.go
index 76a81346d4f3a..d38f9bd6b5fac 100644
--- a/pkg/services/grafana-apiserver/endpoints/request/request_test.go
+++ b/pkg/services/grafana-apiserver/endpoints/request/request_test.go
@@ -1,61 +1,127 @@
 package request_test
 
 import (
-	"context"
 	"testing"
 
-	"k8s.io/apiserver/pkg/endpoints/request"
-
 	grafanarequest "github.com/grafana/grafana/pkg/services/grafana-apiserver/endpoints/request"
 )
 
-func TestOrgIDFrom(t *testing.T) {
+func TestParseNamespace(t *testing.T) {
 	tests := []struct {
-		name     string
-		ctx      context.Context
-		expected int64
-		ok       bool
+		name      string
+		namespace string
+		expected  grafanarequest.NamespaceInfo
+		expectErr bool
 	}{
 		{
-			name:     "empty namespace",
-			ctx:      context.Background(),
-			expected: 0,
-			ok:       false,
+			name: "empty namespace",
+			expected: grafanarequest.NamespaceInfo{
+				OrgID: -1,
+			},
+		},
+		{
+			name:      "incorrect number of parts",
+			namespace: "org-123-a",
+			expectErr: true,
+			expected: grafanarequest.NamespaceInfo{
+				OrgID: -1,
+			},
+		},
+		{
+			name:      "org id not a number",
+			namespace: "org-invalid",
+			expectErr: true,
+			expected: grafanarequest.NamespaceInfo{
+				OrgID: -1,
+			},
+		},
+		{
+			name:      "valid org id",
+			namespace: "org-123",
+			expected: grafanarequest.NamespaceInfo{
+				OrgID: 123,
+			},
+		},
+		{
+			name:      "org should not be 1 in the namespace",
+			namespace: "org-1",
+			expectErr: true,
+			expected: grafanarequest.NamespaceInfo{
+				OrgID: -1,
+			},
 		},
 		{
-			name:     "incorrect number of parts",
-			ctx:      request.WithNamespace(context.Background(), "org-123-a"),
-			expected: 0,
-			ok:       false,
+			name:      "can not be negative",
+			namespace: "org--5",
+			expectErr: true,
+			expected: grafanarequest.NamespaceInfo{
+				OrgID: -1,
+			},
 		},
 		{
-			name:     "incorrect prefix",
-			ctx:      request.WithNamespace(context.Background(), "abc-123"),
-			expected: 0,
-			ok:       false,
+			name:      "can not be zero",
+			namespace: "org-0",
+			expectErr: true,
+			expected: grafanarequest.NamespaceInfo{
+				OrgID: -1,
+			},
 		},
 		{
-			name:     "org id not a number",
-			ctx:      request.WithNamespace(context.Background(), "org-invalid"),
-			expected: 0,
-			ok:       false,
+			name:      "default is org 1",
+			namespace: "default",
+			expected: grafanarequest.NamespaceInfo{
+				OrgID: 1,
+			},
 		},
 		{
-			name:     "valid org id",
-			ctx:      request.WithNamespace(context.Background(), "org-123"),
-			expected: 123,
-			ok:       true,
+			name:      "valid stack",
+			namespace: "stack-abcdef",
+			expected: grafanarequest.NamespaceInfo{
+				OrgID:   1,
+				StackID: "abcdef",
+			},
+		},
+		{
+			name:      "invalid stack id",
+			namespace: "stack-",
+			expectErr: true,
+			expected: grafanarequest.NamespaceInfo{
+				OrgID: -1,
+			},
+		},
+		{
+			name:      "invalid stack id (too short)",
+			namespace: "stack-1",
+			expectErr: true,
+			expected: grafanarequest.NamespaceInfo{
+				OrgID:   -1,
+				StackID: "1",
+			},
+		},
+		{
+			name:      "other namespace",
+			namespace: "anything",
+			expected: grafanarequest.NamespaceInfo{
+				OrgID: -1,
+				Value: "anything",
+			},
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			actual, ok := grafanarequest.OrgIDFrom(tt.ctx)
-			if actual != tt.expected {
-				t.Errorf("OrgIDFrom() returned %d, expected %d", actual, tt.expected)
+			info, err := grafanarequest.ParseNamespace(tt.namespace)
+			if tt.expectErr != (err != nil) {
+				t.Errorf("ParseNamespace() returned %+v, expected an error", info)
+			}
+			if info.OrgID != tt.expected.OrgID {
+				t.Errorf("ParseNamespace() [OrgID] returned %d, expected %d", info.OrgID, tt.expected.OrgID)
+			}
+			if info.StackID != tt.expected.StackID {
+				t.Errorf("ParseNamespace() [StackID] returned %s, expected %s", info.StackID, tt.expected.StackID)
 			}
-			if ok != tt.ok {
-				t.Errorf("OrgIDFrom() returned %t, expected %t", ok, tt.ok)
+			if info.Value != tt.namespace {
+				t.Errorf("ParseNamespace() [Value] returned %s, expected %s", info.Value, tt.namespace)
 			}
 		})
 	}
diff --git a/pkg/services/grafana-apiserver/log.go b/pkg/services/grafana-apiserver/log.go
index 2f2d137b9ca33..ff1e6705565d6 100644
--- a/pkg/services/grafana-apiserver/log.go
+++ b/pkg/services/grafana-apiserver/log.go
@@ -10,11 +10,12 @@ import (
 var _ logr.LogSink = (*logAdapter)(nil)
 
 type logAdapter struct {
-	log log.Logger
+	level int
+	log   log.Logger
 }
 
-func newLogAdapter() *logAdapter {
-	return &logAdapter{log: log.New("k8s.apiserver")}
+func newLogAdapter(level int) *logAdapter {
+	return &logAdapter{log: log.New("grafana-apiserver"), level: level}
 }
 
 func (l *logAdapter) WithName(name string) logr.LogSink {
@@ -28,19 +29,21 @@ func (l *logAdapter) WithValues(keysAndValues ...any) logr.LogSink {
 }
 
 func (l *logAdapter) Init(_ logr.RuntimeInfo) {
-	// TODO: shrug emoji
+	// we aren't using the logr library for logging, so this is a no-op
 }
 
 func (l *logAdapter) Enabled(level int) bool {
-	return level <= 5
+	return level <= l.level
 }
 
 func (l *logAdapter) Info(level int, msg string, keysAndValues ...any) {
 	msg = strings.TrimSpace(msg)
-	if level < 1 {
+	// kubernetes uses level 0 for critical messages, so map that to Info
+	if level == 0 {
 		l.log.Info(msg, keysAndValues...)
 		return
 	}
+	// every other level is mapped to Debug
 	l.log.Debug(msg, keysAndValues...)
 }
 
diff --git a/pkg/services/grafana-apiserver/service.go b/pkg/services/grafana-apiserver/service.go
index ea5fe1ad186cd..a142c094cb5a2 100644
--- a/pkg/services/grafana-apiserver/service.go
+++ b/pkg/services/grafana-apiserver/service.go
@@ -37,7 +37,6 @@ import (
 	"github.com/grafana/grafana/pkg/modules"
 	"github.com/grafana/grafana/pkg/registry"
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
 )
@@ -91,11 +90,9 @@ type RestConfigProvider interface {
 type service struct {
 	*services.BasicService
 
-	restConfig   *clientrest.Config
-	etcd_servers []string
+	config     *config
+	restConfig *clientrest.Config
 
-	enabled   bool
-	dataPath  string
 	stopCh    chan struct{}
 	stoppedCh chan error
 
@@ -112,13 +109,11 @@ func ProvideService(
 	authz authorizer.Authorizer,
 ) (*service, error) {
 	s := &service{
-		etcd_servers: cfg.SectionWithEnvOverrides("grafana-apiserver").Key("etcd_servers").Strings(","),
-		enabled:      cfg.IsFeatureToggleEnabled(featuremgmt.FlagGrafanaAPIServer),
-		rr:           rr,
-		dataPath:     path.Join(cfg.DataPath, "k8s"),
-		stopCh:       make(chan struct{}),
-		builders:     []APIGroupBuilder{},
-		authorizer:   authz,
+		config:     newConfig(cfg),
+		rr:         rr,
+		stopCh:     make(chan struct{}),
+		builders:   []APIGroupBuilder{},
+		authorizer: authz,
 	}
 
 	// This will be used when running as a dskit service
@@ -155,7 +150,7 @@ func (s *service) GetRestConfig() *clientrest.Config {
 }
 
 func (s *service) IsDisabled() bool {
-	return !s.enabled
+	return !s.config.enabled
 }
 
 // Run is an adapter for the BackgroundService interface.
@@ -171,15 +166,14 @@ func (s *service) RegisterAPI(builder APIGroupBuilder) {
 }
 
 func (s *service) start(ctx context.Context) error {
-	logger := logr.New(newLogAdapter())
-	logger.V(9)
+	logger := logr.New(newLogAdapter(s.config.logLevel))
 	klog.SetLoggerWithOptions(logger, klog.ContextualLogger(true))
 
 	o := options.NewRecommendedOptions("", unstructured.UnstructuredJSONScheme)
 	o.SecureServing.BindPort = 6443
 	o.Authentication.RemoteKubeConfigFileOptional = true
 	o.Authorization.RemoteKubeConfigFileOptional = true
-	o.Etcd.StorageConfig.Transport.ServerList = s.etcd_servers
+	o.Etcd.StorageConfig.Transport.ServerList = s.config.etcdServers
 
 	o.Admission = nil
 	o.CoreAPI = nil
@@ -189,7 +183,7 @@ func (s *service) start(ctx context.Context) error {
 
 	// Get the util to get the paths to pre-generated certs
 	certUtil := certgenerator.CertUtil{
-		K8sDataPath: s.dataPath,
+		K8sDataPath: s.config.dataPath,
 	}
 
 	if err := certUtil.InitializeCACertPKI(); err != nil {
@@ -356,7 +350,7 @@ func (s *service) writeKubeConfiguration(restConfig *clientrest.Config) error {
 		CurrentContext: "default-context",
 		AuthInfos:      authinfos,
 	}
-	return clientcmd.WriteToFile(clientConfig, path.Join(s.dataPath, "grafana.kubeconfig"))
+	return clientcmd.WriteToFile(clientConfig, path.Join(s.config.dataPath, "grafana.kubeconfig"))
 }
 
 func newAuthenticator(cert *x509.Certificate) (authenticator.Request, error) {
diff --git a/pkg/services/navtree/models.go b/pkg/services/navtree/models.go
index 1054d87802e45..800cc62d56ac5 100644
--- a/pkg/services/navtree/models.go
+++ b/pkg/services/navtree/models.go
@@ -90,7 +90,9 @@ func (root *NavTreeRoot) RemoveSection(node *NavLink) {
 func (root *NavTreeRoot) FindById(id string) *NavLink {
 	return FindById(root.Children, id)
 }
-
+func (root *NavTreeRoot) FindByURL(url string) *NavLink {
+	return FindByURL(root.Children, url)
+}
 func (root *NavTreeRoot) Sort() {
 	Sort(root.Children)
 }
@@ -192,6 +194,26 @@ func (root *NavTreeRoot) ApplyAdminIA(navAdminSubsectionsEnabled bool) {
 				authenticationNode.IsSection = true
 				adminNodeLinks = append(adminNodeLinks, authenticationNode)
 			}
+
+			costManagementNode := root.FindById("plugin-page-grafana-costmanagementui-app")
+
+			if costManagementNode != nil {
+				adminNodeLinks = append(adminNodeLinks, costManagementNode)
+			}
+
+			costManagementMetricsNode := root.FindByURL("/a/grafana-costmanagementui-app/metrics")
+			adaptiveMetricsNode := root.FindById("plugin-page-grafana-adaptive-metrics-app")
+
+			if costManagementMetricsNode != nil && adaptiveMetricsNode != nil {
+				costManagementMetricsNode.Children = append(costManagementMetricsNode.Children, adaptiveMetricsNode)
+			}
+
+			costManagementLogsNode := root.FindByURL("/a/grafana-costmanagementui-app/logs")
+			logVolumeExplorerNode := root.FindById("plugin-page-grafana-logvolumeexplorer-app")
+
+			if costManagementLogsNode != nil && logVolumeExplorerNode != nil {
+				costManagementLogsNode.Children = append(costManagementLogsNode.Children, logVolumeExplorerNode)
+			}
 		} else {
 			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("datasources"))
 			adminNodeLinks = AppendIfNotNil(adminNodeLinks, root.FindById("plugins"))
@@ -245,3 +267,17 @@ func FindById(nodes []*NavLink, id string) *NavLink {
 
 	return nil
 }
+
+func FindByURL(nodes []*NavLink, url string) *NavLink {
+	for _, child := range nodes {
+		if child.Url == url {
+			return child
+		} else if len(child.Children) > 0 {
+			if found := FindByURL(child.Children, url); found != nil {
+				return found
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/pkg/services/navtree/models_test.go b/pkg/services/navtree/models_test.go
index dfdc5560c7061..0d6df4cc64845 100644
--- a/pkg/services/navtree/models_test.go
+++ b/pkg/services/navtree/models_test.go
@@ -33,4 +33,15 @@ func TestNavTreeRoot(t *testing.T) {
 		require.Equal(t, "1", treeRoot.Children[0].Id)
 		require.Equal(t, "4", treeRoot.Children[1].Id)
 	})
+	t.Run("FindByURL is able to find a navItem by url", func(t *testing.T) {
+		treeRoot := NavTreeRoot{
+			Children: []*NavLink{
+				{Id: "1", Url: "/"},
+				{Id: "2", Url: "/org"},
+				{Id: "3", Url: "/org/users"},
+			},
+		}
+		require.Equal(t, "2", treeRoot.FindByURL("/org").Id)
+		require.Equal(t, "3", treeRoot.FindByURL("/org/users").Id)
+	})
 }
diff --git a/pkg/services/navtree/navtreeimpl/applinks.go b/pkg/services/navtree/navtreeimpl/applinks.go
index fe1ac0e994c17..15f3f2f8b4aea 100644
--- a/pkg/services/navtree/navtreeimpl/applinks.go
+++ b/pkg/services/navtree/navtreeimpl/applinks.go
@@ -262,10 +262,18 @@ func (s *ServiceImpl) readNavigationSettings() {
 		"grafana-incident-app":             {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 2, Text: "Incidents"},
 		"grafana-ml-app":                   {SectionID: navtree.NavIDAlertsAndIncidents, SortWeight: 3, Text: "Machine Learning"},
 		"grafana-cloud-link-app":           {SectionID: navtree.NavIDCfg},
+		"grafana-costmanagementui-app":     {SectionID: navtree.NavIDCfg, Text: "Cost management"},
 		"grafana-easystart-app":            {SectionID: navtree.NavIDRoot, SortWeight: navtree.WeightApps + 1, Text: "Connections", Icon: "adjust-circle"},
 		"k6-app":                           {SectionID: navtree.NavIDRoot, SortWeight: navtree.WeightAlertsAndIncidents + 1, Text: "Performance testing", Icon: "k6"},
 	}
 
+	if s.features.IsEnabled(featuremgmt.FlagNavAdminSubsections) && s.features.IsEnabled(featuremgmt.FlagCostManagementUi) {
+		// if cost management is enabled we want to nest adaptive metrics and log volume explorer under that plugin
+		// in the admin section
+		s.navigationAppConfig["grafana-adaptive-metrics-app"] = NavigationAppConfig{SectionID: navtree.NavIDCfg}
+		s.navigationAppConfig["grafana-logvolumeexplorer-app"] = NavigationAppConfig{SectionID: navtree.NavIDCfg}
+	}
+
 	s.navigationAppPathConfig = map[string]NavigationAppConfig{
 		"/a/grafana-auth-app": {SectionID: navtree.NavIDCfg, SortWeight: 7},
 	}
diff --git a/pkg/services/navtree/navtreeimpl/applinks_test.go b/pkg/services/navtree/navtreeimpl/applinks_test.go
index 6d19b8cf67b7d..a877638fd6b1b 100644
--- a/pkg/services/navtree/navtreeimpl/applinks_test.go
+++ b/pkg/services/navtree/navtreeimpl/applinks_test.go
@@ -360,7 +360,8 @@ func TestAddAppLinks(t *testing.T) {
 func TestReadingNavigationSettings(t *testing.T) {
 	t.Run("Should include defaults", func(t *testing.T) {
 		service := ServiceImpl{
-			cfg: setting.NewCfg(),
+			cfg:      setting.NewCfg(),
+			features: featuremgmt.WithFeatures(),
 		}
 
 		_, _ = service.cfg.Raw.NewSection("navigation.app_sections")
@@ -371,7 +372,8 @@ func TestReadingNavigationSettings(t *testing.T) {
 
 	t.Run("Can add additional overrides via ini system", func(t *testing.T) {
 		service := ServiceImpl{
-			cfg: setting.NewCfg(),
+			cfg:      setting.NewCfg(),
+			features: featuremgmt.WithFeatures(),
 		}
 
 		appSections, _ := service.cfg.Raw.NewSection("navigation.app_sections")
diff --git a/pkg/services/ngalert/api/api_provisioning.go b/pkg/services/ngalert/api/api_provisioning.go
index bd825349c2863..edfb8b1b248bb 100644
--- a/pkg/services/ngalert/api/api_provisioning.go
+++ b/pkg/services/ngalert/api/api_provisioning.go
@@ -548,22 +548,26 @@ func exportHcl(download bool, body definitions.AlertingFileExport) response.Resp
 			Body: &gr,
 		})
 	}
+	for idx, cp := range body.ContactPoints {
+		upd, err := ContactPointFromContactPointExport(cp)
+		if err != nil {
+			return response.Error(http.StatusInternalServerError, "failed to convert contact points to HCL", err)
+		}
+		resources = append(resources, hcl.Resource{
+			Type: "grafana_contact_point",
+			Name: fmt.Sprintf("contact_point_%d", idx),
+			Body: &upd,
+		})
+	}
 
-	// TODO implement support.
-	// for idx, cp := range ex.ContactPoints {
-	// 	resources = append(resources, resourceBlock{
-	// 		Type: "grafana_contact_point",
-	// 		Name: fmt.Sprintf("contact_point_%d", idx),
-	// 		Body: &cp,
-	// 	})
-	// }
-	// for idx, cp := range ex.Policies {
-	// 	resources = append(resources, resourceBlock{
-	// 		Type: "grafana_notification_policy",
-	// 		Name: fmt.Sprintf("notification_policy_%d", idx),
-	// 		Body: &cp,
-	// 	})
-	//
+	for idx, cp := range body.Policies {
+		policy := cp.Policy
+		resources = append(resources, hcl.Resource{
+			Type: "grafana_notification_policy",
+			Name: fmt.Sprintf("notification_policy_%d", idx+1),
+			Body: policy,
+		})
+	}
 
 	hclBody, err := hcl.Encode(resources...)
 	if err != nil {
diff --git a/pkg/services/ngalert/api/api_provisioning_test.go b/pkg/services/ngalert/api/api_provisioning_test.go
index 5128072c0396f..e067861b5d38c 100644
--- a/pkg/services/ngalert/api/api_provisioning_test.go
+++ b/pkg/services/ngalert/api/api_provisioning_test.go
@@ -1134,6 +1134,21 @@ func TestProvisioningApi(t *testing.T) {
 				require.Equal(t, 200, response.Status())
 				require.Equal(t, expectedResponse, string(response.Body()))
 			})
+
+			t.Run("hcl body content is as expected", func(t *testing.T) {
+				sut := createProvisioningSrvSut(t)
+				sut.policies = createFakeNotificationPolicyService()
+				rc := createTestRequestCtx()
+
+				rc.Context.Req.Form.Add("format", "hcl")
+				expectedResponse := "resource \"grafana_notification_policy\" \"notification_policy_1\" {\n  contact_point = \"default-receiver\"\n  group_by      = [\"g1\", \"g2\"]\n\n  policy {\n    contact_point = \"nested-receiver\"\n    group_by      = [\"g3\", \"g4\"]\n\n    matcher {\n      label = \"foo\"\n      match = \"=\"\n      value = \"bar\"\n    }\n\n    mute_timings    = [\"interval\"]\n    continue        = true\n    group_wait      = \"5m\"\n    group_interval  = \"5m\"\n    repeat_interval = \"5m\"\n  }\n\n  group_wait      = \"30s\"\n  group_interval  = \"5m\"\n  repeat_interval = \"1h\"\n}\n"
+
+				response := sut.RouteGetPolicyTreeExport(&rc)
+
+				t.Log(string(response.Body()))
+				require.Equal(t, 200, response.Status())
+				require.Equal(t, expectedResponse, string(response.Body()))
+			})
 		})
 	})
 }
diff --git a/pkg/services/ngalert/api/compat.go b/pkg/services/ngalert/api/compat.go
index 899609a7dc3a1..8a901c6de1a1c 100644
--- a/pkg/services/ngalert/api/compat.go
+++ b/pkg/services/ngalert/api/compat.go
@@ -281,18 +281,36 @@ func AlertingFileExportFromRoute(orgID int64, route definitions.Route) (definiti
 
 // RouteExportFromRoute creates a definitions.RouteExport DTO from definitions.Route.
 func RouteExportFromRoute(route *definitions.Route) *definitions.RouteExport {
+	toStringIfNotNil := func(d *model.Duration) *string {
+		if d == nil {
+			return nil
+		}
+		s := d.String()
+		return &s
+	}
+
+	matchers := make([]*definitions.MatcherExport, 0, len(route.ObjectMatchers))
+	for _, matcher := range route.ObjectMatchers {
+		matchers = append(matchers, &definitions.MatcherExport{
+			Label: matcher.Name,
+			Match: matcher.Type.String(),
+			Value: matcher.Value,
+		})
+	}
+
 	export := definitions.RouteExport{
-		Receiver:          route.Receiver,
-		GroupByStr:        route.GroupByStr,
-		Match:             route.Match,
-		MatchRE:           route.MatchRE,
-		Matchers:          route.Matchers,
-		ObjectMatchers:    route.ObjectMatchers,
-		MuteTimeIntervals: route.MuteTimeIntervals,
-		Continue:          route.Continue,
-		GroupWait:         route.GroupWait,
-		GroupInterval:     route.GroupInterval,
-		RepeatInterval:    route.RepeatInterval,
+		Receiver:            route.Receiver,
+		GroupByStr:          NilIfEmpty(util.Pointer(route.GroupByStr)),
+		Match:               route.Match,
+		MatchRE:             route.MatchRE,
+		Matchers:            route.Matchers,
+		ObjectMatchers:      route.ObjectMatchers,
+		ObjectMatchersSlice: matchers,
+		MuteTimeIntervals:   NilIfEmpty(util.Pointer(route.MuteTimeIntervals)),
+		Continue:            OmitDefault(util.Pointer(route.Continue)),
+		GroupWait:           toStringIfNotNil(route.GroupWait),
+		GroupInterval:       toStringIfNotNil(route.GroupInterval),
+		RepeatInterval:      toStringIfNotNil(route.RepeatInterval),
 	}
 
 	if len(route.Routes) > 0 {
@@ -304,3 +322,23 @@ func RouteExportFromRoute(route *definitions.Route) *definitions.RouteExport {
 
 	return &export
 }
+
+// OmitDefault returns nil if the value is the default.
+func OmitDefault[T comparable](v *T) *T {
+	var def T
+	if v == nil {
+		return v
+	}
+	if *v == def {
+		return nil
+	}
+	return v
+}
+
+// NilIfEmpty returns nil if pointer to slice points to the empty slice.
+func NilIfEmpty[T any](v *[]T) *[]T {
+	if v == nil || len(*v) == 0 {
+		return nil
+	}
+	return v
+}
diff --git a/pkg/services/ngalert/api/compat_contact_points.go b/pkg/services/ngalert/api/compat_contact_points.go
new file mode 100644
index 0000000000000..b6afc5f83df10
--- /dev/null
+++ b/pkg/services/ngalert/api/compat_contact_points.go
@@ -0,0 +1,446 @@
+package api
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"strings"
+	"unsafe"
+
+	"github.com/grafana/alerting/notify"
+	"github.com/grafana/alerting/receivers"
+	jsoniter "github.com/json-iterator/go"
+	"github.com/modern-go/reflect2"
+
+	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+// ContactPointFromContactPointExport parses the database model of the contact point (group of integrations) where settings are represented in JSON,
+// to strongly typed ContactPoint.
+func ContactPointFromContactPointExport(rawContactPoint definitions.ContactPointExport) (definitions.ContactPoint, error) {
+	j := jsoniter.ConfigCompatibleWithStandardLibrary
+	j.RegisterExtension(&contactPointsExtension{})
+
+	contactPoint := definitions.ContactPoint{
+		Name: rawContactPoint.Name,
+	}
+	var errs []error
+	for _, rawIntegration := range rawContactPoint.Receivers {
+		err := parseIntegration(j, &contactPoint, rawIntegration.Type, rawIntegration.DisableResolveMessage, json.RawMessage(rawIntegration.Settings))
+		if err != nil {
+			// accumulate errors to report all at once.
+			errs = append(errs, fmt.Errorf("failed to parse %s integration (uid:%s): %w", rawIntegration.Type, rawIntegration.UID, err))
+		}
+	}
+	return contactPoint, errors.Join(errs...)
+}
+
+// ContactPointToContactPointExport converts definitions.ContactPoint to notify.APIReceiver.
+// It uses special extension for json-iterator API that properly handles marshalling of some specific fields.
+//
+//nolint:gocyclo
+func ContactPointToContactPointExport(cp definitions.ContactPoint) (notify.APIReceiver, error) {
+	j := jsoniter.ConfigCompatibleWithStandardLibrary
+	// use json iterator with custom extension that has special codec for some field.
+	// This is needed to keep the API models clean and convert from database model
+	j.RegisterExtension(&contactPointsExtension{})
+
+	var integration []*notify.GrafanaIntegrationConfig
+
+	var errs []error
+	for _, i := range cp.Alertmanager {
+		el, err := marshallIntegration(j, "prometheus-alertmanager", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Dingding {
+		el, err := marshallIntegration(j, "dingding", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Discord {
+		el, err := marshallIntegration(j, "discord", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Email {
+		el, err := marshallIntegration(j, "email", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Googlechat {
+		el, err := marshallIntegration(j, "googlechat", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Kafka {
+		el, err := marshallIntegration(j, "kafka", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Line {
+		el, err := marshallIntegration(j, "line", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Opsgenie {
+		el, err := marshallIntegration(j, "opsgenie", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Pagerduty {
+		el, err := marshallIntegration(j, "pagerduty", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.OnCall {
+		el, err := marshallIntegration(j, "oncall", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Pushover {
+		el, err := marshallIntegration(j, "pushover", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Sensugo {
+		el, err := marshallIntegration(j, "sensugo", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Slack {
+		el, err := marshallIntegration(j, "slack", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Teams {
+		el, err := marshallIntegration(j, "teams", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Telegram {
+		el, err := marshallIntegration(j, "telegram", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Threema {
+		el, err := marshallIntegration(j, "threema", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Victorops {
+		el, err := marshallIntegration(j, "victorops", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Webhook {
+		el, err := marshallIntegration(j, "webhook", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Wecom {
+		el, err := marshallIntegration(j, "wecom", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	for _, i := range cp.Webex {
+		el, err := marshallIntegration(j, "webex", i, i.DisableResolveMessage)
+		integration = append(integration, el)
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+	if len(errs) > 0 {
+		return notify.APIReceiver{}, errors.Join(errs...)
+	}
+	contactPoint := notify.APIReceiver{
+		ConfigReceiver:      notify.ConfigReceiver{Name: cp.Name},
+		GrafanaIntegrations: notify.GrafanaIntegrations{Integrations: integration},
+	}
+	return contactPoint, nil
+}
+
+// marshallIntegration converts the API model integration to the storage model that contains settings in the JSON format.
+// The secret fields are not encrypted.
+func marshallIntegration(json jsoniter.API, integrationType string, integration interface{}, disableResolveMessage *bool) (*notify.GrafanaIntegrationConfig, error) {
+	data, err := json.Marshal(integration)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshall integration '%s' to JSON: %w", integrationType, err)
+	}
+	e := &notify.GrafanaIntegrationConfig{
+		Type:     integrationType,
+		Settings: data,
+	}
+	if disableResolveMessage != nil {
+		e.DisableResolveMessage = *disableResolveMessage
+	}
+	return e, nil
+}
+
+//nolint:gocyclo
+func parseIntegration(json jsoniter.API, result *definitions.ContactPoint, receiverType string, disableResolveMessage bool, data json.RawMessage) error {
+	var err error
+	var disable *bool
+	if disableResolveMessage { // populate only if true
+		disable = util.Pointer(disableResolveMessage)
+	}
+	switch strings.ToLower(receiverType) {
+	case "prometheus-alertmanager":
+		integration := definitions.AlertmanagerIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Alertmanager = append(result.Alertmanager, integration)
+		}
+	case "dingding":
+		integration := definitions.DingdingIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Dingding = append(result.Dingding, integration)
+		}
+	case "discord":
+		integration := definitions.DiscordIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Discord = append(result.Discord, integration)
+		}
+	case "email":
+		integration := definitions.EmailIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Email = append(result.Email, integration)
+		}
+	case "googlechat":
+		integration := definitions.GooglechatIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Googlechat = append(result.Googlechat, integration)
+		}
+	case "kafka":
+		integration := definitions.KafkaIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Kafka = append(result.Kafka, integration)
+		}
+	case "line":
+		integration := definitions.LineIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Line = append(result.Line, integration)
+		}
+	case "opsgenie":
+		integration := definitions.OpsgenieIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Opsgenie = append(result.Opsgenie, integration)
+		}
+	case "pagerduty":
+		integration := definitions.PagerdutyIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Pagerduty = append(result.Pagerduty, integration)
+		}
+	case "oncall":
+		integration := definitions.OnCallIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.OnCall = append(result.OnCall, integration)
+		}
+	case "pushover":
+		integration := definitions.PushoverIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Pushover = append(result.Pushover, integration)
+		}
+	case "sensugo":
+		integration := definitions.SensugoIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Sensugo = append(result.Sensugo, integration)
+		}
+	case "slack":
+		integration := definitions.SlackIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Slack = append(result.Slack, integration)
+		}
+	case "teams":
+		integration := definitions.TeamsIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Teams = append(result.Teams, integration)
+		}
+	case "telegram":
+		integration := definitions.TelegramIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Telegram = append(result.Telegram, integration)
+		}
+	case "threema":
+		integration := definitions.ThreemaIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Threema = append(result.Threema, integration)
+		}
+	case "victorops":
+		integration := definitions.VictoropsIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Victorops = append(result.Victorops, integration)
+		}
+	case "webhook":
+		integration := definitions.WebhookIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Webhook = append(result.Webhook, integration)
+		}
+	case "wecom":
+		integration := definitions.WecomIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Wecom = append(result.Wecom, integration)
+		}
+	case "webex":
+		integration := definitions.WebexIntegration{DisableResolveMessage: disable}
+		if err = json.Unmarshal(data, &integration); err == nil {
+			result.Webex = append(result.Webex, integration)
+		}
+	default:
+		err = fmt.Errorf("integration %s is not supported", receiverType)
+	}
+	return err
+}
+
+// contactPointsExtension extends jsoniter with special codecs for some integrations' fields that are encoded differently in the legacy configuration.
+type contactPointsExtension struct {
+	jsoniter.DummyExtension
+}
+
+func (c contactPointsExtension) UpdateStructDescriptor(structDescriptor *jsoniter.StructDescriptor) {
+	if structDescriptor.Type == reflect2.TypeOf(definitions.EmailIntegration{}) {
+		bind := structDescriptor.GetField("Addresses")
+		codec := &emailAddressCodec{}
+		bind.Decoder = codec
+		bind.Encoder = codec
+	}
+	if structDescriptor.Type == reflect2.TypeOf(definitions.PushoverIntegration{}) {
+		codec := &numberAsStringCodec{}
+		for _, field := range []string{"AlertingPriority", "OKPriority"} {
+			desc := structDescriptor.GetField(field)
+			desc.Decoder = codec
+			desc.Encoder = codec
+		}
+		// the same logic is in the pushover.NewConfig in alerting module
+		codec = &numberAsStringCodec{ignoreError: true}
+		for _, field := range []string{"Retry", "Expire"} {
+			desc := structDescriptor.GetField(field)
+			desc.Decoder = codec
+			desc.Encoder = codec
+		}
+	}
+	if structDescriptor.Type == reflect2.TypeOf(definitions.WebhookIntegration{}) {
+		codec := &numberAsStringCodec{ignoreError: true}
+		desc := structDescriptor.GetField("MaxAlerts")
+		desc.Decoder = codec
+		desc.Encoder = codec
+	}
+	if structDescriptor.Type == reflect2.TypeOf(definitions.OnCallIntegration{}) {
+		codec := &numberAsStringCodec{ignoreError: true}
+		desc := structDescriptor.GetField("MaxAlerts")
+		desc.Decoder = codec
+		desc.Encoder = codec
+	}
+}
+
+type emailAddressCodec struct{}
+
+func (d *emailAddressCodec) IsEmpty(ptr unsafe.Pointer) bool {
+	f := *(*[]string)(ptr)
+	return len(f) == 0
+}
+
+func (d *emailAddressCodec) Encode(ptr unsafe.Pointer, stream *jsoniter.Stream) {
+	f := *(*[]string)(ptr)
+	addresses := strings.Join(f, ";")
+	stream.WriteString(addresses)
+}
+
+func (d *emailAddressCodec) Decode(ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+	s := iter.ReadString()
+	emails := strings.FieldsFunc(strings.Trim(s, "\""), func(r rune) bool {
+		switch r {
+		case ',', ';', '\n':
+			return true
+		}
+		return false
+	})
+	*((*[]string)(ptr)) = emails
+}
+
+// converts a string representation of a number to *int64
+type numberAsStringCodec struct {
+	ignoreError bool // if true, then ignores the error and keeps value nil
+}
+
+func (d *numberAsStringCodec) IsEmpty(ptr unsafe.Pointer) bool {
+	return *((*(*int))(ptr)) == nil
+}
+
+func (d *numberAsStringCodec) Encode(ptr unsafe.Pointer, stream *jsoniter.Stream) {
+	val := *((*(*int))(ptr))
+	if val == nil {
+		stream.WriteNil()
+		return
+	}
+	stream.WriteInt(*val)
+}
+
+func (d *numberAsStringCodec) Decode(ptr unsafe.Pointer, iter *jsoniter.Iterator) {
+	valueType := iter.WhatIsNext()
+	var value int64
+	switch valueType {
+	case jsoniter.NumberValue:
+		value = iter.ReadInt64()
+	case jsoniter.StringValue:
+		var num receivers.OptionalNumber
+		err := num.UnmarshalJSON(iter.ReadStringAsSlice())
+		if err != nil {
+			iter.ReportError("numberAsStringCodec", fmt.Sprintf("failed to unmarshall string as OptionalNumber: %s", err.Error()))
+		}
+		if num.String() == "" {
+			return
+		}
+		value, err = num.Int64()
+		if err != nil {
+			if !d.ignoreError {
+				iter.ReportError("numberAsStringCodec", fmt.Sprintf("string does not represent an integer number: %s", err.Error()))
+			}
+			return
+		}
+	case jsoniter.NilValue:
+		iter.ReadNil()
+		return
+	default:
+		iter.ReportError("numberAsStringCodec", "not number or string")
+	}
+	*((*(*int64))(ptr)) = &value
+}
diff --git a/pkg/services/ngalert/api/compat_contact_points_test.go b/pkg/services/ngalert/api/compat_contact_points_test.go
new file mode 100644
index 0000000000000..8700212edbade
--- /dev/null
+++ b/pkg/services/ngalert/api/compat_contact_points_test.go
@@ -0,0 +1,187 @@
+package api
+
+import (
+	"context"
+	"encoding/base64"
+	"strings"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/grafana/alerting/notify"
+	receiversTesting "github.com/grafana/alerting/receivers/testing"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/ngalert/provisioning"
+)
+
+// Test that conversion notify.APIReceiver -> definitions.ContactPoint -> notify.APIReceiver does not lose data
+func TestContactPointFromContactPointExports(t *testing.T) {
+	getContactPointExport := func(t *testing.T, receiver *notify.APIReceiver) definitions.ContactPointExport {
+		export := make([]definitions.ReceiverExport, 0, len(receiver.Integrations))
+		for _, integrationConfig := range receiver.Integrations {
+			postable := &definitions.PostableGrafanaReceiver{
+				UID:                   integrationConfig.UID,
+				Name:                  integrationConfig.Name,
+				Type:                  integrationConfig.Type,
+				DisableResolveMessage: integrationConfig.DisableResolveMessage,
+				Settings:              definitions.RawMessage(integrationConfig.Settings),
+				SecureSettings:        integrationConfig.SecureSettings,
+			}
+			emb, err := provisioning.PostableGrafanaReceiverToEmbeddedContactPoint(
+				postable,
+				models.ProvenanceNone,
+				func(s string) string { // test configs are not encrypted but encoded
+					d, err := base64.StdEncoding.DecodeString(s)
+					require.NoError(t, err)
+					return string(d)
+				})
+			require.NoError(t, err)
+			ex, err := ReceiverExportFromEmbeddedContactPoint(emb)
+			require.NoError(t, err)
+			export = append(export, ex)
+		}
+
+		return definitions.ContactPointExport{
+			OrgID:     1,
+			Name:      receiver.Name,
+			Receivers: export,
+		}
+	}
+
+	// use the configs for testing because they have all fields supported by integrations
+	for integrationType, cfg := range notify.AllKnownConfigsForTesting {
+		t.Run(integrationType, func(t *testing.T) {
+			recCfg := &notify.APIReceiver{
+				ConfigReceiver: notify.ConfigReceiver{Name: "test-receiver"},
+				GrafanaIntegrations: notify.GrafanaIntegrations{
+					Integrations: []*notify.GrafanaIntegrationConfig{
+						cfg.GetRawNotifierConfig("test"),
+					},
+				},
+			}
+
+			expected, err := notify.BuildReceiverConfiguration(context.Background(), recCfg, func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string {
+				return receiversTesting.DecryptForTesting(sjd)(key, fallback)
+			})
+			require.NoError(t, err)
+
+			result, err := ContactPointFromContactPointExport(getContactPointExport(t, recCfg))
+			require.NoError(t, err)
+
+			back, err := ContactPointToContactPointExport(result)
+			require.NoError(t, err)
+
+			actual, err := notify.BuildReceiverConfiguration(context.Background(), &back, func(ctx context.Context, sjd map[string][]byte, key string, fallback string) string {
+				return receiversTesting.DecryptForTesting(sjd)(key, fallback)
+			})
+			require.NoError(t, err)
+
+			diff := cmp.Diff(expected, actual, cmp.FilterPath(func(path cmp.Path) bool {
+				return strings.Contains(path.String(), "Metadata.UID") ||
+					strings.Contains(path.String(), "Metadata.Name") ||
+					strings.Contains(path.String(), "WecomConfigs.Settings.EndpointURL") // This field is not exposed to user
+			}, cmp.Ignore()))
+			if len(diff) != 0 {
+				require.Failf(t, "The re-marshalled configuration does not match the expected one", diff)
+			}
+		})
+	}
+
+	t.Run("pushover optional numbers as string", func(t *testing.T) {
+		export := definitions.ContactPointExport{
+			Name: "test",
+			Receivers: []definitions.ReceiverExport{
+				{
+					Type: "pushover",
+					Settings: definitions.RawMessage(
+						`{
+						"priority": 1,
+						"okPriority": "2",
+						"expire": null,
+						"retry": "invalid"
+					}`),
+				},
+			},
+		}
+		result, err := ContactPointFromContactPointExport(export)
+		require.NoError(t, err)
+		require.Len(t, result.Pushover, 1)
+		require.Equal(t, int64(1), *result.Pushover[0].AlertingPriority)
+		require.Equal(t, int64(2), *result.Pushover[0].OKPriority)
+		require.Nil(t, result.Pushover[0].Expire)
+		require.Nil(t, result.Pushover[0].Retry)
+	})
+	t.Run("email with multiple addresses", func(t *testing.T) {
+		export := definitions.ContactPointExport{
+			Name: "test",
+			Receivers: []definitions.ReceiverExport{
+				{
+					Type:     "email",
+					Settings: definitions.RawMessage(`{"addresses": "test@grafana.com,test2@grafana.com;test3@grafana.com\ntest4@granafa.com"}`),
+				},
+			},
+		}
+		result, err := ContactPointFromContactPointExport(export)
+		require.NoError(t, err)
+		require.Len(t, result.Email, 1)
+		require.EqualValues(t, []string{
+			"test@grafana.com",
+			"test2@grafana.com",
+			"test3@grafana.com",
+			"test4@granafa.com",
+		}, result.Email[0].Addresses)
+	})
+	t.Run("webhook with optional numbers as string", func(t *testing.T) {
+		export := definitions.ContactPointExport{
+			Name: "test",
+			Receivers: []definitions.ReceiverExport{
+				{
+					Type:     "webhook",
+					Settings: definitions.RawMessage(`{ "maxAlerts" : "112" }`),
+				},
+				{
+					Type:     "webhook",
+					Settings: definitions.RawMessage(`{ "maxAlerts" : "test" }`),
+				},
+				{
+					Type:     "webhook",
+					Settings: definitions.RawMessage(`{ "maxAlerts" : null }`),
+				},
+			},
+		}
+		result, err := ContactPointFromContactPointExport(export)
+		require.NoError(t, err)
+		require.Len(t, result.Webhook, 3)
+		require.Equal(t, int64(112), *result.Webhook[0].MaxAlerts)
+		require.Nil(t, result.Webhook[1].MaxAlerts)
+		require.Nil(t, result.Webhook[2].MaxAlerts)
+	})
+
+	t.Run("oncall with optional numbers as string", func(t *testing.T) {
+		export := definitions.ContactPointExport{
+			Name: "test",
+			Receivers: []definitions.ReceiverExport{
+				{
+					Type:     "oncall",
+					Settings: definitions.RawMessage(`{ "maxAlerts" : "112" }`),
+				},
+				{
+					Type:     "oncall",
+					Settings: definitions.RawMessage(`{ "maxAlerts" : "test" }`),
+				},
+				{
+					Type:     "oncall",
+					Settings: definitions.RawMessage(`{ "maxAlerts" : null }`),
+				},
+			},
+		}
+		result, err := ContactPointFromContactPointExport(export)
+		require.NoError(t, err)
+		require.Len(t, result.OnCall, 3)
+		require.Equal(t, int64(112), *result.OnCall[0].MaxAlerts)
+		require.Nil(t, result.OnCall[1].MaxAlerts)
+		require.Nil(t, result.OnCall[2].MaxAlerts)
+	})
+}
diff --git a/pkg/services/ngalert/api/tooling/definitions/contact_points.go b/pkg/services/ngalert/api/tooling/definitions/contact_points.go
new file mode 100644
index 0000000000000..3f484be097f27
--- /dev/null
+++ b/pkg/services/ngalert/api/tooling/definitions/contact_points.go
@@ -0,0 +1,284 @@
+package definitions
+
+// This file contains API models of integrations that are supported by Grafana Managed Alerts.
+// The models below match the Config models described in the module github.com/grafana/alerting, package 'receivers/**'
+// as well as models described in Grafana Terraform Provider.
+// Currently, they are used only for export to HCL but in the future we expand their scope.
+// The consistency between  models in the alerting module and this file is enforced by unit-tests.
+
+//
+// 1. JSON tags are used for unmarshalling from the definitions.PostableGrafanaReceiver.Settings.
+// 2. YAML tags are not used but kept while copying of models from the alerting module
+// 3. Each integration struct contains field 'DisableResolveMessage'. In Terraform provider the field is on the same level as the settings.
+//    Currently, HCL encoder does not support composition of structures or generic ones. This can be change after https://github.com/hashicorp/hcl/issues/290 is solved.
+// 4. Sensitive fields have type Secret. Currently, this is done for information purpose and is not used anywhere.
+
+// A string that contain sensitive information.
+type Secret string // TODO implement masking fields when models are used
+
+type AlertmanagerIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"` // TODO change when https://github.com/hashicorp/hcl/issues/290 is fixed
+
+	URL      string  `json:"url" yaml:"url" hcl:"url"`
+	User     *string `json:"basicAuthUser,omitempty" yaml:"basicAuthUser,omitempty" hcl:"basic_auth_user"`
+	Password *Secret `json:"basicAuthPassword,omitempty" yaml:"basicAuthPassword,omitempty" hcl:"basic_auth_password"`
+}
+
+type DingdingIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	URL         string  `json:"url,omitempty" yaml:"url,omitempty" hcl:"url"`
+	MessageType *string `json:"msgType,omitempty" yaml:"msgType,omitempty" hcl:"message_type"`
+	Title       *string `json:"title,omitempty" yaml:"title,omitempty" hcl:"title"`
+	Message     *string `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"`
+}
+
+type DiscordIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	WebhookURL         Secret  `json:"url" yaml:"url" hcl:"url"`
+	Title              *string `json:"title,omitempty" yaml:"title,omitempty" hcl:"title"`
+	Message            *string `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"`
+	AvatarURL          *string `json:"avatar_url,omitempty" yaml:"avatar_url,omitempty" hcl:"avatar_url"`
+	UseDiscordUsername *bool   `json:"use_discord_username,omitempty" yaml:"use_discord_username,omitempty" hcl:"use_discord_username"`
+}
+
+type EmailIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	Addresses []string `json:"addresses" yaml:"addresses" hcl:"addresses"`
+
+	SingleEmail *bool   `json:"singleEmail,omitempty" yaml:"singleEmail,omitempty" hcl:"single_email"`
+	Message     *string `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"`
+	Subject     *string `json:"subject,omitempty" yaml:"subject,omitempty" hcl:"subject"`
+}
+
+type GooglechatIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	URL string `json:"url" yaml:"url" hcl:"url"`
+
+	Title   *string `json:"title,omitempty" yaml:"title,omitempty" hcl:"title"`
+	Message *string `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"`
+}
+
+type KafkaIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	Endpoint Secret `json:"kafkaRestProxy" yaml:"kafkaRestProxy" hcl:"rest_proxy_url"`
+	Topic    string `json:"kafkaTopic" yaml:"kafkaTopic" hcl:"topic"`
+
+	Description    *string `json:"description,omitempty" yaml:"description,omitempty" hcl:"description"`
+	Details        *string `json:"details,omitempty" yaml:"details,omitempty" hcl:"details"`
+	Username       *string `json:"username,omitempty" yaml:"username,omitempty" hcl:"username"`
+	Password       *Secret `json:"password,omitempty" yaml:"password,omitempty" hcl:"password"`
+	APIVersion     *string `json:"apiVersion,omitempty" yaml:"apiVersion,omitempty" hcl:"api_version"`
+	KafkaClusterID *string `json:"kafkaClusterId,omitempty" yaml:"kafkaClusterId,omitempty" hcl:"cluster_id"`
+}
+
+type LineIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	Token Secret `json:"token" yaml:"token" hcl:"token"`
+
+	Title       *string `json:"title,omitempty" yaml:"title,omitempty" hcl:"title"`
+	Description *string `json:"description,omitempty" yaml:"description,omitempty" hcl:"description"`
+}
+
+type OnCallIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	URL string `json:"url" yaml:"url" hcl:"url"`
+
+	HTTPMethod               *string `json:"httpMethod,omitempty" yaml:"httpMethod,omitempty" hcl:"http_method"`
+	MaxAlerts                *int64  `json:"maxAlerts,omitempty" yaml:"maxAlerts,omitempty" hcl:"max_alerts"`
+	AuthorizationScheme      *string `json:"authorization_scheme,omitempty" yaml:"authorization_scheme,omitempty" hcl:"authorization_scheme"`
+	AuthorizationCredentials *Secret `json:"authorization_credentials,omitempty" yaml:"authorization_credentials,omitempty" hcl:"authorization_credentials"`
+	User                     *string `json:"username,omitempty" yaml:"username,omitempty" hcl:"basic_auth_user"`
+	Password                 *Secret `json:"password,omitempty" yaml:"password,omitempty" hcl:"basic_auth_password"`
+	Title                    *string `json:"title,omitempty" yaml:"title,omitempty" hcl:"title"`
+	Message                  *string `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"`
+}
+
+type OpsgenieIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	APIKey Secret `json:"apiKey" yaml:"apiKey" hcl:"api_key"`
+
+	APIUrl           *string `json:"apiUrl,omitempty" yaml:"apiUrl,omitempty" hcl:"url"`
+	Message          *string `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"`
+	Description      *string `json:"description,omitempty" yaml:"description,omitempty" hcl:"description"`
+	AutoClose        *bool   `json:"autoClose,omitempty" yaml:"autoClose,omitempty" hcl:"auto_close"`
+	OverridePriority *bool   `json:"overridePriority,omitempty" yaml:"overridePriority,omitempty" hcl:"override_priority"`
+	SendTagsAs       *string `json:"sendTagsAs,omitempty" yaml:"sendTagsAs,omitempty" hcl:"send_tags_as"`
+}
+
+type PagerdutyIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	Key Secret `json:"integrationKey" yaml:"integrationKey" hcl:"integration_key"`
+
+	Severity  *string            `json:"severity,omitempty" yaml:"severity,omitempty" hcl:"severity"`
+	Class     *string            `json:"class,omitempty" yaml:"class,omitempty" hcl:"class"`
+	Component *string            `json:"component,omitempty" yaml:"component,omitempty" hcl:"component"`
+	Group     *string            `json:"group,omitempty" yaml:"group,omitempty" hcl:"group"`
+	Summary   *string            `json:"summary,omitempty" yaml:"summary,omitempty" hcl:"summary"`
+	Source    *string            `json:"source,omitempty" yaml:"source,omitempty" hcl:"source"`
+	Client    *string            `json:"client,omitempty" yaml:"client,omitempty" hcl:"client"`
+	ClientURL *string            `json:"client_url,omitempty" yaml:"client_url,omitempty" hcl:"client_url"`
+	Details   *map[string]string `json:"details,omitempty" yaml:"details,omitempty" hcl:"details"`
+}
+
+type PushoverIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	UserKey  Secret `json:"userKey" yaml:"userKey" hcl:"user_key"`
+	APIToken Secret `json:"apiToken" yaml:"apiToken" hcl:"api_token"`
+
+	AlertingPriority *int64  `json:"priority,omitempty" yaml:"priority,omitempty" hcl:"priority"`
+	OKPriority       *int64  `json:"okPriority,omitempty" yaml:"okPriority,omitempty" hcl:"ok_priority"`
+	Retry            *int64  `json:"retry,omitempty" yaml:"retry,omitempty" hcl:"retry"`
+	Expire           *int64  `json:"expire,omitempty" yaml:"expire,omitempty" hcl:"expire"`
+	Device           *string `json:"device,omitempty" yaml:"device,omitempty" hcl:"device"`
+	AlertingSound    *string `json:"sound,omitempty" yaml:"sound,omitempty" hcl:"sound"`
+	OKSound          *string `json:"okSound,omitempty" yaml:"okSound,omitempty" hcl:"ok_sound"`
+	Title            *string `json:"title,omitempty" yaml:"title,omitempty" hcl:"title"`
+	Message          *string `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"`
+	UploadImage      *bool   `json:"uploadImage,omitempty" yaml:"uploadImage,omitempty" hcl:"upload_image"`
+}
+
+type SensugoIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	URL    string `json:"url" yaml:"url" hcl:"url"`
+	APIKey Secret `json:"apikey" yaml:"apikey" hcl:"api_key"`
+
+	Entity    *string `json:"entity,omitempty" yaml:"entity,omitempty" hcl:"entity"`
+	Check     *string `json:"check,omitempty" yaml:"check,omitempty" hcl:"check"`
+	Namespace *string `json:"namespace,omitempty" yaml:"namespace,omitempty" hcl:"namespace"`
+	Handler   *string `json:"handler,omitempty" yaml:"handler,omitempty" hcl:"handler"`
+	Message   *string `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"`
+}
+
+type SlackIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	EndpointURL    *string `json:"endpointUrl,omitempty" yaml:"endpointUrl,omitempty" hcl:"endpoint_url"`
+	URL            *Secret `json:"url,omitempty" yaml:"url,omitempty" hcl:"url"`
+	Token          *Secret `json:"token,omitempty" yaml:"token,omitempty" hcl:"token"`
+	Recipient      *string `json:"recipient,omitempty" yaml:"recipient,omitempty" hcl:"recipient"`
+	Text           *string `json:"text,omitempty" yaml:"text,omitempty" hcl:"text"`
+	Title          *string `json:"title,omitempty" yaml:"title,omitempty" hcl:"title"`
+	Username       *string `json:"username,omitempty" yaml:"username,omitempty" hcl:"username"`
+	IconEmoji      *string `json:"icon_emoji,omitempty" yaml:"icon_emoji,omitempty" hcl:"icon_emoji"`
+	IconURL        *string `json:"icon_url,omitempty" yaml:"icon_url,omitempty" hcl:"icon_url"`
+	MentionChannel *string `json:"mentionChannel,omitempty" yaml:"mentionChannel,omitempty" hcl:"mention_channel"`
+	MentionUsers   *string `json:"mentionUsers,omitempty" yaml:"mentionUsers,omitempty" hcl:"mention_users"`
+	MentionGroups  *string `json:"mentionGroups,omitempty" yaml:"mentionGroups,omitempty" hcl:"mention_groups"`
+}
+
+type TelegramIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	BotToken Secret `json:"bottoken" yaml:"bottoken" hcl:"token"`
+	ChatID   string `json:"chatid,omitempty" yaml:"chatid,omitempty" hcl:"chat_id"`
+
+	Message               *string `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"`
+	ParseMode             *string `json:"parse_mode,omitempty" yaml:"parse_mode,omitempty" hcl:"parse_mode"`
+	DisableWebPagePreview *bool   `json:"disable_web_page_preview,omitempty" yaml:"disable_web_page_preview,omitempty" hcl:"disable_web_page_preview"`
+	ProtectContent        *bool   `json:"protect_content,omitempty" yaml:"protect_content,omitempty" hcl:"protect_content"`
+	DisableNotifications  *bool   `json:"disable_notifications,omitempty" yaml:"disable_notifications,omitempty" hcl:"disable_notifications"`
+}
+
+type TeamsIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	URL Secret `json:"url,omitempty" yaml:"url,omitempty" hcl:"url"`
+
+	Message      *string `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"`
+	Title        *string `json:"title,omitempty" yaml:"title,omitempty" hcl:"title"`
+	SectionTitle *string `json:"sectiontitle,omitempty" yaml:"sectiontitle,omitempty" hcl:"section_title"`
+}
+
+type ThreemaIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	GatewayID   string `json:"gateway_id" yaml:"gateway_id" hcl:"gateway_id"`
+	RecipientID string `json:"recipient_id" yaml:"recipient_id" hcl:"recipient_id"`
+	APISecret   Secret `json:"api_secret" yaml:"api_secret" hcl:"api_secret"`
+
+	Title       *string `json:"title,omitempty" yaml:"title,omitempty" hcl:"title"`
+	Description *string `json:"description,omitempty" yaml:"description,omitempty" hcl:"description"`
+}
+
+type VictoropsIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	URL string `json:"url" yaml:"url" hcl:"url"`
+
+	MessageType *string `json:"messageType,omitempty" yaml:"messageType,omitempty" hcl:"message_type"`
+	Title       *string `json:"title,omitempty" yaml:"title,omitempty" hcl:"title"`
+	Description *string `json:"description,omitempty" yaml:"description,omitempty" hcl:"description"`
+}
+
+type WebexIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	Token Secret `json:"bot_token" yaml:"bot_token" hcl:"token"`
+
+	APIURL  *string `json:"api_url,omitempty" yaml:"api_url,omitempty" hcl:"api_url"`
+	Message *string `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"`
+	RoomID  *string `json:"room_id,omitempty" yaml:"room_id,omitempty" hcl:"room_id"`
+}
+
+type WebhookIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	URL string `json:"url" yaml:"url" hcl:"url"`
+
+	HTTPMethod               *string `json:"httpMethod,omitempty" yaml:"httpMethod,omitempty" hcl:"http_method"`
+	MaxAlerts                *int64  `json:"maxAlerts,omitempty" yaml:"maxAlerts,omitempty" hcl:"max_alerts"`
+	AuthorizationScheme      *string `json:"authorization_scheme,omitempty" yaml:"authorization_scheme,omitempty" hcl:"authorization_scheme"`
+	AuthorizationCredentials *Secret `json:"authorization_credentials,omitempty" yaml:"authorization_credentials,omitempty" hcl:"authorization_credentials"`
+	User                     *string `json:"username,omitempty" yaml:"username,omitempty" hcl:"basic_auth_user"`
+	Password                 *Secret `json:"password,omitempty" yaml:"password,omitempty" hcl:"basic_auth_password"`
+	Title                    *string `json:"title,omitempty" yaml:"title,omitempty" hcl:"title"`
+	Message                  *string `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"`
+}
+
+type WecomIntegration struct {
+	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
+
+	URL     *Secret `json:"url,omitempty" yaml:"url,omitempty" hcl:"url"`
+	Secret  *Secret `json:"secret,omitempty" yaml:"secret,omitempty" hcl:"secret"`
+	AgentID *string `json:"agent_id,omitempty" yaml:"agent_id,omitempty" hcl:"agent_id"`
+	CorpID  *string `json:"corp_id,omitempty" yaml:"corp_id,omitempty" hcl:"corp_id"`
+	Message *string `json:"message,omitempty" yaml:"message,omitempty" hcl:"message"`
+	Title   *string `json:"title,omitempty" yaml:"title,omitempty" hcl:"title"`
+	MsgType *string `json:"msgtype,omitempty" yaml:"msgtype,omitempty" hcl:"msg_type"`
+	ToUser  *string `json:"touser,omitempty" yaml:"touser,omitempty" hcl:"to_user"`
+}
+
+type ContactPoint struct {
+	Name         string                    `json:"name" yaml:"name" hcl:"name"`
+	Alertmanager []AlertmanagerIntegration `json:"alertmanager" yaml:"alertmanager" hcl:"alertmanager,block"`
+	Dingding     []DingdingIntegration     `json:"dingding" yaml:"dingding" hcl:"dingding,block"`
+	Discord      []DiscordIntegration      `json:"discord" yaml:"discord" hcl:"discord,block"`
+	Email        []EmailIntegration        `json:"email" yaml:"email" hcl:"email,block"`
+	Googlechat   []GooglechatIntegration   `json:"googlechat" yaml:"googlechat" hcl:"googlechat,block"`
+	Kafka        []KafkaIntegration        `json:"kafka" yaml:"kafka" hcl:"kafka,block"`
+	Line         []LineIntegration         `json:"line" yaml:"line" hcl:"line,block"`
+	Opsgenie     []OpsgenieIntegration     `json:"opsgenie" yaml:"opsgenie" hcl:"opsgenie,block"`
+	Pagerduty    []PagerdutyIntegration    `json:"pagerduty" yaml:"pagerduty" hcl:"pagerduty,block"`
+	OnCall       []OnCallIntegration       `json:"oncall" yaml:"oncall" hcl:"oncall,block"`
+	Pushover     []PushoverIntegration     `json:"pushover" yaml:"pushover" hcl:"pushover,block"`
+	Sensugo      []SensugoIntegration      `json:"sensugo" yaml:"sensugo" hcl:"sensugo,block"`
+	Slack        []SlackIntegration        `json:"slack" yaml:"slack" hcl:"slack,block"`
+	Teams        []TeamsIntegration        `json:"teams" yaml:"teams" hcl:"teams,block"`
+	Telegram     []TelegramIntegration     `json:"telegram" yaml:"telegram" hcl:"telegram,block"`
+	Threema      []ThreemaIntegration      `json:"threema" yaml:"threema" hcl:"threema,block"`
+	Victorops    []VictoropsIntegration    `json:"victorops" yaml:"victorops" hcl:"victorops,block"`
+	Webhook      []WebhookIntegration      `json:"webhook" yaml:"webhook" hcl:"webhook,block"`
+	Wecom        []WecomIntegration        `json:"wecom" yaml:"wecom" hcl:"wecom,block"`
+	Webex        []WebexIntegration        `json:"webex" yaml:"webex" hcl:"webex,block"`
+}
diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_policies.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_policies.go
index 697fa1937a252..480339895ee44 100644
--- a/pkg/services/ngalert/api/tooling/definitions/provisioning_policies.go
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_policies.go
@@ -2,7 +2,6 @@ package definitions
 
 import (
 	"github.com/prometheus/alertmanager/config"
-	"github.com/prometheus/common/model"
 )
 
 // swagger:route GET /api/v1/provisioning/policies provisioning stable RouteGetPolicyTree
@@ -58,20 +57,27 @@ type NotificationPolicyExport struct {
 // RouteExport is the provisioned file export of definitions.Route. This is needed to hide fields that aren't useable in
 // provisioning file format. An alternative would be to define a custom MarshalJSON and MarshalYAML that excludes them.
 type RouteExport struct {
-	Receiver string `yaml:"receiver,omitempty" json:"receiver,omitempty"`
+	Receiver string `yaml:"receiver,omitempty" json:"receiver,omitempty" hcl:"contact_point"`
 
-	GroupByStr []string `yaml:"group_by,omitempty" json:"group_by,omitempty"`
+	GroupByStr *[]string `yaml:"group_by,omitempty" json:"group_by,omitempty" hcl:"group_by"`
 	// Deprecated. Remove before v1.0 release.
 	Match map[string]string `yaml:"match,omitempty" json:"match,omitempty"`
 	// Deprecated. Remove before v1.0 release.
-	MatchRE           config.MatchRegexps `yaml:"match_re,omitempty" json:"match_re,omitempty"`
-	Matchers          config.Matchers     `yaml:"matchers,omitempty" json:"matchers,omitempty"`
-	ObjectMatchers    ObjectMatchers      `yaml:"object_matchers,omitempty" json:"object_matchers,omitempty"`
-	MuteTimeIntervals []string            `yaml:"mute_time_intervals,omitempty" json:"mute_time_intervals,omitempty"`
-	Continue          bool                `yaml:"continue,omitempty" json:"continue,omitempty"` // Added omitempty to yaml for a cleaner export.
-	Routes            []*RouteExport      `yaml:"routes,omitempty" json:"routes,omitempty"`
+	MatchRE             config.MatchRegexps `yaml:"match_re,omitempty" json:"match_re,omitempty"`
+	Matchers            config.Matchers     `yaml:"matchers,omitempty" json:"matchers,omitempty"`
+	ObjectMatchers      ObjectMatchers      `yaml:"object_matchers,omitempty" json:"object_matchers,omitempty"`
+	ObjectMatchersSlice []*MatcherExport    `yaml:"-" json:"-" hcl:"matcher,block"`
+	MuteTimeIntervals   *[]string           `yaml:"mute_time_intervals,omitempty" json:"mute_time_intervals,omitempty" hcl:"mute_timings"`
+	Continue            *bool               `yaml:"continue,omitempty" json:"continue,omitempty" hcl:"continue,optional"` // Added omitempty to yaml for a cleaner export.
+	Routes              []*RouteExport      `yaml:"routes,omitempty" json:"routes,omitempty" hcl:"policy,block"`
 
-	GroupWait      *model.Duration `yaml:"group_wait,omitempty" json:"group_wait,omitempty"`
-	GroupInterval  *model.Duration `yaml:"group_interval,omitempty" json:"group_interval,omitempty"`
-	RepeatInterval *model.Duration `yaml:"repeat_interval,omitempty" json:"repeat_interval,omitempty"`
+	GroupWait      *string `yaml:"group_wait,omitempty" json:"group_wait,omitempty" hcl:"group_wait,optional"`
+	GroupInterval  *string `yaml:"group_interval,omitempty" json:"group_interval,omitempty" hcl:"group_interval,optional"`
+	RepeatInterval *string `yaml:"repeat_interval,omitempty" json:"repeat_interval,omitempty" hcl:"repeat_interval,optional"`
+}
+
+type MatcherExport struct {
+	Label string `yaml:"-" json:"-" hcl:"label"`
+	Match string `yaml:"-" json:"-" hcl:"match"`
+	Value string `yaml:"-" json:"-" hcl:"value"`
 }
diff --git a/pkg/services/ngalert/migration/alert_rule.go b/pkg/services/ngalert/migration/alert_rule.go
index 2ef2ec03fe9fd..be8d39a3da19b 100644
--- a/pkg/services/ngalert/migration/alert_rule.go
+++ b/pkg/services/ngalert/migration/alert_rule.go
@@ -9,6 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/log"
 	legacymodels "github.com/grafana/grafana/pkg/services/alerting/models"
+	migmodels "github.com/grafana/grafana/pkg/services/ngalert/migration/models"
 	migrationStore "github.com/grafana/grafana/pkg/services/ngalert/migration/store"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
@@ -40,14 +41,14 @@ func addMigrationInfo(da *migrationStore.DashAlert, dashboardUID string) (map[st
 }
 
 // MigrateAlert migrates a single dashboard alert from legacy alerting to unified alerting.
-func (om *OrgMigration) migrateAlert(ctx context.Context, l log.Logger, da *migrationStore.DashAlert, dashboardUID string, folderUID string) (*ngmodels.AlertRule, error) {
+func (om *OrgMigration) migrateAlert(ctx context.Context, l log.Logger, da *migrationStore.DashAlert, info migmodels.DashboardUpgradeInfo) (*ngmodels.AlertRule, error) {
 	l.Debug("Migrating alert rule to Unified Alerting")
 	cond, err := transConditions(ctx, da, om.migrationStore)
 	if err != nil {
 		return nil, fmt.Errorf("transform conditions: %w", err)
 	}
 
-	lbls, annotations := addMigrationInfo(da, dashboardUID)
+	lbls, annotations := addMigrationInfo(da, info.DashboardUID)
 
 	message := MigrateTmpl(l.New("field", "message"), da.Message)
 	annotations["message"] = message
@@ -63,15 +64,29 @@ func (om *OrgMigration) migrateAlert(ctx context.Context, l log.Logger, da *migr
 	}
 
 	// Here we ensure that the alert rule title is unique within the folder.
-	dedupSet := om.AlertTitleDeduplicator(folderUID)
-	name := truncateRuleName(da.Name)
-	if dedupSet.contains(name) {
-		dedupedName := dedupSet.deduplicate(name)
-		l.Debug("Duplicate alert rule name detected, renaming", "old_name", name, "new_name", dedupedName)
+	titleDedupSet := om.AlertTitleDeduplicator(info.NewFolderUID)
+	name := truncate(da.Name, store.AlertDefinitionMaxTitleLength)
+	if titleDedupSet.contains(name) {
+		dedupedName := titleDedupSet.deduplicate(name)
+		l.Debug("Duplicate alert rule name detected, renaming", "oldName", name, "newName", dedupedName)
 		name = dedupedName
 	}
-	dedupSet.add(name)
+	titleDedupSet.add(name)
+
+	// Here we ensure that the alert rule group is unique within the folder.
+	// This is so that we don't have to ensure that the alerts rules have the same interval.
+	groupDedupSet := om.AlertTitleDeduplicator(info.NewFolderUID)
+	panelSuffix := fmt.Sprintf(" - %d", da.PanelID)
+	truncatedDashboard := truncate(info.DashboardName, store.AlertRuleMaxRuleGroupNameLength-len(panelSuffix))
+	groupName := fmt.Sprintf("%s%s", truncatedDashboard, panelSuffix) // Unique to this dash alert but still contains useful info.
+	if groupDedupSet.contains(groupName) {
+		dedupedGroupName := groupDedupSet.deduplicate(groupName)
+		l.Debug("Duplicate alert rule group name detected, renaming", "oldGroup", groupName, "newGroup", dedupedGroupName)
+		groupName = dedupedGroupName
+	}
+	groupDedupSet.add(groupName)
 
+	dashUID := info.DashboardUID
 	ar := &ngmodels.AlertRule{
 		OrgID:           da.OrgID,
 		Title:           name,
@@ -80,10 +95,10 @@ func (om *OrgMigration) migrateAlert(ctx context.Context, l log.Logger, da *migr
 		Data:            data,
 		IntervalSeconds: ruleAdjustInterval(da.Frequency),
 		Version:         1,
-		NamespaceUID:    folderUID, // Folder already created, comes from env var.
-		DashboardUID:    &dashboardUID,
+		NamespaceUID:    info.NewFolderUID,
+		DashboardUID:    &dashUID,
 		PanelID:         &da.PanelID,
-		RuleGroup:       name,
+		RuleGroup:       groupName,
 		For:             da.For,
 		Updated:         time.Now().UTC(),
 		Annotations:     annotations,
@@ -264,10 +279,10 @@ func transExecErr(l log.Logger, s string) ngmodels.ExecutionErrorState {
 	}
 }
 
-// truncateRuleName truncates the rule name to the maximum allowed length.
-func truncateRuleName(daName string) string {
-	if len(daName) > store.AlertDefinitionMaxTitleLength {
-		return daName[:store.AlertDefinitionMaxTitleLength]
+// truncate truncates the given name to the maximum allowed length.
+func truncate(daName string, length int) string {
+	if len(daName) > length {
+		return daName[:length]
 	}
 	return daName
 }
diff --git a/pkg/services/ngalert/migration/alert_rule_test.go b/pkg/services/ngalert/migration/alert_rule_test.go
index 8ffa233d79ad4..49296ea0bc454 100644
--- a/pkg/services/ngalert/migration/alert_rule_test.go
+++ b/pkg/services/ngalert/migration/alert_rule_test.go
@@ -2,6 +2,7 @@ package migration
 
 import (
 	"context"
+	"fmt"
 	"strings"
 	"testing"
 
@@ -12,6 +13,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log/logtest"
 	legacymodels "github.com/grafana/grafana/pkg/services/alerting/models"
+	migmodels "github.com/grafana/grafana/pkg/services/ngalert/migration/models"
 	migrationStore "github.com/grafana/grafana/pkg/services/ngalert/migration/store"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
@@ -127,17 +129,22 @@ func TestAddMigrationInfo(t *testing.T) {
 
 func TestMakeAlertRule(t *testing.T) {
 	sqlStore := db.InitTestDB(t)
+	info := migmodels.DashboardUpgradeInfo{
+		DashboardUID:  "dashboarduid",
+		DashboardName: "dashboardname",
+		NewFolderUID:  "ewfolderuid",
+		NewFolderName: "newfoldername",
+	}
 	t.Run("when mapping rule names", func(t *testing.T) {
 		t.Run("leaves basic names untouched", func(t *testing.T) {
 			service := NewTestMigrationService(t, sqlStore, nil)
 			m := service.newOrgMigration(1)
 			da := createTestDashAlert()
 
-			ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, "dashboard", "folder")
+			ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
 
 			require.NoError(t, err)
 			require.Equal(t, da.Name, ar.Title)
-			require.Equal(t, ar.Title, ar.RuleGroup)
 		})
 
 		t.Run("truncates very long names to max length", func(t *testing.T) {
@@ -146,7 +153,7 @@ func TestMakeAlertRule(t *testing.T) {
 			da := createTestDashAlert()
 			da.Name = strings.Repeat("a", store.AlertDefinitionMaxTitleLength+1)
 
-			ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, "dashboard", "folder")
+			ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
 
 			require.NoError(t, err)
 			require.Len(t, ar.Title, store.AlertDefinitionMaxTitleLength)
@@ -158,7 +165,7 @@ func TestMakeAlertRule(t *testing.T) {
 			da := createTestDashAlert()
 			da.Name = strings.Repeat("a", store.AlertDefinitionMaxTitleLength+1)
 
-			ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, "dashboard", "folder")
+			ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
 
 			require.NoError(t, err)
 			require.Len(t, ar.Title, store.AlertDefinitionMaxTitleLength)
@@ -166,7 +173,7 @@ func TestMakeAlertRule(t *testing.T) {
 			da = createTestDashAlert()
 			da.Name = strings.Repeat("a", store.AlertDefinitionMaxTitleLength+1)
 
-			ar, err = m.migrateAlert(context.Background(), &logtest.Fake{}, &da, "dashboard", "folder")
+			ar, err = m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
 
 			require.NoError(t, err)
 			require.Len(t, ar.Title, store.AlertDefinitionMaxTitleLength)
@@ -174,7 +181,6 @@ func TestMakeAlertRule(t *testing.T) {
 			require.Len(t, parts, 2)
 			require.Greater(t, len(parts[1]), 8, "unique identifier should be longer than 9 characters")
 			require.Equal(t, store.AlertDefinitionMaxTitleLength-1, len(parts[0])+len(parts[1]), "truncated name + underscore + unique identifier should together be DefaultFieldMaxLength")
-			require.Equal(t, ar.Title, ar.RuleGroup)
 		})
 	})
 
@@ -183,7 +189,7 @@ func TestMakeAlertRule(t *testing.T) {
 		m := service.newOrgMigration(1)
 		da := createTestDashAlert()
 
-		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, "dashboard", "folder")
+		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
 		require.NoError(t, err)
 		require.False(t, ar.IsPaused)
 	})
@@ -194,7 +200,7 @@ func TestMakeAlertRule(t *testing.T) {
 		da := createTestDashAlert()
 		da.State = "paused"
 
-		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, "dashboard", "folder")
+		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
 		require.NoError(t, err)
 		require.True(t, ar.IsPaused)
 	})
@@ -205,7 +211,7 @@ func TestMakeAlertRule(t *testing.T) {
 		da := createTestDashAlert()
 		da.ParsedSettings.NoDataState = uuid.NewString()
 
-		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, "dashboard", "folder")
+		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
 		require.Nil(t, err)
 		require.Equal(t, models.NoData, ar.NoDataState)
 	})
@@ -216,7 +222,7 @@ func TestMakeAlertRule(t *testing.T) {
 		da := createTestDashAlert()
 		da.ParsedSettings.ExecutionErrorState = uuid.NewString()
 
-		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, "dashboard", "folder")
+		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
 		require.Nil(t, err)
 		require.Equal(t, models.ErrorErrState, ar.ExecErrState)
 	})
@@ -227,13 +233,78 @@ func TestMakeAlertRule(t *testing.T) {
 		da := createTestDashAlert()
 		da.Message = "Instance ${instance} is down"
 
-		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, "dashboard", "folder")
+		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
 		require.Nil(t, err)
 		expected :=
 			"{{- $mergedLabels := mergeLabelValues $values -}}\n" +
 				"Instance {{$mergedLabels.instance}} is down"
 		require.Equal(t, expected, ar.Annotations["message"])
 	})
+
+	t.Run("create unique group from dashboard title and panel", func(t *testing.T) {
+		service := NewTestMigrationService(t, sqlStore, nil)
+		m := service.newOrgMigration(1)
+		da := createTestDashAlert()
+		da.PanelID = 42
+
+		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
+
+		require.NoError(t, err)
+		require.Equal(t, fmt.Sprintf("%s - %d", info.DashboardName, da.PanelID), ar.RuleGroup)
+	})
+
+	t.Run("truncate rule group if dashboard name + panel id is too long", func(t *testing.T) {
+		service := NewTestMigrationService(t, sqlStore, nil)
+		m := service.newOrgMigration(1)
+		da := createTestDashAlert()
+		da.PanelID = 42
+		info := migmodels.DashboardUpgradeInfo{
+			DashboardUID:  "dashboarduid",
+			DashboardName: strings.Repeat("a", store.AlertRuleMaxRuleGroupNameLength-1),
+			NewFolderUID:  "newfolderuid",
+			NewFolderName: "newfoldername",
+		}
+
+		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
+
+		require.NoError(t, err)
+		require.Len(t, ar.RuleGroup, store.AlertRuleMaxRuleGroupNameLength)
+		require.Equal(t, fmt.Sprintf("%s - %d", strings.Repeat("a", store.AlertRuleMaxRuleGroupNameLength-5), da.PanelID), ar.RuleGroup)
+	})
+
+	t.Run("deduplicate rule group name if truncation is not unique", func(t *testing.T) {
+		service := NewTestMigrationService(t, sqlStore, nil)
+		m := service.newOrgMigration(1)
+		da := createTestDashAlert()
+		da.PanelID = 42
+		info := migmodels.DashboardUpgradeInfo{
+			DashboardUID:  "dashboarduid",
+			DashboardName: strings.Repeat("a", store.AlertRuleMaxRuleGroupNameLength-1),
+			NewFolderUID:  "newfolderuid",
+			NewFolderName: "newfoldername",
+		}
+
+		_, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
+		require.NoError(t, err)
+
+		da = createTestDashAlert()
+		da.PanelID = 42
+		info = migmodels.DashboardUpgradeInfo{
+			DashboardUID:  "dashboarduid",
+			DashboardName: strings.Repeat("a", store.AlertRuleMaxRuleGroupNameLength-1),
+			NewFolderUID:  "newfolderuid",
+			NewFolderName: "newfoldername",
+		}
+
+		ar, err := m.migrateAlert(context.Background(), &logtest.Fake{}, &da, info)
+
+		require.NoError(t, err)
+		require.Len(t, ar.RuleGroup, store.AlertRuleMaxRuleGroupNameLength)
+		parts := strings.SplitN(ar.RuleGroup, "_", 2)
+		require.Len(t, parts, 2)
+		require.Greater(t, len(parts[1]), 8, "unique identifier should be longer than 9 characters")
+		require.Equal(t, store.AlertDefinitionMaxTitleLength-1, len(parts[0])+len(parts[1]), "truncated name + underscore + unique identifier should together be DefaultFieldMaxLength")
+	})
 }
 
 func createTestDashAlert() migrationStore.DashAlert {
diff --git a/pkg/services/ngalert/migration/migration_test.go b/pkg/services/ngalert/migration/migration_test.go
index d5edee7b274d3..85ef5c7392517 100644
--- a/pkg/services/ngalert/migration/migration_test.go
+++ b/pkg/services/ngalert/migration/migration_test.go
@@ -697,7 +697,7 @@ func TestDashAlertQueryMigration(t *testing.T) {
 			NamespaceUID:    "folder5-1",
 			DashboardUID:    pointer("dash1-1"),
 			PanelID:         pointer(int64(1)),
-			RuleGroup:       "alert1",
+			RuleGroup:       "dash1-1",
 			RuleGroupIndex:  1,
 			NoDataState:     ngModels.NoData,
 			ExecErrState:    ngModels.AlertingErrState,
@@ -713,6 +713,8 @@ func TestDashAlertQueryMigration(t *testing.T) {
 			mutator(rule)
 		}
 
+		rule.RuleGroup = fmt.Sprintf("%s - %d", *rule.DashboardUID, *rule.PanelID)
+
 		rule.Annotations["__dashboardUid__"] = *rule.DashboardUID
 		rule.Annotations["__panelId__"] = strconv.FormatInt(*rule.PanelID, 10)
 		return rule
diff --git a/pkg/services/ngalert/migration/models.go b/pkg/services/ngalert/migration/models.go
index 90553f88b7005..a5047caeabba8 100644
--- a/pkg/services/ngalert/migration/models.go
+++ b/pkg/services/ngalert/migration/models.go
@@ -6,6 +6,7 @@ import (
 	pb "github.com/prometheus/alertmanager/silence/silencepb"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/folder"
 	migmodels "github.com/grafana/grafana/pkg/services/ngalert/migration/models"
 	migrationStore "github.com/grafana/grafana/pkg/services/ngalert/migration/store"
@@ -28,9 +29,12 @@ type OrgMigration struct {
 	seenUIDs            Deduplicator
 	silences            []*pb.MeshSilence
 	alertRuleTitleDedup map[string]Deduplicator // Folder -> Deduplicator (Title).
+	alertRuleGroupDedup map[string]Deduplicator // Folder -> Deduplicator (Group).
 
-	// cache for folders created for dashboards that have custom permissions
-	folderCache           map[string]*folder.Folder
+	// Migrated folder for a dashboard based on permissions. Parent Folder ID -> unique dashboard permission -> custom folder.
+	permissionsMap        map[int64]map[permissionHash]*folder.Folder
+	folderCache           map[int64]*folder.Folder                      // Folder ID -> Folder.
+	folderPermissionCache map[string][]accesscontrol.ResourcePermission // Folder UID -> Folder Permissions.
 	generalAlertingFolder *folder.Folder
 
 	state *migmodels.OrgMigrationState
@@ -51,7 +55,12 @@ func (ms *MigrationService) newOrgMigration(orgID int64) *OrgMigration {
 		silences:            make([]*pb.MeshSilence, 0),
 		alertRuleTitleDedup: make(map[string]Deduplicator),
 
-		folderCache: make(map[string]*folder.Folder),
+		// We deduplicate alert rule groups so that we don't have to ensure that the alerts rules have the same interval.
+		alertRuleGroupDedup: make(map[string]Deduplicator),
+
+		permissionsMap:        make(map[int64]map[permissionHash]*folder.Folder),
+		folderCache:           make(map[int64]*folder.Folder),
+		folderPermissionCache: make(map[string][]accesscontrol.ResourcePermission),
 
 		state: &migmodels.OrgMigrationState{
 			OrgID:          orgID,
@@ -71,6 +80,17 @@ func (om *OrgMigration) AlertTitleDeduplicator(folderUID string) Deduplicator {
 	return om.alertRuleTitleDedup[folderUID]
 }
 
+func (om *OrgMigration) AlertGroupDeduplicator(folderUID string) Deduplicator {
+	if _, ok := om.alertRuleGroupDedup[folderUID]; !ok {
+		om.alertRuleGroupDedup[folderUID] = Deduplicator{
+			set:             make(map[string]struct{}),
+			caseInsensitive: om.migrationStore.CaseInsensitive(),
+			maxLen:          store.AlertRuleMaxRuleGroupNameLength,
+		}
+	}
+	return om.alertRuleGroupDedup[folderUID]
+}
+
 type AlertPair struct {
 	AlertRule *models.AlertRule
 	DashAlert *migrationStore.DashAlert
diff --git a/pkg/services/ngalert/migration/models/state.go b/pkg/services/ngalert/migration/models/state.go
index e7c5b78120b0b..c965443ba67bc 100644
--- a/pkg/services/ngalert/migration/models/state.go
+++ b/pkg/services/ngalert/migration/models/state.go
@@ -5,3 +5,11 @@ type OrgMigrationState struct {
 	OrgID          int64    `json:"orgId"`
 	CreatedFolders []string `json:"createdFolders"`
 }
+
+// DashboardUpgradeInfo contains information about a dashboard that was upgraded.
+type DashboardUpgradeInfo struct {
+	DashboardUID  string
+	DashboardName string
+	NewFolderUID  string
+	NewFolderName string
+}
diff --git a/pkg/services/ngalert/migration/permissions.go b/pkg/services/ngalert/migration/permissions.go
index ce6f139b880d3..48894c9617ec3 100644
--- a/pkg/services/ngalert/migration/permissions.go
+++ b/pkg/services/ngalert/migration/permissions.go
@@ -2,8 +2,12 @@ package migration
 
 import (
 	"context"
+	"crypto"
+	"encoding/hex"
 	"errors"
 	"fmt"
+	"sort"
+	"strings"
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
@@ -11,26 +15,40 @@ import (
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/folder"
+	migmodels "github.com/grafana/grafana/pkg/services/ngalert/migration/models"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 )
 
+// DASHBOARD_FOLDER is the format used to generate the folder name for migrated dashboards with custom permissions.
 const DASHBOARD_FOLDER = "%s Alerts - %s"
 
 // MaxFolderName is the maximum length of the folder name generated using DASHBOARD_FOLDER format
 const MaxFolderName = 255
 
 var (
+	// migratorPermissions are the permissions required for the background user to migrate alerts.
 	migratorPermissions = []accesscontrol.Permission{
 		{Action: dashboards.ActionFoldersRead, Scope: dashboards.ScopeFoldersAll},
 		{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeDashboardsAll},
 		{Action: dashboards.ActionFoldersPermissionsRead, Scope: dashboards.ScopeFoldersAll},
 		{Action: dashboards.ActionDashboardsPermissionsRead, Scope: dashboards.ScopeDashboardsAll},
 		{Action: dashboards.ActionFoldersCreate},
-		{Action: dashboards.ActionDashboardsCreate, Scope: dashboards.ScopeFoldersAll},
 		{Action: datasources.ActionRead, Scope: datasources.ScopeAll},
+		{Action: accesscontrol.ActionOrgUsersRead, Scope: accesscontrol.ScopeUsersAll},
+		{Action: accesscontrol.ActionTeamsRead, Scope: accesscontrol.ScopeTeamsAll},
 	}
+
+	// generalAlertingFolderTitle is the title of the general alerting folder. This is used for dashboard alerts in the general folder.
 	generalAlertingFolderTitle = "General Alerting"
+
+	// permissionMap maps the "friendly" permission name for a ResourcePermissions actions to the dashboards.PermissionType.
+	// A sort of reverse accesscontrol Service.MapActions similar to api.dashboardPermissionMap.
+	permissionMap = map[string]dashboards.PermissionType{
+		"View":  dashboards.PERMISSION_VIEW,
+		"Edit":  dashboards.PERMISSION_EDIT,
+		"Admin": dashboards.PERMISSION_ADMIN,
+	}
 )
 
 // getMigrationUser returns a background user for the given orgID with permissions to execute migration-related tasks.
@@ -38,115 +56,356 @@ func getMigrationUser(orgID int64) identity.Requester {
 	return accesscontrol.BackgroundUser("ngalert_migration", orgID, org.RoleAdmin, migratorPermissions)
 }
 
-// getAlertFolderNameFromDashboard generates a folder name for alerts that belong to a dashboard. Formats the string according to DASHBOARD_FOLDER format.
-// If the resulting string exceeds the migrations.MaxTitleLength, the dashboard title is stripped to be at the maximum length
-func getAlertFolderNameFromDashboard(dash *dashboards.Dashboard) string {
-	maxLen := MaxFolderName - len(fmt.Sprintf(DASHBOARD_FOLDER, "", dash.UID))
-	title := dash.Title
+func (om *OrgMigration) migratedFolder(ctx context.Context, log log.Logger, dashID int64) (*migmodels.DashboardUpgradeInfo, error) {
+	dash, err := om.migrationStore.GetDashboard(ctx, om.orgID, dashID)
+	if err != nil {
+		return nil, err
+	}
+	l := log.New("dashboardTitle", dash.Title, "dashboardUid", dash.UID)
+
+	dashFolder, err := om.getFolder(ctx, dash)
+	if err != nil {
+		l.Warn("Failed to find folder for dashboard", "missing_folder_id", dash.FolderID, "error", err)
+	}
+	if dashFolder != nil {
+		l = l.New("folderUid", dashFolder.UID, "folderName", dashFolder.Title)
+	}
+
+	migratedFolder, err := om.getOrCreateMigratedFolder(ctx, l, dash, dashFolder)
+	if err != nil {
+		return nil, err
+	}
+
+	return &migmodels.DashboardUpgradeInfo{
+		DashboardUID:  dash.UID,
+		DashboardName: dash.Title,
+		NewFolderUID:  migratedFolder.UID,
+		NewFolderName: migratedFolder.Title,
+	}, nil
+}
+
+// getOrCreateMigratedFolder returns the folder that alerts in a given dashboard should migrate to.
+// If the dashboard has no custom permissions, this should be the same folder as dash.FolderID.
+// If the dashboard has custom permissions that affect access, this should be a new folder with migrated permissions relating to both the dashboard and parent folder.
+// Any dashboard that has greater read/write permissions for an orgRole/team/user compared to its folder will necessitate creating a new folder with the same permissions as the dashboard.
+func (om *OrgMigration) getOrCreateMigratedFolder(ctx context.Context, l log.Logger, dash *dashboards.Dashboard, parentFolder *folder.Folder) (*folder.Folder, error) {
+	// If parentFolder does not exist then the dashboard is an orphan. We migrate the alert to the general alerting folder.
+	// The general alerting folder is only accessible to admins.
+	if parentFolder == nil {
+		l.Warn("Migrating alert to the general alerting folder: original folder not found")
+		f, err := om.getOrCreateGeneralAlertingFolder(ctx, om.orgID)
+		if err != nil {
+			return nil, fmt.Errorf("general alerting folder: %w", err)
+		}
+		return f, nil
+	}
+
+	// Check if the dashboard has custom permissions. If it does, we need to create a new folder for it.
+	// This folder will be cached for re-use for each dashboard in the folder with the same permissions.
+	permissionsToFolder, ok := om.permissionsMap[parentFolder.ID]
+	if !ok {
+		permissionsToFolder = make(map[permissionHash]*folder.Folder)
+		om.permissionsMap[dash.FolderID] = permissionsToFolder
+
+		folderPerms, err := om.getFolderPermissions(ctx, parentFolder)
+		if err != nil {
+			return nil, fmt.Errorf("folder permissions: %w", err)
+		}
+		newFolderPerms, _ := om.convertResourcePerms(folderPerms)
+
+		// We assign the folder to the cache so that any dashboards with identical equivalent permissions will use the parent folder instead of creating a new one.
+		folderPermsHash, err := createHash(newFolderPerms)
+		if err != nil {
+			return nil, fmt.Errorf("hash of folder permissions: %w", err)
+		}
+		permissionsToFolder[folderPermsHash] = parentFolder
+	}
+
+	// Now we compute the hash of the dashboard permissions and check if we have a folder for it. If not, we create a new one.
+	perms, err := om.getDashboardPermissions(ctx, dash)
+	if err != nil {
+		return nil, fmt.Errorf("dashboard permissions: %w", err)
+	}
+	newPerms, unusedPerms := om.convertResourcePerms(perms)
+	hash, err := createHash(newPerms)
+	if err != nil {
+		return nil, fmt.Errorf("hash of dashboard permissions: %w", err)
+	}
+
+	customFolder, ok := permissionsToFolder[hash]
+	if !ok {
+		folderName := generateAlertFolderName(parentFolder, hash)
+		l.Info("Dashboard has custom permissions, create a new folder for alerts.", "newFolder", folderName)
+		f, err := om.createFolder(ctx, om.orgID, folderName, newPerms)
+		if err != nil {
+			return nil, err
+		}
+
+		// If the role is not managed or basic we don't attempt to migrate its permissions. This is because
+		// the logic to migrate would be complex, error-prone, and even if done correctly would have significant
+		// drawbacks in the case of custom provisioned roles. Instead, we log if the role has dashboard permissions that could
+		// potentially override the folder permissions. These overrides would always be to increase permissions not decrease them,
+		// so the risk of giving users access to alerts they shouldn't have access to is mitigated.
+		overrides := potentialOverrides(unusedPerms, newPerms)
+		if len(overrides) > 0 {
+			l.Warn("Some roles were not migrated but had the potential to allow additional access. Please verify the permissions of the new folder.", "roles", overrides, "newFolder", folderName)
+		}
+
+		permissionsToFolder[hash] = f
+		return f, nil
+	}
+
+	return customFolder, nil
+}
+
+// generateAlertFolderName generates a folder name for alerts that belong to a dashboard with custom permissions.
+// Formats the string according to DASHBOARD_FOLDER format.
+// If the resulting string's length exceeds migration.MaxFolderName, the dashboard title is stripped to be at the maximum length.
+func generateAlertFolderName(f *folder.Folder, hash permissionHash) string {
+	maxLen := MaxFolderName - len(fmt.Sprintf(DASHBOARD_FOLDER, "", hash))
+	title := f.Title
 	if len(title) > maxLen {
 		title = title[:maxLen]
 	}
-	return fmt.Sprintf(DASHBOARD_FOLDER, title, dash.UID) // include UID to the name to avoid collision
+	return fmt.Sprintf(DASHBOARD_FOLDER, title, hash) // Include hash in the name to avoid collision.
 }
 
-func (om *OrgMigration) getOrCreateMigratedFolder(ctx context.Context, log log.Logger, dashID int64) (*dashboards.Dashboard, *folder.Folder, error) {
-	dash, err := om.migrationStore.GetDashboard(ctx, om.orgID, dashID)
-	if err != nil {
-		if errors.Is(err, dashboards.ErrFolderNotFound) {
-			return nil, nil, fmt.Errorf("dashboard with ID %v under organisation %d not found: %w", dashID, om.orgID, err)
-		}
-		return nil, nil, fmt.Errorf("failed to get dashboard with ID %v under organisation %d: %w", dashID, om.orgID, err)
-	}
-	l := log.New(
-		"dashboardTitle", dash.Title,
-		"dashboardUID", dash.UID,
-	)
-
-	var migratedFolder *folder.Folder
-	switch {
-	case dash.HasACL:
-		folderName := getAlertFolderNameFromDashboard(dash)
-		f, ok := om.folderCache[folderName]
-		if !ok {
-			l.Info("create a new folder for alerts that belongs to dashboard because it has custom permissions", "folder", folderName)
-			// create folder and assign the permissions of the dashboard (included default and inherited)
-			f, err = om.createFolder(ctx, om.orgID, folderName)
-			if err != nil {
-				return nil, nil, fmt.Errorf("create new folder: %w", err)
-			}
-			permissions, err := om.migrationStore.GetACL(ctx, dash.OrgID, dash.ID)
-			if err != nil {
-				return nil, nil, fmt.Errorf("failed to get dashboard %d under organisation %d permissions: %w", dash.ID, dash.OrgID, err)
+// isBasic returns true if the given roleName is a basic role.
+func isBasic(roleName string) bool {
+	return strings.HasPrefix(roleName, accesscontrol.BasicRolePrefix)
+}
+
+// convertResourcePerms converts the given resource permissions (from a dashboard or folder) to a set of unique, sorted SetResourcePermissionCommands.
+// This is done by iterating over the managed, basic, and inherited resource permissions and adding the highest permission for each orgrole/user/team.
+//
+// # Details
+//
+// There are two role types that we consider:
+//   - managed (ex. managed:users:1:permissions, managed:builtins:editor:permissions, managed:teams:1:permissions):
+//     These are the only roles that exist in OSS. For each of these roles, we add the actions of the highest
+//     dashboards.PermissionType between the folder and the dashboard. Permissions from the folder are inherited.
+//     The added actions should have scope=folder:uid:xxxxxx, where xxxxxx is the new folder uid.
+//   - basic (ex. basic:admin, basic:editor):
+//     These are roles used in enterprise. Every user should have one of these roles. They should be considered
+//     equivalent to managed:builtins. The highest dashboards.PermissionType between the two should be used.
+//
+// There are two role types that we do not consider:
+//   - fixed: (ex. fixed:dashboards:reader, fixed:dashboards:writer):
+//     These are roles with fixed actions/scopes. They should not be given any extra actions/scopes because they
+//     can be overwritten. Because of this, to ensure that all users with this role have the correct access to the
+//     new folder we would need to find all users with this role and add a permission for
+//     action folders:read/write -> folder:uid:xxxxxx to their managed:users:X:permissions.
+//     This will eventually fall out of sync.
+//   - custom: Custom roles created via API or provisioning.
+//     Similar to fixed roles, we can't give them any extra actions/scopes because they can be overwritten.
+//
+// For now, we choose the simpler approach of handling managed and basic roles. Fixed and custom roles will not
+// be taken into account, but we will log a warning if they had the potential to override the folder permissions.
+func (om *OrgMigration) convertResourcePerms(rperms []accesscontrol.ResourcePermission) ([]accesscontrol.SetResourcePermissionCommand, []accesscontrol.ResourcePermission) {
+	keep := make(map[accesscontrol.SetResourcePermissionCommand]dashboards.PermissionType)
+	unusedPerms := make([]accesscontrol.ResourcePermission, 0)
+	for _, p := range rperms {
+		if p.IsManaged || p.IsInherited || isBasic(p.RoleName) {
+			if permission := om.migrationStore.MapActions(p); permission != "" {
+				sp := accesscontrol.SetResourcePermissionCommand{
+					UserID:      p.UserId,
+					TeamID:      p.TeamId,
+					BuiltinRole: p.BuiltInRole,
+				}
+				// We could have redundant perms, ex: if one is inherited from the parent folder, or we have basic roles from enterprise.
+				// We use the highest permission available.
+				pType := permissionMap[permission]
+				current, ok := keep[sp]
+				if !ok || pType > current {
+					keep[sp] = pType
+				}
 			}
-			err = om.migrationStore.SetACL(ctx, f.OrgID, f.ID, permissions)
-			if err != nil {
-				return nil, nil, fmt.Errorf("failed to set folder %d under organisation %d permissions: %w", f.ID, f.OrgID, err)
+		} else {
+			// Keep track of unused perms, so we can later log a warning if they had the potential to override the folder permissions.
+			unusedPerms = append(unusedPerms, p)
+		}
+	}
+
+	permissions := make([]accesscontrol.SetResourcePermissionCommand, 0, len(keep))
+	for p, pType := range keep {
+		p.Permission = pType.String()
+		permissions = append(permissions, p)
+	}
+
+	// Stable sort since we will be creating a hash of this to compare dashboard perms to folder perms.
+	sort.SliceStable(permissions, func(i, j int) bool {
+		if permissions[i].BuiltinRole != permissions[j].BuiltinRole {
+			return permissions[i].BuiltinRole < permissions[j].BuiltinRole
+		}
+		if permissions[i].UserID != permissions[j].UserID {
+			return permissions[i].UserID < permissions[j].UserID
+		}
+		if permissions[i].TeamID != permissions[j].TeamID {
+			return permissions[i].TeamID < permissions[j].TeamID
+		}
+		return permissions[i].Permission < permissions[j].Permission
+	})
+
+	return permissions, unusedPerms
+}
+
+// potentialOverrides returns a map of roles from unusedOldPerms that have dashboard permissions that could potentially
+// override the given folder permissions in newPerms. These overrides are always to increase permissions not decrease them.
+func potentialOverrides(unusedOldPerms []accesscontrol.ResourcePermission, newPerms []accesscontrol.SetResourcePermissionCommand) map[string]dashboards.PermissionType {
+	var lowestPermission dashboards.PermissionType
+	for _, p := range newPerms {
+		if p.BuiltinRole == string(org.RoleEditor) || p.BuiltinRole == string(org.RoleViewer) {
+			pType := permissionMap[p.Permission]
+			if pType < lowestPermission {
+				lowestPermission = pType
 			}
-			om.folderCache[folderName] = f
 		}
-		migratedFolder = f
-	case dash.FolderID > 0:
-		// get folder if exists
-		f, err := om.migrationStore.GetFolder(ctx, &folder.GetFolderQuery{ID: &dash.FolderID, OrgID: dash.OrgID, SignedInUser: getMigrationUser(dash.OrgID)})
+	}
+
+	nonManagedPermissionTypes := make(map[string]dashboards.PermissionType)
+	for _, p := range unusedOldPerms {
+		existing, ok := nonManagedPermissionTypes[p.RoleName]
+		if ok && existing == dashboards.PERMISSION_EDIT {
+			// We've already handled the highest permission we care about, no need to check this role anymore.
+			continue
+		}
+
+		if p.Contains([]string{dashboards.ActionDashboardsWrite}) {
+			existing = dashboards.PERMISSION_EDIT
+		} else if p.Contains([]string{dashboards.ActionDashboardsRead}) {
+			existing = dashboards.PERMISSION_VIEW
+		}
+
+		if existing > lowestPermission && existing > nonManagedPermissionTypes[p.RoleName] {
+			nonManagedPermissionTypes[p.RoleName] = existing
+		}
+	}
+
+	return nonManagedPermissionTypes
+}
+
+type permissionHash string
+
+// createHash returns a hash of the given permissions.
+func createHash(setResourcePermissionCommands []accesscontrol.SetResourcePermissionCommand) (permissionHash, error) {
+	// Speed is not particularly important here.
+	digester := crypto.MD5.New()
+	var separator = []byte{255}
+	for _, perm := range setResourcePermissionCommands {
+		_, err := fmt.Fprint(digester, separator)
 		if err != nil {
-			// If folder does not exist then the dashboard is an orphan and we migrate the alert to the general folder.
-			l.Warn("Failed to find folder for dashboard. Migrate rule to the default folder", "missing_folder_id", dash.FolderID, "error", err)
-			migratedFolder, err = om.getOrCreateGeneralFolder(ctx, dash.OrgID)
-			if err != nil {
-				return nil, nil, err
-			}
-		} else {
-			migratedFolder = f
+			return "", err
 		}
-	default:
-		migratedFolder, err = om.getOrCreateGeneralFolder(ctx, dash.OrgID)
+		_, err = fmt.Fprint(digester, perm)
 		if err != nil {
-			return nil, nil, err
+			return "", err
 		}
 	}
+	return permissionHash(hex.EncodeToString(digester.Sum(nil))), nil
+}
 
-	if migratedFolder.UID == "" {
-		return nil, nil, fmt.Errorf("empty folder identifier")
+// getFolderPermissions Get permissions for folder.
+func (om *OrgMigration) getFolderPermissions(ctx context.Context, f *folder.Folder) ([]accesscontrol.ResourcePermission, error) {
+	if p, ok := om.folderPermissionCache[f.UID]; ok {
+		return p, nil
 	}
+	p, err := om.migrationStore.GetFolderPermissions(ctx, getMigrationUser(f.OrgID), f.UID)
+	if err != nil {
+		return nil, err
+	}
+	om.folderPermissionCache[f.UID] = p
+	return p, nil
+}
 
-	return dash, migratedFolder, nil
+// getDashboardPermissions Get permissions for dashboard.
+func (om *OrgMigration) getDashboardPermissions(ctx context.Context, d *dashboards.Dashboard) ([]accesscontrol.ResourcePermission, error) {
+	p, err := om.migrationStore.GetDashboardPermissions(ctx, getMigrationUser(om.orgID), d.UID)
+	if err != nil {
+		return nil, err
+	}
+	return p, nil
 }
 
-// getOrCreateGeneralFolder returns the general folder under the specific organisation
-// If the general folder does not exist it creates it.
-func (om *OrgMigration) getOrCreateGeneralFolder(ctx context.Context, orgID int64) (*folder.Folder, error) {
+// getFolder returns the parent folder for the given dashboard. If the dashboard is in the general folder, it returns the general alerting folder.
+func (om *OrgMigration) getFolder(ctx context.Context, dash *dashboards.Dashboard) (*folder.Folder, error) {
+	if f, ok := om.folderCache[dash.FolderID]; ok {
+		return f, nil
+	}
+
+	if dash.FolderID <= 0 {
+		// Don't use general folder since it has no uid, instead we use a new "General Alerting" folder.
+		migratedFolder, err := om.getOrCreateGeneralAlertingFolder(ctx, om.orgID)
+		if err != nil {
+			return nil, fmt.Errorf("get or create general folder: %w", err)
+		}
+		return migratedFolder, err
+	}
+
+	f, err := om.migrationStore.GetFolder(ctx, &folder.GetFolderQuery{ID: &dash.FolderID, OrgID: om.orgID, SignedInUser: getMigrationUser(om.orgID)})
+	if err != nil {
+		if errors.Is(err, dashboards.ErrFolderNotFound) {
+			return nil, fmt.Errorf("folder with id %v not found", dash.FolderID)
+		}
+		return nil, fmt.Errorf("get folder %d: %w", dash.FolderID, err)
+	}
+	om.folderCache[dash.FolderID] = f
+	return f, nil
+}
+
+// getOrCreateGeneralAlertingFolder returns the general alerting folder under the specific organisation
+// If the general alerting folder does not exist it creates it.
+func (om *OrgMigration) getOrCreateGeneralAlertingFolder(ctx context.Context, orgID int64) (*folder.Folder, error) {
 	if om.generalAlertingFolder != nil {
 		return om.generalAlertingFolder, nil
 	}
 	f, err := om.migrationStore.GetFolder(ctx, &folder.GetFolderQuery{OrgID: orgID, Title: &generalAlertingFolderTitle, SignedInUser: getMigrationUser(orgID)})
 	if err != nil {
 		if errors.Is(err, dashboards.ErrFolderNotFound) {
-			// create folder
-			generalAlertingFolder, err := om.createFolder(ctx, orgID, generalAlertingFolderTitle)
+			// create general alerting folder without permissions to mimic the general folder.
+			f, err := om.createFolder(ctx, orgID, generalAlertingFolderTitle, nil)
 			if err != nil {
-				return nil, fmt.Errorf("create general alerting folder '%s': %w", generalAlertingFolderTitle, err)
+				return nil, fmt.Errorf("create general alerting folder: %w", err)
 			}
-			om.generalAlertingFolder = generalAlertingFolder
-			return om.generalAlertingFolder, nil
+			om.generalAlertingFolder = f
+			return f, err
 		}
-		return nil, fmt.Errorf("get general alerting folder '%s': %w", generalAlertingFolderTitle, err)
+		return nil, fmt.Errorf("get folder '%s': %w", generalAlertingFolderTitle, err)
 	}
 	om.generalAlertingFolder = f
-
-	return om.generalAlertingFolder, nil
+	return f, nil
 }
 
 // createFolder creates a new folder with given permissions.
-func (om *OrgMigration) createFolder(ctx context.Context, orgID int64, title string) (*folder.Folder, error) {
+func (om *OrgMigration) createFolder(ctx context.Context, orgID int64, title string, newPerms []accesscontrol.SetResourcePermissionCommand) (*folder.Folder, error) {
 	f, err := om.migrationStore.CreateFolder(ctx, &folder.CreateFolderCommand{
 		OrgID:        orgID,
 		Title:        title,
 		SignedInUser: getMigrationUser(orgID).(*user.SignedInUser),
 	})
 	if err != nil {
+		if errors.Is(err, dashboards.ErrFolderSameNameExists) {
+			// If the folder already exists, we return the existing folder.
+			// This isn't perfect since permissions might have been manually modified,
+			// but the only folders we should be creating here are ones with permission
+			// hash suffix or general alerting. Neither of which is likely to spuriously
+			// conflict with an existing folder.
+			om.log.Warn("Folder already exists, using existing folder", "title", title)
+			f, err := om.migrationStore.GetFolder(ctx, &folder.GetFolderQuery{OrgID: orgID, Title: &title, SignedInUser: getMigrationUser(orgID)})
+			if err != nil {
+				return nil, err
+			}
+			return f, nil
+		}
 		return nil, err
 	}
 
+	if len(newPerms) > 0 {
+		_, err = om.migrationStore.SetFolderPermissions(ctx, orgID, f.UID, newPerms...)
+		if err != nil {
+			return nil, fmt.Errorf("set permissions: %w", err)
+		}
+	}
+
 	om.state.CreatedFolders = append(om.state.CreatedFolders, f.UID)
 
 	return f, nil
diff --git a/pkg/services/ngalert/migration/permissions_test.go b/pkg/services/ngalert/migration/permissions_test.go
new file mode 100644
index 0000000000000..bc52ddce191e4
--- /dev/null
+++ b/pkg/services/ngalert/migration/permissions_test.go
@@ -0,0 +1,820 @@
+package migration
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"sort"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
+	"github.com/grafana/grafana/pkg/services/alerting/models"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	ngModels "github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/team"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+// TestDashAlertPermissionMigration tests the execution of the migration specifically for dashboards with custom permissions.
+//
+//nolint:gocyclo
+func TestDashAlertPermissionMigration(t *testing.T) {
+	genLegacyAlert := func(name string, dashboardId int64, mutators ...func(*models.Alert)) *models.Alert {
+		a := createAlert(t, 1, int(dashboardId), 1, name, nil)
+		if len(mutators) > 0 {
+			for _, mutator := range mutators {
+				mutator(a)
+			}
+		}
+		return a
+	}
+
+	genAlert := func(title string, namespaceUID string, dashboardUID string, mutators ...func(*ngModels.AlertRule)) *ngModels.AlertRule {
+		a := &ngModels.AlertRule{
+			ID:        1,
+			OrgID:     1,
+			Title:     title,
+			Condition: "A",
+			Data: []ngModels.AlertQuery{
+				{
+					RefID:         "A",
+					DatasourceUID: "__expr__",
+					Model:         json.RawMessage(`{"conditions":[],"intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"classic_conditions"}`),
+				},
+			},
+			NamespaceUID:    namespaceUID,
+			DashboardUID:    &dashboardUID,
+			RuleGroup:       fmt.Sprintf("Dashboard Title %s - %d", dashboardUID, 1),
+			IntervalSeconds: 60,
+			Version:         1,
+			PanelID:         pointer(int64(1)),
+			RuleGroupIndex:  1,
+			NoDataState:     ngModels.NoData,
+			ExecErrState:    ngModels.AlertingErrState,
+			For:             60 * time.Second,
+			Annotations: map[string]string{
+				"message":          "message",
+				"__dashboardUid__": dashboardUID,
+				"__panelId__":      "1",
+			},
+			Labels:   map[string]string{},
+			IsPaused: false,
+		}
+		if len(mutators) > 0 {
+			for _, mutator := range mutators {
+				mutator(a)
+			}
+		}
+		return a
+	}
+
+	withPanelId := func(id int64) func(*ngModels.AlertRule) {
+		return func(a *ngModels.AlertRule) {
+			a.PanelID = pointer(id)
+			a.Annotations["__panelId__"] = fmt.Sprintf("%d", id)
+			a.RuleGroup = fmt.Sprintf("Dashboard Title %s - %d", *a.DashboardUID, id)
+		}
+	}
+
+	genFolder := func(t *testing.T, id int64, uid string, mutators ...func(f *dashboards.Dashboard)) *dashboards.Dashboard {
+		d := createFolder(t, id, 1, uid)
+		d.Title = "Original Folder " + uid
+		if len(mutators) > 0 {
+			for _, mutator := range mutators {
+				mutator(d)
+			}
+		}
+		return d
+	}
+
+	genCreatedFolder := func(t *testing.T, title string, mutators ...func(f *dashboards.Dashboard)) *dashboards.Dashboard {
+		d := createFolder(t, 1, 1, "") // Leave generated UID blank, so we don't compare.
+		d.Title = title
+		d.CreatedBy = -1
+		d.UpdatedBy = -1
+		if len(mutators) > 0 {
+			for _, mutator := range mutators {
+				mutator(d)
+			}
+		}
+		return d
+	}
+
+	genDashboard := func(t *testing.T, id int64, uid string, folderId int64, mutators ...func(f *dashboards.Dashboard)) *dashboards.Dashboard {
+		d := createDashboard(t, id, 1, uid, folderId, nil)
+		d.Title = "Dashboard Title " + uid
+		if len(mutators) > 0 {
+			for _, mutator := range mutators {
+				mutator(d)
+			}
+		}
+		return d
+	}
+
+	genPerms := func(perms ...accesscontrol.SetResourcePermissionCommand) []accesscontrol.SetResourcePermissionCommand {
+		return perms
+	}
+
+	type expectedAlertMigration struct {
+		Alert  *ngModels.AlertRule
+		Folder *dashboards.Dashboard
+		Perms  []accesscontrol.SetResourcePermissionCommand
+	}
+
+	type testcase struct {
+		name           string
+		enterprise     bool
+		folders        []*dashboards.Dashboard
+		folderPerms    map[string][]accesscontrol.SetResourcePermissionCommand // UID -> Perms
+		dashboards     []*dashboards.Dashboard
+		dashboardPerms map[string][]accesscontrol.SetResourcePermissionCommand // UID -> Perms
+		alerts         []*models.Alert
+		roles          map[accesscontrol.Role][]accesscontrol.Permission
+
+		expected []expectedAlertMigration
+	}
+
+	// Used to perform the same tests for each of builtins, users, and teams.
+	splitTestcase := func(raw testcase) []testcase {
+		permTypes := make(map[string]func(accesscontrol.SetResourcePermissionCommand) accesscontrol.SetResourcePermissionCommand, 3)
+		permTypes["builtins"] = func(p accesscontrol.SetResourcePermissionCommand) accesscontrol.SetResourcePermissionCommand {
+			return p
+		}
+		mapping := map[string]int64{
+			string(org.RoleEditor): 1,
+			string(org.RoleViewer): 2,
+		}
+		permTypes["users"] = func(p accesscontrol.SetResourcePermissionCommand) accesscontrol.SetResourcePermissionCommand {
+			id, ok := mapping[p.BuiltinRole]
+			if !ok {
+				return p
+			}
+			p.UserID = id
+			p.BuiltinRole = ""
+			return p
+		}
+		permTypes["teams"] = func(p accesscontrol.SetResourcePermissionCommand) accesscontrol.SetResourcePermissionCommand {
+			id, ok := mapping[p.BuiltinRole]
+			if !ok {
+				return p
+			}
+			p.TeamID = id
+			p.BuiltinRole = ""
+			return p
+		}
+
+		applyTransform := func(tt testcase, pfunc func(p accesscontrol.SetResourcePermissionCommand) accesscontrol.SetResourcePermissionCommand) testcase {
+			folderPerms := make(map[string][]accesscontrol.SetResourcePermissionCommand, len(tt.folderPerms))
+			for _, f := range tt.folders {
+				perms := make([]accesscontrol.SetResourcePermissionCommand, 0, len(tt.folderPerms[f.UID]))
+				for _, p := range tt.folderPerms[f.UID] {
+					perms = append(perms, pfunc(p))
+				}
+				folderPerms[f.UID] = perms
+			}
+			tt.folderPerms = folderPerms
+
+			dashboardPerms := make(map[string][]accesscontrol.SetResourcePermissionCommand, len(tt.dashboardPerms))
+			for _, d := range tt.dashboards {
+				perms := make([]accesscontrol.SetResourcePermissionCommand, 0, len(tt.dashboardPerms[d.UID]))
+				for _, p := range tt.dashboardPerms[d.UID] {
+					perms = append(perms, pfunc(p))
+				}
+				dashboardPerms[d.UID] = perms
+			}
+			tt.dashboardPerms = dashboardPerms
+
+			expected := make([]expectedAlertMigration, 0, len(tt.expected))
+			for _, ex := range tt.expected {
+				permissions := make([]accesscontrol.SetResourcePermissionCommand, 0, len(ex.Perms))
+				for _, p := range ex.Perms {
+					permissions = append(permissions, pfunc(p))
+				}
+				ex.Perms = permissions
+
+				sort.SliceStable(permissions, func(i, j int) bool {
+					if permissions[i].BuiltinRole != permissions[j].BuiltinRole {
+						return permissions[i].BuiltinRole < permissions[j].BuiltinRole
+					}
+					if permissions[i].UserID != permissions[j].UserID {
+						return permissions[i].UserID < permissions[j].UserID
+					}
+					if permissions[i].TeamID != permissions[j].TeamID {
+						return permissions[i].TeamID < permissions[j].TeamID
+					}
+					return permissions[i].Permission < permissions[j].Permission
+				})
+
+				f := *ex.Folder
+				if strings.Contains(f.Title, "%s") {
+					hash, err := createHash(permissions)
+					require.NoError(t, err)
+					f.Title = fmt.Sprintf(f.Title, hash)
+				}
+
+				expected = append(expected, expectedAlertMigration{
+					Alert:  ex.Alert,
+					Folder: &f,
+					Perms:  permissions,
+				})
+			}
+			tt.expected = expected
+
+			return tt
+		}
+
+		cases := make([]testcase, 0, 3)
+		for k, pfunc := range permTypes {
+			tt := applyTransform(raw, pfunc)
+			tt.name = k
+			cases = append(cases, tt)
+		}
+		return cases
+	}
+
+	basicFolder := genFolder(t, 1, "f_1")
+	basicDashboard := genDashboard(t, 2, "d_1", basicFolder.ID)
+	defaultPerms := genPerms(
+		accesscontrol.SetResourcePermissionCommand{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
+		accesscontrol.SetResourcePermissionCommand{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
+	)
+
+	basicAlert1 := genLegacyAlert("alert1", basicDashboard.ID, func(a *models.Alert) { a.PanelID = 1 })
+	basicAlert2 := genLegacyAlert("alert2", basicDashboard.ID, func(a *models.Alert) { a.PanelID = 2 })
+
+	basicPerms := func() map[accesscontrol.Role][]accesscontrol.Permission {
+		basic := make(map[accesscontrol.Role][]accesscontrol.Permission)
+		var permissions []accesscontrol.Permission
+		ts := time.Now()
+		for _, action := range append(ossaccesscontrol.DashboardAdminActions, ossaccesscontrol.FolderAdminActions...) {
+			if isDashboardAction := strings.HasPrefix(action, "dashboards"); isDashboardAction {
+				permissions = append(permissions, accesscontrol.Permission{
+					Action:  action,
+					Scope:   dashboards.ScopeDashboardsAll,
+					Created: ts,
+					Updated: ts,
+				})
+			}
+			permissions = append(permissions, accesscontrol.Permission{
+				Action:  action,
+				Scope:   dashboards.ScopeFoldersAll,
+				Created: ts,
+				Updated: ts,
+			})
+		}
+		basic[accesscontrol.Role{Name: accesscontrol.BasicRolePrefix + "admin"}] = permissions
+		return basic
+	}
+
+	tc := []testcase{
+		{
+			name:           "alerts in dashboard and folder with default permissions migrate to same folder",
+			folders:        []*dashboards.Dashboard{basicFolder},
+			folderPerms:    map[string][]accesscontrol.SetResourcePermissionCommand{basicFolder.UID: defaultPerms},
+			dashboards:     []*dashboards.Dashboard{basicDashboard},
+			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{basicDashboard.UID: defaultPerms},
+			alerts:         []*models.Alert{basicAlert1, basicAlert2},
+			expected: []expectedAlertMigration{
+				{
+					Alert:  genAlert(basicAlert1.Name, basicFolder.UID, basicDashboard.UID, withPanelId(basicAlert1.PanelID)),
+					Folder: basicFolder,
+					Perms:  defaultPerms,
+				},
+				{
+					Alert:  genAlert(basicAlert2.Name, basicFolder.UID, basicDashboard.UID, withPanelId(basicAlert2.PanelID)),
+					Folder: basicFolder,
+					Perms:  defaultPerms,
+				},
+			},
+		},
+		{
+			name:        "dashboard override cannot lessen folder permissions",
+			folders:     []*dashboards.Dashboard{basicFolder},
+			folderPerms: map[string][]accesscontrol.SetResourcePermissionCommand{basicFolder.UID: defaultPerms},
+			dashboards:  []*dashboards.Dashboard{basicDashboard},
+			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
+				basicDashboard.UID: {
+					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_VIEW.String()}, // Change.
+					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
+				},
+			},
+			alerts: []*models.Alert{basicAlert1},
+			expected: []expectedAlertMigration{
+				{
+					Alert:  genAlert(basicAlert1.Name, basicFolder.UID, basicDashboard.UID),
+					Folder: basicFolder,
+					Perms: []accesscontrol.SetResourcePermissionCommand{
+						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()}, // Inherits from Folder.
+						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
+					},
+				},
+			},
+		},
+		{
+			name:        "dashboard with various permission overrides should create new folder",
+			folders:     []*dashboards.Dashboard{basicFolder},
+			folderPerms: map[string][]accesscontrol.SetResourcePermissionCommand{basicFolder.UID: defaultPerms},
+			dashboards: []*dashboards.Dashboard{
+				genDashboard(t, 2, "d_1", basicFolder.ID),
+				genDashboard(t, 3, "d_2", basicFolder.ID),
+				genDashboard(t, 4, "d_3", basicFolder.ID),
+				genDashboard(t, 5, "d_4", basicFolder.ID),
+				genDashboard(t, 6, "d_5", basicFolder.ID),
+			},
+			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
+				"d_1": {
+					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
+					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_EDIT.String()}, // Change.
+				},
+				"d_2": {
+					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
+					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
+				},
+				"d_3": {
+					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
+					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_EDIT.String()},  // Change.
+				},
+				"d_4": {
+					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
+					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
+				},
+				"d_5": {
+					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
+					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
+				},
+			},
+			alerts: []*models.Alert{genLegacyAlert("alert1", 2), genLegacyAlert("alert2", 3), genLegacyAlert("alert3", 4), genLegacyAlert("alert4", 5), genLegacyAlert("alert5", 6)},
+			expected: []expectedAlertMigration{
+				{
+					Alert:  genAlert("alert1", "", "d_1"),
+					Folder: genCreatedFolder(t, "Original Folder f_1 Alerts - %s"),
+					Perms: []accesscontrol.SetResourcePermissionCommand{
+						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
+						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_EDIT.String()}, // Change.
+					},
+				},
+				{
+					Alert:  genAlert("alert2", "", "d_2"),
+					Folder: genCreatedFolder(t, "Original Folder f_1 Alerts - %s"),
+					Perms: []accesscontrol.SetResourcePermissionCommand{
+						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
+						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
+					},
+				},
+				{
+					Alert:  genAlert("alert3", "", "d_3"),
+					Folder: genCreatedFolder(t, "Original Folder f_1 Alerts - %s"),
+					Perms: []accesscontrol.SetResourcePermissionCommand{
+						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
+						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_EDIT.String()},  // Change.
+					},
+				},
+				{
+					Alert:  genAlert("alert4", "", "d_4"),
+					Folder: genCreatedFolder(t, "Original Folder f_1 Alerts - %s"),
+					Perms: []accesscontrol.SetResourcePermissionCommand{
+						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
+						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
+					},
+				},
+				{
+					Alert:  genAlert("alert5", "", "d_5"),
+					Folder: genCreatedFolder(t, "Original Folder f_1 Alerts - %s"),
+					Perms: []accesscontrol.SetResourcePermissionCommand{
+						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
+						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_ADMIN.String()}, // Change.
+					},
+				},
+			},
+		},
+		{
+			name:    "missing dashboard permission is inherited from folder",
+			folders: []*dashboards.Dashboard{genFolder(t, 1, "f_1"), genFolder(t, 2, "f_2")},
+			folderPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
+				"f_1": {
+					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()},
+					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_ADMIN.String()},
+				},
+				"f_2": {
+					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_VIEW.String()},
+					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
+				},
+			},
+			dashboards: []*dashboards.Dashboard{
+				genDashboard(t, 3, "d_1", 1),
+				genDashboard(t, 4, "d_2", 1),
+				genDashboard(t, 5, "d_3", 2),
+				genDashboard(t, 6, "d_4", 2),
+			},
+			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
+				"d_1": {
+					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
+				},
+				"d_2": {
+					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
+				},
+				"d_3": {
+					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
+				},
+				"d_4": {
+					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
+				},
+			},
+			alerts: []*models.Alert{genLegacyAlert("alert1", 3), genLegacyAlert("alert2", 4), genLegacyAlert("alert3", 5), genLegacyAlert("alert4", 6)},
+			expected: []expectedAlertMigration{
+				{
+					Alert:  genAlert("alert1", "f_1", "d_1"),
+					Folder: genFolder(t, 1, "f_1"), // Original folder since the perms didn't change.
+					Perms: []accesscontrol.SetResourcePermissionCommand{
+						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()}, // Inherits from Folder.
+						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_ADMIN.String()}, // Overrides from Folder.
+					},
+				},
+				{
+					Alert:  genAlert("alert2", "f_1", "d_2"),
+					Folder: genFolder(t, 1, "f_1"), // Original folder since the perms didn't change.
+					Perms: []accesscontrol.SetResourcePermissionCommand{
+						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_ADMIN.String()}, // Overrides from Folder.
+						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_ADMIN.String()}, // Inherits from Folder.
+					},
+				},
+				{
+					Alert:  genAlert("alert3", "f_2", "d_3"),
+					Folder: genFolder(t, 2, "f_2"), // Original folder since the perms didn't change.
+					Perms: []accesscontrol.SetResourcePermissionCommand{
+						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_VIEW.String()}, // Inherits from Folder.
+						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()},
+					},
+				},
+				{
+					Alert:  genAlert("alert4", "", "d_4"),
+					Folder: genCreatedFolder(t, "Original Folder f_2 Alerts - %s"),
+					Perms: []accesscontrol.SetResourcePermissionCommand{
+						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
+						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()}, // Inherits from Folder.
+					},
+				},
+			},
+		},
+		{
+			name:    "missing dashboard and folder view permission is still missing",
+			folders: []*dashboards.Dashboard{basicFolder},
+			folderPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
+				basicFolder.UID: {
+					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
+				},
+			},
+			dashboards: []*dashboards.Dashboard{basicDashboard},
+			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
+				basicDashboard.UID: {
+					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_VIEW.String()},
+				},
+			},
+			alerts: []*models.Alert{basicAlert1},
+			expected: []expectedAlertMigration{
+				{
+					Alert:  genAlert(basicAlert1.Name, basicFolder.UID, basicDashboard.UID),
+					Folder: basicFolder,
+					Perms: []accesscontrol.SetResourcePermissionCommand{
+						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
+					},
+				},
+			},
+		},
+
+		// General folder.
+		{
+			name:       "dashboard in general folder with default permissions migrates to General Alerting subfolder for permission",
+			dashboards: []*dashboards.Dashboard{genDashboard(t, 1, "d_1", 0)}, // Dashboard in general folder.
+			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
+				"d_1": defaultPerms,
+			},
+			alerts: []*models.Alert{genLegacyAlert("alert1", 1)},
+			expected: []expectedAlertMigration{
+				{
+					Alert:  genAlert("alert1", "f_1", "d_1"),
+					Folder: genCreatedFolder(t, "General Alerting Alerts - %s"),
+					Perms: []accesscontrol.SetResourcePermissionCommand{
+						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()}, // From Dashboard.
+						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_VIEW.String()}, // From Dashboard.
+					},
+				},
+			},
+		},
+		{
+			name:       "dashboard in general folder with some perms migrates to General Alerting subfolder with correct permissions",
+			dashboards: []*dashboards.Dashboard{genDashboard(t, 1, "d_1", 0)}, // Dashboard in general folder.
+			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
+				"d_1": { // Missing viewer.
+					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
+				},
+			},
+			alerts: []*models.Alert{genLegacyAlert("alert1", 1)},
+			expected: []expectedAlertMigration{
+				{
+					Alert:  genAlert("alert1", "f_1", "d_1"),
+					Folder: genCreatedFolder(t, "General Alerting Alerts - %s"),
+					Perms: []accesscontrol.SetResourcePermissionCommand{
+						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()}, // From Dashboard.
+					},
+				},
+			},
+		},
+		{
+			name:       "dashboard in general folder with empty perms migrates to General Alerting",
+			dashboards: []*dashboards.Dashboard{genDashboard(t, 1, "d_1", 0)}, // Dashboard in general folder.
+			alerts:     []*models.Alert{genLegacyAlert("alert1", 1)},
+			expected: []expectedAlertMigration{
+				{
+					Alert:  genAlert("alert1", "f_1", "d_1"),
+					Folder: genCreatedFolder(t, "General Alerting"),
+					Perms:  []accesscontrol.SetResourcePermissionCommand{},
+				},
+			},
+		},
+
+		// The following tests handled extra requirements of enterprise RBAC in that they include basic, fixed, and custom roles.
+		{
+			name:        "should handle basic roles the same as managed builtin roles",
+			enterprise:  true,
+			roles:       basicPerms(),
+			folders:     []*dashboards.Dashboard{basicFolder},
+			folderPerms: map[string][]accesscontrol.SetResourcePermissionCommand{basicFolder.UID: defaultPerms},
+			dashboards: []*dashboards.Dashboard{
+				genDashboard(t, 2, "d_1", basicFolder.ID),
+			},
+			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{
+				"d_1": {
+					{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
+					{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_EDIT.String()}, // Change.
+				},
+			},
+			alerts: []*models.Alert{genLegacyAlert("alert1", 2)},
+			expected: []expectedAlertMigration{
+				{
+					Alert:  genAlert("alert1", "", "d_1"),
+					Folder: genCreatedFolder(t, "Original Folder f_1 Alerts - %s"),
+					Perms: []accesscontrol.SetResourcePermissionCommand{
+						{BuiltinRole: string(org.RoleAdmin), Permission: dashboards.PERMISSION_ADMIN.String()}, // From basic:admin.
+						{BuiltinRole: string(org.RoleEditor), Permission: dashboards.PERMISSION_EDIT.String()},
+						{BuiltinRole: string(org.RoleViewer), Permission: dashboards.PERMISSION_EDIT.String()}, // Change.
+					},
+				},
+			},
+		},
+		{
+			name:       "should ignore fixed roles even if they would affect access",
+			enterprise: true,
+			roles: map[accesscontrol.Role][]accesscontrol.Permission{
+				{Name: "fixed:dashboards:writer"}: {
+					{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeDashboardsAll},
+					{Action: dashboards.ActionDashboardsWrite, Scope: dashboards.ScopeDashboardsAll},
+					{Action: dashboards.ActionDashboardsDelete, Scope: dashboards.ScopeDashboardsAll},
+					{Action: dashboards.ActionDashboardsCreate, Scope: dashboards.ScopeFoldersAll},
+					{Action: dashboards.ActionDashboardsPermissionsRead, Scope: dashboards.ScopeDashboardsAll},
+					{Action: dashboards.ActionDashboardsPermissionsWrite, Scope: dashboards.ScopeDashboardsAll},
+				},
+			},
+			folders:        []*dashboards.Dashboard{basicFolder},
+			folderPerms:    map[string][]accesscontrol.SetResourcePermissionCommand{basicFolder.UID: defaultPerms},
+			dashboards:     []*dashboards.Dashboard{basicDashboard},
+			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{basicDashboard.UID: defaultPerms},
+			alerts:         []*models.Alert{basicAlert1},
+			expected: []expectedAlertMigration{ // Expect no new folder.
+				{
+					Alert:  genAlert(basicAlert1.Name, basicFolder.UID, basicDashboard.UID),
+					Folder: basicFolder,
+					Perms:  defaultPerms,
+				},
+			},
+		},
+		{
+			name:       "should ignore custom roles even if they would affect access",
+			enterprise: true,
+			roles: map[accesscontrol.Role][]accesscontrol.Permission{
+				{Name: "custom role"}: {
+					{Action: dashboards.ActionDashboardsRead, Scope: dashboards.ScopeDashboardsAll},
+					{Action: dashboards.ActionDashboardsWrite, Scope: dashboards.ScopeDashboardsAll},
+					{Action: dashboards.ActionDashboardsDelete, Scope: dashboards.ScopeDashboardsAll},
+					{Action: dashboards.ActionDashboardsCreate, Scope: dashboards.ScopeFoldersAll},
+					{Action: dashboards.ActionDashboardsPermissionsRead, Scope: dashboards.ScopeDashboardsAll},
+					{Action: dashboards.ActionDashboardsPermissionsWrite, Scope: dashboards.ScopeDashboardsAll},
+				},
+			},
+			folders:        []*dashboards.Dashboard{basicFolder},
+			folderPerms:    map[string][]accesscontrol.SetResourcePermissionCommand{basicFolder.UID: defaultPerms},
+			dashboards:     []*dashboards.Dashboard{basicDashboard},
+			dashboardPerms: map[string][]accesscontrol.SetResourcePermissionCommand{basicDashboard.UID: defaultPerms},
+			alerts:         []*models.Alert{basicAlert1},
+			expected: []expectedAlertMigration{ // Expect no new folder.
+				{
+					Alert:  genAlert(basicAlert1.Name, basicFolder.UID, basicDashboard.UID),
+					Folder: basicFolder,
+					Perms:  defaultPerms,
+				},
+			},
+		},
+	}
+	for _, ttRaw := range tc {
+		t.Run(ttRaw.name, func(t *testing.T) {
+			for _, tt := range splitTestcase(ttRaw) {
+				t.Run(tt.name, func(t *testing.T) {
+					sqlStore := db.InitTestDB(t)
+					x := sqlStore.GetEngine()
+
+					if tt.enterprise {
+						createRoles(t, context.Background(), sqlStore, tt.roles)
+					}
+
+					service := NewTestMigrationService(t, sqlStore, &setting.Cfg{})
+					setupLegacyAlertsTables(t, x, nil, tt.alerts, tt.folders, tt.dashboards)
+
+					for i := 1; i < 3; i++ {
+						_, err := x.Insert(user.User{
+							ID:      int64(i),
+							OrgID:   1,
+							Name:    fmt.Sprintf("user%v", i),
+							Login:   fmt.Sprintf("user%v", i),
+							Email:   fmt.Sprintf("user%v@example.org", i),
+							Created: now,
+							Updated: now,
+						})
+						require.NoError(t, err)
+					}
+
+					for i := 1; i < 3; i++ {
+						_, err := x.Insert(team.Team{
+							ID:      int64(i),
+							OrgID:   1,
+							UID:     fmt.Sprintf("team%v", i),
+							Name:    fmt.Sprintf("team%v", i),
+							Created: now,
+							Updated: now,
+						})
+						require.NoError(t, err)
+					}
+
+					for _, f := range tt.folders {
+						_, err := service.migrationStore.SetFolderPermissions(context.Background(), 1, f.UID, tt.folderPerms[f.UID]...)
+						require.NoError(t, err)
+					}
+					for _, d := range tt.dashboards {
+						_, err := service.migrationStore.SetDashboardPermissions(context.Background(), 1, d.UID, tt.dashboardPerms[d.UID]...)
+						require.NoError(t, err)
+					}
+
+					err := service.Run(context.Background())
+					require.NoError(t, err)
+
+					// construct actuals.
+					orgId := int64(1)
+					rules := getAlertRules(t, x, orgId)
+					actual := make([]expectedAlertMigration, 0, len(rules))
+					for i, r := range rules {
+						// Remove generated fields.
+						require.NotEqual(t, r.Labels["rule_uid"], "")
+						delete(r.Labels, "rule_uid")
+						require.NotEqual(t, r.Annotations["__alertId__"], "")
+						delete(r.Annotations, "__alertId__")
+
+						folder := getDashboard(t, x, orgId, r.NamespaceUID)
+						rperms, err := service.migrationStore.GetFolderPermissions(context.Background(), getMigrationUser(orgId), folder.UID)
+						require.NoError(t, err)
+
+						expected := tt.expected[i]
+						if expected.Folder.UID == "" {
+							// We're expecting the UID to be generated, so remove it from comparison.
+							folder.UID = ""
+							r.NamespaceUID = ""
+							expected.Alert.NamespaceUID = ""
+						}
+
+						keep := make(map[accesscontrol.SetResourcePermissionCommand]dashboards.PermissionType)
+						for _, p := range rperms {
+							if permission := service.migrationStore.MapActions(p); permission != "" {
+								sp := accesscontrol.SetResourcePermissionCommand{
+									UserID:      p.UserId,
+									TeamID:      p.TeamId,
+									BuiltinRole: p.BuiltInRole,
+								}
+								pType := permissionMap[permission]
+								current, ok := keep[sp]
+								if !ok || pType > current {
+									keep[sp] = pType
+								}
+							}
+						}
+						perms := make([]accesscontrol.SetResourcePermissionCommand, 0, len(keep))
+						for p, pType := range keep {
+							p.Permission = pType.String()
+							perms = append(perms, p)
+						}
+
+						actual = append(actual, expectedAlertMigration{
+							Alert:  r,
+							Folder: folder,
+							Perms:  perms,
+						})
+					}
+
+					cOpt := []cmp.Option{
+						cmpopts.SortSlices(func(a, b expectedAlertMigration) bool {
+							return a.Alert.Title < b.Alert.Title
+						}),
+						cmpopts.SortSlices(func(a, b accesscontrol.SetResourcePermissionCommand) bool {
+							if a.BuiltinRole != b.BuiltinRole {
+								return a.BuiltinRole < b.BuiltinRole
+							}
+							if a.UserID != b.UserID {
+								return a.UserID < b.UserID
+							}
+							if a.TeamID != b.TeamID {
+								return a.TeamID < b.TeamID
+							}
+							return a.Permission < b.Permission
+						}),
+						cmpopts.IgnoreUnexported(ngModels.AlertRule{}, ngModels.AlertQuery{}),
+						cmpopts.IgnoreFields(ngModels.AlertRule{}, "ID", "Updated", "UID"),
+						cmpopts.IgnoreFields(dashboards.Dashboard{}, "ID", "Created", "Updated", "Data", "Slug"),
+					}
+					if !cmp.Equal(tt.expected, actual, cOpt...) {
+						t.Errorf("Unexpected Rule: %v", cmp.Diff(tt.expected, actual, cOpt...))
+					}
+				})
+			}
+		})
+	}
+}
+
+func createRoles(t testing.TB, ctx context.Context, store db.DB, rolePerms map[accesscontrol.Role][]accesscontrol.Permission) {
+	_ = store.WithDbSession(ctx, func(sess *db.Session) error {
+		ts := time.Now()
+		var roles []accesscontrol.Role
+
+		basic := accesscontrol.BuildBasicRoleDefinitions()
+
+		var permissions []accesscontrol.Permission
+		var builtinRoleAssignments []accesscontrol.BuiltinRole
+		var userRoleAssignments []accesscontrol.UserRole
+		var teamRoleAssignments []accesscontrol.TeamRole
+		i := int64(1)
+		for role, perms := range rolePerms {
+			if role.IsBasic() {
+				for roleType, br := range basic {
+					if br.Name == role.Name {
+						role = br.Role()
+						builtinRoleAssignments = append(builtinRoleAssignments, accesscontrol.BuiltinRole{
+							OrgID: accesscontrol.GlobalOrgID, RoleID: i, Role: roleType, Created: ts, Updated: ts,
+						})
+					}
+				}
+			} else {
+				userRoleAssignments = append(userRoleAssignments, accesscontrol.UserRole{
+					OrgID: accesscontrol.GlobalOrgID, RoleID: i, UserID: 1, Created: ts,
+				})
+				teamRoleAssignments = append(teamRoleAssignments, accesscontrol.TeamRole{
+					OrgID: accesscontrol.GlobalOrgID, RoleID: i, TeamID: 1, Created: ts,
+				})
+			}
+			role.ID = i
+			role.Created = ts
+			role.Updated = ts
+
+			roles = append(roles, role)
+
+			for _, p := range perms {
+				permissions = append(permissions, accesscontrol.Permission{
+					RoleID: role.ID, Action: p.Action, Scope: p.Scope, Created: ts, Updated: ts,
+				})
+			}
+			i++
+		}
+
+		_, err := sess.InsertMulti(&roles)
+		require.NoError(t, err)
+
+		_, err = sess.InsertMulti(&permissions)
+		require.NoError(t, err)
+
+		_, err = sess.InsertMulti(&builtinRoleAssignments)
+		require.NoError(t, err)
+
+		_, err = sess.InsertMulti(&userRoleAssignments)
+		require.NoError(t, err)
+
+		_, err = sess.InsertMulti(&teamRoleAssignments)
+		require.NoError(t, err)
+
+		return nil
+	})
+}
diff --git a/pkg/services/ngalert/migration/service_test.go b/pkg/services/ngalert/migration/service_test.go
index 4bc386a5fe5ed..0b4c464e97418 100644
--- a/pkg/services/ngalert/migration/service_test.go
+++ b/pkg/services/ngalert/migration/service_test.go
@@ -187,4 +187,106 @@ func TestServiceRevert(t *testing.T) {
 			require.Nil(t, getDashboard(t, x, 1, uid))
 		}
 	})
+
+	t.Run("revert skips migrated folders that are not empty", func(t *testing.T) {
+		sqlStore := db.InitTestDB(t)
+		x := sqlStore.GetEngine()
+		alerts = []*legacymodels.Alert{
+			createAlert(t, 1, 8, 1, "alert1", []string{"notifier1"}),
+		}
+		setupLegacyAlertsTables(t, x, channels, alerts, folders, dashes)
+
+		dashCount, err := x.Table("dashboard").Count(&dashboards.Dashboard{})
+		require.NoError(t, err)
+		require.Equal(t, int64(4), dashCount)
+
+		// Run migration.
+		ctx := context.Background()
+		cfg := &setting.Cfg{
+			ForceMigration: true,
+			UnifiedAlerting: setting.UnifiedAlertingSettings{
+				Enabled: pointer(true),
+			},
+		}
+		service := NewTestMigrationService(t, sqlStore, cfg)
+
+		err = service.migrationStore.SetMigrated(ctx, false)
+		require.NoError(t, err)
+
+		err = service.Run(ctx)
+		require.NoError(t, err)
+
+		// Verify migration was run.
+		migrated, err := service.migrationStore.IsMigrated(ctx)
+		require.NoError(t, err)
+		require.Equal(t, true, migrated)
+
+		// Verify we created some folders.
+		newDashCount, err := x.Table("dashboard").Count(&dashboards.Dashboard{})
+		require.NoError(t, err)
+		require.Truef(t, newDashCount > dashCount, "newDashCount: %d should be greater than dashCount: %d", newDashCount, dashCount)
+
+		// Check that dashboards and folders from before migration still exist.
+		require.NotNil(t, getDashboard(t, x, 1, "dash1-1"))
+		require.NotNil(t, getDashboard(t, x, 1, "dash2-1"))
+		require.NotNil(t, getDashboard(t, x, 1, "dash-in-general-1"))
+
+		state, err := service.migrationStore.GetOrgMigrationState(ctx, 1)
+		require.NoError(t, err)
+
+		// Verify list of created folders.
+		require.NotEmpty(t, state.CreatedFolders)
+		var generalAlertingFolder *dashboards.Dashboard
+		for _, uid := range state.CreatedFolders {
+			f := getDashboard(t, x, 1, uid)
+			require.NotNil(t, f)
+			if f.Slug == "general-alerting" {
+				generalAlertingFolder = f
+			}
+		}
+		require.NotNil(t, generalAlertingFolder)
+
+		// Create dashboard in general alerting.
+		newDashes := []*dashboards.Dashboard{
+			createDashboard(t, 99, 1, "dash-in-general-alerting-1", generalAlertingFolder.ID, nil),
+		}
+		_, err = x.Insert(newDashes)
+		require.NoError(t, err)
+
+		newF := getDashboard(t, x, 1, "dash-in-general-alerting-1")
+		require.NotNil(t, newF)
+
+		// Revert migration.
+		service.cfg.UnifiedAlerting.Enabled = pointer(false)
+		err = service.Run(ctx)
+		require.NoError(t, err)
+
+		// Verify revert was run.
+		migrated, err = service.migrationStore.IsMigrated(ctx)
+		require.NoError(t, err)
+		require.Equal(t, false, migrated)
+
+		// Verify we are back to the original count + 2.
+		newDashCount, err = x.Table("dashboard").Count(&dashboards.Dashboard{})
+		require.NoError(t, err)
+		require.Equalf(t, dashCount+2, newDashCount, "newDashCount: %d should be equal to dashCount + 2: %d after revert", newDashCount, dashCount)
+
+		// Check that dashboards and folders from before migration still exist.
+		require.NotNil(t, getDashboard(t, x, 1, "dash1-1"))
+		require.NotNil(t, getDashboard(t, x, 1, "dash2-1"))
+		require.NotNil(t, getDashboard(t, x, 1, "dash-in-general-1"))
+
+		// Check that the general alerting folder still exists.
+		require.NotNil(t, getDashboard(t, x, 1, generalAlertingFolder.UID))
+		// Check that the new dashboard in general alerting folder still exists.
+		require.NotNil(t, getDashboard(t, x, 1, "dash-in-general-alerting-1"))
+
+		// Check that other folders created during migration are gone.
+		for _, uid := range state.CreatedFolders {
+			if uid == generalAlertingFolder.UID {
+				continue
+			}
+			require.Nil(t, getDashboard(t, x, 1, uid))
+		}
+	})
 }
diff --git a/pkg/services/ngalert/migration/silences.go b/pkg/services/ngalert/migration/silences.go
index 0263605c0a899..b5431e854f801 100644
--- a/pkg/services/ngalert/migration/silences.go
+++ b/pkg/services/ngalert/migration/silences.go
@@ -26,6 +26,7 @@ const (
 	ErrorAlertName = "DatasourceError"
 )
 
+// addErrorSilence adds a silence for the given rule to the orgMigration if the ExecutionErrorState was set to keep_state.
 func (om *OrgMigration) addErrorSilence(rule *models.AlertRule) error {
 	uid, err := uuid.NewRandom()
 	if err != nil {
@@ -58,6 +59,7 @@ func (om *OrgMigration) addErrorSilence(rule *models.AlertRule) error {
 	return nil
 }
 
+// addNoDataSilence adds a silence for the given rule to the orgMigration if the NoDataState was set to keep_state.
 func (om *OrgMigration) addNoDataSilence(rule *models.AlertRule) error {
 	uid, err := uuid.NewRandom()
 	if err != nil {
diff --git a/pkg/services/ngalert/migration/store/database.go b/pkg/services/ngalert/migration/store/database.go
index 99589b57f4953..2eecc8924adb8 100644
--- a/pkg/services/ngalert/migration/store/database.go
+++ b/pkg/services/ngalert/migration/store/database.go
@@ -3,11 +3,12 @@ package store
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
 	"strconv"
-	"time"
+	"strings"
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/kvstore"
@@ -44,8 +45,11 @@ type Store interface {
 
 	GetOrgDashboardAlerts(ctx context.Context, orgID int64) (map[int64][]*DashAlert, int, error)
 
-	GetACL(ctx context.Context, orgID int64, dashID int64) ([]*DashboardACL, error)
-	SetACL(ctx context.Context, orgID int64, dashboardID int64, items []*DashboardACL) error
+	GetDashboardPermissions(ctx context.Context, user identity.Requester, resourceID string) ([]accesscontrol.ResourcePermission, error)
+	GetFolderPermissions(ctx context.Context, user identity.Requester, resourceID string) ([]accesscontrol.ResourcePermission, error)
+	SetDashboardPermissions(ctx context.Context, orgID int64, resourceID string, commands ...accesscontrol.SetResourcePermissionCommand) ([]accesscontrol.ResourcePermission, error)
+	SetFolderPermissions(ctx context.Context, orgID int64, resourceID string, commands ...accesscontrol.SetResourcePermissionCommand) ([]accesscontrol.ResourcePermission, error)
+	MapActions(permission accesscontrol.ResourcePermission) string
 
 	GetDashboard(ctx context.Context, orgID int64, id int64) (*dashboards.Dashboard, error)
 	GetFolder(ctx context.Context, cmd *folder.GetFolderQuery) (*folder.Folder, error)
@@ -62,15 +66,18 @@ type Store interface {
 }
 
 type migrationStore struct {
-	store                          db.DB
-	cfg                            *setting.Cfg
-	log                            log.Logger
-	kv                             kvstore.KVStore
-	alertingStore                  *store.DBstore
-	dashboardService               dashboards.DashboardService
-	folderService                  folder.Service
-	dataSourceCache                datasources.CacheService
-	orgService                     org.Service
+	store                db.DB
+	cfg                  *setting.Cfg
+	log                  log.Logger
+	kv                   kvstore.KVStore
+	alertingStore        *store.DBstore
+	dashboardService     dashboards.DashboardService
+	folderService        folder.Service
+	dataSourceCache      datasources.CacheService
+	folderPermissions    accesscontrol.FolderPermissionsService
+	dashboardPermissions accesscontrol.DashboardPermissionsService
+	orgService           org.Service
+
 	legacyAlertNotificationService *legacyalerting.AlertNotificationService
 }
 
@@ -85,6 +92,8 @@ func ProvideMigrationStore(
 	dashboardService dashboards.DashboardService,
 	folderService folder.Service,
 	dataSourceCache datasources.CacheService,
+	folderPermissions accesscontrol.FolderPermissionsService,
+	dashboardPermissions accesscontrol.DashboardPermissionsService,
 	orgService org.Service,
 	legacyAlertNotificationService *legacyalerting.AlertNotificationService,
 ) (Store, error) {
@@ -97,6 +106,8 @@ func ProvideMigrationStore(
 		dashboardService:               dashboardService,
 		folderService:                  folderService,
 		dataSourceCache:                dataSourceCache,
+		folderPermissions:              folderPermissions,
+		dashboardPermissions:           dashboardPermissions,
 		orgService:                     orgService,
 		legacyAlertNotificationService: legacyAlertNotificationService,
 	}, nil
@@ -230,7 +241,8 @@ func (ms *migrationStore) RevertAllOrgs(ctx context.Context) error {
 		}
 		for _, o := range orgs {
 			if err := ms.DeleteMigratedFolders(ctx, o.ID); err != nil {
-				return err
+				ms.log.Warn("Failed to delete migrated folders", "orgID", o.ID, "err", err)
+				continue
 			}
 		}
 
@@ -283,6 +295,8 @@ func (ms *migrationStore) DeleteMigratedFolders(ctx context.Context, orgID int64
 	return ms.DeleteFolders(ctx, orgID, summary.CreatedFolders...)
 }
 
+var ErrFolderNotDeleted = fmt.Errorf("folder not deleted")
+
 // DeleteFolders deletes the folders from the given orgs with the given UIDs. This includes all folder permissions.
 // If the folder is not empty of all descendants the operation will fail and return an error.
 func (ms *migrationStore) DeleteFolders(ctx context.Context, orgID int64, uids ...string) error {
@@ -290,18 +304,56 @@ func (ms *migrationStore) DeleteFolders(ctx context.Context, orgID int64, uids .
 		return nil
 	}
 
+	var errs error
 	usr := accesscontrol.BackgroundUser("ngalert_migration_revert", orgID, org.RoleAdmin, revertPermissions)
 	for _, folderUID := range uids {
+		// Check if folder is empty. If not, we should not delete it.
+		uid := folderUID
+		countCmd := folder.GetDescendantCountsQuery{
+			UID:          &uid,
+			OrgID:        orgID,
+			SignedInUser: usr.(*user.SignedInUser),
+		}
+		count, err := ms.folderService.GetDescendantCounts(ctx, &countCmd)
+		if err != nil {
+			errs = errors.Join(errs, fmt.Errorf("folder %s: %w", folderUID, err))
+			continue
+		}
+		var descendantCounts []string
+		var cntErr error
+		for kind, cnt := range count {
+			if cnt > 0 {
+				descendantCounts = append(descendantCounts, fmt.Sprintf("%d %s", cnt, kind))
+				if err != nil {
+					cntErr = errors.Join(cntErr, err)
+					continue
+				}
+			}
+		}
+		if cntErr != nil {
+			errs = errors.Join(errs, fmt.Errorf("folder %s: %w", folderUID, cntErr))
+			continue
+		}
+
+		if len(descendantCounts) > 0 {
+			errs = errors.Join(errs, fmt.Errorf("folder %s contains descendants: %s", folderUID, strings.Join(descendantCounts, ", ")))
+			continue
+		}
+
 		cmd := folder.DeleteFolderCommand{
-			UID:          folderUID,
+			UID:          uid,
 			OrgID:        orgID,
 			SignedInUser: usr.(*user.SignedInUser),
 		}
-		err := ms.folderService.Delete(ctx, &cmd) // Also handles permissions and other related entities.
+		err = ms.folderService.Delete(ctx, &cmd) // Also handles permissions and other related entities.
 		if err != nil {
-			return err
+			errs = errors.Join(errs, fmt.Errorf("folder %s: %w", folderUID, err))
+			continue
 		}
 	}
+	if errs != nil {
+		return fmt.Errorf("%w: %w", ErrFolderNotDeleted, errs)
+	}
 	return nil
 }
 
@@ -325,155 +377,6 @@ func (ms *migrationStore) GetNotificationChannels(ctx context.Context, orgID int
 	})
 }
 
-func (ms *migrationStore) GetFolder(ctx context.Context, cmd *folder.GetFolderQuery) (*folder.Folder, error) {
-	return ms.folderService.Get(ctx, cmd)
-}
-
-func (ms *migrationStore) CreateFolder(ctx context.Context, cmd *folder.CreateFolderCommand) (*folder.Folder, error) {
-	return ms.folderService.Create(ctx, cmd)
-}
-
-// based on SQLStore.GetDashboardACLInfoList()
-func (ms *migrationStore) GetACL(ctx context.Context, orgID, dashboardID int64) ([]*DashboardACL, error) {
-	var err error
-
-	falseStr := ms.store.GetDialect().BooleanStr(false)
-
-	result := make([]*DashboardACL, 0)
-	rawSQL := `
-			-- get distinct permissions for the dashboard and its parent folder
-			SELECT DISTINCT
-				da.id,
-				da.user_id,
-				da.team_id,
-				da.permission,
-				da.role
-			FROM dashboard as d
-				LEFT JOIN dashboard folder on folder.id = d.folder_id
-				LEFT JOIN dashboard_acl AS da ON
-				da.dashboard_id = d.id OR
-				da.dashboard_id = d.folder_id  OR
-				(
-					-- include default permissions --
-					da.org_id = -1 AND (
-					  (folder.id IS NOT NULL AND folder.has_acl = ` + falseStr + `) OR
-					  (folder.id IS NULL AND d.has_acl = ` + falseStr + `)
-					)
-				)
-			WHERE d.org_id = ? AND d.id = ? AND da.id IS NOT NULL
-			ORDER BY da.id ASC
-			`
-	err = ms.store.WithDbSession(ctx, func(sess *db.Session) error {
-		return sess.SQL(rawSQL, orgID, dashboardID).Find(&result)
-	})
-	if err != nil {
-		return nil, err
-	}
-	return result, err
-}
-
-// based on SQLStore.UpdateDashboardACL()
-// it should be called from inside a transaction
-func (ms *migrationStore) SetACL(ctx context.Context, orgID int64, dashboardID int64, items []*DashboardACL) error {
-	if dashboardID <= 0 {
-		return fmt.Errorf("folder id must be greater than zero for a folder permission")
-	}
-	return ms.store.WithDbSession(ctx, func(sess *db.Session) error {
-		// userPermissionsMap is a map keeping the highest permission per user
-		// for handling conficting inherited (folder) and non-inherited (dashboard) user permissions
-		userPermissionsMap := make(map[int64]*DashboardACL, len(items))
-		// teamPermissionsMap is a map keeping the highest permission per team
-		// for handling conficting inherited (folder) and non-inherited (dashboard) team permissions
-		teamPermissionsMap := make(map[int64]*DashboardACL, len(items))
-		for _, item := range items {
-			if item.UserID != 0 {
-				acl, ok := userPermissionsMap[item.UserID]
-				if !ok {
-					userPermissionsMap[item.UserID] = item
-				} else {
-					if item.Permission > acl.Permission {
-						// the higher permission wins
-						userPermissionsMap[item.UserID] = item
-					}
-				}
-			}
-
-			if item.TeamID != 0 {
-				acl, ok := teamPermissionsMap[item.TeamID]
-				if !ok {
-					teamPermissionsMap[item.TeamID] = item
-				} else {
-					if item.Permission > acl.Permission {
-						// the higher permission wins
-						teamPermissionsMap[item.TeamID] = item
-					}
-				}
-			}
-		}
-
-		type keyType struct {
-			UserID     int64 `xorm:"user_id"`
-			TeamID     int64 `xorm:"team_id"`
-			Role       RoleType
-			Permission permissionType
-		}
-		// seen keeps track of inserted perrmissions to avoid duplicates (due to inheritance)
-		seen := make(map[keyType]struct{}, len(items))
-		for _, item := range items {
-			if item.UserID == 0 && item.TeamID == 0 && (item.Role == nil || !item.Role.IsValid()) {
-				return dashboards.ErrDashboardACLInfoMissing
-			}
-
-			// ignore duplicate user permissions
-			if item.UserID != 0 {
-				acl, ok := userPermissionsMap[item.UserID]
-				if ok {
-					if acl.Id != item.Id {
-						continue
-					}
-				}
-			}
-
-			// ignore duplicate team permissions
-			if item.TeamID != 0 {
-				acl, ok := teamPermissionsMap[item.TeamID]
-				if ok {
-					if acl.Id != item.Id {
-						continue
-					}
-				}
-			}
-
-			key := keyType{UserID: item.UserID, TeamID: item.TeamID, Role: "", Permission: item.Permission}
-			if item.Role != nil {
-				key.Role = *item.Role
-			}
-			if _, ok := seen[key]; ok {
-				continue
-			}
-
-			// unset Id so that the new record will get a different one
-			item.Id = 0
-			item.OrgID = orgID
-			item.DashboardID = dashboardID
-			item.Created = time.Now()
-			item.Updated = time.Now()
-
-			sess.Nullable("user_id", "team_id")
-			if _, err := sess.Insert(item); err != nil {
-				return err
-			}
-			seen[key] = struct{}{}
-		}
-
-		// Update dashboard HasACL flag
-		dashboard := dashboards.Dashboard{HasACL: true}
-		_, err := sess.Cols("has_acl").Where("id=?", dashboardID).Update(&dashboard)
-
-		return err
-	})
-}
-
 // GetOrgDashboardAlerts loads all legacy dashboard alerts for the given org mapped by dashboard id.
 func (ms *migrationStore) GetOrgDashboardAlerts(ctx context.Context, orgID int64) (map[int64][]*DashAlert, int, error) {
 	var alerts []legacymodels.Alert
@@ -506,6 +409,34 @@ func (ms *migrationStore) GetOrgDashboardAlerts(ctx context.Context, orgID int64
 	return mappedAlerts, len(alerts), nil
 }
 
+func (ms *migrationStore) GetDashboardPermissions(ctx context.Context, user identity.Requester, resourceID string) ([]accesscontrol.ResourcePermission, error) {
+	return ms.dashboardPermissions.GetPermissions(ctx, user, resourceID)
+}
+
+func (ms *migrationStore) GetFolderPermissions(ctx context.Context, user identity.Requester, resourceID string) ([]accesscontrol.ResourcePermission, error) {
+	return ms.folderPermissions.GetPermissions(ctx, user, resourceID)
+}
+
+func (ms *migrationStore) GetFolder(ctx context.Context, cmd *folder.GetFolderQuery) (*folder.Folder, error) {
+	return ms.folderService.Get(ctx, cmd)
+}
+
+func (ms *migrationStore) CreateFolder(ctx context.Context, cmd *folder.CreateFolderCommand) (*folder.Folder, error) {
+	return ms.folderService.Create(ctx, cmd)
+}
+
+func (ms *migrationStore) SetDashboardPermissions(ctx context.Context, orgID int64, resourceID string, commands ...accesscontrol.SetResourcePermissionCommand) ([]accesscontrol.ResourcePermission, error) {
+	return ms.dashboardPermissions.SetPermissions(ctx, orgID, resourceID, commands...)
+}
+
+func (ms *migrationStore) SetFolderPermissions(ctx context.Context, orgID int64, resourceID string, commands ...accesscontrol.SetResourcePermissionCommand) ([]accesscontrol.ResourcePermission, error) {
+	return ms.folderPermissions.SetPermissions(ctx, orgID, resourceID, commands...)
+}
+
+func (ms *migrationStore) MapActions(permission accesscontrol.ResourcePermission) string {
+	return ms.dashboardPermissions.MapActions(permission)
+}
+
 func (ms *migrationStore) CaseInsensitive() bool {
 	return ms.store.GetDialect().SupportEngine()
 }
diff --git a/pkg/services/ngalert/migration/store/models.go b/pkg/services/ngalert/migration/store/models.go
index 7053e4199edc0..8fe78ee5722da 100644
--- a/pkg/services/ngalert/migration/store/models.go
+++ b/pkg/services/ngalert/migration/store/models.go
@@ -2,43 +2,10 @@ package store
 
 import (
 	"encoding/json"
-	"time"
 
 	legacymodels "github.com/grafana/grafana/pkg/services/alerting/models"
 )
 
-type RoleType string
-
-const (
-	RoleNone   RoleType = "None"
-	RoleViewer RoleType = "Viewer"
-	RoleEditor RoleType = "Editor"
-	RoleAdmin  RoleType = "Admin"
-)
-
-func (r RoleType) IsValid() bool {
-	return r == RoleViewer || r == RoleAdmin || r == RoleEditor || r == RoleNone
-}
-
-type permissionType int
-
-type DashboardACL struct {
-	// nolint:stylecheck
-	Id          int64
-	OrgID       int64 `xorm:"org_id"`
-	DashboardID int64 `xorm:"dashboard_id"`
-
-	UserID     int64     `xorm:"user_id"`
-	TeamID     int64     `xorm:"team_id"`
-	Role       *RoleType // pointer to be nullable
-	Permission permissionType
-
-	Created time.Time
-	Updated time.Time
-}
-
-func (p DashboardACL) TableName() string { return "dashboard_acl" }
-
 // uidOrID for both uid and ID, primarily used for mapping legacy channel to migrated receiver.
 type UidOrID any
 
diff --git a/pkg/services/ngalert/migration/store/testing.go b/pkg/services/ngalert/migration/store/testing.go
index 7f912000f92ca..a21dfa4d41544 100644
--- a/pkg/services/ngalert/migration/store/testing.go
+++ b/pkg/services/ngalert/migration/store/testing.go
@@ -1,26 +1,38 @@
 package store
 
 import (
+	"context"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/infra/localcache"
 	"github.com/grafana/grafana/pkg/infra/log/logtest"
 	"github.com/grafana/grafana/pkg/infra/tracing"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/acimpl"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
 	legacyalerting "github.com/grafana/grafana/pkg/services/alerting"
-	"github.com/grafana/grafana/pkg/services/datasources/guardian"
+	"github.com/grafana/grafana/pkg/services/dashboards/database"
+	dashboardservice "github.com/grafana/grafana/pkg/services/dashboards/service"
+	datasourceGuardian "github.com/grafana/grafana/pkg/services/datasources/guardian"
 	datasourceService "github.com/grafana/grafana/pkg/services/datasources/service"
 	encryptionservice "github.com/grafana/grafana/pkg/services/encryption/service"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/folder/folderimpl"
+	"github.com/grafana/grafana/pkg/services/guardian"
+	"github.com/grafana/grafana/pkg/services/licensing/licensingtest"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/services/ngalert/tests/fakes"
-	"github.com/grafana/grafana/pkg/services/ngalert/testutil"
 	"github.com/grafana/grafana/pkg/services/org/orgimpl"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/supportbundles/bundleregistry"
+	"github.com/grafana/grafana/pkg/services/tag/tagimpl"
+	"github.com/grafana/grafana/pkg/services/team/teamimpl"
+	"github.com/grafana/grafana/pkg/services/user/userimpl"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -28,20 +40,52 @@ func NewTestMigrationStore(t *testing.T, sqlStore *sqlstore.SQLStore, cfg *setti
 	if cfg.UnifiedAlerting.BaseInterval == 0 {
 		cfg.UnifiedAlerting.BaseInterval = time.Second * 10
 	}
+	features := featuremgmt.WithFeatures()
+	cfg.IsFeatureToggleEnabled = features.IsEnabled
 	alertingStore := store.DBstore{
 		SQLStore: sqlStore,
 		Cfg:      cfg.UnifiedAlerting,
 	}
 	bus := bus.ProvideBus(tracing.InitializeTracerForTest())
 	folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
-	dashboardService, dashboardStore := testutil.SetupDashboardService(t, sqlStore, folderStore, cfg)
-	folderService := testutil.SetupFolderService(t, cfg, sqlStore, dashboardStore, folderStore, bus)
 
+	cache := localcache.ProvideService()
 	quotaService := &quotatest.FakeQuotaService{}
+	ac := acimpl.ProvideAccessControl(cfg)
+	routeRegister := routing.ProvideRegister()
+	acSvc, err := acimpl.ProvideService(cfg, sqlStore, routing.ProvideRegister(), cache, ac, features)
+	require.NoError(t, err)
+
+	license := licensingtest.NewFakeLicensing()
+	license.On("FeatureEnabled", "accesscontrol.enforcement").Return(true).Maybe()
+	teamSvc := teamimpl.ProvideService(sqlStore, cfg)
 	orgService, err := orgimpl.ProvideService(sqlStore, cfg, quotaService)
 	require.NoError(t, err)
+	userSvc, err := userimpl.ProvideService(sqlStore, orgService, cfg, teamSvc, cache, quotaService, bundleregistry.ProvideService())
+	require.NoError(t, err)
+
+	dashboardStore, err := database.ProvideDashboardStore(sqlStore, sqlStore.Cfg, features, tagimpl.ProvideService(sqlStore, cfg), quotaService)
+	require.NoError(t, err)
+	folderService := folderimpl.ProvideService(ac, bus, cfg, dashboardStore, folderStore, sqlStore, features)
+
+	folderPermissions, err := ossaccesscontrol.ProvideFolderPermissions(
+		features, routeRegister, sqlStore, ac, license, dashboardStore, folderService, acSvc, teamSvc, userSvc)
+	require.NoError(t, err)
+	dashboardPermissions, err := ossaccesscontrol.ProvideDashboardPermissions(
+		features, routeRegister, sqlStore, ac, license, dashboardStore, folderService, acSvc, teamSvc, userSvc)
+	require.NoError(t, err)
+
+	dashboardService, err := dashboardservice.ProvideDashboardServiceImpl(
+		cfg, dashboardStore, folderStore, nil,
+		features, folderPermissions, dashboardPermissions, ac,
+		folderService,
+	)
+	require.NoError(t, err)
+	guardian.InitAccessControlGuardian(setting.NewCfg(), ac, dashboardService)
+
+	err = acSvc.RegisterFixedRoles(context.Background())
+	require.NoError(t, err)
 
-	cache := localcache.ProvideService()
 	return &migrationStore{
 		log:                            &logtest.Fake{},
 		cfg:                            cfg,
@@ -50,7 +94,9 @@ func NewTestMigrationStore(t *testing.T, sqlStore *sqlstore.SQLStore, cfg *setti
 		alertingStore:                  &alertingStore,
 		dashboardService:               dashboardService,
 		folderService:                  folderService,
-		dataSourceCache:                datasourceService.ProvideCacheService(cache, sqlStore, guardian.ProvideGuardian()),
+		dataSourceCache:                datasourceService.ProvideCacheService(cache, sqlStore, datasourceGuardian.ProvideGuardian()),
+		folderPermissions:              folderPermissions,
+		dashboardPermissions:           dashboardPermissions,
 		orgService:                     orgService,
 		legacyAlertNotificationService: legacyalerting.ProvideService(sqlStore, encryptionservice.SetupTestService(t), nil),
 	}
diff --git a/pkg/services/ngalert/migration/ualert.go b/pkg/services/ngalert/migration/ualert.go
index 085960d14de8f..918e7859f1882 100644
--- a/pkg/services/ngalert/migration/ualert.go
+++ b/pkg/services/ngalert/migration/ualert.go
@@ -5,20 +5,23 @@ import (
 	"fmt"
 
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
+	migmodels "github.com/grafana/grafana/pkg/services/ngalert/migration/models"
 	migrationStore "github.com/grafana/grafana/pkg/services/ngalert/migration/store"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 )
 
-func (om *OrgMigration) migrateAlerts(ctx context.Context, alerts []*migrationStore.DashAlert, dashboardUID string, folderUID string) ([]*AlertPair, error) {
+func (om *OrgMigration) migrateAlerts(ctx context.Context, alerts []*migrationStore.DashAlert, info migmodels.DashboardUpgradeInfo) ([]*AlertPair, error) {
 	log := om.log.New(
-		"dashboardUID", dashboardUID,
-		"newFolderUID", folderUID,
+		"dashboardUid", info.DashboardUID,
+		"dashboardName", info.DashboardName,
+		"newFolderUid", info.NewFolderUID,
+		"newFolderNane", info.NewFolderName,
 	)
 
 	pairs := make([]*AlertPair, 0, len(alerts))
 	for _, da := range alerts {
 		al := log.New("ruleID", da.ID, "ruleName", da.Name)
-		alertRule, err := om.migrateAlert(ctx, al, da, dashboardUID, folderUID)
+		alertRule, err := om.migrateAlert(ctx, al, da, info)
 		if err != nil {
 			return nil, fmt.Errorf("migrate alert: %w", err)
 		}
@@ -29,12 +32,11 @@ func (om *OrgMigration) migrateAlerts(ctx context.Context, alerts []*migrationSt
 }
 
 func (om *OrgMigration) migrateDashboard(ctx context.Context, dashID int64, alerts []*migrationStore.DashAlert) ([]*AlertPair, error) {
-	dash, newFolder, err := om.getOrCreateMigratedFolder(ctx, om.log, dashID)
+	info, err := om.migratedFolder(ctx, om.log, dashID)
 	if err != nil {
 		return nil, fmt.Errorf("get or create migrated folder: %w", err)
 	}
-
-	pairs, err := om.migrateAlerts(ctx, alerts, dash.UID, newFolder.UID)
+	pairs, err := om.migrateAlerts(ctx, alerts, *info)
 	if err != nil {
 		return nil, fmt.Errorf("migrate and save alerts: %w", err)
 	}
diff --git a/pkg/services/ngalert/migration/ualert_test.go b/pkg/services/ngalert/migration/ualert_test.go
index 2f4cd49f90b6d..05a278c109345 100644
--- a/pkg/services/ngalert/migration/ualert_test.go
+++ b/pkg/services/ngalert/migration/ualert_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/folder"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/util"
 )
@@ -106,13 +106,13 @@ const invalidUri = "�6�M��)uk譹1(�h`$�o�N>mĕ����cS2�dh
 
 func Test_getAlertFolderNameFromDashboard(t *testing.T) {
 	t.Run("should include full title", func(t *testing.T) {
-		dash := &dashboards.Dashboard{
-			UID:   util.GenerateShortUID(),
+		hash := util.GenerateShortUID()
+		f := &folder.Folder{
 			Title: "TEST",
 		}
-		folder := getAlertFolderNameFromDashboard(dash)
-		require.Contains(t, folder, dash.Title)
-		require.Contains(t, folder, dash.UID)
+		name := generateAlertFolderName(f, permissionHash(hash))
+		require.Contains(t, name, f.Title)
+		require.Contains(t, name, hash)
 	})
 	t.Run("should cut title to the length", func(t *testing.T) {
 		title := ""
@@ -124,13 +124,13 @@ func Test_getAlertFolderNameFromDashboard(t *testing.T) {
 			}
 		}
 
-		dash := &dashboards.Dashboard{
-			UID:   util.GenerateShortUID(),
+		hash := util.GenerateShortUID()
+		f := &folder.Folder{
 			Title: title,
 		}
-		folder := getAlertFolderNameFromDashboard(dash)
-		require.Len(t, folder, MaxFolderName)
-		require.Contains(t, folder, dash.UID)
+		name := generateAlertFolderName(f, permissionHash(hash))
+		require.Len(t, name, MaxFolderName)
+		require.Contains(t, name, hash)
 	})
 }
 
diff --git a/pkg/services/ngalert/notifier/external_alertmanager_test.go b/pkg/services/ngalert/notifier/external_alertmanager_test.go
index 8985b0135e073..b54d73f7762c0 100644
--- a/pkg/services/ngalert/notifier/external_alertmanager_test.go
+++ b/pkg/services/ngalert/notifier/external_alertmanager_test.go
@@ -2,11 +2,14 @@ package notifier
 
 import (
 	"context"
+	"math/rand"
+	"os"
 	"testing"
+	"time"
 
 	"github.com/go-openapi/strfmt"
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
-	amfake "github.com/grafana/grafana/pkg/services/ngalert/notifier/fake"
+	"github.com/grafana/grafana/pkg/util"
 	amv2 "github.com/prometheus/alertmanager/api/v2/models"
 	"github.com/stretchr/testify/require"
 )
@@ -85,88 +88,103 @@ func TestNewExternalAlertmanager(t *testing.T) {
 	}
 }
 
-func TestSilences(t *testing.T) {
-	const (
-		tenantID = "1"
-		password = "password"
-	)
-	fakeAm := amfake.NewFakeExternalAlertmanager(t, tenantID, password)
+func TestIntegrationRemoteAlertmanagerSilences(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	amURL, ok := os.LookupEnv("AM_URL")
+	if !ok {
+		t.Skip("No Alertmanager URL provided")
+	}
+	tenantID := os.Getenv("AM_TENANT_ID")
+	password := os.Getenv("AM_PASSWORD")
 
-	// Using a wrong password should cause an error.
 	cfg := externalAlertmanagerConfig{
-		URL:               fakeAm.Server.URL + "/alertmanager",
+		URL:               amURL + "/alertmanager",
 		TenantID:          tenantID,
-		BasicAuthPassword: "wrongpassword",
+		BasicAuthPassword: password,
 		DefaultConfig:     validConfig,
 	}
 	am, err := newExternalAlertmanager(cfg, 1)
 	require.NoError(t, err)
 
-	_, err = am.ListSilences(context.Background(), []string{})
-	require.NotNil(t, err)
-
-	// Using the correct password should make the request succeed.
-	cfg.BasicAuthPassword = password
-	am, err = newExternalAlertmanager(cfg, 1)
-	require.NoError(t, err)
-
 	// We should have no silences at first.
 	silences, err := am.ListSilences(context.Background(), []string{})
 	require.NoError(t, err)
 	require.Equal(t, 0, len(silences))
 
 	// Creating a silence should succeed.
-	testSilence := createSilence("test comment", "1", amv2.Matchers{}, strfmt.NewDateTime(), strfmt.NewDateTime())
-	silenceID, err := am.CreateSilence(context.Background(), &testSilence)
+	testSilence := genSilence("test")
+	id, err := am.CreateSilence(context.Background(), &testSilence)
 	require.NoError(t, err)
-	require.NotEmpty(t, silenceID)
+	require.NotEmpty(t, id)
+	testSilence.ID = id
 
 	// We should be able to retrieve a specific silence.
-	silence, err := am.GetSilence(context.Background(), silenceID)
+	silence, err := am.GetSilence(context.Background(), testSilence.ID)
 	require.NoError(t, err)
-	require.Equal(t, *testSilence.Comment, *silence.Comment)
-	require.Equal(t, *testSilence.CreatedBy, *silence.CreatedBy)
-	require.Equal(t, *testSilence.StartsAt, *silence.StartsAt)
-	require.Equal(t, *testSilence.EndsAt, *silence.EndsAt)
-	require.Equal(t, testSilence.Matchers, silence.Matchers)
+	require.Equal(t, testSilence.ID, *silence.ID)
 
 	// Trying to retrieve a non-existing silence should fail.
-	_, err = am.GetSilence(context.Background(), "invalid")
+	_, err = am.GetSilence(context.Background(), util.GenerateShortUID())
 	require.Error(t, err)
 
 	// After creating another silence, the total amount should be 2.
-	testSilence2 := createSilence("another test comment", "1", amv2.Matchers{}, strfmt.NewDateTime(), strfmt.NewDateTime())
-	silenceID2, err := am.CreateSilence(context.Background(), &testSilence2)
+	testSilence2 := genSilence("test")
+	id, err = am.CreateSilence(context.Background(), &testSilence2)
 	require.NoError(t, err)
-	require.NotEmpty(t, silenceID2)
+	require.NotEmpty(t, id)
+	testSilence2.ID = id
 
 	silences, err = am.ListSilences(context.Background(), []string{})
 	require.NoError(t, err)
 	require.Equal(t, 2, len(silences))
-	require.True(t, *silences[0].ID == silenceID || *silences[0].ID == silenceID2)
-	require.True(t, *silences[1].ID == silenceID || *silences[1].ID == silenceID2)
+	require.True(t, *silences[0].ID == testSilence.ID || *silences[0].ID == testSilence2.ID)
+	require.True(t, *silences[1].ID == testSilence.ID || *silences[1].ID == testSilence2.ID)
 
-	// After deleting one of those silences, the total amount should be 2.
-	err = am.DeleteSilence(context.Background(), silenceID)
+	// After deleting one of those silences, the total amount should be 2 but one of those should be expired.
+	err = am.DeleteSilence(context.Background(), testSilence.ID)
 	require.NoError(t, err)
 
 	silences, err = am.ListSilences(context.Background(), []string{})
 	require.NoError(t, err)
-	require.Equal(t, 1, len(silences))
 
-	// Trying to delete the same error should fail.
-	err = am.DeleteSilence(context.Background(), silenceID)
-	require.NotNil(t, err)
+	for _, s := range silences {
+		if *s.ID == testSilence.ID {
+			require.Equal(t, *s.Status.State, "expired")
+		} else {
+			require.Equal(t, *s.Status.State, "pending")
+		}
+	}
+
+	// When deleting the other silence, both should be expired.
+	err = am.DeleteSilence(context.Background(), testSilence2.ID)
+	require.NoError(t, err)
+
+	silences, err = am.ListSilences(context.Background(), []string{})
+	require.NoError(t, err)
+	require.Equal(t, *silences[0].Status.State, "expired")
+	require.Equal(t, *silences[1].Status.State, "expired")
 }
 
-func createSilence(comment, createdBy string, matchers amv2.Matchers, startsAt, endsAt strfmt.DateTime) apimodels.PostableSilence {
+func genSilence(createdBy string) apimodels.PostableSilence {
+	starts := strfmt.DateTime(time.Now().Add(time.Duration(rand.Int63n(9)+1) * time.Second))
+	ends := strfmt.DateTime(time.Now().Add(time.Duration(rand.Int63n(9)+10) * time.Second))
+	comment := "test comment"
+	isEqual := true
+	name := "test"
+	value := "test"
+	isRegex := false
+	matchers := amv2.Matchers{&amv2.Matcher{IsEqual: &isEqual, Name: &name, Value: &value, IsRegex: &isRegex}}
+
 	return apimodels.PostableSilence{
 		Silence: amv2.Silence{
 			Comment:   &comment,
 			CreatedBy: &createdBy,
 			Matchers:  matchers,
-			StartsAt:  &startsAt,
-			EndsAt:    &endsAt,
+			StartsAt:  &starts,
+			EndsAt:    &ends,
 		},
 	}
 }
diff --git a/pkg/services/ngalert/notifier/fake/external_alertmanager_fake.go b/pkg/services/ngalert/notifier/fake/external_alertmanager_fake.go
deleted file mode 100644
index b32b0eae9e269..0000000000000
--- a/pkg/services/ngalert/notifier/fake/external_alertmanager_fake.go
+++ /dev/null
@@ -1,154 +0,0 @@
-package fake
-
-import (
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"sync"
-	"testing"
-
-	"github.com/go-openapi/strfmt"
-	alertingNotify "github.com/grafana/alerting/notify"
-	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
-	"github.com/grafana/grafana/pkg/util"
-	"github.com/grafana/grafana/pkg/web"
-	"github.com/stretchr/testify/require"
-)
-
-type FakeExternalAlertmanager struct {
-	t        *testing.T
-	mtx      sync.RWMutex
-	tenantID string
-	password string
-	Server   *httptest.Server
-
-	silences alertingNotify.GettableSilences
-}
-
-func NewFakeExternalAlertmanager(t *testing.T, tenantID, password string) *FakeExternalAlertmanager {
-	t.Helper()
-	am := &FakeExternalAlertmanager{
-		t:        t,
-		tenantID: tenantID,
-		password: password,
-		mtx:      sync.RWMutex{},
-	}
-	mux := web.New()
-	mux.SetURLPrefix("/alertmanager/api/")
-	mux.UseMiddleware(am.basicAuthMiddleware)
-	mux.UseMiddleware(am.contentTypeJSONMiddleware)
-
-	// Routes
-	mux.Get("/v2/silences", http.HandlerFunc(am.getSilences))
-	mux.Get("/v2/silence/:silenceID", http.HandlerFunc(am.getSilence))
-	mux.Post("/v2/silences", http.HandlerFunc(am.postSilence))
-	mux.Delete("/v2/silence/:silenceID", http.HandlerFunc(am.deleteSilence))
-
-	am.Server = httptest.NewServer(mux)
-	return am
-}
-
-func (am *FakeExternalAlertmanager) getSilences(w http.ResponseWriter, r *http.Request) {
-	am.mtx.RLock()
-	if err := json.NewEncoder(w).Encode(am.silences); err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-	}
-	am.mtx.RUnlock()
-}
-
-func (am *FakeExternalAlertmanager) getSilence(w http.ResponseWriter, r *http.Request) {
-	silenceID, ok := web.Params(r)[":silenceID"]
-	if !ok {
-		return
-	}
-
-	am.mtx.RLock()
-	var matching *alertingNotify.GettableSilence
-	for _, silence := range am.silences {
-		if *silence.ID == silenceID {
-			matching = silence
-			break
-		}
-	}
-	am.mtx.RUnlock()
-
-	if matching == nil {
-		w.WriteHeader(http.StatusNotFound)
-		return
-	}
-
-	if err := json.NewEncoder(w).Encode(matching); err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-	}
-}
-
-func (am *FakeExternalAlertmanager) postSilence(w http.ResponseWriter, r *http.Request) {
-	var silence definitions.PostableSilence
-	require.NoError(am.t, json.NewDecoder(r.Body).Decode(&silence))
-
-	updatedAt := strfmt.NewDateTime()
-	id := util.GenerateShortUID()
-
-	am.mtx.Lock()
-	am.silences = append(am.silences, &alertingNotify.GettableSilence{
-		ID:        &id,
-		UpdatedAt: &updatedAt,
-		Silence:   silence.Silence,
-	})
-	am.mtx.Unlock()
-
-	res := map[string]string{"silenceID": id}
-	if err := json.NewEncoder(w).Encode(res); err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-	}
-}
-
-func (am *FakeExternalAlertmanager) deleteSilence(w http.ResponseWriter, r *http.Request) {
-	silenceID, ok := web.Params(r)[":silenceID"]
-	if !ok {
-		return
-	}
-
-	am.mtx.Lock()
-	defer am.mtx.Unlock()
-	var newSilences []*alertingNotify.GettableSilence
-	for _, silence := range am.silences {
-		if *silence.ID != silenceID {
-			newSilences = append(newSilences, silence)
-		}
-	}
-
-	if len(newSilences) == len(am.silences) {
-		w.WriteHeader(http.StatusNotFound)
-		return
-	}
-
-	am.silences = newSilences
-	w.WriteHeader(http.StatusOK)
-}
-
-func (am *FakeExternalAlertmanager) basicAuthMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		username, password, ok := r.BasicAuth()
-		if !ok {
-			w.WriteHeader(http.StatusUnauthorized)
-			return
-		}
-		if username != am.tenantID || password != am.password || r.Header.Get("X-Scope-OrgID") != am.tenantID {
-			w.WriteHeader(http.StatusForbidden)
-			return
-		}
-		next.ServeHTTP(w, r)
-	})
-}
-
-func (am *FakeExternalAlertmanager) contentTypeJSONMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json")
-		next.ServeHTTP(w, r)
-	})
-}
-
-func (am *FakeExternalAlertmanager) Close() {
-	am.Server.Close()
-}
diff --git a/pkg/services/ngalert/store/alert_rule.go b/pkg/services/ngalert/store/alert_rule.go
index a9f49bce1f795..a88d5258619ab 100644
--- a/pkg/services/ngalert/store/alert_rule.go
+++ b/pkg/services/ngalert/store/alert_rule.go
@@ -556,11 +556,11 @@ func (st DBstore) GetAlertRulesForScheduling(ctx context.Context, query *ngmodel
 			// In previous versions of Grafana, Loki datasources would default to range queries
 			// instead of instant queries, sometimes creating unnecessary load. This is only
 			// done for Grafana Cloud.
-			if indices, migratable := canBeInstant(rule); migratable {
-				if err := migrateToInstant(rule, indices); err != nil {
+			if optimizations, migratable := canBeInstant(rule); migratable {
+				if err := migrateToInstant(rule, optimizations); err != nil {
 					st.Logger.Error("Could not migrate rule from range to instant query", "rule", rule.UID, "err", err)
 				} else {
-					st.Logger.Info("Migrated rule from range to instant query", "rule", rule.UID, "migrated_queries", len(indices))
+					st.Logger.Info("Migrated rule from range to instant query", "rule", rule.UID, "migrated_queries", len(optimizations))
 				}
 			}
 			rules = append(rules, rule)
diff --git a/pkg/services/ngalert/store/loki_range_to_instant.go b/pkg/services/ngalert/store/loki_range_to_instant.go
deleted file mode 100644
index f5e7c5f7664ab..0000000000000
--- a/pkg/services/ngalert/store/loki_range_to_instant.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package store
-
-import (
-	"encoding/json"
-
-	"github.com/grafana/grafana/pkg/expr"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	"github.com/grafana/grafana/pkg/services/ngalert/models"
-)
-
-// DSType can be used to check the datasource type if it's set in the model.
-type dsType struct {
-	DS struct {
-		Type string `json:"type"`
-	} `json:"datasource"`
-}
-
-func (t dsType) isLoki() bool {
-	return t.DS.Type == datasources.DS_LOKI
-}
-
-// canBeInstant checks if any of the query nodes that are loki range queries can be migrated to instant queries.
-// If any are migratable, those indices are returned.
-func canBeInstant(r *models.AlertRule) ([]int, bool) {
-	if len(r.Data) < 2 {
-		return nil, false
-	}
-	var (
-		optimizableIndices []int
-		canBeOptimized     = false
-	)
-	// Loop over query nodes to find all Loki range queries.
-	for i := range r.Data {
-		if r.Data[i].QueryType != "range" {
-			continue
-		}
-		var t dsType
-		// We can ignore the error here, the query just won't be optimized.
-		_ = json.Unmarshal(r.Data[i].Model, &t)
-
-		if !t.isLoki() {
-			continue
-		}
-		var validReducers bool
-		// Loop over all query nodes to find the reduce node.
-		for ii := range r.Data {
-			// Second query part should be and expression.
-			if !expr.IsDataSource(r.Data[ii].DatasourceUID) {
-				continue
-			}
-			exprRaw := make(map[string]any)
-			if err := json.Unmarshal(r.Data[ii].Model, &exprRaw); err != nil {
-				continue
-			}
-			// Second query part should use first query part as expression.
-			if ref, ok := exprRaw["expression"].(string); !ok || ref != r.Data[i].RefID {
-				continue
-			}
-			// Second query part should be "last()"
-			if val, ok := exprRaw["reducer"].(string); !ok || val != "last" {
-				validReducers = false
-				break
-			}
-			validReducers = true
-		}
-		// If we found a reduce node that uses last, we can add the loki query to the optimizations.
-		if validReducers {
-			canBeOptimized = true
-			optimizableIndices = append(optimizableIndices, i)
-		}
-	}
-	return optimizableIndices, canBeOptimized
-}
-
-// migrateToInstant will move the provided indices from a range-query to an instant query. This should only
-// be used for loki.
-func migrateToInstant(r *models.AlertRule, optimizableIndices []int) error {
-	for _, lokiQueryIndex := range optimizableIndices {
-		modelRaw := make(map[string]any)
-		if err := json.Unmarshal(r.Data[lokiQueryIndex].Model, &modelRaw); err != nil {
-			return err
-		}
-		modelRaw["queryType"] = "instant"
-		model, err := json.Marshal(modelRaw)
-		if err != nil {
-			return err
-		}
-		r.Data[lokiQueryIndex].Model = model
-		r.Data[lokiQueryIndex].QueryType = "instant"
-	}
-	return nil
-}
diff --git a/pkg/services/ngalert/store/loki_range_to_instant_test.go b/pkg/services/ngalert/store/loki_range_to_instant_test.go
deleted file mode 100644
index 0c5f71848ebb9..0000000000000
--- a/pkg/services/ngalert/store/loki_range_to_instant_test.go
+++ /dev/null
@@ -1,242 +0,0 @@
-package store
-
-import (
-	"encoding/json"
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/services/ngalert/models"
-)
-
-func TestCanBeInstant(t *testing.T) {
-	tcs := []struct {
-		name            string
-		expected        bool
-		expectedIndices []int
-		rule            *models.AlertRule
-	}{
-		{
-			name:            "valid rule that can be migrated from range to instant",
-			expected:        true,
-			expectedIndices: []int{0},
-			rule:            createMigrateableLokiRule(t),
-		},
-		{
-			name:            "valid rule with external loki datasource",
-			expected:        true,
-			expectedIndices: []int{0},
-			rule: createMigrateableLokiRule(t, func(r *models.AlertRule) {
-				r.Data[0].DatasourceUID = "something-external"
-			}),
-		},
-		{
-			name:            "valid multi query rule with loki datasources",
-			expected:        true,
-			expectedIndices: []int{0, 1},
-			rule:            createMultiQueryMigratableLokiRule(t),
-		},
-		{
-			name:     "invalid rule where the data array is too short to be migrateable",
-			expected: false,
-			rule: createMigrateableLokiRule(t, func(r *models.AlertRule) {
-				r.Data = []models.AlertQuery{r.Data[0]}
-			}),
-		},
-		{
-			name:     "invalid rule that is not a range query",
-			expected: false,
-			rule: createMigrateableLokiRule(t, func(r *models.AlertRule) {
-				r.Data[0].QueryType = "something-else"
-			}),
-		},
-		{
-			name:     "invalid rule that has not last() as aggregation",
-			expected: false,
-			rule: createMigrateableLokiRule(t, func(r *models.AlertRule) {
-				r.Data[1] = reducer(t, "B", "A", "avg")
-			}),
-		},
-		{
-			name:     "invalid rule that has not all reducers last()",
-			expected: false,
-			rule: createMigrateableLokiRule(t, func(r *models.AlertRule) {
-				r.Data = append(r.Data, reducer(t, "invalid-reducer", "A", "min"))
-			}),
-		},
-		{
-			name:     "invalid rule that has no aggregation",
-			expected: false,
-			rule: createMigrateableLokiRule(t, func(r *models.AlertRule) {
-				r.Data[1].DatasourceUID = "something-else"
-			}),
-		},
-		{
-			name:     "invalid rule that has not last() pointing to range query",
-			expected: false,
-			rule: createMigrateableLokiRule(t, func(r *models.AlertRule) {
-				raw := make(map[string]any)
-				err := json.Unmarshal(r.Data[1].Model, &raw)
-				require.NoError(t, err)
-				raw["expression"] = "C"
-				r.Data[1].Model, err = json.Marshal(raw)
-				require.NoError(t, err)
-			}),
-		},
-	}
-	for _, tc := range tcs {
-		t.Run(tc.name, func(t *testing.T) {
-			indicies, canBe := canBeInstant(tc.rule)
-			require.Equal(t, tc.expected, canBe)
-			require.Equal(t, tc.expectedIndices, indicies)
-		})
-	}
-}
-
-func TestMigrateLokiQueryToInstant(t *testing.T) {
-	original := createMigrateableLokiRule(t)
-	mirgrated := createMigrateableLokiRule(t, func(r *models.AlertRule) {
-		r.Data[0] = lokiQuery(t, "A", "instant", "grafanacloud-logs")
-	})
-
-	optimizableIndices, canBeOptimized := canBeInstant(original)
-	require.True(t, canBeOptimized)
-	require.NoError(t, migrateToInstant(original, optimizableIndices))
-
-	require.Equal(t, mirgrated.Data[0].QueryType, original.Data[0].QueryType)
-
-	originalModel := make(map[string]any)
-	require.NoError(t, json.Unmarshal(original.Data[0].Model, &originalModel))
-	migratedModel := make(map[string]any)
-	require.NoError(t, json.Unmarshal(mirgrated.Data[0].Model, &migratedModel))
-
-	require.Equal(t, migratedModel, originalModel)
-
-	_, canBeOptimized = canBeInstant(original)
-	require.False(t, canBeOptimized)
-}
-
-func TestMigrateMultiLokiQueryToInstant(t *testing.T) {
-	original := createMultiQueryMigratableLokiRule(t)
-	mirgrated := createMultiQueryMigratableLokiRule(t, func(r *models.AlertRule) {
-		r.Data[0] = lokiQuery(t, "TotalRequests", "instant", "grafanacloud-logs")
-		r.Data[1] = lokiQuery(t, "TotalErrors", "instant", "grafanacloud-logs")
-	})
-
-	optimizableIndices, canBeOptimized := canBeInstant(original)
-	require.True(t, canBeOptimized)
-	require.NoError(t, migrateToInstant(original, optimizableIndices))
-
-	require.Equal(t, mirgrated.Data[0].QueryType, original.Data[0].QueryType)
-	require.Equal(t, mirgrated.Data[1].QueryType, original.Data[1].QueryType)
-
-	originalModel := make(map[string]any)
-	require.NoError(t, json.Unmarshal(original.Data[0].Model, &originalModel))
-	migratedModel := make(map[string]any)
-	require.NoError(t, json.Unmarshal(mirgrated.Data[0].Model, &migratedModel))
-
-	require.Equal(t, migratedModel, originalModel)
-
-	originalModel = make(map[string]any)
-	require.NoError(t, json.Unmarshal(original.Data[1].Model, &originalModel))
-	migratedModel = make(map[string]any)
-	require.NoError(t, json.Unmarshal(mirgrated.Data[1].Model, &migratedModel))
-
-	require.Equal(t, migratedModel, originalModel)
-
-	_, canBeOptimized = canBeInstant(original)
-	require.False(t, canBeOptimized)
-}
-
-func createMigrateableLokiRule(t *testing.T, muts ...func(*models.AlertRule)) *models.AlertRule {
-	t.Helper()
-	r := &models.AlertRule{
-		Data: []models.AlertQuery{
-			lokiQuery(t, "A", "range", "grafanacloud-logs"),
-			reducer(t, "B", "A", "last"),
-		},
-	}
-	for _, m := range muts {
-		m(r)
-	}
-	return r
-}
-
-func createMultiQueryMigratableLokiRule(t *testing.T, muts ...func(*models.AlertRule)) *models.AlertRule {
-	t.Helper()
-	r := &models.AlertRule{
-		Data: []models.AlertQuery{
-			lokiQuery(t, "TotalRequests", "range", "grafanacloud-logs"),
-			lokiQuery(t, "TotalErrors", "range", "grafanacloud-logs"),
-			reducer(t, "TotalRequests_Last", "TotalRequests", "last"),
-			reducer(t, "TotalErrors_Last", "TotalErrors", "last"),
-		},
-	}
-	for _, m := range muts {
-		m(r)
-	}
-	return r
-}
-func lokiQuery(t *testing.T, refID, queryType, datasourceUID string) models.AlertQuery {
-	t.Helper()
-	return models.AlertQuery{
-		RefID:         refID,
-		QueryType:     queryType,
-		DatasourceUID: datasourceUID,
-		Model: []byte(fmt.Sprintf(`{
-					"datasource": {
-						"type": "loki",
-						"uid": "%s"
-					},
-					"editorMode": "code",
-					"expr": "1",
-					"intervalMs": 1000,
-					"maxDataPoints": 43200,
-					"queryType": "%s",
-					"refId": "%s"
-				}`, datasourceUID, queryType, refID)),
-	}
-}
-
-func reducer(t *testing.T, refID, exp, op string) models.AlertQuery {
-	t.Helper()
-	return models.AlertQuery{
-		RefID:         refID,
-		DatasourceUID: "__expr__",
-		Model: []byte(fmt.Sprintf(`{
-					"conditions": [
-						{
-							"evaluator": {
-								"params": [],
-								"type": "gt"
-							},
-							"operator": {
-								"type": "and"
-							},
-							"query": {
-								"params": [
-									"B"
-								]
-							},
-							"reducer": {
-								"params": [],
-								"type": "%s"
-							},
-							"type": "query"
-						}
-					],
-					"datasource": {
-						"type": "__expr__",
-						"uid": "__expr__"
-					},
-					"expression": "%s",
-					"hide": false,
-					"intervalMs": 1000,
-					"maxDataPoints": 43200,
-					"reducer": "%s",
-					"refId": "%s",
-					"type": "reduce"
-				}`, op, exp, op, refID)),
-	}
-}
diff --git a/pkg/services/ngalert/store/range_to_instant.go b/pkg/services/ngalert/store/range_to_instant.go
new file mode 100644
index 0000000000000..7269084a0cf55
--- /dev/null
+++ b/pkg/services/ngalert/store/range_to_instant.go
@@ -0,0 +1,132 @@
+package store
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/grafana/grafana/pkg/expr"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+)
+
+const (
+	grafanaCloudProm  = "grafanacloud-prom"
+	grafanaCloudUsage = "grafanacloud-usage"
+)
+
+// DSType can be used to check the datasource type if it's set in the model.
+type dsType struct {
+	DS struct {
+		Type string `json:"type"`
+	} `json:"datasource"`
+	Range bool `json:"range"`
+}
+
+type optimization struct {
+	// Index of the query that can be optimized
+	i int
+	// Type of the query that ca be optimized (loki,prometheus)
+	t string
+}
+
+// canBeInstant checks if any of the query nodes that are loki or prometheus range queries can be migrated to instant queries.
+// If any are migratable, those indices are returned.
+func canBeInstant(r *models.AlertRule) ([]optimization, bool) {
+	if len(r.Data) < 2 {
+		return nil, false
+	}
+	var (
+		optimizableIndices []optimization
+		canBeOptimized     = false
+	)
+	// Loop over query nodes to find all range queries.
+	for i := range r.Data {
+		var t dsType
+		// We can ignore the error here, the query just won't be optimized.
+		_ = json.Unmarshal(r.Data[i].Model, &t)
+
+		switch t.DS.Type {
+		case datasources.DS_PROMETHEUS:
+			if !t.Range {
+				continue
+			}
+		case datasources.DS_LOKI:
+			if r.Data[i].QueryType != "range" {
+				continue
+			}
+		default:
+			// The default datasource is not saved as datasource, this is why we need to check for the datasource name.
+			// Here we check the well-known grafana cloud datasources.
+			if r.Data[i].DatasourceUID != grafanaCloudProm && r.Data[i].DatasourceUID != grafanaCloudUsage {
+				continue
+			}
+			if !t.Range {
+				continue
+			}
+			t.DS.Type = datasources.DS_PROMETHEUS
+		}
+
+		var validReducers bool
+		// Loop over all query nodes to find the reduce node.
+		for ii := range r.Data {
+			// Second query part should be and expression.
+			if !expr.IsDataSource(r.Data[ii].DatasourceUID) {
+				continue
+			}
+			exprRaw := make(map[string]any)
+			if err := json.Unmarshal(r.Data[ii].Model, &exprRaw); err != nil {
+				continue
+			}
+			// Second query part should use first query part as expression.
+			if ref, ok := exprRaw["expression"].(string); !ok || ref != r.Data[i].RefID {
+				continue
+			}
+			// Second query part should be "last()"
+			if val, ok := exprRaw["reducer"].(string); !ok || val != "last" {
+				validReducers = false
+				break
+			}
+			validReducers = true
+		}
+		// If we found a reduce node that uses last, we can add the query to the optimizations.
+		if validReducers {
+			canBeOptimized = true
+			optimizableIndices = append(optimizableIndices, optimization{
+				i: i,
+				t: t.DS.Type,
+			})
+		}
+	}
+	return optimizableIndices, canBeOptimized
+}
+
+// migrateToInstant will move the provided indices from a range-query to an instant query.
+func migrateToInstant(r *models.AlertRule, optimizations []optimization) error {
+	for _, opti := range optimizations {
+		modelRaw := make(map[string]any)
+		if err := json.Unmarshal(r.Data[opti.i].Model, &modelRaw); err != nil {
+			return err
+		}
+		switch opti.t {
+		case datasources.DS_PROMETHEUS:
+			modelRaw["instant"] = true
+			modelRaw["range"] = false
+			model, err := json.Marshal(modelRaw)
+			if err != nil {
+				return err
+			}
+			r.Data[opti.i].Model = model
+		case datasources.DS_LOKI:
+			modelRaw["queryType"] = "instant"
+			model, err := json.Marshal(modelRaw)
+			if err != nil {
+				return err
+			}
+			r.Data[opti.i].Model = model
+			r.Data[opti.i].QueryType = "instant"
+		default:
+			return fmt.Errorf("optimization for datasource of type %s not possible", opti.t)
+		}
+	}
+	return nil
+}
diff --git a/pkg/services/ngalert/store/range_to_instant_test.go b/pkg/services/ngalert/store/range_to_instant_test.go
new file mode 100644
index 0000000000000..cb669ff2e00fa
--- /dev/null
+++ b/pkg/services/ngalert/store/range_to_instant_test.go
@@ -0,0 +1,426 @@
+package store
+
+import (
+	"encoding/json"
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/ngalert/models"
+)
+
+const (
+	promIsInstant    = true
+	promIsNotInstant = false
+	promExternalDS   = "some-external-ds"
+)
+
+func TestCanBeInstant(t *testing.T) {
+	tcs := []struct {
+		name                  string
+		expected              bool
+		expectedOptimizations []optimization
+		rule                  *models.AlertRule
+	}{
+		{
+			name:                  "valid loki rule that can be migrated from range to instant",
+			expected:              true,
+			expectedOptimizations: []optimization{{i: 0, t: datasources.DS_LOKI}},
+			rule:                  createMigrateableLokiRule(t),
+		},
+		{
+			name:                  "valid prom rule that can be migrated from range to instant",
+			expected:              true,
+			expectedOptimizations: []optimization{{i: 0, t: datasources.DS_PROMETHEUS}},
+			rule:                  createMigratablePromRule(t),
+		},
+		{
+			name:                  "valid loki rule with external loki datasource",
+			expected:              true,
+			expectedOptimizations: []optimization{{i: 0, t: datasources.DS_LOKI}},
+			rule: createMigrateableLokiRule(t, func(r *models.AlertRule) {
+				r.Data[0].DatasourceUID = "something-external"
+			}),
+		},
+		{
+			name:                  "valid prom rule with external prometheus datasource",
+			expected:              true,
+			expectedOptimizations: []optimization{{i: 0, t: datasources.DS_PROMETHEUS}},
+			rule: createMigratablePromRule(t, func(r *models.AlertRule) {
+				r.Data[0].DatasourceUID = "something-external"
+			}),
+		},
+		{
+			name:                  "valid prom rule with missing datasource",
+			expected:              true,
+			expectedOptimizations: []optimization{{i: 0, t: datasources.DS_PROMETHEUS}},
+			rule:                  createMigratablePromRuleWithDefaultDS(t),
+		},
+		{
+			name:     "valid prom rule with missing datasource and instant query",
+			expected: false,
+			rule: createMigratablePromRuleWithDefaultDS(t, func(r *models.AlertRule) {
+				raw := make(map[string]any)
+				err := json.Unmarshal(r.Data[0].Model, &raw)
+				require.NoError(t, err)
+				raw["range"] = false
+				r.Data[0].Model, err = json.Marshal(raw)
+				require.NoError(t, err)
+			}),
+		},
+		{
+			name:     "valid loki multi query rule with loki datasources",
+			expected: true,
+			expectedOptimizations: []optimization{
+				{i: 0, t: datasources.DS_LOKI},
+				{i: 1, t: datasources.DS_LOKI},
+			},
+			rule: createMultiQueryMigratableLokiRule(t),
+		},
+		{
+			name:     "valid prom multi query rule with prom datasources",
+			expected: true,
+			expectedOptimizations: []optimization{
+				{i: 0, t: datasources.DS_PROMETHEUS},
+				{i: 1, t: datasources.DS_PROMETHEUS},
+			},
+			rule: createMultiQueryMigratablePromRule(t),
+		},
+		{
+			name:     "invalid rule where the data array is too short to be migrateable",
+			expected: false,
+			rule: createMigrateableLokiRule(t, func(r *models.AlertRule) {
+				r.Data = []models.AlertQuery{r.Data[0]}
+			}),
+		},
+		{
+			name:     "invalid rule that is not a range query",
+			expected: false,
+			rule: createMigrateableLokiRule(t, func(r *models.AlertRule) {
+				r.Data[0].QueryType = "something-else"
+			}),
+		},
+		{
+			name:     "invalid rule that has not last() as aggregation",
+			expected: false,
+			rule: createMigrateableLokiRule(t, func(r *models.AlertRule) {
+				r.Data[1] = reducer(t, "B", "A", "avg")
+			}),
+		},
+		{
+			name:     "invalid rule that has not all reducers last()",
+			expected: false,
+			rule: createMigrateableLokiRule(t, func(r *models.AlertRule) {
+				r.Data = append(r.Data, reducer(t, "invalid-reducer", "A", "min"))
+			}),
+		},
+		{
+			name:     "invalid rule that has no aggregation",
+			expected: false,
+			rule: createMigrateableLokiRule(t, func(r *models.AlertRule) {
+				r.Data[1].DatasourceUID = "something-else"
+			}),
+		},
+		{
+			name:     "invalid rule that has not last() pointing to range query",
+			expected: false,
+			rule: createMigrateableLokiRule(t, func(r *models.AlertRule) {
+				raw := make(map[string]any)
+				err := json.Unmarshal(r.Data[1].Model, &raw)
+				require.NoError(t, err)
+				raw["expression"] = "C"
+				r.Data[1].Model, err = json.Marshal(raw)
+				require.NoError(t, err)
+			}),
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.name, func(t *testing.T) {
+			optimizations, canBe := canBeInstant(tc.rule)
+			require.Equal(t, tc.expected, canBe)
+			require.Equal(t, tc.expectedOptimizations, optimizations)
+		})
+	}
+}
+
+func TestMigrateLokiQueryToInstant(t *testing.T) {
+	original := createMigrateableLokiRule(t)
+	mirgrated := createMigrateableLokiRule(t, func(r *models.AlertRule) {
+		r.Data[0] = lokiQuery(t, "A", "instant", "grafanacloud-logs")
+	})
+
+	optimizableIndices, canBeOptimized := canBeInstant(original)
+	require.True(t, canBeOptimized)
+	require.NoError(t, migrateToInstant(original, optimizableIndices))
+
+	require.Equal(t, mirgrated.Data[0].QueryType, original.Data[0].QueryType)
+
+	originalModel := make(map[string]any)
+	require.NoError(t, json.Unmarshal(original.Data[0].Model, &originalModel))
+	migratedModel := make(map[string]any)
+	require.NoError(t, json.Unmarshal(mirgrated.Data[0].Model, &migratedModel))
+
+	require.Equal(t, migratedModel, originalModel)
+
+	_, canBeOptimized = canBeInstant(original)
+	require.False(t, canBeOptimized)
+}
+
+func TestMigrateMultiLokiQueryToInstant(t *testing.T) {
+	original := createMultiQueryMigratableLokiRule(t)
+	mirgrated := createMultiQueryMigratableLokiRule(t, func(r *models.AlertRule) {
+		r.Data[0] = lokiQuery(t, "TotalRequests", "instant", "grafanacloud-logs")
+		r.Data[1] = lokiQuery(t, "TotalErrors", "instant", "grafanacloud-logs")
+	})
+
+	optimizableIndices, canBeOptimized := canBeInstant(original)
+	require.True(t, canBeOptimized)
+	require.NoError(t, migrateToInstant(original, optimizableIndices))
+
+	require.Equal(t, mirgrated.Data[0].QueryType, original.Data[0].QueryType)
+	require.Equal(t, mirgrated.Data[1].QueryType, original.Data[1].QueryType)
+
+	originalModel := make(map[string]any)
+	require.NoError(t, json.Unmarshal(original.Data[0].Model, &originalModel))
+	migratedModel := make(map[string]any)
+	require.NoError(t, json.Unmarshal(mirgrated.Data[0].Model, &migratedModel))
+
+	require.Equal(t, migratedModel, originalModel)
+
+	originalModel = make(map[string]any)
+	require.NoError(t, json.Unmarshal(original.Data[1].Model, &originalModel))
+	migratedModel = make(map[string]any)
+	require.NoError(t, json.Unmarshal(mirgrated.Data[1].Model, &migratedModel))
+
+	require.Equal(t, migratedModel, originalModel)
+
+	_, canBeOptimized = canBeInstant(original)
+	require.False(t, canBeOptimized)
+}
+
+func TestMigratePromQueryToInstant(t *testing.T) {
+	original := createMigratablePromRule(t)
+	mirgrated := createMigratablePromRule(t, func(r *models.AlertRule) {
+		r.Data[0] = prometheusQuery(t, "A", promExternalDS, promIsInstant)
+	})
+
+	optimizableIndices, canBeOptimized := canBeInstant(original)
+	require.True(t, canBeOptimized)
+	require.NoError(t, migrateToInstant(original, optimizableIndices))
+
+	originalModel := make(map[string]any)
+	require.NoError(t, json.Unmarshal(original.Data[0].Model, &originalModel))
+	migratedModel := make(map[string]any)
+	require.NoError(t, json.Unmarshal(mirgrated.Data[0].Model, &migratedModel))
+
+	require.Equal(t, migratedModel, originalModel)
+
+	_, canBeOptimized = canBeInstant(original)
+	require.False(t, canBeOptimized)
+}
+
+func TestMigrateMultiPromQueryToInstant(t *testing.T) {
+	original := createMultiQueryMigratablePromRule(t)
+	mirgrated := createMultiQueryMigratablePromRule(t, func(r *models.AlertRule) {
+		r.Data[0] = prometheusQuery(t, "TotalRequests", promExternalDS, promIsInstant)
+		r.Data[1] = prometheusQuery(t, "TotalErrors", promExternalDS, promIsInstant)
+	})
+
+	optimizableIndices, canBeOptimized := canBeInstant(original)
+	require.True(t, canBeOptimized)
+	require.NoError(t, migrateToInstant(original, optimizableIndices))
+
+	originalModel := make(map[string]any)
+	require.NoError(t, json.Unmarshal(original.Data[0].Model, &originalModel))
+	migratedModel := make(map[string]any)
+	require.NoError(t, json.Unmarshal(mirgrated.Data[0].Model, &migratedModel))
+
+	require.Equal(t, migratedModel, originalModel)
+
+	originalModel = make(map[string]any)
+	require.NoError(t, json.Unmarshal(original.Data[1].Model, &originalModel))
+	migratedModel = make(map[string]any)
+	require.NoError(t, json.Unmarshal(mirgrated.Data[1].Model, &migratedModel))
+
+	require.Equal(t, migratedModel, originalModel)
+
+	_, canBeOptimized = canBeInstant(original)
+	require.False(t, canBeOptimized)
+}
+
+func createMigrateableLokiRule(t *testing.T, muts ...func(*models.AlertRule)) *models.AlertRule {
+	t.Helper()
+	r := &models.AlertRule{
+		Data: []models.AlertQuery{
+			lokiQuery(t, "A", "range", "grafanacloud-logs"),
+			reducer(t, "B", "A", "last"),
+		},
+	}
+	for _, m := range muts {
+		m(r)
+	}
+	return r
+}
+
+func createMultiQueryMigratableLokiRule(t *testing.T, muts ...func(*models.AlertRule)) *models.AlertRule {
+	t.Helper()
+	r := &models.AlertRule{
+		Data: []models.AlertQuery{
+			lokiQuery(t, "TotalRequests", "range", "grafanacloud-logs"),
+			lokiQuery(t, "TotalErrors", "range", "grafanacloud-logs"),
+			reducer(t, "TotalRequests_Last", "TotalRequests", "last"),
+			reducer(t, "TotalErrors_Last", "TotalErrors", "last"),
+		},
+	}
+	for _, m := range muts {
+		m(r)
+	}
+	return r
+}
+
+func createMigratablePromRule(t *testing.T, muts ...func(*models.AlertRule)) *models.AlertRule {
+	t.Helper()
+	r := &models.AlertRule{
+		Data: []models.AlertQuery{
+			prometheusQuery(t, "A", promExternalDS, promIsNotInstant),
+			reducer(t, "B", "A", "last"),
+		},
+	}
+	for _, m := range muts {
+		m(r)
+	}
+	return r
+}
+
+func createMigratablePromRuleWithDefaultDS(t *testing.T, muts ...func(*models.AlertRule)) *models.AlertRule {
+	t.Helper()
+	r := &models.AlertRule{
+		Data: []models.AlertQuery{
+			prometheusQueryWithoutDS(t, "A", grafanaCloudProm, promIsNotInstant),
+			reducer(t, "B", "A", "last"),
+		},
+	}
+	for _, m := range muts {
+		m(r)
+	}
+	return r
+}
+
+func createMultiQueryMigratablePromRule(t *testing.T, muts ...func(*models.AlertRule)) *models.AlertRule {
+	t.Helper()
+	r := &models.AlertRule{
+		Data: []models.AlertQuery{
+			prometheusQuery(t, "TotalRequests", promExternalDS, promIsNotInstant),
+			prometheusQuery(t, "TotalErrors", promExternalDS, promIsNotInstant),
+			reducer(t, "TotalRequests_Last", "TotalRequests", "last"),
+			reducer(t, "TotalErrors_Last", "TotalErrors", "last"),
+		},
+	}
+	for _, m := range muts {
+		m(r)
+	}
+	return r
+}
+
+func lokiQuery(t *testing.T, refID, queryType, datasourceUID string) models.AlertQuery {
+	t.Helper()
+	return models.AlertQuery{
+		RefID:         refID,
+		QueryType:     queryType,
+		DatasourceUID: datasourceUID,
+		Model: []byte(fmt.Sprintf(`{
+					"datasource": {
+						"type": "loki",
+						"uid": "%s"
+					},
+					"editorMode": "code",
+					"expr": "1",
+					"intervalMs": 1000,
+					"maxDataPoints": 43200,
+					"queryType": "%s",
+					"refId": "%s"
+				}`, datasourceUID, queryType, refID)),
+	}
+}
+
+func prometheusQuery(t *testing.T, refID, datasourceUID string, isInstant bool) models.AlertQuery {
+	t.Helper()
+	return models.AlertQuery{
+		RefID:         refID,
+		DatasourceUID: datasourceUID,
+		Model: []byte(fmt.Sprintf(`{
+					"datasource": {
+						"type": "prometheus",
+						"uid": "%s"
+					},
+					"instant": %t,
+					"range": %t,
+					"editorMode": "code",
+					"expr": "1",
+					"intervalMs": 1000,
+					"maxDataPoints": 43200,
+					"refId": "%s"
+				}`, datasourceUID, isInstant, !isInstant, refID)),
+	}
+}
+
+func prometheusQueryWithoutDS(t *testing.T, refID, datasourceUID string, isInstant bool) models.AlertQuery {
+	t.Helper()
+	return models.AlertQuery{
+		RefID:         refID,
+		DatasourceUID: datasourceUID,
+		Model: []byte(fmt.Sprintf(`{
+					"instant": %t,
+					"range": %t,
+					"editorMode": "code",
+					"expr": "1",
+					"intervalMs": 1000,
+					"maxDataPoints": 43200,
+					"refId": "%s"
+				}`, isInstant, !isInstant, refID)),
+	}
+}
+
+func reducer(t *testing.T, refID, exp, op string) models.AlertQuery {
+	t.Helper()
+	return models.AlertQuery{
+		RefID:         refID,
+		DatasourceUID: "__expr__",
+		Model: []byte(fmt.Sprintf(`{
+					"conditions": [
+						{
+							"evaluator": {
+								"params": [],
+								"type": "gt"
+							},
+							"operator": {
+								"type": "and"
+							},
+							"query": {
+								"params": [
+									"B"
+								]
+							},
+							"reducer": {
+								"params": [],
+								"type": "%s"
+							},
+							"type": "query"
+						}
+					],
+					"datasource": {
+						"type": "__expr__",
+						"uid": "__expr__"
+					},
+					"expression": "%s",
+					"hide": false,
+					"intervalMs": 1000,
+					"maxDataPoints": 43200,
+					"reducer": "%s",
+					"refId": "%s",
+					"type": "reduce"
+				}`, op, exp, op, refID)),
+	}
+}
diff --git a/pkg/services/org/org.go b/pkg/services/org/org.go
index b1920d0b8ec19..b41c7a80a6fd2 100644
--- a/pkg/services/org/org.go
+++ b/pkg/services/org/org.go
@@ -22,4 +22,5 @@ type Service interface {
 	RemoveOrgUser(context.Context, *RemoveOrgUserCommand) error
 	GetOrgUsers(context.Context, *GetOrgUsersQuery) ([]*OrgUserDTO, error)
 	SearchOrgUsers(context.Context, *SearchOrgUsersQuery) (*SearchOrgUsersQueryResult, error)
+	RegisterDelete(query string)
 }
diff --git a/pkg/services/org/orgimpl/org.go b/pkg/services/org/orgimpl/org.go
index 3c6c9ffed3b4f..f9395027cdfd6 100644
--- a/pkg/services/org/orgimpl/org.go
+++ b/pkg/services/org/orgimpl/org.go
@@ -241,3 +241,7 @@ func readQuotaConfig(cfg *setting.Cfg) (*quota.Map, error) {
 	limits.Set(userTag, cfg.Quota.User.Org)
 	return limits, nil
 }
+
+func (s *Service) RegisterDelete(query string) {
+	s.store.RegisterDelete(query)
+}
diff --git a/pkg/services/org/orgimpl/org_test.go b/pkg/services/org/orgimpl/org_test.go
index 639f101d303e3..1bf94ed68e961 100644
--- a/pkg/services/org/orgimpl/org_test.go
+++ b/pkg/services/org/orgimpl/org_test.go
@@ -154,3 +154,6 @@ func (f *FakeOrgStore) RemoveOrgUser(ctx context.Context, cmd *org.RemoveOrgUser
 func (f *FakeOrgStore) Count(ctx context.Context, _ *quota.ScopeParameters) (*quota.Map, error) {
 	return nil, nil
 }
+
+func (f *FakeOrgStore) RegisterDelete(query string) {
+}
diff --git a/pkg/services/org/orgimpl/store.go b/pkg/services/org/orgimpl/store.go
index 4c34861ff2287..59eb2dc10164a 100644
--- a/pkg/services/org/orgimpl/store.go
+++ b/pkg/services/org/orgimpl/store.go
@@ -46,14 +46,16 @@ type store interface {
 	RemoveOrgUser(context.Context, *org.RemoveOrgUserCommand) error
 
 	Count(context.Context, *quota.ScopeParameters) (*quota.Map, error)
+	RegisterDelete(query string)
 }
 
 type sqlStore struct {
 	db      db.DB
 	dialect migrator.Dialect
 	//TODO: moved to service
-	log log.Logger
-	cfg *setting.Cfg
+	log     log.Logger
+	cfg     *setting.Cfg
+	deletes []string
 }
 
 func (ss *sqlStore) Get(ctx context.Context, orgID int64) (*org.Org, error) {
@@ -239,8 +241,16 @@ func (ss *sqlStore) Delete(ctx context.Context, cmd *org.DeleteOrgCommand) error
 			"DELETE FROM alert WHERE org_id = ?",
 			"DELETE FROM annotation WHERE org_id = ?",
 			"DELETE FROM kv_store WHERE org_id = ?",
+			"DELETE FROM team WHERE org_id = ?",
+			"DELETE FROM team_member WHERE org_id = ?",
+			"DELETE FROM team_role WHERE org_id = ?",
+			"DELETE FROM user_role WHERE org_id = ?",
+			"DELETE FROM builtin_role WHERE org_id = ?",
 		}
 
+		// Add registered deletes
+		deletes = append(deletes, ss.deletes...)
+
 		for _, sql := range deletes {
 			_, err := sess.Exec(sql, cmd.ID)
 			if err != nil {
@@ -822,3 +832,8 @@ func removeUserOrg(sess *db.Session, userID int64) error {
 	_, err := sess.ID(userID).MustCols("org_id").Update(&user)
 	return err
 }
+
+// RegisterDelete registers a delete query to be executed when an org is deleted, used to delete enterprise data.
+func (ss *sqlStore) RegisterDelete(query string) {
+	ss.deletes = append(ss.deletes, query)
+}
diff --git a/pkg/services/org/orgtest/fake.go b/pkg/services/org/orgtest/fake.go
index 84fed24e9858b..323cce75be8e2 100644
--- a/pkg/services/org/orgtest/fake.go
+++ b/pkg/services/org/orgtest/fake.go
@@ -99,3 +99,6 @@ func (f *FakeOrgService) RemoveOrgUser(ctx context.Context, cmd *org.RemoveOrgUs
 func (f *FakeOrgService) SearchOrgUsers(ctx context.Context, query *org.SearchOrgUsersQuery) (*org.SearchOrgUsersQueryResult, error) {
 	return f.ExpectedSearchOrgUsersResult, f.ExpectedError
 }
+
+func (f *FakeOrgService) RegisterDelete(query string) {
+}
diff --git a/pkg/services/playlist/model.go b/pkg/services/playlist/model.go
index f0a0b4b4ae784..178bd7c83f803 100644
--- a/pkg/services/playlist/model.go
+++ b/pkg/services/playlist/model.go
@@ -2,8 +2,6 @@ package playlist
 
 import (
 	"errors"
-
-	"github.com/grafana/grafana/pkg/kinds/playlist"
 )
 
 // Typed errors
@@ -27,9 +25,47 @@ type Playlist struct {
 	UpdatedAt int64 `json:"-" db:"updated_at"`
 }
 
-type PlaylistDTO = playlist.Spec
-type PlaylistItemDTO = playlist.Item
-type PlaylistItemType = playlist.ItemType
+type PlaylistDTO struct {
+	// Unique playlist identifier. Generated on creation, either by the
+	// creator of the playlist of by the application.
+	Uid string `json:"uid"`
+
+	// Name of the playlist.
+	Name string `json:"name"`
+
+	// Interval sets the time between switching views in a playlist.
+	Interval string `json:"interval"`
+
+	// The ordered list of items that the playlist will iterate over.
+	Items []PlaylistItemDTO `json:"items,omitempty"`
+
+	// Returned for k8s
+	CreatedAt int64 `json:"-"`
+
+	// Returned for k8s
+	UpdatedAt int64 `json:"-"`
+
+	// Returned for k8s
+	OrgID int64 `json:"-"`
+}
+
+type PlaylistItemDTO struct {
+	// Title is an unused property -- it will be removed in the future
+	Title *string `json:"title,omitempty"`
+
+	// Type of the item.
+	Type string `json:"type"`
+
+	// Value depends on type and describes the playlist item.
+	//
+	//  - dashboard_by_id: The value is an internal numerical identifier set by Grafana. This
+	//  is not portable as the numerical identifier is non-deterministic between different instances.
+	//  Will be replaced by dashboard_by_uid in the future. (deprecated)
+	//  - dashboard_by_tag: The value is a tag which is set on any number of dashboards. All
+	//  dashboards behind the tag will be added to the playlist.
+	//  - dashboard_by_uid: The value is the dashboard UID
+	Value string `json:"value"`
+}
 
 type PlaylistItem struct {
 	Id         int64  `db:"id"`
@@ -88,10 +124,3 @@ type GetPlaylistItemsByUidQuery struct {
 	PlaylistUID string
 	OrgId       int64
 }
-
-func PlaylistToResource(p PlaylistDTO) playlist.K8sResource {
-	copy := p
-	r := playlist.NewK8sResource(p.Uid, &copy)
-	copy.Uid = "" // remove it from the payload
-	return r
-}
diff --git a/pkg/services/playlist/playlistimpl/playlist.go b/pkg/services/playlist/playlistimpl/playlist.go
index 3111d701e5809..ee6a000c62799 100644
--- a/pkg/services/playlist/playlistimpl/playlist.go
+++ b/pkg/services/playlist/playlistimpl/playlist.go
@@ -4,9 +4,7 @@ import (
 	"context"
 
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/playlist"
-	"github.com/grafana/grafana/pkg/services/store/entity"
 )
 
 type Service struct {
@@ -15,11 +13,10 @@ type Service struct {
 
 var _ playlist.Service = &Service{}
 
-func ProvideService(db db.DB, toggles featuremgmt.FeatureToggles, objserver entity.EntityStoreServer) playlist.Service {
-	sqlstore := &sqlStore{
+func ProvideService(db db.DB) playlist.Service {
+	return &Service{store: &sqlStore{
 		db: db,
-	}
-	return &Service{store: sqlstore}
+	}}
 }
 
 func (s *Service) Create(ctx context.Context, cmd *playlist.CreatePlaylistCommand) (*playlist.Playlist, error) {
@@ -48,7 +45,7 @@ func (s *Service) Get(ctx context.Context, q *playlist.GetPlaylistByUidQuery) (*
 	}
 	items := make([]playlist.PlaylistItemDTO, len(rawItems))
 	for i := 0; i < len(rawItems); i++ {
-		items[i].Type = playlist.PlaylistItemType(rawItems[i].Type)
+		items[i].Type = rawItems[i].Type
 		items[i].Value = rawItems[i].Value
 
 		// Add the unused title to the result
@@ -58,10 +55,13 @@ func (s *Service) Get(ctx context.Context, q *playlist.GetPlaylistByUidQuery) (*
 		}
 	}
 	return &playlist.PlaylistDTO{
-		Uid:      v.UID,
-		Name:     v.Name,
-		Interval: v.Interval,
-		Items:    items,
+		Uid:       v.UID,
+		Name:      v.Name,
+		Interval:  v.Interval,
+		Items:     items,
+		CreatedAt: v.CreatedAt,
+		UpdatedAt: v.UpdatedAt,
+		OrgID:     v.OrgId,
 	}, nil
 }
 
diff --git a/pkg/services/pluginsintegration/clientmiddleware/logger_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/logger_middleware.go
index 8230997e23686..74dc492fc8a25 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/logger_middleware.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/logger_middleware.go
@@ -10,27 +10,31 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/plugins"
 	plog "github.com/grafana/grafana/pkg/plugins/log"
+	"github.com/grafana/grafana/pkg/plugins/pluginrequestmeta"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
 // NewLoggerMiddleware creates a new plugins.ClientMiddleware that will
 // log requests.
-func NewLoggerMiddleware(cfg *setting.Cfg, logger plog.Logger) plugins.ClientMiddleware {
+func NewLoggerMiddleware(cfg *setting.Cfg, logger plog.Logger, features featuremgmt.FeatureToggles) plugins.ClientMiddleware {
 	return plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
 		if !cfg.PluginLogBackendRequests {
 			return next
 		}
 
 		return &LoggerMiddleware{
-			next:   next,
-			logger: logger,
+			next:     next,
+			logger:   logger,
+			features: features,
 		}
 	})
 }
 
 type LoggerMiddleware struct {
-	next   plugins.Client
-	logger plog.Logger
+	next     plugins.Client
+	logger   plog.Logger
+	features featuremgmt.FeatureToggles
 }
 
 func (m *LoggerMiddleware) logRequest(ctx context.Context, fn func(ctx context.Context) error) error {
@@ -45,7 +49,6 @@ func (m *LoggerMiddleware) logRequest(ctx context.Context, fn func(ctx context.C
 			status = statusCancelled
 		}
 	}
-
 	logParams := []any{
 		"status", status,
 		"duration", time.Since(start),
@@ -55,6 +58,9 @@ func (m *LoggerMiddleware) logRequest(ctx context.Context, fn func(ctx context.C
 	if status == statusError {
 		logParams = append(logParams, "error", err)
 	}
+	if m.features.IsEnabled(featuremgmt.FlagPluginsInstrumentationStatusSource) {
+		logParams = append(logParams, "status_source", pluginrequestmeta.StatusSourceFromContext(ctx))
+	}
 	m.logger.FromContext(ctx).Info("Plugin Request Completed", logParams...)
 	return err
 }
@@ -67,7 +73,19 @@ func (m *LoggerMiddleware) QueryData(ctx context.Context, req *backend.QueryData
 	var resp *backend.QueryDataResponse
 	err := m.logRequest(ctx, func(ctx context.Context) (innerErr error) {
 		resp, innerErr = m.next.QueryData(ctx, req)
-		return innerErr
+
+		if innerErr != nil {
+			return innerErr
+		}
+
+		ctxLogger := m.logger.FromContext(ctx)
+		for refID, dr := range resp.Responses {
+			if dr.Error != nil {
+				ctxLogger.Error("Partial data response error", "refID", refID, "error", dr.Error)
+			}
+		}
+
+		return nil
 	})
 
 	return resp, err
diff --git a/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware.go
index fa765b800538d..e293711320683 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware.go
@@ -3,6 +3,7 @@ package clientmiddleware
 import (
 	"context"
 	"errors"
+	"fmt"
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
@@ -11,6 +12,8 @@ import (
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/plugins/manager/registry"
+	"github.com/grafana/grafana/pkg/plugins/pluginrequestmeta"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 )
 
 // pluginMetrics contains the prometheus metrics used by the MetricsMiddleware.
@@ -26,21 +29,26 @@ type pluginMetrics struct {
 type MetricsMiddleware struct {
 	pluginMetrics
 	pluginRegistry registry.Service
+	features       featuremgmt.FeatureToggles
 	next           plugins.Client
 }
 
-func newMetricsMiddleware(promRegisterer prometheus.Registerer, pluginRegistry registry.Service) *MetricsMiddleware {
+func newMetricsMiddleware(promRegisterer prometheus.Registerer, pluginRegistry registry.Service, features featuremgmt.FeatureToggles) *MetricsMiddleware {
+	var additionalLabels []string
+	if features.IsEnabled(featuremgmt.FlagPluginsInstrumentationStatusSource) {
+		additionalLabels = []string{"status_source"}
+	}
 	pluginRequestCounter := prometheus.NewCounterVec(prometheus.CounterOpts{
 		Namespace: "grafana",
 		Name:      "plugin_request_total",
 		Help:      "The total amount of plugin requests",
-	}, []string{"plugin_id", "endpoint", "status", "target"})
+	}, append([]string{"plugin_id", "endpoint", "status", "target"}, additionalLabels...))
 	pluginRequestDuration := prometheus.NewHistogramVec(prometheus.HistogramOpts{
 		Namespace: "grafana",
 		Name:      "plugin_request_duration_milliseconds",
 		Help:      "Plugin request duration",
 		Buckets:   []float64{.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10, 25, 50, 100},
-	}, []string{"plugin_id", "endpoint", "target"})
+	}, append([]string{"plugin_id", "endpoint", "target"}, additionalLabels...))
 	pluginRequestSize := prometheus.NewHistogramVec(
 		prometheus.HistogramOpts{
 			Namespace: "grafana",
@@ -54,7 +62,7 @@ func newMetricsMiddleware(promRegisterer prometheus.Registerer, pluginRegistry r
 		Name:      "plugin_request_duration_seconds",
 		Help:      "Plugin request duration in seconds",
 		Buckets:   []float64{.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10, 25},
-	}, []string{"source", "plugin_id", "endpoint", "status", "target"})
+	}, append([]string{"source", "plugin_id", "endpoint", "status", "target"}, additionalLabels...))
 	promRegisterer.MustRegister(
 		pluginRequestCounter,
 		pluginRequestDuration,
@@ -69,12 +77,13 @@ func newMetricsMiddleware(promRegisterer prometheus.Registerer, pluginRegistry r
 			pluginRequestDurationSeconds: pluginRequestDurationSeconds,
 		},
 		pluginRegistry: pluginRegistry,
+		features:       features,
 	}
 }
 
 // NewMetricsMiddleware returns a new MetricsMiddleware.
-func NewMetricsMiddleware(promRegisterer prometheus.Registerer, pluginRegistry registry.Service) plugins.ClientMiddleware {
-	imw := newMetricsMiddleware(promRegisterer, pluginRegistry)
+func NewMetricsMiddleware(promRegisterer prometheus.Registerer, pluginRegistry registry.Service, features featuremgmt.FeatureToggles) plugins.ClientMiddleware {
+	imw := newMetricsMiddleware(promRegisterer, pluginRegistry, features)
 	return plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
 		imw.next = next
 		return imw
@@ -117,12 +126,21 @@ func (m *MetricsMiddleware) instrumentPluginRequest(ctx context.Context, pluginC
 			status = statusCancelled
 		}
 	}
-
 	elapsed := time.Since(start)
 
-	pluginRequestDurationWithLabels := m.pluginRequestDuration.WithLabelValues(pluginCtx.PluginID, endpoint, target)
-	pluginRequestCounterWithLabels := m.pluginRequestCounter.WithLabelValues(pluginCtx.PluginID, endpoint, status, target)
-	pluginRequestDurationSecondsWithLabels := m.pluginRequestDurationSeconds.WithLabelValues("grafana-backend", pluginCtx.PluginID, endpoint, status, target)
+	pluginRequestDurationLabels := []string{pluginCtx.PluginID, endpoint, target}
+	pluginRequestCounterLabels := []string{pluginCtx.PluginID, endpoint, status, target}
+	pluginRequestDurationSecondsLabels := []string{"grafana-backend", pluginCtx.PluginID, endpoint, status, target}
+	if m.features.IsEnabled(featuremgmt.FlagPluginsInstrumentationStatusSource) {
+		statusSource := pluginrequestmeta.StatusSourceFromContext(ctx)
+		pluginRequestDurationLabels = append(pluginRequestDurationLabels, string(statusSource))
+		pluginRequestCounterLabels = append(pluginRequestCounterLabels, string(statusSource))
+		pluginRequestDurationSecondsLabels = append(pluginRequestDurationSecondsLabels, string(statusSource))
+	}
+
+	pluginRequestDurationWithLabels := m.pluginRequestDuration.WithLabelValues(pluginRequestDurationLabels...)
+	pluginRequestCounterWithLabels := m.pluginRequestCounter.WithLabelValues(pluginRequestCounterLabels...)
+	pluginRequestDurationSecondsWithLabels := m.pluginRequestDurationSeconds.WithLabelValues(pluginRequestDurationSecondsLabels...)
 
 	if traceID := tracing.TraceIDFromContext(ctx, true); traceID != "" {
 		pluginRequestDurationWithLabels.(prometheus.ExemplarObserver).ObserveWithExemplar(
@@ -142,6 +160,9 @@ func (m *MetricsMiddleware) instrumentPluginRequest(ctx context.Context, pluginC
 }
 
 func (m *MetricsMiddleware) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	// Setup plugin request status source
+	ctx = pluginrequestmeta.WithStatusSource(ctx, pluginrequestmeta.StatusSourcePlugin)
+
 	var requestSize float64
 	for _, v := range req.Queries {
 		requestSize += float64(len(v.JSON))
@@ -152,6 +173,32 @@ func (m *MetricsMiddleware) QueryData(ctx context.Context, req *backend.QueryDat
 	var resp *backend.QueryDataResponse
 	err := m.instrumentPluginRequest(ctx, req.PluginContext, endpointQueryData, func(ctx context.Context) (innerErr error) {
 		resp, innerErr = m.next.QueryData(ctx, req)
+		if resp == nil || resp.Responses == nil || !m.features.IsEnabled(featuremgmt.FlagPluginsInstrumentationStatusSource) {
+			return innerErr
+		}
+
+		// Set downstream status source in the context if there's at least one response with downstream status source,
+		// and if there's no plugin error
+		var hasPluginError bool
+		var hasDownstreamError bool
+		for _, r := range resp.Responses {
+			if r.Error == nil {
+				continue
+			}
+			if r.ErrorSource == backend.ErrorSourceDownstream {
+				hasDownstreamError = true
+			} else {
+				hasPluginError = true
+			}
+		}
+		// A plugin error has higher priority than a downstream error,
+		// so set to downstream only if there's no plugin error
+		if hasDownstreamError && !hasPluginError {
+			if err := pluginrequestmeta.WithDownstreamStatusSource(ctx); err != nil {
+				return fmt.Errorf("failed to set downstream status source: %w", err)
+			}
+		}
+
 		return innerErr
 	})
 	return resp, err
diff --git a/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware_test.go b/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware_test.go
index f9321fb22e37c..eaae2c58fdbf9 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware_test.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/metrics_middleware_test.go
@@ -16,20 +16,21 @@ import (
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
 	"github.com/grafana/grafana/pkg/plugins/manager/client/clienttest"
 	"github.com/grafana/grafana/pkg/plugins/manager/fakes"
+	"github.com/grafana/grafana/pkg/plugins/pluginrequestmeta"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 )
 
-func TestInstrumentationMiddleware(t *testing.T) {
-	const (
-		pluginID = "plugin-id"
+const (
+	pluginID = "plugin-id"
 
-		metricRequestTotal      = "grafana_plugin_request_total"
-		metricRequestDurationMs = "grafana_plugin_request_duration_milliseconds"
-		metricRequestDurationS  = "grafana_plugin_request_duration_seconds"
-		metricRequestSize       = "grafana_plugin_request_size_bytes"
-	)
+	metricRequestTotal      = "grafana_plugin_request_total"
+	metricRequestDurationMs = "grafana_plugin_request_duration_milliseconds"
+	metricRequestDurationS  = "grafana_plugin_request_duration_seconds"
+	metricRequestSize       = "grafana_plugin_request_size_bytes"
+)
 
+func TestInstrumentationMiddleware(t *testing.T) {
 	pCtx := backend.PluginContext{PluginID: pluginID}
-
 	t.Run("should instrument requests", func(t *testing.T) {
 		for _, tc := range []struct {
 			expEndpoint                 string
@@ -75,7 +76,7 @@ func TestInstrumentationMiddleware(t *testing.T) {
 					JSONData: plugins.JSONData{ID: pluginID, Backend: true},
 				}))
 
-				mw := newMetricsMiddleware(promRegistry, pluginsRegistry)
+				mw := newMetricsMiddleware(promRegistry, pluginsRegistry, featuremgmt.WithFeatures())
 				cdt := clienttest.NewClientDecoratorTest(t, clienttest.WithMiddlewares(
 					plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
 						mw.next = next
@@ -112,6 +113,173 @@ func TestInstrumentationMiddleware(t *testing.T) {
 	})
 }
 
+func TestInstrumentationMiddlewareStatusSource(t *testing.T) {
+	const labelStatusSource = "status_source"
+	queryDataCounterLabels := prometheus.Labels{
+		"plugin_id": pluginID,
+		"endpoint":  endpointQueryData,
+		"status":    statusOK,
+		"target":    string(backendplugin.TargetUnknown),
+	}
+	downstreamErrorResponse := backend.DataResponse{
+		Frames:      nil,
+		Error:       errors.New("bad gateway"),
+		Status:      502,
+		ErrorSource: backend.ErrorSourceDownstream,
+	}
+	pluginErrorResponse := backend.DataResponse{
+		Frames:      nil,
+		Error:       errors.New("internal error"),
+		Status:      500,
+		ErrorSource: backend.ErrorSourcePlugin,
+	}
+	legacyErrorResponse := backend.DataResponse{
+		Frames:      nil,
+		Error:       errors.New("internal error"),
+		Status:      500,
+		ErrorSource: "",
+	}
+	okResponse := backend.DataResponse{
+		Frames:      nil,
+		Error:       nil,
+		Status:      200,
+		ErrorSource: "",
+	}
+
+	pCtx := backend.PluginContext{PluginID: pluginID}
+
+	promRegistry := prometheus.NewRegistry()
+	pluginsRegistry := fakes.NewFakePluginRegistry()
+	require.NoError(t, pluginsRegistry.Add(context.Background(), &plugins.Plugin{
+		JSONData: plugins.JSONData{ID: pluginID, Backend: true},
+	}))
+	features := featuremgmt.WithFeatures(featuremgmt.FlagPluginsInstrumentationStatusSource)
+	metricsMw := newMetricsMiddleware(promRegistry, pluginsRegistry, features)
+	cdt := clienttest.NewClientDecoratorTest(t, clienttest.WithMiddlewares(
+		plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
+			metricsMw.next = next
+			return metricsMw
+		}),
+	))
+
+	t.Run("Metrics", func(t *testing.T) {
+		t.Run("Should ignore ErrorSource if feature flag is disabled", func(t *testing.T) {
+			// Use different middleware without feature flag
+			metricsMw := newMetricsMiddleware(prometheus.NewRegistry(), pluginsRegistry, featuremgmt.WithFeatures())
+			cdt := clienttest.NewClientDecoratorTest(t, clienttest.WithMiddlewares(
+				plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
+					metricsMw.next = next
+					return metricsMw
+				}),
+			))
+
+			cdt.TestClient.QueryDataFunc = func(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+				return &backend.QueryDataResponse{Responses: map[string]backend.DataResponse{"A": downstreamErrorResponse}}, nil
+			}
+			_, err := cdt.Decorator.QueryData(context.Background(), &backend.QueryDataRequest{PluginContext: pCtx})
+			require.NoError(t, err)
+			counter, err := metricsMw.pluginMetrics.pluginRequestCounter.GetMetricWith(newLabels(queryDataCounterLabels, nil))
+			require.NoError(t, err)
+			require.Equal(t, 1.0, testutil.ToFloat64(counter))
+
+			// error_source should not be defined at all
+			_, err = metricsMw.pluginMetrics.pluginRequestCounter.GetMetricWith(newLabels(
+				queryDataCounterLabels,
+				prometheus.Labels{
+					labelStatusSource: string(backend.ErrorSourceDownstream),
+				}),
+			)
+			require.Error(t, err)
+			require.ErrorContains(t, err, "inconsistent label cardinality")
+		})
+
+		t.Run("Should add error_source label if feature flag is enabled", func(t *testing.T) {
+			metricsMw.pluginMetrics.pluginRequestCounter.Reset()
+
+			cdt.TestClient.QueryDataFunc = func(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+				return &backend.QueryDataResponse{Responses: map[string]backend.DataResponse{"A": downstreamErrorResponse}}, nil
+			}
+			_, err := cdt.Decorator.QueryData(context.Background(), &backend.QueryDataRequest{PluginContext: pCtx})
+			require.NoError(t, err)
+			counter, err := metricsMw.pluginMetrics.pluginRequestCounter.GetMetricWith(newLabels(
+				queryDataCounterLabels,
+				prometheus.Labels{
+					labelStatusSource: string(backend.ErrorSourceDownstream),
+				}),
+			)
+			require.NoError(t, err)
+			require.Equal(t, 1.0, testutil.ToFloat64(counter))
+		})
+	})
+
+	t.Run("Priority", func(t *testing.T) {
+		for _, tc := range []struct {
+			name            string
+			responses       map[string]backend.DataResponse
+			expStatusSource pluginrequestmeta.StatusSource
+		}{
+			{
+				"Default status source for ok responses should be plugin",
+				map[string]backend.DataResponse{"A": okResponse},
+				pluginrequestmeta.StatusSourcePlugin,
+			},
+			{
+				"Plugin errors should have higher priority than downstream errors",
+				map[string]backend.DataResponse{
+					"A": pluginErrorResponse,
+					"B": downstreamErrorResponse,
+				},
+				pluginrequestmeta.StatusSourcePlugin,
+			},
+			{
+				"Errors without ErrorSource should be reported as plugin status source",
+				map[string]backend.DataResponse{"A": legacyErrorResponse},
+				pluginrequestmeta.StatusSourcePlugin,
+			},
+			{
+				"Downstream errors should have higher priority than ok responses",
+				map[string]backend.DataResponse{
+					"A": okResponse,
+					"B": downstreamErrorResponse,
+				},
+				pluginrequestmeta.StatusSourceDownstream,
+			},
+			{
+				"Plugin errors should have higher priority than ok responses",
+				map[string]backend.DataResponse{
+					"A": okResponse,
+					"B": pluginErrorResponse,
+				},
+				pluginrequestmeta.StatusSourcePlugin,
+			},
+			{
+				"Legacy errors should have higher priority than ok responses",
+				map[string]backend.DataResponse{
+					"A": okResponse,
+					"B": legacyErrorResponse,
+				},
+				pluginrequestmeta.StatusSourcePlugin,
+			},
+		} {
+			t.Run(tc.name, func(t *testing.T) {
+				t.Cleanup(func() {
+					cdt.QueryDataCtx = nil
+					cdt.QueryDataReq = nil
+				})
+				cdt.TestClient.QueryDataFunc = func(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+					cdt.QueryDataCtx = ctx
+					cdt.QueryDataReq = req
+					return &backend.QueryDataResponse{Responses: tc.responses}, nil
+				}
+				_, err := cdt.Decorator.QueryData(context.Background(), &backend.QueryDataRequest{PluginContext: pCtx})
+				require.NoError(t, err)
+				ctxStatusSource := pluginrequestmeta.StatusSourceFromContext(cdt.QueryDataCtx)
+				require.Equal(t, tc.expStatusSource, ctxStatusSource)
+			})
+		}
+	})
+}
+
 // checkHistogram is a utility function that checks if a histogram with the given name and label values exists
 // and has been observed at least once.
 func checkHistogram(promRegistry *prometheus.Registry, expMetricName string, expLabels map[string]string) error {
@@ -162,3 +330,18 @@ func checkHistogram(promRegistry *prometheus.Registry, expMetricName string, exp
 	}
 	return nil
 }
+
+// newLabels creates a new prometheus.Labels from the given initial labels and additional labels.
+// The additionalLabels are merged into the initial ones, and will overwrite a value if already set in initialLabels.
+func newLabels(initialLabels prometheus.Labels, additional ...prometheus.Labels) prometheus.Labels {
+	r := make(prometheus.Labels, len(initialLabels)+len(additional)/2)
+	for k, v := range initialLabels {
+		r[k] = v
+	}
+	for _, l := range additional {
+		for k, v := range l {
+			r[k] = v
+		}
+	}
+	return r
+}
diff --git a/pkg/services/pluginsintegration/clientmiddleware/team_headers_middleware.go b/pkg/services/pluginsintegration/clientmiddleware/team_headers_middleware.go
new file mode 100644
index 0000000000000..9cb10240785ac
--- /dev/null
+++ b/pkg/services/pluginsintegration/clientmiddleware/team_headers_middleware.go
@@ -0,0 +1,131 @@
+package clientmiddleware
+
+import (
+	"context"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/services/contexthandler"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/util/proxyutil"
+)
+
+// NewTeamHTTPHeaderMiddleware creates a new plugins.ClientMiddleware that will
+// set headers based on teams user is member of.
+func NewTeamHTTPHeadersMiddleware() plugins.ClientMiddleware {
+	return plugins.ClientMiddlewareFunc(func(next plugins.Client) plugins.Client {
+		return &TeamHTTPHeadersMiddleware{
+			next: next,
+		}
+	})
+}
+
+type TeamHTTPHeadersMiddleware struct {
+	next plugins.Client
+}
+
+func (m *TeamHTTPHeadersMiddleware) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	if req == nil {
+		return m.next.QueryData(ctx, req)
+	}
+
+	err := m.setHeaders(ctx, req.PluginContext, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return m.next.QueryData(ctx, req)
+}
+
+func (m *TeamHTTPHeadersMiddleware) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	if req == nil {
+		return m.next.CallResource(ctx, req, sender)
+	}
+
+	err := m.setHeaders(ctx, req.PluginContext, req)
+	if err != nil {
+		return err
+	}
+
+	return m.next.CallResource(ctx, req, sender)
+}
+
+func (m *TeamHTTPHeadersMiddleware) CheckHealth(ctx context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+	if req == nil {
+		return m.next.CheckHealth(ctx, req)
+	}
+
+	// NOTE: might not be needed to set headers. we want to for now set these headers
+	err := m.setHeaders(ctx, req.PluginContext, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return m.next.CheckHealth(ctx, req)
+}
+
+func (m *TeamHTTPHeadersMiddleware) CollectMetrics(ctx context.Context, req *backend.CollectMetricsRequest) (*backend.CollectMetricsResult, error) {
+	return m.next.CollectMetrics(ctx, req)
+}
+
+func (m *TeamHTTPHeadersMiddleware) SubscribeStream(ctx context.Context, req *backend.SubscribeStreamRequest) (*backend.SubscribeStreamResponse, error) {
+	return m.next.SubscribeStream(ctx, req)
+}
+
+func (m *TeamHTTPHeadersMiddleware) PublishStream(ctx context.Context, req *backend.PublishStreamRequest) (*backend.PublishStreamResponse, error) {
+	return m.next.PublishStream(ctx, req)
+}
+
+func (m *TeamHTTPHeadersMiddleware) RunStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender) error {
+	return m.next.RunStream(ctx, req, sender)
+}
+
+func (m *TeamHTTPHeadersMiddleware) setHeaders(ctx context.Context, pCtx backend.PluginContext, req interface{}) error {
+	reqCtx := contexthandler.FromContext(ctx)
+	// if request not for a datasource or no HTTP request context skip middleware
+	if req == nil || pCtx.DataSourceInstanceSettings == nil || reqCtx == nil || reqCtx.Req == nil {
+		return nil
+	}
+
+	settings := pCtx.DataSourceInstanceSettings
+	jsonDataBytes, err := simplejson.NewJson(settings.JSONData)
+	if err != nil {
+		return err
+	}
+
+	ds := &datasources.DataSource{
+		ID:       settings.ID,
+		OrgID:    pCtx.OrgID,
+		JsonData: jsonDataBytes,
+		Updated:  settings.Updated,
+	}
+
+	signedInUser, err := appcontext.User(ctx)
+	if err != nil {
+		return nil // no user
+	}
+
+	teamHTTPHeaders, err := proxyutil.GetTeamHTTPHeaders(ds, signedInUser.GetTeams())
+	if err != nil {
+		return err
+	}
+
+	switch t := req.(type) {
+	case *backend.QueryDataRequest:
+		for key, value := range teamHTTPHeaders {
+			t.SetHTTPHeader(key, value)
+		}
+	case *backend.CheckHealthRequest:
+		for key, value := range teamHTTPHeaders {
+			t.SetHTTPHeader(key, value)
+		}
+	case *backend.CallResourceRequest:
+		for key, value := range teamHTTPHeaders {
+			t.SetHTTPHeader(key, value)
+		}
+	}
+
+	return nil
+}
diff --git a/pkg/services/pluginsintegration/loader/loader_test.go b/pkg/services/pluginsintegration/loader/loader_test.go
index c4fda2f7b14ff..553ccbc4e5d17 100644
--- a/pkg/services/pluginsintegration/loader/loader_test.go
+++ b/pkg/services/pluginsintegration/loader/loader_test.go
@@ -498,12 +498,12 @@ func TestLoader_Load_ExternalRegistration(t *testing.T) {
 	boolPtr := func(b bool) *bool { return &b }
 	stringPtr := func(s string) *string { return &s }
 
-	t.Run("Load a plugin with external registration", func(t *testing.T) {
+	t.Run("Load a plugin with oauth client registration", func(t *testing.T) {
 		cfg := &config.Cfg{
 			Features:             fakes.NewFakeFeatureToggles(featuremgmt.FlagExternalServiceAuth),
 			PluginsAllowUnsigned: []string{"grafana-test-datasource"},
 		}
-		pluginPaths := []string{filepath.Join(testDataDir(t), "external-registration")}
+		pluginPaths := []string{filepath.Join(testDataDir(t), "oauth-external-registration")}
 		expected := []*plugins.Plugin{
 			{JSONData: plugins.JSONData{
 				ID:         "grafana-test-datasource",
@@ -539,13 +539,10 @@ func TestLoader_Load_ExternalRegistration(t *testing.T) {
 							},
 						},
 					},
-					Self: &plugindef.Self{
-						Enabled: boolPtr(true),
-						Permissions: []plugindef.Permission{
-							{
-								Action: "read",
-								Scope:  stringPtr("datasource"),
-							},
+					Permissions: []plugindef.Permission{
+						{
+							Action: "read",
+							Scope:  stringPtr("datasource"),
 						},
 					},
 				},
@@ -602,6 +599,96 @@ func TestLoader_Load_ExternalRegistration(t *testing.T) {
 			t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(got, expected, compareOpts...))
 		}
 	})
+
+	t.Run("Load a plugin with service account registration", func(t *testing.T) {
+		cfg := &config.Cfg{
+			Features:             fakes.NewFakeFeatureToggles(featuremgmt.FlagExternalServiceAuth),
+			PluginsAllowUnsigned: []string{"grafana-test-datasource"},
+		}
+		pluginPaths := []string{filepath.Join(testDataDir(t), "external-registration")}
+		expected := []*plugins.Plugin{
+			{JSONData: plugins.JSONData{
+				ID:         "grafana-test-datasource",
+				Type:       plugins.TypeDataSource,
+				Name:       "Test",
+				Backend:    true,
+				Executable: "gpx_test_datasource",
+				Info: plugins.Info{
+					Author: plugins.InfoLink{
+						Name: "Grafana Labs",
+						URL:  "https://grafana.com",
+					},
+					Version: "1.0.0",
+					Logos: plugins.Logos{
+						Small: "/public/plugins/grafana-test-datasource/img/ds.svg",
+						Large: "/public/plugins/grafana-test-datasource/img/ds.svg",
+					},
+					Updated:     "2023-08-03",
+					Screenshots: []plugins.Screenshots{},
+				},
+				Dependencies: plugins.Dependencies{
+					GrafanaVersion: "*",
+					Plugins:        []plugins.Dependency{},
+				},
+				ExternalServiceRegistration: &plugindef.ExternalServiceRegistration{
+					Permissions: []plugindef.Permission{
+						{
+							Action: "read",
+							Scope:  stringPtr("datasource"),
+						},
+					},
+				},
+			},
+				FS:        mustNewStaticFSForTests(t, pluginPaths[0]),
+				Class:     plugins.ClassExternal,
+				Signature: plugins.SignatureStatusUnsigned,
+				Module:    "/public/plugins/grafana-test-datasource/module.js",
+				BaseURL:   "/public/plugins/grafana-test-datasource",
+				ExternalService: &auth.ExternalService{
+					ClientID:     "client-id",
+					ClientSecret: "secretz",
+				},
+			},
+		}
+
+		backendFactoryProvider := fakes.NewFakeBackendProcessProvider()
+		backendFactoryProvider.BackendFactoryFunc = func(ctx context.Context, plugin *plugins.Plugin) backendplugin.PluginFactoryFunc {
+			return func(pluginID string, logger log.Logger, env func() []string) (backendplugin.Plugin, error) {
+				require.Equal(t, "grafana-test-datasource", pluginID)
+				require.Equal(t, []string{"GF_VERSION=", "GF_EDITION=", "GF_ENTERPRISE_LICENSE_PATH=",
+					"GF_ENTERPRISE_APP_URL=", "GF_ENTERPRISE_LICENSE_TEXT=", "GF_APP_URL=",
+					"GF_PLUGIN_APP_CLIENT_ID=client-id", "GF_PLUGIN_APP_CLIENT_SECRET=secretz",
+					"GF_INSTANCE_FEATURE_TOGGLES_ENABLE=externalServiceAuth"}, env())
+				return &fakes.FakeBackendPlugin{}, nil
+			}
+		}
+
+		l := newLoaderWithOpts(t, cfg, loaderDepOpts{
+			authServiceRegistry: &fakes.FakeAuthService{
+				Result: &auth.ExternalService{
+					ClientID:     "client-id",
+					ClientSecret: "secretz",
+				},
+			},
+			backendFactoryProvider: backendFactoryProvider,
+		})
+		got, err := l.Load(context.Background(), &fakes.FakePluginSource{
+			PluginClassFunc: func(ctx context.Context) plugins.Class {
+				return plugins.ClassExternal
+			},
+			PluginURIsFunc: func(ctx context.Context) []string {
+				return pluginPaths
+			},
+			DefaultSignatureFunc: func(ctx context.Context) (plugins.Signature, bool) {
+				return plugins.Signature{}, false
+			},
+		})
+
+		require.NoError(t, err)
+		if !cmp.Equal(got, expected, compareOpts...) {
+			t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(got, expected, compareOpts...))
+		}
+	})
 }
 
 func TestLoader_Load_CustomSource(t *testing.T) {
diff --git a/pkg/services/pluginsintegration/pipeline/steps.go b/pkg/services/pluginsintegration/pipeline/steps.go
index 6e2bc6c0c2dff..44bd572dba3f2 100644
--- a/pkg/services/pluginsintegration/pipeline/steps.go
+++ b/pkg/services/pluginsintegration/pipeline/steps.go
@@ -38,7 +38,8 @@ func newExternalServiceRegistration(cfg *config.Cfg, serviceRegistry auth.Extern
 
 // Register registers the external service with the external service registry, if the feature is enabled.
 func (r *ExternalServiceRegistration) Register(ctx context.Context, p *plugins.Plugin) (*plugins.Plugin, error) {
-	if p.ExternalServiceRegistration != nil && r.cfg.Features.IsEnabled(featuremgmt.FlagExternalServiceAuth) {
+	if p.ExternalServiceRegistration != nil &&
+		(r.cfg.Features.IsEnabled(featuremgmt.FlagExternalServiceAuth) || r.cfg.Features.IsEnabled(featuremgmt.FlagExternalServiceAccounts)) {
 		s, err := r.externalServiceRegistry.RegisterExternalService(ctx, p.ID, p.ExternalServiceRegistration)
 		if err != nil {
 			r.log.Error("Could not register an external service. Initialization skipped", "pluginId", p.ID, "error", err)
diff --git a/pkg/services/pluginsintegration/pluginsintegration.go b/pkg/services/pluginsintegration/pluginsintegration.go
index 7114142b66bcf..9a89255fffd0b 100644
--- a/pkg/services/pluginsintegration/pluginsintegration.go
+++ b/pkg/services/pluginsintegration/pluginsintegration.go
@@ -156,9 +156,9 @@ func CreateMiddlewares(cfg *setting.Cfg, oAuthTokenService oauthtoken.OAuthToken
 	skipCookiesNames := []string{cfg.LoginCookieName}
 	middlewares := []plugins.ClientMiddleware{
 		clientmiddleware.NewTracingMiddleware(tracer),
-		clientmiddleware.NewMetricsMiddleware(promRegisterer, registry),
+		clientmiddleware.NewMetricsMiddleware(promRegisterer, registry, features),
 		clientmiddleware.NewContextualLoggerMiddleware(),
-		clientmiddleware.NewLoggerMiddleware(cfg, log.New("plugin.instrumentation")),
+		clientmiddleware.NewLoggerMiddleware(cfg, log.New("plugin.instrumentation"), features),
 		clientmiddleware.NewTracingHeaderMiddleware(),
 		clientmiddleware.NewClearAuthHeadersMiddleware(),
 		clientmiddleware.NewOAuthTokenMiddleware(oAuthTokenService),
@@ -179,6 +179,10 @@ func CreateMiddlewares(cfg *setting.Cfg, oAuthTokenService oauthtoken.OAuthToken
 		middlewares = append(middlewares, clientmiddleware.NewUserHeaderMiddleware())
 	}
 
+	if features.IsEnabled(featuremgmt.FlagTeamHttpHeaders) {
+		middlewares = append(middlewares, clientmiddleware.NewTeamHTTPHeadersMiddleware())
+	}
+
 	middlewares = append(middlewares, clientmiddleware.NewHTTPClientMiddleware())
 
 	return middlewares
diff --git a/pkg/services/pluginsintegration/serviceregistration/serviceregistration.go b/pkg/services/pluginsintegration/serviceregistration/serviceregistration.go
index f2054f8ca3bc0..396e43f2565f0 100644
--- a/pkg/services/pluginsintegration/serviceregistration/serviceregistration.go
+++ b/pkg/services/pluginsintegration/serviceregistration/serviceregistration.go
@@ -38,23 +38,26 @@ func (s *Service) RegisterExternalService(ctx context.Context, svcName string, s
 	}
 
 	self := extsvcauth.SelfCfg{}
-	if svc.Self != nil {
-		self.Permissions = toAccessControlPermissions(svc.Self.Permissions)
-		if svc.Self.Enabled != nil {
-			self.Enabled = *svc.Self.Enabled
-		} else {
-			self.Enabled = true
-		}
+	if len(svc.Permissions) > 0 {
+		self.Permissions = toAccessControlPermissions(svc.Permissions)
+		self.Enabled = true
+	}
+
+	registration := &extsvcauth.ExternalServiceRegistration{
+		Name:          svcName,
+		Impersonation: impersonation,
+		Self:          self,
+	}
+
+	// Default authProvider now is ServiceAccounts
+	registration.AuthProvider = extsvcauth.ServiceAccounts
+	if svc.Impersonation != nil {
+		registration.AuthProvider = extsvcauth.OAuth2Server
+		registration.OAuthProviderCfg = &extsvcauth.OAuthProviderCfg{Key: &extsvcauth.KeyOption{Generate: true}}
 	}
 
-	extSvc, err := s.os.SaveExternalService(ctx, &extsvcauth.ExternalServiceRegistration{
-		Name:             svcName,
-		Impersonation:    impersonation,
-		Self:             self,
-		AuthProvider:     extsvcauth.OAuth2Server,
-		OAuthProviderCfg: &extsvcauth.OAuthProviderCfg{Key: &extsvcauth.KeyOption{Generate: true}},
-	})
-	if err != nil {
+	extSvc, err := s.os.SaveExternalService(ctx, registration)
+	if err != nil || extSvc == nil {
 		return nil, err
 	}
 
diff --git a/pkg/services/quota/quotaimpl/quota_test.go b/pkg/services/quota/quotaimpl/quota_test.go
index 42960015213ed..1703d6cebf776 100644
--- a/pkg/services/quota/quotaimpl/quota_test.go
+++ b/pkg/services/quota/quotaimpl/quota_test.go
@@ -476,7 +476,7 @@ func setupEnv(t *testing.T, sqlStore *sqlstore.SQLStore, b bus.Bus, quotaService
 	require.NoError(t, err)
 	secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
 	secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
-	_, err = dsservice.ProvideService(sqlStore, secretsService, secretsStore, sqlStore.Cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService)
+	_, err = dsservice.ProvideService(sqlStore, secretsService, secretsStore, sqlStore.Cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewMockedPermissionsService(), quotaService, &pluginstore.FakePluginStore{})
 	require.NoError(t, err)
 	m := metrics.NewNGAlert(prometheus.NewRegistry())
 	ruleStore, err := ngstore.ProvideDBStore(sqlStore.Cfg, featuremgmt.WithFeatures(), sqlStore, &foldertest.FakeService{},
diff --git a/pkg/services/secrets/kvstore/migrations/datasource_mig_test.go b/pkg/services/secrets/kvstore/migrations/datasource_mig_test.go
index bde1a10c72da8..275c7391a515a 100644
--- a/pkg/services/secrets/kvstore/migrations/datasource_mig_test.go
+++ b/pkg/services/secrets/kvstore/migrations/datasource_mig_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/datasources"
 	dsservice "github.com/grafana/grafana/pkg/services/datasources/service"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/secrets/fakes"
 	secretskvs "github.com/grafana/grafana/pkg/services/secrets/kvstore"
@@ -30,7 +31,7 @@ func SetupTestDataSourceSecretMigrationService(t *testing.T, sqlStore db.DB, kvS
 	}
 	secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
 	quotaService := quotatest.New(false, nil)
-	dsService, err := dsservice.ProvideService(sqlStore, secretsService, secretsStore, cfg, features, acmock.New(), acmock.NewMockedPermissionsService(), quotaService)
+	dsService, err := dsservice.ProvideService(sqlStore, secretsService, secretsStore, cfg, features, acmock.New(), acmock.NewMockedPermissionsService(), quotaService, &pluginstore.FakePluginStore{})
 	require.NoError(t, err)
 	migService := ProvideDataSourceMigrationService(dsService, kvStore, features)
 	return migService
diff --git a/pkg/services/store/kind/playlist/summary.go b/pkg/services/store/kind/playlist/summary.go
deleted file mode 100644
index 8511ae3e511c7..0000000000000
--- a/pkg/services/store/kind/playlist/summary.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package playlist
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-
-	"github.com/grafana/grafana/pkg/kinds/playlist"
-	"github.com/grafana/grafana/pkg/services/store/entity"
-)
-
-func GetEntityKindInfo() entity.EntityKindInfo {
-	return entity.EntityKindInfo{
-		ID:          entity.StandardKindPlaylist,
-		Name:        "Playlist",
-		Description: "Cycle though a collection of dashboards automatically",
-	}
-}
-
-func GetEntitySummaryBuilder() entity.EntitySummaryBuilder {
-	return summaryBuilder
-}
-
-func summaryBuilder(ctx context.Context, uid string, body []byte) (*entity.EntitySummary, []byte, error) {
-	obj := &playlist.Spec{}
-	err := json.Unmarshal(body, obj)
-	if err != nil {
-		return nil, nil, err // unable to read object
-	}
-
-	// TODO: fix model so this is not possible
-	if obj.Items == nil {
-		temp := make([]playlist.Item, 0)
-		obj.Items = temp
-	}
-
-	obj.Uid = uid // make sure they are consistent
-	summary := &entity.EntitySummary{
-		UID:         uid,
-		Name:        obj.Name,
-		Description: fmt.Sprintf("%d items, refreshed every %s", len(obj.Items), obj.Interval),
-	}
-
-	for _, item := range obj.Items {
-		switch item.Type {
-		case playlist.ItemTypeDashboardByUid:
-			summary.References = append(summary.References, &entity.EntityExternalReference{
-				Family:     entity.StandardKindDashboard,
-				Identifier: item.Value,
-			})
-
-		case playlist.ItemTypeDashboardByTag:
-			if summary.Labels == nil {
-				summary.Labels = make(map[string]string, 0)
-			}
-			summary.Labels[item.Value] = ""
-
-		case playlist.ItemTypeDashboardById:
-			// obviously insufficient long term... but good to have an example :)
-			summary.Error = &entity.EntityErrorInfo{
-				Message: "Playlist uses deprecated internal id system",
-			}
-		}
-	}
-
-	out, err := json.MarshalIndent(obj, "", "  ")
-	return summary, out, err
-}
diff --git a/pkg/services/store/kind/playlist/summary_test.go b/pkg/services/store/kind/playlist/summary_test.go
deleted file mode 100644
index 7a9186cbc37e1..0000000000000
--- a/pkg/services/store/kind/playlist/summary_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package playlist
-
-import (
-	"context"
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/kinds/playlist"
-)
-
-func TestPlaylistSummary(t *testing.T) {
-	builder := GetEntitySummaryBuilder()
-
-	// Do not parse invalid input
-	_, _, err := builder(context.Background(), "abc", []byte("{invalid json"))
-	require.Error(t, err)
-
-	playlist := playlist.Spec{
-		Interval: "30s",
-		Name:     "test",
-		Items: []playlist.Item{
-			{Type: playlist.ItemTypeDashboardByUid, Value: "D1"},
-			{Type: playlist.ItemTypeDashboardByTag, Value: "tagA"},
-			{Type: playlist.ItemTypeDashboardByUid, Value: "D3"},
-		},
-	}
-	out, err := json.Marshal(playlist)
-	require.NoError(t, err)
-	require.NotNil(t, out)
-
-	// Do not parse invalid input
-	summary, body, err := builder(context.Background(), "abc", out)
-	require.NoError(t, err)
-	require.Equal(t, "test", summary.Name)
-	require.Equal(t, 2, len(summary.References))
-	require.Equal(t, map[string]string{"tagA": ""}, summary.Labels)
-	require.True(t, json.Valid(body))
-}
diff --git a/pkg/services/store/kind/registry.go b/pkg/services/store/kind/registry.go
index a43d7c7a592e3..d6c9f6d27a551 100644
--- a/pkg/services/store/kind/registry.go
+++ b/pkg/services/store/kind/registry.go
@@ -12,7 +12,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/store/kind/folder"
 	"github.com/grafana/grafana/pkg/services/store/kind/geojson"
 	"github.com/grafana/grafana/pkg/services/store/kind/jsonobj"
-	"github.com/grafana/grafana/pkg/services/store/kind/playlist"
 	"github.com/grafana/grafana/pkg/services/store/kind/png"
 	"github.com/grafana/grafana/pkg/services/store/kind/preferences"
 	"github.com/grafana/grafana/pkg/services/store/kind/snapshot"
@@ -30,10 +29,6 @@ type KindRegistry interface {
 
 func NewKindRegistry() KindRegistry {
 	kinds := make(map[string]*kindValues)
-	kinds[entity.StandardKindPlaylist] = &kindValues{
-		info:    playlist.GetEntityKindInfo(),
-		builder: playlist.GetEntitySummaryBuilder(),
-	}
 	kinds[entity.StandardKindDashboard] = &kindValues{
 		info:    dashboard.GetEntityKindInfo(),
 		builder: dashboard.GetEntitySummaryBuilder(),
diff --git a/pkg/services/store/kind/registry_test.go b/pkg/services/store/kind/registry_test.go
index 9443edc1263aa..a9e501ed5f860 100644
--- a/pkg/services/store/kind/registry_test.go
+++ b/pkg/services/store/kind/registry_test.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/grafana/pkg/services/store/entity"
 	"github.com/grafana/grafana/pkg/services/store/kind/dummy"
 )
 
@@ -24,21 +23,14 @@ func TestKindRegistry(t *testing.T) {
 		"frame",
 		"geojson",
 		"jsonobj",
-		"playlist",
 		"png",
 		"preferences",
 		"snapshot",
 		"test",
 	}, ids)
 
-	// Check playlist exists
-	info, err := registry.GetInfo(entity.StandardKindPlaylist)
-	require.NoError(t, err)
-	require.Equal(t, "Playlist", info.Name)
-	require.False(t, info.IsRaw)
-
 	// Check that we registered a test item
-	info, err = registry.GetInfo("test")
+	info, err := registry.GetInfo("test")
 	require.NoError(t, err)
 	require.Equal(t, "test", info.Name)
 	require.True(t, info.IsRaw)
diff --git a/pkg/setting/setting_secure_socks_proxy.go b/pkg/setting/setting_secure_socks_proxy.go
index 64700ec21992c..41689d4ef022f 100644
--- a/pkg/setting/setting_secure_socks_proxy.go
+++ b/pkg/setting/setting_secure_socks_proxy.go
@@ -3,7 +3,6 @@ package setting
 import (
 	"errors"
 
-	sdkproxy "github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
 	"gopkg.in/ini.v1"
 )
 
@@ -43,21 +42,5 @@ func readSecureSocksDSProxySettings(iniFile *ini.File) (SecureSocksDSProxySettin
 		return s, errors.New("proxy address required")
 	}
 
-	setDefaultProxyCli(s)
-
 	return s, nil
 }
-
-// setDefaultProxyCli overrides the default proxy cli for the sdk
-//
-// Note: Not optimal changing global state, but hard to not do in this case.
-func setDefaultProxyCli(cfg SecureSocksDSProxySettings) {
-	sdkproxy.Cli = sdkproxy.NewWithCfg(&sdkproxy.ClientCfg{
-		Enabled:      cfg.Enabled,
-		ClientCert:   cfg.ClientCert,
-		ClientKey:    cfg.ClientKey,
-		ServerName:   cfg.ServerName,
-		RootCA:       cfg.RootCA,
-		ProxyAddress: cfg.ProxyAddress,
-	})
-}
diff --git a/pkg/tsdb/azuremonitor/azuremonitor.go b/pkg/tsdb/azuremonitor/azuremonitor.go
index ac94cb0284236..9cf434c2f73f8 100644
--- a/pkg/tsdb/azuremonitor/azuremonitor.go
+++ b/pkg/tsdb/azuremonitor/azuremonitor.go
@@ -63,9 +63,9 @@ type Service struct {
 	resourceHandler backend.CallResourceHandler
 }
 
-func getDatasourceService(settings *backend.DataSourceInstanceSettings, cfg *setting.Cfg, clientProvider *httpclient.Provider, dsInfo types.DatasourceInfo, routeName string) (types.DatasourceService, error) {
+func getDatasourceService(ctx context.Context, settings *backend.DataSourceInstanceSettings, cfg *setting.Cfg, clientProvider *httpclient.Provider, dsInfo types.DatasourceInfo, routeName string) (types.DatasourceService, error) {
 	route := dsInfo.Routes[routeName]
-	client, err := newHTTPClient(route, dsInfo, settings, cfg, clientProvider)
+	client, err := newHTTPClient(ctx, route, dsInfo, settings, cfg, clientProvider)
 	if err != nil {
 		return types.DatasourceService{}, err
 	}
@@ -76,7 +76,7 @@ func getDatasourceService(settings *backend.DataSourceInstanceSettings, cfg *set
 }
 
 func NewInstanceSettings(cfg *setting.Cfg, clientProvider *httpclient.Provider, executors map[string]azDatasourceExecutor) datasource.InstanceFactoryFunc {
-	return func(_ context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 		jsonDataObj := map[string]any{}
 		err := json.Unmarshal(settings.JSONData, &jsonDataObj)
 		if err != nil {
@@ -116,7 +116,7 @@ func NewInstanceSettings(cfg *setting.Cfg, clientProvider *httpclient.Provider,
 		}
 
 		for routeName := range executors {
-			service, err := getDatasourceService(&settings, cfg, clientProvider, model, routeName)
+			service, err := getDatasourceService(ctx, &settings, cfg, clientProvider, model, routeName)
 			if err != nil {
 				return nil, err
 			}
diff --git a/pkg/tsdb/azuremonitor/httpclient.go b/pkg/tsdb/azuremonitor/httpclient.go
index fbe1d3ed8aa66..7aef1b53e0514 100644
--- a/pkg/tsdb/azuremonitor/httpclient.go
+++ b/pkg/tsdb/azuremonitor/httpclient.go
@@ -1,6 +1,7 @@
 package azuremonitor
 
 import (
+	"context"
 	"crypto/tls"
 	"fmt"
 	"net/http"
@@ -20,8 +21,8 @@ type Provider interface {
 	GetTLSConfig(...httpclient.Options) (*tls.Config, error)
 }
 
-func newHTTPClient(route types.AzRoute, model types.DatasourceInfo, settings *backend.DataSourceInstanceSettings, cfg *setting.Cfg, clientProvider Provider) (*http.Client, error) {
-	clientOpts, err := settings.HTTPClientOptions()
+func newHTTPClient(ctx context.Context, route types.AzRoute, model types.DatasourceInfo, settings *backend.DataSourceInstanceSettings, cfg *setting.Cfg, clientProvider Provider) (*http.Client, error) {
+	clientOpts, err := settings.HTTPClientOptions(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("error getting HTTP options: %w", err)
 	}
diff --git a/pkg/tsdb/azuremonitor/httpclient_test.go b/pkg/tsdb/azuremonitor/httpclient_test.go
index c569cbc27b94d..9cd4a41c0cc6c 100644
--- a/pkg/tsdb/azuremonitor/httpclient_test.go
+++ b/pkg/tsdb/azuremonitor/httpclient_test.go
@@ -1,6 +1,7 @@
 package azuremonitor
 
 import (
+	"context"
 	"crypto/tls"
 	"encoding/json"
 	"net/http"
@@ -39,7 +40,7 @@ func TestHttpClient_AzureCredentials(t *testing.T) {
 			Scopes: []string{"https://management.azure.com/.default"},
 		}
 
-		_, err := newHTTPClient(route, model, settings, cfg, provider)
+		_, err := newHTTPClient(context.Background(), route, model, settings, cfg, provider)
 		require.NoError(t, err)
 
 		require.NotNil(t, provider.opts)
@@ -52,7 +53,7 @@ func TestHttpClient_AzureCredentials(t *testing.T) {
 			Scopes: []string{},
 		}
 
-		_, err := newHTTPClient(route, model, settings, cfg, provider)
+		_, err := newHTTPClient(context.Background(), route, model, settings, cfg, provider)
 		require.NoError(t, err)
 
 		assert.NotNil(t, provider.opts)
@@ -73,7 +74,7 @@ func TestHttpClient_AzureCredentials(t *testing.T) {
 			"GrafanaHeader": "GrafanaValue",
 			"AzureHeader":   "AzureValue",
 		}
-		_, err := newHTTPClient(route, model, settings, cfg, provider)
+		_, err := newHTTPClient(context.Background(), route, model, settings, cfg, provider)
 		require.NoError(t, err)
 
 		assert.NotNil(t, provider.opts)
diff --git a/pkg/tsdb/cloud-monitoring/cloudmonitoring.go b/pkg/tsdb/cloud-monitoring/cloudmonitoring.go
index 9c1213c03c81b..cb63abd0ad6af 100644
--- a/pkg/tsdb/cloud-monitoring/cloudmonitoring.go
+++ b/pkg/tsdb/cloud-monitoring/cloudmonitoring.go
@@ -161,7 +161,7 @@ type datasourceService struct {
 }
 
 func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
-	return func(_ context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 		var jsonData datasourceJSONData
 		err := json.Unmarshal(settings.JSONData, &jsonData)
 		if err != nil {
@@ -188,7 +188,7 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 			return nil, err
 		}
 
-		opts, err := settings.HTTPClientOptions()
+		opts, err := settings.HTTPClientOptions(ctx)
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go
index 57f2605c129cd..cd3fb5c501f5c 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch.go
@@ -89,13 +89,13 @@ func newExecutor(im instancemgmt.InstanceManager, cfg *setting.Cfg, sessions Ses
 }
 
 func NewInstanceSettings(httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
-	return func(_ context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 		instanceSettings, err := models.LoadCloudWatchSettings(settings)
 		if err != nil {
 			return nil, fmt.Errorf("error reading settings: %w", err)
 		}
 
-		opts, err := settings.HTTPClientOptions()
+		opts, err := settings.HTTPClientOptions(ctx)
 		if err != nil {
 			return nil, err
 		}
@@ -151,6 +151,7 @@ func (e *cloudWatchExecutor) getRequestContext(ctx context.Context, pluginCtx ba
 		EC2APIProvider:        ec2Client,
 		Settings:              instance.Settings,
 		Features:              e.features,
+		Logger:                logger,
 	}, nil
 }
 
diff --git a/pkg/tsdb/cloudwatch/models/api.go b/pkg/tsdb/cloudwatch/models/api.go
index bcda4d2df1f64..4abcb4346edfd 100644
--- a/pkg/tsdb/cloudwatch/models/api.go
+++ b/pkg/tsdb/cloudwatch/models/api.go
@@ -9,6 +9,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/oam"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 )
@@ -24,6 +25,7 @@ type RequestContext struct {
 	EC2APIProvider        EC2APIProvider
 	Settings              CloudWatchSettings
 	Features              featuremgmt.FeatureToggles
+	Logger                log.Logger
 }
 
 // Services
diff --git a/pkg/tsdb/cloudwatch/routes/regions.go b/pkg/tsdb/cloudwatch/routes/regions.go
index 4fd9fbfd57fd1..ff7a0aad2322e 100644
--- a/pkg/tsdb/cloudwatch/routes/regions.go
+++ b/pkg/tsdb/cloudwatch/routes/regions.go
@@ -44,5 +44,5 @@ var newRegionsService = func(ctx context.Context, pluginCtx backend.PluginContex
 		return nil, err
 	}
 
-	return services.NewRegionsService(reqCtx.EC2APIProvider), nil
+	return services.NewRegionsService(reqCtx.EC2APIProvider, reqCtx.Logger), nil
 }
diff --git a/pkg/tsdb/cloudwatch/services/regions.go b/pkg/tsdb/cloudwatch/services/regions.go
index 8662afba988ed..37bbac3172d6f 100644
--- a/pkg/tsdb/cloudwatch/services/regions.go
+++ b/pkg/tsdb/cloudwatch/services/regions.go
@@ -3,6 +3,8 @@ package services
 import (
 	"sort"
 
+	"github.com/grafana/grafana/pkg/infra/log"
+
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/constants"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
@@ -11,11 +13,13 @@ import (
 
 type RegionsService struct {
 	models.EC2APIProvider
+	log.Logger
 }
 
-func NewRegionsService(ec2client models.EC2APIProvider) models.RegionsAPIProvider {
+func NewRegionsService(ec2client models.EC2APIProvider, logger log.Logger) models.RegionsAPIProvider {
 	return &RegionsService{
 		ec2client,
+		logger,
 	}
 }
 
@@ -33,8 +37,11 @@ func (r *RegionsService) GetRegions() ([]resources.ResourceResponse[resources.Re
 	result := make([]resources.ResourceResponse[resources.Region], 0)
 
 	ec2Regions, err := r.DescribeRegions(&ec2.DescribeRegionsInput{})
+	// we ignore this error and always send default regions
+	// we only fetch incase a user has enabled additional regions
+	// but we still log it in case the user is expecting to fetch regions specific to their account and are unable to
 	if err != nil {
-		return nil, err
+		r.Error("Failed to get regions: ", "error", err)
 	}
 
 	mergeEC2RegionsAndConstantRegions(regions, ec2Regions.Regions)
diff --git a/pkg/tsdb/cloudwatch/services/regions_test.go b/pkg/tsdb/cloudwatch/services/regions_test.go
index 20334d58cfcab..9778a43b1353e 100644
--- a/pkg/tsdb/cloudwatch/services/regions_test.go
+++ b/pkg/tsdb/cloudwatch/services/regions_test.go
@@ -4,12 +4,15 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
 	"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
 	"github.com/stretchr/testify/assert"
 )
 
+var testLogger = log.New("test logger")
+
 func TestRegions(t *testing.T) {
 	t.Run("returns regions from the api and merges them with default regions", func(t *testing.T) {
 		mockRegions := &ec2.DescribeRegionsOutput{
@@ -21,7 +24,7 @@ func TestRegions(t *testing.T) {
 		}
 		ec2Mock := &mocks.EC2Mock{}
 		ec2Mock.On("DescribeRegions").Return(mockRegions, nil)
-		regions, err := NewRegionsService(ec2Mock).GetRegions()
+		regions, err := NewRegionsService(ec2Mock, testLogger).GetRegions()
 		assert.NoError(t, err)
 		assert.Contains(t, regions, resources.ResourceResponse[resources.Region]{
 			Value: resources.Region{
@@ -35,10 +38,18 @@ func TestRegions(t *testing.T) {
 		})
 	})
 
-	t.Run("forwards error if DescribeRegions errors out", func(t *testing.T) {
+	t.Run("always returns default regions, even if fetch fails", func(t *testing.T) {
 		ec2Mock := &mocks.EC2Mock{}
-		ec2Mock.On("DescribeRegions").Return((*ec2.DescribeRegionsOutput)(nil), assert.AnError)
-		_, err := NewRegionsService(ec2Mock).GetRegions()
-		assert.Error(t, err)
+		mockRegions := &ec2.DescribeRegionsOutput{
+			Regions: []*ec2.Region{},
+		}
+		ec2Mock.On("DescribeRegions").Return(mockRegions, assert.AnError)
+		regions, err := NewRegionsService(ec2Mock, testLogger).GetRegions()
+		assert.NoError(t, err)
+		assert.Contains(t, regions, resources.ResourceResponse[resources.Region]{
+			Value: resources.Region{
+				Name: "us-east-2",
+			},
+		})
 	})
 }
diff --git a/pkg/tsdb/elasticsearch/data_query.go b/pkg/tsdb/elasticsearch/data_query.go
index da7f286970d12..f2df4ba0afc48 100644
--- a/pkg/tsdb/elasticsearch/data_query.go
+++ b/pkg/tsdb/elasticsearch/data_query.go
@@ -54,7 +54,6 @@ func (e *elasticsearchDataQuery) execute() (*backend.QueryDataResponse, error) {
 	from := e.dataQueries[0].TimeRange.From.UnixNano() / int64(time.Millisecond)
 	to := e.dataQueries[0].TimeRange.To.UnixNano() / int64(time.Millisecond)
 	for _, q := range queries {
-		fmt.Printf("Query = %v", q)
 		if err := e.processQuery(q, ms, from, to); err != nil {
 			mq, _ := json.Marshal(q)
 			e.logger.Error("Failed to process query to multisearch request builder", "error", err, "query", string(mq), "queriesLength", len(queries), "duration", time.Since(start), "stage", es.StagePrepareRequest)
diff --git a/pkg/tsdb/elasticsearch/elasticsearch.go b/pkg/tsdb/elasticsearch/elasticsearch.go
index 4ea44a9f613f0..cd25200b52d64 100644
--- a/pkg/tsdb/elasticsearch/elasticsearch.go
+++ b/pkg/tsdb/elasticsearch/elasticsearch.go
@@ -71,13 +71,13 @@ func queryData(ctx context.Context, queries []backend.DataQuery, dsInfo *es.Data
 }
 
 func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
-	return func(_ context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 		jsonData := map[string]any{}
 		err := json.Unmarshal(settings.JSONData, &jsonData)
 		if err != nil {
 			return nil, fmt.Errorf("error reading settings: %w", err)
 		}
-		httpCliOpts, err := settings.HTTPClientOptions()
+		httpCliOpts, err := settings.HTTPClientOptions(ctx)
 		if err != nil {
 			return nil, fmt.Errorf("error getting http options: %w", err)
 		}
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/instance.go b/pkg/tsdb/grafana-pyroscope-datasource/instance.go
index 5ffd40e1ef21c..58b97e19d08b2 100644
--- a/pkg/tsdb/grafana-pyroscope-datasource/instance.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/instance.go
@@ -10,9 +10,12 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana/pkg/infra/httpclient"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
 )
 
 var (
@@ -39,8 +42,8 @@ type PyroscopeDatasource struct {
 }
 
 // NewPyroscopeDatasource creates a new datasource instance.
-func NewPyroscopeDatasource(httpClientProvider httpclient.Provider, settings backend.DataSourceInstanceSettings, ac accesscontrol.AccessControl) (instancemgmt.Instance, error) {
-	opt, err := settings.HTTPClientOptions()
+func NewPyroscopeDatasource(ctx context.Context, httpClientProvider httpclient.Provider, settings backend.DataSourceInstanceSettings, ac accesscontrol.AccessControl) (instancemgmt.Instance, error) {
+	opt, err := settings.HTTPClientOptions(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -58,6 +61,8 @@ func NewPyroscopeDatasource(httpClientProvider httpclient.Provider, settings bac
 }
 
 func (d *PyroscopeDatasource) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.CallResource", trace.WithAttributes(attribute.String("path", req.Path), attribute.String("method", req.Method)))
+	defer span.End()
 	logger.Debug("CallResource", "Path", req.Path, "Method", req.Method, "Body", req.Body)
 	if req.Path == "profileTypes" {
 		return d.profileTypes(ctx, req, sender)
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient.go b/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient.go
index 3653c455ae2ab..007ee6d06050e 100644
--- a/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient.go
@@ -6,11 +6,15 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 	typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
 
 	"github.com/bufbuild/connect-go"
 	querierv1 "github.com/grafana/pyroscope/api/gen/proto/go/querier/v1"
 	"github.com/grafana/pyroscope/api/gen/proto/go/querier/v1/querierv1connect"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/codes"
+	"go.opentelemetry.io/otel/trace"
 )
 
 type ProfileType struct {
@@ -67,8 +71,12 @@ func NewPyroscopeClient(httpClient *http.Client, url string) *PyroscopeClient {
 }
 
 func (c *PyroscopeClient) ProfileTypes(ctx context.Context) ([]*ProfileType, error) {
+	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.ProfileTypes")
+	defer span.End()
 	res, err := c.connectClient.ProfileTypes(ctx, connect.NewRequest(&querierv1.ProfileTypesRequest{}))
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return nil, err
 	}
 	if res.Msg.ProfileTypes == nil {
@@ -87,6 +95,8 @@ func (c *PyroscopeClient) ProfileTypes(ctx context.Context) ([]*ProfileType, err
 }
 
 func (c *PyroscopeClient) GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, step float64) (*SeriesResponse, error) {
+	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.GetSeries", trace.WithAttributes(attribute.String("profileTypeID", profileTypeID), attribute.String("labelSelector", labelSelector)))
+	defer span.End()
 	req := connect.NewRequest(&querierv1.SelectSeriesRequest{
 		ProfileTypeID: profileTypeID,
 		LabelSelector: labelSelector,
@@ -98,6 +108,8 @@ func (c *PyroscopeClient) GetSeries(ctx context.Context, profileTypeID string, l
 
 	resp, err := c.connectClient.SelectSeries(ctx, req)
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return nil, err
 	}
 
@@ -136,6 +148,8 @@ func (c *PyroscopeClient) GetSeries(ctx context.Context, profileTypeID string, l
 }
 
 func (c *PyroscopeClient) GetProfile(ctx context.Context, profileTypeID, labelSelector string, start, end int64, maxNodes *int64) (*ProfileResponse, error) {
+	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.GetProfile", trace.WithAttributes(attribute.String("profileTypeID", profileTypeID), attribute.String("labelSelector", labelSelector)))
+	defer span.End()
 	req := &connect.Request[querierv1.SelectMergeStacktracesRequest]{
 		Msg: &querierv1.SelectMergeStacktracesRequest{
 			ProfileTypeID: profileTypeID,
@@ -148,6 +162,8 @@ func (c *PyroscopeClient) GetProfile(ctx context.Context, profileTypeID, labelSe
 
 	resp, err := c.connectClient.SelectMergeStacktraces(ctx, req)
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return nil, err
 	}
 
@@ -187,8 +203,12 @@ func getUnits(profileTypeID string) string {
 }
 
 func (c *PyroscopeClient) LabelNames(ctx context.Context) ([]string, error) {
+	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.LabelNames")
+	defer span.End()
 	resp, err := c.connectClient.LabelNames(ctx, connect.NewRequest(&typesv1.LabelNamesRequest{}))
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return nil, fmt.Errorf("error seding LabelNames request %v", err)
 	}
 
@@ -203,8 +223,12 @@ func (c *PyroscopeClient) LabelNames(ctx context.Context) ([]string, error) {
 }
 
 func (c *PyroscopeClient) LabelValues(ctx context.Context, label string) ([]string, error) {
+	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.LabelValues")
+	defer span.End()
 	resp, err := c.connectClient.LabelValues(ctx, connect.NewRequest(&typesv1.LabelValuesRequest{Name: label}))
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return nil, err
 	}
 	return resp.Msg.Names, nil
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/query.go b/pkg/tsdb/grafana-pyroscope-datasource/query.go
index 0bbd30a6e4c2f..3f21c0cf8c8bd 100644
--- a/pkg/tsdb/grafana-pyroscope-datasource/query.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/query.go
@@ -10,10 +10,14 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana-plugin-sdk-go/live"
 	"github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource/kinds/dataquery"
 	"github.com/xlab/treeprint"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/codes"
+	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -34,11 +38,16 @@ const (
 
 // query processes single Pyroscope query transforming the response to data.Frame packaged in DataResponse
 func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginContext, query backend.DataQuery) backend.DataResponse {
+	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.query", trace.WithAttributes(attribute.String("query_type", query.QueryType)))
+	defer span.End()
+
 	var qm queryModel
 	response := backend.DataResponse{}
 
 	err := json.Unmarshal(query.JSON, &qm)
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		response.Error = fmt.Errorf("error unmarshaling query model: %v", err)
 		return response
 	}
@@ -50,6 +59,8 @@ func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginCont
 			var dsJson dsJsonModel
 			err = json.Unmarshal(pCtx.DataSourceInstanceSettings.JSONData, &dsJson)
 			if err != nil {
+				span.RecordError(err)
+				span.SetStatus(codes.Error, err.Error())
 				return fmt.Errorf("error unmarshaling datasource json model: %v", err)
 			}
 
@@ -72,6 +83,8 @@ func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginCont
 				math.Max(query.Interval.Seconds(), parsedInterval.Seconds()),
 			)
 			if err != nil {
+				span.RecordError(err)
+				span.SetStatus(codes.Error, err.Error())
 				logger.Error("Querying SelectSeries()", "err", err)
 				return err
 			}
@@ -88,6 +101,8 @@ func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginCont
 			logger.Debug("Calling GetProfile", "queryModel", qm)
 			prof, err := d.client.GetProfile(gCtx, qm.ProfileTypeId, qm.LabelSelector, query.TimeRange.From.UnixMilli(), query.TimeRange.To.UnixMilli(), qm.MaxNodes)
 			if err != nil {
+				span.RecordError(err)
+				span.SetStatus(codes.Error, err.Error())
 				logger.Error("Error GetProfile()", "err", err)
 				return err
 			}
@@ -120,6 +135,8 @@ func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginCont
 	}
 
 	if err := g.Wait(); err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		response.Error = g.Wait()
 	}
 
diff --git a/pkg/tsdb/grafana-pyroscope-datasource/service.go b/pkg/tsdb/grafana-pyroscope-datasource/service.go
index e208372faacd9..23f3ace482aad 100644
--- a/pkg/tsdb/grafana-pyroscope-datasource/service.go
+++ b/pkg/tsdb/grafana-pyroscope-datasource/service.go
@@ -49,8 +49,8 @@ func ProvideService(httpClientProvider httpclient.Provider, ac accesscontrol.Acc
 }
 
 func newInstanceSettings(httpClientProvider httpclient.Provider, ac accesscontrol.AccessControl) datasource.InstanceFactoryFunc {
-	return func(_ context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return NewPyroscopeDatasource(httpClientProvider, settings, ac)
+	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+		return NewPyroscopeDatasource(ctx, httpClientProvider, settings, ac)
 	}
 }
 
diff --git a/pkg/tsdb/graphite/graphite.go b/pkg/tsdb/graphite/graphite.go
index e4cbde617adcf..33f038078d072 100644
--- a/pkg/tsdb/graphite/graphite.go
+++ b/pkg/tsdb/graphite/graphite.go
@@ -55,8 +55,8 @@ type datasourceInfo struct {
 }
 
 func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
-	return func(_ context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		opts, err := settings.HTTPClientOptions()
+	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+		opts, err := settings.HTTPClientOptions(ctx)
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/tsdb/influxdb/fsql/arrow.go b/pkg/tsdb/influxdb/fsql/arrow.go
index ee79e643be573..576f08b798571 100644
--- a/pkg/tsdb/influxdb/fsql/arrow.go
+++ b/pkg/tsdb/influxdb/fsql/arrow.go
@@ -8,9 +8,9 @@ import (
 	"runtime/debug"
 	"time"
 
-	"github.com/apache/arrow/go/v12/arrow"
-	"github.com/apache/arrow/go/v12/arrow/array"
-	"github.com/apache/arrow/go/v12/arrow/scalar"
+	"github.com/apache/arrow/go/v13/arrow"
+	"github.com/apache/arrow/go/v13/arrow/array"
+	"github.com/apache/arrow/go/v13/arrow/scalar"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
diff --git a/pkg/tsdb/influxdb/fsql/arrow_test.go b/pkg/tsdb/influxdb/fsql/arrow_test.go
index dbf6278e1fea7..d6b0121523e5b 100644
--- a/pkg/tsdb/influxdb/fsql/arrow_test.go
+++ b/pkg/tsdb/influxdb/fsql/arrow_test.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/apache/arrow/go/v12/arrow"
-	"github.com/apache/arrow/go/v12/arrow/array"
-	"github.com/apache/arrow/go/v12/arrow/memory"
+	"github.com/apache/arrow/go/v13/arrow"
+	"github.com/apache/arrow/go/v13/arrow/array"
+	"github.com/apache/arrow/go/v13/arrow/memory"
 	"github.com/google/go-cmp/cmp"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana-plugin-sdk-go/data/sqlutil"
diff --git a/pkg/tsdb/influxdb/fsql/client.go b/pkg/tsdb/influxdb/fsql/client.go
index fbb0302e1adef..ce094769b6602 100644
--- a/pkg/tsdb/influxdb/fsql/client.go
+++ b/pkg/tsdb/influxdb/fsql/client.go
@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/apache/arrow/go/v12/arrow/flight"
-	"github.com/apache/arrow/go/v12/arrow/flight/flightsql"
-	"github.com/apache/arrow/go/v12/arrow/ipc"
-	"github.com/apache/arrow/go/v12/arrow/memory"
+	"github.com/apache/arrow/go/v13/arrow/flight"
+	"github.com/apache/arrow/go/v13/arrow/flight/flightsql"
+	"github.com/apache/arrow/go/v13/arrow/ipc"
+	"github.com/apache/arrow/go/v13/arrow/memory"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
diff --git a/pkg/tsdb/influxdb/fsql/flightsql_test.go b/pkg/tsdb/influxdb/fsql/flightsql_test.go
index e3e81ac964fd1..ebf51068fe007 100644
--- a/pkg/tsdb/influxdb/fsql/flightsql_test.go
+++ b/pkg/tsdb/influxdb/fsql/flightsql_test.go
@@ -6,10 +6,10 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/apache/arrow/go/v12/arrow/flight"
-	"github.com/apache/arrow/go/v12/arrow/flight/flightsql"
-	"github.com/apache/arrow/go/v12/arrow/flight/flightsql/example"
-	"github.com/apache/arrow/go/v12/arrow/memory"
+	"github.com/apache/arrow/go/v13/arrow/flight"
+	"github.com/apache/arrow/go/v13/arrow/flight/flightsql"
+	"github.com/apache/arrow/go/v13/arrow/flight/flightsql/example"
+	"github.com/apache/arrow/go/v13/arrow/memory"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/pkg/tsdb/influxdb/influxdb.go b/pkg/tsdb/influxdb/influxdb.go
index 8b9b91e50c4b9..9f782d6ef277a 100644
--- a/pkg/tsdb/influxdb/influxdb.go
+++ b/pkg/tsdb/influxdb/influxdb.go
@@ -31,8 +31,8 @@ func ProvideService(httpClient httpclient.Provider) *Service {
 }
 
 func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
-	return func(_ context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		opts, err := settings.HTTPClientOptions()
+	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+		opts, err := settings.HTTPClientOptions(ctx)
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/tsdb/legacydata/service/service_test.go b/pkg/tsdb/legacydata/service/service_test.go
index 40a58fceeecad..ebf5f98d488fb 100644
--- a/pkg/tsdb/legacydata/service/service_test.go
+++ b/pkg/tsdb/legacydata/service/service_test.go
@@ -42,7 +42,7 @@ func TestHandleRequest(t *testing.T) {
 		secretsStore := secretskvs.NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
 		datasourcePermissions := acmock.NewMockedPermissionsService()
 		quotaService := quotatest.New(false, nil)
-		dsService, err := datasourceservice.ProvideService(nil, secretsService, secretsStore, sqlStore.Cfg, featuremgmt.WithFeatures(), acmock.New(), datasourcePermissions, quotaService)
+		dsService, err := datasourceservice.ProvideService(nil, secretsService, secretsStore, sqlStore.Cfg, featuremgmt.WithFeatures(), acmock.New(), datasourcePermissions, quotaService, &pluginstore.FakePluginStore{})
 		require.NoError(t, err)
 
 		pCtxProvider := plugincontext.ProvideService(sqlStore.Cfg, localcache.ProvideService(), &pluginstore.FakePluginStore{
diff --git a/pkg/tsdb/loki/loki.go b/pkg/tsdb/loki/loki.go
index e9a3af9a9d99d..ceb5b1d08c7d6 100644
--- a/pkg/tsdb/loki/loki.go
+++ b/pkg/tsdb/loki/loki.go
@@ -89,8 +89,8 @@ func parseQueryModel(raw json.RawMessage) (*QueryJSONModel, error) {
 }
 
 func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
-	return func(_ context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		opts, err := settings.HTTPClientOptions()
+	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+		opts, err := settings.HTTPClientOptions(ctx)
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/tsdb/mssql/mssql.go b/pkg/tsdb/mssql/mssql.go
index 2b2ad38c975c7..df224eddc5ae9 100644
--- a/pkg/tsdb/mssql/mssql.go
+++ b/pkg/tsdb/mssql/mssql.go
@@ -111,8 +111,8 @@ func newInstanceSettings(cfg *setting.Cfg) datasource.InstanceFactoryFunc {
 		}
 
 		// register a new proxy driver if the secure socks proxy is enabled
-		proxyOpts := proxyutil.GetSQLProxyOptions(dsInfo)
-		if sdkproxy.Cli.SecureSocksProxyEnabled(proxyOpts) {
+		proxyOpts := proxyutil.GetSQLProxyOptions(cfg.SecureSocksDSProxy, dsInfo)
+		if sdkproxy.New(proxyOpts).SecureSocksProxyEnabled() {
 			URL, err := ParseURL(dsInfo.URL)
 			if err != nil {
 				return nil, err
diff --git a/pkg/tsdb/mssql/proxy.go b/pkg/tsdb/mssql/proxy.go
index d06c20eccc03d..e76886abe7404 100644
--- a/pkg/tsdb/mssql/proxy.go
+++ b/pkg/tsdb/mssql/proxy.go
@@ -71,7 +71,7 @@ var _ core.Driver = (*mssqlProxyDriver)(nil)
 // newMSSQLProxyDriver updates the dialer for a mssql connector with a dialer that proxys connections through the secure socks proxy
 // and returns a new mssql driver to register
 func newMSSQLProxyDriver(connector *mssql.Connector, hostName string, opts *sdkproxy.Options) (*mssqlProxyDriver, error) {
-	dialer, err := sdkproxy.Cli.NewSecureSocksProxyContextDialer(opts)
+	dialer, err := sdkproxy.New(opts).NewSecureSocksProxyContextDialer()
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/tsdb/mssql/proxy_test.go b/pkg/tsdb/mssql/proxy_test.go
index bd214a1ad78cb..3a81e1855f0c0 100644
--- a/pkg/tsdb/mssql/proxy_test.go
+++ b/pkg/tsdb/mssql/proxy_test.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng/proxyutil"
 	mssql "github.com/microsoft/go-mssqldb"
@@ -14,8 +15,16 @@ import (
 
 func TestMSSQLProxyDriver(t *testing.T) {
 	settings := proxyutil.SetupTestSecureSocksProxySettings(t)
+	proxySettings := setting.SecureSocksDSProxySettings{
+		Enabled:      true,
+		ClientCert:   settings.ClientCert,
+		ClientKey:    settings.ClientKey,
+		RootCA:       settings.RootCA,
+		ProxyAddress: settings.ProxyAddress,
+		ServerName:   settings.ServerName,
+	}
 	dialect := "mssql"
-	opts := proxyutil.GetSQLProxyOptions(sqleng.DataSourceInfo{UID: "1", JsonData: sqleng.JsonData{SecureDSProxy: true}})
+	opts := proxyutil.GetSQLProxyOptions(proxySettings, sqleng.DataSourceInfo{UID: "1", JsonData: sqleng.JsonData{SecureDSProxy: true}})
 	cnnstr := "server=127.0.0.1;port=1433;user id=sa;password=yourStrong(!)Password;database=db"
 	driverName, err := createMSSQLProxyDriver(cnnstr, "127.0.0.1", opts)
 	require.NoError(t, err)
diff --git a/pkg/tsdb/mysql/mysql.go b/pkg/tsdb/mysql/mysql.go
index a408b19bc0b10..e65e02ec225a3 100644
--- a/pkg/tsdb/mysql/mysql.go
+++ b/pkg/tsdb/mysql/mysql.go
@@ -51,7 +51,7 @@ func ProvideService(cfg *setting.Cfg, httpClientProvider httpclient.Provider) *S
 }
 
 func newInstanceSettings(cfg *setting.Cfg, httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
-	return func(_ context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 		jsonData := sqleng.JsonData{
 			MaxOpenConns:            cfg.SqlDatasourceMaxOpenConnsDefault,
 			MaxIdleConns:            cfg.SqlDatasourceMaxIdleConnsDefault,
@@ -87,8 +87,8 @@ func newInstanceSettings(cfg *setting.Cfg, httpClientProvider httpclient.Provide
 		}
 
 		// register the secure socks proxy dialer context, if enabled
-		proxyOpts := proxyutil.GetSQLProxyOptions(dsInfo)
-		if sdkproxy.Cli.SecureSocksProxyEnabled(proxyOpts) {
+		proxyOpts := proxyutil.GetSQLProxyOptions(cfg.SecureSocksDSProxy, dsInfo)
+		if sdkproxy.New(proxyOpts).SecureSocksProxyEnabled() {
 			// UID is only unique per org, the only way to ensure uniqueness is to do it by connection information
 			uniqueIdentifier := dsInfo.User + dsInfo.DecryptedSecureJSONData["password"] + dsInfo.URL + dsInfo.Database
 			protocol, err = registerProxyDialerContext(protocol, uniqueIdentifier, proxyOpts)
@@ -109,7 +109,7 @@ func newInstanceSettings(cfg *setting.Cfg, httpClientProvider httpclient.Provide
 			cnnstr += "&allowCleartextPasswords=true"
 		}
 
-		opts, err := settings.HTTPClientOptions()
+		opts, err := settings.HTTPClientOptions(ctx)
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/tsdb/mysql/proxy.go b/pkg/tsdb/mysql/proxy.go
index 3ca495ef6a728..07dc58ad125b1 100644
--- a/pkg/tsdb/mysql/proxy.go
+++ b/pkg/tsdb/mysql/proxy.go
@@ -39,7 +39,7 @@ type mySQLContextDialer struct {
 
 // getProxyDialerContext returns a context dialer that will send the request through to the secure socks proxy
 func getProxyDialerContext(actualNetwork string, opts *sdkproxy.Options) (*mySQLContextDialer, error) {
-	dialer, err := sdkproxy.Cli.NewSecureSocksProxyContextDialer(opts)
+	dialer, err := sdkproxy.New(opts).NewSecureSocksProxyContextDialer()
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/tsdb/mysql/proxy_test.go b/pkg/tsdb/mysql/proxy_test.go
index 6251471631902..3abffe93ebbe8 100644
--- a/pkg/tsdb/mysql/proxy_test.go
+++ b/pkg/tsdb/mysql/proxy_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/go-sql-driver/mysql"
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng/proxyutil"
 	"github.com/stretchr/testify/require"
@@ -13,9 +14,16 @@ import (
 
 func TestMySQLProxyDialer(t *testing.T) {
 	settings := proxyutil.SetupTestSecureSocksProxySettings(t)
-
+	proxySettings := setting.SecureSocksDSProxySettings{
+		Enabled:      true,
+		ClientCert:   settings.ClientCert,
+		ClientKey:    settings.ClientKey,
+		RootCA:       settings.RootCA,
+		ProxyAddress: settings.ProxyAddress,
+		ServerName:   settings.ServerName,
+	}
 	protocol := "tcp"
-	opts := proxyutil.GetSQLProxyOptions(sqleng.DataSourceInfo{UID: "1", JsonData: sqleng.JsonData{SecureDSProxy: true}})
+	opts := proxyutil.GetSQLProxyOptions(proxySettings, sqleng.DataSourceInfo{UID: "1", JsonData: sqleng.JsonData{SecureDSProxy: true}})
 	dbURL := "localhost:5432"
 	network, err := registerProxyDialerContext(protocol, dbURL, opts)
 	require.NoError(t, err)
diff --git a/pkg/tsdb/opentsdb/opentsdb.go b/pkg/tsdb/opentsdb/opentsdb.go
index 504490a3cefc0..8dbf3c8a71224 100644
--- a/pkg/tsdb/opentsdb/opentsdb.go
+++ b/pkg/tsdb/opentsdb/opentsdb.go
@@ -43,8 +43,8 @@ type datasourceInfo struct {
 type DsAccess string
 
 func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
-	return func(_ context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		opts, err := settings.HTTPClientOptions()
+	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+		opts, err := settings.HTTPClientOptions(ctx)
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/tsdb/parca/plugin.go b/pkg/tsdb/parca/plugin.go
index fd46dbe6ace05..50bf3a233a9ba 100644
--- a/pkg/tsdb/parca/plugin.go
+++ b/pkg/tsdb/parca/plugin.go
@@ -8,7 +8,10 @@ import (
 	"github.com/bufbuild/connect-go"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 	"github.com/grafana/grafana/pkg/infra/httpclient"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
 )
 
 // Make sure ParcaDatasource implements required interfaces. This is important to do
@@ -32,8 +35,8 @@ type ParcaDatasource struct {
 }
 
 // NewParcaDatasource creates a new datasource instance.
-func NewParcaDatasource(httpClientProvider httpclient.Provider, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-	opt, err := settings.HTTPClientOptions()
+func NewParcaDatasource(ctx context.Context, httpClientProvider httpclient.Provider, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+	opt, err := settings.HTTPClientOptions(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -56,6 +59,9 @@ func (d *ParcaDatasource) Dispose() {
 
 func (d *ParcaDatasource) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
 	logger.Debug("CallResource", "Path", req.Path, "Method", req.Method, "Body", req.Body)
+	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.parca.CallResource", trace.WithAttributes(attribute.String("path", req.Path), attribute.String("method", req.Method)))
+	defer span.End()
+
 	if req.Path == "profileTypes" {
 		return d.callProfileTypes(ctx, req, sender)
 	}
diff --git a/pkg/tsdb/parca/query.go b/pkg/tsdb/parca/query.go
index 07618f8a521af..83ee24b67697b 100644
--- a/pkg/tsdb/parca/query.go
+++ b/pkg/tsdb/parca/query.go
@@ -10,8 +10,12 @@ import (
 	v1alpha1 "buf.build/gen/go/parca-dev/parca/protocolbuffers/go/parca/query/v1alpha1"
 	"github.com/bufbuild/connect-go"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana/pkg/tsdb/parca/kinds/dataquery"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/codes"
+	"go.opentelemetry.io/otel/trace"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
@@ -27,12 +31,17 @@ const (
 
 // query processes single Parca query transforming the response to data.Frame packaged in DataResponse
 func (d *ParcaDatasource) query(ctx context.Context, pCtx backend.PluginContext, query backend.DataQuery) backend.DataResponse {
+	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.parca.query", trace.WithAttributes(attribute.String("query_type", query.QueryType)))
+	defer span.End()
+
 	var qm queryModel
 	response := backend.DataResponse{}
 
 	err := json.Unmarshal(query.JSON, &qm)
 	if err != nil {
 		response.Error = err
+		span.RecordError(response.Error)
+		span.SetStatus(codes.Error, response.Error.Error())
 		return response
 	}
 
@@ -40,6 +49,8 @@ func (d *ParcaDatasource) query(ctx context.Context, pCtx backend.PluginContext,
 		seriesResp, err := d.client.QueryRange(ctx, makeMetricRequest(qm, query))
 		if err != nil {
 			response.Error = err
+			span.RecordError(response.Error)
+			span.SetStatus(codes.Error, response.Error.Error())
 			return response
 		}
 		response.Frames = append(response.Frames, seriesToDataFrame(seriesResp, qm.ProfileTypeId)...)
@@ -50,6 +61,8 @@ func (d *ParcaDatasource) query(ctx context.Context, pCtx backend.PluginContext,
 		resp, err := d.client.Query(ctx, makeProfileRequest(qm, query))
 		if err != nil {
 			response.Error = err
+			span.RecordError(response.Error)
+			span.SetStatus(codes.Error, response.Error.Error())
 			return response
 		}
 		frame := responseToDataFrames(resp)
diff --git a/pkg/tsdb/parca/resources.go b/pkg/tsdb/parca/resources.go
index 87fad90a0e59b..db27a9bfad43c 100644
--- a/pkg/tsdb/parca/resources.go
+++ b/pkg/tsdb/parca/resources.go
@@ -9,6 +9,8 @@ import (
 	v1alpha1 "buf.build/gen/go/parca-dev/parca/protocolbuffers/go/parca/query/v1alpha1"
 	"github.com/bufbuild/connect-go"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
+	"go.opentelemetry.io/otel/codes"
 )
 
 type ProfileType struct {
@@ -23,8 +25,12 @@ type ProfileType struct {
 }
 
 func (d *ParcaDatasource) callProfileTypes(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.parca.callProfileTypes")
+	defer span.End()
 	res, err := d.client.ProfileTypes(ctx, connect.NewRequest(&v1alpha1.ProfileTypesRequest{}))
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
 
@@ -50,35 +56,51 @@ func (d *ParcaDatasource) callProfileTypes(ctx context.Context, req *backend.Cal
 
 	data, err := json.Marshal(types)
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
 	err = sender.Send(&backend.CallResourceResponse{Body: data, Headers: req.Headers, Status: 200})
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
 	return nil
 }
 
 func (d *ParcaDatasource) callLabelNames(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.parca.callLabelNames")
+	defer span.End()
 	res, err := d.client.Labels(ctx, connect.NewRequest(&v1alpha1.LabelsRequest{}))
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
 
 	data, err := json.Marshal(res.Msg.LabelNames)
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
 	err = sender.Send(&backend.CallResourceResponse{Body: data, Headers: req.Headers, Status: 200})
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
 	return nil
 }
 
 func (d *ParcaDatasource) callLabelValues(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.parca.callLabelValues")
+	defer span.End()
 	parsedUrl, err := url.Parse(req.URL)
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
 	label, ok := parsedUrl.Query()["label"]
@@ -87,14 +109,20 @@ func (d *ParcaDatasource) callLabelValues(ctx context.Context, req *backend.Call
 	}
 	res, err := d.client.Values(ctx, connect.NewRequest(&v1alpha1.ValuesRequest{LabelName: label[0]}))
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
 	data, err := json.Marshal(res.Msg.LabelValues)
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
 	err = sender.Send(&backend.CallResourceResponse{Body: data, Headers: req.Headers, Status: 200})
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return err
 	}
 	return nil
diff --git a/pkg/tsdb/parca/service.go b/pkg/tsdb/parca/service.go
index 08c71da0bfebe..b47b2ad7abf14 100644
--- a/pkg/tsdb/parca/service.go
+++ b/pkg/tsdb/parca/service.go
@@ -47,8 +47,8 @@ func ProvideService(httpClientProvider httpclient.Provider) *Service {
 }
 
 func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
-	return func(_ context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		return NewParcaDatasource(httpClientProvider, settings)
+	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+		return NewParcaDatasource(ctx, httpClientProvider, settings)
 	}
 }
 
diff --git a/pkg/tsdb/postgres/postgres.go b/pkg/tsdb/postgres/postgres.go
index 00952b28a3d0f..b11daefa253d8 100644
--- a/pkg/tsdb/postgres/postgres.go
+++ b/pkg/tsdb/postgres/postgres.go
@@ -97,8 +97,8 @@ func (s *Service) newInstanceSettings(cfg *setting.Cfg) datasource.InstanceFacto
 
 		driverName := "postgres"
 		// register a proxy driver if the secure socks proxy is enabled
-		proxyOpts := proxyutil.GetSQLProxyOptions(dsInfo)
-		if sdkproxy.Cli.SecureSocksProxyEnabled(proxyOpts) {
+		proxyOpts := proxyutil.GetSQLProxyOptions(cfg.SecureSocksDSProxy, dsInfo)
+		if sdkproxy.New(proxyOpts).SecureSocksProxyEnabled() {
 			driverName, err = createPostgresProxyDriver(cnnstr, proxyOpts)
 			if err != nil {
 				return "", nil
diff --git a/pkg/tsdb/postgres/proxy.go b/pkg/tsdb/postgres/proxy.go
index fbe4f43a8e947..f7ceaeb023709 100644
--- a/pkg/tsdb/postgres/proxy.go
+++ b/pkg/tsdb/postgres/proxy.go
@@ -55,10 +55,10 @@ type postgresProxyDriver struct {
 var _ driver.DriverContext = (*postgresProxyDriver)(nil)
 var _ core.Driver = (*postgresProxyDriver)(nil)
 
-// newPostgresProxyDriver updates the dialer for a postgres connector with a dialer that proxys connections through the secure socks proxy
+// newPostgresProxyDriver updates the dialer for a postgres connector with a dialer that proxies connections through the secure socks proxy
 // and returns a new postgres driver to register
 func newPostgresProxyDriver(connector *pq.Connector, opts *sdkproxy.Options) (*postgresProxyDriver, error) {
-	dialer, err := sdkproxy.Cli.NewSecureSocksProxyContextDialer(opts)
+	dialer, err := sdkproxy.New(opts).NewSecureSocksProxyContextDialer()
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/tsdb/postgres/proxy_test.go b/pkg/tsdb/postgres/proxy_test.go
index 819d8cc93b686..7b4f12be518d8 100644
--- a/pkg/tsdb/postgres/proxy_test.go
+++ b/pkg/tsdb/postgres/proxy_test.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng/proxyutil"
 	"github.com/lib/pq"
@@ -14,8 +15,16 @@ import (
 
 func TestPostgresProxyDriver(t *testing.T) {
 	dialect := "postgres"
-	opts := proxyutil.GetSQLProxyOptions(sqleng.DataSourceInfo{UID: "1", JsonData: sqleng.JsonData{SecureDSProxy: true}})
 	settings := proxyutil.SetupTestSecureSocksProxySettings(t)
+	proxySettings := setting.SecureSocksDSProxySettings{
+		Enabled:      true,
+		ClientCert:   settings.ClientCert,
+		ClientKey:    settings.ClientKey,
+		RootCA:       settings.RootCA,
+		ProxyAddress: settings.ProxyAddress,
+		ServerName:   settings.ServerName,
+	}
+	opts := proxyutil.GetSQLProxyOptions(proxySettings, sqleng.DataSourceInfo{UID: "1", JsonData: sqleng.JsonData{SecureDSProxy: true}})
 	dbURL := "localhost:5432"
 	cnnstr := fmt.Sprintf("postgres://auser:password@%s/db?sslmode=disable", dbURL)
 	driverName, err := createPostgresProxyDriver(cnnstr, opts)
diff --git a/pkg/tsdb/prometheus/client/transport.go b/pkg/tsdb/prometheus/client/transport.go
index 2ec74ec72f748..0084daa52e8c6 100644
--- a/pkg/tsdb/prometheus/client/transport.go
+++ b/pkg/tsdb/prometheus/client/transport.go
@@ -1,6 +1,7 @@
 package client
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
@@ -17,8 +18,8 @@ import (
 
 // CreateTransportOptions creates options for the http client. Probably should be shared and should not live in the
 // buffered package.
-func CreateTransportOptions(settings backend.DataSourceInstanceSettings, cfg *setting.Cfg, logger log.Logger) (*sdkhttpclient.Options, error) {
-	opts, err := settings.HTTPClientOptions()
+func CreateTransportOptions(ctx context.Context, settings backend.DataSourceInstanceSettings, cfg *setting.Cfg, logger log.Logger) (*sdkhttpclient.Options, error) {
+	opts, err := settings.HTTPClientOptions(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("error getting HTTP options: %w", err)
 	}
diff --git a/pkg/tsdb/prometheus/client/transport_test.go b/pkg/tsdb/prometheus/client/transport_test.go
index 67f0e92b49d48..f6be58c1cbd39 100644
--- a/pkg/tsdb/prometheus/client/transport_test.go
+++ b/pkg/tsdb/prometheus/client/transport_test.go
@@ -1,6 +1,7 @@
 package client
 
 import (
+	"context"
 	"testing"
 
 	"github.com/grafana/grafana-azure-sdk-go/azsettings"
@@ -21,7 +22,7 @@ func TestCreateTransportOptions(t *testing.T) {
 				"httpHeaderValue1": "bar",
 			},
 		}
-		opts, err := CreateTransportOptions(settings, &setting.Cfg{}, &logtest.Fake{})
+		opts, err := CreateTransportOptions(context.Background(), settings, &setting.Cfg{}, &logtest.Fake{})
 		require.NoError(t, err)
 		require.Equal(t, map[string]string{"foo": "bar"}, opts.Headers)
 		require.Equal(t, 2, len(opts.Middlewares))
@@ -38,7 +39,7 @@ func TestCreateTransportOptions(t *testing.T) {
 			}`),
 			DecryptedSecureJSONData: map[string]string{},
 		}
-		opts, err := CreateTransportOptions(settings, &setting.Cfg{AzureAuthEnabled: true, Azure: &azsettings.AzureSettings{}}, &logtest.Fake{})
+		opts, err := CreateTransportOptions(context.Background(), settings, &setting.Cfg{AzureAuthEnabled: true, Azure: &azsettings.AzureSettings{}}, &logtest.Fake{})
 		require.NoError(t, err)
 		require.Equal(t, 3, len(opts.Middlewares))
 	})
diff --git a/pkg/tsdb/prometheus/prometheus.go b/pkg/tsdb/prometheus/prometheus.go
index 8987b8f0c8bfc..8402ca5abab75 100644
--- a/pkg/tsdb/prometheus/prometheus.go
+++ b/pkg/tsdb/prometheus/prometheus.go
@@ -46,9 +46,9 @@ func ProvideService(httpClientProvider httpclient.Provider, cfg *setting.Cfg, fe
 }
 
 func newInstanceSettings(httpClientProvider httpclient.Provider, cfg *setting.Cfg, features featuremgmt.FeatureToggles, tracer tracing.Tracer) datasource.InstanceFactoryFunc {
-	return func(_ context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 		// Creates a http roundTripper.
-		opts, err := client.CreateTransportOptions(settings, cfg, plog)
+		opts, err := client.CreateTransportOptions(ctx, settings, cfg, plog)
 		if err != nil {
 			return nil, fmt.Errorf("error creating transport options: %v", err)
 		}
diff --git a/pkg/tsdb/prometheus/querydata/request_test.go b/pkg/tsdb/prometheus/querydata/request_test.go
index 0ce0433606121..faaad26620f89 100644
--- a/pkg/tsdb/prometheus/querydata/request_test.go
+++ b/pkg/tsdb/prometheus/querydata/request_test.go
@@ -445,7 +445,7 @@ func setup() (*testContext, error) {
 
 	features := &fakeFeatureToggles{flags: map[string]bool{"prometheusBufferedClient": false}}
 
-	opts, err := client.CreateTransportOptions(settings, &setting.Cfg{}, &logtest.Fake{})
+	opts, err := client.CreateTransportOptions(context.Background(), settings, &setting.Cfg{}, &logtest.Fake{})
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/tsdb/sqleng/proxyutil/proxy_test_util.go b/pkg/tsdb/sqleng/proxyutil/proxy_test_util.go
index a5e31263a012d..8b9783e1b37f1 100644
--- a/pkg/tsdb/sqleng/proxyutil/proxy_test_util.go
+++ b/pkg/tsdb/sqleng/proxyutil/proxy_test_util.go
@@ -100,7 +100,6 @@ func SetupTestSecureSocksProxySettings(t *testing.T) *sdkproxy.ClientCfg {
 	require.NoError(t, err)
 
 	settings := &sdkproxy.ClientCfg{
-		Enabled:      true,
 		ClientCert:   clientCert,
 		ClientKey:    clientKey,
 		RootCA:       rootCACert,
@@ -108,6 +107,5 @@ func SetupTestSecureSocksProxySettings(t *testing.T) *sdkproxy.ClientCfg {
 		ProxyAddress: proxyAddress,
 	}
 
-	sdkproxy.Cli = sdkproxy.NewWithCfg(settings)
 	return settings
 }
diff --git a/pkg/tsdb/sqleng/proxyutil/proxy_util.go b/pkg/tsdb/sqleng/proxyutil/proxy_util.go
index 507988a277aaa..ce82abb955280 100644
--- a/pkg/tsdb/sqleng/proxyutil/proxy_util.go
+++ b/pkg/tsdb/sqleng/proxyutil/proxy_util.go
@@ -2,15 +2,23 @@ package proxyutil
 
 import (
 	sdkproxy "github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/sqleng"
 )
 
-func GetSQLProxyOptions(dsInfo sqleng.DataSourceInfo) *sdkproxy.Options {
+func GetSQLProxyOptions(cfg setting.SecureSocksDSProxySettings, dsInfo sqleng.DataSourceInfo) *sdkproxy.Options {
 	opts := &sdkproxy.Options{
-		Enabled: dsInfo.JsonData.SecureDSProxy,
+		Enabled: dsInfo.JsonData.SecureDSProxy && cfg.Enabled,
 		Auth: &sdkproxy.AuthOptions{
 			Username: dsInfo.UID,
 		},
+		ClientCfg: &sdkproxy.ClientCfg{
+			ClientCert:   cfg.ClientCert,
+			ClientKey:    cfg.ClientKey,
+			ServerName:   cfg.ServerName,
+			RootCA:       cfg.RootCA,
+			ProxyAddress: cfg.ProxyAddress,
+		},
 	}
 	if dsInfo.JsonData.SecureDSProxyUsername != "" {
 		opts.Auth.Username = dsInfo.JsonData.SecureDSProxyUsername
diff --git a/pkg/tsdb/tempo/search_stream.go b/pkg/tsdb/tempo/search_stream.go
index bec6b987048b9..d2ef5a1d8ae2a 100644
--- a/pkg/tsdb/tempo/search_stream.go
+++ b/pkg/tsdb/tempo/search_stream.go
@@ -8,9 +8,12 @@ import (
 	"io"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana/pkg/tsdb/tempo/kinds/dataquery"
 	"github.com/grafana/tempo/pkg/tempopb"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/codes"
 )
 
 const SearchPathPrefix = "search/"
@@ -27,12 +30,17 @@ type StreamSender interface {
 }
 
 func (s *Service) runSearchStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender, datasource *Datasource) error {
+	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.tempo.runSearchStream")
+	defer span.End()
+
 	response := &backend.DataResponse{}
 
 	var backendQuery *backend.DataQuery
 	err := json.Unmarshal(req.Data, &backendQuery)
 	if err != nil {
 		response.Error = fmt.Errorf("error unmarshaling backend query model: %v", err)
+		span.RecordError(response.Error)
+		span.SetStatus(codes.Error, response.Error.Error())
 		return err
 	}
 
@@ -40,6 +48,8 @@ func (s *Service) runSearchStream(ctx context.Context, req *backend.RunStreamReq
 	err = json.Unmarshal(req.Data, &sr)
 	if err != nil {
 		response.Error = fmt.Errorf("error unmarshaling Tempo query model: %v", err)
+		span.RecordError(response.Error)
+		span.SetStatus(codes.Error, response.Error.Error())
 		return err
 	}
 
@@ -52,46 +62,60 @@ func (s *Service) runSearchStream(ctx context.Context, req *backend.RunStreamReq
 
 	stream, err := datasource.StreamingClient.Search(ctx, sr)
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		s.logger.Error("Error Search()", "err", err)
 		return err
 	}
 
-	return s.processStream(stream, sender)
+	return s.processStream(ctx, stream, sender)
 }
 
-func (s *Service) processStream(stream tempopb.StreamingQuerier_SearchClient, sender StreamSender) error {
+func (s *Service) processStream(ctx context.Context, stream tempopb.StreamingQuerier_SearchClient, sender StreamSender) error {
+	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.tempo.processStream")
+	defer span.End()
 	var traceList []*tempopb.TraceSearchMetadata
 	var metrics *tempopb.SearchMetrics
+	messageCount := 0
 	for {
 		msg, err := stream.Recv()
+		messageCount++
+		span.SetAttributes(attribute.Int("message_count", messageCount))
 		if errors.Is(err, io.EOF) {
-			if err := sendResponse(&ExtendedResponse{
+			if err := s.sendResponse(ctx, &ExtendedResponse{
 				State: dataquery.SearchStreamingStateDone,
 				SearchResponse: &tempopb.SearchResponse{
 					Metrics: metrics,
 					Traces:  traceList,
 				},
 			}, sender); err != nil {
+				span.RecordError(err)
+				span.SetStatus(codes.Error, err.Error())
 				return err
 			}
 			break
 		}
 		if err != nil {
 			s.logger.Error("Error receiving message", "err", err)
+			span.RecordError(err)
+			span.SetStatus(codes.Error, err.Error())
 			return err
 		}
 
 		metrics = msg.Metrics
 		traceList = append(traceList, msg.Traces...)
 		traceList = removeDuplicates(traceList)
+		span.SetAttributes(attribute.Int("traces_count", len(traceList)))
 
-		if err := sendResponse(&ExtendedResponse{
+		if err := s.sendResponse(ctx, &ExtendedResponse{
 			State: dataquery.SearchStreamingStateStreaming,
 			SearchResponse: &tempopb.SearchResponse{
 				Metrics: metrics,
 				Traces:  traceList,
 			},
 		}, sender); err != nil {
+			span.RecordError(err)
+			span.SetStatus(codes.Error, err.Error())
 			return err
 		}
 	}
@@ -99,10 +123,14 @@ func (s *Service) processStream(stream tempopb.StreamingQuerier_SearchClient, se
 	return nil
 }
 
-func sendResponse(response *ExtendedResponse, sender StreamSender) error {
+func (s *Service) sendResponse(ctx context.Context, response *ExtendedResponse, sender StreamSender) error {
+	_, span := tracing.DefaultTracer().Start(ctx, "datasource.tempo.sendResponse")
+	defer span.End()
 	frame := createResponseDataFrame()
 
 	if response != nil {
+		span.SetAttributes(attribute.Int("trace_count", len(response.Traces)), attribute.String("state", string(response.State)))
+
 		tracesAsJson, err := json.Marshal(response.Traces)
 		if err != nil {
 			return err
diff --git a/pkg/tsdb/tempo/search_stream_test.go b/pkg/tsdb/tempo/search_stream_test.go
index 035d46da9c55d..dddda21d20128 100644
--- a/pkg/tsdb/tempo/search_stream_test.go
+++ b/pkg/tsdb/tempo/search_stream_test.go
@@ -21,7 +21,7 @@ func TestProcessStream_ValidInput_ReturnsNoError(t *testing.T) {
 	service := &Service{}
 	searchClient := &mockStreamer{}
 	streamSender := &mockSender{}
-	err := service.processStream(searchClient, streamSender)
+	err := service.processStream(context.Background(), searchClient, streamSender)
 	if err != nil {
 		t.Errorf("Expected no error, but got %s", err)
 	}
@@ -33,7 +33,7 @@ func TestProcessStream_InvalidInput_ReturnsError(t *testing.T) {
 	}
 	searchClient := &mockStreamer{err: errors.New("invalid input")}
 	streamSender := &mockSender{}
-	err := service.processStream(searchClient, streamSender)
+	err := service.processStream(context.Background(), searchClient, streamSender)
 	if err != nil {
 		if !strings.Contains(err.Error(), "invalid input") {
 			t.Errorf("Expected error message to contain 'invalid input', but got %s", err)
@@ -109,7 +109,7 @@ func TestProcessStream_ValidInput_ReturnsExpectedOutput(t *testing.T) {
 		},
 	}
 	streamSender := &mockSender{}
-	err := service.processStream(searchClient, streamSender)
+	err := service.processStream(context.Background(), searchClient, streamSender)
 	if err != nil {
 		t.Errorf("Expected no error, but got %s", err)
 		return
diff --git a/pkg/tsdb/tempo/tempo.go b/pkg/tsdb/tempo/tempo.go
index 7a75c70b68982..b4c924de28544 100644
--- a/pkg/tsdb/tempo/tempo.go
+++ b/pkg/tsdb/tempo/tempo.go
@@ -33,8 +33,8 @@ type Datasource struct {
 }
 
 func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.InstanceFactoryFunc {
-	return func(_ context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-		opts, err := settings.HTTPClientOptions()
+	return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+		opts, err := settings.HTTPClientOptions(ctx)
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/tsdb/tempo/trace.go b/pkg/tsdb/tempo/trace.go
index 9bd4ff33f6ef2..8b3ac71aef784 100644
--- a/pkg/tsdb/tempo/trace.go
+++ b/pkg/tsdb/tempo/trace.go
@@ -8,15 +8,24 @@ import (
 	"net/http"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana/pkg/tsdb/tempo/kinds/dataquery"
 	"go.opentelemetry.io/collector/pdata/ptrace"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/codes"
+	"go.opentelemetry.io/otel/trace"
 )
 
 func (s *Service) getTrace(ctx context.Context, pCtx backend.PluginContext, query backend.DataQuery) (*backend.DataResponse, error) {
 	result := &backend.DataResponse{}
 	refID := query.RefID
 
+	ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.tempo.getTrace", trace.WithAttributes(
+		attribute.String("queryType", query.QueryType),
+	))
+	defer span.End()
+
 	model := &dataquery.TempoQuery{}
 	err := json.Unmarshal(query.JSON, model)
 	if err != nil {
@@ -34,11 +43,15 @@ func (s *Service) getTrace(ctx context.Context, pCtx backend.PluginContext, quer
 
 	request, err := s.createRequest(ctx, dsInfo, *model.Query, query.TimeRange.From.Unix(), query.TimeRange.To.Unix())
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return result, err
 	}
 
 	resp, err := dsInfo.HTTPClient.Do(request)
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return result, fmt.Errorf("failed get to tempo: %w", err)
 	}
 
@@ -55,6 +68,8 @@ func (s *Service) getTrace(ctx context.Context, pCtx backend.PluginContext, quer
 
 	if resp.StatusCode != http.StatusOK {
 		result.Error = fmt.Errorf("failed to get trace with id: %v Status: %s Body: %s", model.Query, resp.Status, string(body))
+		span.RecordError(result.Error)
+		span.SetStatus(codes.Error, result.Error.Error())
 		return result, nil
 	}
 
@@ -62,11 +77,15 @@ func (s *Service) getTrace(ctx context.Context, pCtx backend.PluginContext, quer
 	otTrace, err := pbUnmarshaler.UnmarshalTraces(body)
 
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return &backend.DataResponse{}, fmt.Errorf("failed to convert tempo response to Otlp: %w", err)
 	}
 
 	frame, err := TraceToFrame(otTrace)
 	if err != nil {
+		span.RecordError(err)
+		span.SetStatus(codes.Error, err.Error())
 		return &backend.DataResponse{}, fmt.Errorf("failed to transform trace %v to data frame: %w", model.Query, err)
 	}
 	frame.RefID = refID
diff --git a/pkg/util/proxyutil/proxyutil.go b/pkg/util/proxyutil/proxyutil.go
index 0677fa5a396e7..2946cee9d76c5 100644
--- a/pkg/util/proxyutil/proxyutil.go
+++ b/pkg/util/proxyutil/proxyutil.go
@@ -5,9 +5,11 @@ import (
 	"net"
 	"net/http"
 	"sort"
+	"strconv"
 	"strings"
 
 	"github.com/grafana/grafana/pkg/services/auth/identity"
+	"github.com/grafana/grafana/pkg/services/datasources"
 )
 
 const (
@@ -130,3 +132,58 @@ func ApplyForwardIDHeader(req *http.Request, user identity.Requester) {
 		req.Header.Set(IDHeaderName, token)
 	}
 }
+
+func ApplyTeamHTTPHeaders(req *http.Request, ds *datasources.DataSource, teams []int64) error {
+	headers, err := GetTeamHTTPHeaders(ds, teams)
+	if err != nil {
+		return err
+	}
+
+	for header, value := range headers {
+		// check if headerv is already set in req.Header
+		if req.Header.Get(header) != "" {
+			req.Header.Add(header, value)
+		} else {
+			req.Header.Set(header, value)
+		}
+	}
+
+	return nil
+}
+
+func GetTeamHTTPHeaders(ds *datasources.DataSource, teams []int64) (map[string]string, error) {
+	teamHTTPHeadersMap := make(map[string]string)
+	teamHTTPHeaders, err := ds.TeamHTTPHeaders()
+	if err != nil {
+		return nil, err
+	}
+
+	for teamID, headers := range teamHTTPHeaders {
+		id, err := strconv.ParseInt(teamID, 10, 64)
+		if err != nil {
+			// FIXME: logging here
+			continue
+		}
+
+		if !contains(teams, id) {
+			continue
+		}
+
+		for _, header := range headers {
+			// TODO: handle multiple header values
+			// add tests for these cases
+			teamHTTPHeadersMap[header.Header] = header.Value
+		}
+	}
+
+	return teamHTTPHeadersMap, nil
+}
+
+func contains(slice []int64, value int64) bool {
+	for _, v := range slice {
+		if v == value {
+			return true
+		}
+	}
+	return false
+}
diff --git a/pkg/util/proxyutil/proxyutil_test.go b/pkg/util/proxyutil/proxyutil_test.go
index 4ea59ee61ea4c..de21c6bce2da6 100644
--- a/pkg/util/proxyutil/proxyutil_test.go
+++ b/pkg/util/proxyutil/proxyutil_test.go
@@ -6,6 +6,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/user"
 )
 
@@ -203,3 +205,67 @@ func TestApplyUserHeader(t *testing.T) {
 		require.Equal(t, "admin", req.Header.Get("X-Grafana-User"))
 	})
 }
+
+func TestApplyteamHTTPHeaders(t *testing.T) {
+	t.Run("Should not apply team headers for users that are not part of the teams", func(t *testing.T) {
+		req, err := http.NewRequest(http.MethodGet, "/", nil)
+		require.NoError(t, err)
+		ds := &datasources.DataSource{
+			JsonData: simplejson.New(),
+		}
+		// add team headers
+		ds.JsonData.Set("teamHTTPHeaders", map[string]interface{}{
+			"1": []map[string]interface{}{
+				{
+					"header": "X-Team-Header",
+					"value":  "1",
+				},
+			},
+			"2": []map[string]interface{}{
+				{
+					"header": "X-Prom-Label-Policy",
+					"value":  "2",
+				},
+			},
+			// user is not part of this team
+			"3": []map[string]interface{}{
+				{
+					"header": "X-Custom-Label-Policy",
+					"value":  "3",
+				},
+			},
+		})
+
+		err = ApplyTeamHTTPHeaders(req, ds, []int64{1, 2})
+		require.NoError(t, err)
+		require.Contains(t, req.Header, "X-Team-Header")
+		require.Contains(t, req.Header, "X-Prom-Label-Policy")
+		require.NotContains(t, req.Header, "X-Custom-Label-Policy")
+	})
+	t.Run("Should apply team headers", func(t *testing.T) {
+		req, err := http.NewRequest(http.MethodGet, "/", nil)
+		require.NoError(t, err)
+		ds := &datasources.DataSource{
+			JsonData: simplejson.New(),
+		}
+		ds.JsonData.Set("teamHTTPHeaders", map[string]interface{}{
+			"1": []map[string]interface{}{
+				{
+					"header": "X-Team-Header",
+					"value":  "1",
+				},
+			},
+			"2": []map[string]interface{}{
+				{
+					"header": "X-Prom-Label-Policy",
+					"value":  "2",
+				},
+			},
+		})
+
+		err = ApplyTeamHTTPHeaders(req, ds, []int64{1, 2})
+		require.NoError(t, err)
+		require.Contains(t, req.Header, "X-Team-Header")
+		require.Contains(t, req.Header, "X-Prom-Label-Policy")
+	})
+}
diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json
index 533437505ce9d..95c189508b0d7 100644
--- a/plugins-bundled/internal/input-datasource/package.json
+++ b/plugins-bundled/internal/input-datasource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grafana-plugins/input-datasource",
-  "version": "10.2.0-pre",
+  "version": "10.3.0-pre",
   "description": "Input Datasource",
   "private": true,
   "repository": {
@@ -28,8 +28,8 @@
     "webpack": "5.76.0"
   },
   "dependencies": {
-    "@grafana/data": "10.2.0-pre",
-    "@grafana/ui": "10.2.0-pre",
+    "@grafana/data": "10.3.0-pre",
+    "@grafana/ui": "10.3.0-pre",
     "react": "18.2.0",
     "tslib": "2.5.0"
   }
diff --git a/public/app/angular/panel/AngularPanelReactWrapper.tsx b/public/app/angular/panel/AngularPanelReactWrapper.tsx
index d676a431ef8f5..a994b5b0a20b4 100644
--- a/public/app/angular/panel/AngularPanelReactWrapper.tsx
+++ b/public/app/angular/panel/AngularPanelReactWrapper.tsx
@@ -37,7 +37,7 @@ export function getAngularPanelReactWrapper(plugin: PanelPlugin): ComponentType<
         // @ts-ignore
         panel: fakePanel,
         // @ts-ignore
-        dashboard: new DashboardModelCompatibilityWrapper(),
+        dashboard: getDashboardSrv().getCurrent(),
         size: { width: props.width, height: props.height },
         queryRunner: queryRunner,
       };
diff --git a/public/app/app.ts b/public/app/app.ts
index 97bff0eb9cca0..b910cf67af571 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -52,6 +52,7 @@ import { AppChromeService } from './core/components/AppChrome/AppChromeService';
 import { getAllOptionEditors, getAllStandardFieldConfigs } from './core/components/OptionsUI/registry';
 import { PluginPage } from './core/components/Page/PluginPage';
 import { GrafanaContextType } from './core/context/GrafanaContext';
+import { initIconCache } from './core/icons/iconBundle';
 import { initializeI18n } from './core/internationalization';
 import { interceptLinkClicks } from './core/navigation/patch/interceptLinkClicks';
 import { ModalManager } from './core/services/ModalManager';
@@ -122,6 +123,7 @@ export class GrafanaApp {
 
       setBackendSrv(backendSrv);
       initEchoSrv();
+      initIconCache();
       // This needs to be done after the `initEchoSrv` since it is being used under the hood.
       startMeasure('frontend_app_init');
       addClassIfNoOverlayScrollbar();
diff --git a/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenu.tsx b/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenu.tsx
index 0c7b5ce2f0773..89978940c2fd1 100644
--- a/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenu.tsx
+++ b/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenu.tsx
@@ -1,6 +1,5 @@
 import { css } from '@emotion/css';
 import { DOMAttributes } from '@react-types/shared';
-import { cloneDeep } from 'lodash';
 import React, { forwardRef } from 'react';
 import { useLocation } from 'react-router-dom';
 
@@ -22,14 +21,12 @@ export interface Props extends DOMAttributes {
 
 export const MegaMenu = React.memo(
   forwardRef<HTMLDivElement, Props>(({ onClose, ...restProps }, ref) => {
-    const navBarTree = useSelector((state) => state.navBarTree);
+    const navTree = useSelector((state) => state.navBarTree);
     const styles = useStyles2(getStyles);
     const location = useLocation();
     const { chrome } = useGrafana();
     const state = chrome.useState();
 
-    const navTree = cloneDeep(navBarTree);
-
     // Remove profile + help from tree
     const navItems = navTree
       .filter((item) => item.id !== 'profile' && item.id !== 'help')
diff --git a/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenuItem.tsx b/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenuItem.tsx
index 2518d035889fe..1179ceed2fb15 100644
--- a/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenuItem.tsx
+++ b/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenuItem.tsx
@@ -2,13 +2,12 @@ import { css, cx } from '@emotion/css';
 import React from 'react';
 import { useLocalStorage } from 'react-use';
 
-import { GrafanaTheme2, NavModelItem } from '@grafana/data';
+import { GrafanaTheme2, NavModelItem, toIconName } from '@grafana/data';
 import { Button, Icon, useStyles2, Text } from '@grafana/ui';
 
 import { Indent } from '../../Indent/Indent';
 
 import { FeatureHighlight } from './FeatureHighlight';
-import { MegaMenuItemIcon } from './MegaMenuItemIcon';
 import { MegaMenuItemText } from './MegaMenuItemText';
 import { hasChildMatch } from './utils';
 
@@ -19,6 +18,9 @@ interface Props {
   level?: number;
 }
 
+// max level depth to render
+const MAX_DEPTH = 2;
+
 export function MegaMenuItem({ link, activeItem, level = 0, onClick }: Props) {
   const styles = useStyles2(getStyles);
   const FeatureHighlightWrapper = link.highlightText ? FeatureHighlight : React.Fragment;
@@ -26,7 +28,7 @@ export function MegaMenuItem({ link, activeItem, level = 0, onClick }: Props) {
   const hasActiveChild = hasChildMatch(link, activeItem);
   const [sectionExpanded, setSectionExpanded] =
     useLocalStorage(`grafana.navigation.expanded[${link.text}]`, false) ?? Boolean(hasActiveChild);
-  const showExpandButton = linkHasChildren(link) || link.emptyMessage;
+  const showExpandButton = level < MAX_DEPTH && (linkHasChildren(link) || link.emptyMessage);
 
   return (
     <li className={styles.listItem}>
@@ -43,11 +45,12 @@ export function MegaMenuItem({ link, activeItem, level = 0, onClick }: Props) {
           <div
             className={cx(styles.labelWrapper, {
               [styles.isActive]: isActive,
-              [styles.hasActiveChild]: hasActiveChild,
             })}
           >
             <FeatureHighlightWrapper>
-              <div className={styles.iconWrapper}>{level === 0 && <MegaMenuItemIcon link={link} />}</div>
+              <div className={styles.iconWrapper}>
+                {level === 0 && link.icon && <Icon name={toIconName(link.icon) ?? 'link'} size="xl" />}
+              </div>
             </FeatureHighlightWrapper>
             <Indent level={Math.max(0, level - 1)} spacing={2} />
             <Text truncate>{link.text}</Text>
@@ -140,9 +143,6 @@ const getStyles = (theme: GrafanaTheme2) => ({
       backgroundImage: theme.colors.gradients.brandVertical,
     },
   }),
-  hasActiveChild: css({
-    color: theme.colors.text.primary,
-  }),
 });
 
 function linkHasChildren(link: NavModelItem): link is NavModelItem & { children: NavModelItem[] } {
diff --git a/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenuItemIcon.tsx b/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenuItemIcon.tsx
deleted file mode 100644
index b33f616fa7b61..0000000000000
--- a/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenuItemIcon.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2, NavModelItem } from '@grafana/data';
-import { Icon, toIconName, useTheme2 } from '@grafana/ui';
-
-import { Branding } from '../../Branding/Branding';
-
-interface NavBarItemIconProps {
-  link: NavModelItem;
-}
-
-export function MegaMenuItemIcon({ link }: NavBarItemIconProps) {
-  const theme = useTheme2();
-  const styles = getStyles(theme);
-
-  if (link.icon === 'grafana') {
-    return <Branding.MenuLogo className={styles.img} />;
-  } else if (link.icon) {
-    const iconName = toIconName(link.icon);
-    return <Icon name={iconName ?? 'link'} size="xl" />;
-  } else {
-    // consumer of NavBarItemIcon gives enclosing element an appropriate label
-    return <img className={cx(styles.img, link.roundIcon && styles.round)} src={link.img} alt="" />;
-  }
-}
-
-function getStyles(theme: GrafanaTheme2) {
-  return {
-    img: css({
-      height: theme.spacing(3),
-      width: theme.spacing(3),
-    }),
-    round: css({
-      borderRadius: theme.shape.radius.circle,
-    }),
-  };
-}
diff --git a/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenuItemText.tsx b/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenuItemText.tsx
index ec0480a0d8c9e..08c511d83649a 100644
--- a/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenuItemText.tsx
+++ b/public/app/core/components/AppChrome/DockedMegaMenu/MegaMenuItemText.tsx
@@ -3,26 +3,22 @@ import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { Icon, IconName, Link, useTheme2 } from '@grafana/ui';
+import { Icon, Link, useTheme2 } from '@grafana/ui';
 
 export interface Props {
   children: React.ReactNode;
-  icon?: IconName;
   isActive?: boolean;
-  isChild?: boolean;
   onClick?: () => void;
   target?: HTMLAnchorElement['target'];
   url?: string;
 }
 
-export function MegaMenuItemText({ children, icon, isActive, isChild, onClick, target, url }: Props) {
+export function MegaMenuItemText({ children, isActive, onClick, target, url }: Props) {
   const theme = useTheme2();
-  const styles = getStyles(theme, isActive, isChild);
+  const styles = getStyles(theme, isActive);
 
   const linkContent = (
     <div className={styles.linkContent}>
-      {icon && <Icon data-testid="dropdown-child-icon" name={icon} />}
-
       {children}
 
       {target === '_blank' && (
@@ -71,7 +67,7 @@ export function MegaMenuItemText({ children, icon, isActive, isChild, onClick, t
 
 MegaMenuItemText.displayName = 'MegaMenuItemText';
 
-const getStyles = (theme: GrafanaTheme2, isActive: Props['isActive'], isChild: Props['isActive']) => ({
+const getStyles = (theme: GrafanaTheme2, isActive: Props['isActive']) => ({
   button: css({
     backgroundColor: 'unset',
     borderStyle: 'unset',
@@ -91,15 +87,9 @@ const getStyles = (theme: GrafanaTheme2, isActive: Props['isActive'], isChild: P
     boxSizing: 'border-box',
     position: 'relative',
     color: isActive ? theme.colors.text.primary : theme.colors.text.secondary,
-    padding: theme.spacing(1, 1, 1, isChild ? 5 : 0),
-    ...(isChild && {
-      borderRadius: theme.shape.radius.default,
-    }),
+    padding: theme.spacing(1, 1, 1, 0),
     width: '100%',
     '&:hover, &:focus-visible': {
-      ...(isChild && {
-        background: theme.colors.emphasize(theme.colors.background.primary, 0.03),
-      }),
       textDecoration: 'underline',
       color: theme.colors.text.primary,
     },
@@ -127,8 +117,5 @@ const getStyles = (theme: GrafanaTheme2, isActive: Props['isActive'], isChild: P
     position: 'relative',
     display: 'flex',
     width: '100%',
-    ...(isChild && {
-      padding: theme.spacing(0, 2),
-    }),
   }),
 });
diff --git a/public/app/core/components/AppChrome/DockedMegaMenu/utils.ts b/public/app/core/components/AppChrome/DockedMegaMenu/utils.ts
index 2f180c5e674d7..89384f0eb6c9c 100644
--- a/public/app/core/components/AppChrome/DockedMegaMenu/utils.ts
+++ b/public/app/core/components/AppChrome/DockedMegaMenu/utils.ts
@@ -30,18 +30,20 @@ export const enrichHelpItem = (helpItem: NavModelItem) => {
 };
 
 export const enrichWithInteractionTracking = (item: NavModelItem, expandedState: boolean) => {
-  const onClick = item.onClick;
-  item.onClick = () => {
+  // creating a new object here to not mutate the original item object
+  const newItem = { ...item };
+  const onClick = newItem.onClick;
+  newItem.onClick = () => {
     reportInteraction('grafana_navigation_item_clicked', {
-      path: item.url ?? item.id,
+      path: newItem.url ?? newItem.id,
       state: expandedState ? 'expanded' : 'collapsed',
     });
     onClick?.();
   };
-  if (item.children) {
-    item.children = item.children.map((item) => enrichWithInteractionTracking(item, expandedState));
+  if (newItem.children) {
+    newItem.children = newItem.children.map((item) => enrichWithInteractionTracking(item, expandedState));
   }
-  return item;
+  return newItem;
 };
 
 export const isMatchOrChildMatch = (itemToCheck: NavModelItem, searchItem?: NavModelItem) => {
diff --git a/public/app/core/components/AppChrome/SectionNav/SectionNavItem.tsx b/public/app/core/components/AppChrome/SectionNav/SectionNavItem.tsx
index 7865ac5634371..ef29d68ecc168 100644
--- a/public/app/core/components/AppChrome/SectionNav/SectionNavItem.tsx
+++ b/public/app/core/components/AppChrome/SectionNav/SectionNavItem.tsx
@@ -9,9 +9,13 @@ import { useStyles2, Icon } from '@grafana/ui';
 export interface Props {
   item: NavModelItem;
   isSectionRoot?: boolean;
+  level?: number;
 }
 
-export function SectionNavItem({ item, isSectionRoot = false }: Props) {
+// max level depth to render
+const MAX_DEPTH = 2;
+
+export function SectionNavItem({ item, isSectionRoot = false, level = 0 }: Props) {
   const styles = useStyles2(getStyles);
 
   const children = item.children?.filter((x) => !x.hideFromTabs);
@@ -22,7 +26,7 @@ export function SectionNavItem({ item, isSectionRoot = false }: Props) {
   const linkClass = cx({
     [styles.link]: true,
     [styles.activeStyle]: item.active,
-    [styles.isSection]: Boolean(children?.length) || item.isSection,
+    [styles.isSection]: level < MAX_DEPTH && (Boolean(children?.length) || item.isSection),
     [styles.isSectionRoot]: isSectionRoot,
     [styles.noRootMargin]: noRootMargin,
   });
@@ -56,7 +60,8 @@ export function SectionNavItem({ item, isSectionRoot = false }: Props) {
         {item.text}
         {item.tabSuffix && <item.tabSuffix className={styles.suffix} />}
       </a>
-      {children?.map((child, index) => <SectionNavItem item={child} key={index} />)}
+      {level < MAX_DEPTH &&
+        children?.map((child, index) => <SectionNavItem item={child} key={index} level={level + 1} />)}
     </>
   );
 }
diff --git a/public/app/core/components/NodeGraphSettings.tsx b/public/app/core/components/NodeGraphSettings.tsx
index deaf1e62467e5..0dfe986323ea6 100644
--- a/public/app/core/components/NodeGraphSettings.tsx
+++ b/public/app/core/components/NodeGraphSettings.tsx
@@ -50,13 +50,16 @@ export function NodeGraphSettings({ options, onOptionsChange }: Props) {
 }
 
 export const NodeGraphSection = ({ options, onOptionsChange }: DataSourcePluginOptionsEditorProps) => {
+  let suffix = options.type;
+  suffix += options.type === 'tempo' ? '/configure-tempo-data-source/#node-graph' : '/#node-graph';
+
   return (
     <ConfigSubSection
       title="Node graph"
       description={
         <ConfigDescriptionLink
           description="Show or hide the node graph visualization."
-          suffix={`${options.type}/#node-graph`}
+          suffix={suffix}
           feature="the node graph"
         />
       }
diff --git a/public/app/core/components/Select/TeamPicker.tsx b/public/app/core/components/Select/TeamPicker.tsx
index b2a2acbb2c1e2..345c0e55012a6 100644
--- a/public/app/core/components/Select/TeamPicker.tsx
+++ b/public/app/core/components/Select/TeamPicker.tsx
@@ -9,10 +9,12 @@ import { Team } from 'app/types';
 export interface Props {
   onSelected: (team: SelectableValue<Team>) => void;
   className?: string;
+  teamId?: number;
 }
 
 export interface State {
   isLoading: boolean;
+  value?: SelectableValue<Team>;
 }
 
 export class TeamPicker extends Component<Props, State> {
@@ -29,6 +31,25 @@ export class TeamPicker extends Component<Props, State> {
     });
   }
 
+  componentDidMount(): void {
+    const { teamId } = this.props;
+    if (!teamId) {
+      return;
+    }
+
+    getBackendSrv()
+      .get(`/api/teams/${teamId}`)
+      .then((team: Team) => {
+        this.setState({
+          value: {
+            value: team,
+            label: team.name,
+            imgUrl: team.avatarUrl,
+          },
+        });
+      });
+  }
+
   search(query?: string) {
     this.setState({ isLoading: true });
 
@@ -54,13 +75,14 @@ export class TeamPicker extends Component<Props, State> {
 
   render() {
     const { onSelected, className } = this.props;
-    const { isLoading } = this.state;
+    const { isLoading, value } = this.state;
     return (
       <div className="user-picker" data-testid="teamPicker">
         <AsyncSelect
           isLoading={isLoading}
           defaultOptions={true}
           loadOptions={this.debouncedSearch}
+          value={value}
           onChange={onSelected}
           className={className}
           placeholder="Select a team"
diff --git a/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx b/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx
index c02f784db8cea..3dcd3eb51c7a0 100644
--- a/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx
+++ b/public/app/core/components/TraceToLogs/TraceToLogsSettings.tsx
@@ -255,13 +255,16 @@ export const getTimeShiftTooltip = (type: 'start' | 'end', defaultVal: string) =
 export const invalidTimeShiftError = 'Invalid time shift. See tooltip for examples.';
 
 export const TraceToLogsSection = ({ options, onOptionsChange }: DataSourcePluginOptionsEditorProps) => {
+  let suffix = options.type;
+  suffix += options.type === 'tempo' ? '/configure-tempo-data-source/#trace-to-logs' : '/#trace-to-logs';
+
   return (
     <ConfigSection
       title="Trace to logs"
       description={
         <ConfigDescriptionLink
           description="Navigate from a trace span to the selected data source's logs."
-          suffix={`${options.type}/#trace-to-logs`}
+          suffix={suffix}
           feature="trace to logs"
         />
       }
diff --git a/public/app/core/components/TraceToMetrics/TraceToMetricsSettings.tsx b/public/app/core/components/TraceToMetrics/TraceToMetricsSettings.tsx
index 76aee01e73eb9..448b5a978b71b 100644
--- a/public/app/core/components/TraceToMetrics/TraceToMetricsSettings.tsx
+++ b/public/app/core/components/TraceToMetrics/TraceToMetricsSettings.tsx
@@ -202,13 +202,16 @@ export function TraceToMetricsSettings({ options, onOptionsChange }: Props) {
 }
 
 export const TraceToMetricsSection = ({ options, onOptionsChange }: DataSourcePluginOptionsEditorProps) => {
+  let suffix = options.type;
+  suffix += options.type === 'tempo' ? '/configure-tempo-data-source/#trace-to-metrics' : '/#trace-to-metrics';
+
   return (
     <ConfigSection
       title="Trace to metrics"
       description={
         <ConfigDescriptionLink
           description="Navigate from a trace span to the selected data source's metrics."
-          suffix={`${options.type}/#trace-to-metrics`}
+          suffix={suffix}
           feature="trace to metrics"
         />
       }
diff --git a/packages/grafana-ui/src/components/Icon/cached.json b/public/app/core/icons/cached.json
similarity index 100%
rename from packages/grafana-ui/src/components/Icon/cached.json
rename to public/app/core/icons/cached.json
diff --git a/public/app/core/icons/iconBundle.ts b/public/app/core/icons/iconBundle.ts
new file mode 100644
index 0000000000000..f493d0a71c290
--- /dev/null
+++ b/public/app/core/icons/iconBundle.ts
@@ -0,0 +1,389 @@
+/* eslint-disable import/order */
+// DO NOT EDIT THIS FILE
+// This file is automatically generated  (do not edit it here)
+// see @grafana/ui/scripts/generate-icon-bundle.js
+
+import { cacheStore } from 'react-inlinesvg';
+
+// do not edit this list directly
+// the list of icons live here: @grafana/ui/components/Icon/cached.json
+import u1000 from '../../../img/icons/unicons/at.svg';
+import u1001 from '../../../img/icons/unicons/adjust-circle.svg';
+import u1002 from '../../../img/icons/unicons/align-left.svg';
+import u1003 from '../../../img/icons/unicons/align-right.svg';
+import u1004 from '../../../img/icons/unicons/angle-double-down.svg';
+import u1005 from '../../../img/icons/unicons/angle-double-right.svg';
+import u1006 from '../../../img/icons/unicons/angle-down.svg';
+import u1007 from '../../../img/icons/unicons/angle-left.svg';
+import u1008 from '../../../img/icons/unicons/angle-right.svg';
+import u1009 from '../../../img/icons/unicons/angle-up.svg';
+import u1010 from '../../../img/icons/unicons/apps.svg';
+import u1011 from '../../../img/icons/unicons/arrow.svg';
+import u1012 from '../../../img/icons/unicons/arrow-down.svg';
+import u1013 from '../../../img/icons/unicons/arrow-from-right.svg';
+import u1014 from '../../../img/icons/unicons/arrow-left.svg';
+import u1015 from '../../../img/icons/unicons/arrow-random.svg';
+import u1016 from '../../../img/icons/unicons/arrow-right.svg';
+import u1017 from '../../../img/icons/unicons/arrow-to-right.svg';
+import u1018 from '../../../img/icons/unicons/arrow-up.svg';
+import u1019 from '../../../img/icons/unicons/arrows-h.svg';
+import u1020 from '../../../img/icons/unicons/backward.svg';
+import u1021 from '../../../img/icons/unicons/bars.svg';
+import u1022 from '../../../img/icons/unicons/bell.svg';
+import u1023 from '../../../img/icons/unicons/bell-slash.svg';
+import u1024 from '../../../img/icons/unicons/bolt.svg';
+import u1025 from '../../../img/icons/unicons/book.svg';
+import u1026 from '../../../img/icons/unicons/book-open.svg';
+import u1027 from '../../../img/icons/unicons/brackets-curly.svg';
+import u1028 from '../../../img/icons/unicons/bug.svg';
+import u1029 from '../../../img/icons/unicons/building.svg';
+import u1030 from '../../../img/icons/unicons/calculator-alt.svg';
+import u1031 from '../../../img/icons/unicons/calendar-alt.svg';
+import u1032 from '../../../img/icons/unicons/calendar-slash.svg';
+import u1033 from '../../../img/icons/unicons/camera.svg';
+import u1034 from '../../../img/icons/unicons/channel-add.svg';
+import u1035 from '../../../img/icons/unicons/chart-line.svg';
+import u1036 from '../../../img/icons/unicons/check.svg';
+import u1037 from '../../../img/icons/unicons/check-circle.svg';
+import u1038 from '../../../img/icons/unicons/circle.svg';
+import u1039 from '../../../img/icons/unicons/clipboard-alt.svg';
+import u1040 from '../../../img/icons/unicons/clock-nine.svg';
+import u1041 from '../../../img/icons/unicons/cloud.svg';
+import u1042 from '../../../img/icons/unicons/cloud-download.svg';
+import u1043 from '../../../img/icons/unicons/code-branch.svg';
+import u1044 from '../../../img/icons/unicons/cog.svg';
+import u1045 from '../../../img/icons/unicons/columns.svg';
+import u1046 from '../../../img/icons/unicons/comment-alt.svg';
+import u1047 from '../../../img/icons/unicons/comment-alt-share.svg';
+import u1048 from '../../../img/icons/unicons/comments-alt.svg';
+import u1049 from '../../../img/icons/unicons/compass.svg';
+import u1050 from '../../../img/icons/unicons/copy.svg';
+import u1051 from '../../../img/icons/unicons/corner-down-right-alt.svg';
+import u1052 from '../../../img/icons/unicons/cube.svg';
+import u1053 from '../../../img/icons/unicons/dashboard.svg';
+import u1054 from '../../../img/icons/unicons/database.svg';
+import u1055 from '../../../img/icons/unicons/document-info.svg';
+import u1056 from '../../../img/icons/unicons/download-alt.svg';
+import u1057 from '../../../img/icons/unicons/draggabledots.svg';
+import u1058 from '../../../img/icons/unicons/edit.svg';
+import u1059 from '../../../img/icons/unicons/ellipsis-v.svg';
+import u1060 from '../../../img/icons/unicons/ellipsis-h.svg';
+import u1061 from '../../../img/icons/unicons/envelope.svg';
+import u1062 from '../../../img/icons/unicons/exchange-alt.svg';
+import u1063 from '../../../img/icons/unicons/exclamation-circle.svg';
+import u1064 from '../../../img/icons/unicons/exclamation-triangle.svg';
+import u1065 from '../../../img/icons/unicons/external-link-alt.svg';
+import u1066 from '../../../img/icons/unicons/eye.svg';
+import u1067 from '../../../img/icons/unicons/eye-slash.svg';
+import u1068 from '../../../img/icons/unicons/file-alt.svg';
+import u1069 from '../../../img/icons/unicons/file-blank.svg';
+import u1070 from '../../../img/icons/unicons/filter.svg';
+import u1071 from '../../../img/icons/unicons/folder.svg';
+import u1072 from '../../../img/icons/unicons/folder-open.svg';
+import u1073 from '../../../img/icons/unicons/folder-plus.svg';
+import u1074 from '../../../img/icons/unicons/folder-upload.svg';
+import u1075 from '../../../img/icons/unicons/forward.svg';
+import u1076 from '../../../img/icons/unicons/graph-bar.svg';
+import u1077 from '../../../img/icons/unicons/history.svg';
+import u1078 from '../../../img/icons/unicons/history-alt.svg';
+import u1079 from '../../../img/icons/unicons/home-alt.svg';
+import u1080 from '../../../img/icons/unicons/import.svg';
+import u1081 from '../../../img/icons/unicons/info.svg';
+import u1082 from '../../../img/icons/unicons/info-circle.svg';
+import u1083 from '../../../img/icons/unicons/k6.svg';
+import u1084 from '../../../img/icons/unicons/key-skeleton-alt.svg';
+import u1085 from '../../../img/icons/unicons/keyboard.svg';
+import u1086 from '../../../img/icons/unicons/link.svg';
+import u1087 from '../../../img/icons/unicons/list-ul.svg';
+import u1088 from '../../../img/icons/unicons/lock.svg';
+import u1089 from '../../../img/icons/unicons/minus.svg';
+import u1090 from '../../../img/icons/unicons/minus-circle.svg';
+import u1091 from '../../../img/icons/unicons/mobile-android.svg';
+import u1092 from '../../../img/icons/unicons/monitor.svg';
+import u1093 from '../../../img/icons/unicons/pause.svg';
+import u1094 from '../../../img/icons/unicons/pen.svg';
+import u1095 from '../../../img/icons/unicons/play.svg';
+import u1096 from '../../../img/icons/unicons/plug.svg';
+import u1097 from '../../../img/icons/unicons/plus.svg';
+import u1098 from '../../../img/icons/unicons/plus-circle.svg';
+import u1099 from '../../../img/icons/unicons/power.svg';
+import u1100 from '../../../img/icons/unicons/presentation-play.svg';
+import u1101 from '../../../img/icons/unicons/process.svg';
+import u1102 from '../../../img/icons/unicons/question-circle.svg';
+import u1103 from '../../../img/icons/unicons/repeat.svg';
+import u1104 from '../../../img/icons/unicons/rocket.svg';
+import u1105 from '../../../img/icons/unicons/rss.svg';
+import u1106 from '../../../img/icons/unicons/save.svg';
+import u1107 from '../../../img/icons/unicons/search.svg';
+import u1108 from '../../../img/icons/unicons/search-minus.svg';
+import u1109 from '../../../img/icons/unicons/search-plus.svg';
+import u1110 from '../../../img/icons/unicons/share-alt.svg';
+import u1111 from '../../../img/icons/unicons/shield.svg';
+import u1112 from '../../../img/icons/unicons/signal.svg';
+import u1113 from '../../../img/icons/unicons/signin.svg';
+import u1114 from '../../../img/icons/unicons/signout.svg';
+import u1115 from '../../../img/icons/unicons/sitemap.svg';
+import u1116 from '../../../img/icons/unicons/slack.svg';
+import u1117 from '../../../img/icons/unicons/sliders-v-alt.svg';
+import u1118 from '../../../img/icons/unicons/sort-amount-down.svg';
+import u1119 from '../../../img/icons/unicons/sort-amount-up.svg';
+import u1120 from '../../../img/icons/unicons/square-shape.svg';
+import u1121 from '../../../img/icons/unicons/star.svg';
+import u1122 from '../../../img/icons/unicons/step-backward.svg';
+import u1123 from '../../../img/icons/unicons/sync.svg';
+import u1124 from '../../../img/icons/unicons/stopwatch.svg';
+import u1125 from '../../../img/icons/unicons/table.svg';
+import u1126 from '../../../img/icons/unicons/tag-alt.svg';
+import u1127 from '../../../img/icons/unicons/times.svg';
+import u1128 from '../../../img/icons/unicons/trash-alt.svg';
+import u1129 from '../../../img/icons/unicons/unlock.svg';
+import u1130 from '../../../img/icons/unicons/upload.svg';
+import u1131 from '../../../img/icons/unicons/user.svg';
+import u1132 from '../../../img/icons/unicons/users-alt.svg';
+import u1133 from '../../../img/icons/unicons/wrap-text.svg';
+import u1134 from '../../../img/icons/unicons/cloud-upload.svg';
+import u1135 from '../../../img/icons/unicons/credit-card.svg';
+import u1136 from '../../../img/icons/unicons/file-copy-alt.svg';
+import u1137 from '../../../img/icons/unicons/fire.svg';
+import u1138 from '../../../img/icons/unicons/hourglass.svg';
+import u1139 from '../../../img/icons/unicons/layer-group.svg';
+import u1140 from '../../../img/icons/unicons/layers-alt.svg';
+import u1141 from '../../../img/icons/unicons/line-alt.svg';
+import u1142 from '../../../img/icons/unicons/list-ui-alt.svg';
+import u1143 from '../../../img/icons/unicons/message.svg';
+import u1144 from '../../../img/icons/unicons/palette.svg';
+import u1145 from '../../../img/icons/unicons/percentage.svg';
+import u1146 from '../../../img/icons/unicons/shield-exclamation.svg';
+import u1147 from '../../../img/icons/unicons/plus-square.svg';
+import u1148 from '../../../img/icons/unicons/x.svg';
+import u1149 from '../../../img/icons/unicons/capture.svg';
+import u1150 from '../../../img/icons/custom/gf-grid.svg';
+import u1151 from '../../../img/icons/custom/gf-landscape.svg';
+import u1152 from '../../../img/icons/custom/gf-layout-simple.svg';
+import u1153 from '../../../img/icons/custom/gf-portrait.svg';
+import u1154 from '../../../img/icons/custom/gf-show-context.svg';
+import u1155 from '../../../img/icons/custom/gf-bar-alignment-after.svg';
+import u1156 from '../../../img/icons/custom/gf-bar-alignment-before.svg';
+import u1157 from '../../../img/icons/custom/gf-bar-alignment-center.svg';
+import u1158 from '../../../img/icons/custom/gf-interpolation-linear.svg';
+import u1159 from '../../../img/icons/custom/gf-interpolation-smooth.svg';
+import u1160 from '../../../img/icons/custom/gf-interpolation-step-after.svg';
+import u1161 from '../../../img/icons/custom/gf-interpolation-step-before.svg';
+import u1162 from '../../../img/icons/custom/gf-logs.svg';
+import u1163 from '../../../img/icons/custom/gf-movepane-left.svg';
+import u1164 from '../../../img/icons/custom/gf-movepane-right.svg';
+import u1165 from '../../../img/icons/mono/favorite.svg';
+import u1166 from '../../../img/icons/mono/grafana.svg';
+import u1167 from '../../../img/icons/mono/heart.svg';
+import u1168 from '../../../img/icons/mono/heart-break.svg';
+import u1169 from '../../../img/icons/mono/panel-add.svg';
+import u1170 from '../../../img/icons/mono/library-panel.svg';
+import u1171 from '../../../img/icons/unicons/record-audio.svg';
+// do not edit this list directly
+// the list of icons live here: @grafana/ui/components/Icon/cached.json
+
+let cacheInitialized = false;
+
+function cacheItem(content: string, path: string) {
+  cacheStore[path] = { content, status: 'loaded' };
+}
+
+function createPathResolver() {
+  let root = 'public/img/icons/';
+
+  // This function needs to be called after index.js loads to give the
+  // application time to modify __webpack_public_path__ with a CDN path
+  const grafanaPublicPath = typeof window !== 'undefined' && window.__grafana_public_path__;
+  if (grafanaPublicPath) {
+    root = grafanaPublicPath + 'img/icons/';
+  }
+
+  return (path: string) => {
+    return root + path;
+  };
+}
+
+export function initIconCache() {
+  if (cacheInitialized) {
+    return;
+  }
+  cacheInitialized = true;
+  const resolvePath = createPathResolver();
+
+  // do not edit this list directly
+  // the list of icons live here: @grafana/ui/components/Icon/cached.json
+  cacheItem(u1000, resolvePath('unicons/at.svg'));
+  cacheItem(u1001, resolvePath('unicons/adjust-circle.svg'));
+  cacheItem(u1002, resolvePath('unicons/align-left.svg'));
+  cacheItem(u1003, resolvePath('unicons/align-right.svg'));
+  cacheItem(u1004, resolvePath('unicons/angle-double-down.svg'));
+  cacheItem(u1005, resolvePath('unicons/angle-double-right.svg'));
+  cacheItem(u1006, resolvePath('unicons/angle-down.svg'));
+  cacheItem(u1007, resolvePath('unicons/angle-left.svg'));
+  cacheItem(u1008, resolvePath('unicons/angle-right.svg'));
+  cacheItem(u1009, resolvePath('unicons/angle-up.svg'));
+  cacheItem(u1010, resolvePath('unicons/apps.svg'));
+  cacheItem(u1011, resolvePath('unicons/arrow.svg'));
+  cacheItem(u1012, resolvePath('unicons/arrow-down.svg'));
+  cacheItem(u1013, resolvePath('unicons/arrow-from-right.svg'));
+  cacheItem(u1014, resolvePath('unicons/arrow-left.svg'));
+  cacheItem(u1015, resolvePath('unicons/arrow-random.svg'));
+  cacheItem(u1016, resolvePath('unicons/arrow-right.svg'));
+  cacheItem(u1017, resolvePath('unicons/arrow-to-right.svg'));
+  cacheItem(u1018, resolvePath('unicons/arrow-up.svg'));
+  cacheItem(u1019, resolvePath('unicons/arrows-h.svg'));
+  cacheItem(u1020, resolvePath('unicons/backward.svg'));
+  cacheItem(u1021, resolvePath('unicons/bars.svg'));
+  cacheItem(u1022, resolvePath('unicons/bell.svg'));
+  cacheItem(u1023, resolvePath('unicons/bell-slash.svg'));
+  cacheItem(u1024, resolvePath('unicons/bolt.svg'));
+  cacheItem(u1025, resolvePath('unicons/book.svg'));
+  cacheItem(u1026, resolvePath('unicons/book-open.svg'));
+  cacheItem(u1027, resolvePath('unicons/brackets-curly.svg'));
+  cacheItem(u1028, resolvePath('unicons/bug.svg'));
+  cacheItem(u1029, resolvePath('unicons/building.svg'));
+  cacheItem(u1030, resolvePath('unicons/calculator-alt.svg'));
+  cacheItem(u1031, resolvePath('unicons/calendar-alt.svg'));
+  cacheItem(u1032, resolvePath('unicons/calendar-slash.svg'));
+  cacheItem(u1033, resolvePath('unicons/camera.svg'));
+  cacheItem(u1034, resolvePath('unicons/channel-add.svg'));
+  cacheItem(u1035, resolvePath('unicons/chart-line.svg'));
+  cacheItem(u1036, resolvePath('unicons/check.svg'));
+  cacheItem(u1037, resolvePath('unicons/check-circle.svg'));
+  cacheItem(u1038, resolvePath('unicons/circle.svg'));
+  cacheItem(u1039, resolvePath('unicons/clipboard-alt.svg'));
+  cacheItem(u1040, resolvePath('unicons/clock-nine.svg'));
+  cacheItem(u1041, resolvePath('unicons/cloud.svg'));
+  cacheItem(u1042, resolvePath('unicons/cloud-download.svg'));
+  cacheItem(u1043, resolvePath('unicons/code-branch.svg'));
+  cacheItem(u1044, resolvePath('unicons/cog.svg'));
+  cacheItem(u1045, resolvePath('unicons/columns.svg'));
+  cacheItem(u1046, resolvePath('unicons/comment-alt.svg'));
+  cacheItem(u1047, resolvePath('unicons/comment-alt-share.svg'));
+  cacheItem(u1048, resolvePath('unicons/comments-alt.svg'));
+  cacheItem(u1049, resolvePath('unicons/compass.svg'));
+  cacheItem(u1050, resolvePath('unicons/copy.svg'));
+  cacheItem(u1051, resolvePath('unicons/corner-down-right-alt.svg'));
+  cacheItem(u1052, resolvePath('unicons/cube.svg'));
+  cacheItem(u1053, resolvePath('unicons/dashboard.svg'));
+  cacheItem(u1054, resolvePath('unicons/database.svg'));
+  cacheItem(u1055, resolvePath('unicons/document-info.svg'));
+  cacheItem(u1056, resolvePath('unicons/download-alt.svg'));
+  cacheItem(u1057, resolvePath('unicons/draggabledots.svg'));
+  cacheItem(u1058, resolvePath('unicons/edit.svg'));
+  cacheItem(u1059, resolvePath('unicons/ellipsis-v.svg'));
+  cacheItem(u1060, resolvePath('unicons/ellipsis-h.svg'));
+  cacheItem(u1061, resolvePath('unicons/envelope.svg'));
+  cacheItem(u1062, resolvePath('unicons/exchange-alt.svg'));
+  cacheItem(u1063, resolvePath('unicons/exclamation-circle.svg'));
+  cacheItem(u1064, resolvePath('unicons/exclamation-triangle.svg'));
+  cacheItem(u1065, resolvePath('unicons/external-link-alt.svg'));
+  cacheItem(u1066, resolvePath('unicons/eye.svg'));
+  cacheItem(u1067, resolvePath('unicons/eye-slash.svg'));
+  cacheItem(u1068, resolvePath('unicons/file-alt.svg'));
+  cacheItem(u1069, resolvePath('unicons/file-blank.svg'));
+  cacheItem(u1070, resolvePath('unicons/filter.svg'));
+  cacheItem(u1071, resolvePath('unicons/folder.svg'));
+  cacheItem(u1072, resolvePath('unicons/folder-open.svg'));
+  cacheItem(u1073, resolvePath('unicons/folder-plus.svg'));
+  cacheItem(u1074, resolvePath('unicons/folder-upload.svg'));
+  cacheItem(u1075, resolvePath('unicons/forward.svg'));
+  cacheItem(u1076, resolvePath('unicons/graph-bar.svg'));
+  cacheItem(u1077, resolvePath('unicons/history.svg'));
+  cacheItem(u1078, resolvePath('unicons/history-alt.svg'));
+  cacheItem(u1079, resolvePath('unicons/home-alt.svg'));
+  cacheItem(u1080, resolvePath('unicons/import.svg'));
+  cacheItem(u1081, resolvePath('unicons/info.svg'));
+  cacheItem(u1082, resolvePath('unicons/info-circle.svg'));
+  cacheItem(u1083, resolvePath('unicons/k6.svg'));
+  cacheItem(u1084, resolvePath('unicons/key-skeleton-alt.svg'));
+  cacheItem(u1085, resolvePath('unicons/keyboard.svg'));
+  cacheItem(u1086, resolvePath('unicons/link.svg'));
+  cacheItem(u1087, resolvePath('unicons/list-ul.svg'));
+  cacheItem(u1088, resolvePath('unicons/lock.svg'));
+  cacheItem(u1089, resolvePath('unicons/minus.svg'));
+  cacheItem(u1090, resolvePath('unicons/minus-circle.svg'));
+  cacheItem(u1091, resolvePath('unicons/mobile-android.svg'));
+  cacheItem(u1092, resolvePath('unicons/monitor.svg'));
+  cacheItem(u1093, resolvePath('unicons/pause.svg'));
+  cacheItem(u1094, resolvePath('unicons/pen.svg'));
+  cacheItem(u1095, resolvePath('unicons/play.svg'));
+  cacheItem(u1096, resolvePath('unicons/plug.svg'));
+  cacheItem(u1097, resolvePath('unicons/plus.svg'));
+  cacheItem(u1098, resolvePath('unicons/plus-circle.svg'));
+  cacheItem(u1099, resolvePath('unicons/power.svg'));
+  cacheItem(u1100, resolvePath('unicons/presentation-play.svg'));
+  cacheItem(u1101, resolvePath('unicons/process.svg'));
+  cacheItem(u1102, resolvePath('unicons/question-circle.svg'));
+  cacheItem(u1103, resolvePath('unicons/repeat.svg'));
+  cacheItem(u1104, resolvePath('unicons/rocket.svg'));
+  cacheItem(u1105, resolvePath('unicons/rss.svg'));
+  cacheItem(u1106, resolvePath('unicons/save.svg'));
+  cacheItem(u1107, resolvePath('unicons/search.svg'));
+  cacheItem(u1108, resolvePath('unicons/search-minus.svg'));
+  cacheItem(u1109, resolvePath('unicons/search-plus.svg'));
+  cacheItem(u1110, resolvePath('unicons/share-alt.svg'));
+  cacheItem(u1111, resolvePath('unicons/shield.svg'));
+  cacheItem(u1112, resolvePath('unicons/signal.svg'));
+  cacheItem(u1113, resolvePath('unicons/signin.svg'));
+  cacheItem(u1114, resolvePath('unicons/signout.svg'));
+  cacheItem(u1115, resolvePath('unicons/sitemap.svg'));
+  cacheItem(u1116, resolvePath('unicons/slack.svg'));
+  cacheItem(u1117, resolvePath('unicons/sliders-v-alt.svg'));
+  cacheItem(u1118, resolvePath('unicons/sort-amount-down.svg'));
+  cacheItem(u1119, resolvePath('unicons/sort-amount-up.svg'));
+  cacheItem(u1120, resolvePath('unicons/square-shape.svg'));
+  cacheItem(u1121, resolvePath('unicons/star.svg'));
+  cacheItem(u1122, resolvePath('unicons/step-backward.svg'));
+  cacheItem(u1123, resolvePath('unicons/sync.svg'));
+  cacheItem(u1124, resolvePath('unicons/stopwatch.svg'));
+  cacheItem(u1125, resolvePath('unicons/table.svg'));
+  cacheItem(u1126, resolvePath('unicons/tag-alt.svg'));
+  cacheItem(u1127, resolvePath('unicons/times.svg'));
+  cacheItem(u1128, resolvePath('unicons/trash-alt.svg'));
+  cacheItem(u1129, resolvePath('unicons/unlock.svg'));
+  cacheItem(u1130, resolvePath('unicons/upload.svg'));
+  cacheItem(u1131, resolvePath('unicons/user.svg'));
+  cacheItem(u1132, resolvePath('unicons/users-alt.svg'));
+  cacheItem(u1133, resolvePath('unicons/wrap-text.svg'));
+  cacheItem(u1134, resolvePath('unicons/cloud-upload.svg'));
+  cacheItem(u1135, resolvePath('unicons/credit-card.svg'));
+  cacheItem(u1136, resolvePath('unicons/file-copy-alt.svg'));
+  cacheItem(u1137, resolvePath('unicons/fire.svg'));
+  cacheItem(u1138, resolvePath('unicons/hourglass.svg'));
+  cacheItem(u1139, resolvePath('unicons/layer-group.svg'));
+  cacheItem(u1140, resolvePath('unicons/layers-alt.svg'));
+  cacheItem(u1141, resolvePath('unicons/line-alt.svg'));
+  cacheItem(u1142, resolvePath('unicons/list-ui-alt.svg'));
+  cacheItem(u1143, resolvePath('unicons/message.svg'));
+  cacheItem(u1144, resolvePath('unicons/palette.svg'));
+  cacheItem(u1145, resolvePath('unicons/percentage.svg'));
+  cacheItem(u1146, resolvePath('unicons/shield-exclamation.svg'));
+  cacheItem(u1147, resolvePath('unicons/plus-square.svg'));
+  cacheItem(u1148, resolvePath('unicons/x.svg'));
+  cacheItem(u1149, resolvePath('unicons/capture.svg'));
+  cacheItem(u1150, resolvePath('custom/gf-grid.svg'));
+  cacheItem(u1151, resolvePath('custom/gf-landscape.svg'));
+  cacheItem(u1152, resolvePath('custom/gf-layout-simple.svg'));
+  cacheItem(u1153, resolvePath('custom/gf-portrait.svg'));
+  cacheItem(u1154, resolvePath('custom/gf-show-context.svg'));
+  cacheItem(u1155, resolvePath('custom/gf-bar-alignment-after.svg'));
+  cacheItem(u1156, resolvePath('custom/gf-bar-alignment-before.svg'));
+  cacheItem(u1157, resolvePath('custom/gf-bar-alignment-center.svg'));
+  cacheItem(u1158, resolvePath('custom/gf-interpolation-linear.svg'));
+  cacheItem(u1159, resolvePath('custom/gf-interpolation-smooth.svg'));
+  cacheItem(u1160, resolvePath('custom/gf-interpolation-step-after.svg'));
+  cacheItem(u1161, resolvePath('custom/gf-interpolation-step-before.svg'));
+  cacheItem(u1162, resolvePath('custom/gf-logs.svg'));
+  cacheItem(u1163, resolvePath('custom/gf-movepane-left.svg'));
+  cacheItem(u1164, resolvePath('custom/gf-movepane-right.svg'));
+  cacheItem(u1165, resolvePath('mono/favorite.svg'));
+  cacheItem(u1166, resolvePath('mono/grafana.svg'));
+  cacheItem(u1167, resolvePath('mono/heart.svg'));
+  cacheItem(u1168, resolvePath('mono/heart-break.svg'));
+  cacheItem(u1169, resolvePath('mono/panel-add.svg'));
+  cacheItem(u1170, resolvePath('mono/library-panel.svg'));
+  cacheItem(u1171, resolvePath('unicons/record-audio.svg'));
+  // do not edit this list directly
+  // the list of icons live here: @grafana/ui/components/Icon/cached.json
+}
diff --git a/packages/grafana-ui/src/components/Icon/iconBundle.ts.template b/public/app/core/icons/iconBundle.ts.template
similarity index 72%
rename from packages/grafana-ui/src/components/Icon/iconBundle.ts.template
rename to public/app/core/icons/iconBundle.ts.template
index db75ce7d011ac..ffb748cfbad9d 100644
--- a/packages/grafana-ui/src/components/Icon/iconBundle.ts.template
+++ b/public/app/core/icons/iconBundle.ts.template
@@ -12,22 +12,33 @@ import { cacheStore } from 'react-inlinesvg';
 // do not edit this list directly
 // the list of icons live here: @grafana/ui/components/Icon/cached.json
 
-export let cacheInitialized = false;
-export let iconRoot = 'public/img/icons/';
+let cacheInitialized = false;
 
-export function cacheItem(content: string, path: string) {
-  cacheStore[iconRoot + path] = { content, status: 'loaded' };
+function cacheItem(content: string, path: string) {
+  cacheStore[path] = { content, status: 'loaded' };
 }
 
-export function initIconCache() {
-  cacheInitialized = true;
+function createPathResolver() {
+  let root = 'public/img/icons/';
 
   // This function needs to be called after index.js loads to give the
   // application time to modify __webpack_public_path__ with a CDN path
   const grafanaPublicPath = typeof window !== 'undefined' && window.__grafana_public_path__;
   if (grafanaPublicPath) {
-    iconRoot = grafanaPublicPath + 'img/icons/';
+    root = grafanaPublicPath + 'img/icons/';
+  }
+
+  return (path: string) => {
+    return root + path;
+  };
+}
+
+export function initIconCache() {
+  if (cacheInitialized) {
+    return;
   }
+  cacheInitialized = true;
+  const resolvePath = createPathResolver();
 
   // do not edit this list directly
   // the list of icons live here: @grafana/ui/components/Icon/cached.json
diff --git a/public/app/core/utils/ConfigProvider.tsx b/public/app/core/utils/ConfigProvider.tsx
index 43851d729a770..3a8e5c4f99e14 100644
--- a/public/app/core/utils/ConfigProvider.tsx
+++ b/public/app/core/utils/ConfigProvider.tsx
@@ -1,9 +1,8 @@
 import React, { useEffect, useState } from 'react';
 import { SkeletonTheme } from 'react-loading-skeleton';
 
-import { GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme2, ThemeContext } from '@grafana/data';
 import { ThemeChangedEvent, config } from '@grafana/runtime';
-import { ThemeContext } from '@grafana/ui';
 
 import { appEvents } from '../core';
 
diff --git a/public/app/features/admin/AdminFeatureTogglesAPI.ts b/public/app/features/admin/AdminFeatureTogglesAPI.ts
index 35a67cd455a96..7c13e7751727e 100644
--- a/public/app/features/admin/AdminFeatureTogglesAPI.ts
+++ b/public/app/features/admin/AdminFeatureTogglesAPI.ts
@@ -30,6 +30,9 @@ export const togglesApi = createApi({
   reducerPath: 'togglesApi',
   baseQuery: backendSrvBaseQuery({ baseUrl: '/api' }),
   endpoints: (builder) => ({
+    getManagerState: builder.query<FeatureMgmtState, void>({
+      query: () => ({ url: '/featuremgmt/state' }),
+    }),
     getFeatureToggles: builder.query<FeatureToggle[], void>({
       query: () => ({ url: '/featuremgmt' }),
     }),
@@ -50,5 +53,9 @@ type FeatureToggle = {
   readOnly?: boolean;
 };
 
-export const { useGetFeatureTogglesQuery, useUpdateFeatureTogglesMutation } = togglesApi;
-export type { FeatureToggle };
+type FeatureMgmtState = {
+  restartRequired: boolean;
+};
+
+export const { useGetManagerStateQuery, useGetFeatureTogglesQuery, useUpdateFeatureTogglesMutation } = togglesApi;
+export type { FeatureToggle, FeatureMgmtState };
diff --git a/public/app/features/admin/AdminFeatureTogglesPage.tsx b/public/app/features/admin/AdminFeatureTogglesPage.tsx
index 36bdfca4f2c81..138b6a2821787 100644
--- a/public/app/features/admin/AdminFeatureTogglesPage.tsx
+++ b/public/app/features/admin/AdminFeatureTogglesPage.tsx
@@ -1,26 +1,72 @@
-import React from 'react';
+import { css } from '@emotion/css';
+import React, { useState } from 'react';
 
+import { GrafanaTheme2 } from '@grafana/data';
+import { useStyles2, Icon } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 
-import { useGetFeatureTogglesQuery } from './AdminFeatureTogglesAPI';
+import { useGetFeatureTogglesQuery, useGetManagerStateQuery } from './AdminFeatureTogglesAPI';
 import { AdminFeatureTogglesTable } from './AdminFeatureTogglesTable';
 
 export default function AdminFeatureTogglesPage() {
   const { data: featureToggles, isLoading, isError } = useGetFeatureTogglesQuery();
+  const { data: featureMgmtState } = useGetManagerStateQuery();
+  const [updateSuccessful, setUpdateSuccessful] = useState(false);
+
+  const styles = useStyles2(getStyles);
 
   const getErrorMessage = () => {
     return 'Error fetching feature toggles';
   };
 
+  const handleUpdateSuccess = () => {
+    setUpdateSuccessful(true);
+  };
+
+  const AlertMessage = () => {
+    return (
+      <div className={styles.warning}>
+        <div className={styles.icon}>
+          <Icon name="exclamation-triangle" />
+        </div>
+        <span className={styles.message}>
+          {featureMgmtState?.restartRequired || updateSuccessful
+            ? 'A restart is pending for your Grafana instance to apply the latest feature toggle changes'
+            : 'Saving feature toggle changes will prompt a restart of the instance, which may take a few minutes'}
+        </span>
+      </div>
+    );
+  };
+
   return (
     <Page navId="feature-toggles">
       <Page.Contents>
         <>
           {isError && getErrorMessage()}
           {isLoading && 'Fetching feature toggles'}
-          {featureToggles && <AdminFeatureTogglesTable featureToggles={featureToggles} />}
+          <AlertMessage />
+          {featureToggles && (
+            <AdminFeatureTogglesTable featureToggles={featureToggles} onUpdateSuccess={handleUpdateSuccess} />
+          )}
         </>
       </Page.Contents>
     </Page>
   );
 }
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    warning: css({
+      display: 'flex',
+      marginTop: theme.spacing(3),
+    }),
+    icon: css({
+      color: theme.colors.warning.main,
+      paddingRight: theme.spacing(),
+    }),
+    message: css({
+      color: theme.colors.text.secondary,
+      marginTop: theme.spacing(0.25),
+    }),
+  };
+}
diff --git a/public/app/features/admin/AdminFeatureTogglesTable.tsx b/public/app/features/admin/AdminFeatureTogglesTable.tsx
index eca6021bf3139..bcfbf831fc2c3 100644
--- a/public/app/features/admin/AdminFeatureTogglesTable.tsx
+++ b/public/app/features/admin/AdminFeatureTogglesTable.tsx
@@ -6,6 +6,7 @@ import { type FeatureToggle, useUpdateFeatureTogglesMutation } from './AdminFeat
 
 interface Props {
   featureToggles: FeatureToggle[];
+  onUpdateSuccess: () => void;
 }
 
 const sortByName: SortByFn<FeatureToggle> = (a, b) => {
@@ -27,10 +28,11 @@ const sortByEnabled: SortByFn<FeatureToggle> = (a, b) => {
   return a.original.enabled === b.original.enabled ? 0 : a.original.enabled ? 1 : -1;
 };
 
-export function AdminFeatureTogglesTable({ featureToggles }: Props) {
+export function AdminFeatureTogglesTable({ featureToggles, onUpdateSuccess }: Props) {
   const [localToggles, setLocalToggles] = useState<FeatureToggle[]>(featureToggles);
   const [updateFeatureToggles] = useUpdateFeatureTogglesMutation();
   const [modifiedToggles, setModifiedToggles] = useState<FeatureToggle[]>([]);
+  const [isSaving, setIsSaving] = useState(false);
 
   const handleToggleChange = (toggle: FeatureToggle, newValue: boolean) => {
     const updatedToggle = { ...toggle, enabled: newValue };
@@ -56,10 +58,16 @@ export function AdminFeatureTogglesTable({ featureToggles }: Props) {
   };
 
   const handleSaveChanges = async () => {
-    const resp = await updateFeatureToggles(modifiedToggles);
-    // Reset modifiedToggles after successful update
-    if (!('error' in resp)) {
-      setModifiedToggles([]);
+    setIsSaving(true);
+    try {
+      const resp = await updateFeatureToggles(modifiedToggles);
+      // Reset modifiedToggles after successful update
+      if (!('error' in resp)) {
+        onUpdateSuccess();
+        setModifiedToggles([]);
+      }
+    } finally {
+      setIsSaving(false);
     }
   };
 
@@ -103,8 +111,8 @@ export function AdminFeatureTogglesTable({ featureToggles }: Props) {
   return (
     <>
       <div style={{ display: 'flex', justifyContent: 'flex-end', padding: '0 0 5px 0' }}>
-        <Button disabled={!hasModifications()} onClick={handleSaveChanges}>
-          Save Changes
+        <Button disabled={!hasModifications() || isSaving} onClick={handleSaveChanges}>
+          {isSaving ? 'Saving...' : 'Save Changes'}
         </Button>
       </div>
       <InteractiveTable columns={columns} data={localToggles} getRowId={(featureToggle) => featureToggle.name} />
diff --git a/public/app/features/admin/Users/Avatar.tsx b/public/app/features/admin/Users/Avatar.tsx
deleted file mode 100644
index 40f5a0bf3ea3a..0000000000000
--- a/public/app/features/admin/Users/Avatar.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
-
-export interface AvatarProps {
-  src?: string;
-  alt: string;
-}
-export const Avatar = ({ src, alt }: AvatarProps) => {
-  const styles = useStyles2(getStyles);
-
-  if (!src) {
-    return null;
-  }
-  return <img className={styles.image} src={src} alt={alt} />;
-};
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    image: css({
-      width: theme.spacing(3),
-      height: theme.spacing(3),
-      borderRadius: theme.shape.radius.circle,
-    }),
-  };
-};
diff --git a/public/app/features/admin/Users/OrgUnits.tsx b/public/app/features/admin/Users/OrgUnits.tsx
index d3ed21c87c422..ae84b3e5d8b29 100644
--- a/public/app/features/admin/Users/OrgUnits.tsx
+++ b/public/app/features/admin/Users/OrgUnits.tsx
@@ -1,15 +1,13 @@
-import { css } from '@emotion/css';
-import React from 'react';
+import React, { forwardRef, PropsWithChildren } from 'react';
 
-import { GrafanaTheme2, IconName } from '@grafana/data';
-import { Icon, Tooltip, useStyles2 } from '@grafana/ui';
+import { IconName } from '@grafana/data';
+import { Icon, Tooltip } from '@grafana/ui';
+import { Box, Flex } from '@grafana/ui/src/unstable';
 import { Unit } from 'app/types';
 
 type OrgUnitProps = { units?: Unit[]; icon: IconName };
 
 export const OrgUnits = ({ units, icon }: OrgUnitProps) => {
-  const styles = useStyles2(getStyles);
-
   if (!units?.length) {
     return null;
   }
@@ -17,39 +15,25 @@ export const OrgUnits = ({ units, icon }: OrgUnitProps) => {
   return units.length > 1 ? (
     <Tooltip
       placement={'top'}
-      content={
-        <div className={styles.unitTooltip}>{units?.map((unit) => <span key={unit.name}>{unit.name}</span>)}</div>
-      }
+      content={<Flex direction={'column'}>{units?.map((unit) => <span key={unit.name}>{unit.name}</span>)}</Flex>}
     >
-      <div className={styles.unitItem}>
-        <Icon name={icon} /> <span>{units.length}</span>
-      </div>
+      <Content icon={icon}>{units.length}</Content>
     </Tooltip>
   ) : (
-    <span className={styles.unitItem}>
-      <Icon name={icon} /> {units[0].name}
-    </span>
+    <Content icon={icon}>{units[0].name}</Content>
   );
 };
 
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    unitTooltip: css`
-      display: flex;
-      flex-direction: column;
-    `,
-    unitItem: css`
-      padding: ${theme.spacing(0.5)} 0;
-      margin-right: ${theme.spacing(1)};
+interface ContentProps extends PropsWithChildren {
+  icon: IconName;
+}
 
-      svg {
-        margin-bottom: ${theme.spacing(0.25)};
-      }
-    `,
-    link: css`
-      color: inherit;
-      cursor: pointer;
-      text-decoration: underline;
-    `,
-  };
-};
+export const Content = forwardRef<HTMLElement, ContentProps>(({ children, icon }, ref) => {
+  return (
+    <Box ref={ref} display={'flex'} alignItems={'center'} marginRight={1}>
+      <Icon name={icon} /> <Box marginLeft={1}>{children}</Box>
+    </Box>
+  );
+});
+
+Content.displayName = 'TooltipContent';
diff --git a/public/app/features/admin/Users/OrgUsersTable.tsx b/public/app/features/admin/Users/OrgUsersTable.tsx
index 27d41f9c9aefc..bc4aceb65f3c1 100644
--- a/public/app/features/admin/Users/OrgUsersTable.tsx
+++ b/public/app/features/admin/Users/OrgUsersTable.tsx
@@ -1,7 +1,6 @@
-import { css } from '@emotion/css';
 import React, { useEffect, useMemo, useState } from 'react';
 
-import { GrafanaTheme2, OrgRole } from '@grafana/data';
+import { OrgRole } from '@grafana/data';
 import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
 import {
   Button,
@@ -9,15 +8,14 @@ import {
   Icon,
   Tooltip,
   CellProps,
-  useStyles2,
   Tag,
   InteractiveTable,
   Column,
   FetchDataFunc,
   Pagination,
-  HorizontalGroup,
-  VerticalGroup,
+  Avatar,
 } from '@grafana/ui';
+import { Flex, Stack, Box } from '@grafana/ui/src/unstable';
 import { UserRolePicker } from 'app/core/components/RolePicker/UserRolePicker';
 import { fetchRoleOptions } from 'app/core/components/RolePicker/api';
 import { TagBadge } from 'app/core/components/TagFilter/TagBadge';
@@ -27,7 +25,7 @@ import { AccessControlAction, OrgUser, Role } from 'app/types';
 
 import { OrgRolePicker } from '../OrgRolePicker';
 
-import { Avatar } from './Avatar';
+import { TableWrapper } from './TableWrapper';
 
 type Cell<T extends keyof OrgUser = keyof OrgUser> = CellProps<OrgUser, OrgUser[T]>;
 
@@ -72,7 +70,6 @@ export const OrgUsersTable = ({
 }: Props) => {
   const [userToRemove, setUserToRemove] = useState<OrgUser | null>(null);
   const [roleOptions, setRoleOptions] = useState<Role[]>([]);
-  const styles = useStyles2(getStyles);
 
   useEffect(() => {
     async function fetchOptions() {
@@ -95,7 +92,7 @@ export const OrgUsersTable = ({
       {
         id: 'avatarUrl',
         header: '',
-        cell: ({ cell: { value } }: Cell<'avatarUrl'>) => <Avatar src={value} alt="User avatar" />,
+        cell: ({ cell: { value } }: Cell<'avatarUrl'>) => value && <Avatar src={value} alt="User avatar" />,
       },
       {
         id: 'login',
@@ -149,7 +146,18 @@ export const OrgUsersTable = ({
       {
         id: 'info',
         header: '',
-        cell: InfoCell,
+        cell: ({ row: { original } }: Cell) => {
+          const basicRoleDisabled = getBasicRoleDisabled(original);
+          return (
+            basicRoleDisabled && (
+              <Box display={'flex'} alignItems={'center'} marginLeft={1}>
+                <Tooltip content={disabledRoleMessage}>
+                  <Icon name="question-circle" />
+                </Tooltip>
+              </Box>
+            )
+          );
+        },
       },
       {
         id: 'authLabels',
@@ -187,18 +195,18 @@ export const OrgUsersTable = ({
   );
 
   return (
-    <VerticalGroup spacing="md" data-testid={selectors.container}>
-      <div className={styles.wrapper}>
+    <Stack gap={2} data-testid={selectors.container}>
+      <TableWrapper>
         <InteractiveTable
           columns={columns}
           data={users}
           getRowId={(user) => String(user.userId)}
           fetchData={fetchData}
         />
-        <HorizontalGroup justify="flex-end">
+        <Flex justifyContent="flex-end">
           <Pagination onNavigate={changePage} currentPage={page} numberOfPages={totalPages} hideWhenSinglePage={true} />
-        </HorizontalGroup>
-      </div>
+        </Flex>
+      </TableWrapper>
       {Boolean(userToRemove) && (
         <ConfirmModal
           body={`Are you sure you want to delete user ${userToRemove?.login}?`}
@@ -217,43 +225,6 @@ export const OrgUsersTable = ({
           }}
         />
       )}
-    </VerticalGroup>
+    </Stack>
   );
 };
-
-const InfoCell = ({ row: { original } }: Cell) => {
-  const styles = useStyles2(getStyles);
-  const basicRoleDisabled = getBasicRoleDisabled(original);
-  return (
-    basicRoleDisabled && (
-      <div className={styles.row}>
-        <Tooltip content={disabledRoleMessage}>
-          <Icon name="question-circle" className={styles.icon} />
-        </Tooltip>
-      </div>
-    )
-  );
-};
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  row: css({
-    display: 'flex',
-    alignItems: 'center',
-  }),
-  icon: css({
-    marginLeft: theme.spacing(1),
-  }),
-  // Enable RolePicker overflow
-  wrapper: css({
-    display: 'flex',
-    flexDirection: 'column',
-    overflowX: 'auto',
-    overflowY: 'hidden',
-    minHeight: '100vh',
-    width: '100%',
-    '& > div': {
-      overflowX: 'unset',
-      marginBottom: theme.spacing(2),
-    },
-  }),
-});
diff --git a/public/app/features/admin/Users/TableWrapper.tsx b/public/app/features/admin/Users/TableWrapper.tsx
new file mode 100644
index 0000000000000..ea3fd28809dd1
--- /dev/null
+++ b/public/app/features/admin/Users/TableWrapper.tsx
@@ -0,0 +1,30 @@
+import { css } from '@emotion/css';
+import React, { PropsWithChildren } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { useStyles2 } from '@grafana/ui';
+
+/**
+ * A wrapper component for interactive tables using RolePicker to enable overflow.
+ * Should be removed when the RolePicker component uses portals to render its menu
+ */
+export const TableWrapper = ({ children }: PropsWithChildren) => {
+  const styles = useStyles2(getStyles);
+  return <div className={styles.wrapper}>{children}</div>;
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  // Enable RolePicker overflow
+  wrapper: css({
+    display: 'flex',
+    flexDirection: 'column',
+    overflowX: 'auto',
+    overflowY: 'hidden',
+    minHeight: '100vh',
+    width: '100%',
+    '& > div': {
+      overflowX: 'unset',
+      marginBottom: theme.spacing(2),
+    },
+  }),
+});
diff --git a/public/app/features/admin/Users/UsersTable.tsx b/public/app/features/admin/Users/UsersTable.tsx
index e45ac10a6e9a9..209625698cd41 100644
--- a/public/app/features/admin/Users/UsersTable.tsx
+++ b/public/app/features/admin/Users/UsersTable.tsx
@@ -1,24 +1,21 @@
-import { css } from '@emotion/css';
 import React, { useMemo } from 'react';
 
-import { GrafanaTheme2 } from '@grafana/data';
 import {
   InteractiveTable,
   CellProps,
   Tooltip,
   Icon,
-  useStyles2,
   Tag,
   Pagination,
   Column,
-  VerticalGroup,
-  HorizontalGroup,
   FetchDataFunc,
+  Text,
+  Avatar,
 } from '@grafana/ui';
+import { Flex, Stack } from '@grafana/ui/src/unstable';
 import { TagBadge } from 'app/core/components/TagFilter/TagBadge';
 import { UserDTO } from 'app/types';
 
-import { Avatar } from './Avatar';
 import { OrgUnits } from './OrgUnits';
 
 type Cell<T extends keyof UserDTO = keyof UserDTO> = CellProps<UserDTO, UserDTO[T]>;
@@ -46,7 +43,7 @@ export const UsersTable = ({
       {
         id: 'avatarUrl',
         header: '',
-        cell: ({ cell: { value } }: Cell<'avatarUrl'>) => <Avatar src={value} alt={'User avatar'} />,
+        cell: ({ cell: { value } }: Cell<'avatarUrl'>) => value && <Avatar src={value} alt={'User avatar'} />,
       },
       {
         id: 'login',
@@ -69,7 +66,18 @@ export const UsersTable = ({
       {
         id: 'orgs',
         header: 'Belongs to',
-        cell: OrgUnitsCell,
+        cell: ({ cell: { value, row } }: Cell<'orgs'>) => {
+          return (
+            <Flex alignItems={'center'}>
+              <OrgUnits units={value} icon={'building'} />
+              {row.original.isAdmin && (
+                <Tooltip placement="top" content="Grafana Admin">
+                  <Icon name="shield" />
+                </Tooltip>
+              )}
+            </Flex>
+          );
+        },
         sortType: (a, b) => (a.original.orgs?.length || 0) - (b.original.orgs?.length || 0),
       },
       ...(showLicensedRole
@@ -77,7 +85,18 @@ export const UsersTable = ({
             {
               id: 'licensedRole',
               header: 'Licensed role',
-              cell: LicensedRoleCell,
+              cell: ({ cell: { value } }: Cell<'licensedRole'>) => {
+                return value === 'None' ? (
+                  <Text color={'disabled'}>
+                    Not assigned{' '}
+                    <Tooltip placement="top" content="A licensed role will be assigned when this user signs in">
+                      <Icon name="question-circle" />
+                    </Tooltip>
+                  </Text>
+                ) : (
+                  value
+                );
+              },
               // Needs the assertion here, the types are not inferred correctly due to the  conditional assignment
               sortType: 'string' as const,
             },
@@ -90,7 +109,9 @@ export const UsersTable = ({
           content: 'Time since user was seen using Grafana',
           iconName: 'question-circle',
         },
-        cell: LastSeenAtCell,
+        cell: ({ cell: { value } }: Cell<'lastSeenAtAge'>) => {
+          return <>{value && <>{value === '10 years' ? <Text color={'disabled'}>Never</Text> : value}</>}</>;
+        },
         sortType: (a, b) => new Date(a.original.lastSeenAt!).getTime() - new Date(b.original.lastSeenAt!).getTime(),
       },
       {
@@ -122,62 +143,13 @@ export const UsersTable = ({
     [showLicensedRole]
   );
   return (
-    <VerticalGroup spacing={'md'}>
+    <Stack gap={2}>
       <InteractiveTable columns={columns} data={users} getRowId={(user) => String(user.id)} fetchData={fetchData} />
       {showPaging && (
-        <HorizontalGroup justify={'flex-end'}>
+        <Flex justifyContent={'flex-end'}>
           <Pagination numberOfPages={totalPages} currentPage={currentPage} onNavigate={onChangePage} />
-        </HorizontalGroup>
-      )}
-    </VerticalGroup>
-  );
-};
-
-const OrgUnitsCell = ({ cell: { value, row } }: Cell<'orgs'>) => {
-  const styles = useStyles2(getStyles);
-  return (
-    <div className={styles.row}>
-      <OrgUnits units={value} icon={'building'} />
-      {row.original.isAdmin && (
-        <Tooltip placement="top" content="Grafana Admin">
-          <Icon name="shield" />
-        </Tooltip>
-      )}
-    </div>
-  );
-};
-
-const LicensedRoleCell = ({ cell: { value } }: Cell<'licensedRole'>) => {
-  const styles = useStyles2(getStyles);
-
-  return (
-    <>
-      {value === 'None' ? (
-        <span className={styles.disabled}>
-          Not assigned{' '}
-          <Tooltip placement="top" content="A licensed role will be assigned when this user signs in">
-            <Icon name="question-circle" />
-          </Tooltip>
-        </span>
-      ) : (
-        value
+        </Flex>
       )}
-    </>
+    </Stack>
   );
 };
-
-const LastSeenAtCell = ({ cell: { value } }: Cell<'lastSeenAtAge'>) => {
-  const styles = useStyles2(getStyles);
-
-  return <>{value && <>{value === '10 years' ? <span className={styles.disabled}>Never</span> : value}</>}</>;
-};
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    disabled: css({ color: theme.colors.text.disabled }),
-    row: css({
-      display: 'flex',
-      alignItems: 'center',
-    }),
-  };
-};
diff --git a/public/app/features/alerting/TestRuleResult.tsx b/public/app/features/alerting/TestRuleResult.tsx
index dc1504f916f60..a2c86c917c9a3 100644
--- a/public/app/features/alerting/TestRuleResult.tsx
+++ b/public/app/features/alerting/TestRuleResult.tsx
@@ -43,7 +43,7 @@ class UnThemedTestRuleResult extends PureComponent<Props, State> {
     const { dashboard, panel } = this.props;
 
     // dashboard save model
-    const model = dashboard.getSaveModelClone();
+    const model = dashboard.getSaveModelCloneOld();
 
     // now replace panel to get current edits
     model.panels = model.panels.map((dashPanel) => {
diff --git a/public/app/features/alerting/routes.tsx b/public/app/features/alerting/routes.tsx
index c1d39295cd062..5e67be4822df3 100644
--- a/public/app/features/alerting/routes.tsx
+++ b/public/app/features/alerting/routes.tsx
@@ -1,6 +1,5 @@
 import { uniq } from 'lodash';
 import React from 'react';
-import { Redirect } from 'react-router-dom';
 
 import { SafeDynamicImport } from 'app/core/components/DynamicImports/SafeDynamicImport';
 import { NavLandingPage } from 'app/core/components/NavLandingPage/NavLandingPage';
@@ -247,15 +246,13 @@ const unifiedRoutes: RouteDescriptor[] = [
   {
     path: '/alerting/:id/modify-export',
     pageClass: 'page-alerting',
-    roles: evaluateAccess([AccessControlAction.AlertingRuleUpdate]),
-    component: config.featureToggles.alertingModifiedExport
-      ? SafeDynamicImport(
-          () =>
-            import(
-              /* webpackChunkName: "AlertingRuleForm"*/ 'app/features/alerting/unified/components/export/GrafanaModifyExport'
-            )
+    roles: evaluateAccess([AccessControlAction.AlertingRuleRead]),
+    component: SafeDynamicImport(
+      () =>
+        import(
+          /* webpackChunkName: "AlertingRuleForm"*/ 'app/features/alerting/unified/components/export/GrafanaModifyExport'
         )
-      : () => <Redirect to="/alerting/List" />,
+    ),
   },
   {
     path: '/alerting/:sourceName/:id/view',
diff --git a/public/app/features/alerting/unified/MoreActionsRuleButtons.tsx b/public/app/features/alerting/unified/MoreActionsRuleButtons.tsx
index ba1d61121ec12..fcf0f5e6b48d1 100644
--- a/public/app/features/alerting/unified/MoreActionsRuleButtons.tsx
+++ b/public/app/features/alerting/unified/MoreActionsRuleButtons.tsx
@@ -7,12 +7,20 @@ import { Button, Dropdown, Icon, LinkButton, Menu, MenuItem } from '@grafana/ui'
 
 import { logInfo, LogMessages } from './Analytics';
 import { GrafanaRulesExporter } from './components/export/GrafanaRulesExporter';
-import { useRulesAccess } from './utils/accessControlHooks';
+import { AlertSourceAction, useAlertSourceAbility } from './hooks/useAbilities';
 
 interface Props {}
 
 export function MoreActionsRuleButtons({}: Props) {
-  const { canCreateGrafanaRules, canCreateCloudRules, canReadProvisioning } = useRulesAccess();
+  const [_, viewRuleAllowed] = useAlertSourceAbility(AlertSourceAction.ViewAlertRule);
+  const [createRuleSupported, createRuleAllowed] = useAlertSourceAbility(AlertSourceAction.CreateAlertRule);
+  const [createCloudRuleSupported, createCloudRuleAllowed] = useAlertSourceAbility(
+    AlertSourceAction.CreateExternalAlertRule
+  );
+
+  const canCreateGrafanaRules = createRuleSupported && createRuleAllowed;
+  const canCreateCloudRules = createCloudRuleSupported && createCloudRuleAllowed;
+
   const location = useLocation();
   const [showExportDrawer, toggleShowExportDrawer] = useToggle(false);
   const newMenu = (
@@ -25,7 +33,7 @@ export function MoreActionsRuleButtons({}: Props) {
           label="New recording rule"
         />
       )}
-      {canReadProvisioning && <MenuItem onClick={toggleShowExportDrawer} label="Export all Grafana-managed rules" />}
+      {viewRuleAllowed && <MenuItem onClick={toggleShowExportDrawer} label="Export all Grafana-managed rules" />}
     </Menu>
   );
 
diff --git a/public/app/features/alerting/unified/RuleEditor.tsx b/public/app/features/alerting/unified/RuleEditor.tsx
index 23487beea4db1..4928fc27cb569 100644
--- a/public/app/features/alerting/unified/RuleEditor.tsx
+++ b/public/app/features/alerting/unified/RuleEditor.tsx
@@ -57,6 +57,9 @@ const RuleEditor = ({ match }: RuleEditorProps) => {
     if (identifier) {
       await dispatch(fetchRulesSourceBuildInfoAction({ rulesSourceName: identifier.ruleSourceName }));
     }
+    if (copyFromIdentifier) {
+      await dispatch(fetchRulesSourceBuildInfoAction({ rulesSourceName: copyFromIdentifier.ruleSourceName }));
+    }
   }, [dispatch]);
 
   const { canCreateGrafanaRules, canCreateCloudRules, canEditRules } = useRulesAccess();
diff --git a/public/app/features/alerting/unified/RuleList.test.tsx b/public/app/features/alerting/unified/RuleList.test.tsx
index 07de53cb27a6e..ff1eddc5d3837 100644
--- a/public/app/features/alerting/unified/RuleList.test.tsx
+++ b/public/app/features/alerting/unified/RuleList.test.tsx
@@ -684,25 +684,27 @@ describe('RuleList', () => {
 
   describe('RBAC Enabled', () => {
     describe('Export button', () => {
-      it('Export button should be visible when the user has alert provisioning read permissions', async () => {
-        grantUserPermissions([AccessControlAction.AlertingProvisioningRead]);
+      it('Export button should be visible when the user has alert read permissions', async () => {
+        grantUserPermissions([AccessControlAction.AlertingRuleRead, AccessControlAction.FoldersRead]);
 
         mocks.getAllDataSourcesMock.mockReturnValue([]);
         setDataSourceSrv(new MockDataSourceSrv({}));
-        mocks.api.fetchRules.mockResolvedValue([]);
-        mocks.api.fetchRulerRules.mockResolvedValue({});
-
-        renderRuleList();
-
-        await userEvent.click(ui.moreButton.get());
-        expect(ui.exportButton.get()).toBeInTheDocument();
-      });
-      it('Export button should be visible when the user has alert provisioning read secrets permissions', async () => {
-        grantUserPermissions([AccessControlAction.AlertingProvisioningReadSecrets]);
-
-        mocks.getAllDataSourcesMock.mockReturnValue([]);
-        setDataSourceSrv(new MockDataSourceSrv({}));
-        mocks.api.fetchRules.mockResolvedValue([]);
+        mocks.api.fetchRules.mockResolvedValue([
+          mockPromRuleNamespace({
+            name: 'foofolder',
+            dataSourceName: GRAFANA_RULES_SOURCE_NAME,
+            groups: [
+              mockPromRuleGroup({
+                name: 'grafana-group',
+                rules: [
+                  mockPromAlertingRule({
+                    query: '[]',
+                  }),
+                ],
+              }),
+            ],
+          }),
+        ]);
         mocks.api.fetchRulerRules.mockResolvedValue({});
 
         renderRuleList();
@@ -710,19 +712,6 @@ describe('RuleList', () => {
         await userEvent.click(ui.moreButton.get());
         expect(ui.exportButton.get()).toBeInTheDocument();
       });
-      it('Export button should not be visible when the user has no alert provisioning read permissions', async () => {
-        grantUserPermissions([AccessControlAction.AlertingRuleCreate, AccessControlAction.FoldersRead]);
-
-        mocks.getAllDataSourcesMock.mockReturnValue([]);
-        setDataSourceSrv(new MockDataSourceSrv({}));
-        mocks.api.fetchRules.mockResolvedValue([]);
-        mocks.api.fetchRulerRules.mockResolvedValue({});
-
-        renderRuleList();
-
-        await userEvent.click(ui.moreButton.get());
-        expect(ui.exportButton.query()).not.toBeInTheDocument();
-      });
     });
     describe('Grafana Managed Alerts', () => {
       it('New alert button should be visible when the user has alert rule create and folder read permissions and no rules exists', async () => {
diff --git a/public/app/features/alerting/unified/RuleList.tsx b/public/app/features/alerting/unified/RuleList.tsx
index 6aaaec90e1d4e..655b52a9f3d28 100644
--- a/public/app/features/alerting/unified/RuleList.tsx
+++ b/public/app/features/alerting/unified/RuleList.tsx
@@ -24,7 +24,6 @@ import { useCombinedRuleNamespaces } from './hooks/useCombinedRuleNamespaces';
 import { useFilteredRules, useRulesFilter } from './hooks/useFilteredRules';
 import { useUnifiedAlertingSelector } from './hooks/useUnifiedAlertingSelector';
 import { fetchAllPromAndRulerRulesAction } from './state/actions';
-import { useRulesAccess } from './utils/accessControlHooks';
 import { RULE_LIST_POLL_INTERVAL_MS } from './utils/constants';
 import { getAllRulesSourceNames } from './utils/datasource';
 
@@ -91,8 +90,6 @@ const RuleList = withErrorBoundary(
     const combinedNamespaces: CombinedRuleNamespace[] = useCombinedRuleNamespaces();
     const filteredNamespaces = useFilteredRules(combinedNamespaces, filterState);
 
-    const { canCreateGrafanaRules, canCreateCloudRules, canReadProvisioning } = useRulesAccess();
-
     return (
       // We don't want to show the Loading... indicator for the whole page.
       // We show separate indicators for Grafana-managed and Cloud rules
@@ -116,11 +113,9 @@ const RuleList = withErrorBoundary(
                 )}
                 <RuleStats namespaces={filteredNamespaces} />
               </div>
-              {(canCreateGrafanaRules || canCreateCloudRules || canReadProvisioning) && (
-                <Stack direction="row" gap={0.5}>
-                  <MoreActionsRuleButtons />
-                </Stack>
-              )}
+              <Stack direction="row" gap={0.5}>
+                <MoreActionsRuleButtons />
+              </Stack>
             </div>
           </>
         )}
diff --git a/public/app/features/alerting/unified/RuleViewer.tsx b/public/app/features/alerting/unified/RuleViewer.tsx
index 05f844372882e..864d68d104e32 100644
--- a/public/app/features/alerting/unified/RuleViewer.tsx
+++ b/public/app/features/alerting/unified/RuleViewer.tsx
@@ -1,16 +1,12 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { Disable, Enable } from 'react-enable';
-import { useParams } from 'react-router-dom';
 
-import { Button, HorizontalGroup, withErrorBoundary } from '@grafana/ui';
-import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
+import { withErrorBoundary } from '@grafana/ui';
 import { SafeDynamicImport } from 'app/core/components/DynamicImports/SafeDynamicImport';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 
 import { AlertingPageWrapper } from './components/AlertingPageWrapper';
-import { GrafanaRuleExporter } from './components/export/GrafanaRuleExporter';
 import { AlertingFeature } from './features';
-import { GRAFANA_RULES_SOURCE_NAME } from './utils/datasource';
 
 const DetailViewV1 = SafeDynamicImport(() => import('./components/rule-viewer/RuleViewer.v1'));
 const DetailViewV2 = SafeDynamicImport(() => import('./components/rule-viewer/v2/RuleViewer.v2'));
@@ -21,25 +17,8 @@ type RuleViewerProps = GrafanaRouteComponentProps<{
 }>;
 
 const RuleViewer = (props: RuleViewerProps): JSX.Element => {
-  const routeParams = useParams<{ type: string; id: string }>();
-  const uidFromParams = routeParams.id;
-
-  const sourceName = props.match.params.sourceName;
-
-  const [showYaml, setShowYaml] = useState(false);
-  const actionButtons =
-    sourceName === GRAFANA_RULES_SOURCE_NAME ? (
-      <HorizontalGroup height="auto" justify="flex-end">
-        <Button variant="secondary" type="button" onClick={() => setShowYaml(true)} size="sm">
-          Export
-        </Button>
-      </HorizontalGroup>
-    ) : null;
-
   return (
     <AlertingPageWrapper>
-      <AppChromeUpdate actions={actionButtons} />
-      {showYaml && <GrafanaRuleExporter alertUid={uidFromParams} onClose={() => setShowYaml(false)} />}
       <Enable feature={AlertingFeature.DetailsViewV2}>
         <DetailViewV2 {...props} />
       </Enable>
diff --git a/public/app/features/alerting/unified/api/alertRuleApi.ts b/public/app/features/alerting/unified/api/alertRuleApi.ts
index bee885c2e0d3f..85c07792765a1 100644
--- a/public/app/features/alerting/unified/api/alertRuleApi.ts
+++ b/public/app/features/alerting/unified/api/alertRuleApi.ts
@@ -43,10 +43,6 @@ export interface Datasource {
 export const PREVIEW_URL = '/api/v1/rule/test/grafana';
 export const PROM_RULES_URL = 'api/prometheus/grafana/api/v1/rules';
 
-function getProvisioningExportUrl(ruleUid: string, format: 'yaml' | 'json' | 'hcl' = 'yaml') {
-  return `/api/v1/provisioning/alert-rules/${ruleUid}/export?format=${format}`;
-}
-
 export interface Data {
   refId: string;
   relativeTimeRange: RelativeTimeRange;
@@ -71,6 +67,13 @@ export interface Rule {
 
 export type AlertInstances = Record<string, string>;
 
+interface ExportRulesParams {
+  format: ExportFormats;
+  folderUid?: string;
+  group?: string;
+  ruleUid?: string;
+}
+
 export interface ModifyExportPayload {
   rules: Array<RulerAlertingRuleDTO | RulerRecordingRuleDTO | PostableRuleGrafanaRuleDTO>;
   name: string;
@@ -192,20 +195,10 @@ export const alertRuleApi = alertingApi.injectEndpoints({
       },
     }),
 
-    exportRule: build.query<string, { uid: string; format: ExportFormats }>({
-      query: ({ uid, format }) => ({ url: getProvisioningExportUrl(uid, format), responseType: 'text' }),
-    }),
-    exportRuleGroup: build.query<string, { folderUid: string; groupName: string; format: ExportFormats }>({
-      query: ({ folderUid, groupName, format }) => ({
-        url: `/api/v1/provisioning/folder/${folderUid}/rule-groups/${groupName}/export`,
-        params: { format: format },
-        responseType: 'text',
-      }),
-    }),
-    exportRules: build.query<string, { format: ExportFormats }>({
-      query: ({ format }) => ({
-        url: `/api/v1/provisioning/alert-rules/export`,
-        params: { format: format },
+    exportRules: build.query<string, ExportRulesParams>({
+      query: ({ format, folderUid, group, ruleUid }) => ({
+        url: `/api/ruler/grafana/api/v1/export/rules`,
+        params: { format: format, folderUid: folderUid, group: group, ruleUid: ruleUid },
         responseType: 'text',
       }),
     }),
diff --git a/public/app/features/alerting/unified/components/export/GrafanaModifyExport.test.tsx b/public/app/features/alerting/unified/components/export/GrafanaModifyExport.test.tsx
new file mode 100644
index 0000000000000..0f44e23c14fdf
--- /dev/null
+++ b/public/app/features/alerting/unified/components/export/GrafanaModifyExport.test.tsx
@@ -0,0 +1,138 @@
+import { render, waitFor, waitForElementToBeRemoved } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { Route } from 'react-router-dom';
+import { AutoSizerProps } from 'react-virtualized-auto-sizer';
+import { byRole, byTestId, byText } from 'testing-library-selector';
+
+import { selectors } from '@grafana/e2e-selectors';
+import { locationService } from '@grafana/runtime';
+
+import { TestProvider } from '../../../../../../test/helpers/TestProvider';
+import { AlertmanagerChoice } from '../../../../../plugins/datasource/alertmanager/types';
+import { DashboardSearchItemType } from '../../../../search/types';
+import { mockAlertRuleApi, mockApi, mockExportApi, mockSearchApi, setupMswServer } from '../../mockApi';
+import { getGrafanaRule, mockDataSource } from '../../mocks';
+import { mockAlertmanagerChoiceResponse } from '../../mocks/alertmanagerApi';
+import { setupDataSources } from '../../testSetup/datasources';
+import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource';
+
+import GrafanaModifyExport from './GrafanaModifyExport';
+
+jest.mock('app/core/components/AppChrome/AppChromeUpdate', () => ({
+  AppChromeUpdate: ({ actions }: { actions: React.ReactNode }) => <div>{actions}</div>,
+}));
+
+jest.mock('react-virtualized-auto-sizer', () => {
+  return ({ children }: AutoSizerProps) => children({ height: 600, width: 1 });
+});
+jest.mock('@grafana/ui', () => ({
+  ...jest.requireActual('@grafana/ui'),
+  CodeEditor: ({ value }: { value: string }) => <textarea data-testid="code-editor" value={value} readOnly />,
+}));
+
+const ui = {
+  loading: byText('Loading the rule'),
+  form: {
+    nameInput: byRole('textbox', { name: 'name' }),
+    folder: byTestId('folder-picker'),
+    folderContainer: byTestId(selectors.components.FolderPicker.containerV2),
+    group: byTestId('group-picker'),
+    annotationKey: (idx: number) => byTestId(`annotation-key-${idx}`),
+    annotationValue: (idx: number) => byTestId(`annotation-value-${idx}`),
+    labelKey: (idx: number) => byTestId(`label-key-${idx}`),
+    labelValue: (idx: number) => byTestId(`label-value-${idx}`),
+  },
+  exportButton: byRole('button', { name: 'Export' }),
+  exportDrawer: {
+    dialog: byRole('dialog', { name: /Export Group/ }),
+    jsonTab: byRole('tab', { name: /JSON/ }),
+    yamlTab: byRole('tab', { name: /YAML/ }),
+    editor: byTestId('code-editor'),
+    loadingSpinner: byTestId('Spinner'),
+  },
+};
+
+const dataSources = {
+  default: mockDataSource({ type: 'prometheus', name: 'Prom', isDefault: true }, { alerting: true }),
+};
+
+function renderModifyExport(ruleId: string) {
+  locationService.push(`/alerting/${ruleId}/modify-export`);
+  render(<Route path="/alerting/:id/modify-export" component={GrafanaModifyExport} />, { wrapper: TestProvider });
+}
+
+const server = setupMswServer();
+
+mockAlertmanagerChoiceResponse(server, {
+  alertmanagersChoice: AlertmanagerChoice.Internal,
+  numExternalAlertmanagers: 0,
+});
+
+describe('GrafanaModifyExport', () => {
+  setupDataSources(dataSources.default);
+
+  const grafanaRule = getGrafanaRule(undefined, {
+    uid: 'test-rule-uid',
+    title: 'cpu-usage',
+    namespace_uid: 'folder-test-uid',
+    namespace_id: 1,
+    data: [
+      {
+        refId: 'A',
+        datasourceUid: dataSources.default.uid,
+        queryType: 'alerting',
+        relativeTimeRange: { from: 1000, to: 2000 },
+        model: {
+          refId: 'A',
+          expression: 'vector(1)',
+          queryType: 'alerting',
+          datasource: { uid: dataSources.default.uid, type: 'prometheus' },
+        },
+      },
+    ],
+  });
+
+  it('Should render edit form for the specified rule', async () => {
+    mockApi(server).eval({ results: { A: { frames: [] } } });
+    mockSearchApi(server).search([
+      {
+        title: grafanaRule.namespace.name,
+        uid: 'folder-test-uid',
+        id: 1,
+        url: '',
+        tags: [],
+        type: DashboardSearchItemType.DashFolder,
+      },
+    ]);
+    mockAlertRuleApi(server).rulerRules(GRAFANA_RULES_SOURCE_NAME, {
+      [grafanaRule.namespace.name]: [{ name: grafanaRule.group.name, interval: '1m', rules: [grafanaRule.rulerRule!] }],
+    });
+    mockAlertRuleApi(server).rulerRuleGroup(
+      GRAFANA_RULES_SOURCE_NAME,
+      grafanaRule.namespace.name,
+      grafanaRule.group.name,
+      { name: grafanaRule.group.name, interval: '1m', rules: [grafanaRule.rulerRule!] }
+    );
+    mockExportApi(server).modifiedExport(grafanaRule.namespace.name, {
+      yaml: 'Yaml Export Content',
+    });
+
+    const user = userEvent.setup();
+
+    renderModifyExport('test-rule-uid');
+
+    await waitForElementToBeRemoved(() => ui.loading.get());
+    expect(await ui.form.nameInput.find()).toHaveValue('cpu-usage');
+
+    await user.click(ui.exportButton.get());
+
+    const drawer = await ui.exportDrawer.dialog.find();
+    expect(drawer).toBeInTheDocument();
+
+    expect(ui.exportDrawer.yamlTab.get(drawer)).toHaveAttribute('aria-selected', 'true');
+    await waitFor(() => {
+      expect(ui.exportDrawer.editor.get(drawer)).toHaveTextContent('Yaml Export Content');
+    });
+  });
+});
diff --git a/public/app/features/alerting/unified/components/export/GrafanaPoliciesExporter.tsx b/public/app/features/alerting/unified/components/export/GrafanaPoliciesExporter.tsx
index 7cf5d82dd35bf..c0cf2e0083b11 100644
--- a/public/app/features/alerting/unified/components/export/GrafanaPoliciesExporter.tsx
+++ b/public/app/features/alerting/unified/components/export/GrafanaPoliciesExporter.tsx
@@ -6,7 +6,7 @@ import { alertRuleApi } from '../../api/alertRuleApi';
 
 import { FileExportPreview } from './FileExportPreview';
 import { GrafanaExportDrawer } from './GrafanaExportDrawer';
-import { ExportFormats, jsonAndYamlGrafanaExportProviders } from './providers';
+import { allGrafanaExportProviders, ExportFormats } from './providers';
 interface GrafanaPoliciesPreviewProps {
   exportFormat: ExportFormats;
   onClose: () => void;
@@ -45,7 +45,7 @@ export const GrafanaPoliciesExporter = ({ onClose }: GrafanaPoliciesExporterProp
       activeTab={activeTab}
       onTabChange={setActiveTab}
       onClose={onClose}
-      formatProviders={jsonAndYamlGrafanaExportProviders}
+      formatProviders={Object.values(allGrafanaExportProviders)}
     >
       <GrafanaPoliciesExporterPreview exportFormat={activeTab} onClose={onClose} />
     </GrafanaExportDrawer>
diff --git a/public/app/features/alerting/unified/components/export/GrafanaReceiverExporter.tsx b/public/app/features/alerting/unified/components/export/GrafanaReceiverExporter.tsx
index ddf4380ac92d2..6a90aca691859 100644
--- a/public/app/features/alerting/unified/components/export/GrafanaReceiverExporter.tsx
+++ b/public/app/features/alerting/unified/components/export/GrafanaReceiverExporter.tsx
@@ -6,7 +6,7 @@ import { alertRuleApi } from '../../api/alertRuleApi';
 
 import { FileExportPreview } from './FileExportPreview';
 import { GrafanaExportDrawer } from './GrafanaExportDrawer';
-import { ExportFormats, jsonAndYamlGrafanaExportProviders } from './providers';
+import { allGrafanaExportProviders, ExportFormats } from './providers';
 
 interface GrafanaReceiverExportPreviewProps {
   exportFormat: ExportFormats;
@@ -57,7 +57,7 @@ export const GrafanaReceiverExporter = ({ onClose, receiverName, decrypt }: Graf
       activeTab={activeTab}
       onTabChange={setActiveTab}
       onClose={onClose}
-      formatProviders={jsonAndYamlGrafanaExportProviders}
+      formatProviders={Object.values(allGrafanaExportProviders)}
     >
       <GrafanaReceiverExportPreview
         receiverName={receiverName}
diff --git a/public/app/features/alerting/unified/components/export/GrafanaReceiversExporter.tsx b/public/app/features/alerting/unified/components/export/GrafanaReceiversExporter.tsx
index b843d5a1be4c8..e0f0037f676d0 100644
--- a/public/app/features/alerting/unified/components/export/GrafanaReceiversExporter.tsx
+++ b/public/app/features/alerting/unified/components/export/GrafanaReceiversExporter.tsx
@@ -6,7 +6,7 @@ import { alertRuleApi } from '../../api/alertRuleApi';
 
 import { FileExportPreview } from './FileExportPreview';
 import { GrafanaExportDrawer } from './GrafanaExportDrawer';
-import { ExportFormats, jsonAndYamlGrafanaExportProviders } from './providers';
+import { allGrafanaExportProviders, ExportFormats } from './providers';
 
 interface GrafanaReceiversExportPreviewProps {
   exportFormat: ExportFormats;
@@ -49,7 +49,7 @@ export const GrafanaReceiversExporter = ({ onClose, decrypt }: GrafanaReceiversE
       activeTab={activeTab}
       onTabChange={setActiveTab}
       onClose={onClose}
-      formatProviders={jsonAndYamlGrafanaExportProviders}
+      formatProviders={Object.values(allGrafanaExportProviders)}
     >
       <GrafanaReceiversExportPreview decrypt={decrypt} exportFormat={activeTab} onClose={onClose} />
     </GrafanaExportDrawer>
diff --git a/public/app/features/alerting/unified/components/export/GrafanaRuleExporter.tsx b/public/app/features/alerting/unified/components/export/GrafanaRuleExporter.tsx
index 852eb4914ecc5..20347d656c877 100644
--- a/public/app/features/alerting/unified/components/export/GrafanaRuleExporter.tsx
+++ b/public/app/features/alerting/unified/components/export/GrafanaRuleExporter.tsx
@@ -15,8 +15,8 @@ interface GrafanaRuleExportPreviewProps {
 }
 
 const GrafanaRuleExportPreview = ({ alertUid, exportFormat, onClose }: GrafanaRuleExportPreviewProps) => {
-  const { currentData: ruleTextDefinition = '', isFetching } = alertRuleApi.useExportRuleQuery({
-    uid: alertUid,
+  const { currentData: ruleTextDefinition = '', isFetching } = alertRuleApi.endpoints.exportRules.useQuery({
+    ruleUid: alertUid,
     format: exportFormat,
   });
 
diff --git a/public/app/features/alerting/unified/components/export/GrafanaRuleFolderExporter.tsx b/public/app/features/alerting/unified/components/export/GrafanaRuleFolderExporter.tsx
new file mode 100644
index 0000000000000..f7832957c017c
--- /dev/null
+++ b/public/app/features/alerting/unified/components/export/GrafanaRuleFolderExporter.tsx
@@ -0,0 +1,59 @@
+import React, { useState } from 'react';
+
+import { LoadingPlaceholder } from '@grafana/ui';
+
+import { FolderDTO } from '../../../../../types';
+import { alertRuleApi } from '../../api/alertRuleApi';
+
+import { FileExportPreview } from './FileExportPreview';
+import { GrafanaExportDrawer } from './GrafanaExportDrawer';
+import { allGrafanaExportProviders, ExportFormats } from './providers';
+
+interface GrafanaRuleFolderExporterProps {
+  folder: FolderDTO;
+  onClose: () => void;
+}
+
+export function GrafanaRuleFolderExporter({ folder, onClose }: GrafanaRuleFolderExporterProps) {
+  const [activeTab, setActiveTab] = useState<ExportFormats>('yaml');
+
+  return (
+    <GrafanaExportDrawer
+      title={`Export ${folder.title} rules`}
+      activeTab={activeTab}
+      onTabChange={setActiveTab}
+      onClose={onClose}
+      formatProviders={Object.values(allGrafanaExportProviders)}
+    >
+      <GrafanaRuleFolderExportPreview folder={folder} exportFormat={activeTab} onClose={onClose} />
+    </GrafanaExportDrawer>
+  );
+}
+
+interface GrafanaRuleFolderExportPreviewProps {
+  folder: FolderDTO;
+  exportFormat: ExportFormats;
+  onClose: () => void;
+}
+
+function GrafanaRuleFolderExportPreview({ folder, exportFormat, onClose }: GrafanaRuleFolderExportPreviewProps) {
+  const { currentData: exportFolderDefinition = '', isFetching } = alertRuleApi.endpoints.exportRules.useQuery({
+    folderUid: folder.uid,
+    format: exportFormat,
+  });
+
+  if (isFetching) {
+    return <LoadingPlaceholder text="Loading...." />;
+  }
+
+  const downloadFileName = `${folder.title}-${folder.uid}`;
+
+  return (
+    <FileExportPreview
+      format={exportFormat}
+      textDefinition={exportFolderDefinition}
+      downloadFileName={downloadFileName}
+      onClose={onClose}
+    />
+  );
+}
diff --git a/public/app/features/alerting/unified/components/export/GrafanaRuleGroupExporter.tsx b/public/app/features/alerting/unified/components/export/GrafanaRuleGroupExporter.tsx
index f16c4dbc296b0..ab7286c82f449 100644
--- a/public/app/features/alerting/unified/components/export/GrafanaRuleGroupExporter.tsx
+++ b/public/app/features/alerting/unified/components/export/GrafanaRuleGroupExporter.tsx
@@ -19,6 +19,7 @@ export function GrafanaRuleGroupExporter({ folderUid, groupName, onClose }: Graf
 
   return (
     <GrafanaExportDrawer
+      title={`Export ${groupName} rules`}
       activeTab={activeTab}
       onTabChange={setActiveTab}
       onClose={onClose}
@@ -47,9 +48,9 @@ function GrafanaRuleGroupExportPreview({
   exportFormat,
   onClose,
 }: GrafanaRuleGroupExportPreviewProps) {
-  const { currentData: ruleGroupTextDefinition = '', isFetching } = alertRuleApi.useExportRuleGroupQuery({
+  const { currentData: ruleGroupTextDefinition = '', isFetching } = alertRuleApi.endpoints.exportRules.useQuery({
     folderUid,
-    groupName,
+    group: groupName,
     format: exportFormat,
   });
 
diff --git a/public/app/features/alerting/unified/components/export/GrafanaRulesExporter.tsx b/public/app/features/alerting/unified/components/export/GrafanaRulesExporter.tsx
index ea8e8dbe000d4..4d4a2db0193b9 100644
--- a/public/app/features/alerting/unified/components/export/GrafanaRulesExporter.tsx
+++ b/public/app/features/alerting/unified/components/export/GrafanaRulesExporter.tsx
@@ -33,7 +33,7 @@ interface GrafanaRulesExportPreviewProps {
 }
 
 function GrafanaRulesExportPreview({ exportFormat, onClose }: GrafanaRulesExportPreviewProps) {
-  const { currentData: rulesDefinition = '', isFetching } = alertRuleApi.useExportRulesQuery({
+  const { currentData: rulesDefinition = '', isFetching } = alertRuleApi.endpoints.exportRules.useQuery({
     format: exportFormat,
   });
 
diff --git a/public/app/features/alerting/unified/components/notification-policies/EditDefaultPolicyForm.tsx b/public/app/features/alerting/unified/components/notification-policies/EditDefaultPolicyForm.tsx
index 1812ad8bbb9a3..fbfab072ad502 100644
--- a/public/app/features/alerting/unified/components/notification-policies/EditDefaultPolicyForm.tsx
+++ b/public/app/features/alerting/unified/components/notification-policies/EditDefaultPolicyForm.tsx
@@ -138,7 +138,7 @@ export const AmRootRouteForm = ({
               </Field>
               <Field
                 label="Repeat interval"
-                description="The waiting time to resend an alert after they have successfully been sent. Default 4 hours."
+                description="The waiting time to resend an alert after they have successfully been sent. Default 4 hours. Should be a multiple of Group interval."
                 invalid={!!errors.repeatIntervalValue}
                 error={errors.repeatIntervalValue?.message}
                 data-testid="am-repeat-interval"
diff --git a/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.test.tsx b/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.test.tsx
index 5ca9a009cc221..c9b25fe59b5a9 100644
--- a/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.test.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.test.tsx
@@ -296,37 +296,37 @@ describe('AnnotationsField', function () {
       expect(annotationKeyElements[1]).toHaveTextContent('Panel ID');
       expect(annotationValueElements[1]).toHaveTextContent('3');
     });
+  });
+});
 
-    it('should render warning icon for panels of type other than graph and timeseries', async function () {
-      mockSearchApiResponse(server, [
-        mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
-      ]);
-
-      mockGetDashboardResponse(
-        mockDashboardDto({
-          title: 'My dashboard',
-          uid: 'dash-test-uid',
-          panels: [
-            { id: 1, title: 'First panel', type: 'bar' },
-            { id: 2, title: 'Second panel', type: 'graph' },
-          ],
-        })
-      );
+it('should render warning icon for panels of type other than graph and timeseries', async function () {
+  mockSearchApiResponse(server, [
+    mockDashboardSearchItem({ title: 'My dashboard', uid: 'dash-test-uid', type: DashboardSearchItemType.DashDB }),
+  ]);
+
+  mockGetDashboardResponse(
+    mockDashboardDto({
+      title: 'My dashboard',
+      uid: 'dash-test-uid',
+      panels: [
+        { id: 1, title: 'First panel', type: 'bar' },
+        { id: 2, title: 'Second panel', type: 'graph' },
+      ],
+    })
+  );
 
-      const user = userEvent.setup();
+  const user = userEvent.setup();
 
-      render(<FormWrapper formValues={{ annotations: [] }} />);
+  render(<FormWrapper formValues={{ annotations: [] }} />);
 
-      const { dialog } = ui.dashboardPicker;
+  const { dialog } = ui.dashboardPicker;
 
-      await user.click(ui.setDashboardButton.get());
-      await user.click(await findByTitle(dialog.get(), 'My dashboard'));
+  await user.click(ui.setDashboardButton.get());
+  await user.click(await findByTitle(dialog.get(), 'My dashboard'));
 
-      const warnedPanel = await findByRole(dialog.get(), 'button', { name: /First panel/ });
+  const warnedPanel = await findByRole(dialog.get(), 'button', { name: /First panel/ });
 
-      expect(getByTestId(warnedPanel, 'warning-icon')).toBeInTheDocument();
-    });
-  });
+  expect(getByTestId(warnedPanel, 'warning-icon')).toBeInTheDocument();
 });
 
 function mockGetDashboardResponse(dashboard: DashboardDTO) {
diff --git a/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.v1.test.tsx b/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.v1.test.tsx
index 3e6f8c88005a3..df7ebac1f0acb 100644
--- a/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.v1.test.tsx
+++ b/public/app/features/alerting/unified/components/rule-viewer/RuleViewer.v1.test.tsx
@@ -1,4 +1,5 @@
 import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { TestProvider } from 'test/helpers/TestProvider';
 import { byRole, byText } from 'testing-library-selector';
@@ -57,10 +58,13 @@ const mocks = {
 const ui = {
   actionButtons: {
     edit: byRole('link', { name: /edit/i }),
-    clone: byRole('button', { name: /^copy$/i }),
-    delete: byRole('button', { name: /delete/i }),
     silence: byRole('link', { name: 'Silence' }),
   },
+  moreButton: byRole('button', { name: /More/i }),
+  moreButtons: {
+    duplicate: byRole('menuitem', { name: /^Duplicate$/i }),
+    delete: byRole('menuitem', { name: /delete/i }),
+  },
   loadingIndicator: byText(/Loading rule/i),
 };
 
@@ -208,11 +212,14 @@ describe('RuleDetails RBAC', () => {
       });
       mocks.useIsRuleEditable.mockReturnValue({ loading: false, isRemovable: true });
 
+      const user = userEvent.setup();
+
       // Act
       await renderRuleViewer();
+      await user.click(ui.moreButton.get());
 
       // Assert
-      expect(ui.actionButtons.delete.get()).toBeInTheDocument();
+      expect(ui.moreButtons.delete.get()).toBeInTheDocument();
     });
 
     it('Should not render Silence button for users wihout the instance create permission', async () => {
@@ -266,9 +273,12 @@ describe('RuleDetails RBAC', () => {
       });
       grantUserPermissions([AccessControlAction.AlertingRuleCreate]);
 
+      const user = userEvent.setup();
+
       await renderRuleViewer();
+      await user.click(ui.moreButton.get());
 
-      expect(ui.actionButtons.clone.get()).toBeInTheDocument();
+      expect(ui.moreButtons.duplicate.get()).toBeInTheDocument();
     });
 
     it('Should NOT render clone button for users without create rule permission', async () => {
@@ -281,10 +291,12 @@ describe('RuleDetails RBAC', () => {
 
       const { AlertingRuleRead, AlertingRuleUpdate, AlertingRuleDelete } = AccessControlAction;
       grantUserPermissions([AlertingRuleRead, AlertingRuleUpdate, AlertingRuleDelete]);
+      const user = userEvent.setup();
 
       await renderRuleViewer();
+      await user.click(ui.moreButton.get());
 
-      expect(ui.actionButtons.clone.query()).not.toBeInTheDocument();
+      expect(ui.moreButtons.duplicate.query()).not.toBeInTheDocument();
     });
   });
   describe('Cloud rules action buttons', () => {
@@ -326,11 +338,14 @@ describe('RuleDetails RBAC', () => {
       });
       mocks.useIsRuleEditable.mockReturnValue({ loading: false, isRemovable: true });
 
+      const user = userEvent.setup();
+
       // Act
       await renderRuleViewer();
+      await user.click(ui.moreButton.get());
 
       // Assert
-      expect(ui.actionButtons.delete.query()).toBeInTheDocument();
+      expect(ui.moreButtons.delete.query()).toBeInTheDocument();
     });
   });
 });
diff --git a/public/app/features/alerting/unified/components/rules/RuleActionsButtons.tsx b/public/app/features/alerting/unified/components/rules/RuleActionsButtons.tsx
index 286c58c8d351d..80e42a858decb 100644
--- a/public/app/features/alerting/unified/components/rules/RuleActionsButtons.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleActionsButtons.tsx
@@ -2,11 +2,10 @@ import { css } from '@emotion/css';
 import { uniqueId } from 'lodash';
 import React, { useState } from 'react';
 import { useLocation } from 'react-router-dom';
-import { useToggle } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Stack } from '@grafana/experimental';
-import { config, locationService } from '@grafana/runtime';
+import { locationService } from '@grafana/runtime';
 import {
   Button,
   ClipboardButton,
@@ -22,16 +21,13 @@ import { useAppNotification } from 'app/core/copy/appNotification';
 import { useDispatch } from 'app/types';
 import { CombinedRule, RuleIdentifier, RulesSource } from 'app/types/unified-alerting';
 
-import { contextSrv } from '../../../../../core/services/context_srv';
 import { useIsRuleEditable } from '../../hooks/useIsRuleEditable';
 import { deleteRuleAction } from '../../state/actions';
-import { provisioningPermissions } from '../../utils/access-control';
 import { getRulesSourceName } from '../../utils/datasource';
 import { createShareLink, createViewLink } from '../../utils/misc';
 import * as ruleId from '../../utils/rule-id';
 import { isFederatedRuleGroup, isGrafanaRulerRule } from '../../utils/rules';
 import { createUrl } from '../../utils/url';
-import { GrafanaRuleExporter } from '../export/GrafanaRuleExporter';
 
 import { RedirectToCloneRule } from './CloneRule';
 
@@ -51,14 +47,12 @@ export const RuleActionsButtons = ({ rule, rulesSource }: Props) => {
   const [redirectToClone, setRedirectToClone] = useState<
     { identifier: RuleIdentifier; isProvisioned: boolean } | undefined
   >(undefined);
-  const [showExportDrawer, toggleShowExportDrawer] = useToggle(false);
 
   const { namespace, group, rulerRule } = rule;
   const [ruleToDelete, setRuleToDelete] = useState<CombinedRule>();
 
   const rulesSourceName = getRulesSourceName(rulesSource);
 
-  const canReadProvisioning = contextSrv.hasPermission(provisioningPermissions.read);
   const isProvisioned = isGrafanaRulerRule(rule.rulerRule) && Boolean(rule.rulerRule.grafana_alert.provenance);
 
   const buttons: JSX.Element[] = [];
@@ -103,75 +97,74 @@ export const RuleActionsButtons = ({ rule, rulesSource }: Props) => {
     );
   }
 
-  if (isEditable && rulerRule && !isFederated) {
+  if (rulerRule && !isFederated) {
     const identifier = ruleId.fromRulerRule(sourceName, namespace.name, group.name, rulerRule);
 
-    if (!isProvisioned) {
-      const editURL = createUrl(`/alerting/${encodeURIComponent(ruleId.stringifyIdentifier(identifier))}/edit`, {
-        returnTo,
-      });
+    if (isEditable) {
+      if (!isProvisioned) {
+        const editURL = createUrl(`/alerting/${encodeURIComponent(ruleId.stringifyIdentifier(identifier))}/edit`, {
+          returnTo,
+        });
+
+        if (isViewMode) {
+          buttons.push(
+            <ClipboardButton
+              key="copy"
+              icon="copy"
+              onClipboardError={(copiedText) => {
+                notifyApp.error('Error while copying URL', copiedText);
+              }}
+              className={style.button}
+              size="sm"
+              getText={buildShareUrl}
+            >
+              Copy link to rule
+            </ClipboardButton>
+          );
+        }
 
-      if (isViewMode) {
         buttons.push(
-          <ClipboardButton
-            key="copy"
-            icon="copy"
-            onClipboardError={(copiedText) => {
-              notifyApp.error('Error while copying URL', copiedText);
-            }}
-            className={style.button}
-            size="sm"
-            getText={buildShareUrl}
-          >
-            Copy link to rule
-          </ClipboardButton>
+          <Tooltip placement="top" content={'Edit'}>
+            <LinkButton
+              title="Edit"
+              className={style.button}
+              size="sm"
+              key="edit"
+              variant="secondary"
+              icon="pen"
+              href={editURL}
+            />
+          </Tooltip>
         );
       }
 
-      buttons.push(
-        <Tooltip placement="top" content={'Edit'}>
-          <LinkButton
-            title="Edit"
-            className={style.button}
-            size="sm"
-            key="edit"
-            variant="secondary"
-            icon="pen"
-            href={editURL}
-          />
-        </Tooltip>
+      moreActions.push(
+        <Menu.Item label="Duplicate" icon="copy" onClick={() => setRedirectToClone({ identifier, isProvisioned })} />
       );
     }
 
-    if (isGrafanaRulerRule(rulerRule) && canReadProvisioning) {
-      moreActions.push(<Menu.Item label="Export" icon="download-alt" onClick={toggleShowExportDrawer} />);
-      if (config.featureToggles.alertingModifiedExport) {
-        moreActions.push(
-          <Menu.Item
-            label="Modify export"
-            icon="edit"
-            onClick={() =>
-              locationService.push(
-                createUrl(`/alerting/${encodeURIComponent(ruleId.stringifyIdentifier(identifier))}/modify-export`, {
-                  returnTo: location.pathname + location.search,
-                })
-              )
-            }
-          />
-        );
-      }
+    if (isGrafanaRulerRule(rulerRule)) {
+      moreActions.push(
+        <Menu.Item
+          label="Modify export"
+          icon="edit"
+          onClick={() =>
+            locationService.push(
+              createUrl(`/alerting/${encodeURIComponent(ruleId.stringifyIdentifier(identifier))}/modify-export`, {
+                returnTo: location.pathname + location.search,
+              })
+            )
+          }
+        />
+      );
     }
-
-    moreActions.push(
-      <Menu.Item label="Duplicate" icon="copy" onClick={() => setRedirectToClone({ identifier, isProvisioned })} />
-    );
   }
 
   if (isRemovable && rulerRule && !isFederated && !isProvisioned) {
     moreActions.push(<Menu.Item label="Delete" icon="trash-alt" onClick={() => setRuleToDelete(rule)} />);
   }
 
-  if (buttons.length) {
+  if (buttons.length || moreActions.length) {
     return (
       <>
         <Stack gap={1}>
@@ -214,9 +207,7 @@ export const RuleActionsButtons = ({ rule, rulesSource }: Props) => {
             onDismiss={() => setRuleToDelete(undefined)}
           />
         )}
-        {showExportDrawer && isGrafanaRulerRule(rule.rulerRule) && (
-          <GrafanaRuleExporter alertUid={rule.rulerRule.grafana_alert.uid} onClose={toggleShowExportDrawer} />
-        )}
+
         {redirectToClone && (
           <RedirectToCloneRule
             identifier={redirectToClone.identifier}
diff --git a/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx b/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx
index d683d4522d627..44cd3979713d7 100644
--- a/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx
+++ b/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx
@@ -1,15 +1,26 @@
 import { css } from '@emotion/css';
+import { uniqueId } from 'lodash';
 import React, { Fragment, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 
 import { GrafanaTheme2, textUtil, urlUtil } from '@grafana/data';
-import { config } from '@grafana/runtime';
-import { Button, ClipboardButton, ConfirmModal, HorizontalGroup, LinkButton, useStyles2 } from '@grafana/ui';
+import { config, locationService } from '@grafana/runtime';
+import {
+  Button,
+  ClipboardButton,
+  ConfirmModal,
+  Dropdown,
+  HorizontalGroup,
+  Icon,
+  LinkButton,
+  Menu,
+  useStyles2,
+} from '@grafana/ui';
 import { useAppNotification } from 'app/core/copy/appNotification';
 import { contextSrv } from 'app/core/services/context_srv';
 import { AlertmanagerChoice } from 'app/plugins/datasource/alertmanager/types';
 import { AccessControlAction, useDispatch } from 'app/types';
-import { CombinedRule, RulesSource } from 'app/types/unified-alerting';
+import { CombinedRule, RuleIdentifier, RulesSource } from 'app/types/unified-alerting';
 import { PromAlertingRuleState } from 'app/types/unified-alerting-dto';
 
 import { alertmanagerApi } from '../../api/alertmanagerApi';
@@ -29,9 +40,10 @@ import {
 } from '../../utils/misc';
 import * as ruleId from '../../utils/rule-id';
 import { isAlertingRule, isFederatedRuleGroup, isGrafanaRulerRule } from '../../utils/rules';
+import { createUrl } from '../../utils/url';
 import { DeclareIncident } from '../bridges/DeclareIncidentButton';
 
-import { CloneRuleButton } from './CloneRule';
+import { RedirectToCloneRule } from './CloneRule';
 
 interface Props {
   rule: CombinedRule;
@@ -48,6 +60,9 @@ export const RuleDetailsActionButtons = ({ rule, rulesSource, isViewMode }: Prop
   const notifyApp = useAppNotification();
 
   const [ruleToDelete, setRuleToDelete] = useState<CombinedRule>();
+  const [redirectToClone, setRedirectToClone] = useState<
+    { identifier: RuleIdentifier; isProvisioned: boolean } | undefined
+  >(undefined);
 
   const alertmanagerSourceName = isGrafanaRulesSource(rulesSource)
     ? rulesSource
@@ -57,6 +72,7 @@ export const RuleDetailsActionButtons = ({ rule, rulesSource, isViewMode }: Prop
 
   const buttons: JSX.Element[] = [];
   const rightButtons: JSX.Element[] = [];
+  const moreActionsButtons: React.ReactElement[] = [];
 
   const deleteRule = () => {
     if (ruleToDelete && ruleToDelete.rulerRule) {
@@ -221,34 +237,58 @@ export const RuleDetailsActionButtons = ({ rule, rulesSource, isViewMode }: Prop
       }
     }
 
+    if (isGrafanaRulerRule(rulerRule)) {
+      moreActionsButtons.push(
+        <Menu.Item
+          label="Modify export"
+          icon="edit"
+          onClick={() =>
+            locationService.push(
+              createUrl(`/alerting/${encodeURIComponent(ruleId.stringifyIdentifier(identifier))}/modify-export`)
+            )
+          }
+        />
+      );
+    }
+
     if (hasCreateRulePermission && !isFederated) {
-      rightButtons.push(
-        <CloneRuleButton key="clone" text="Copy" ruleIdentifier={identifier} isProvisioned={isProvisioned} />
+      moreActionsButtons.push(
+        <Menu.Item label="Duplicate" icon="copy" onClick={() => setRedirectToClone({ identifier, isProvisioned })} />
       );
     }
 
     if (isRemovable && !isFederated && !isProvisioned) {
-      rightButtons.push(
-        <Button
-          size="sm"
-          type="button"
-          key="delete"
-          variant="secondary"
-          icon="trash-alt"
-          onClick={() => setRuleToDelete(rule)}
-        >
-          Delete
-        </Button>
+      moreActionsButtons.push(<Menu.Divider />);
+      moreActionsButtons.push(
+        <Menu.Item key="delete" label="Delete" icon="trash-alt" onClick={() => setRuleToDelete(rule)} />
       );
     }
   }
 
-  if (buttons.length || rightButtons.length) {
+  if (buttons.length || rightButtons.length || moreActionsButtons.length) {
     return (
       <>
         <div className={style.wrapper}>
           <HorizontalGroup width="auto">{buttons.length ? buttons : <div />}</HorizontalGroup>
-          <HorizontalGroup width="auto">{rightButtons.length ? rightButtons : <div />}</HorizontalGroup>
+          <HorizontalGroup width="auto">
+            {rightButtons.length && rightButtons}
+            {moreActionsButtons.length && (
+              <Dropdown
+                overlay={
+                  <Menu>
+                    {moreActionsButtons.map((action) => (
+                      <React.Fragment key={uniqueId('action_')}>{action}</React.Fragment>
+                    ))}
+                  </Menu>
+                }
+              >
+                <Button variant="secondary" size="sm">
+                  More
+                  <Icon name="angle-down" />
+                </Button>
+              </Dropdown>
+            )}
+          </HorizontalGroup>
         </div>
         {!!ruleToDelete && (
           <ConfirmModal
@@ -261,9 +301,17 @@ export const RuleDetailsActionButtons = ({ rule, rulesSource, isViewMode }: Prop
             onDismiss={() => setRuleToDelete(undefined)}
           />
         )}
+        {redirectToClone && (
+          <RedirectToCloneRule
+            identifier={redirectToClone.identifier}
+            isProvisioned={redirectToClone.isProvisioned}
+            onDismiss={() => setRedirectToClone(undefined)}
+          />
+        )}
       </>
     );
   }
+
   return null;
 };
 
diff --git a/public/app/features/alerting/unified/components/rules/RulesGroup.test.tsx b/public/app/features/alerting/unified/components/rules/RulesGroup.test.tsx
index 044e358d278d1..7bdfa495c2469 100644
--- a/public/app/features/alerting/unified/components/rules/RulesGroup.test.tsx
+++ b/public/app/features/alerting/unified/components/rules/RulesGroup.test.tsx
@@ -13,7 +13,7 @@ import { CombinedRuleGroup, CombinedRuleNamespace } from 'app/types/unified-aler
 
 import { LogMessages } from '../../Analytics';
 import { useHasRuler } from '../../hooks/useHasRuler';
-import { mockFolderApi, mockProvisioningApi, setupMswServer } from '../../mockApi';
+import { mockExportApi, mockFolderApi, setupMswServer } from '../../mockApi';
 import { grantUserPermissions, mockCombinedRule, mockDataSource, mockFolder, mockGrafanaRulerRule } from '../../mocks';
 
 import { RulesGroup } from './RulesGroup';
@@ -61,7 +61,7 @@ const ui = {
   },
   moreActionsButton: byRole('button', { name: 'More' }),
   export: {
-    dialog: byRole('dialog', { name: 'Drawer title Export' }),
+    dialog: byRole('dialog', { name: /Drawer title Export .* rules/ }),
     jsonTab: byRole('tab', { name: /JSON/ }),
     yamlTab: byRole('tab', { name: /YAML/ }),
     editor: byTestId('code-editor'),
@@ -121,7 +121,7 @@ describe('Rules group tests', () => {
       // Arrange
       mockUseHasRuler(true, true);
       mockFolderApi(server).folder('cpu-usage', mockFolder({ uid: 'cpu-usage' }));
-      mockProvisioningApi(server).exportRuleGroup('cpu-usage', 'TestGroup', {
+      mockExportApi(server).exportRulesGroup('cpu-usage', 'TestGroup', {
         yaml: 'Yaml Export Content',
         json: 'Json Export Content',
       });
diff --git a/public/app/features/alerting/unified/components/rules/RulesGroup.tsx b/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
index b6270635cba9c..df792d74b0847 100644
--- a/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
+++ b/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
@@ -1,7 +1,6 @@
 import { css } from '@emotion/css';
 import pluralize from 'pluralize';
 import React, { useEffect, useState } from 'react';
-import { useToggle } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Stack } from '@grafana/experimental';
@@ -10,18 +9,17 @@ import { Badge, ConfirmModal, HorizontalGroup, Icon, Spinner, Tooltip, useStyles
 import { useDispatch } from 'app/types';
 import { CombinedRuleGroup, CombinedRuleNamespace } from 'app/types/unified-alerting';
 
-import { contextSrv } from '../../../../../core/services/context_srv';
 import { LogMessages } from '../../Analytics';
 import { useFolder } from '../../hooks/useFolder';
 import { useHasRuler } from '../../hooks/useHasRuler';
 import { deleteRulesGroupAction } from '../../state/actions';
-import { provisioningPermissions } from '../../utils/access-control';
 import { useRulesAccess } from '../../utils/accessControlHooks';
 import { GRAFANA_RULES_SOURCE_NAME, isCloudRulesSource } from '../../utils/datasource';
 import { makeFolderLink, makeFolderSettingsLink } from '../../utils/misc';
 import { isFederatedRuleGroup, isGrafanaRulerRule } from '../../utils/rules';
 import { CollapseToggle } from '../CollapseToggle';
 import { RuleLocation } from '../RuleLocation';
+import { GrafanaRuleFolderExporter } from '../export/GrafanaRuleFolderExporter';
 import { GrafanaRuleGroupExporter } from '../export/GrafanaRuleGroupExporter';
 
 import { ActionIcon } from './ActionIcon';
@@ -47,7 +45,7 @@ export const RulesGroup = React.memo(({ group, namespace, expandAll, viewMode }:
   const [isEditingGroup, setIsEditingGroup] = useState(false);
   const [isDeletingGroup, setIsDeletingGroup] = useState(false);
   const [isReorderingGroup, setIsReorderingGroup] = useState(false);
-  const [isExporting, toggleIsExporting] = useToggle(false);
+  const [isExporting, setIsExporting] = useState<'group' | 'folder' | undefined>(undefined);
   const [isCollapsed, setIsCollapsed] = useState(!expandAll);
 
   const { canEditRules } = useRulesAccess();
@@ -66,7 +64,6 @@ export const RulesGroup = React.memo(({ group, namespace, expandAll, viewMode }:
     hasRuler(rulesSource) && rulerRulesLoaded(rulesSource) && !group.rules.find((rule) => !!rule.rulerRule);
   const isFederated = isFederatedRuleGroup(group);
 
-  const canReadProvisioning = contextSrv.hasPermission(provisioningPermissions.read);
   // check if group has provisioned items
   const isProvisioned = group.rules.some((rule) => {
     return isGrafanaRulerRule(rule.rulerRule) && rule.rulerRule.grafana_alert.provenance;
@@ -118,18 +115,6 @@ export const RulesGroup = React.memo(({ group, namespace, expandAll, viewMode }:
             />
           );
         }
-        if (isGroupView && canReadProvisioning) {
-          actionIcons.push(
-            <ActionIcon
-              aria-label="xport rule group"
-              data-testid="export-group"
-              key="export"
-              icon="download-alt"
-              tooltip="Export rule group"
-              onClick={() => toggleIsExporting(true)}
-            />
-          );
-        }
         if (isListView) {
           actionIcons.push(
             <ActionIcon
@@ -141,19 +126,45 @@ export const RulesGroup = React.memo(({ group, namespace, expandAll, viewMode }:
               target="__blank"
             />
           );
+
+          if (folder?.canAdmin) {
+            actionIcons.push(
+              <ActionIcon
+                aria-label="manage permissions"
+                key="manage-perms"
+                icon="lock"
+                tooltip="manage permissions"
+                to={baseUrl + '/permissions'}
+                target="__blank"
+              />
+            );
+          }
         }
       }
-      if (folder?.canAdmin && isListView) {
-        actionIcons.push(
-          <ActionIcon
-            aria-label="manage permissions"
-            key="manage-perms"
-            icon="lock"
-            tooltip="manage permissions"
-            to={baseUrl + '/permissions'}
-            target="__blank"
-          />
-        );
+      if (folder) {
+        if (isListView) {
+          actionIcons.push(
+            <ActionIcon
+              aria-label="export rule folder"
+              data-testid="export-folder"
+              key="export-folder"
+              icon="download-alt"
+              tooltip="Export rules folder"
+              onClick={() => setIsExporting('folder')}
+            />
+          );
+        } else if (isGroupView) {
+          actionIcons.push(
+            <ActionIcon
+              aria-label="export rule group"
+              data-testid="export-group"
+              key="export-group"
+              icon="download-alt"
+              tooltip="Export rule group"
+              onClick={() => setIsExporting('group')}
+            />
+          );
+        }
       }
     }
   } else if (canEditRules(rulesSource.name) && hasRuler(rulesSource)) {
@@ -290,8 +301,15 @@ export const RulesGroup = React.memo(({ group, namespace, expandAll, viewMode }:
         onDismiss={() => setIsDeletingGroup(false)}
         confirmText="Delete"
       />
-      {isExporting && folder?.uid && (
-        <GrafanaRuleGroupExporter folderUid={folder?.uid} groupName={group.name} onClose={toggleIsExporting} />
+      {folder && isExporting === 'folder' && (
+        <GrafanaRuleFolderExporter folder={folder} onClose={() => setIsExporting(undefined)} />
+      )}
+      {folder && isExporting === 'group' && (
+        <GrafanaRuleGroupExporter
+          folderUid={folder.uid}
+          groupName={group.name}
+          onClose={() => setIsExporting(undefined)}
+        />
       )}
     </div>
   );
diff --git a/public/app/features/alerting/unified/components/rules/RulesTable.test.tsx b/public/app/features/alerting/unified/components/rules/RulesTable.test.tsx
index da7cccf7a551d..ce123239e6389 100644
--- a/public/app/features/alerting/unified/components/rules/RulesTable.test.tsx
+++ b/public/app/features/alerting/unified/components/rules/RulesTable.test.tsx
@@ -53,9 +53,12 @@ describe('RulesTable RBAC', () => {
 
     it('Should not render Delete button for users without the delete permission', async () => {
       mocks.useIsRuleEditable.mockReturnValue({ loading: false, isRemovable: false });
+      const user = userEvent.setup();
 
       renderRulesTable(grafanaRule);
-      expect(ui.actionButtons.more.query()).not.toBeInTheDocument();
+      await user.click(ui.actionButtons.more.get());
+
+      expect(ui.moreActionItems.delete.query()).not.toBeInTheDocument();
     });
 
     it('Should render Edit button for users with the update permission', () => {
diff --git a/public/app/features/alerting/unified/mockApi.ts b/public/app/features/alerting/unified/mockApi.ts
index 5ca8ea06d8a75..87814055a13a9 100644
--- a/public/app/features/alerting/unified/mockApi.ts
+++ b/public/app/features/alerting/unified/mockApi.ts
@@ -23,6 +23,7 @@ import {
   Route,
 } from '../../../plugins/datasource/alertmanager/types';
 import { FolderDTO, NotifierDTO } from '../../../types';
+import { DashboardSearchHit } from '../../search/types';
 
 import { CreateIntegrationDTO, NewOnCallIntegrationDTO, OnCallIntegrationDTO } from './api/onCallApi';
 import { AlertingQueryResponse } from './state/AlertingQueryRunner';
@@ -337,6 +338,55 @@ export function mockProvisioningApi(server: SetupServer) {
   };
 }
 
+export function mockExportApi(server: SetupServer) {
+  // exportRule, exportRulesGroup, exportRulesFolder use the same API endpoint but with different parameters
+  return {
+    // exportRule requires ruleUid parameter and doesn't allow folderUid and group parameters
+    exportRule: (ruleUid: string, response: Record<string, string>) => {
+      server.use(
+        rest.get('/api/ruler/grafana/api/v1/export/rules', (req, res, ctx) => {
+          if (req.url.searchParams.get('ruleUid') === ruleUid) {
+            return res(ctx.status(200), ctx.text(response[req.url.searchParams.get('format') ?? 'yaml']));
+          }
+
+          return res(ctx.status(500));
+        })
+      );
+    },
+    // exportRulesGroup requires folderUid and group parameters and doesn't allow ruleUid parameter
+    exportRulesGroup: (folderUid: string, group: string, response: Record<string, string>) => {
+      server.use(
+        rest.get('/api/ruler/grafana/api/v1/export/rules', (req, res, ctx) => {
+          if (req.url.searchParams.get('folderUid') === folderUid && req.url.searchParams.get('group') === group) {
+            return res(ctx.status(200), ctx.text(response[req.url.searchParams.get('format') ?? 'yaml']));
+          }
+
+          return res(ctx.status(500));
+        })
+      );
+    },
+    // exportRulesFolder requires folderUid parameter
+    exportRulesFolder: (folderUid: string, response: Record<string, string>) => {
+      server.use(
+        rest.get('/api/ruler/grafana/api/v1/export/rules', (req, res, ctx) => {
+          if (req.url.searchParams.get('folderUid') === folderUid) {
+            return res(ctx.status(200), ctx.text(response[req.url.searchParams.get('format') ?? 'yaml']));
+          }
+
+          return res(ctx.status(500));
+        })
+      );
+    },
+    modifiedExport: (namespace: string, response: Record<string, string>) => {
+      server.use(
+        rest.post(`/api/ruler/grafana/api/v1/rules/${namespace}/export`, (req, res, ctx) => {
+          return res(ctx.status(200), ctx.text(response[req.url.searchParams.get('format') ?? 'yaml']));
+        })
+      );
+    },
+  };
+}
+
 export function mockFolderApi(server: SetupServer) {
   return {
     folder: (folderUid: string, response: FolderDTO) => {
@@ -345,6 +395,14 @@ export function mockFolderApi(server: SetupServer) {
   };
 }
 
+export function mockSearchApi(server: SetupServer) {
+  return {
+    search: (results: DashboardSearchHit[]) => {
+      server.use(rest.get(`/api/search`, (_, res, ctx) => res(ctx.status(200), ctx.json(results))));
+    },
+  };
+}
+
 // Creates a MSW server and sets up beforeAll, afterAll and beforeEach handlers for it
 export function setupMswServer() {
   const server = setupServer();
diff --git a/public/app/features/alerting/unified/utils/access-control.ts b/public/app/features/alerting/unified/utils/access-control.ts
index d71134a46598a..46ca371882ccb 100644
--- a/public/app/features/alerting/unified/utils/access-control.ts
+++ b/public/app/features/alerting/unified/utils/access-control.ts
@@ -1,7 +1,8 @@
+import { getConfig } from 'app/core/config';
 import { contextSrv } from 'app/core/services/context_srv';
 import { AccessControlAction } from 'app/types';
 
-import { isGrafanaRulesSource } from './datasource';
+import { GRAFANA_RULES_SOURCE_NAME, isGrafanaRulesSource } from './datasource';
 
 type RulesSourceType = 'grafana' | 'external';
 
@@ -128,3 +129,12 @@ export function getRulesAccess() {
       contextSrv.hasPermission(provisioningPermissions.readSecrets),
   };
 }
+
+export function getCreateAlertInMenuAvailability() {
+  const { unifiedAlertingEnabled } = getConfig();
+  const hasRuleReadPermissions = contextSrv.hasPermission(getRulesPermissions(GRAFANA_RULES_SOURCE_NAME).read);
+  const hasRuleUpdatePermissions = contextSrv.hasPermission(getRulesPermissions(GRAFANA_RULES_SOURCE_NAME).update);
+  const isAlertingAvailableForRead = unifiedAlertingEnabled && hasRuleReadPermissions;
+
+  return isAlertingAvailableForRead && hasRuleUpdatePermissions;
+}
diff --git a/public/app/features/alerting/unified/utils/cloud-alertmanager-notifier-types.ts b/public/app/features/alerting/unified/utils/cloud-alertmanager-notifier-types.ts
index 31355b79a492b..df76463fb5acd 100644
--- a/public/app/features/alerting/unified/utils/cloud-alertmanager-notifier-types.ts
+++ b/public/app/features/alerting/unified/utils/cloud-alertmanager-notifier-types.ts
@@ -491,6 +491,22 @@ export const cloudNotifierTypes: Array<NotifierDTO<CloudNotifierType>> = [
       }),
     ],
   },
+  {
+    name: 'Microsoft Teams',
+    description: 'Sends notifications to Microsoft Teams',
+    type: 'msteams',
+    info: '',
+    heading: 'Microsoft Teams settings',
+    options: [
+      option('webhook_url', 'Webhook URL', 'The incoming webhook URL.'),
+      option('title', 'Title', 'Message title template.', {
+        placeholder: '{{ template "teams.default.title" . }}',
+      }),
+      option('text', 'Text', 'Message body template.', {
+        placeholder: '{{ template "teams.default.text" . }}',
+      }),
+    ],
+  },
 ];
 
 export const globalConfigOptions: NotificationChannelOption[] = [
diff --git a/public/app/features/canvas/element.ts b/public/app/features/canvas/element.ts
index b7b0bf069dd34..0e51e4a881534 100644
--- a/public/app/features/canvas/element.ts
+++ b/public/app/features/canvas/element.ts
@@ -92,4 +92,4 @@ export interface CanvasElementItem<TConfig = any, TData = any> extends RegistryI
 export const defaultBgColor = '#D9D9D9';
 export const defaultTextColor = '#000000';
 export const defaultLightTextColor = '#F0F4FD';
-export const defaultThemeTextColor = config.theme2.colors.background.primary;
+export const defaultThemeTextColor = config.theme2.colors.text.primary;
diff --git a/public/app/features/canvas/elements/button.tsx b/public/app/features/canvas/elements/button.tsx
index e0f3f46f3bf80..18cf97713a458 100644
--- a/public/app/features/canvas/elements/button.tsx
+++ b/public/app/features/canvas/elements/button.tsx
@@ -1,11 +1,10 @@
 import { css } from '@emotion/css';
-import React, { PureComponent } from 'react';
+import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { PluginState } from '@grafana/data/src';
 import { TextDimensionMode } from '@grafana/schema';
-import { Button, stylesFactory } from '@grafana/ui';
-import { config } from 'app/core/config';
+import { Button, Spinner, useStyles2 } from '@grafana/ui';
 import { DimensionContext } from 'app/features/dimensions/context';
 import { ColorDimensionEditor } from 'app/features/dimensions/editors';
 import { TextDimensionEditor } from 'app/features/dimensions/editors/TextDimensionEditor';
@@ -40,26 +39,33 @@ export const defaultStyleConfig: ButtonStyleConfig = {
   variant: 'primary',
 };
 
-class ButtonDisplay extends PureComponent<CanvasElementProps<ButtonConfig, ButtonData>> {
-  render() {
-    const { data } = this.props;
-    const styles = getStyles(config.theme2, data);
+const ButtonDisplay = ({ data }: CanvasElementProps<ButtonConfig, ButtonData>) => {
+  const styles = useStyles2(getStyles, data);
 
-    const onClick = () => {
-      if (data?.api && data?.api?.endpoint) {
-        callApi(data.api);
-      }
-    };
+  const [isLoading, setIsLoading] = React.useState(false);
+
+  const updateLoadingStateCallback = (loading: boolean) => {
+    setIsLoading(loading);
+  };
+
+  const onClick = () => {
+    if (data?.api && data?.api?.endpoint) {
+      setIsLoading(true);
+      callApi(data.api, updateLoadingStateCallback);
+    }
+  };
 
-    return (
-      <Button type="submit" variant={data?.style?.variant} onClick={onClick} className={styles.button}>
+  return (
+    <Button type="submit" variant={data?.style?.variant} onClick={onClick} className={styles.button}>
+      <span>
+        {isLoading && <Spinner inline={true} className={styles.buttonSpinner} />}
         {data?.text}
-      </Button>
-    );
-  }
-}
+      </span>
+    </Button>
+  );
+};
 
-const getStyles = stylesFactory((theme: GrafanaTheme2, data: ButtonData | undefined) => ({
+const getStyles = (theme: GrafanaTheme2, data: ButtonData | undefined) => ({
   button: css({
     height: '100%',
     width: '100%',
@@ -67,18 +73,22 @@ const getStyles = stylesFactory((theme: GrafanaTheme2, data: ButtonData | undefi
 
     '> span': {
       display: 'inline-grid',
+      gridAutoFlow: 'column',
       textAlign: data?.align,
       fontSize: `${data?.size}px`,
       color: data?.color,
     },
   }),
-}));
+  buttonSpinner: css({
+    marginRight: theme.spacing(0.5),
+  }),
+});
 
 export const buttonItem: CanvasElementItem<ButtonConfig, ButtonData> = {
   id: 'button',
   name: 'Button',
   description: 'Button',
-  state: PluginState.alpha,
+  state: PluginState.beta,
 
   standardEditorConfig: {
     background: false,
@@ -137,7 +147,7 @@ export const buttonItem: CanvasElementItem<ButtonConfig, ButtonData> = {
     const data: ButtonData = {
       text: cfg?.text ? ctx.getText(cfg.text).value() : '',
       align: cfg.align ?? Align.Center,
-      size: cfg.size,
+      size: cfg.size ?? 14,
       api: getCfgApi(),
       style: cfg?.style ?? defaultStyleConfig,
     };
diff --git a/public/app/features/dashboard-scene/scene/DashboardScene.test.tsx b/public/app/features/dashboard-scene/scene/DashboardScene.test.tsx
index 6ca683bbefb3c..4ee8261448287 100644
--- a/public/app/features/dashboard-scene/scene/DashboardScene.test.tsx
+++ b/public/app/features/dashboard-scene/scene/DashboardScene.test.tsx
@@ -1,26 +1,16 @@
 import { CoreApp } from '@grafana/data';
 import { sceneGraph, SceneGridItem, SceneGridLayout, SceneQueryRunner, VizPanel } from '@grafana/scenes';
+import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 
 import { DashboardScene } from './DashboardScene';
 
 describe('DashboardScene', () => {
-  describe('Given a standard scene', () => {
-    it('Should set inspectPanelKey when url has inspect key', () => {
+  describe('DashboardSrv.getCurrent compatibility', () => {
+    it('Should set to compatibility wrapper', () => {
       const scene = buildTestScene();
-      scene.urlSync?.updateFromUrl({ inspect: '2' });
-      expect(scene.state.inspectPanelKey).toBe('2');
-    });
+      scene.activate();
 
-    it('Should handle inspect key that is not found', () => {
-      const scene = buildTestScene();
-      scene.urlSync?.updateFromUrl({ inspect: '12321' });
-      expect(scene.state.inspectPanelKey).toBe(undefined);
-    });
-
-    it('Should set viewPanelKey when url has viewPanel', () => {
-      const scene = buildTestScene();
-      scene.urlSync?.updateFromUrl({ viewPanel: '2' });
-      expect(scene.state.viewPanelKey).toBe('2');
+      expect(getDashboardSrv().getCurrent()?.uid).toBe('dash-1');
     });
   });
 
diff --git a/public/app/features/dashboard-scene/scene/DashboardScene.tsx b/public/app/features/dashboard-scene/scene/DashboardScene.tsx
index a31f99b24237a..30ed88975803b 100644
--- a/public/app/features/dashboard-scene/scene/DashboardScene.tsx
+++ b/public/app/features/dashboard-scene/scene/DashboardScene.tsx
@@ -14,10 +14,12 @@ import {
   SceneObjectStateChangedEvent,
   sceneUtils,
 } from '@grafana/scenes';
+import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 import { DashboardMeta } from 'app/types';
 
 import { DashboardSceneRenderer } from '../scene/DashboardSceneRenderer';
 import { SaveDashboardDrawer } from '../serialization/SaveDashboardDrawer';
+import { DashboardModelCompatibilityWrapper } from '../utils/DashboardModelCompatibilityWrapper';
 import {
   findVizPanelByKey,
   forceRenderChildren,
@@ -29,12 +31,21 @@ import {
 import { DashboardSceneUrlSync } from './DashboardSceneUrlSync';
 
 export interface DashboardSceneState extends SceneObjectState {
+  /** The title */
   title: string;
+  /** A uid when saved */
   uid?: string;
+  /** @deprecated */
+  id?: number | null;
+  /** Layout of panels */
   body: SceneObject;
+  /** NavToolbar actions */
   actions?: SceneObject[];
+  /** Fixed row at the top of the canvas with for example variables and time range controls */
   controls?: SceneObject[];
+  /** True when editing */
   isEditing?: boolean;
+  /** True when user made a change */
   isDirty?: boolean;
   /** meta flags */
   meta: DashboardMeta;
@@ -84,11 +95,17 @@ export class DashboardScene extends SceneObjectBase<DashboardSceneState> {
       this.startTrackingChanges();
     }
 
+    const oldDashboardWrapper = new DashboardModelCompatibilityWrapper(this);
+
+    // @ts-expect-error
+    getDashboardSrv().setCurrent(oldDashboardWrapper);
+
     // Deactivation logic
     return () => {
       window.__grafanaSceneContext = undefined;
       this.stopTrackingChanges();
       this.stopUrlSync();
+      oldDashboardWrapper.destroy();
     };
   }
 
@@ -213,4 +230,8 @@ export class DashboardScene extends SceneObjectBase<DashboardSceneState> {
       panelId: (panel && getPanelIdForVizPanel(panel)) ?? 0,
     };
   }
+
+  canEditDashboard() {
+    return Boolean(this.state.meta.canEdit || this.state.meta.canMakeEditable);
+  }
 }
diff --git a/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.test.ts b/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.test.ts
new file mode 100644
index 0000000000000..951187e9d2e86
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.test.ts
@@ -0,0 +1,91 @@
+import { AppEvents } from '@grafana/data';
+import { SceneGridItem, SceneGridLayout, SceneQueryRunner, VizPanel } from '@grafana/scenes';
+import appEvents from 'app/core/app_events';
+
+import { DashboardScene } from './DashboardScene';
+import { DashboardRepeatsProcessedEvent } from './types';
+
+describe('DashboardSceneUrlSync', () => {
+  describe('Given a standard scene', () => {
+    it('Should set inspectPanelKey when url has inspect key', () => {
+      const scene = buildTestScene();
+      scene.urlSync?.updateFromUrl({ inspect: '2' });
+      expect(scene.state.inspectPanelKey).toBe('2');
+    });
+
+    it('Should handle inspect key that is not found', () => {
+      const scene = buildTestScene();
+      scene.urlSync?.updateFromUrl({ inspect: '12321' });
+      expect(scene.state.inspectPanelKey).toBe(undefined);
+    });
+
+    it('Should set viewPanelKey when url has viewPanel', () => {
+      const scene = buildTestScene();
+      scene.urlSync?.updateFromUrl({ viewPanel: '2' });
+      expect(scene.state.viewPanelKey).toBe('2');
+    });
+  });
+
+  describe('Given a viewPanelKey with clone that is not found', () => {
+    const scene = buildTestScene();
+
+    let errorNotice = 0;
+    appEvents.on(AppEvents.alertError, (evt) => errorNotice++);
+
+    scene.urlSync?.updateFromUrl({ viewPanel: 'panel-1-clone-1' });
+
+    expect(scene.state.viewPanelKey).toBeUndefined();
+    // Verify no error notice was shown
+    expect(errorNotice).toBe(0);
+
+    // fake adding clone panel
+    const layout = scene.state.body as SceneGridLayout;
+    layout.setState({
+      children: [
+        new SceneGridItem({
+          key: 'griditem-1',
+          x: 0,
+          body: new VizPanel({
+            title: 'Clone Panel A',
+            key: 'panel-1-clone-1',
+            pluginId: 'table',
+          }),
+        }),
+      ],
+    });
+
+    // Verify it subscribes to DashboardRepeatsProcessedEvent
+    scene.publishEvent(new DashboardRepeatsProcessedEvent({ source: scene }));
+    expect(scene.state.viewPanelKey).toBe('panel-1-clone-1');
+  });
+});
+
+function buildTestScene() {
+  const scene = new DashboardScene({
+    title: 'hello',
+    uid: 'dash-1',
+    body: new SceneGridLayout({
+      children: [
+        new SceneGridItem({
+          key: 'griditem-1',
+          x: 0,
+          body: new VizPanel({
+            title: 'Panel A',
+            key: 'panel-1',
+            pluginId: 'table',
+            $data: new SceneQueryRunner({ key: 'data-query-runner', queries: [{ refId: 'A' }] }),
+          }),
+        }),
+        new SceneGridItem({
+          body: new VizPanel({
+            title: 'Panel B',
+            key: 'panel-2',
+            pluginId: 'table',
+          }),
+        }),
+      ],
+    }),
+  });
+
+  return scene;
+}
diff --git a/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.ts b/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.ts
index 58ccccc5b94eb..67e09082a4bb4 100644
--- a/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.ts
+++ b/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.ts
@@ -1,3 +1,5 @@
+import { Unsubscribable } from 'rxjs';
+
 import { AppEvents } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
 import { SceneObjectUrlSyncHandler, SceneObjectUrlValues } from '@grafana/scenes';
@@ -7,8 +9,11 @@ import { PanelInspectDrawer } from '../inspect/PanelInspectDrawer';
 import { findVizPanelByKey } from '../utils/utils';
 
 import { DashboardScene, DashboardSceneState } from './DashboardScene';
+import { DashboardRepeatsProcessedEvent } from './types';
 
 export class DashboardSceneUrlSync implements SceneObjectUrlSyncHandler {
+  private _eventSub?: Unsubscribable;
+
   constructor(private _scene: DashboardScene) {}
 
   getKeys(): string[] {
@@ -44,6 +49,12 @@ export class DashboardSceneUrlSync implements SceneObjectUrlSyncHandler {
     if (typeof values.viewPanel === 'string') {
       const panel = findVizPanelByKey(this._scene, values.viewPanel);
       if (!panel) {
+        // // If we are trying to view a repeat clone that can't be found it might be that the repeats have not been processed yet
+        if (values.viewPanel.indexOf('clone')) {
+          this._handleViewRepeatClone(values.viewPanel);
+          return;
+        }
+
         appEvents.emit(AppEvents.alertError, ['Panel not found']);
         locationService.partial({ viewPanel: null });
         return;
@@ -58,4 +69,16 @@ export class DashboardSceneUrlSync implements SceneObjectUrlSyncHandler {
       this._scene.setState(update);
     }
   }
+
+  private _handleViewRepeatClone(viewPanel: string) {
+    if (!this._eventSub) {
+      this._eventSub = this._scene.subscribeToEvent(DashboardRepeatsProcessedEvent, () => {
+        const panel = findVizPanelByKey(this._scene, viewPanel);
+        if (panel) {
+          this._eventSub?.unsubscribe();
+          this._scene.setState({ viewPanelKey: viewPanel });
+        }
+      });
+    }
+  }
 }
diff --git a/public/app/features/dashboard-scene/scene/LibraryVizPanel.tsx b/public/app/features/dashboard-scene/scene/LibraryVizPanel.tsx
index b15c8ef78942c..ce09b6269f649 100644
--- a/public/app/features/dashboard-scene/scene/LibraryVizPanel.tsx
+++ b/public/app/features/dashboard-scene/scene/LibraryVizPanel.tsx
@@ -42,7 +42,7 @@ export class LibraryVizPanel extends SceneObjectBase<LibraryVizPanelState> {
       });
     } catch (err) {
       vizPanel.setState({
-        pluginLoadError: 'Unable to load library panel: ' + this.state.uid,
+        _pluginLoadError: 'Unable to load library panel: ' + this.state.uid,
       });
     }
 
diff --git a/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx b/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
index 48e7e46c1f786..2a634c2b5c59d 100644
--- a/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
+++ b/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
@@ -22,6 +22,7 @@ export const NavToolbarActions = React.memo<Props>(({ dashboard }) => {
   if (uid) {
     toolbarActions.push(
       <DashNavButton
+        key="share-dashboard-button"
         tooltip={t('dashboard.toolbar.share', 'Share dashboard')}
         icon="share-alt"
         iconSize="lg"
@@ -33,7 +34,7 @@ export const NavToolbarActions = React.memo<Props>(({ dashboard }) => {
 
     toolbarActions.push(
       <DashNavButton
-        key="button-scenes"
+        key="view-in-old-dashboard-button"
         tooltip={'View as dashboard'}
         icon="apps"
         onClick={() => locationService.push(`/d/${uid}`)}
diff --git a/public/app/features/dashboard-scene/scene/PanelRepeaterGridItem.test.tsx b/public/app/features/dashboard-scene/scene/PanelRepeaterGridItem.test.tsx
index f853691c1bef3..6a58da61b87e8 100644
--- a/public/app/features/dashboard-scene/scene/PanelRepeaterGridItem.test.tsx
+++ b/public/app/features/dashboard-scene/scene/PanelRepeaterGridItem.test.tsx
@@ -108,6 +108,16 @@ describe('PanelRepeaterGridItem', () => {
     // given 5 rows with total height 25 gives new itemHeight of 5
     expect(repeater.state.itemHeight).toBe(5);
   });
+
+  it('When updating variable should update repeats', async () => {
+    const { scene, repeater, variable } = buildScene({ variableQueryTime: 0 });
+
+    activateFullSceneTree(scene);
+
+    variable.changeValueTo(['1', '3'], ['A', 'C']);
+
+    expect(repeater.state.repeatedPanels?.length).toBe(2);
+  });
 });
 
 interface SceneOptions {
@@ -130,27 +140,27 @@ function buildScene(options: SceneOptions) {
     }),
   });
 
+  const variable = new TestVariable({
+    name: 'server',
+    query: 'A.*',
+    value: ALL_VARIABLE_VALUE,
+    text: ALL_VARIABLE_TEXT,
+    isMulti: true,
+    includeAll: true,
+    delayMs: options.variableQueryTime,
+    optionsToReturn: [
+      { label: 'A', value: '1' },
+      { label: 'B', value: '2' },
+      { label: 'C', value: '3' },
+      { label: 'D', value: '4' },
+      { label: 'E', value: '5' },
+    ],
+  });
+
   const scene = new EmbeddedScene({
     $timeRange: new SceneTimeRange({ from: 'now-6h', to: 'now' }),
     $variables: new SceneVariableSet({
-      variables: [
-        new TestVariable({
-          name: 'server',
-          query: 'A.*',
-          value: ALL_VARIABLE_VALUE,
-          text: ALL_VARIABLE_TEXT,
-          isMulti: true,
-          includeAll: true,
-          delayMs: options.variableQueryTime,
-          optionsToReturn: [
-            { label: 'A', value: '1' },
-            { label: 'B', value: '2' },
-            { label: 'C', value: '3' },
-            { label: 'D', value: '4' },
-            { label: 'E', value: '5' },
-          ],
-        }),
-      ],
+      variables: [variable],
     }),
     body: new SceneGridLayout({
       children: [
@@ -161,5 +171,5 @@ function buildScene(options: SceneOptions) {
     }),
   });
 
-  return { scene, repeater };
+  return { scene, repeater, variable };
 }
diff --git a/public/app/features/dashboard-scene/scene/PanelRepeaterGridItem.tsx b/public/app/features/dashboard-scene/scene/PanelRepeaterGridItem.tsx
index a1a6044e22a2f..ed553c1433803 100644
--- a/public/app/features/dashboard-scene/scene/PanelRepeaterGridItem.tsx
+++ b/public/app/features/dashboard-scene/scene/PanelRepeaterGridItem.tsx
@@ -20,6 +20,8 @@ import { GRID_CELL_HEIGHT, GRID_CELL_VMARGIN } from 'app/core/constants';
 
 import { getMultiVariableValues } from '../utils/utils';
 
+import { DashboardRepeatsProcessedEvent } from './types';
+
 interface PanelRepeaterGridItemState extends SceneGridItemStateLike {
   source: VizPanel;
   repeatedPanels?: VizPanel[];
@@ -146,6 +148,9 @@ export class PanelRepeaterGridItem extends SceneObjectBase<PanelRepeaterGridItem
         layout.forceRender();
       }
     }
+
+    // Used from dashboard url sync
+    this.publishEvent(new DashboardRepeatsProcessedEvent({ source: this }), true);
   }
 
   private getMaxPerRow(): number {
diff --git a/public/app/features/dashboard-scene/scene/RowRepeaterBehavior.ts b/public/app/features/dashboard-scene/scene/RowRepeaterBehavior.ts
index 4e34cd8923b1b..70ada7a69cce8 100644
--- a/public/app/features/dashboard-scene/scene/RowRepeaterBehavior.ts
+++ b/public/app/features/dashboard-scene/scene/RowRepeaterBehavior.ts
@@ -15,6 +15,8 @@ import {
 
 import { getMultiVariableValues } from '../utils/utils';
 
+import { DashboardRepeatsProcessedEvent } from './types';
+
 interface RowRepeaterBehaviorState extends SceneObjectState {
   variableName: string;
   sources: SceneGridItemLike[];
@@ -120,6 +122,9 @@ export class RowRepeaterBehavior extends SceneObjectBase<RowRepeaterBehaviorStat
     }
 
     updateLayout(layout, rows, maxYOfRows, rowToRepeat);
+
+    // Used from dashboard url sync
+    this.publishEvent(new DashboardRepeatsProcessedEvent({ source: this }), true);
   }
 
   getRowClone(
diff --git a/public/app/features/dashboard-scene/scene/setDashboardPanelContext.test.ts b/public/app/features/dashboard-scene/scene/setDashboardPanelContext.test.ts
new file mode 100644
index 0000000000000..149dce0d11958
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/setDashboardPanelContext.test.ts
@@ -0,0 +1,238 @@
+import { EventBusSrv } from '@grafana/data';
+import { BackendSrv, setBackendSrv } from '@grafana/runtime';
+import { PanelContext } from '@grafana/ui';
+
+import { transformSaveModelToScene } from '../serialization/transformSaveModelToScene';
+import { findVizPanelByKey } from '../utils/utils';
+
+import { getAdHocFilterSetFor, setDashboardPanelContext } from './setDashboardPanelContext';
+
+const postFn = jest.fn();
+const putFn = jest.fn();
+const deleteFn = jest.fn();
+
+setBackendSrv({
+  post: postFn,
+  put: putFn,
+  delete: deleteFn,
+} as any as BackendSrv);
+
+describe('setDashboardPanelContext', () => {
+  describe('canAddAnnotations', () => {
+    it('Can add when builtIn is enabled and permissions allow', () => {
+      const { context } = buildTestScene({ builtInAnnotationsEnabled: true, dashboardCanEdit: true, canAdd: true });
+      expect(context.canAddAnnotations!()).toBe(true);
+    });
+
+    it('Can not when builtIn is disabled', () => {
+      const { context } = buildTestScene({ builtInAnnotationsEnabled: false, dashboardCanEdit: true, canAdd: true });
+      expect(context.canAddAnnotations!()).toBe(false);
+    });
+
+    it('Can not when permission do not allow', () => {
+      const { context } = buildTestScene({ builtInAnnotationsEnabled: true, dashboardCanEdit: true, canAdd: false });
+      expect(context.canAddAnnotations!()).toBe(false);
+    });
+  });
+
+  describe('canEditAnnotations', () => {
+    it('Can edit global event when user has org permission', () => {
+      const { context } = buildTestScene({ dashboardCanEdit: true, orgCanEdit: true });
+      expect(context.canEditAnnotations!()).toBe(true);
+    });
+
+    it('Can not edit global event when has no org permission', () => {
+      const { context } = buildTestScene({ dashboardCanEdit: true, orgCanEdit: false });
+      expect(context.canEditAnnotations!()).toBe(false);
+    });
+
+    it('Can edit dashboard event when has dashboard permission', () => {
+      const { context } = buildTestScene({ dashboardCanEdit: true, canEdit: true });
+      expect(context.canEditAnnotations!('dash-uid')).toBe(true);
+    });
+
+    it('Can not edit dashboard event when has no dashboard permission', () => {
+      const { context } = buildTestScene({ dashboardCanEdit: true, canEdit: false });
+      expect(context.canEditAnnotations!('dash-uid')).toBe(false);
+    });
+  });
+
+  describe('canDeleteAnnotations', () => {
+    it('Can delete global event when user has org permission', () => {
+      const { context } = buildTestScene({ dashboardCanEdit: true, canDelete: true });
+      expect(context.canDeleteAnnotations!()).toBe(true);
+    });
+
+    it('Can not delete global event when has no org permission', () => {
+      const { context } = buildTestScene({ dashboardCanEdit: true, canDelete: false });
+      expect(context.canDeleteAnnotations!()).toBe(false);
+    });
+
+    it('Can delete dashboard event when has dashboard permission', () => {
+      const { context } = buildTestScene({ dashboardCanEdit: true, canDelete: true });
+      expect(context.canDeleteAnnotations!('dash-uid')).toBe(true);
+    });
+
+    it('Can not delete dashboard event when has no dashboard permission', () => {
+      const { context } = buildTestScene({ dashboardCanEdit: true, canDelete: false });
+      expect(context.canDeleteAnnotations!('dash-uid')).toBe(false);
+    });
+  });
+
+  describe('onAnnotationCreate', () => {
+    it('should create annotation', () => {
+      const { context } = buildTestScene({ dashboardCanEdit: true, canAdd: true });
+
+      context.onAnnotationCreate!({ from: 100, to: 200, description: 'save it', tags: [] });
+
+      expect(postFn).toHaveBeenCalledWith('/api/annotations', {
+        dashboardUID: 'dash-1',
+        isRegion: true,
+        panelId: 4,
+        tags: [],
+        text: 'save it',
+        time: 100,
+        timeEnd: 200,
+      });
+    });
+  });
+
+  describe('onAnnotationUpdate', () => {
+    it('should update annotation', () => {
+      const { context } = buildTestScene({ dashboardCanEdit: true, canAdd: true });
+
+      context.onAnnotationUpdate!({ from: 100, to: 200, id: 'event-id-123', description: 'updated', tags: [] });
+
+      expect(putFn).toHaveBeenCalledWith('/api/annotations/event-id-123', {
+        id: 'event-id-123',
+        dashboardUID: 'dash-1',
+        isRegion: true,
+        panelId: 4,
+        tags: [],
+        text: 'updated',
+        time: 100,
+        timeEnd: 200,
+      });
+    });
+  });
+
+  describe('onAnnotationDelete', () => {
+    it('should update annotation', () => {
+      const { context } = buildTestScene({ dashboardCanEdit: true, canAdd: true });
+
+      context.onAnnotationDelete!('I-do-not-want-you');
+
+      expect(deleteFn).toHaveBeenCalledWith('/api/annotations/I-do-not-want-you');
+    });
+  });
+
+  describe('onAddAdHocFilter', () => {
+    it('Should add new filter set', () => {
+      const { scene, context } = buildTestScene({});
+
+      context.onAddAdHocFilter!({ key: 'hello', value: 'world', operator: '=' });
+
+      const set = getAdHocFilterSetFor(scene, { uid: 'my-ds-uid' });
+
+      expect(set.state.filters).toEqual([{ key: 'hello', value: 'world', operator: '=' }]);
+    });
+
+    it('Should update and add filter to existing set', () => {
+      const { scene, context } = buildTestScene({ existingFilterSet: true });
+
+      const set = getAdHocFilterSetFor(scene, { uid: 'my-ds-uid' });
+
+      set.setState({ filters: [{ key: 'existing', value: 'world', operator: '=' }] });
+
+      context.onAddAdHocFilter!({ key: 'hello', value: 'world', operator: '=' });
+
+      expect(set.state.filters.length).toBe(2);
+
+      // Can update existing filter value without adding a new filter
+      context.onAddAdHocFilter!({ key: 'hello', value: 'world2', operator: '=' });
+      // Verify existing filter value updated
+      expect(set.state.filters[1].value).toBe('world2');
+    });
+  });
+});
+
+interface SceneOptions {
+  builtInAnnotationsEnabled?: boolean;
+  dashboardCanEdit?: boolean;
+  canAdd?: boolean;
+  canEdit?: boolean;
+  canDelete?: boolean;
+  orgCanEdit?: boolean;
+  existingFilterSet?: boolean;
+}
+
+function buildTestScene(options: SceneOptions) {
+  const scene = transformSaveModelToScene({
+    dashboard: {
+      title: 'hello',
+      uid: 'dash-1',
+      schemaVersion: 38,
+      annotations: {
+        list: [
+          {
+            builtIn: 1,
+            datasource: {
+              type: 'grafana',
+              uid: '-- Grafana --',
+            },
+            enable: options.builtInAnnotationsEnabled ?? false,
+            hide: true,
+            iconColor: 'rgba(0, 211, 255, 1)',
+            name: 'Annotations & Alerts',
+            target: { refId: 'A' },
+            type: 'dashboard',
+          },
+        ],
+      },
+      panels: [
+        {
+          type: 'timeseries',
+          id: 4,
+          datasource: { uid: 'my-ds-uid', type: 'prometheus' },
+          targets: [],
+        },
+      ],
+      templating: {
+        list: options.existingFilterSet
+          ? [
+              {
+                type: 'adhoc',
+                name: 'Filters',
+                datasource: { uid: 'my-ds-uid' },
+              },
+            ]
+          : [],
+      },
+    },
+    meta: {
+      canEdit: options.dashboardCanEdit,
+      annotationsPermissions: {
+        dashboard: {
+          canAdd: options.canAdd ?? false,
+          canEdit: options.canEdit ?? false,
+          canDelete: options.canDelete ?? false,
+        },
+        organization: {
+          canAdd: false,
+          canEdit: options.orgCanEdit ?? false,
+          canDelete: options.canDelete ?? false,
+        },
+      },
+    },
+  });
+
+  const vizPanel = findVizPanelByKey(scene, 'panel-4')!;
+  const context: PanelContext = {
+    eventBus: new EventBusSrv(),
+    eventsScope: 'global',
+  };
+
+  setDashboardPanelContext(vizPanel, context);
+
+  return { scene, vizPanel, context };
+}
diff --git a/public/app/features/dashboard-scene/scene/setDashboardPanelContext.ts b/public/app/features/dashboard-scene/scene/setDashboardPanelContext.ts
new file mode 100644
index 0000000000000..5689ee6c4e889
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/setDashboardPanelContext.ts
@@ -0,0 +1,188 @@
+import { AnnotationChangeEvent, AnnotationEventUIModel, CoreApp, DataFrame } from '@grafana/data';
+import { AdHocFilterSet, dataLayers, SceneDataLayers, VizPanel } from '@grafana/scenes';
+import { DataSourceRef } from '@grafana/schema';
+import { AdHocFilterItem, PanelContext } from '@grafana/ui';
+import { deleteAnnotation, saveAnnotation, updateAnnotation } from 'app/features/annotations/api';
+
+import { getDashboardSceneFor, getPanelIdForVizPanel, getQueryRunnerFor } from '../utils/utils';
+
+import { DashboardScene } from './DashboardScene';
+
+export function setDashboardPanelContext(vizPanel: VizPanel, context: PanelContext) {
+  context.app = CoreApp.Dashboard;
+
+  context.canAddAnnotations = () => {
+    const dashboard = getDashboardSceneFor(vizPanel);
+    const builtInLayer = getBuiltInAnnotationsLayer(dashboard);
+
+    // When there is no builtin annotations query we disable the ability to add annotations
+    if (!builtInLayer || !dashboard.canEditDashboard()) {
+      return false;
+    }
+
+    // If RBAC is enabled there are additional conditions to check.
+    return Boolean(dashboard.state.meta.annotationsPermissions?.dashboard.canAdd);
+  };
+
+  context.canEditAnnotations = (dashboardUID?: string) => {
+    const dashboard = getDashboardSceneFor(vizPanel);
+
+    if (!dashboard.canEditDashboard()) {
+      return false;
+    }
+
+    if (dashboardUID) {
+      return Boolean(dashboard.state.meta.annotationsPermissions?.dashboard.canEdit);
+    }
+
+    return Boolean(dashboard.state.meta.annotationsPermissions?.organization.canEdit);
+  };
+
+  context.canDeleteAnnotations = (dashboardUID?: string) => {
+    const dashboard = getDashboardSceneFor(vizPanel);
+
+    if (!dashboard.canEditDashboard()) {
+      return false;
+    }
+
+    if (dashboardUID) {
+      return Boolean(dashboard.state.meta.annotationsPermissions?.dashboard.canDelete);
+    }
+
+    return Boolean(dashboard.state.meta.annotationsPermissions?.organization.canDelete);
+  };
+
+  context.onAnnotationCreate = async (event: AnnotationEventUIModel) => {
+    const dashboard = getDashboardSceneFor(vizPanel);
+
+    const isRegion = event.from !== event.to;
+    const anno = {
+      dashboardUID: dashboard.state.uid,
+      panelId: getPanelIdForVizPanel(vizPanel),
+      isRegion,
+      time: event.from,
+      timeEnd: isRegion ? event.to : 0,
+      tags: event.tags,
+      text: event.description,
+    };
+
+    await saveAnnotation(anno);
+
+    reRunBuiltInAnnotationsLayer(dashboard);
+
+    context.eventBus.publish(new AnnotationChangeEvent(anno));
+  };
+
+  context.onAnnotationUpdate = async (event: AnnotationEventUIModel) => {
+    const dashboard = getDashboardSceneFor(vizPanel);
+
+    const isRegion = event.from !== event.to;
+    const anno = {
+      id: event.id,
+      dashboardUID: dashboard.state.uid,
+      panelId: getPanelIdForVizPanel(vizPanel),
+      isRegion,
+      time: event.from,
+      timeEnd: isRegion ? event.to : 0,
+      tags: event.tags,
+      text: event.description,
+    };
+
+    await updateAnnotation(anno);
+
+    reRunBuiltInAnnotationsLayer(dashboard);
+
+    context.eventBus.publish(new AnnotationChangeEvent(anno));
+  };
+
+  context.onAnnotationDelete = async (id: string) => {
+    await deleteAnnotation({ id });
+
+    reRunBuiltInAnnotationsLayer(getDashboardSceneFor(vizPanel));
+
+    context.eventBus.publish(new AnnotationChangeEvent({ id }));
+  };
+
+  context.onAddAdHocFilter = (newFilter: AdHocFilterItem) => {
+    const dashboard = getDashboardSceneFor(vizPanel);
+
+    const queryRunner = getQueryRunnerFor(vizPanel);
+    if (!queryRunner) {
+      return;
+    }
+
+    const filterSet = getAdHocFilterSetFor(dashboard, queryRunner.state.datasource);
+    updateAdHocFilterSet(filterSet, newFilter);
+  };
+
+  context.onUpdateData = (frames: DataFrame[]): Promise<boolean> => {
+    // TODO
+    //return onUpdatePanelSnapshotData(this.props.panel, frames);
+    return Promise.resolve(true);
+  };
+}
+
+function getBuiltInAnnotationsLayer(scene: DashboardScene): dataLayers.AnnotationsDataLayer | undefined {
+  // When there is no builtin annotations query we disable the ability to add annotations
+  if (scene.state.$data instanceof SceneDataLayers) {
+    for (const layer of scene.state.$data.state.layers) {
+      if (layer instanceof dataLayers.AnnotationsDataLayer) {
+        if (layer.state.isEnabled && layer.state.query.builtIn) {
+          return layer;
+        }
+      }
+    }
+  }
+
+  return undefined;
+}
+
+function reRunBuiltInAnnotationsLayer(scene: DashboardScene) {
+  const layer = getBuiltInAnnotationsLayer(scene);
+  if (layer) {
+    layer.runLayer();
+  }
+}
+
+export function getAdHocFilterSetFor(scene: DashboardScene, ds: DataSourceRef | null | undefined) {
+  const controls = scene.state.controls ?? [];
+
+  for (const control of controls) {
+    if (control instanceof AdHocFilterSet) {
+      if (control.state.datasource === ds || control.state.datasource?.uid === ds?.uid) {
+        return control;
+      }
+    }
+  }
+
+  const newSet = new AdHocFilterSet({ datasource: ds });
+
+  // Add it to the scene
+  scene.setState({
+    controls: [controls[0], newSet, ...controls.slice(1)],
+  });
+
+  return newSet;
+}
+
+function updateAdHocFilterSet(filterSet: AdHocFilterSet, newFilter: AdHocFilterItem) {
+  // Check if we need to update an existing filter
+  for (const filter of filterSet.state.filters) {
+    if (filter.key === newFilter.key) {
+      filterSet.setState({
+        filters: filterSet.state.filters.map((f) => {
+          if (f.key === newFilter.key) {
+            return newFilter;
+          }
+          return f;
+        }),
+      });
+      return;
+    }
+  }
+
+  // Add new filter
+  filterSet.setState({
+    filters: [...filterSet.state.filters, newFilter],
+  });
+}
diff --git a/public/app/features/dashboard-scene/scene/types.ts b/public/app/features/dashboard-scene/scene/types.ts
new file mode 100644
index 0000000000000..9bf602cc1711a
--- /dev/null
+++ b/public/app/features/dashboard-scene/scene/types.ts
@@ -0,0 +1,10 @@
+import { BusEventWithPayload } from '@grafana/data';
+import { SceneObject } from '@grafana/scenes';
+
+export interface DashboardRepeatsProcessedEventPayload {
+  source: SceneObject;
+}
+
+export class DashboardRepeatsProcessedEvent extends BusEventWithPayload<DashboardRepeatsProcessedEventPayload> {
+  public static type = 'dashboard-repeats-processed';
+}
diff --git a/public/app/features/dashboard-scene/serialization/__snapshots__/transformSceneToSaveModel.test.ts.snap b/public/app/features/dashboard-scene/serialization/__snapshots__/transformSceneToSaveModel.test.ts.snap
index 3e9a5012a51cb..022e3016f8955 100644
--- a/public/app/features/dashboard-scene/serialization/__snapshots__/transformSceneToSaveModel.test.ts.snap
+++ b/public/app/features/dashboard-scene/serialization/__snapshots__/transformSceneToSaveModel.test.ts.snap
@@ -62,7 +62,7 @@ exports[`transformSceneToSaveModel Annotations should transform annotations to s
 ]
 `;
 
-exports[`transformSceneToSaveModel Given a scene with rows Should transform back to peristed model 1`] = `
+exports[`transformSceneToSaveModel Given a scene with rows Should transform back to persisted model 1`] = `
 {
   "annotations": {
     "list": [
@@ -242,7 +242,7 @@ exports[`transformSceneToSaveModel Given a scene with rows Should transform back
 }
 `;
 
-exports[`transformSceneToSaveModel Given a simple scene Should transform back to peristed model 1`] = `
+exports[`transformSceneToSaveModel Given a simple scene with variables Should transform back to persisted model 1`] = `
 {
   "annotations": {
     "list": [
@@ -308,6 +308,7 @@ exports[`transformSceneToSaveModel Given a simple scene Should transform back to
   "editable": true,
   "fiscalYearStartMonth": 1,
   "graphTooltip": 0,
+  "id": 1351,
   "links": [],
   "panels": [
     {
@@ -447,6 +448,76 @@ exports[`transformSceneToSaveModel Given a simple scene Should transform back to
   "tags": [],
   "templating": {
     "list": [
+      {
+        "auto": true,
+        "auto_count": 30,
+        "auto_min": "10s",
+        "current": {
+          "text": "1m",
+          "value": "1m",
+        },
+        "hide": 2,
+        "name": "intervalVar",
+        "query": "1m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
+        "refresh": 2,
+        "type": "interval",
+      },
+      {
+        "current": {
+          "text": [
+            "a",
+          ],
+          "value": [
+            "a",
+          ],
+        },
+        "includeAll": true,
+        "multi": true,
+        "name": "customVar",
+        "options": [],
+        "query": "a, b, c",
+        "type": "custom",
+      },
+      {
+        "current": {
+          "text": "gdev-testdata",
+          "value": "PD8C576611E62080A",
+        },
+        "includeAll": false,
+        "name": "dsVar",
+        "options": [],
+        "query": "grafana-testdata-datasource",
+        "refresh": 1,
+        "regex": "",
+        "type": "datasource",
+      },
+      {
+        "current": {
+          "text": "A",
+          "value": "A",
+        },
+        "includeAll": false,
+        "name": "query0",
+        "options": [],
+        "query": {
+          "query": "*",
+          "refId": "StandardVariableQuery",
+        },
+        "refresh": 1,
+        "regex": "",
+        "type": "query",
+      },
+      {
+        "current": {
+          "text": "test",
+          "value": "test",
+        },
+        "hide": 2,
+        "name": "constant",
+        "query": "test",
+        "skipUrlSync": true,
+        "type": "constant",
+      },
       {
         "datasource": {
           "type": "prometheus",
diff --git a/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts b/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts
index 17e69a1ac4b54..5063c6fd5945b 100644
--- a/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts
+++ b/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts
@@ -1,6 +1,15 @@
-import { SceneVariableSet, QueryVariable, CustomVariable, DataSourceVariable, ConstantVariable } from '@grafana/scenes';
+import {
+  SceneVariableSet,
+  QueryVariable,
+  CustomVariable,
+  DataSourceVariable,
+  ConstantVariable,
+  IntervalVariable,
+} from '@grafana/scenes';
 import { VariableModel, VariableHide, VariableRefresh, VariableSort } from '@grafana/schema';
 
+import { getIntervalsQueryFromNewIntervalModel } from '../utils/utils';
+
 export function sceneVariablesSetToVariables(set: SceneVariableSet) {
   const variables: VariableModel[] = [];
   for (const variable of set.state.variables) {
@@ -78,6 +87,22 @@ export function sceneVariablesSetToVariables(set: SceneVariableSet) {
         query: variable.state.value,
         hide: VariableHide.hideVariable,
       });
+    } else if (variable instanceof IntervalVariable) {
+      const intervals = getIntervalsQueryFromNewIntervalModel(variable.state.intervals);
+      variables.push({
+        ...commonProperties,
+        current: {
+          text: variable.state.value,
+          value: variable.state.value,
+        },
+        query: intervals,
+        hide: VariableHide.hideVariable,
+        refresh: variable.state.refresh,
+        // @ts-expect-error ?? how to fix this without adding the ts-expect-error
+        auto: variable.state.autoEnabled,
+        auto_min: variable.state.autoMinInterval,
+        auto_count: variable.state.autoStepCount,
+      });
     } else {
       throw new Error('Unsupported variable type');
     }
diff --git a/public/app/features/dashboard-scene/serialization/testfiles/dashboard_to_load1.json b/public/app/features/dashboard-scene/serialization/testfiles/dashboard_to_load1.json
index f5e7476efda4c..2032a958cfd4a 100644
--- a/public/app/features/dashboard-scene/serialization/testfiles/dashboard_to_load1.json
+++ b/public/app/features/dashboard-scene/serialization/testfiles/dashboard_to_load1.json
@@ -202,6 +202,105 @@
         "name": "Filters",
         "skipUrlSync": false,
         "type": "adhoc"
+      },
+      {
+        "auto": true,
+        "auto_count": 30,
+        "auto_min": "10s",
+        "current": {
+          "selected": false,
+          "text": "1m",
+          "value": "1m"
+        },
+        "hide": 0,
+        "name": "intervalVar",
+        "query": "1m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
+        "queryValue": "",
+        "refresh": 2,
+        "skipUrlSync": false,
+        "type": "interval"
+      },
+      {
+        "current": {
+          "selected": true,
+          "text": ["a"],
+          "value": ["a"]
+        },
+        "hide": 0,
+        "includeAll": true,
+        "multi": true,
+        "name": "customVar",
+        "options": [
+          {
+            "selected": false,
+            "text": "All",
+            "value": "$__all"
+          },
+          {
+            "selected": true,
+            "text": "a",
+            "value": "a"
+          },
+          {
+            "selected": false,
+            "text": "b",
+            "value": "b"
+          },
+          {
+            "selected": false,
+            "text": "c",
+            "value": "c"
+          }
+        ],
+        "query": "a, b, c",
+        "skipUrlSync": false,
+        "type": "custom"
+      },
+      {
+        "current": {
+          "selected": false,
+          "text": "gdev-testdata",
+          "value": "PD8C576611E62080A"
+        },
+        "hide": 0,
+        "includeAll": false,
+        "multi": false,
+        "name": "dsVar",
+        "options": [],
+        "query": "grafana-testdata-datasource",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
+      {
+        "current": {
+          "selected": false,
+          "text": "A",
+          "value": "A"
+        },
+        "definition": "*",
+        "hide": 0,
+        "includeAll": false,
+        "multi": false,
+        "name": "query0",
+        "options": [],
+        "query": {
+          "query": "*",
+          "refId": "StandardVariableQuery"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "hide": 2,
+        "name": "constant",
+        "query": "test",
+        "skipUrlSync": false,
+        "type": "constant"
       }
     ]
   },
diff --git a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts
index 21470a4c2f7d8..7660265d0e464 100644
--- a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts
@@ -91,8 +91,8 @@ describe('transformSaveModelToScene', () => {
       expect(scene.state?.$timeRange?.state.weekStart).toEqual('saturday');
       expect(scene.state?.$variables?.state.variables).toHaveLength(1);
       expect(scene.state.controls).toBeDefined();
-      expect(scene.state.controls![2]).toBeInstanceOf(AdHocFilterSet);
-      expect((scene.state.controls![2] as AdHocFilterSet).state.name).toBe('CoolFilters');
+      expect(scene.state.controls![1]).toBeInstanceOf(AdHocFilterSet);
+      expect((scene.state.controls![1] as AdHocFilterSet).state.name).toBe('CoolFilters');
     });
 
     it('should apply cursor sync behavior', () => {
@@ -637,7 +637,56 @@ describe('transformSaveModelToScene', () => {
       });
     });
 
-    it.each(['interval', 'textbox', 'system'])('should throw for unsupported (yet) variables', (type) => {
+    it('should migrate interval variable', () => {
+      const variable = {
+        name: 'intervalVar',
+        label: 'Interval Label',
+        type: 'interval' as VariableType,
+        rootStateKey: 'N4XLmH5Vz',
+        auto: false,
+        refresh: 2,
+        auto_count: 30,
+        auto_min: '10s',
+        current: {
+          selected: true,
+          text: '1m',
+          value: '1m',
+        },
+        options: [
+          {
+            selected: true,
+            text: '1m',
+            value: '1m',
+          },
+        ],
+        query: '1m, 5m, 15m, 30m, 1h, 6h, 12h, 1d, 7d, 14d, 30d',
+        id: 'intervalVar',
+        global: false,
+        index: 4,
+        hide: 0,
+        skipUrlSync: false,
+        state: 'Done',
+        error: null,
+        description: null,
+      };
+      const migrated = createSceneVariableFromVariableModel(variable);
+      const { key, ...rest } = migrated.state;
+      expect(rest).toEqual({
+        label: 'Interval Label',
+        autoEnabled: false,
+        autoMinInterval: '10s',
+        autoStepCount: 30,
+        description: null,
+        refresh: 2,
+        intervals: ['1m', '5m', '15m', '30m', '1h', '6h', '12h', '1d', '7d', '14d', '30d'],
+        hide: 0,
+        name: 'intervalVar',
+        skipUrlSync: false,
+        type: 'interval',
+        value: '1m',
+      });
+    });
+    it.each(['textbox', 'system'])('should throw for unsupported (yet) variables', (type) => {
       const variable = {
         name: 'query0',
         type: type as VariableType,
@@ -668,7 +717,7 @@ describe('transformSaveModelToScene', () => {
       const scene = transformSaveModelToScene({ dashboard: dashboard_to_load1 as any, meta: {} });
 
       expect(scene.state.$data).toBeInstanceOf(SceneDataLayers);
-      expect(scene.state.controls![0]).toBeInstanceOf(SceneDataLayerControls);
+      expect(scene.state.controls![2]).toBeInstanceOf(SceneDataLayerControls);
 
       const dataLayers = scene.state.$data as SceneDataLayers;
       expect(dataLayers.state.layers).toHaveLength(4);
diff --git a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts
index feb796f7b89d2..825342252c00e 100644
--- a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts
@@ -3,6 +3,7 @@ import {
   ConstantVariableModel,
   CustomVariableModel,
   DataSourceVariableModel,
+  IntervalVariableModel,
   QueryVariableModel,
   VariableModel,
 } from '@grafana/data';
@@ -19,6 +20,7 @@ import {
   DataSourceVariable,
   QueryVariable,
   ConstantVariable,
+  IntervalVariable,
   SceneRefreshPicker,
   SceneGridItem,
   SceneObject,
@@ -32,7 +34,6 @@ import {
   SceneDataLayerControls,
   AdHocFilterSet,
 } from '@grafana/scenes';
-import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
 import { DashboardDTO } from 'app/types';
 
@@ -43,8 +44,13 @@ import { panelMenuBehavior } from '../scene/PanelMenuBehavior';
 import { PanelRepeaterGridItem } from '../scene/PanelRepeaterGridItem';
 import { PanelTimeRange } from '../scene/PanelTimeRange';
 import { RowRepeaterBehavior } from '../scene/RowRepeaterBehavior';
+import { setDashboardPanelContext } from '../scene/setDashboardPanelContext';
 import { createPanelDataProvider } from '../utils/createPanelDataProvider';
-import { getVizPanelKeyForPanelId } from '../utils/utils';
+import {
+  getCurrentValueForOldIntervalModel,
+  getIntervalsFromOldIntervalModel,
+  getVizPanelKeyForPanelId,
+} from '../utils/utils';
 
 import { getAngularPanelMigrationHandler } from './angularMigration';
 
@@ -60,9 +66,6 @@ export function transformSaveModelToScene(rsp: DashboardDTO): DashboardScene {
     autoMigrateOldPanels: false,
   });
 
-  // Setting for built-in annotations query to run
-  getDashboardSrv().setCurrent(oldModel);
-
   return createDashboardSceneFromDashboardModel(oldModel);
 }
 
@@ -200,9 +203,9 @@ export function createDashboardSceneFromDashboardModel(oldModel: DashboardModel)
   }
 
   const controls: SceneObject[] = [
-    new SceneDataLayerControls(),
     new VariableValueSelectors({}),
     ...filtersSets,
+    new SceneDataLayerControls(),
     new SceneControlsSpacer(),
     new SceneTimePicker({}),
     new SceneRefreshPicker({
@@ -214,6 +217,7 @@ export function createDashboardSceneFromDashboardModel(oldModel: DashboardModel)
   return new DashboardScene({
     title: oldModel.title,
     uid: oldModel.uid,
+    id: oldModel.id,
     meta: oldModel.meta,
     body: new SceneGridLayout({
       isLazy: true,
@@ -294,6 +298,21 @@ export function createSceneVariableFromVariableModel(variable: VariableModel): S
       isMulti: variable.multi,
       hide: variable.hide,
     });
+  } else if (isIntervalVariable(variable)) {
+    const intervals = getIntervalsFromOldIntervalModel(variable);
+    const currentInterval = getCurrentValueForOldIntervalModel(variable, intervals);
+    return new IntervalVariable({
+      ...commonProperties,
+      value: currentInterval,
+      description: variable.description,
+      intervals: intervals,
+      autoEnabled: variable.auto,
+      autoStepCount: variable.auto_count,
+      autoMinInterval: variable.auto_min,
+      refresh: variable.refresh,
+      skipUrlSync: variable.skipUrlSync,
+      hide: variable.hide,
+    });
   } else if (isConstantVariable(variable)) {
     return new ConstantVariable({
       ...commonProperties,
@@ -325,6 +344,7 @@ export function buildGridItemForLibPanel(panel: PanelModel) {
     height: panel.gridPos.h,
   });
 }
+
 export function buildGridItemForPanel(panel: PanelModel): SceneGridItemLike {
   const vizPanelState: VizPanelState = {
     key: getVizPanelKeyForPanelId(panel.id),
@@ -340,6 +360,7 @@ export function buildGridItemForPanel(panel: PanelModel): SceneGridItemLike {
     menu: new VizPanelMenu({
       $behaviors: [panelMenuBehavior],
     }),
+    extendPanelContext: setDashboardPanelContext,
     _UNSAFE_customMigrationHandler: getAngularPanelMigrationHandler(panel),
   };
 
@@ -383,4 +404,5 @@ const isCustomVariable = (v: VariableModel): v is CustomVariableModel => v.type
 const isQueryVariable = (v: VariableModel): v is QueryVariableModel => v.type === 'query';
 const isDataSourceVariable = (v: VariableModel): v is DataSourceVariableModel => v.type === 'datasource';
 const isConstantVariable = (v: VariableModel): v is ConstantVariableModel => v.type === 'constant';
+const isIntervalVariable = (v: VariableModel): v is IntervalVariableModel => v.type === 'interval';
 const isAdhocVariable = (v: VariableModel): v is AdHocVariableModel => v.type === 'adhoc';
diff --git a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts
index 04163e6fbcbcb..5328a8a30d296 100644
--- a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts
@@ -138,8 +138,8 @@ jest.mock('@grafana/runtime', () => ({
   },
 }));
 describe('transformSceneToSaveModel', () => {
-  describe('Given a simple scene', () => {
-    it('Should transform back to peristed model', () => {
+  describe('Given a simple scene with variables', () => {
+    it('Should transform back to persisted model', () => {
       const scene = transformSaveModelToScene({ dashboard: dashboard_to_load1 as any, meta: {} });
       const saveModel = transformSceneToSaveModel(scene);
 
@@ -148,7 +148,7 @@ describe('transformSceneToSaveModel', () => {
   });
 
   describe('Given a scene with rows', () => {
-    it('Should transform back to peristed model', () => {
+    it('Should transform back to persisted model', () => {
       const scene = transformSaveModelToScene({ dashboard: repeatingRowsAndPanelsDashboardJson as any, meta: {} });
       const saveModel = transformSceneToSaveModel(scene);
       const row2: RowPanel = saveModel.panels![2] as RowPanel;
diff --git a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.ts b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.ts
index 795a7a50b67ab..1cbd1a78ac054 100644
--- a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.ts
@@ -92,6 +92,7 @@ export function transformSceneToSaveModel(scene: DashboardScene, isSnapshot = fa
     ...defaultDashboard,
     title: state.title,
     uid: state.uid,
+    id: state.id,
     time: {
       from: timeRange.from,
       to: timeRange.to,
@@ -336,7 +337,6 @@ export function trimDashboardForSnapshot(title: string, time: TimeRange, dash: D
         enable: annotation.enable,
         iconColor: annotation.iconColor,
         type: annotation.type,
-        // @ts-expect-error
         builtIn: annotation.builtIn,
         hide: annotation.hide,
         // TODO: Remove when we migrate snapshots to snapshot queries.
diff --git a/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.test.ts b/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.test.ts
new file mode 100644
index 0000000000000..fa705c8ab7413
--- /dev/null
+++ b/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.test.ts
@@ -0,0 +1,85 @@
+import { TimeRangeUpdatedEvent } from '@grafana/runtime';
+import { behaviors, SceneGridItem, SceneGridLayout, SceneQueryRunner, SceneTimeRange, VizPanel } from '@grafana/scenes';
+import { DashboardCursorSync } from '@grafana/schema';
+
+import { DashboardScene } from '../scene/DashboardScene';
+
+import { DashboardModelCompatibilityWrapper } from './DashboardModelCompatibilityWrapper';
+
+describe('DashboardModelCompatibilityWrapper', () => {
+  it('Provide basic prop and function of compatability', () => {
+    const { wrapper } = setup();
+
+    expect(wrapper.uid).toBe('dash-1');
+    expect(wrapper.title).toBe('hello');
+
+    expect(wrapper.time.from).toBe('now-6h');
+  });
+
+  it('Shared tooltip functions', () => {
+    const { scene, wrapper } = setup();
+    expect(wrapper.sharedTooltipModeEnabled()).toBe(false);
+    expect(wrapper.sharedCrosshairModeOnly()).toBe(false);
+
+    scene.setState({ $behaviors: [new behaviors.CursorSync({ sync: DashboardCursorSync.Crosshair })] });
+
+    expect(wrapper.sharedTooltipModeEnabled()).toBe(true);
+    expect(wrapper.sharedCrosshairModeOnly()).toBe(true);
+  });
+
+  it('Get timezone from time range', () => {
+    const { wrapper } = setup();
+    expect(wrapper.getTimezone()).toBe('America/New_York');
+  });
+
+  it('Should emit TimeRangeUpdatedEvent when time range change', () => {
+    const { scene, wrapper } = setup();
+    let timeChanged = 0;
+    wrapper.events.subscribe(TimeRangeUpdatedEvent, () => timeChanged++);
+
+    scene.state.$timeRange!.onRefresh();
+    expect(timeChanged).toBe(1);
+  });
+
+  it('Can get fake panel with getPanelById', () => {
+    const { wrapper } = setup();
+
+    expect(wrapper.getPanelById(1)!.title).toBe('Panel A');
+    expect(wrapper.getPanelById(2)!.title).toBe('Panel B');
+  });
+});
+
+function setup() {
+  const scene = new DashboardScene({
+    title: 'hello',
+    uid: 'dash-1',
+    $timeRange: new SceneTimeRange({
+      timeZone: 'America/New_York',
+    }),
+    body: new SceneGridLayout({
+      children: [
+        new SceneGridItem({
+          key: 'griditem-1',
+          x: 0,
+          body: new VizPanel({
+            title: 'Panel A',
+            key: 'panel-1',
+            pluginId: 'table',
+            $data: new SceneQueryRunner({ key: 'data-query-runner', queries: [{ refId: 'A' }] }),
+          }),
+        }),
+        new SceneGridItem({
+          body: new VizPanel({
+            title: 'Panel B',
+            key: 'panel-2',
+            pluginId: 'table',
+          }),
+        }),
+      ],
+    }),
+  });
+
+  const wrapper = new DashboardModelCompatibilityWrapper(scene);
+
+  return { scene, wrapper };
+}
diff --git a/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.ts b/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.ts
index 33adcc149e2b4..6cce5418c7877 100644
--- a/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.ts
+++ b/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.ts
@@ -1,17 +1,66 @@
-import { DashboardCursorSync, dateTimeFormat, DateTimeInput, EventBusSrv } from '@grafana/data';
-import { behaviors, sceneGraph } from '@grafana/scenes';
+import { Subscription } from 'rxjs';
+
+import { AnnotationQuery, DashboardCursorSync, dateTimeFormat, DateTimeInput, EventBusSrv } from '@grafana/data';
+import { TimeRangeUpdatedEvent } from '@grafana/runtime';
+import { behaviors, SceneDataTransformer, sceneGraph, VizPanel } from '@grafana/scenes';
 
 import { DashboardScene } from '../scene/DashboardScene';
 
+import { findVizPanelByKey, getVizPanelKeyForPanelId } from './utils';
+
 /**
  * Will move this to make it the main way we remain somewhat compatible with getDashboardSrv().getCurrent
  */
 export class DashboardModelCompatibilityWrapper {
-  events = new EventBusSrv();
-  panelInitialized() {}
+  public events = new EventBusSrv();
+  private _subs = new Subscription();
+
+  public constructor(private _scene: DashboardScene) {
+    const timeRange = sceneGraph.getTimeRange(_scene);
+
+    this._subs.add(
+      timeRange.subscribeToState((state, prev) => {
+        if (state.value !== prev.value) {
+          this.events.publish(new TimeRangeUpdatedEvent(state.value));
+        }
+      })
+    );
+  }
+
+  public get id(): number | null {
+    return this._scene.state.id ?? null;
+  }
+
+  public get uid() {
+    return this._scene.state.uid ?? null;
+  }
+
+  public get title() {
+    return this._scene.state.title;
+  }
+
+  public get meta() {
+    return this._scene.state.meta;
+  }
+
+  public get time() {
+    const time = sceneGraph.getTimeRange(this._scene);
+    return {
+      from: time.state.from,
+      to: time.state.to,
+    };
+  }
+
+  /**
+   * Used from from timeseries migration handler to migrate time regions to dashboard annotations
+   */
+  public get annotations(): { list: AnnotationQuery[] } {
+    console.error('Scenes DashboardModelCompatibilityWrapper.annotations not implemented (yet)');
+    return { list: [] };
+  }
 
   public getTimezone() {
-    const time = sceneGraph.getTimeRange(window.__grafanaSceneContext);
+    const time = sceneGraph.getTimeRange(this._scene);
     return time.getTimeZone();
   }
 
@@ -20,16 +69,14 @@ export class DashboardModelCompatibilityWrapper {
   }
 
   public sharedCrosshairModeOnly() {
-    return this._getSyncMode() > 1;
+    return this._getSyncMode() === 1;
   }
 
   private _getSyncMode() {
-    const dashboard = this.getDashboardScene();
-
-    if (dashboard.state.$behaviors) {
-      for (const behavior of dashboard.state.$behaviors) {
+    if (this._scene.state.$behaviors) {
+      for (const behavior of this._scene.state.$behaviors) {
         if (behavior instanceof behaviors.CursorSync) {
-          return behavior.state.sync > 0;
+          return behavior.state.sync;
         }
       }
     }
@@ -37,14 +84,6 @@ export class DashboardModelCompatibilityWrapper {
     return DashboardCursorSync.Off;
   }
 
-  private getDashboardScene(): DashboardScene {
-    if (window.__grafanaSceneContext instanceof DashboardScene) {
-      return window.__grafanaSceneContext;
-    }
-
-    throw new Error('Dashboard scene not found');
-  }
-
   public otherPanelInFullscreen(panel: unknown) {
     return false;
   }
@@ -55,4 +94,62 @@ export class DashboardModelCompatibilityWrapper {
       timeZone: this.getTimezone(),
     });
   }
+
+  public getPanelById(id: number): PanelCompatibilityWrapper | null {
+    const vizPanel = findVizPanelByKey(this._scene, getVizPanelKeyForPanelId(id));
+    if (vizPanel) {
+      return new PanelCompatibilityWrapper(vizPanel);
+    }
+
+    return null;
+  }
+
+  public removePanel(panel: PanelCompatibilityWrapper) {
+    // TODO
+    console.error('Scenes DashboardModelCompatibilityWrapper.removePanel not implemented (yet)');
+  }
+
+  public canEditAnnotations(dashboardUID?: string) {
+    // TOOD
+    return false;
+  }
+
+  public panelInitialized() {}
+
+  public destroy() {
+    this.events.removeAllListeners();
+    this._subs.unsubscribe();
+  }
+}
+
+class PanelCompatibilityWrapper {
+  constructor(private _vizPanel: VizPanel) {}
+
+  public get type() {
+    return this._vizPanel.state.pluginId;
+  }
+
+  public get title() {
+    return this._vizPanel.state.title;
+  }
+
+  public get transformations() {
+    if (this._vizPanel.state.$data instanceof SceneDataTransformer) {
+      return this._vizPanel.state.$data.state.transformations;
+    }
+
+    return [];
+  }
+
+  public refresh() {
+    console.error('Scenes PanelCompatibilityWrapper.refresh no implemented (yet)');
+  }
+
+  public render() {
+    console.error('Scenes PanelCompatibilityWrapper.render no implemented (yet)');
+  }
+
+  public getQueryRunner() {
+    console.error('Scenes PanelCompatibilityWrapper.getQueryRunner no implemented (yet)');
+  }
 }
diff --git a/public/app/features/dashboard-scene/utils/utils.ts b/public/app/features/dashboard-scene/utils/utils.ts
index 604f7d354b5c0..b28c27c8834ef 100644
--- a/public/app/features/dashboard-scene/utils/utils.ts
+++ b/public/app/features/dashboard-scene/utils/utils.ts
@@ -1,4 +1,4 @@
-import { UrlQueryMap, urlUtil } from '@grafana/data';
+import { IntervalVariableModel, UrlQueryMap, urlUtil } from '@grafana/data';
 import { config, locationSearchToObject } from '@grafana/runtime';
 import {
   MultiValueVariable,
@@ -8,6 +8,7 @@ import {
   SceneQueryRunner,
   VizPanel,
 } from '@grafana/scenes';
+import { initialIntervalVariableModelState } from 'app/features/variables/interval/reducer';
 
 import { DashboardScene } from '../scene/DashboardScene';
 
@@ -150,6 +151,58 @@ export function getMultiVariableValues(variable: MultiValueVariable) {
   };
 }
 
+// Transform old interval model to new interval model from scenes
+export function getIntervalsFromOldIntervalModel(variable: IntervalVariableModel): string[] {
+  // separate intervals by quotes either single or double
+  const matchIntervals = variable.query.match(/(["'])(.*?)\1|\w+/g);
+
+  // If no intervals are found in query, return the initial state of the interval reducer.
+  if (!matchIntervals) {
+    return initialIntervalVariableModelState.query?.split(',') ?? [];
+  }
+  const uniqueIntervals = new Set<string>();
+
+  // when options are defined in variable.query
+  const intervals = matchIntervals.reduce((uniqueIntervals: Set<string>, text: string) => {
+    // Remove surrounding quotes from the interval value.
+    const intervalValue = text.replace(/["']+/g, '');
+
+    // Skip intervals that start with "$__auto_interval_",scenes will handle them.
+    if (intervalValue.startsWith('$__auto_interval_')) {
+      return uniqueIntervals;
+    }
+
+    // Add the interval if it's not already in the Set.
+    uniqueIntervals.add(intervalValue);
+    return uniqueIntervals;
+  }, uniqueIntervals);
+
+  return Array.from(intervals);
+}
+
+// Transform new interval scene model to old interval core model
+export function getIntervalsQueryFromNewIntervalModel(intervals: string[]): string {
+  const variableQuery = Array.isArray(intervals) ? intervals.join(',') : '';
+  return variableQuery;
+}
+
+export function getCurrentValueForOldIntervalModel(variable: IntervalVariableModel, intervals: string[]): string {
+  const selectedInterval = Array.isArray(variable.current.value) ? variable.current.value[0] : variable.current.value;
+
+  // If the interval is the old auto format, return the new auto interval from scenes.
+  if (selectedInterval.startsWith('$__auto_interval_')) {
+    return '$__auto';
+  }
+
+  // Check if the selected interval is valid.
+  if (intervals.includes(selectedInterval)) {
+    return selectedInterval;
+  }
+
+  // If the selected interval is not valid, return the first valid interval.
+  return intervals[0];
+}
+
 export function getQueryRunnerFor(sceneObject: SceneObject | undefined): SceneQueryRunner | undefined {
   if (!sceneObject) {
     return undefined;
diff --git a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
index 9dc25f22ffd73..1e68a587f8e3d 100644
--- a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
+++ b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
@@ -83,7 +83,7 @@ export class DashboardExporter {
     // this is pretty hacky and needs to be changed
     dashboard.cleanUpRepeats();
 
-    const saveModel = dashboard.getSaveModelClone();
+    const saveModel = dashboard.getSaveModelCloneOld();
     saveModel.id = null;
 
     // undo repeat cleanup
diff --git a/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.test.tsx b/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.test.tsx
index 94a437bf93dcd..ce8b511ce6618 100644
--- a/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.test.tsx
+++ b/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.test.tsx
@@ -35,7 +35,7 @@ function getTestContext() {
   const contextSrv = { isSignedIn: true, isEditor: true } as ContextSrv;
   setContextSrv(contextSrv);
   const dash = getDefaultDashboardModel();
-  const original = dash.getSaveModelClone();
+  const original = dash.getSaveModelCloneOld();
 
   return { dash, original, contextSrv };
 }
@@ -98,7 +98,7 @@ describe('DashboardPrompt', () => {
       it('then it should return true', () => {
         const { contextSrv } = getTestContext();
         const dash = createDashboardModelFixture({}, { canSave: false });
-        const original = dash.getSaveModelClone();
+        const original = dash.getSaveModelCloneOld();
         contextSrv.isEditor = false;
         expect(ignoreChanges(dash, original)).toBe(true);
       });
@@ -108,7 +108,7 @@ describe('DashboardPrompt', () => {
       it('then it should return undefined', () => {
         const { contextSrv } = getTestContext();
         const dash = createDashboardModelFixture({}, { canSave: true });
-        const original = dash.getSaveModelClone();
+        const original = dash.getSaveModelCloneOld();
         contextSrv.isEditor = false;
         expect(ignoreChanges(dash, original)).toBe(undefined);
       });
@@ -118,7 +118,7 @@ describe('DashboardPrompt', () => {
       it('then it should return true', () => {
         const { contextSrv } = getTestContext();
         const dash = createDashboardModelFixture({}, { canSave: true });
-        const original = dash.getSaveModelClone();
+        const original = dash.getSaveModelCloneOld();
         contextSrv.isSignedIn = false;
         expect(ignoreChanges(dash, original)).toBe(true);
       });
@@ -127,7 +127,7 @@ describe('DashboardPrompt', () => {
     describe('when called with fromScript', () => {
       it('then it should return true', () => {
         const dash = createDashboardModelFixture({}, { canSave: true, fromScript: true, fromFile: undefined });
-        const original = dash.getSaveModelClone();
+        const original = dash.getSaveModelCloneOld();
         expect(ignoreChanges(dash, original)).toBe(true);
       });
     });
@@ -146,7 +146,7 @@ describe('DashboardPrompt', () => {
     describe('when called with fromFile', () => {
       it('then it should return true', () => {
         const dash = createDashboardModelFixture({}, { canSave: true, fromScript: undefined, fromFile: true });
-        const original = dash.getSaveModelClone();
+        const original = dash.getSaveModelCloneOld();
         expect(ignoreChanges(dash, original)).toBe(true);
       });
     });
@@ -154,7 +154,7 @@ describe('DashboardPrompt', () => {
     describe('when called with canSave but without fromScript and fromFile', () => {
       it('then it should return false', () => {
         const dash = createDashboardModelFixture({}, { canSave: true, fromScript: undefined, fromFile: undefined });
-        const original = dash.getSaveModelClone();
+        const original = dash.getSaveModelCloneOld();
         expect(ignoreChanges(dash, original)).toBe(undefined);
       });
     });
diff --git a/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.tsx b/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.tsx
index fc3e87a2f3063..c5602a8cc443f 100644
--- a/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.tsx
+++ b/public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.tsx
@@ -1,5 +1,5 @@
 import * as H from 'history';
-import { each, find } from 'lodash';
+import { find } from 'lodash';
 import React, { useContext, useEffect, useState } from 'react';
 import { Prompt } from 'react-router-dom';
 
@@ -37,12 +37,12 @@ export const DashboardPrompt = React.memo(({ dashboard }: Props) => {
     // This is to minimize unsaved changes warnings due to automatic schema migrations
     const timeoutId = setTimeout(() => {
       const originalPath = locationService.getLocation().pathname;
-      const original = dashboard.getSaveModelClone();
+      const original = dashboard.getSaveModelCloneOld();
       setState({ originalPath, original });
     }, 1000);
 
     const savedEventUnsub = appEvents.subscribe(DashboardSavedEvent, () => {
-      const original = dashboard.getSaveModelClone();
+      const original = dashboard.getSaveModelCloneOld();
       setState({ originalPath, original });
     });
 
@@ -177,19 +177,22 @@ function cleanDashboardFromIgnoredChanges(dashData: Dashboard) {
   const dash = model.getSaveModelClone();
 
   // ignore time and refresh
-  dash.time = 0;
+  delete dash.time;
   dash.refresh = '';
   dash.schemaVersion = 0;
-  dash.timezone = 0;
+  delete dash.timezone;
 
   dash.panels = [];
 
   // ignore template variable values
-  each(dash.getVariables(), (variable: any) => {
-    variable.current = null;
-    variable.options = null;
-    variable.filters = null;
-  });
+  if (dash.templating?.list) {
+    for (const variable of dash.templating.list) {
+      delete variable.current;
+      delete variable.options;
+      // @ts-expect-error
+      delete variable.filters;
+    }
+  }
 
   return dash;
 }
@@ -200,7 +203,7 @@ export function hasChanges(current: DashboardModel, original: unknown) {
     return true;
   }
   // TODO: Make getSaveModelClone return Dashboard type instead
-  const currentClean = cleanDashboardFromIgnoredChanges(current.getSaveModelClone() as unknown as Dashboard);
+  const currentClean = cleanDashboardFromIgnoredChanges(current.getSaveModelCloneOld() as unknown as Dashboard);
   const originalClean = cleanDashboardFromIgnoredChanges(original as Dashboard);
 
   const currentTimepicker = find((currentClean as any).nav, { type: 'timepicker' });
diff --git a/public/app/features/dashboard/components/EmbeddedDashboard/SaveDashboardDrawer.tsx b/public/app/features/dashboard/components/EmbeddedDashboard/SaveDashboardDrawer.tsx
index 105c855a5477b..c54ca33fe9308 100644
--- a/public/app/features/dashboard/components/EmbeddedDashboard/SaveDashboardDrawer.tsx
+++ b/public/app/features/dashboard/components/EmbeddedDashboard/SaveDashboardDrawer.tsx
@@ -1,6 +1,7 @@
 import React, { useMemo, useState } from 'react';
 
 import { config } from '@grafana/runtime';
+import { Dashboard } from '@grafana/schema';
 import { Drawer, Tab, TabsBar } from '@grafana/ui';
 
 import { DashboardModel } from '../../state';
@@ -15,16 +16,14 @@ type SaveDashboardDrawerProps = {
   dashboard: DashboardModel;
   onDismiss: () => void;
   dashboardJson: string;
-  onSave: (clone: DashboardModel) => Promise<unknown>;
+  onSave: (clone: Dashboard) => Promise<unknown>;
 };
 
 export const SaveDashboardDrawer = ({ dashboard, onDismiss, dashboardJson, onSave }: SaveDashboardDrawerProps) => {
   const data = useMemo<SaveDashboardData>(() => {
     const clone = dashboard.getSaveModelClone();
-    const cloneJSON = JSON.stringify(clone, null, 2);
-    const cloneSafe = JSON.parse(cloneJSON); // avoids undefined issues
 
-    const diff = jsonDiff(JSON.parse(JSON.stringify(dashboardJson, null, 2)), cloneSafe);
+    const diff = jsonDiff(JSON.parse(JSON.stringify(dashboardJson, null, 2)), clone);
     let diffCount = 0;
     for (const d of Object.values(diff)) {
       diffCount += d.length;
diff --git a/public/app/features/dashboard/components/EmbeddedDashboard/SaveDashboardForm.tsx b/public/app/features/dashboard/components/EmbeddedDashboard/SaveDashboardForm.tsx
index c8e4f6d2e0184..910486e18a00d 100644
--- a/public/app/features/dashboard/components/EmbeddedDashboard/SaveDashboardForm.tsx
+++ b/public/app/features/dashboard/components/EmbeddedDashboard/SaveDashboardForm.tsx
@@ -1,6 +1,7 @@
 import React, { useMemo, useState } from 'react';
 
 import { Stack } from '@grafana/experimental';
+import { Dashboard } from '@grafana/schema';
 import { Button, Form } from '@grafana/ui';
 import { useAppNotification } from 'app/core/copy/appNotification';
 
@@ -10,7 +11,7 @@ import { SaveDashboardData } from '../SaveDashboard/types';
 interface SaveDashboardProps {
   dashboard: DashboardModel;
   onCancel: () => void;
-  onSubmit?: (clone: DashboardModel) => Promise<unknown>;
+  onSubmit?: (clone: Dashboard) => Promise<unknown>;
   onSuccess: () => void;
   saveModel: SaveDashboardData;
 }
diff --git a/public/app/features/dashboard/components/GenAI/GenAIButton.tsx b/public/app/features/dashboard/components/GenAI/GenAIButton.tsx
index 12a76bf4bd58d..e283c97f54f72 100644
--- a/public/app/features/dashboard/components/GenAI/GenAIButton.tsx
+++ b/public/app/features/dashboard/components/GenAI/GenAIButton.tsx
@@ -26,6 +26,8 @@ export interface GenAIButtonProps {
   temperature?: number;
   // Event tracking source. Send as `src` to Rudderstack event
   eventTrackingSrc: EventTrackingSrc;
+  // Whether the button should be disabled
+  disabled?: boolean;
 }
 
 export const GenAIButton = ({
@@ -37,6 +39,7 @@ export const GenAIButton = ({
   onGenerate,
   temperature = 1,
   eventTrackingSrc,
+  disabled,
 }: GenAIButtonProps) => {
   const styles = useStyles2(getStyles);
 
@@ -47,7 +50,7 @@ export const GenAIButton = ({
 
   const hasHistory = history.length > 0;
   const isFirstHistoryEntry = streamStatus === StreamStatus.GENERATING && !hasHistory;
-  const isButtonDisabled = isFirstHistoryEntry || (value && !value.enabled && !error);
+  const isButtonDisabled = disabled || isFirstHistoryEntry || (value && !value.enabled && !error);
   const reportInteraction = (item: AutoGenerateItem) => reportAutoGenerateInteraction(eventTrackingSrc, item);
 
   const onClick = (e: React.MouseEvent<HTMLButtonElement>) => {
diff --git a/public/app/features/dashboard/components/GenAI/GenAIDashboardChangesButton.tsx b/public/app/features/dashboard/components/GenAI/GenAIDashboardChangesButton.tsx
index dc07710bc874e..1f2cd23972c3b 100644
--- a/public/app/features/dashboard/components/GenAI/GenAIDashboardChangesButton.tsx
+++ b/public/app/features/dashboard/components/GenAI/GenAIDashboardChangesButton.tsx
@@ -9,6 +9,7 @@ import { getDashboardChanges, Message, Role } from './utils';
 interface GenAIDashboardChangesButtonProps {
   dashboard: DashboardModel;
   onGenerate: (title: string) => void;
+  disabled?: boolean;
 }
 
 const CHANGES_GENERATION_STANDARD_PROMPT = [
@@ -16,16 +17,16 @@ const CHANGES_GENERATION_STANDARD_PROMPT = [
   'Your goal is to write a description of the changes for a dashboard',
   'When referring to panel changes, use the panel title',
   'When using panel title, wrap it with double quotes',
-  'When the panel changes the position, just mention the panel title has changed position',
+  'When the panel changes the position, just mention the panel has changed position and not the specific change',
   'When an entire panel is added or removed, use the panel title and only say it was added or removed and disregard the rest of the changes for that panel',
   'Group changes when all panels are affected',
   'Do not mention line number',
   'Refer to templating elements as variables',
   'Ignore and never mention changes about plugin version',
-  'Try to make it as short as possible.',
-].join('. ');
+  'Try to make the response as short as possible',
+].join('.\n');
 
-export const GenAIDashboardChangesButton = ({ dashboard, onGenerate }: GenAIDashboardChangesButtonProps) => {
+export const GenAIDashboardChangesButton = ({ dashboard, onGenerate, disabled }: GenAIDashboardChangesButtonProps) => {
   const messages = useMemo(() => getMessages(dashboard), [dashboard]);
 
   return (
@@ -36,6 +37,7 @@ export const GenAIDashboardChangesButton = ({ dashboard, onGenerate }: GenAIDash
       temperature={0}
       eventTrackingSrc={EventTrackingSrc.dashboardChanges}
       toggleTipTitle={'Improve your dashboard changes summary'}
+      disabled={disabled}
     />
   );
 };
@@ -55,13 +57,19 @@ function getMessages(dashboard: DashboardModel): Message[] {
       role: Role.system,
     },
     {
-      content: `Group the following diff under "User changes" as a bullet list: ${JSON.stringify(userChanges)}`,
+      content: `Summarize the following user changes diff under a "User changes" heading with no special formatting as a bulleted list:\n${userChanges}`,
       role: Role.system,
     },
     {
-      content: `Group the following diff under "Migration changes" as a bullet list: ${JSON.stringify(
-        migrationChanges
-      )}`,
+      content: `Be sure to only include substantial user changes, such as adding or removing entire panels, changing panel titles or descriptions, etc. Ignore other changes and do not include them in the summary. Do not include "User Changes" section if there are no substantial user changes to report.`,
+      role: Role.system,
+    },
+    {
+      content: `Threshold step changes of value being removed and replaced with color "green" should always be ignored`,
+      role: Role.system,
+    },
+    {
+      content: `In addition to summarizing the user diff changes, add the following sentence at the end of the response "Some autogenerated changes are included to update the dashboard to the latest valid schema version." Only add this sentence if the following migrations diff has substantial changes. Ignore any threshold step changes, templating list changes, and ignore the entire migration diff if it is less than 10 lines long. \n This is the migrations diff:\n${migrationChanges}`,
       role: Role.system,
     },
   ];
diff --git a/public/app/features/dashboard/components/GenAI/jsonDiffText.test.ts b/public/app/features/dashboard/components/GenAI/jsonDiffText.test.ts
new file mode 100644
index 0000000000000..96f09c6d92f5a
--- /dev/null
+++ b/public/app/features/dashboard/components/GenAI/jsonDiffText.test.ts
@@ -0,0 +1,285 @@
+import { createDashboardModelFixture, createPanelSaveModel } from '../../state/__fixtures__/dashboardFixtures';
+
+import { orderProperties, JSONArray, JSONValue, isObject, getDashboardStringDiff } from './jsonDiffText';
+
+describe('orderProperties', () => {
+  it('should sort simple objects', () => {
+    // Simplest possible case
+    const before = {
+      firstProperty: 'foo',
+      secondProperty: 'bar',
+    };
+
+    const after = {
+      secondProperty: 'bar',
+      firstProperty: 'foo',
+    };
+
+    // Call the function to test
+    const result = orderProperties(before, after);
+
+    expect(result).toEqual({
+      firstProperty: 'foo',
+      secondProperty: 'bar',
+    });
+  });
+
+  it('should sort arrays', () => {
+    const result = orderProperties([0, 1], [1, 0]);
+
+    expect(result).toEqual([0, 1]);
+  });
+
+  it('should handle nested objects', () => {
+    const before = {
+      nested: {
+        firstProperty: 'foo',
+        secondProperty: 'bar',
+      },
+    };
+
+    const after = {
+      nested: {
+        secondProperty: 'bar',
+        firstProperty: 'foo',
+      },
+    };
+
+    const result = orderProperties(before, after);
+
+    expect(result).toEqual({
+      nested: {
+        firstProperty: 'foo',
+        secondProperty: 'bar',
+      },
+    });
+  });
+
+  it('should handle arrays of objects with different order', () => {
+    const before = [
+      { id: 1, name: 'Alice' },
+      { id: 2, name: 'Bob' },
+    ];
+
+    const after = [
+      { id: 2, name: 'Bob' },
+      { id: 1, name: 'Alice' },
+    ];
+
+    const result = orderProperties(before, after);
+
+    expect(result).toEqual([
+      { id: 1, name: 'Alice' },
+      { id: 2, name: 'Bob' },
+    ]);
+  });
+
+  it('should handle null values', () => {
+    const before = {
+      a: null,
+      b: null,
+    };
+
+    const after = {
+      b: null,
+      a: null,
+    };
+
+    const result = orderProperties(before, after);
+
+    expect(result).toEqual({
+      a: null,
+      b: null,
+    });
+  });
+
+  it('should handle empty objects', () => {
+    const before = {};
+    const after = {};
+
+    const result = orderProperties(before, after);
+
+    expect(result).toEqual({});
+  });
+
+  it('should handle empty arrays', () => {
+    const before: JSONValue[] = [];
+    const after: JSONValue[] = [];
+
+    const result = orderProperties(before, after);
+
+    expect(result).toEqual([]);
+  });
+
+  it('should handle deeply nested objects', () => {
+    const before = {
+      a: {
+        b: {
+          c: 'foo',
+        },
+      },
+      d: 'bar',
+    };
+
+    const after = {
+      d: 'bar',
+      a: {
+        b: {
+          c: 'foo',
+        },
+      },
+    };
+
+    const result = orderProperties(before, after);
+
+    expect(result).toEqual({
+      a: {
+        b: {
+          c: 'foo',
+        },
+      },
+      d: 'bar',
+    });
+  });
+
+  it('should handle arrays of nested objects', () => {
+    const before = [
+      { id: 1, nested: { name: 'Alice' } },
+      { id: 2, nested: { name: 'Bob' } },
+    ];
+
+    const after = [
+      { id: 2, nested: { name: 'Bob' } },
+      { id: 1, nested: { name: 'Alice' } },
+    ];
+
+    const result = orderProperties(before, after);
+
+    expect(result).toEqual([
+      { id: 1, nested: { name: 'Alice' } },
+      { id: 2, nested: { name: 'Bob' } },
+    ]);
+  });
+
+  it('should handle mixed arrays of objects and primitive values', () => {
+    const before = [{ id: 1 }, 42, [3, 2, 1]];
+
+    const after = [{ id: 1 }, [3, 2, 1], 42];
+
+    const result = orderProperties(before, after);
+
+    expect(result).toEqual([{ id: 1 }, 42, [3, 2, 1]]);
+  });
+
+  it('should handle arrays of objects with nested arrays', () => {
+    const before = [
+      { id: 1, values: [3, 2, 1] },
+      { id: 2, values: [6, 5, 4] },
+    ];
+
+    const after = [
+      { id: 2, values: [6, 5, 4] },
+      { id: 1, values: [3, 2, 1] },
+    ];
+
+    const result = orderProperties(before, after);
+
+    expect(result).toEqual([
+      { id: 1, values: [3, 2, 1] },
+      { id: 2, values: [6, 5, 4] },
+    ]);
+  });
+
+  it('should handle arrays of arrays', () => {
+    const before = [
+      [1, 2, 3],
+      [4, 5, 6],
+    ];
+
+    const after = [
+      [4, 5, 6],
+      [1, 2, 3],
+    ];
+
+    const result = orderProperties(before, after);
+
+    expect(result).toEqual([
+      [1, 2, 3],
+      [4, 5, 6],
+    ]);
+  });
+
+  it('should match reordered and modified arrays to nearest keys', () => {
+    const before = [
+      { id: '1', name: 'Alice', country: 'England' },
+      { id: '2', name: 'Bob', country: 'America' },
+      { id: '3', name: 'Charlie', country: 'Foxtrot' },
+    ];
+
+    const after: JSONArray = [{ name: 'Charlie', country: 'Foxtrot' }, { name: 'Alice' }];
+
+    const result = orderProperties(before, after);
+
+    expect(result).toEqual([{ name: 'Alice' }, { name: 'Charlie', country: 'Foxtrot' }]);
+  });
+});
+
+describe('isObject', () => {
+  it('should return true for non-array objects', () => {
+    expect(isObject({})).toBe(true);
+    expect(isObject({ foo: 'bar' })).toBe(true);
+    expect(isObject(null)).toBe(false);
+    expect(isObject([])).toBe(false);
+    expect(isObject('')).toBe(false);
+    expect(isObject(123)).toBe(false);
+    expect(isObject(true)).toBe(false);
+  });
+});
+
+describe('getDashboardStringDiff', () => {
+  const dashboard = {
+    title: 'Original Title',
+    schemaVersion: 38,
+    panels: [
+      createPanelSaveModel({
+        id: 1,
+        title: 'Original Panel Title',
+        gridPos: { x: 0, y: 0, w: 2, h: 2 },
+      }),
+      createPanelSaveModel({
+        id: 2,
+        title: 'Panel to be moved',
+        gridPos: { x: 2, y: 0, w: 2, h: 2 },
+      }),
+    ],
+  };
+
+  it('should no return changes when nothing changes', () => {
+    const dashboardModel = createDashboardModelFixture(dashboard);
+
+    const result = getDashboardStringDiff(dashboardModel);
+
+    expect(result).toEqual({
+      migrationDiff:
+        'Index: Original Title\n' +
+        '===================================================================\n' +
+        '--- Original Title\t\n' +
+        '+++ Original Title\t\n',
+      userDiff:
+        'Index: Original Title\n' +
+        '===================================================================\n' +
+        '--- Original Title\t\n' +
+        '+++ Original Title\t\n',
+    });
+  });
+
+  it('should return a diff of the dashboard title as user change', () => {
+    const dashboardModel = createDashboardModelFixture(dashboard);
+    dashboardModel.title = 'New Title';
+
+    const result = getDashboardStringDiff(dashboardModel);
+
+    expect(result.userDiff).toContain(`-  \"title\": \"Original Title\"`);
+    expect(result.userDiff).toContain(`+  \"title\": \"New Title\",`);
+  });
+});
diff --git a/public/app/features/dashboard/components/GenAI/jsonDiffText.ts b/public/app/features/dashboard/components/GenAI/jsonDiffText.ts
new file mode 100644
index 0000000000000..56715a6f869ee
--- /dev/null
+++ b/public/app/features/dashboard/components/GenAI/jsonDiffText.ts
@@ -0,0 +1,205 @@
+import { createTwoFilesPatch } from 'diff';
+
+import { Dashboard } from '@grafana/schema';
+
+import { DashboardModel } from '../../state';
+
+export type JSONValue = null | boolean | number | string | JSONArray | JSONObject;
+
+export type JSONArray = JSONValue[];
+
+export type JSONObject = {
+  [key: string]: JSONValue;
+};
+
+export function orderProperties(obj1: JSONValue, obj2: JSONValue) {
+  // If obj1 and obj2 are the same object, return obj2
+  if (obj1 === obj2) {
+    return obj2; // No need to order properties, they are already the same
+  }
+
+  if (Array.isArray(obj1) && Array.isArray(obj2)) {
+    // They are both arrays
+    return orderArrayProperties(obj1, obj2);
+  }
+
+  // Use a type guard to check if they are both non-array objects
+  else if (isObject(obj1) && isObject(obj2)) {
+    // Both non-array objects
+    return orderObjectProperties(obj1, obj2);
+  }
+
+  return obj2;
+}
+
+export function isObject(obj: JSONValue): obj is JSONObject {
+  return typeof obj === 'object' && !Array.isArray(obj) && obj !== null;
+}
+
+export function orderObjectProperties(obj1: JSONObject, obj2: JSONObject) {
+  const orderedProperties = Object.keys(obj1);
+  const orderedObj2: Record<string, JSONValue> = {};
+
+  for (const prop of orderedProperties) {
+    if (obj2.hasOwnProperty(prop)) {
+      if (Array.isArray(obj1[prop]) && Array.isArray(obj2[prop])) {
+        // Recursive call orderProperties for arrays
+        orderedObj2[prop] = orderProperties(obj1[prop], obj2[prop]);
+      } else if (typeof obj1[prop] === 'object' && typeof obj2[prop] === 'object') {
+        // Recursively call orderProperties for nested objects
+        orderedObj2[prop] = orderProperties(obj1[prop], obj2[prop]);
+      } else {
+        orderedObj2[prop] = obj2[prop];
+      }
+    }
+  }
+  return orderedObj2;
+}
+
+export function orderArrayProperties(obj1: JSONArray, obj2: JSONArray) {
+  const orderedObj2: JSONValue[] = new Array(obj1.length).fill(undefined);
+
+  const unseen1 = new Set<number>([...Array(obj1.length).keys()]);
+  const unseen2 = new Set<number>([...Array(obj2.length).keys()]);
+
+  // Loop to match up elements that match exactly
+  for (let i = 0; i < obj1.length; i++) {
+    if (unseen2.size === 0) {
+      break;
+    }
+    let item1 = obj1[i];
+    for (let j = 0; j < obj2.length; j++) {
+      if (!unseen2.has(j)) {
+        continue;
+      }
+      let item2 = obj2[j];
+      item2 = orderProperties(item1, item2);
+      if (JSON.stringify(item1) === JSON.stringify(item2)) {
+        unseen1.delete(i);
+        unseen2.delete(j);
+        orderedObj2[i] = item2;
+      }
+    }
+  }
+
+  fillBySimilarity(obj1, obj2, orderedObj2, unseen1, unseen2);
+
+  return orderedObj2.filter((value) => value !== undefined);
+}
+
+// Compare all pairings by similarity and match greedily from highest to lowest
+// Similarity is simply measured by number of k:v pairs in fair
+// O(n^2), which is more or less unavoidable
+// Can be made a better match by using levenshtein distance and Hungarian matching
+export function fillBySimilarity(
+  // TODO: Investigate not using any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  obj1: any[],
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  obj2: any[],
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  orderedObj2: any[],
+  unseen1: Set<number>,
+  unseen2: Set<number>
+): void {
+  let rankings: Record<number, number[][]> = {}; // Maps scores to arrays of value pairs
+  // Unpacking it because I'm not sure removing items while iterating is safe
+
+  unseen2.forEach((j: number) => {
+    // Index name matches calling function
+    let item2 = obj2[j];
+
+    // If not object, or if array, just push item2 to orderedObj2 and remove j from unseen2
+    if (typeof item2 !== 'object' || Array.isArray(item2)) {
+      orderedObj2.push(item2);
+      unseen2.delete(j);
+      return;
+    }
+
+    unseen1.forEach((i: number) => {
+      let item1 = obj1[i];
+      if (typeof item1 !== 'object' || Array.isArray(item1)) {
+        unseen1.delete(i);
+        return;
+      }
+
+      let score = 0;
+
+      for (const key in item1) {
+        let val1 = item1[key];
+        if (!item2.hasOwnProperty(key)) {
+          continue;
+        }
+        let val2 = item2[key];
+        if ((typeof val1 !== 'string' && typeof val1 !== 'number') || typeof val1 !== typeof val2) {
+          continue;
+        }
+        if (val1 === val2) {
+          score++;
+        }
+      }
+
+      if (score !== 0) {
+        if (rankings[score] === undefined) {
+          rankings[score] = [];
+        }
+        rankings[score].push([i, j]);
+      }
+    });
+  });
+
+  const keys: number[] = Object.keys(rankings).map(Number); // Get keys as an array of numbers
+  keys.sort((a, b) => b - a); // Sort in descending order
+
+  for (const key of keys) {
+    let pairs: number[][] = rankings[key];
+    for (const pair of pairs) {
+      const [i, j] = pair;
+      if (unseen1.has(i) && unseen2.has(j)) {
+        orderedObj2[i] = obj2[j];
+        unseen1.delete(i);
+        unseen2.delete(j);
+      }
+    }
+  }
+
+  // Get anything that had no matches whatsoever
+  for (const j of unseen2) {
+    orderedObj2.push(obj2[j]);
+  }
+}
+
+export function jsonSanitize(obj: Dashboard | DashboardModel | null) {
+  return JSON.parse(JSON.stringify(obj, null, 2));
+}
+
+export function getDashboardStringDiff(dashboard: DashboardModel) {
+  const originalDashboard = jsonSanitize(dashboard.getOriginalDashboard());
+  let dashboardAfterMigration = jsonSanitize(new DashboardModel(originalDashboard).getSaveModelClone());
+  let currentDashboard = jsonSanitize(dashboard.getSaveModelClone());
+
+  dashboardAfterMigration = orderProperties(originalDashboard, dashboardAfterMigration);
+  currentDashboard = orderProperties(dashboardAfterMigration, currentDashboard);
+
+  let migrationDiff = createTwoFilesPatch(
+    originalDashboard.title ?? 'Before migration changes',
+    dashboardAfterMigration.title ?? 'After migration changes',
+    JSON.stringify(originalDashboard, null, 2),
+    JSON.stringify(dashboardAfterMigration, null, 2),
+    '',
+    '',
+    { context: 5 }
+  );
+
+  let userDiff = createTwoFilesPatch(
+    dashboardAfterMigration.title ?? 'Before user changes',
+    currentDashboard.title ?? 'After user changes',
+    JSON.stringify(dashboardAfterMigration, null, 2),
+    JSON.stringify(currentDashboard, null, 2),
+    '',
+    '',
+    { context: 5 }
+  );
+
+  return { migrationDiff, userDiff };
+}
diff --git a/public/app/features/dashboard/components/GenAI/utils.test.ts b/public/app/features/dashboard/components/GenAI/utils.test.ts
index c108aaf9ae4c5..cf3c4672c4478 100644
--- a/public/app/features/dashboard/components/GenAI/utils.test.ts
+++ b/public/app/features/dashboard/components/GenAI/utils.test.ts
@@ -37,29 +37,50 @@ describe('getDashboardChanges', () => {
     const result = getDashboardChanges(dashboard);
 
     // Assertions
-    expect(result.userChanges).toEqual({
-      panels: [
-        {
-          op: 'replace',
-          originalValue: 'Panel 1',
-          value: 'New title',
-          startLineNumber: expect.any(Number),
-          path: ['panels', '0', 'title'],
-        },
-      ],
-    });
+    expect(result.migrationChanges).toEqual(
+      '===================================================================\n' +
+        '--- Before migration changes\t\n' +
+        '+++ After migration changes\t\n' +
+        '@@ -1,9 +1,9 @@\n' +
+        ' {\n' +
+        '   "editable": true,\n' +
+        '   "graphTooltip": 0,\n' +
+        '-  "schemaVersion": 37,\n' +
+        '+  "schemaVersion": 38,\n' +
+        '   "timezone": "",\n' +
+        '   "panels": [\n' +
+        '     {\n' +
+        '       "type": "timeseries",\n' +
+        '       "title": "Panel 1",\n'
+    );
+    expect(result.userChanges).toEqual(
+      '===================================================================\n' +
+        '--- Before user changes\t\n' +
+        '+++ After user changes\t\n' +
+        '@@ -3,16 +3,17 @@\n' +
+        '   "graphTooltip": 0,\n' +
+        '   "schemaVersion": 38,\n' +
+        '   "timezone": "",\n' +
+        '   "panels": [\n' +
+        '     {\n' +
+        '-      "type": "timeseries",\n' +
+        '-      "title": "Panel 1",\n' +
+        '+      "id": 1,\n' +
+        '       "options": {\n' +
+        '         "legend": {\n' +
+        '           "displayMode": "hidden",\n' +
+        '           "showLegend": false\n' +
+        '         }\n' +
+        '-      }\n' +
+        '+      },\n' +
+        '+      "title": "New title",\n' +
+        '+      "type": "timeseries"\n' +
+        '     }\n' +
+        '   ]\n' +
+        ' }\n' +
+        '\\ No newline at end of file\n'
+    );
     expect(result.migrationChanges).toBeDefined();
-    expect(result.userChanges).not.toContain({
-      panels: [
-        {
-          op: 'replace',
-          originalValue: 'Panel 1',
-          value: 'New title',
-          startLineNumber: expect.any(Number),
-          path: ['panels', '0', 'title'],
-        },
-      ],
-    });
   });
 });
 
diff --git a/public/app/features/dashboard/components/GenAI/utils.ts b/public/app/features/dashboard/components/GenAI/utils.ts
index 956beb0ac9320..bbea14b337a04 100644
--- a/public/app/features/dashboard/components/GenAI/utils.ts
+++ b/public/app/features/dashboard/components/GenAI/utils.ts
@@ -1,6 +1,6 @@
 import { DashboardModel, PanelModel } from '../../state';
-import { Diffs, jsonDiff } from '../VersionHistory/utils';
 
+import { getDashboardStringDiff } from './jsonDiffText';
 import { openai } from './llms';
 
 export enum Role {
@@ -41,17 +41,14 @@ export const sanitizeReply = (reply: string) => {
  * @returns user changes and migration changes
  */
 export function getDashboardChanges(dashboard: DashboardModel): {
-  userChanges: Diffs;
-  migrationChanges: Diffs;
+  userChanges: string;
+  migrationChanges: string;
 } {
-  // Re-parse the dashboard to remove functions and other non-serializable properties
-  const currentDashboard = JSON.parse(JSON.stringify(dashboard.getSaveModelClone()));
-  const originalDashboard = dashboard.getOriginalDashboard()!;
-  const dashboardAfterMigration = JSON.parse(JSON.stringify(new DashboardModel(originalDashboard).getSaveModelClone()));
+  const { migrationDiff, userDiff } = getDashboardStringDiff(dashboard);
 
   return {
-    userChanges: jsonDiff(dashboardAfterMigration, currentDashboard),
-    migrationChanges: jsonDiff(originalDashboard, dashboardAfterMigration),
+    userChanges: userDiff,
+    migrationChanges: migrationDiff,
   };
 }
 
diff --git a/public/app/features/dashboard/components/PublicDashboard/PublicDashboardsFooter.tsx b/public/app/features/dashboard/components/PublicDashboard/PublicDashboardsFooter.tsx
new file mode 100644
index 0000000000000..c2b9f72dd9f88
--- /dev/null
+++ b/public/app/features/dashboard/components/PublicDashboard/PublicDashboardsFooter.tsx
@@ -0,0 +1,37 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { useStyles2 } from '@grafana/ui';
+
+import { useGetPublicDashboardConfig } from './usePublicDashboardConfig';
+
+export const PublicDashboardFooter = function () {
+  const styles = useStyles2(getStyles);
+  const conf = useGetPublicDashboardConfig();
+
+  return conf.footerHide ? null : (
+    <div className={styles.footer}>
+      <a className={styles.link} href={conf.footerLink} target="_blank" rel="noreferrer noopener">
+        {conf.footerText} <img className={styles.logoImg} alt="" src={conf.footerLogo} />
+      </a>
+    </div>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  footer: css({
+    display: 'flex',
+    justifyContent: 'end',
+    height: '30px',
+    padding: theme.spacing(0, 2, 0, 1),
+  }),
+  link: css({
+    display: 'flex',
+    alignItems: 'center',
+  }),
+  logoImg: css({
+    height: '16px',
+    marginLeft: theme.spacing(0.5),
+  }),
+});
diff --git a/public/app/features/dashboard/components/PublicDashboard/usePublicDashboardConfig.tsx b/public/app/features/dashboard/components/PublicDashboard/usePublicDashboardConfig.tsx
new file mode 100644
index 0000000000000..eff429de19a6e
--- /dev/null
+++ b/public/app/features/dashboard/components/PublicDashboard/usePublicDashboardConfig.tsx
@@ -0,0 +1,55 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { useStyles2, useTheme2 } from '@grafana/ui';
+
+const FOOTER_URL = 'https://grafana.com/?src=grafananet&cnt=public-dashboards';
+const GRAFANA_LOGO_LIGHT_URL = 'public/img/grafana_text_logo_light.svg';
+const GRAFANA_LOGO_DARK_URL = 'public/img/grafana_text_logo_dark.svg';
+const GRAFANA_LOGO_DEFAULT_VALUE = 'grafana-logo';
+
+export interface PublicDashboardCfg {
+  footerHide: boolean;
+  footerText: React.ReactNode;
+  footerLogo: string;
+  footerLink: string;
+  headerLogoHide: boolean;
+}
+const useGetConfig = (cfg?: PublicDashboardCfg) => {
+  const theme = useTheme2();
+  const styles = useStyles2(getStyles);
+
+  const { footerHide, footerText, footerLink, footerLogo, headerLogoHide } = cfg || {
+    footerHide: false,
+    footerText: 'Powered by',
+    footerLogo: GRAFANA_LOGO_DEFAULT_VALUE,
+    footerLink: FOOTER_URL,
+    headerLogoHide: false,
+  };
+
+  return {
+    footerHide,
+    footerText: <span className={styles.text}>{footerText}</span>,
+    footerLogo:
+      footerLogo === GRAFANA_LOGO_DEFAULT_VALUE
+        ? theme.isDark
+          ? GRAFANA_LOGO_LIGHT_URL
+          : GRAFANA_LOGO_DARK_URL
+        : footerLogo,
+    footerLink,
+    headerLogoHide,
+  };
+};
+export let useGetPublicDashboardConfig = (): PublicDashboardCfg => useGetConfig();
+
+export function setPublicDashboardConfigFn(cfg: PublicDashboardCfg) {
+  useGetPublicDashboardConfig = (): PublicDashboardCfg => useGetConfig(cfg);
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  text: css({
+    color: theme.colors.text.secondary,
+    fontSize: theme.typography.body.fontSize,
+  }),
+});
diff --git a/public/app/features/dashboard/components/PublicDashboardFooter/PublicDashboardsFooter.tsx b/public/app/features/dashboard/components/PublicDashboardFooter/PublicDashboardsFooter.tsx
deleted file mode 100644
index 4b65096307d71..0000000000000
--- a/public/app/features/dashboard/components/PublicDashboardFooter/PublicDashboardsFooter.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { css } from '@emotion/css';
-import React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
-
-export interface PublicDashboardFooterCfg {
-  hide: boolean;
-  text: string;
-  logo: string;
-  link: string;
-}
-
-export const PublicDashboardFooter = function () {
-  const styles = useStyles2(getStyles);
-  const conf = getPublicDashboardFooterConfig();
-
-  return conf.hide ? null : (
-    <div className={styles.footer}>
-      <a className={styles.link} href={conf.link} target="_blank" rel="noreferrer noopener">
-        {conf.text} <img className={styles.logoImg} alt="" src={conf.logo}></img>
-      </a>
-    </div>
-  );
-};
-
-export function setPublicDashboardFooterConfigFn(fn: typeof getPublicDashboardFooterConfig) {
-  getPublicDashboardFooterConfig = fn;
-}
-export let getPublicDashboardFooterConfig = (): PublicDashboardFooterCfg => ({
-  hide: false,
-  text: 'powered by Grafana',
-  logo: 'public/img/grafana_icon.svg',
-  link: 'https://grafana.com/',
-});
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  footer: css`
-    display: flex;
-    justify-content: end;
-    height: 30px;
-    padding: ${theme.spacing(0, 2, 0, 1)};
-  `,
-  link: css`
-    display: flex;
-    gap: 4px;
-    justify-content: end;
-    align-items: center;
-  `,
-  logoImg: css`
-    height: 100%;
-    padding: ${theme.spacing(0.25, 0, 0.5, 0)};
-  `,
-});
diff --git a/public/app/features/dashboard/components/SaveDashboard/DashboardValidation.tsx b/public/app/features/dashboard/components/SaveDashboard/DashboardValidation.tsx
index 2f59a6f8b12f6..6225baac6851c 100644
--- a/public/app/features/dashboard/components/SaveDashboard/DashboardValidation.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/DashboardValidation.tsx
@@ -18,7 +18,7 @@ type ValidationResponse = Awaited<ReturnType<typeof backendSrv.validateDashboard
 function DashboardValidation({ dashboard }: DashboardValidationProps) {
   const styles = useStyles2(getStyles);
   const { loading, value, error } = useAsync(async () => {
-    const saveModel = dashboard.getSaveModelClone();
+    const saveModel = dashboard.getSaveModelCloneOld();
     const respPromise = backendSrv
       .validateDashboard(saveModel)
       // API returns schema validation errors in 4xx range, so resolve them rather than throwing
diff --git a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx
index 8bc3e5dda697f..5b81085c3a029 100644
--- a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx
@@ -30,10 +30,7 @@ export const SaveDashboardDrawer = ({ dashboard, onDismiss, onSaveSuccess, isCop
       return { clone, diff: {}, diffCount: 0, hasChanges: false };
     }
 
-    const cloneJSON = JSON.stringify(clone, null, 2);
-    const cloneSafe = JSON.parse(cloneJSON); // avoids undefined issues
-
-    const diff = jsonDiff(previous, cloneSafe);
+    const diff = jsonDiff(previous, clone);
     let diffCount = 0;
     for (const d of Object.values(diff)) {
       diffCount += d.length;
@@ -48,7 +45,7 @@ export const SaveDashboardDrawer = ({ dashboard, onDismiss, onSaveSuccess, isCop
   }, [dashboard, previous, options, isNew]);
 
   const [showDiff, setShowDiff] = useState(false);
-  const { state, onDashboardSave } = useDashboardSave(dashboard, isCopy);
+  const { state, onDashboardSave } = useDashboardSave(isCopy);
   const onSuccess = onSaveSuccess
     ? () => {
         onDismiss();
diff --git a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardErrorProxy.tsx b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardErrorProxy.tsx
index 21af081275509..23882f5af6077 100644
--- a/public/app/features/dashboard/components/SaveDashboard/SaveDashboardErrorProxy.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/SaveDashboardErrorProxy.tsx
@@ -3,8 +3,10 @@ import React, { useEffect } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { FetchError } from '@grafana/runtime';
+import { Dashboard } from '@grafana/schema';
 import { Button, ConfirmModal, Modal, useStyles2 } from '@grafana/ui';
-import { DashboardModel } from 'app/features/dashboard/state';
+
+import { DashboardModel } from '../../state/DashboardModel';
 
 import { SaveDashboardAsButton } from './SaveDashboardButton';
 import { SaveDashboardModalProps } from './types';
@@ -14,7 +16,7 @@ interface SaveDashboardErrorProxyProps {
   /** original dashboard */
   dashboard: DashboardModel;
   /** dashboard save model with applied modifications, i.e. title */
-  dashboardSaveModel: DashboardModel;
+  dashboardSaveModel: Dashboard;
   error: FetchError;
   onDismiss: () => void;
 }
@@ -25,7 +27,7 @@ export const SaveDashboardErrorProxy = ({
   error,
   onDismiss,
 }: SaveDashboardErrorProxyProps) => {
-  const { onDashboardSave } = useDashboardSave(dashboard);
+  const { onDashboardSave } = useDashboardSave();
 
   useEffect(() => {
     if (error.data && proxyHandlesError(error.data.status)) {
@@ -78,7 +80,7 @@ export const SaveDashboardErrorProxy = ({
 };
 
 const ConfirmPluginDashboardSaveModal = ({ onDismiss, dashboard }: SaveDashboardModalProps) => {
-  const { onDashboardSave } = useDashboardSave(dashboard);
+  const { onDashboardSave } = useDashboardSave();
   const styles = useStyles2(getConfirmPluginDashboardSaveModalStyles);
 
   return (
diff --git a/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.tsx b/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.tsx
index 834ed63d3fc01..0e86fa849d34f 100644
--- a/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.tsx
@@ -3,7 +3,7 @@ import React, { ChangeEvent } from 'react';
 import { config } from '@grafana/runtime';
 import { Button, Input, Switch, Form, Field, InputControl, HorizontalGroup, Label, TextArea } from '@grafana/ui';
 import { FolderPicker } from 'app/core/components/Select/FolderPicker';
-import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
+import { DashboardModel } from 'app/features/dashboard/state';
 import { validationSrv } from 'app/features/manage-dashboards/services/ValidationSrv';
 
 import { GenAIDashDescriptionButton } from '../../GenAI/GenAIDashDescriptionButton';
@@ -26,11 +26,14 @@ const getSaveAsDashboardClone = (dashboard: DashboardModel) => {
 
   // remove alerts if source dashboard is already persisted
   // do not want to create alert dupes
-  if (dashboard.id > 0) {
-    clone.panels.forEach((panel: PanelModel) => {
+  if (dashboard.id > 0 && clone.panels) {
+    clone.panels.forEach((panel) => {
+      // @ts-expect-error
       if (panel.type === 'graph' && panel.alert) {
+        // @ts-expect-error
         delete panel.thresholds;
       }
+      // @ts-expect-error
       delete panel.alert;
     });
   }
diff --git a/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardForm.test.tsx b/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardForm.test.tsx
index bcbad4676d734..cf52a3984dc06 100644
--- a/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardForm.test.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardForm.test.tsx
@@ -2,6 +2,7 @@ import { screen, render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
+import { Dashboard } from '@grafana/schema';
 import { DashboardModel } from 'app/features/dashboard/state';
 import { createDashboardModelFixture } from 'app/features/dashboard/state/__fixtures__/dashboardFixtures';
 
@@ -15,22 +16,23 @@ const prepareDashboardMock = (
   resetTimeSpy: jest.Mock,
   resetVarsSpy: jest.Mock
 ) => {
-  const json = {
+  const json: Dashboard = {
     title: 'name',
-    hasTimeChanged: jest.fn().mockReturnValue(timeChanged),
-    hasVariableValuesChanged: jest.fn().mockReturnValue(variableValuesChanged),
-    resetOriginalTime: () => resetTimeSpy(),
-    resetOriginalVariables: () => resetVarsSpy(),
-    getSaveModelClone: jest.fn().mockReturnValue({}),
+    id: 5,
+    schemaVersion: 30,
   };
 
   return {
-    id: 5,
-    meta: {},
     ...json,
+    meta: {},
+    hasTimeChanged: jest.fn().mockReturnValue(timeChanged),
+    hasVariablesChanged: jest.fn().mockReturnValue(variableValuesChanged),
+    resetOriginalTime: () => resetTimeSpy(),
+    resetOriginalVariables: () => resetVarsSpy(),
     getSaveModelClone: () => json,
   } as unknown as DashboardModel;
 };
+
 const renderAndSubmitForm = async (dashboard: DashboardModel, submitSpy: jest.Mock) => {
   render(
     <SaveDashboardForm
@@ -43,7 +45,7 @@ const renderAndSubmitForm = async (dashboard: DashboardModel, submitSpy: jest.Mo
         return { status: 'success' };
       }}
       saveModel={{
-        clone: dashboard,
+        clone: dashboard.getSaveModelClone(),
         diff: {},
         diffCount: 0,
         hasChanges: true,
@@ -71,7 +73,7 @@ describe('SaveDashboardAsForm', () => {
             return {};
           }}
           saveModel={{
-            clone: prepareDashboardMock(true, true, jest.fn(), jest.fn()),
+            clone: { id: 1, schemaVersion: 3 },
             diff: {},
             diffCount: 0,
             hasChanges: true,
@@ -134,7 +136,7 @@ describe('SaveDashboardAsForm', () => {
             return {};
           }}
           saveModel={{
-            clone: createDashboardModelFixture(),
+            clone: createDashboardModelFixture().getSaveModelClone(),
             diff: {},
             diffCount: 0,
             hasChanges: true,
diff --git a/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardForm.tsx b/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardForm.tsx
index 908e918f85aef..92ac378d9e371 100644
--- a/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardForm.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardForm.tsx
@@ -5,6 +5,7 @@ import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { Stack } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
+import { Dashboard } from '@grafana/schema';
 import { Button, Checkbox, Form, TextArea, useStyles2 } from '@grafana/ui';
 import { DashboardModel } from 'app/features/dashboard/state';
 
@@ -21,7 +22,7 @@ export type SaveProps = {
   saveModel: SaveDashboardData; // already cloned
   onCancel: () => void;
   onSuccess: () => void;
-  onSubmit?: (clone: DashboardModel, options: SaveDashboardOptions, dashboard: DashboardModel) => Promise<any>;
+  onSubmit?: (saveModel: Dashboard, options: SaveDashboardOptions, dashboard: DashboardModel) => Promise<any>;
   options: SaveDashboardOptions;
   onOptionsChange: (opts: SaveDashboardOptions) => void;
 };
@@ -37,7 +38,7 @@ export const SaveDashboardForm = ({
   onOptionsChange,
 }: SaveProps) => {
   const hasTimeChanged = useMemo(() => dashboard.hasTimeChanged(), [dashboard]);
-  const hasVariableChanged = useMemo(() => dashboard.hasVariableValuesChanged(), [dashboard]);
+  const hasVariableChanged = useMemo(() => dashboard.hasVariablesChanged(), [dashboard]);
 
   const [saving, setSaving] = useState(false);
   const [message, setMessage] = useState(options.message);
@@ -53,12 +54,6 @@ export const SaveDashboardForm = ({
         options = { ...options, message };
         const result = await onSubmit(saveModel.clone, options, dashboard);
         if (result.status === 'success') {
-          if (options.saveVariables) {
-            dashboard.resetOriginalVariables();
-          }
-          if (options.saveTimerange) {
-            dashboard.resetOriginalTime();
-          }
           onSuccess();
         } else {
           setSaving(false);
@@ -105,6 +100,7 @@ export const SaveDashboardForm = ({
                     });
                     setMessage(text);
                   }}
+                  disabled={!saveModel.hasChanges}
                 />
               )}
               <TextArea
diff --git a/public/app/features/dashboard/components/SaveDashboard/types.ts b/public/app/features/dashboard/components/SaveDashboard/types.ts
index 1e757c0bad052..0baff9a2d8975 100644
--- a/public/app/features/dashboard/components/SaveDashboard/types.ts
+++ b/public/app/features/dashboard/components/SaveDashboard/types.ts
@@ -1,10 +1,11 @@
+import { Dashboard } from '@grafana/schema';
 import { CloneOptions, DashboardModel } from 'app/features/dashboard/state/DashboardModel';
 import { DashboardDataDTO } from 'app/types';
 
 import { Diffs } from '../VersionHistory/utils';
 
 export interface SaveDashboardData {
-  clone: DashboardModel; // cloned copy
+  clone: Dashboard; // cloned copy
   diff: Diffs;
   diffCount: number; // cumulative count
   hasChanges: boolean; // not new and has changes
@@ -29,7 +30,7 @@ export interface SaveDashboardFormProps {
   isLoading: boolean;
   onCancel: () => void;
   onSuccess: () => void;
-  onSubmit?: (clone: DashboardModel, options: SaveDashboardOptions, dashboard: DashboardModel) => Promise<any>;
+  onSubmit?: (saveModel: Dashboard, options: SaveDashboardOptions, dashboard: DashboardModel) => Promise<any>;
 }
 
 export interface SaveDashboardModalProps {
diff --git a/public/app/features/dashboard/components/SaveDashboard/useDashboardSave.tsx b/public/app/features/dashboard/components/SaveDashboard/useDashboardSave.tsx
index 8aa6db501ded1..da61281c29670 100644
--- a/public/app/features/dashboard/components/SaveDashboard/useDashboardSave.tsx
+++ b/public/app/features/dashboard/components/SaveDashboard/useDashboardSave.tsx
@@ -2,6 +2,7 @@ import { useAsyncFn } from 'react-use';
 
 import { locationUtil } from '@grafana/data';
 import { locationService, reportInteraction } from '@grafana/runtime';
+import { Dashboard } from '@grafana/schema';
 import appEvents from 'app/core/app_events';
 import { useAppNotification } from 'app/core/copy/appNotification';
 import { contextSrv } from 'app/core/core';
@@ -49,16 +50,18 @@ const saveDashboard = async (
   }
 };
 
-export const useDashboardSave = (dashboard: DashboardModel, isCopy = false) => {
+export const useDashboardSave = (isCopy = false) => {
   const dispatch = useDispatch();
   const notifyApp = useAppNotification();
   const [saveDashboardRtkQuery] = useSaveDashboardMutation();
   const [state, onDashboardSave] = useAsyncFn(
-    async (clone: DashboardModel, options: SaveDashboardOptions, dashboard: DashboardModel) => {
+    async (clone: Dashboard, options: SaveDashboardOptions, dashboard: DashboardModel) => {
       try {
         const result = await saveDashboard(clone, options, dashboard, saveDashboardRtkQuery);
         dashboard.version = result.version;
-        dashboard.clearUnsavedChanges();
+
+        clone.version = result.version;
+        dashboard.clearUnsavedChanges(clone, options);
 
         // important that these happen before location redirect below
         appEvents.publish(new DashboardSavedEvent());
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/CreatePublicDashboard.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/CreatePublicDashboard.tsx
index 7d768f751f823..6cee539c1932b 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/CreatePublicDashboard.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/CreatePublicDashboard.tsx
@@ -46,7 +46,7 @@ const CreatePublicDashboard = ({ isError }: { isError: boolean }) => {
   return (
     <div className={styles.container}>
       <div>
-        <p className={styles.title}>Welcome to public dashboards public preview!</p>
+        <p className={styles.title}>Welcome to public dashboards!</p>
         <p className={styles.description}>Currently, we don’t support template variables or frontend data sources</p>
       </div>
 
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx
index 640ad444457de..c0eabd9428759 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx
@@ -195,7 +195,7 @@ describe('SharePublic - New config setup', () => {
   it('renders when public dashboards feature is enabled', async () => {
     await renderSharePublicDashboard();
 
-    await screen.findByText('Welcome to public dashboards public preview!');
+    await screen.findByText('Welcome to public dashboards!');
     expect(screen.getByText('Generate public URL')).toBeInTheDocument();
 
     expect(screen.queryByTestId(selectors.WillBePublicCheckbox)).toBeInTheDocument();
diff --git a/public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx b/public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx
index 1923a0fb30ff2..d0f7b3baa8f38 100644
--- a/public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx
+++ b/public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx
@@ -97,7 +97,7 @@ export class ShareSnapshot extends PureComponent<Props, State> {
 
   saveSnapshot = async (dashboard: DashboardModel, external?: boolean) => {
     const { snapshotExpires } = this.state;
-    const dash = this.dashboard.getSaveModelClone();
+    const dash = this.dashboard.getSaveModelCloneOld();
 
     this.scrubDashboard(dash);
 
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx
index 5a6f7fbcf6a22..0a714b49c5a6b 100644
--- a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx
@@ -14,6 +14,7 @@ import {
   TransformerRegistryItem,
   TransformerCategory,
   DataTransformerID,
+  TransformationApplicabilityLevels,
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { reportInteraction } from '@grafana/runtime';
@@ -486,6 +487,7 @@ class UnThemedTransformationsEditor extends React.PureComponent<TransformationsE
                 <TransformationsGrid
                   showIllustrations={this.state.showIllustrations}
                   transformations={xforms}
+                  data={this.state.data}
                   onClick={(id) => {
                     this.onTransformationAdd({ value: id });
                   }}
@@ -589,90 +591,98 @@ function TransformationCard({ transform, onClick }: TransformationCardProps) {
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    hide: css`
-      display: none;
-    `,
-    card: css`
-      margin: 0;
-      padding: ${theme.spacing(1)};
-    `,
-    grid: css`
-      display: grid;
-      grid-template-columns: repeat(auto-fill, minmax(220px, 1fr));
-      grid-auto-rows: 1fr;
-      gap: ${theme.spacing(2)} ${theme.spacing(1)};
-      width: 100%;
-    `,
-    newCard: css`
-      grid-template-rows: min-content 0 1fr 0;
-    `,
+    hide: css({
+      display: 'none',
+    }),
+    card: css({
+      margin: '0',
+      padding: `${theme.spacing(1)}`,
+    }),
+    grid: css({
+      display: 'grid',
+      gridTemplateColumns: 'repeat(auto-fill, minmax(220px, 1fr))',
+      gridAutoRows: '1fr',
+      gap: `${theme.spacing(2)} ${theme.spacing(1)}`,
+      width: '100%',
+    }),
+    newCard: css({
+      gridTemplateRows: 'min-content 0 1fr 0',
+    }),
+    cardDisabled: css({
+      backgroundColor: 'rgb(204, 204, 220, 0.045)',
+      color: `${theme.colors.text.disabled} !important`,
+    }),
     heading: css`
-      font-weight: 400;
-
-      > button {
-        width: 100%;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        flex-wrap: no-wrap;
-      }
-    `,
-    description: css`
-      font-size: 12px;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-    `,
-    image: css`
-      display: block;
-      max-width: 100%;
-      margin-top: ${theme.spacing(2)};
-    `,
-    searchWrapper: css`
-      display: flex;
-      flex-wrap: wrap;
-      column-gap: 27px;
-      row-gap: 16px;
-      width: 100%;
-    `,
-    searchInput: css`
-      flex-grow: 1;
-      width: initial;
-    `,
-    showImages: css`
-      flex-basis: 0;
-      display: flex;
-      gap: 8px;
-      align-items: center;
-    `,
-    pickerInformationLine: css`
-      font-size: 16px;
-      margin-bottom: ${theme.spacing(2)};
-    `,
-    pickerInformationLineHighlight: css`
-      vertical-align: middle;
-    `,
-    illustationSwitchLabel: css`
-      white-space: nowrap;
-    `,
-    filterWrapper: css`
-      padding: ${theme.spacing(1)} 0;
-      display: flex;
-      flex-wrap: wrap;
-      row-gap: ${theme.spacing(1)};
-      column-gap: ${theme.spacing(0.5)};
-    `,
-    listInformationLineWrapper: css`
-      display: flex;
-      justify-content: space-between;
-      margin-bottom: 24px;
-    `,
-    listInformationLineText: css`
-      font-size: 16px;
-    `,
-    pluginStateInfoWrapper: css`
-      margin-left: 5px;
+      font-weight: 400,
+      > button: {
+        width: '100%',
+        display: 'flex',
+        justify-content: 'space-between',
+        align-items: 'center',
+        flex-wrap: 'no-wrap',
+      },
     `,
+    description: css({
+      fontSize: '12px',
+      display: 'flex',
+      flexDirection: 'column',
+      justifyContent: 'space-between',
+    }),
+    image: css({
+      display: 'block',
+      maxEidth: '100%`',
+      marginTop: `${theme.spacing(2)}`,
+    }),
+    searchWrapper: css({
+      display: 'flex',
+      flexWrap: 'wrap',
+      columnGap: '27px',
+      rowGap: '16px',
+      width: '100%',
+    }),
+    searchInput: css({
+      flexGrow: '1',
+      width: 'initial',
+    }),
+    showImages: css({
+      flexBasis: '0',
+      display: 'flex',
+      gap: '8px',
+      alignItems: 'center',
+    }),
+    pickerInformationLine: css({
+      fontSize: '16px',
+      marginBottom: `${theme.spacing(2)}`,
+    }),
+    pickerInformationLineHighlight: css({
+      verticalAlign: 'middle',
+    }),
+    illustationSwitchLabel: css({
+      whiteSpace: 'nowrap',
+    }),
+    filterWrapper: css({
+      padding: `${theme.spacing(1)} 0`,
+      display: 'flex',
+      flexWrap: 'wrap',
+      rowGap: `${theme.spacing(1)}`,
+      columnGap: `${theme.spacing(0.5)}`,
+    }),
+    listInformationLineWrapper: css({
+      display: 'flex',
+      justifyContent: 'space-between',
+      marginBottom: '24px',
+    }),
+    listInformationLineText: css({
+      fontSize: '16px',
+    }),
+    pluginStateInfoWrapper: css({
+      marginLeft: '5px',
+    }),
+    cardApplicableInfo: css({
+      position: 'absolute',
+      bottom: `${theme.spacing(1)}`,
+      right: `${theme.spacing(1)}`,
+    }),
   };
 };
 
@@ -680,46 +690,88 @@ interface TransformationsGridProps {
   transformations: Array<TransformerRegistryItem<any>>;
   showIllustrations?: boolean;
   onClick: (id: string) => void;
+  data: DataFrame[];
 }
 
-function TransformationsGrid({ showIllustrations, transformations, onClick }: TransformationsGridProps) {
+function TransformationsGrid({ showIllustrations, transformations, onClick, data }: TransformationsGridProps) {
   const styles = useStyles2(getStyles);
 
   return (
     <div className={styles.grid}>
-      {transformations.map((transform) => (
-        <Card
-          key={transform.id}
-          className={styles.newCard}
-          data-testid={selectors.components.TransformTab.newTransform(transform.name)}
-          onClick={() => onClick(transform.id)}
-        >
-          <Card.Heading className={styles.heading}>
-            <>
-              <span>{transform.name}</span>
-              <span className={styles.pluginStateInfoWrapper}>
-                <PluginStateInfo state={transform.state} />
-              </span>
-            </>
-          </Card.Heading>
-          <Card.Description className={styles.description}>
-            <>
-              <span>{getTransformationsRedesignDescriptions(transform.id)}</span>
-              {showIllustrations && (
-                <span>
-                  <img className={styles.image} src={getImagePath(transform.id)} alt={transform.name} />
+      {transformations.map((transform) => {
+        // Check to see if the transform
+        // is applicable to the given data
+        let applicabilityScore = TransformationApplicabilityLevels.Applicable;
+        if (transform.transformation.isApplicable !== undefined) {
+          applicabilityScore = transform.transformation.isApplicable(data);
+        }
+        const isApplicable = applicabilityScore > 0;
+
+        let applicabilityDescription = null;
+        if (transform.transformation.isApplicableDescription !== undefined) {
+          if (typeof transform.transformation.isApplicableDescription === 'function') {
+            applicabilityDescription = transform.transformation.isApplicableDescription(data);
+          } else {
+            applicabilityDescription = transform.transformation.isApplicableDescription;
+          }
+        }
+
+        // Add disabled styles to disabled
+        let cardClasses = styles.newCard;
+        if (!isApplicable) {
+          cardClasses = cx(styles.newCard, styles.cardDisabled);
+        }
+
+        return (
+          <Card
+            className={cardClasses}
+            data-testid={selectors.components.TransformTab.newTransform(transform.name)}
+            onClick={() => onClick(transform.id)}
+            key={transform.id}
+          >
+            <Card.Heading className={styles.heading}>
+              <>
+                <span>{transform.name}</span>
+                <span className={styles.pluginStateInfoWrapper}>
+                  <PluginStateInfo state={transform.state} />
                 </span>
-              )}
-            </>
-          </Card.Description>
-        </Card>
-      ))}
+              </>
+            </Card.Heading>
+            <Card.Description className={styles.description}>
+              <>
+                <span>{getTransformationsRedesignDescriptions(transform.id)}</span>
+                {showIllustrations && (
+                  <span>
+                    <img
+                      className={styles.image}
+                      src={getImagePath(transform.id, !isApplicable)}
+                      alt={transform.name}
+                    />
+                  </span>
+                )}
+                {!isApplicable && applicabilityDescription !== null && (
+                  <IconButton
+                    className={styles.cardApplicableInfo}
+                    name="info-circle"
+                    tooltip={applicabilityDescription}
+                  />
+                )}
+              </>
+            </Card.Description>
+          </Card>
+        );
+      })}
     </div>
   );
 }
 
-const getImagePath = (id: string) => {
-  const folder = config.theme2.isDark ? 'dark' : 'light';
+const getImagePath = (id: string, disabled: boolean) => {
+  let folder = null;
+  if (!disabled) {
+    folder = config.theme2.isDark ? 'dark' : 'light';
+  } else {
+    folder = 'disabled';
+  }
 
   return `public/img/transformations/${folder}/${id}.svg`;
 };
diff --git a/public/app/features/dashboard/containers/EmbeddedDashboardPage.tsx b/public/app/features/dashboard/containers/EmbeddedDashboardPage.tsx
index 86a61bc4ea56d..d33fbfd1c90ea 100644
--- a/public/app/features/dashboard/containers/EmbeddedDashboardPage.tsx
+++ b/public/app/features/dashboard/containers/EmbeddedDashboardPage.tsx
@@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react';
 
 import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
 import { getBackendSrv, locationService } from '@grafana/runtime';
-import { TimeZone } from '@grafana/schema';
+import { Dashboard, TimeZone } from '@grafana/schema';
 import { Button, ModalsController, PageToolbar, useStyles2 } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { useGrafana } from 'app/core/context/GrafanaContext';
@@ -105,7 +105,7 @@ const Toolbar = ({ dashboard, dashboardJson }: ToolbarProps) => {
     dispatch(updateTimeZoneForSession(timeZone));
   };
 
-  const saveDashboard = async (clone: DashboardModel) => {
+  const saveDashboard = async (clone: Dashboard) => {
     const params = locationService.getSearch();
     const serverPort = params.get('serverPort');
     if (!clone || !serverPort) {
diff --git a/public/app/features/dashboard/containers/PublicDashboardPage.tsx b/public/app/features/dashboard/containers/PublicDashboardPage.tsx
index 861f7b6dd70f5..a4af9556c90ed 100644
--- a/public/app/features/dashboard/containers/PublicDashboardPage.tsx
+++ b/public/app/features/dashboard/containers/PublicDashboardPage.tsx
@@ -14,7 +14,8 @@ import { useSelector, useDispatch } from 'app/types';
 import { DashNavTimeControls } from '../components/DashNav/DashNavTimeControls';
 import { DashboardFailed } from '../components/DashboardLoading/DashboardFailed';
 import { DashboardLoading } from '../components/DashboardLoading/DashboardLoading';
-import { PublicDashboardFooter } from '../components/PublicDashboardFooter/PublicDashboardsFooter';
+import { PublicDashboardFooter } from '../components/PublicDashboard/PublicDashboardsFooter';
+import { useGetPublicDashboardConfig } from '../components/PublicDashboard/usePublicDashboardConfig';
 import { PublicDashboardNotAvailable } from '../components/PublicDashboardNotAvailable/PublicDashboardNotAvailable';
 import { DashboardGrid } from '../dashgrid/DashboardGrid';
 import { getTimeSrv } from '../services/TimeSrv';
@@ -37,13 +38,18 @@ const selectors = e2eSelectors.pages.PublicDashboard;
 
 const Toolbar = ({ dashboard }: { dashboard: DashboardModel }) => {
   const dispatch = useDispatch();
+  const conf = useGetPublicDashboardConfig();
 
   const onChangeTimeZone = (timeZone: TimeZone) => {
     dispatch(updateTimeZoneForSession(timeZone));
   };
 
   return (
-    <PageToolbar title={dashboard.title} buttonOverflowAlignment="right">
+    <PageToolbar
+      title={dashboard.title}
+      pageIcon={!conf.headerLogoHide ? 'grafana' : undefined}
+      buttonOverflowAlignment="right"
+    >
       {!dashboard.timepicker.hidden && (
         <DashNavTimeControls dashboard={dashboard} onChangeTimeZone={onChangeTimeZone} />
       )}
diff --git a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
index 2460cc5059a4d..924944700dcba 100644
--- a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
@@ -153,6 +153,7 @@ export class DashboardGrid extends PureComponent<Props> {
       const panelClasses = classNames({ 'react-grid-item--fullscreen': panel.isViewing });
 
       // used to allow overflowing content to show on top of the next panel
+      // requires parent create stacking context to prevent overlap with parent elements
       const descIndex = this.props.dashboard.panels.length - panelElements.length;
 
       panelElements.push(
@@ -230,9 +231,18 @@ export class DashboardGrid extends PureComponent<Props> {
      * We have a parent with "flex: 1 1 0" we need to reset it to "flex: 1 1 auto" to have the AutoSizer
      * properly working. For more information go here:
      * https://github.com/bvaughn/react-virtualized/blob/master/docs/usingAutoSizer.md#can-i-use-autosizer-within-a-flex-container
+     *
+     * pos: rel + z-index is required to create a new stacking context to contain the escalating z-indexes of the panels
      */
     return (
-      <div style={{ flex: '1 1 auto', display: this.props.editPanel ? 'none' : undefined }}>
+      <div
+        style={{
+          flex: '1 1 auto',
+          position: 'relative',
+          zIndex: 1,
+          display: this.props.editPanel ? 'none' : undefined,
+        }}
+      >
         <AutoSizer disableHeight>
           {({ width }) => {
             if (width === 0) {
diff --git a/public/app/features/dashboard/state/DashboardModel.test.ts b/public/app/features/dashboard/state/DashboardModel.test.ts
index 7db392e38d7bd..45294c5df9eec 100644
--- a/public/app/features/dashboard/state/DashboardModel.test.ts
+++ b/public/app/features/dashboard/state/DashboardModel.test.ts
@@ -130,7 +130,7 @@ describe('DashboardModel', () => {
       const saveModel = model.getSaveModelClone();
       const panels = saveModel.panels;
 
-      expect(panels.length).toBe(1);
+      expect(panels!.length).toBe(1);
     });
 
     it('should save model in edit mode', () => {
@@ -140,7 +140,7 @@ describe('DashboardModel', () => {
       const panel = model.initEditPanel(model.panels[0]);
       panel.title = 'updated';
 
-      const saveModel = model.getSaveModelClone();
+      const saveModel = model.getSaveModelCloneOld();
       const savedPanel = saveModel.panels[0];
 
       expect(savedPanel.title).toBe('updated');
@@ -204,7 +204,7 @@ describe('DashboardModel', () => {
     });
 
     it('getSaveModelClone should remove meta', () => {
-      const clone = model.getSaveModelClone();
+      const clone = model.getSaveModelCloneOld();
       expect(clone.meta).toBe(undefined);
     });
   });
@@ -608,37 +608,32 @@ describe('DashboardModel', () => {
       const options = { saveTimerange: false };
       const saveModel = model.getSaveModelClone(options);
 
-      expect(saveModel.time.from).toBe('now-6h');
-      expect(saveModel.time.to).toBe('now');
+      expect(saveModel.time!.from).toBe('now-6h');
+      expect(saveModel.time!.to).toBe('now');
     });
 
     it('getSaveModelClone should return updated time when saveTimerange=true', () => {
       const options = { saveTimerange: true };
       const saveModel = model.getSaveModelClone(options);
 
-      expect(saveModel.time.from).toBe('now-3h');
-      expect(saveModel.time.to).toBe('now-1h');
-    });
-
-    it('hasTimeChanged should be false when reset original time', () => {
-      model.resetOriginalTime();
-      expect(model.hasTimeChanged()).toBeFalsy();
+      expect(saveModel.time!.from).toBe('now-3h');
+      expect(saveModel.time!.to).toBe('now-1h');
     });
 
     it('getSaveModelClone should return original time when saveTimerange=false', () => {
       const options = { saveTimerange: false };
       const saveModel = model.getSaveModelClone(options);
 
-      expect(saveModel.time.from).toBe('now-6h');
-      expect(saveModel.time.to).toBe('now');
+      expect(saveModel.time!.from).toBe('now-6h');
+      expect(saveModel.time!.to).toBe('now');
     });
 
     it('getSaveModelClone should return updated time when saveTimerange=true', () => {
       const options = { saveTimerange: true };
       const saveModel = model.getSaveModelClone(options);
 
-      expect(saveModel.time.from).toBe('now-3h');
-      expect(saveModel.time.to).toBe('now-1h');
+      expect(saveModel.time!.from).toBe('now-3h');
+      expect(saveModel.time!.to).toBe('now-1h');
     });
 
     it('getSaveModelClone should remove repeated panels and scopedVars', () => {
@@ -684,13 +679,13 @@ describe('DashboardModel', () => {
       expect(model.panels.find((x) => x.type !== 'row')?.scopedVars?.dc?.value).toBe('dc1');
       expect(model.panels.find((x) => x.type !== 'row')?.scopedVars?.app?.value).toBe('se1');
 
-      const saveModel = model.getSaveModelClone();
+      const saveModel = model.getSaveModelCloneOld();
       expect(saveModel.panels.length).toBe(2);
       expect(saveModel.panels[0].scopedVars).toBe(undefined);
       expect(saveModel.panels[1].scopedVars).toBe(undefined);
 
       model.collapseRows();
-      const savedModelWithCollapsedRows = model.getSaveModelClone();
+      const savedModelWithCollapsedRows = model.getSaveModelCloneOld();
       expect(savedModelWithCollapsedRows.panels[0].panels!.length).toBe(1);
     });
 
@@ -738,14 +733,14 @@ describe('DashboardModel', () => {
       expect(model.panels.find((x) => x.type !== 'row')?.scopedVars?.app?.value).toBe('se1');
 
       model.snapshot = { timestamp: new Date() };
-      const saveModel = model.getSaveModelClone();
+      const saveModel = model.getSaveModelCloneOld();
       expect(saveModel.panels.filter((x) => x.type === 'row')).toHaveLength(2);
       expect(saveModel.panels.filter((x) => x.type !== 'row')).toHaveLength(4);
       expect(saveModel.panels.find((x) => x.type !== 'row')?.scopedVars?.dc?.value).toBe('dc1');
       expect(saveModel.panels.find((x) => x.type !== 'row')?.scopedVars?.app?.value).toBe('se1');
 
       model.collapseRows();
-      const savedModelWithCollapsedRows = model.getSaveModelClone();
+      const savedModelWithCollapsedRows = model.getSaveModelCloneOld();
       expect(savedModelWithCollapsedRows.panels[0].panels!.length).toBe(2);
     });
   });
@@ -760,6 +755,8 @@ describe('DashboardModel', () => {
             {
               name: 'Server',
               type: 'query',
+              refresh: 1,
+              options: [],
               current: {
                 selected: true,
                 text: 'server_001',
@@ -770,10 +767,10 @@ describe('DashboardModel', () => {
         },
       };
       model = getDashboardModel(json);
-      expect(model.hasVariableValuesChanged()).toBeFalsy();
+      expect(model.hasVariablesChanged()).toBeFalsy();
     });
 
-    it('hasVariableValuesChanged should be false when adding a template variable', () => {
+    it('hasVariablesChanged should be false when adding a template variable', () => {
       model.templating.list.push({
         name: 'Server2',
         type: 'query',
@@ -783,24 +780,24 @@ describe('DashboardModel', () => {
           value: 'server_002',
         },
       });
-      expect(model.hasVariableValuesChanged()).toBeFalsy();
+      expect(model.hasVariablesChanged()).toBeFalsy();
     });
 
-    it('hasVariableValuesChanged should be false when removing existing template variable', () => {
+    it('hasVariablesChanged should be false when removing existing template variable', () => {
       model.templating.list = [];
-      expect(model.hasVariableValuesChanged()).toBeFalsy();
+      expect(model.hasVariablesChanged()).toBeFalsy();
     });
 
-    it('hasVariableValuesChanged should be true when changing value of template variable', () => {
+    it('hasVariablesChanged should be true when changing value of template variable', () => {
       model.templating.list[0].current.text = 'server_002';
-      expect(model.hasVariableValuesChanged()).toBeTruthy();
+      expect(model.hasVariablesChanged()).toBeTruthy();
     });
 
     it('getSaveModelClone should return original variable when saveVariables=false', () => {
       model.templating.list[0].current.text = 'server_002';
 
       const options = { saveVariables: false };
-      const saveModel = model.getSaveModelClone(options);
+      const saveModel = model.getSaveModelCloneOld(options);
 
       expect(saveModel.templating.list[0].current.text).toBe('server_001');
     });
@@ -809,7 +806,7 @@ describe('DashboardModel', () => {
       model.templating.list[0].current.text = 'server_002';
 
       const options = { saveVariables: true };
-      const saveModel = model.getSaveModelClone(options);
+      const saveModel = model.getSaveModelCloneOld(options);
 
       expect(saveModel.templating.list[0].current.text).toBe('server_002');
     });
@@ -825,6 +822,7 @@ describe('DashboardModel', () => {
             {
               name: 'Filter',
               type: 'adhoc',
+              refresh: 0,
               filters: [
                 {
                   key: '@hostname',
@@ -837,10 +835,10 @@ describe('DashboardModel', () => {
         },
       };
       model = getDashboardModel(json);
-      expect(model.hasVariableValuesChanged()).toBeFalsy();
+      expect(model.hasVariablesChanged()).toBeFalsy();
     });
 
-    it('hasVariableValuesChanged should be false when adding a template variable', () => {
+    it('hasVariablesChanged should be false when adding a template variable', () => {
       model.templating.list.push({
         name: 'Filter',
         type: 'adhoc',
@@ -852,34 +850,34 @@ describe('DashboardModel', () => {
           },
         ],
       });
-      expect(model.hasVariableValuesChanged()).toBeFalsy();
+      expect(model.hasVariablesChanged()).toBeFalsy();
     });
 
-    it('hasVariableValuesChanged should be false when removing existing template variable', () => {
+    it('hasVariablesChanged should be false when removing existing template variable', () => {
       model.templating.list = [];
-      expect(model.hasVariableValuesChanged()).toBeFalsy();
+      expect(model.hasVariablesChanged()).toBeFalsy();
     });
 
-    it('hasVariableValuesChanged should be true when changing value of filter', () => {
+    it('hasVariablesChanged should be true when changing value of filter', () => {
       model.templating.list[0].filters[0].value = 'server 1';
-      expect(model.hasVariableValuesChanged()).toBeTruthy();
+      expect(model.hasVariablesChanged()).toBeTruthy();
     });
 
-    it('hasVariableValuesChanged should be true when adding an additional condition', () => {
+    it('hasVariablesChanged should be true when adding an additional condition', () => {
       model.templating.list[0].filters[0].condition = 'AND';
       model.templating.list[0].filters[1] = {
         key: '@metric',
         operator: '=',
         value: 'logins.count',
       };
-      expect(model.hasVariableValuesChanged()).toBeTruthy();
+      expect(model.hasVariablesChanged()).toBeTruthy();
     });
 
     it('getSaveModelClone should return original variable when saveVariables=false', () => {
       model.templating.list[0].filters[0].value = 'server 1';
 
       const options = { saveVariables: false };
-      const saveModel = model.getSaveModelClone(options);
+      const saveModel = model.getSaveModelCloneOld(options);
 
       expect(saveModel.templating.list[0].filters[0].value).toBe('server 20');
     });
@@ -888,7 +886,7 @@ describe('DashboardModel', () => {
       model.templating.list[0].filters[0].value = 'server 1';
 
       const options = { saveVariables: true };
-      const saveModel = model.getSaveModelClone(options);
+      const saveModel = model.getSaveModelCloneOld(options);
 
       expect(saveModel.templating.list[0].filters[0].value).toBe('server 1');
     });
diff --git a/public/app/features/dashboard/state/DashboardModel.ts b/public/app/features/dashboard/state/DashboardModel.ts
index d99b0f89628b9..a42b88837b1e6 100644
--- a/public/app/features/dashboard/state/DashboardModel.ts
+++ b/public/app/features/dashboard/state/DashboardModel.ts
@@ -24,7 +24,6 @@ import { GRID_CELL_HEIGHT, GRID_CELL_VMARGIN, GRID_COLUMN_COUNT, REPEAT_DIR_VERT
 import { contextSrv } from 'app/core/services/context_srv';
 import { sortedDeepCloneWithoutNulls } from 'app/core/utils/object';
 import { isAngularDatasourcePlugin } from 'app/features/plugins/angularDeprecation/utils';
-import { deepFreeze } from 'app/features/plugins/extensions/utils';
 import { variableAdapters } from 'app/features/variables/adapters';
 import { onTimeRangeUpdated } from 'app/features/variables/state/actions';
 import { GetVariables, getVariablesByKey } from 'app/features/variables/state/selectors';
@@ -175,12 +174,12 @@ export class DashboardModel implements TimeModel {
     this.panels = map(data.panels ?? [], (panelData: any) => new PanelModel(panelData));
     // Deep clone original dashboard to avoid mutations by object reference
     this.originalDashboard = cloneDeep(data);
+    this.originalTemplating = cloneDeep(this.templating);
+    this.originalTime = cloneDeep(this.time);
+
     this.ensurePanelsHaveUniqueIds();
     this.formatDate = this.formatDate.bind(this);
 
-    this.resetOriginalVariables(true);
-    this.resetOriginalTime();
-
     this.initMeta(meta);
     this.updateSchema(data);
 
@@ -248,9 +247,11 @@ export class DashboardModel implements TimeModel {
     this.meta = meta;
   }
 
-  // cleans meta data and other non persistent state
-  getSaveModelClone(options?: CloneOptions): DashboardModel {
-    const defaults = _defaults(options || {}, {
+  /**
+   * @deprecated Returns the wrong type please do not use
+   */
+  getSaveModelCloneOld(options?: CloneOptions): DashboardModel {
+    const optionsWithDefaults = _defaults(options || {}, {
       saveVariables: true,
       saveTimerange: true,
     });
@@ -265,9 +266,9 @@ export class DashboardModel implements TimeModel {
       copy[property] = cloneDeep(this[property]);
     }
 
-    this.updateTemplatingSaveModelClone(copy, defaults);
+    copy.templating = this.getTemplatingSaveModel(optionsWithDefaults);
 
-    if (!defaults.saveTimerange) {
+    if (!optionsWithDefaults.saveTimerange) {
       copy.time = this.originalTime;
     }
 
@@ -281,6 +282,19 @@ export class DashboardModel implements TimeModel {
     return copy;
   }
 
+  /**
+   * Returns the persisted save model (schema) of the dashboard
+   */
+  getSaveModelClone(options?: CloneOptions): Dashboard {
+    const clone = this.getSaveModelCloneOld(options);
+
+    // This is a bit messy / hacky but it's how we clean the model of any nulls / undefined / infinity
+    const cloneJSON = JSON.stringify(clone);
+    const cloneSafe = JSON.parse(cloneJSON);
+
+    return cloneSafe;
+  }
+
   /**
    * This will load a new dashboard, but keep existing panels unchanged
    *
@@ -353,36 +367,35 @@ export class DashboardModel implements TimeModel {
       });
   }
 
-  private updateTemplatingSaveModelClone(
-    copy: any,
-    defaults: { saveTimerange: boolean; saveVariables: boolean } & CloneOptions
-  ) {
-    const originalVariables = this.originalTemplating;
+  private getTemplatingSaveModel(options: CloneOptions) {
+    const originalVariables = this.originalTemplating?.list ?? [];
     const currentVariables = this.getVariablesFromState(this.uid);
 
-    copy.templating = {
-      list: currentVariables.map((variable) =>
-        variableAdapters.get(variable.type).getSaveModel(variable, defaults.saveVariables)
-      ),
-    };
+    const saveModels = currentVariables.map((variable) => {
+      const variableSaveModel = variableAdapters.get(variable.type).getSaveModel(variable, options.saveVariables);
 
-    if (!defaults.saveVariables) {
-      for (const current of copy.templating.list) {
+      if (!options.saveVariables) {
         const original = originalVariables.find(
-          ({ name, type }: any) => name === current.name && type === current.type
+          ({ name, type }: any) => name === variable.name && type === variable.type
         );
 
         if (!original) {
-          continue;
+          return variableSaveModel;
         }
 
-        if (current.type === 'adhoc') {
-          current.filters = original.filters;
+        if (variable.type === 'adhoc') {
+          variableSaveModel.filters = original.filters;
         } else {
-          current.current = original.current;
+          variableSaveModel.current = original.current;
+          variableSaveModel.options = original.options;
         }
       }
-    }
+
+      return variableSaveModel;
+    });
+
+    const saveModelsWithoutNull = sortedDeepCloneWithoutNulls(saveModels);
+    return { list: saveModelsWithoutNull };
   }
 
   timeRangeUpdated(timeRange: TimeRange) {
@@ -567,7 +580,7 @@ export class DashboardModel implements TimeModel {
     });
   }
 
-  clearUnsavedChanges() {
+  clearUnsavedChanges(savedModel: Dashboard, options: CloneOptions) {
     for (const panel of this.panels) {
       panel.configRev = 0;
     }
@@ -577,6 +590,13 @@ export class DashboardModel implements TimeModel {
       this.panelInEdit.hasSavedPanelEditChange = this.panelInEdit.configRev > 0;
       this.panelInEdit.configRev = 0;
     }
+
+    this.originalDashboard = savedModel;
+    this.originalTemplating = savedModel.templating;
+
+    if (options.saveTimerange) {
+      this.originalTime = savedModel.time;
+    }
   }
 
   hasUnsavedChanges() {
@@ -1082,10 +1102,6 @@ export class DashboardModel implements TimeModel {
     migrator.updateSchema(old);
   }
 
-  resetOriginalTime() {
-    this.originalTime = deepFreeze(this.time);
-  }
-
   hasTimeChanged() {
     const { time, originalTime } = this;
 
@@ -1097,19 +1113,6 @@ export class DashboardModel implements TimeModel {
     );
   }
 
-  resetOriginalVariables(initial = false) {
-    if (initial) {
-      this.originalTemplating = this.cloneVariablesFrom(this.templating.list);
-      return;
-    }
-
-    this.originalTemplating = this.cloneVariablesFrom(this.getVariablesFromState(this.uid));
-  }
-
-  hasVariableValuesChanged() {
-    return this.hasVariablesChanged(this.originalTemplating, this.getVariablesFromState(this.uid));
-  }
-
   autoFitPanels(viewHeight: number, kioskMode?: UrlQueryValue) {
     const currentGridHeight = Math.max(...this.panels.map((panel) => panel.gridPos.h + panel.gridPos.y));
 
@@ -1245,28 +1248,15 @@ export class DashboardModel implements TimeModel {
     return this.getVariablesFromState(this.uid).length > 0;
   }
 
-  private hasVariablesChanged(originalVariables: any[], currentVariables: any[]): boolean {
+  public hasVariablesChanged(): boolean {
+    const originalVariables = this.originalTemplating?.list ?? [];
+    const currentVariables = this.getTemplatingSaveModel({ saveVariables: true }).list;
+
     if (originalVariables.length !== currentVariables.length) {
       return false;
     }
 
-    const updated = currentVariables.map((variable: any) => ({
-      name: variable.name,
-      type: variable.type,
-      current: cloneDeep(variable.current),
-      filters: cloneDeep(variable.filters),
-    }));
-
-    return !isEqual(updated, originalVariables);
-  }
-
-  private cloneVariablesFrom(variables: any[]) {
-    return variables.map((variable) => ({
-      name: variable.name,
-      type: variable.type,
-      current: deepFreeze(variable.current),
-      filters: deepFreeze(variable.filters),
-    }));
+    return !isEqual(currentVariables, originalVariables);
   }
 
   private variablesTimeRangeProcessDoneHandler(event: VariablesTimeRangeProcessDone) {
diff --git a/public/app/features/dashboard/utils/getPanelMenu.test.ts b/public/app/features/dashboard/utils/getPanelMenu.test.ts
index afffadcd47fe9..ad194684d10a4 100644
--- a/public/app/features/dashboard/utils/getPanelMenu.test.ts
+++ b/public/app/features/dashboard/utils/getPanelMenu.test.ts
@@ -12,8 +12,10 @@ import {
 } from '@grafana/data';
 import { AngularComponent, getPluginLinkExtensions } from '@grafana/runtime';
 import config from 'app/core/config';
+import { grantUserPermissions } from 'app/features/alerting/unified/mocks';
 import * as actions from 'app/features/explore/state/main';
 import { setStore } from 'app/store/store';
+import { AccessControlAction } from 'app/types';
 
 import { PanelModel } from '../state';
 import { createDashboardModelFixture } from '../state/__fixtures__/dashboardFixtures';
@@ -23,6 +25,7 @@ import { getPanelMenu } from './getPanelMenu';
 jest.mock('app/core/services/context_srv', () => ({
   contextSrv: {
     hasAccessToExplore: () => true,
+    hasPermission: jest.fn(),
   },
 }));
 
@@ -38,6 +41,8 @@ describe('getPanelMenu()', () => {
   beforeEach(() => {
     getPluginLinkExtensionsMock.mockRestore();
     getPluginLinkExtensionsMock.mockReturnValue({ extensions: [] });
+    grantUserPermissions([AccessControlAction.AlertingRuleRead, AccessControlAction.AlertingRuleUpdate]);
+    config.unifiedAlertingEnabled = false;
   });
 
   it('should return the correct panel menu items', () => {
@@ -295,6 +300,97 @@ describe('getPanelMenu()', () => {
       expect(getPluginLinkExtensionsMock).toBeCalledWith(expect.objectContaining({ context }));
     });
 
+    it('should pass context with default time zone values when configuring extension', () => {
+      const data: PanelData = {
+        series: [
+          toDataFrame({
+            fields: [
+              { name: 'time', type: FieldType.time },
+              { name: 'score', type: FieldType.number },
+            ],
+          }),
+        ],
+        timeRange: {
+          from: dateTime(),
+          to: dateTime(),
+          raw: {
+            from: 'now',
+            to: 'now-1h',
+          },
+        },
+        state: LoadingState.Done,
+      };
+
+      const panel = new PanelModel({
+        type: 'timeseries',
+        id: 1,
+        title: 'My panel',
+        targets: [
+          {
+            refId: 'A',
+            datasource: {
+              type: 'testdata',
+            },
+          },
+        ],
+        scopedVars: {
+          a: {
+            text: 'a',
+            value: 'a',
+          },
+        },
+        queryRunner: {
+          getLastResult: jest.fn(() => data),
+        },
+      });
+
+      const dashboard = createDashboardModelFixture({
+        timezone: '',
+        time: {
+          from: 'now-5m',
+          to: 'now',
+        },
+        tags: ['database', 'panel'],
+        uid: '123',
+        title: 'My dashboard',
+      });
+
+      getPanelMenu(dashboard, panel);
+
+      const context: PluginExtensionPanelContext = {
+        pluginId: 'timeseries',
+        id: 1,
+        title: 'My panel',
+        timeZone: 'browser',
+        timeRange: {
+          from: 'now-5m',
+          to: 'now',
+        },
+        targets: [
+          {
+            refId: 'A',
+            datasource: {
+              type: 'testdata',
+            },
+          },
+        ],
+        dashboard: {
+          tags: ['database', 'panel'],
+          uid: '123',
+          title: 'My dashboard',
+        },
+        scopedVars: {
+          a: {
+            text: 'a',
+            value: 'a',
+          },
+        },
+        data,
+      };
+
+      expect(getPluginLinkExtensionsMock).toBeCalledWith(expect.objectContaining({ context }));
+    });
+
     it('should contain menu item with category', () => {
       getPluginLinkExtensionsMock.mockReturnValue({
         extensions: [
@@ -528,4 +624,57 @@ describe('getPanelMenu()', () => {
       expect(windowOpen).toHaveBeenLastCalledWith(`${testSubUrl}${testUrl}`);
     });
   });
+  describe('Alerting menu', () => {
+    it('should render Create alert menu item if user has permissions to read and update alerts ', () => {
+      const panel = new PanelModel({});
+
+      const dashboard = createDashboardModelFixture({});
+      config.unifiedAlertingEnabled = true;
+      grantUserPermissions([AccessControlAction.AlertingRuleRead, AccessControlAction.AlertingRuleUpdate]);
+      const menuItems = getPanelMenu(dashboard, panel);
+      const moreSubMenu = menuItems.find((i) => i.text === 'More...')?.subMenu;
+
+      expect(moreSubMenu).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            text: 'Create alert',
+          }),
+        ])
+      );
+    });
+
+    it('should not render Create alert menu item, if user does not have permissions to update alerts ', () => {
+      const panel = new PanelModel({});
+      const dashboard = createDashboardModelFixture({});
+
+      grantUserPermissions([AccessControlAction.AlertingRuleRead]);
+      config.unifiedAlertingEnabled = true;
+
+      const menuItems = getPanelMenu(dashboard, panel);
+
+      const moreSubMenu = menuItems.find((i) => i.text === 'More...')?.subMenu;
+
+      expect(moreSubMenu).toEqual(
+        expect.arrayContaining([
+          expect.not.objectContaining({
+            text: 'Create alert',
+          }),
+        ])
+      );
+    });
+    it('should not render Create alert menu item, if user does not have permissions to read update alerts ', () => {
+      const panel = new PanelModel({});
+
+      const dashboard = createDashboardModelFixture({});
+      grantUserPermissions([]);
+      config.unifiedAlertingEnabled = true;
+
+      const menuItems = getPanelMenu(dashboard, panel);
+
+      const moreSubMenu = menuItems.find((i) => i.text === 'More...')?.subMenu;
+      const createAlertOption = moreSubMenu?.find((i) => i.text === 'Create alert')?.subMenu;
+
+      expect(createAlertOption).toBeUndefined();
+    });
+  });
 });
diff --git a/public/app/features/dashboard/utils/getPanelMenu.ts b/public/app/features/dashboard/utils/getPanelMenu.ts
index 64e5d2eeff24c..0894368211d6c 100644
--- a/public/app/features/dashboard/utils/getPanelMenu.ts
+++ b/public/app/features/dashboard/utils/getPanelMenu.ts
@@ -1,15 +1,18 @@
 import {
+  getTimeZone,
   PanelMenuItem,
   PluginExtensionLink,
   PluginExtensionPoints,
+  urlUtil,
   type PluginExtensionPanelContext,
 } from '@grafana/data';
-import { AngularComponent, locationService, reportInteraction, getPluginLinkExtensions } from '@grafana/runtime';
+import { AngularComponent, getPluginLinkExtensions, locationService, reportInteraction } from '@grafana/runtime';
 import { PanelCtrl } from 'app/angular/panel/panel_ctrl';
 import config from 'app/core/config';
 import { t } from 'app/core/internationalization';
 import { contextSrv } from 'app/core/services/context_srv';
 import { getExploreUrl } from 'app/core/utils/explore';
+import { panelToRuleFormValues } from 'app/features/alerting/unified/utils/rule-form';
 import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
 import { PanelModel } from 'app/features/dashboard/state/PanelModel';
 import {
@@ -27,6 +30,7 @@ import { truncateTitle } from 'app/features/plugins/extensions/utils';
 import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
 import { store } from 'app/store/store';
 
+import { getCreateAlertInMenuAvailability } from '../../alerting/unified/utils/access-control';
 import { navigateToExplore } from '../../explore/state/main';
 import { getTimeSrv } from '../services/TimeSrv';
 
@@ -201,8 +205,27 @@ export function getPanelMenu(
     subMenu: inspectMenu,
   });
 
+  const createAlert = async () => {
+    const formValues = await panelToRuleFormValues(panel, dashboard);
+
+    const ruleFormUrl = urlUtil.renderUrl('/alerting/new', {
+      defaults: JSON.stringify(formValues),
+      returnTo: location.pathname + location.search,
+    });
+
+    locationService.push(ruleFormUrl);
+  };
+
+  const onCreateAlert = (event: React.MouseEvent) => {
+    event.preventDefault();
+    createAlert();
+    reportInteraction('dashboards_panelheader_menu', { item: 'create-alert' });
+  };
+
   const subMenu: PanelMenuItem[] = [];
   const canEdit = dashboard.canEditPanel(panel);
+  const isCreateAlertMenuOptionAvailable = getCreateAlertInMenuAvailability();
+
   if (!(panel.isViewing || panel.isEditing)) {
     if (canEdit) {
       subMenu.push({
@@ -236,6 +259,13 @@ export function getPanelMenu(
     }
   }
 
+  if (isCreateAlertMenuOptionAvailable) {
+    subMenu.push({
+      text: t('panel.header-menu.create-alert', `Create alert`),
+      onClick: onCreateAlert,
+    });
+  }
+
   // add old angular panel options
   if (angularComponent) {
     const scope = angularComponent.getScope();
@@ -272,6 +302,12 @@ export function getPanelMenu(
   // When editing hide most actions
   if (panel.isEditing) {
     subMenu.length = 0;
+    if (isCreateAlertMenuOptionAvailable) {
+      subMenu.push({
+        text: t('panel.header-menu.create-alert', `Create alert`),
+        onClick: onCreateAlert,
+      });
+    }
   }
 
   if (canEdit && panel.plugin && !panel.plugin.meta.skipDataQuery) {
@@ -326,7 +362,9 @@ function createExtensionContext(panel: PanelModel, dashboard: DashboardModel): P
     pluginId: panel.type,
     title: panel.title,
     timeRange: dashboard.time,
-    timeZone: dashboard.timezone,
+    timeZone: getTimeZone({
+      timeZone: dashboard.timezone,
+    }),
     dashboard: {
       uid: dashboard.uid,
       title: dashboard.title,
diff --git a/public/app/features/dashboard/utils/loadSnapshotData.ts b/public/app/features/dashboard/utils/loadSnapshotData.ts
index b0068246693e8..ccd169140eace 100644
--- a/public/app/features/dashboard/utils/loadSnapshotData.ts
+++ b/public/app/features/dashboard/utils/loadSnapshotData.ts
@@ -36,6 +36,7 @@ export function loadSnapshotData(panel: PanelModel, dashboard: DashboardModel):
       theme: config.theme2,
       timeZone: dashboard.getTimezone(),
     }),
+    structureRev: 1,
     annotations,
   };
 }
diff --git a/public/app/features/dashboard/utils/panelMerge.test.ts b/public/app/features/dashboard/utils/panelMerge.test.ts
index 4aa420ee76def..4bc201aa8ad21 100644
--- a/public/app/features/dashboard/utils/panelMerge.test.ts
+++ b/public/app/features/dashboard/utils/panelMerge.test.ts
@@ -41,7 +41,7 @@ describe('Merge dashboard panels', () => {
           }),
         ],
       });
-      rawPanels = dashboard.getSaveModelClone().panels;
+      rawPanels = dashboard.getSaveModelCloneOld().panels;
     });
 
     it('should load and support noop', () => {
diff --git a/public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.tsx b/public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.tsx
index 0d5578265fb32..b980f611d4fb5 100644
--- a/public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.tsx
+++ b/public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.tsx
@@ -9,18 +9,9 @@ import {
   Threshold,
   ThresholdsConfig,
   ThresholdsMode,
-} from '@grafana/data';
-import {
-  Button,
-  ColorPicker,
-  colors,
-  IconButton,
-  Input,
-  Label,
-  RadioButtonGroup,
-  stylesFactory,
   ThemeContext,
-} from '@grafana/ui';
+} from '@grafana/data';
+import { Button, ColorPicker, colors, IconButton, Input, Label, RadioButtonGroup, stylesFactory } from '@grafana/ui';
 
 const modes: Array<SelectableValue<ThresholdsMode>> = [
   { value: ThresholdsMode.Absolute, label: 'Absolute', description: 'Pick thresholds based on the absolute values' },
diff --git a/public/app/features/explore/ContentOutline/ContentOutline.test.tsx b/public/app/features/explore/ContentOutline/ContentOutline.test.tsx
new file mode 100644
index 0000000000000..88b0945b88ad5
--- /dev/null
+++ b/public/app/features/explore/ContentOutline/ContentOutline.test.tsx
@@ -0,0 +1,70 @@
+import { render, screen, fireEvent } from '@testing-library/react';
+import React from 'react';
+
+import { ContentOutline } from './ContentOutline';
+
+jest.mock('./ContentOutlineContext', () => ({
+  useContentOutlineContext: jest.fn(),
+}));
+
+const scrollIntoViewMock = jest.fn();
+const scrollerMock = document.createElement('div');
+
+const setup = () => {
+  HTMLElement.prototype.scrollIntoView = scrollIntoViewMock;
+
+  scrollerMock.scroll = jest.fn();
+
+  // Mock useContentOutlineContext with custom outlineItems
+  const mockUseContentOutlineContext = require('./ContentOutlineContext').useContentOutlineContext;
+  mockUseContentOutlineContext.mockReturnValue({
+    outlineItems: [
+      {
+        id: 'item-1',
+        icon: 'test-icon',
+        title: 'Item 1',
+        ref: document.createElement('div'),
+      },
+      {
+        id: 'item-2',
+        icon: 'test-icon',
+        title: 'Item 2',
+        ref: document.createElement('div'),
+      },
+    ],
+    register: jest.fn(),
+    unregister: jest.fn(),
+  });
+
+  return render(<ContentOutline scroller={scrollerMock} panelId="content-outline-container-1" />);
+};
+
+describe('<ContentOutline />', () => {
+  beforeEach(() => {
+    setup();
+  });
+
+  it('toggles content on button click', () => {
+    let showContentOutlineButton = screen.getByLabelText('Expand content outline');
+    expect(showContentOutlineButton).toBeInTheDocument();
+
+    fireEvent.click(showContentOutlineButton);
+    const hideContentOutlineButton = screen.getByText('Collapse outline');
+    expect(hideContentOutlineButton).toBeInTheDocument();
+
+    fireEvent.click(hideContentOutlineButton);
+    showContentOutlineButton = screen.getByLabelText('Expand content outline');
+    expect(showContentOutlineButton).toBeInTheDocument();
+  });
+
+  it('scrolls into view on content button click', () => {
+    const itemButtons = screen.getAllByLabelText(/Item/i);
+
+    itemButtons.forEach((button) => {
+      fireEvent.click(button);
+
+      //assert scrollIntoView is called
+      expect(scrollerMock.scroll).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/public/app/features/explore/ContentOutline/ContentOutline.tsx b/public/app/features/explore/ContentOutline/ContentOutline.tsx
new file mode 100644
index 0000000000000..01b9be893ae20
--- /dev/null
+++ b/public/app/features/explore/ContentOutline/ContentOutline.tsx
@@ -0,0 +1,94 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import { useToggle } from 'react-use';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
+import { useStyles2, PanelContainer, CustomScrollbar } from '@grafana/ui';
+
+import { useContentOutlineContext } from './ContentOutlineContext';
+import { ContentOutlineItemButton } from './ContentOutlineItemButton';
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    wrapper: css({
+      label: 'wrapper',
+      position: 'relative',
+      display: 'flex',
+      justifyContent: 'center',
+      marginRight: theme.spacing(1),
+      height: '100%',
+      backgroundColor: theme.colors.background.primary,
+    }),
+    content: css({
+      label: 'content',
+      top: 0,
+    }),
+    buttonStyles: css({
+      textAlign: 'left',
+      width: '100%',
+      padding: theme.spacing(0, 1.5),
+    }),
+  };
+};
+
+export function ContentOutline({ scroller, panelId }: { scroller: HTMLElement | undefined; panelId: string }) {
+  const [expanded, toggleExpanded] = useToggle(false);
+  const styles = useStyles2((theme) => getStyles(theme));
+  const { outlineItems } = useContentOutlineContext();
+
+  const scrollIntoView = (ref: HTMLElement | null, buttonTitle: string) => {
+    let scrollValue = 0;
+    let el: HTMLElement | null | undefined = ref;
+
+    do {
+      scrollValue += el?.offsetTop || 0;
+      el = el?.offsetParent as HTMLElement;
+    } while (el && el !== scroller);
+
+    scroller?.scroll({
+      top: scrollValue,
+      behavior: 'smooth',
+    });
+    reportInteraction('explore_toolbar_contentoutline_clicked', {
+      item: 'select_section',
+      type: buttonTitle,
+    });
+  };
+
+  const toggle = () => {
+    toggleExpanded();
+    reportInteraction('explore_toolbar_contentoutline_clicked', {
+      item: 'outline',
+      type: expanded ? 'minimize' : 'expand',
+    });
+  };
+
+  return (
+    <PanelContainer className={styles.wrapper} id={panelId}>
+      <CustomScrollbar>
+        <div className={styles.content}>
+          <ContentOutlineItemButton
+            title={expanded ? 'Collapse outline' : undefined}
+            icon={expanded ? 'angle-left' : 'angle-right'}
+            onClick={toggle}
+            tooltip={!expanded ? 'Expand content outline' : undefined}
+            className={styles.buttonStyles}
+            aria-expanded={expanded}
+          />
+
+          {outlineItems.map((item) => (
+            <ContentOutlineItemButton
+              key={item.id}
+              title={expanded ? item.title : undefined}
+              className={styles.buttonStyles}
+              icon={item.icon}
+              onClick={() => scrollIntoView(item.ref, item.title)}
+              tooltip={!expanded ? item.title : undefined}
+            />
+          ))}
+        </div>
+      </CustomScrollbar>
+    </PanelContainer>
+  );
+}
diff --git a/public/app/features/explore/ContentOutline/ContentOutlineContext.tsx b/public/app/features/explore/ContentOutline/ContentOutlineContext.tsx
new file mode 100644
index 0000000000000..5ca319431e1d5
--- /dev/null
+++ b/public/app/features/explore/ContentOutline/ContentOutlineContext.tsx
@@ -0,0 +1,64 @@
+import { uniqueId } from 'lodash';
+import React, { useState, useContext, createContext, ReactNode, useCallback } from 'react';
+
+import { ContentOutlineItemBaseProps } from './ContentOutlineItem';
+
+export interface ContentOutlineItemContextProps extends ContentOutlineItemBaseProps {
+  id: string;
+  ref: HTMLElement | null;
+}
+
+type RegisterFunction = ({ title, icon, ref }: Omit<ContentOutlineItemContextProps, 'id'>) => string;
+
+interface ContentOutlineContextProps {
+  outlineItems: ContentOutlineItemContextProps[];
+  register: RegisterFunction;
+  unregister: (id: string) => void;
+}
+
+const ContentOutlineContext = createContext<ContentOutlineContextProps | undefined>(undefined);
+
+export const ContentOutlineContextProvider = ({ children }: { children: ReactNode }) => {
+  const [outlineItems, setOutlineItems] = useState<ContentOutlineItemContextProps[]>([]);
+
+  const register: RegisterFunction = useCallback(({ title, icon, ref }) => {
+    const id = uniqueId(`${title}-${icon}_`);
+
+    setOutlineItems((prevItems) => {
+      const updatedItems = [...prevItems, { id, title, icon, ref }];
+
+      return updatedItems.sort((a, b) => {
+        if (a.ref && b.ref) {
+          const diff = a.ref.compareDocumentPosition(b.ref);
+          if (diff === Node.DOCUMENT_POSITION_PRECEDING) {
+            return 1;
+          } else if (diff === Node.DOCUMENT_POSITION_FOLLOWING) {
+            return -1;
+          }
+        }
+        return 0;
+      });
+    });
+
+    return id;
+  }, []);
+
+  const unregister = useCallback((id: string) => {
+    setOutlineItems((prevItems) => prevItems.filter((item) => item.id !== id));
+  }, []);
+
+  return (
+    <ContentOutlineContext.Provider value={{ outlineItems, register, unregister }}>
+      {children}
+    </ContentOutlineContext.Provider>
+  );
+};
+
+export function useContentOutlineContext() {
+  const ctx = useContext(ContentOutlineContext);
+
+  if (!ctx) {
+    throw new Error('useContentOutlineContext must be used within a ContentOutlineContextProvider');
+  }
+  return ctx;
+}
diff --git a/public/app/features/explore/ContentOutline/ContentOutlineItem.tsx b/public/app/features/explore/ContentOutline/ContentOutlineItem.tsx
new file mode 100644
index 0000000000000..df591a414b006
--- /dev/null
+++ b/public/app/features/explore/ContentOutline/ContentOutlineItem.tsx
@@ -0,0 +1,32 @@
+import React, { useEffect, useRef, ReactNode } from 'react';
+
+import { useContentOutlineContext } from './ContentOutlineContext';
+
+export interface ContentOutlineItemBaseProps {
+  title: string;
+  icon: string;
+}
+
+interface ContentOutlineItemProps extends ContentOutlineItemBaseProps {
+  children: ReactNode;
+  className?: string;
+}
+
+export function ContentOutlineItem({ title, icon, children, className }: ContentOutlineItemProps) {
+  const { register, unregister } = useContentOutlineContext();
+  const ref = useRef(null);
+
+  useEffect(() => {
+    // When the component mounts, register it and get its unique ID.
+    const id = register({ title: title, icon: icon, ref: ref.current });
+
+    // When the component unmounts, unregister it using its unique ID.
+    return () => unregister(id);
+  }, [title, icon, register, unregister]);
+
+  return (
+    <div className={className} ref={ref}>
+      {children}
+    </div>
+  );
+}
diff --git a/public/app/features/explore/ContentOutline/ContentOutlineItemButton.tsx b/public/app/features/explore/ContentOutline/ContentOutlineItemButton.tsx
new file mode 100644
index 0000000000000..7f887a76899fd
--- /dev/null
+++ b/public/app/features/explore/ContentOutline/ContentOutlineItemButton.tsx
@@ -0,0 +1,72 @@
+import { cx, css } from '@emotion/css';
+import React, { ButtonHTMLAttributes } from 'react';
+
+import { IconName, isIconName, GrafanaTheme2 } from '@grafana/data';
+import { Icon, useStyles2, Tooltip } from '@grafana/ui';
+
+type CommonProps = {
+  title?: string;
+  icon: string;
+  tooltip?: string;
+  className?: string;
+};
+
+export type ContentOutlineItemButtonProps = CommonProps & ButtonHTMLAttributes<HTMLButtonElement>;
+
+export function ContentOutlineItemButton({ title, icon, tooltip, className, ...rest }: ContentOutlineItemButtonProps) {
+  const styles = useStyles2(getStyles);
+
+  const buttonStyles = cx(styles.button, className);
+
+  const body = (
+    <button className={buttonStyles} aria-label={tooltip} {...rest}>
+      {renderIcon(icon)}
+      {title}
+    </button>
+  );
+
+  return tooltip ? (
+    <Tooltip content={tooltip} placement="bottom">
+      {body}
+    </Tooltip>
+  ) : (
+    body
+  );
+}
+
+function renderIcon(icon: IconName | React.ReactNode) {
+  if (!icon) {
+    return null;
+  }
+
+  if (isIconName(icon)) {
+    return <Icon name={icon} size={'lg'} />;
+  }
+
+  return icon;
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    button: css({
+      label: 'content-outline-item-button',
+      display: 'flex',
+      flexGrow: 1,
+      alignItems: 'center',
+      height: theme.spacing(theme.components.height.md),
+      padding: theme.spacing(0, 1),
+      gap: theme.spacing(1),
+      color: theme.colors.text.secondary,
+      background: 'transparent',
+      border: 'none',
+      textOverflow: 'ellipsis',
+      overflow: 'hidden',
+      whiteSpace: 'nowrap',
+      '&:hover': {
+        color: theme.colors.text.primary,
+        background: theme.colors.background.secondary,
+        textDecoration: 'underline',
+      },
+    }),
+  };
+};
diff --git a/public/app/features/explore/Explore.test.tsx b/public/app/features/explore/Explore.test.tsx
index f76ed10569fa2..68de610f7c43e 100644
--- a/public/app/features/explore/Explore.test.tsx
+++ b/public/app/features/explore/Explore.test.tsx
@@ -8,6 +8,7 @@ import { selectors } from '@grafana/e2e-selectors';
 import { getPluginLinkExtensions } from '@grafana/runtime';
 import { configureStore } from 'app/store/configureStore';
 
+import { ContentOutlineContextProvider } from './ContentOutline/ContentOutlineContext';
 import { Explore, Props } from './Explore';
 import { initialExploreState } from './state/main';
 import { scanStopAction } from './state/query';
@@ -141,7 +142,9 @@ const setup = (overrideProps?: Partial<Props>) => {
 
   return render(
     <TestProvider store={store}>
-      <Explore {...exploreProps} />
+      <ContentOutlineContextProvider>
+        <Explore {...exploreProps} />
+      </ContentOutlineContextProvider>
     </TestProvider>
   );
 };
diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx
index 2720d06d2c639..1fca13ba665f4 100644
--- a/public/app/features/explore/Explore.tsx
+++ b/public/app/features/explore/Explore.tsx
@@ -35,6 +35,9 @@ import { StoreState } from 'app/types';
 
 import { getTimeZone } from '../profile/state/selectors';
 
+import { ContentOutline } from './ContentOutline/ContentOutline';
+import { ContentOutlineContextProvider } from './ContentOutline/ContentOutlineContext';
+import { ContentOutlineItem } from './ContentOutline/ContentOutlineItem';
 import { CorrelationHelper } from './CorrelationHelper';
 import { CustomContainer } from './CustomContainer';
 import ExploreQueryInspector from './ExploreQueryInspector';
@@ -69,30 +72,37 @@ import { updateTimeRange } from './state/time';
 
 const getStyles = (theme: GrafanaTheme2) => {
   return {
-    exploreMain: css`
-      label: exploreMain;
+    exploreMain: css({
+      label: 'exploreMain',
       // Is needed for some transition animations to work.
-      position: relative;
-      margin-top: 21px;
-      display: flex;
-      flex-direction: column;
-      gap: ${theme.spacing(1)};
-    `,
-    queryContainer: css`
-      label: queryContainer;
-      // Need to override normal css class and don't want to count on ordering of the classes in html.
-      height: auto !important;
-      flex: unset !important;
-      display: unset !important;
-      padding: ${theme.spacing(1)};
-    `,
-    exploreContainer: css`
-      display: flex;
-      flex: 1 1 auto;
-      flex-direction: column;
-      padding: ${theme.spacing(2)};
-      padding-top: 0;
-    `,
+      position: 'relative',
+      marginTop: '21px',
+      display: 'flex',
+      flexDirection: 'column',
+      gap: theme.spacing(1),
+    }),
+    queryContainer: css({
+      label: 'queryContainer',
+      padding: theme.spacing(1),
+    }),
+    exploreContainer: css({
+      label: 'exploreContainer',
+      display: 'flex',
+      flexDirection: 'column',
+      paddingRight: theme.spacing(2),
+      marginBottom: theme.spacing(2),
+    }),
+    left: css({
+      marginBottom: theme.spacing(2),
+    }),
+    wrapper: css({
+      position: 'absolute',
+      top: 0,
+      left: theme.spacing(2),
+      right: 0,
+      bottom: 0,
+      display: 'flex',
+    }),
   };
 };
 
@@ -109,6 +119,7 @@ enum ExploreDrawer {
 
 interface ExploreState {
   openDrawer?: ExploreDrawer;
+  contentOutlineVisible: boolean;
 }
 
 export type Props = ExploreProps & ConnectedProps<typeof connector>;
@@ -137,6 +148,7 @@ export type Props = ExploreProps & ConnectedProps<typeof connector>;
  * The result viewers determine some of the query options sent to the datasource, e.g.,
  * `format`, to indicate eventual transformations by the datasources' result transformers.
  */
+
 export class Explore extends React.PureComponent<Props, ExploreState> {
   scrollElement: HTMLDivElement | undefined;
   topOfViewRef = createRef<HTMLDivElement>();
@@ -148,6 +160,7 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
     super(props);
     this.state = {
       openDrawer: undefined,
+      contentOutlineVisible: false,
     };
     this.graphEventBus = props.eventBus.newScopedBus('graph', { onlyLocal: false });
     this.logsEventBus = props.eventBus.newScopedBus('logs', { onlyLocal: false });
@@ -174,6 +187,18 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
     }
   };
 
+  onContentOutlineToogle = () => {
+    this.setState((state) => {
+      reportInteraction('explore_toolbar_contentoutline_clicked', {
+        item: 'outline',
+        type: state.contentOutlineVisible ? 'close' : 'open',
+      });
+      return {
+        contentOutlineVisible: !state.contentOutlineVisible,
+      };
+    });
+  };
+
   /**
    * Used by Logs details.
    * Returns true if all queries have the filter, otherwise false.
@@ -318,18 +343,20 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
 
     return Object.entries(groupedByPlugin).map(([pluginId, frames], index) => {
       return (
-        <CustomContainer
-          key={index}
-          timeZone={timeZone}
-          pluginId={pluginId}
-          frames={frames}
-          state={queryResponse.state}
-          absoluteRange={absoluteRange}
-          height={400}
-          width={width}
-          splitOpenFn={this.onSplitOpen(pluginId)}
-          eventBus={eventBus}
-        />
+        <ContentOutlineItem title={pluginId} icon="plug" key={index}>
+          <CustomContainer
+            key={index}
+            timeZone={timeZone}
+            pluginId={pluginId}
+            frames={frames}
+            state={queryResponse.state}
+            absoluteRange={absoluteRange}
+            height={400}
+            width={width}
+            splitOpenFn={this.onSplitOpen(pluginId)}
+            eventBus={eventBus}
+          />
+        </ContentOutlineItem>
       );
     });
   }
@@ -338,68 +365,82 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
     const { graphResult, absoluteRange, timeZone, queryResponse, showFlameGraph } = this.props;
 
     return (
-      <GraphContainer
-        data={graphResult!}
-        height={showFlameGraph ? 180 : 400}
-        width={width}
-        absoluteRange={absoluteRange}
-        timeZone={timeZone}
-        onChangeTime={this.onUpdateTimeRange}
-        annotations={queryResponse.annotations}
-        splitOpenFn={this.onSplitOpen('graph')}
-        loadingState={queryResponse.state}
-        eventBus={this.graphEventBus}
-      />
+      <ContentOutlineItem title="Graph" icon="graph-bar">
+        <GraphContainer
+          data={graphResult!}
+          height={showFlameGraph ? 180 : 400}
+          width={width}
+          absoluteRange={absoluteRange}
+          timeZone={timeZone}
+          onChangeTime={this.onUpdateTimeRange}
+          annotations={queryResponse.annotations}
+          splitOpenFn={this.onSplitOpen('graph')}
+          loadingState={queryResponse.state}
+          eventBus={this.graphEventBus}
+        />
+      </ContentOutlineItem>
     );
   }
 
   renderTablePanel(width: number) {
     const { exploreId, timeZone } = this.props;
     return (
-      <TableContainer
-        ariaLabel={selectors.pages.Explore.General.table}
-        width={width}
-        exploreId={exploreId}
-        onCellFilterAdded={this.onCellFilterAdded}
-        timeZone={timeZone}
-        splitOpenFn={this.onSplitOpen('table')}
-      />
+      <ContentOutlineItem title="Table" icon="table">
+        <TableContainer
+          ariaLabel={selectors.pages.Explore.General.table}
+          width={width}
+          exploreId={exploreId}
+          onCellFilterAdded={this.onCellFilterAdded}
+          timeZone={timeZone}
+          splitOpenFn={this.onSplitOpen('table')}
+        />
+      </ContentOutlineItem>
     );
   }
 
   renderRawPrometheus(width: number) {
     const { exploreId, datasourceInstance, timeZone } = this.props;
     return (
-      <RawPrometheusContainer
-        showRawPrometheus={true}
-        ariaLabel={selectors.pages.Explore.General.table}
-        width={width}
-        exploreId={exploreId}
-        onCellFilterAdded={datasourceInstance?.modifyQuery ? this.onCellFilterAdded : undefined}
-        timeZone={timeZone}
-        splitOpenFn={this.onSplitOpen('table')}
-      />
+      <ContentOutlineItem title="Raw Prometheus" icon="gf-prometheus">
+        <RawPrometheusContainer
+          showRawPrometheus={true}
+          ariaLabel={selectors.pages.Explore.General.table}
+          width={width}
+          exploreId={exploreId}
+          onCellFilterAdded={datasourceInstance?.modifyQuery ? this.onCellFilterAdded : undefined}
+          timeZone={timeZone}
+          splitOpenFn={this.onSplitOpen('table')}
+        />
+      </ContentOutlineItem>
     );
   }
 
   renderLogsPanel(width: number) {
     const { exploreId, syncedTimes, theme, queryResponse } = this.props;
     const spacing = parseInt(theme.spacing(2).slice(0, -2), 10);
+    // Need to make ContentOutlineItem a flex container so the gap works
+    const logsContentOutlineWrapper = css({
+      display: 'flex',
+      flexDirection: 'column',
+      gap: theme.spacing(1),
+    });
     return (
-      <LogsContainer
-        exploreId={exploreId}
-        loadingState={queryResponse.state}
-        syncedTimes={syncedTimes}
-        width={width - spacing}
-        onClickFilterLabel={this.onClickFilterLabel}
-        onClickFilterOutLabel={this.onClickFilterOutLabel}
-        onStartScanning={this.onStartScanning}
-        onStopScanning={this.onStopScanning}
-        eventBus={this.logsEventBus}
-        splitOpenFn={this.onSplitOpen('logs')}
-        scrollElement={this.scrollElement}
-        isFilterLabelActive={this.isFilterLabelActive}
-      />
+      <ContentOutlineItem title="Logs" icon="gf-logs" className={logsContentOutlineWrapper}>
+        <LogsContainer
+          exploreId={exploreId}
+          loadingState={queryResponse.state}
+          syncedTimes={syncedTimes}
+          width={width - spacing}
+          onClickFilterLabel={this.onClickFilterLabel}
+          onClickFilterOutLabel={this.onClickFilterOutLabel}
+          onStartScanning={this.onStartScanning}
+          onStopScanning={this.onStopScanning}
+          eventBus={this.logsEventBus}
+          splitOpenFn={this.onSplitOpen('logs')}
+          scrollElement={this.scrollElement}
+          isFilterLabelActive={this.isFilterLabelActive}
+        />
+      </ContentOutlineItem>
     );
   }
 
@@ -407,17 +448,19 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
     const { logsSample, timeZone, setSupplementaryQueryEnabled, exploreId, datasourceInstance, queries } = this.props;
 
     return (
-      <LogsSamplePanel
-        queryResponse={logsSample.data}
-        timeZone={timeZone}
-        enabled={logsSample.enabled}
-        queries={queries}
-        datasourceInstance={datasourceInstance}
-        splitOpen={this.onSplitOpen('logsSample')}
-        setLogsSampleEnabled={(enabled: boolean) =>
-          setSupplementaryQueryEnabled(exploreId, enabled, SupplementaryQueryType.LogsSample)
-        }
-      />
+      <ContentOutlineItem title="Logs Sample" icon="gf-logs">
+        <LogsSamplePanel
+          queryResponse={logsSample.data}
+          timeZone={timeZone}
+          enabled={logsSample.enabled}
+          queries={queries}
+          datasourceInstance={datasourceInstance}
+          splitOpen={this.onSplitOpen('logsSample')}
+          setLogsSampleEnabled={(enabled: boolean) =>
+            setSupplementaryQueryEnabled(exploreId, enabled, SupplementaryQueryType.LogsSample)
+          }
+        />
+      </ContentOutlineItem>
     );
   }
 
@@ -426,19 +469,25 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
     const datasourceType = datasourceInstance ? datasourceInstance?.type : 'unknown';
 
     return (
-      <NodeGraphContainer
-        dataFrames={this.memoizedGetNodeGraphDataFrames(queryResponse.series)}
-        exploreId={exploreId}
-        withTraceView={showTrace}
-        datasourceType={datasourceType}
-        splitOpenFn={this.onSplitOpen('nodeGraph')}
-      />
+      <ContentOutlineItem title="Node Graph" icon="code-branch">
+        <NodeGraphContainer
+          dataFrames={this.memoizedGetNodeGraphDataFrames(queryResponse.series)}
+          exploreId={exploreId}
+          withTraceView={showTrace}
+          datasourceType={datasourceType}
+          splitOpenFn={this.onSplitOpen('nodeGraph')}
+        />
+      </ContentOutlineItem>
     );
   }
 
   renderFlameGraphPanel() {
     const { queryResponse } = this.props;
-    return <FlameGraphExploreContainer dataFrames={queryResponse.flameGraphFrames} />;
+    return (
+      <ContentOutlineItem title="Flame Graph" icon="fire">
+        <FlameGraphExploreContainer dataFrames={queryResponse.flameGraphFrames} />
+      </ContentOutlineItem>
+    );
   }
 
   renderTraceViewPanel() {
@@ -448,14 +497,16 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
     return (
       // If there is no data (like 404) we show a separate error so no need to show anything here
       dataFrames.length && (
-        <TraceViewContainer
-          exploreId={exploreId}
-          dataFrames={dataFrames}
-          splitOpenFn={this.onSplitOpen('traceView')}
-          scrollElement={this.scrollElement}
-          queryResponse={queryResponse}
-          topOfViewRef={this.topOfViewRef}
-        />
+        <ContentOutlineItem title="Traces" icon="file-alt">
+          <TraceViewContainer
+            exploreId={exploreId}
+            dataFrames={dataFrames}
+            splitOpenFn={this.onSplitOpen('traceView')}
+            scrollElement={this.scrollElement}
+            queryResponse={queryResponse}
+            topOfViewRef={this.topOfViewRef}
+          />
+        </ContentOutlineItem>
       )
     );
   }
@@ -481,7 +532,7 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
       correlationEditorDetails,
       correlationEditorHelperData,
     } = this.props;
-    const { openDrawer } = this.state;
+    const { openDrawer, contentOutlineVisible } = this.state;
     const styles = getStyles(theme);
     const showPanels = queryResponse && queryResponse.state !== LoadingState.NotStarted;
     const showRichHistory = openDrawer === ExploreDrawer.RichHistory;
@@ -508,85 +559,118 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
     }
 
     return (
-      <>
-        <ExploreToolbar exploreId={exploreId} onChangeTime={this.onChangeTime} />
-        <CustomScrollbar
-          testId={selectors.pages.Explore.General.scrollView}
-          scrollRefCallback={(scrollElement) => (this.scrollElement = scrollElement || undefined)}
+      <ContentOutlineContextProvider>
+        <ExploreToolbar
+          exploreId={exploreId}
+          onChangeTime={this.onChangeTime}
+          onContentOutlineToogle={this.onContentOutlineToogle}
+          isContentOutlineOpen={contentOutlineVisible}
+        />
+        <div
+          style={{
+            position: 'relative',
+            height: '100%',
+            paddingLeft: theme.spacing(2),
+          }}
         >
-          {datasourceInstance ? (
-            <div className={styles.exploreContainer} ref={this.topOfViewRef}>
-              <PanelContainer className={styles.queryContainer}>
-                {correlationsBox}
-                <QueryRows exploreId={exploreId} />
-                <SecondaryActions
-                  // do not allow people to add queries with potentially different datasources in correlations editor mode
-                  addQueryRowButtonDisabled={isLive || (isCorrelationsEditorMode && datasourceInstance.meta.mixed)}
-                  // We cannot show multiple traces at the same time right now so we do not show add query button.
-                  //TODO:unification
-                  addQueryRowButtonHidden={false}
-                  richHistoryRowButtonHidden={richHistoryRowButtonHidden}
-                  richHistoryButtonActive={showRichHistory}
-                  queryInspectorButtonActive={showQueryInspector}
-                  onClickAddQueryRowButton={this.onClickAddQueryRowButton}
-                  onClickRichHistoryButton={this.toggleShowRichHistory}
-                  onClickQueryInspectorButton={this.toggleShowQueryInspector}
-                />
-                <ResponseErrorContainer exploreId={exploreId} />
-              </PanelContainer>
-              <AutoSizer onResize={this.onResize} disableHeight>
-                {({ width }) => {
-                  if (width === 0) {
-                    return null;
-                  }
-
-                  return (
-                    <main className={cx(styles.exploreMain)} style={{ width }}>
-                      <ErrorBoundaryAlert>
-                        {showPanels && (
-                          <>
-                            {showMetrics && graphResult && (
-                              <ErrorBoundaryAlert>{this.renderGraphPanel(width)}</ErrorBoundaryAlert>
-                            )}
-                            {showRawPrometheus && (
-                              <ErrorBoundaryAlert>{this.renderRawPrometheus(width)}</ErrorBoundaryAlert>
-                            )}
-                            {showTable && <ErrorBoundaryAlert>{this.renderTablePanel(width)}</ErrorBoundaryAlert>}
-                            {showLogs && <ErrorBoundaryAlert>{this.renderLogsPanel(width)}</ErrorBoundaryAlert>}
-                            {showNodeGraph && <ErrorBoundaryAlert>{this.renderNodeGraphPanel()}</ErrorBoundaryAlert>}
-                            {showFlameGraph && <ErrorBoundaryAlert>{this.renderFlameGraphPanel()}</ErrorBoundaryAlert>}
-                            {showTrace && <ErrorBoundaryAlert>{this.renderTraceViewPanel()}</ErrorBoundaryAlert>}
-                            {showLogsSample && <ErrorBoundaryAlert>{this.renderLogsSamplePanel()}</ErrorBoundaryAlert>}
-                            {showCustom && <ErrorBoundaryAlert>{this.renderCustom(width)}</ErrorBoundaryAlert>}
-                            {showNoData && <ErrorBoundaryAlert>{this.renderNoData()}</ErrorBoundaryAlert>}
-                          </>
-                        )}
-                        {showRichHistory && (
-                          <RichHistoryContainer
-                            width={width}
-                            exploreId={exploreId}
-                            onClose={this.toggleShowRichHistory}
-                          />
-                        )}
-                        {showQueryInspector && (
-                          <ExploreQueryInspector
-                            exploreId={exploreId}
-                            width={width}
-                            onClose={this.toggleShowQueryInspector}
-                            timeZone={timeZone}
-                          />
-                        )}
-                      </ErrorBoundaryAlert>
-                    </main>
-                  );
-                }}
-              </AutoSizer>
-            </div>
-          ) : (
-            this.renderEmptyState(styles.exploreContainer)
-          )}
-        </CustomScrollbar>
-      </>
+          <div className={styles.wrapper}>
+            {contentOutlineVisible && (
+              <div className={styles.left}>
+                <ContentOutline scroller={this.scrollElement} panelId={`content-outline-container-${exploreId}`} />
+              </div>
+            )}
+            <CustomScrollbar
+              testId={selectors.pages.Explore.General.scrollView}
+              scrollRefCallback={(scrollElement) => (this.scrollElement = scrollElement || undefined)}
+              hideHorizontalTrack
+            >
+              <div className={styles.exploreContainer} ref={this.topOfViewRef}>
+                {datasourceInstance ? (
+                  <>
+                    <ContentOutlineItem title="Queries" icon="arrow">
+                      <PanelContainer className={styles.queryContainer}>
+                        {correlationsBox}
+                        <QueryRows exploreId={exploreId} />
+                        <SecondaryActions
+                          // do not allow people to add queries with potentially different datasources in correlations editor mode
+                          addQueryRowButtonDisabled={
+                            isLive || (isCorrelationsEditorMode && datasourceInstance.meta.mixed)
+                          }
+                          // We cannot show multiple traces at the same time right now so we do not show add query button.
+                          //TODO:unification
+                          addQueryRowButtonHidden={false}
+                          richHistoryRowButtonHidden={richHistoryRowButtonHidden}
+                          richHistoryButtonActive={showRichHistory}
+                          queryInspectorButtonActive={showQueryInspector}
+                          onClickAddQueryRowButton={this.onClickAddQueryRowButton}
+                          onClickRichHistoryButton={this.toggleShowRichHistory}
+                          onClickQueryInspectorButton={this.toggleShowQueryInspector}
+                        />
+                        <ResponseErrorContainer exploreId={exploreId} />
+                      </PanelContainer>
+                    </ContentOutlineItem>
+                    <AutoSizer onResize={this.onResize} disableHeight>
+                      {({ width }) => {
+                        if (width === 0) {
+                          return null;
+                        }
+
+                        return (
+                          <main className={cx(styles.exploreMain)} style={{ width }}>
+                            <ErrorBoundaryAlert>
+                              {showPanels && (
+                                <>
+                                  {showMetrics && graphResult && (
+                                    <ErrorBoundaryAlert>{this.renderGraphPanel(width)}</ErrorBoundaryAlert>
+                                  )}
+                                  {showRawPrometheus && (
+                                    <ErrorBoundaryAlert>{this.renderRawPrometheus(width)}</ErrorBoundaryAlert>
+                                  )}
+                                  {showTable && <ErrorBoundaryAlert>{this.renderTablePanel(width)}</ErrorBoundaryAlert>}
+                                  {showLogs && <ErrorBoundaryAlert>{this.renderLogsPanel(width)}</ErrorBoundaryAlert>}
+                                  {showNodeGraph && (
+                                    <ErrorBoundaryAlert>{this.renderNodeGraphPanel()}</ErrorBoundaryAlert>
+                                  )}
+                                  {showFlameGraph && (
+                                    <ErrorBoundaryAlert>{this.renderFlameGraphPanel()}</ErrorBoundaryAlert>
+                                  )}
+                                  {showTrace && <ErrorBoundaryAlert>{this.renderTraceViewPanel()}</ErrorBoundaryAlert>}
+                                  {showLogsSample && (
+                                    <ErrorBoundaryAlert>{this.renderLogsSamplePanel()}</ErrorBoundaryAlert>
+                                  )}
+                                  {showCustom && <ErrorBoundaryAlert>{this.renderCustom(width)}</ErrorBoundaryAlert>}
+                                  {showNoData && <ErrorBoundaryAlert>{this.renderNoData()}</ErrorBoundaryAlert>}
+                                </>
+                              )}
+                              {showRichHistory && (
+                                <RichHistoryContainer
+                                  width={width}
+                                  exploreId={exploreId}
+                                  onClose={this.toggleShowRichHistory}
+                                />
+                              )}
+                              {showQueryInspector && (
+                                <ExploreQueryInspector
+                                  exploreId={exploreId}
+                                  width={width}
+                                  onClose={this.toggleShowQueryInspector}
+                                  timeZone={timeZone}
+                                />
+                              )}
+                            </ErrorBoundaryAlert>
+                          </main>
+                        );
+                      }}
+                    </AutoSizer>
+                  </>
+                ) : (
+                  this.renderEmptyState(styles.exploreContainer)
+                )}
+              </div>
+            </CustomScrollbar>
+          </div>
+        </div>
+      </ContentOutlineContextProvider>
     );
   }
 }
diff --git a/public/app/features/explore/ExplorePaneContainer.tsx b/public/app/features/explore/ExplorePaneContainer.tsx
index ddee6ba8cdd37..fb1574a081bd5 100644
--- a/public/app/features/explore/ExplorePaneContainer.tsx
+++ b/public/app/features/explore/ExplorePaneContainer.tsx
@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 
 import { EventBusSrv, GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { useStyles2 } from '@grafana/ui';
+import { useStyles2, CustomScrollbar } from '@grafana/ui';
 import { stopQueryState } from 'app/core/utils/explore';
 import { StoreState, useSelector } from 'app/types';
 
@@ -14,14 +14,11 @@ import { getExploreItemSelector } from './state/selectors';
 const getStyles = (theme: GrafanaTheme2) => {
   return {
     explore: css`
+      label: explorePaneContainer;
       display: flex;
-      flex: 1 1 auto;
       flex-direction: column;
-      overflow: hidden;
       min-width: 600px;
-      & + & {
-        border-left: 1px dotted ${theme.colors.border.medium};
-      }
+      height: 100%;
     `,
   };
 };
@@ -51,9 +48,11 @@ function ExplorePaneContainerUnconnected({ exploreId }: Props) {
   }, []);
 
   return (
-    <div className={styles.explore} ref={ref} data-testid={selectors.pages.Explore.General.container}>
-      <Explore exploreId={exploreId} eventBus={eventBus.current} />
-    </div>
+    <CustomScrollbar>
+      <div className={styles.explore} ref={ref} data-testid={selectors.pages.Explore.General.container}>
+        <Explore exploreId={exploreId} eventBus={eventBus.current} />
+      </div>
+    </CustomScrollbar>
   );
 }
 
diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx
index 84f0fc35bbbc0..897ddc71782fb 100644
--- a/public/app/features/explore/ExploreToolbar.tsx
+++ b/public/app/features/explore/ExploreToolbar.tsx
@@ -4,7 +4,7 @@ import React, { RefObject, useMemo } from 'react';
 import { shallowEqual } from 'react-redux';
 
 import { DataSourceInstanceSettings, RawTimeRange, GrafanaTheme2 } from '@grafana/data';
-import { reportInteraction } from '@grafana/runtime';
+import { reportInteraction, config } from '@grafana/runtime';
 import {
   defaultIntervals,
   PageToolbar,
@@ -43,25 +43,39 @@ import { isLeftPaneSelector, isSplit, selectCorrelationDetails, selectPanesEntri
 import { syncTimes, changeRefreshInterval } from './state/time';
 import { LiveTailControls } from './useLiveTailControls';
 
-const getStyles = (theme: GrafanaTheme2) => ({
+const getStyles = (theme: GrafanaTheme2, splitted: Boolean) => ({
   rotateIcon: css({
     '> div > svg': {
       transform: 'rotate(180deg)',
     },
   }),
+  toolbarButton: css({
+    display: 'flex',
+    justifyContent: 'center',
+    marginRight: theme.spacing(0.5),
+    width: splitted && theme.spacing(6),
+  }),
 });
 
 interface Props {
   exploreId: string;
   onChangeTime: (range: RawTimeRange, changedByScanner?: boolean) => void;
+  onContentOutlineToogle: () => void;
+  isContentOutlineOpen: boolean;
   topOfViewRef?: RefObject<HTMLDivElement>;
 }
 
-export function ExploreToolbar({ exploreId, topOfViewRef, onChangeTime }: Props) {
+export function ExploreToolbar({
+  exploreId,
+  topOfViewRef,
+  onChangeTime,
+  onContentOutlineToogle,
+  isContentOutlineOpen,
+}: Props) {
   const dispatch = useDispatch();
-  const styles = useStyles2(getStyles);
-
   const splitted = useSelector(isSplit);
+  const styles = useStyles2(getStyles, splitted);
+
   const timeZone = useSelector((state: StoreState) => getTimeZone(state.user));
   const fiscalYearStartMonth = useSelector((state: StoreState) => getFiscalYearStartMonth(state.user));
   const { refreshInterval, datasourceInstance, range, isLive, isPaused, syncedTimes } = useSelector(
@@ -217,6 +231,21 @@ export function ExploreToolbar({ exploreId, topOfViewRef, onChangeTime }: Props)
       <PageToolbar
         aria-label={t('explore.toolbar.aria-label', 'Explore toolbar')}
         leftItems={[
+          config.featureToggles.exploreContentOutline && (
+            <ToolbarButton
+              key="content-outline"
+              variant="canvas"
+              tooltip="Content outline"
+              icon="list-ui-alt"
+              iconOnly={splitted}
+              onClick={onContentOutlineToogle}
+              aria-expanded={isContentOutlineOpen}
+              aria-controls={isContentOutlineOpen ? 'content-outline-container' : undefined}
+              className={styles.toolbarButton}
+            >
+              Outline
+            </ToolbarButton>
+          ),
           <DataSourcePicker
             key={`${exploreId}-ds-picker`}
             mixed={!isCorrelationsEditorMode}
@@ -225,7 +254,7 @@ export function ExploreToolbar({ exploreId, topOfViewRef, onChangeTime }: Props)
             hideTextValue={showSmallDataSourcePicker}
             width={showSmallDataSourcePicker ? 8 : undefined}
           />,
-        ]}
+        ].filter(Boolean)}
         forceShowLeftItems
       >
         {[
diff --git a/public/app/features/explore/SecondaryActions.tsx b/public/app/features/explore/SecondaryActions.tsx
index f0f4d4fbb3e92..b7ee906560880 100644
--- a/public/app/features/explore/SecondaryActions.tsx
+++ b/public/app/features/explore/SecondaryActions.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Components } from '@grafana/e2e-selectors';
-import { HorizontalGroup, ToolbarButton, useTheme2 } from '@grafana/ui';
+import { ToolbarButton, useTheme2 } from '@grafana/ui';
 
 type Props = {
   addQueryRowButtonDisabled?: boolean;
@@ -20,6 +20,9 @@ type Props = {
 const getStyles = (theme: GrafanaTheme2) => {
   return {
     containerMargin: css`
+      display: flex;
+      flex-wrap: wrap;
+      gap: ${theme.spacing(1)};
       margin-top: ${theme.spacing(2)};
     `,
   };
@@ -30,38 +33,36 @@ export function SecondaryActions(props: Props) {
   const styles = getStyles(theme);
   return (
     <div className={styles.containerMargin}>
-      <HorizontalGroup>
-        {!props.addQueryRowButtonHidden && (
-          <ToolbarButton
-            variant="canvas"
-            aria-label="Add query"
-            onClick={props.onClickAddQueryRowButton}
-            disabled={props.addQueryRowButtonDisabled}
-            icon="plus"
-          >
-            Add query
-          </ToolbarButton>
-        )}
-        {!props.richHistoryRowButtonHidden && (
-          <ToolbarButton
-            variant={props.richHistoryButtonActive ? 'active' : 'canvas'}
-            aria-label="Query history"
-            onClick={props.onClickRichHistoryButton}
-            data-testid={Components.QueryTab.queryHistoryButton}
-            icon="history"
-          >
-            Query history
-          </ToolbarButton>
-        )}
+      {!props.addQueryRowButtonHidden && (
         <ToolbarButton
-          variant={props.queryInspectorButtonActive ? 'active' : 'canvas'}
-          aria-label="Query inspector"
-          onClick={props.onClickQueryInspectorButton}
-          icon="info-circle"
+          variant="canvas"
+          aria-label="Add query"
+          onClick={props.onClickAddQueryRowButton}
+          disabled={props.addQueryRowButtonDisabled}
+          icon="plus"
         >
-          Query inspector
+          Add query
         </ToolbarButton>
-      </HorizontalGroup>
+      )}
+      {!props.richHistoryRowButtonHidden && (
+        <ToolbarButton
+          variant={props.richHistoryButtonActive ? 'active' : 'canvas'}
+          aria-label="Query history"
+          onClick={props.onClickRichHistoryButton}
+          data-testid={Components.QueryTab.queryHistoryButton}
+          icon="history"
+        >
+          Query history
+        </ToolbarButton>
+      )}
+      <ToolbarButton
+        variant={props.queryInspectorButtonActive ? 'active' : 'canvas'}
+        aria-label="Query inspector"
+        onClick={props.onClickQueryInspectorButton}
+        icon="info-circle"
+      >
+        Query inspector
+      </ToolbarButton>
     </div>
   );
 }
diff --git a/public/app/features/explore/TraceView/components/model/transform-trace-data.test.ts b/public/app/features/explore/TraceView/components/model/transform-trace-data.test.ts
index 53d3f3b696d9d..7ff8742e335b1 100644
--- a/public/app/features/explore/TraceView/components/model/transform-trace-data.test.ts
+++ b/public/app/features/explore/TraceView/components/model/transform-trace-data.test.ts
@@ -143,6 +143,58 @@ describe('transformTraceData()', () => {
     expect(transformTraceData(traceData)).toEqual(null);
   });
 
+  it('should return null for any span without a spanID', () => {
+    const traceData = {
+      traceID,
+      processes,
+      spans: [
+        {
+          traceID,
+          operationName: 'rootOperation',
+          references: [
+            {
+              refType: 'CHILD_OF',
+              traceID,
+              spanID: rootSpanID,
+            },
+          ],
+          startTime,
+          duration,
+          tags: [],
+          processID: 'p1',
+        },
+      ],
+    } as unknown as TraceResponse;
+
+    expect(transformTraceData(traceData)).toEqual(null);
+  });
+
+  it('should return null for any span without a processID', () => {
+    const traceData = {
+      traceID,
+      processes,
+      spans: [
+        {
+          traceID,
+          spanID: '41f71485ed2593e4',
+          operationName: 'rootOperation',
+          references: [
+            {
+              refType: 'CHILD_OF',
+              traceID,
+              spanID: rootSpanID,
+            },
+          ],
+          startTime,
+          duration,
+          tags: [],
+        },
+      ],
+    } as unknown as TraceResponse;
+
+    expect(transformTraceData(traceData)).toEqual(null);
+  });
+
   it('should return trace data with correct traceName based on root span with missing ref', () => {
     const traceData = {
       traceID,
diff --git a/public/app/features/explore/TraceView/components/model/transform-trace-data.tsx b/public/app/features/explore/TraceView/components/model/transform-trace-data.tsx
index ccd1905bd778d..fef8f4fcf8ee1 100644
--- a/public/app/features/explore/TraceView/components/model/transform-trace-data.tsx
+++ b/public/app/features/explore/TraceView/components/model/transform-trace-data.tsx
@@ -74,7 +74,7 @@ export function orderTags(tags: TraceKeyValuePair[], topPrefixes?: string[]) {
  * generally requires.
  */
 export default function transformTraceData(data: TraceResponse | undefined): Trace | null {
-  if (!data?.traceID) {
+  if (!data?.traceID || data?.spans.some((x) => !x.processID || !x.spanID)) {
     return null;
   }
   const traceID = data.traceID.toLowerCase();
diff --git a/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx b/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx
index 4ce04b8e60b5a..41670d2144202 100644
--- a/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx
+++ b/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx
@@ -79,13 +79,16 @@ export default function SpanBarSettings({ options, onOptionsChange }: Props) {
 }
 
 export const SpanBarSection = ({ options, onOptionsChange }: DataSourcePluginOptionsEditorProps) => {
+  let suffix = options.type;
+  suffix += options.type === 'tempo' ? '/configure-tempo-data-source/#span-bar' : '/#span-bar';
+
   return (
     <ConfigSubSection
       title="Span bar"
       description={
         <ConfigDescriptionLink
           description="Add additional info next to the service and operation on a span bar row in the trace view."
-          suffix={`${options.type}/#span-bar`}
+          suffix={suffix}
           feature="the span bar"
         />
       }
diff --git a/public/app/features/explore/TraceView/components/types/search.tsx b/public/app/features/explore/TraceView/components/types/search.tsx
deleted file mode 100644
index a2ce3710a9321..0000000000000
--- a/public/app/features/explore/TraceView/components/types/search.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2017 Uber Technologies, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import { TNil } from './index';
-
-export type SearchQuery = {
-  end: number | string;
-  limit: number | string;
-  lookback: string;
-  maxDuration: null | string;
-  minDuration: null | string;
-  operation: string | TNil;
-  service: string;
-  start: number | string;
-  tags: string | TNil;
-};
diff --git a/public/app/features/explore/TraceView/components/utils/color-generator.tsx b/public/app/features/explore/TraceView/components/utils/color-generator.tsx
index 9a9a2b02f6427..71b00e27435bd 100644
--- a/public/app/features/explore/TraceView/components/utils/color-generator.tsx
+++ b/public/app/features/explore/TraceView/components/utils/color-generator.tsx
@@ -46,7 +46,7 @@ class ColorGenerator {
   _getColorIndex(key: string): number {
     let i = this.cache.get(key);
     if (i == null) {
-      const hash = this.hashCode(key.toLowerCase());
+      const hash = this.hashCode(key ? key.toLowerCase() : '');
       i = Math.abs(hash % this.colorsHex.length);
 
       if (this.prevColorIndex !== undefined) {
diff --git a/public/app/features/explore/extensions/ToolbarExtensionPoint.test.tsx b/public/app/features/explore/extensions/ToolbarExtensionPoint.test.tsx
index 6b0de23b4afc9..4d4106126750c 100644
--- a/public/app/features/explore/extensions/ToolbarExtensionPoint.test.tsx
+++ b/public/app/features/explore/extensions/ToolbarExtensionPoint.test.tsx
@@ -151,6 +151,21 @@ describe('ToolbarExtensionPoint', () => {
       });
     });
 
+    it('should pass a context with correct timeZone when fetching extensions', async () => {
+      const targets = [{ refId: 'A' }];
+      const data = createEmptyQueryResponse();
+
+      renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="" splitted={false} />, {
+        targets,
+        data,
+      });
+
+      const [options] = getPluginLinkExtensionsMock.mock.calls[0];
+      const { context } = options;
+
+      expect(context).toHaveProperty('timeZone', 'browser');
+    });
+
     it('should correct extension point id when fetching extensions', async () => {
       renderWithExploreStore(<ToolbarExtensionPoint exploreId="left" timeZone="browser" splitted={false} />);
 
diff --git a/public/app/features/explore/extensions/ToolbarExtensionPoint.tsx b/public/app/features/explore/extensions/ToolbarExtensionPoint.tsx
index 59a713c7ac3c4..5e45b4977b536 100644
--- a/public/app/features/explore/extensions/ToolbarExtensionPoint.tsx
+++ b/public/app/features/explore/extensions/ToolbarExtensionPoint.tsx
@@ -1,6 +1,6 @@
 import React, { lazy, ReactElement, Suspense, useMemo, useState } from 'react';
 
-import { type PluginExtensionLink, PluginExtensionPoints, RawTimeRange } from '@grafana/data';
+import { type PluginExtensionLink, PluginExtensionPoints, RawTimeRange, getTimeZone } from '@grafana/data';
 import { getPluginLinkExtensions, config } from '@grafana/runtime';
 import { DataQuery, TimeZone } from '@grafana/schema';
 import { Dropdown, ToolbarButton } from '@grafana/ui';
@@ -101,7 +101,7 @@ function useExtensionPointContext(props: Props): PluginExtensionExploreContext {
       targets: queries,
       data: queryResponse,
       timeRange: range.raw,
-      timeZone: timeZone,
+      timeZone: getTimeZone({ timeZone }),
       shouldShowAddCorrelation:
         config.featureToggles.correlations === true &&
         canWriteCorrelations &&
diff --git a/public/app/features/inspector/QueryInspector.tsx b/public/app/features/inspector/QueryInspector.tsx
index 024b487d90e63..81df3f209f6cf 100644
--- a/public/app/features/inspector/QueryInspector.tsx
+++ b/public/app/features/inspector/QueryInspector.tsx
@@ -7,6 +7,7 @@ import { selectors } from '@grafana/e2e-selectors';
 import { Stack } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
 import { Button, ClipboardButton, JSONFormatter, LoadingPlaceholder } from '@grafana/ui';
+import { Trans } from 'app/core/internationalization';
 import { backendSrv } from 'app/core/services/backend_srv';
 
 import { getPanelInspectorStyles } from './styles';
@@ -221,8 +222,10 @@ export class QueryInspector extends PureComponent<Props, State> {
         <div aria-label={selectors.components.PanelInspector.Query.content}>
           <h3 className="section-heading">Query inspector</h3>
           <p className="small muted">
-            Query inspector allows you to view raw request and response. To collect this data Grafana needs to issue a
-            new query. Click refresh button below to trigger a new query.
+            <Trans i18nKey="inspector.query.description">
+              Query inspector allows you to view raw request and response. To collect this data Grafana needs to issue a
+              new query. Click refresh button below to trigger a new query.
+            </Trans>
           </p>
         </div>
         {this.renderExecutedQueries(executedQueries)}
@@ -232,17 +235,17 @@ export class QueryInspector extends PureComponent<Props, State> {
             onClick={onRefreshQuery}
             aria-label={selectors.components.PanelInspector.Query.refreshButton}
           >
-            Refresh
+            <Trans i18nKey="inspector.query.refresh">Refresh</Trans>
           </Button>
 
           {haveData && allNodesExpanded && (
             <Button icon="minus" variant="secondary" className={styles.toolbarItem} onClick={this.onToggleExpand}>
-              Collapse all
+              <Trans i18nKey="inspector.query.collapse-all">Collapse all</Trans>
             </Button>
           )}
           {haveData && !allNodesExpanded && (
             <Button icon="plus" variant="secondary" className={styles.toolbarItem} onClick={this.onToggleExpand}>
-              Expand all
+              <Trans i18nKey="inspector.query.expand-all">Expand all</Trans>
             </Button>
           )}
 
@@ -253,7 +256,7 @@ export class QueryInspector extends PureComponent<Props, State> {
               icon="copy"
               variant="secondary"
             >
-              Copy to clipboard
+              <Trans i18nKey="inspector.query.copy-to-clipboard">Copy to clipboard</Trans>
             </ClipboardButton>
           )}
           <div className="flex-grow-1" />
@@ -264,7 +267,9 @@ export class QueryInspector extends PureComponent<Props, State> {
             <JSONFormatter json={response} open={openNodes} onDidRender={this.setFormattedJson} />
           )}
           {!isLoading && !haveData && (
-            <p className="muted">No request and response collected yet. Hit refresh button</p>
+            <p className="muted">
+              <Trans i18nKey="inspector.query.no-data">No request and response collected yet. Hit refresh button</Trans>
+            </p>
           )}
         </div>
       </div>
diff --git a/public/app/features/playlist/api.ts b/public/app/features/playlist/api.ts
index f5987ad5badcb..a66e542cd8382 100644
--- a/public/app/features/playlist/api.ts
+++ b/public/app/features/playlist/api.ts
@@ -46,22 +46,28 @@ interface K8sPlaylist {
     name: string;
   };
   spec: {
-    name: string;
+    title: string;
     interval: string;
     items: PlaylistItem[];
   };
 }
 
 class K8sAPI implements PlaylistAPI {
-  readonly url = `/apis/playlist.x.grafana.com/v0alpha1/namespaces/org-${contextSrv.user.orgId}/playlists`;
-  readonly legacy = new LegacyAPI(); // set to null for full CRUD
+  readonly url: string;
+  readonly legacy: PlaylistAPI | undefined;
+
+  constructor() {
+    const ns = contextSrv.user.orgId === 1 ? 'default' : `org-${contextSrv.user.orgId}`;
+    this.url = `/apis/playlist.x.grafana.com/v0alpha1/namespaces/${ns}/playlists`;
+
+    // When undefined, this will use k8s for all CRUD features
+    // if (!config.featureToggles.grafanaAPIServerWithExperimentalAPIs) {
+    this.legacy = new LegacyAPI();
+  }
 
   async getAllPlaylist(): Promise<Playlist[]> {
     const result = await getBackendSrv().get<K8sPlaylistList>(this.url);
-    console.log('getAllPlaylist', result);
-    const v = result.playlists.map(k8sResourceAsPlaylist);
-    console.log('after', v);
-    return v;
+    return result.playlists.map(k8sResourceAsPlaylist);
   }
 
   async getPlaylist(uid: string): Promise<Playlist> {
@@ -118,9 +124,12 @@ class K8sAPI implements PlaylistAPI {
 // the main difference is that k8s uses metdata.name as the uid
 // to avoid future confusion, the display name is now called "title"
 function k8sResourceAsPlaylist(r: K8sPlaylist): Playlist {
+  const { spec, metadata } = r;
   return {
-    ...r.spec,
-    uid: r.metadata.name, // replace the uid from the k8s name
+    uid: metadata.name, // use the k8s name as uid
+    name: spec.title,
+    interval: spec.interval,
+    items: spec.items,
   };
 }
 
diff --git a/public/app/features/plugins/built_in_plugins.ts b/public/app/features/plugins/built_in_plugins.ts
index 40d6bf5987465..fe48f0b03ae45 100644
--- a/public/app/features/plugins/built_in_plugins.ts
+++ b/public/app/features/plugins/built_in_plugins.ts
@@ -28,7 +28,7 @@ const prometheusPlugin = async () =>
 const mssqlPlugin = async () =>
   await import(/* webpackChunkName: "mssqlPlugin" */ 'app/plugins/datasource/mssql/module');
 const testDataDSPlugin = async () =>
-  await import(/* webpackChunkName: "testDataDSPlugin" */ 'app/plugins/datasource/grafana-testdata-datasource/module');
+  await import(/* webpackChunkName: "testDataDSPlugin" */ '@grafana-plugins/grafana-testdata-datasource/module');
 const cloudMonitoringPlugin = async () =>
   await import(/* webpackChunkName: "cloudMonitoringPlugin" */ 'app/plugins/datasource/cloud-monitoring/module');
 const azureMonitorPlugin = async () =>
diff --git a/public/app/features/plugins/loader/sharedDependencies.ts b/public/app/features/plugins/loader/sharedDependencies.ts
index f1b4d2663b592..d1c29ba9b3fc6 100644
--- a/public/app/features/plugins/loader/sharedDependencies.ts
+++ b/public/app/features/plugins/loader/sharedDependencies.ts
@@ -1,12 +1,14 @@
 import * as emotion from '@emotion/css';
 import * as emotionReact from '@emotion/react';
 import * as d3 from 'd3';
+import * as i18next from 'i18next';
 import jquery from 'jquery';
 import _ from 'lodash'; // eslint-disable-line lodash/import-scope
 import moment from 'moment'; // eslint-disable-line no-restricted-imports
 import prismjs from 'prismjs';
 import react from 'react';
 import reactDom from 'react-dom';
+import * as reactInlineSvg from 'react-inlinesvg';
 import * as reactRedux from 'react-redux'; // eslint-disable-line no-restricted-imports
 import * as reactRouterDom from 'react-router-dom';
 import * as reactRouterCompat from 'react-router-dom-v5-compat';
@@ -100,6 +102,8 @@ export const sharedDependenciesMap: Record<string, System.Module> = {
   },
   d3: d3,
   emotion: emotion,
+  // bundling grafana-ui in plugins requires sharing i18next state
+  i18next: i18next,
   jquery: {
     default: jquery,
     __useDefault: true,
@@ -116,6 +120,8 @@ export const sharedDependenciesMap: Record<string, System.Module> = {
   prismjs: prismjs,
   react: react,
   'react-dom': reactDom,
+  // bundling grafana-ui in plugins requires sharing react-inlinesvg for the icon cache
+  'react-inlinesvg': reactInlineSvg,
   'react-redux': reactRedux,
   // Migration - React Router v5 -> v6
   // =================================
diff --git a/public/app/features/plugins/utils.test.ts b/public/app/features/plugins/utils.test.ts
index c66d7ea2ebcae..349a9870a6b01 100644
--- a/public/app/features/plugins/utils.test.ts
+++ b/public/app/features/plugins/utils.test.ts
@@ -18,6 +18,16 @@ describe('buildPluginSectionNav', () => {
         text: 'page2',
         url: '/a/plugin1/page2',
       },
+      {
+        text: 'page3',
+        url: '/a/plugin1/page3',
+        children: [
+          {
+            text: 'page4',
+            url: '/a/plugin1/page3/page4',
+          },
+        ],
+      },
     ],
   };
 
@@ -77,4 +87,10 @@ describe('buildPluginSectionNav', () => {
     expect(result?.main.text).toBe('Admin');
     expect(result?.node.text).toBe('Standalone page');
   });
+
+  it('Should set nested active page', () => {
+    const result = buildPluginSectionNav(appsSection, null, '/a/plugin1/page3/page4');
+    expect(result?.main.children![0].children![2].children![0].active).toBe(true);
+    expect(result?.node.text).toBe('page4');
+  });
 });
diff --git a/public/app/features/plugins/utils.ts b/public/app/features/plugins/utils.ts
index d2badad9ed1d5..c6e1ba8bf5ccf 100644
--- a/public/app/features/plugins/utils.ts
+++ b/public/app/features/plugins/utils.ts
@@ -35,6 +35,7 @@ export function buildPluginSectionNav(
   currentUrl: string
 ): NavModel | undefined {
   // shallow clone as we set active flag
+  const MAX_RECURSION_DEPTH = 10;
   let copiedPluginNavSection = { ...pluginNavSection };
   let activePage: NavModelItem | undefined;
 
@@ -58,12 +59,15 @@ export function buildPluginSectionNav(
     return activePage;
   }
 
-  // Find and set active page
-  copiedPluginNavSection.children = (copiedPluginNavSection?.children ?? []).map((child) => {
+  function findAndSetActivePage(child: NavModelItem, depth = 0): NavModelItem {
+    if (depth > MAX_RECURSION_DEPTH) {
+      return child;
+    }
+
     if (child.children) {
       // Doing this here to make sure that first we check if any of the children is active
       // (In case yes, then the check for the parent will not mark it as active)
-      const children = child.children.map((pluginPage) => setPageToActive(pluginPage, currentUrl));
+      const children = child.children.map((pluginPage) => findAndSetActivePage(pluginPage, depth + 1));
 
       return {
         ...setPageToActive(child, currentUrl),
@@ -72,7 +76,10 @@ export function buildPluginSectionNav(
     }
 
     return setPageToActive(child, currentUrl);
-  });
+  }
+
+  // Find and set active page
+  copiedPluginNavSection.children = (copiedPluginNavSection?.children ?? []).map(findAndSetActivePage);
 
   return { main: copiedPluginNavSection, node: activePage ?? copiedPluginNavSection };
 }
diff --git a/public/app/features/query/state/PanelQueryRunner.ts b/public/app/features/query/state/PanelQueryRunner.ts
index 7ca0c30791b36..8ba3e9c91f60c 100644
--- a/public/app/features/query/state/PanelQueryRunner.ts
+++ b/public/app/features/query/state/PanelQueryRunner.ts
@@ -104,6 +104,7 @@ export class PanelQueryRunner {
         state: LoadingState.Done,
         series: this.dataConfigSource.snapshotData.map((v) => toDataFrame(v)),
         timeRange: getDefaultTimeRange(), // Don't need real time range for snapshots
+        structureRev,
       };
       return of(snapshotPanelData);
     }
diff --git a/public/app/features/runtime/init.ts b/public/app/features/runtime/init.ts
index 5ae3e02dce721..1f71bf55154c4 100644
--- a/public/app/features/runtime/init.ts
+++ b/public/app/features/runtime/init.ts
@@ -29,7 +29,7 @@ export function initWindowRuntime() {
       if (!d) {
         return undefined;
       }
-      return d.getSaveModelClone();
+      return d.getSaveModelCloneOld();
     },
 
     /** The selected time range */
diff --git a/public/app/features/scenes/scenes/gridMultiTimeRange.tsx b/public/app/features/scenes/scenes/gridMultiTimeRange.tsx
index 25511bb96058b..c10d6847a225f 100644
--- a/public/app/features/scenes/scenes/gridMultiTimeRange.tsx
+++ b/public/app/features/scenes/scenes/gridMultiTimeRange.tsx
@@ -7,7 +7,7 @@ import {
   SceneGridItem,
   PanelBuilders,
 } from '@grafana/scenes';
-import { TestDataQueryType } from 'app/plugins/datasource/grafana-testdata-datasource/dataquery.gen';
+import { TestDataQueryType } from '@grafana-plugins/grafana-testdata-datasource/dataquery.gen';
 
 import { DashboardScene } from '../../dashboard-scene/scene/DashboardScene';
 
diff --git a/public/app/features/scenes/scenes/gridWithMultipleData.tsx b/public/app/features/scenes/scenes/gridWithMultipleData.tsx
index 8cee30efece91..3d382b53a058d 100644
--- a/public/app/features/scenes/scenes/gridWithMultipleData.tsx
+++ b/public/app/features/scenes/scenes/gridWithMultipleData.tsx
@@ -7,7 +7,7 @@ import {
   SceneGridItem,
   PanelBuilders,
 } from '@grafana/scenes';
-import { TestDataQueryType } from 'app/plugins/datasource/grafana-testdata-datasource/dataquery.gen';
+import { TestDataQueryType } from '@grafana-plugins/grafana-testdata-datasource/dataquery.gen';
 
 import { DashboardScene } from '../../dashboard-scene/scene/DashboardScene';
 
diff --git a/public/app/features/scenes/scenes/queries.ts b/public/app/features/scenes/scenes/queries.ts
index 3bf3df1b2a6dc..a87957a9a11ea 100644
--- a/public/app/features/scenes/scenes/queries.ts
+++ b/public/app/features/scenes/scenes/queries.ts
@@ -1,5 +1,5 @@
 import { QueryRunnerState, SceneQueryRunner } from '@grafana/scenes';
-import { TestData } from 'app/plugins/datasource/grafana-testdata-datasource/dataquery.gen';
+import { TestData } from '@grafana-plugins/grafana-testdata-datasource/dataquery.gen';
 
 export function getQueryRunnerWithRandomWalkQuery(
   overrides?: Partial<TestData>,
diff --git a/public/app/features/teams/TeamList.tsx b/public/app/features/teams/TeamList.tsx
index 85d54da7bede9..435ab51fa024c 100644
--- a/public/app/features/teams/TeamList.tsx
+++ b/public/app/features/teams/TeamList.tsx
@@ -1,8 +1,6 @@
-import { css } from '@emotion/css';
 import React, { useEffect, useMemo, useState } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
-import { GrafanaTheme2 } from '@grafana/data';
 import {
   LinkButton,
   FilterInput,
@@ -13,11 +11,10 @@ import {
   Icon,
   Tooltip,
   Column,
-  HorizontalGroup,
   Pagination,
-  VerticalGroup,
-  useStyles2,
+  Avatar,
 } from '@grafana/ui';
+import { Stack, Flex } from '@grafana/ui/src/unstable';
 import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
 import { Page } from 'app/core/components/Page/Page';
 import { fetchRoleOptions } from 'app/core/components/RolePicker/api';
@@ -25,7 +22,7 @@ import { contextSrv } from 'app/core/services/context_srv';
 import { AccessControlAction, Role, StoreState, Team } from 'app/types';
 
 import { TeamRolePicker } from '../../core/components/RolePicker/TeamRolePicker';
-import { Avatar } from '../admin/Users/Avatar';
+import { TableWrapper } from '../admin/Users/TableWrapper';
 
 import { deleteTeam, loadTeams, changePage, changeQuery, changeSort } from './state/actions';
 
@@ -50,7 +47,6 @@ export const TeamList = ({
   changeSort,
 }: Props) => {
   const [roleOptions, setRoleOptions] = useState<Role[]>([]);
-  const styles = useStyles2(getStyles);
 
   useEffect(() => {
     loadTeams(true);
@@ -70,7 +66,7 @@ export const TeamList = ({
       {
         id: 'avatarUrl',
         header: '',
-        cell: ({ cell: { value } }: Cell<'avatarUrl'>) => <Avatar src={value} alt="User avatar" />,
+        cell: ({ cell: { value } }: Cell<'avatarUrl'>) => value && <Avatar src={value} alt="User avatar" />,
       },
       {
         id: 'name',
@@ -165,24 +161,24 @@ export const TeamList = ({
                 New Team
               </LinkButton>
             </div>
-            <VerticalGroup spacing={'md'}>
-              <div className={styles.wrapper}>
+            <Stack gap={2}>
+              <TableWrapper>
                 <InteractiveTable
                   columns={columns}
                   data={teams}
                   getRowId={(team) => String(team.id)}
                   fetchData={changeSort}
                 />
-                <HorizontalGroup justify="flex-end">
+                <Flex justifyContent="flex-end">
                   <Pagination
                     hideWhenSinglePage
                     currentPage={page}
                     numberOfPages={totalPages}
                     onNavigate={changePage}
                   />
-                </HorizontalGroup>
-              </div>
-            </VerticalGroup>
+                </Flex>
+              </TableWrapper>
+            </Stack>
           </>
         )}
       </Page.Contents>
@@ -190,24 +186,6 @@ export const TeamList = ({
   );
 };
 
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    // Enable RolePicker overflow
-    wrapper: css({
-      display: 'flex',
-      flexDirection: 'column',
-      overflowX: 'auto',
-      overflowY: 'hidden',
-      minHeight: '100vh',
-      width: '100%',
-      '& > div': {
-        overflowX: 'unset',
-        marginBottom: theme.spacing(2),
-      },
-    }),
-  };
-};
-
 function shouldDisplayRolePicker(): boolean {
   return (
     contextSrv.licensedAccessControlEnabled() &&
diff --git a/public/app/features/transformers/FilterByValueTransformer/FilterByValueFilterEditor.tsx b/public/app/features/transformers/FilterByValueTransformer/FilterByValueFilterEditor.tsx
index fdfd2e1b154b1..312e2646b0b49 100644
--- a/public/app/features/transformers/FilterByValueTransformer/FilterByValueFilterEditor.tsx
+++ b/public/app/features/transformers/FilterByValueTransformer/FilterByValueFilterEditor.tsx
@@ -2,7 +2,8 @@ import React, { useCallback } from 'react';
 
 import { Field, SelectableValue, valueMatchers } from '@grafana/data';
 import { FilterByValueFilter } from '@grafana/data/src/transformations/transformers/filterByValue';
-import { Button, Select } from '@grafana/ui';
+import { Button, Select, InlineField, InlineFieldRow } from '@grafana/ui';
+import { Box } from '@grafana/ui/src/unstable';
 
 import { valueMatchersUI } from './ValueMatchers/valueMatchersUI';
 
@@ -75,9 +76,8 @@ export const FilterByValueFilterEditor = (props: Props) => {
   }
 
   return (
-    <div className="gf-form-inline">
-      <div className="gf-form gf-form-spacing">
-        <div className="gf-form-label width-7">Field</div>
+    <InlineFieldRow>
+      <InlineField label="Field" labelWidth={14}>
         <Select
           className="min-width-15 max-width-24"
           placeholder="Field Name"
@@ -85,9 +85,8 @@ export const FilterByValueFilterEditor = (props: Props) => {
           value={filter.fieldName}
           onChange={onChangeField}
         />
-      </div>
-      <div className="gf-form gf-form-spacing">
-        <div className="gf-form-label">Match</div>
+      </InlineField>
+      <InlineField label="Match">
         <Select
           className="width-12"
           placeholder="Select test"
@@ -95,15 +94,14 @@ export const FilterByValueFilterEditor = (props: Props) => {
           value={matcherId}
           onChange={onChangeMatcher}
         />
-      </div>
-      <div className="gf-form gf-form-spacing">
-        <div className="gf-form-label">Value</div>
+      </InlineField>
+      <InlineField label="Value" grow>
         <editor.component field={field} options={filter.config.options ?? {}} onChange={onChangeMatcherOptions} />
-      </div>
-      <div className="gf-form">
+      </InlineField>
+      <Box marginBottom={0.5}>
         <Button icon="times" onClick={onDelete} variant="secondary" />
-      </div>
-    </div>
+      </Box>
+    </InlineFieldRow>
   );
 };
 
diff --git a/public/app/features/transformers/FilterByValueTransformer/FilterByValueTransformerEditor.tsx b/public/app/features/transformers/FilterByValueTransformer/FilterByValueTransformerEditor.tsx
index 70be902af67f1..08b18d2e289f6 100644
--- a/public/app/features/transformers/FilterByValueTransformer/FilterByValueTransformerEditor.tsx
+++ b/public/app/features/transformers/FilterByValueTransformer/FilterByValueTransformerEditor.tsx
@@ -1,4 +1,3 @@
-import { css } from '@emotion/css';
 import { cloneDeep } from 'lodash';
 import React, { useMemo, useCallback } from 'react';
 
@@ -21,7 +20,8 @@ import {
   FilterByValueTransformerOptions,
   FilterByValueType,
 } from '@grafana/data/src/transformations/transformers/filterByValue';
-import { Button, RadioButtonGroup, stylesFactory } from '@grafana/ui';
+import { Button, RadioButtonGroup, InlineField } from '@grafana/ui';
+import { Box } from '@grafana/ui/src/unstable';
 
 import { DataFrameFieldsInfo, FilterByValueFilterEditor } from './FilterByValueFilterEditor';
 
@@ -37,7 +37,6 @@ const filterMatch: Array<SelectableValue<FilterByValueMatch>> = [
 
 export const FilterByValueTransformerEditor = (props: TransformerUIProps<FilterByValueTransformerOptions>) => {
   const { input, options, onChange } = props;
-  const styles = getEditorStyles();
   const fieldsInfo = useFieldsInfo(input);
 
   const onAddFilter = useCallback(() => {
@@ -101,19 +100,17 @@ export const FilterByValueTransformerEditor = (props: TransformerUIProps<FilterB
 
   return (
     <div>
-      <div className="gf-form gf-form-inline">
-        <div className="gf-form-label width-8">Filter type</div>
+      <InlineField label="Filter type" labelWidth={16}>
         <div className="width-15">
           <RadioButtonGroup options={filterTypes} value={options.type} onChange={onChangeType} fullWidth />
         </div>
-      </div>
-      <div className="gf-form gf-form-inline">
-        <div className="gf-form-label width-8">Conditions</div>
+      </InlineField>
+      <InlineField label="Conditions" labelWidth={16}>
         <div className="width-15">
           <RadioButtonGroup options={filterMatch} value={options.match} onChange={onChangeMatch} fullWidth />
         </div>
-      </div>
-      <div className={styles.conditions}>
+      </InlineField>
+      <Box paddingLeft={2}>
         {options.filters.map((filter, idx) => (
           <FilterByValueFilterEditor
             key={idx}
@@ -123,12 +120,10 @@ export const FilterByValueTransformerEditor = (props: TransformerUIProps<FilterB
             onDelete={() => onDeleteFilter(idx)}
           />
         ))}
-        <div className="gf-form">
-          <Button icon="plus" size="sm" onClick={onAddFilter} variant="secondary">
-            Add condition
-          </Button>
-        </div>
-      </div>
+        <Button icon="plus" size="sm" onClick={onAddFilter} variant="secondary">
+          Add condition
+        </Button>
+      </Box>
     </div>
   );
 };
@@ -143,12 +138,6 @@ export const filterByValueTransformRegistryItem: TransformerRegistryItem<FilterB
   categories: new Set([TransformerCategory.Filter]),
 };
 
-const getEditorStyles = stylesFactory(() => ({
-  conditions: css`
-    padding-left: 16px;
-  `,
-}));
-
 const useFieldsInfo = (data: DataFrame[]): DataFrameFieldsInfo => {
   return useMemo(() => {
     const meta = {
diff --git a/public/app/features/transformers/calculateHeatmap/heatmap.ts b/public/app/features/transformers/calculateHeatmap/heatmap.ts
index 32b5b2c600767..a5c770fe9e8f0 100644
--- a/public/app/features/transformers/calculateHeatmap/heatmap.ts
+++ b/public/app/features/transformers/calculateHeatmap/heatmap.ts
@@ -14,6 +14,7 @@ import {
   formattedValueToString,
   durationToMilliseconds,
   parseDuration,
+  TransformationApplicabilityLevels,
 } from '@grafana/data';
 import { isLikelyAscendingVector } from '@grafana/data/src/transformations/transformers/joinDataFrames';
 import { config } from '@grafana/runtime';
@@ -36,7 +37,21 @@ export const heatmapTransformer: SynchronousDataTransformerInfo<HeatmapTransform
   name: 'Create heatmap',
   description: 'Generate heatmap data from source data.',
   defaultOptions: {},
+  isApplicable: (data) => {
+    const { xField, yField, xs, ys } = findHeatmapFields(data);
 
+    if (xField || yField) {
+      return TransformationApplicabilityLevels.NotPossible;
+    }
+
+    if (!xs.length || !ys.length) {
+      return TransformationApplicabilityLevels.NotPossible;
+    }
+
+    return TransformationApplicabilityLevels.Applicable;
+  },
+  isApplicableDescription:
+    'The Heatmap transformation requires fields with Heatmap compatible data. No fields with Heatmap data could be found.',
   operator: (options, ctx) => (source) =>
     source.pipe(
       map((data) => {
@@ -278,56 +293,8 @@ export function prepBucketFrames(frames: DataFrame[]): DataFrame[] {
 }
 
 export function calculateHeatmapFromData(frames: DataFrame[], options: HeatmapCalculationOptions): DataFrame {
-  //console.time('calculateHeatmapFromData');
-
-  // optimization
-  //let xMin = Infinity;
-  //let xMax = -Infinity;
-
-  let xField: Field | undefined = undefined;
-  let yField: Field | undefined = undefined;
-
-  let dataLen = 0;
-  // pre-allocate arrays
-  for (let frame of frames) {
-    // TODO: assumes numeric timestamps, ordered asc, without nulls
-    const x = frame.fields.find((f) => f.type === FieldType.time);
-    if (x) {
-      dataLen += frame.length;
-    }
-  }
-
-  let xs: number[] = Array(dataLen);
-  let ys: number[] = Array(dataLen);
-  let j = 0;
-
-  for (let frame of frames) {
-    // TODO: assumes numeric timestamps, ordered asc, without nulls
-    const x = frame.fields.find((f) => f.type === FieldType.time);
-    if (!x) {
-      continue;
-    }
-
-    if (!xField) {
-      xField = x; // the first X
-    }
-
-    const xValues = x.values;
-    for (let field of frame.fields) {
-      if (field !== x && field.type === FieldType.number) {
-        const yValues = field.values;
-
-        for (let i = 0; i < xValues.length; i++, j++) {
-          xs[j] = xValues[i];
-          ys[j] = yValues[i];
-        }
-
-        if (!yField) {
-          yField = field;
-        }
-      }
-    }
-  }
+  // Find fields in the heatmap
+  const { xField, yField, xs, ys } = findHeatmapFields(frames);
 
   if (!xField || !yField) {
     throw 'no heatmap fields found';
@@ -398,10 +365,64 @@ export function calculateHeatmapFromData(frames: DataFrame[], options: HeatmapCa
     ],
   };
 
-  //console.timeEnd('calculateHeatmapFromData');
   return frame;
 }
 
+/**
+ * Find fields that can be used within a heatmap
+ *
+ * @param frames
+ *  An array of DataFrames
+ */
+function findHeatmapFields(frames: DataFrame[]) {
+  let xField: Field | undefined = undefined;
+  let yField: Field | undefined = undefined;
+  let dataLen = 0;
+
+  // pre-allocate arrays
+  for (let frame of frames) {
+    // TODO: assumes numeric timestamps, ordered asc, without nulls
+    const x = frame.fields.find((f) => f.type === FieldType.time);
+    if (x) {
+      dataLen += frame.length;
+    }
+  }
+
+  let xs: number[] = Array(dataLen);
+  let ys: number[] = Array(dataLen);
+  let j = 0;
+
+  for (let frame of frames) {
+    // TODO: assumes numeric timestamps, ordered asc, without nulls
+    const x = frame.fields.find((f) => f.type === FieldType.time);
+    if (!x) {
+      continue;
+    }
+
+    if (!xField) {
+      xField = x; // the first X
+    }
+
+    const xValues = x.values;
+    for (let field of frame.fields) {
+      if (field !== x && field.type === FieldType.number) {
+        const yValues = field.values;
+
+        for (let i = 0; i < xValues.length; i++, j++) {
+          xs[j] = xValues[i];
+          ys[j] = yValues[i];
+        }
+
+        if (!yField) {
+          yField = field;
+        }
+      }
+    }
+  }
+
+  return { xField, yField, xs, ys };
+}
+
 interface HeatmapOpts {
   // default is 10% of data range, snapped to a "nice" increment
   xMode?: HeatmapCalculationMode;
diff --git a/public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx b/public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx
index cadf1f324e737..8c02c19d3ba38 100644
--- a/public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx
@@ -10,6 +10,7 @@ import {
   TransformerRegistryItem,
   TransformerUIProps,
   TransformerCategory,
+  getTimeZones,
 } from '@grafana/data';
 import {
   ConvertFieldTypeOptions,
@@ -21,6 +22,8 @@ import { allFieldTypeIconOptions } from '@grafana/ui/src/components/MatchersUI/F
 import { hasAlphaPanels } from 'app/core/config';
 import { findField } from 'app/features/dimensions';
 
+import { getTimezoneOptions } from '../utils';
+
 const fieldNamePickerSettings = {
   settings: { width: 24, isClearable: false },
 } as StandardEditorsRegistryItem<string, FieldNamePickerConfigSettings>;
@@ -31,6 +34,15 @@ export const ConvertFieldTypeTransformerEditor = ({
   onChange,
 }: TransformerUIProps<ConvertFieldTypeTransformerOptions>) => {
   const allTypes = allFieldTypeIconOptions.filter((v) => v.value !== FieldType.trace);
+  const timeZoneOptions: Array<SelectableValue<string>> = getTimezoneOptions(true);
+
+  // Format timezone options
+  const tzs = getTimeZones();
+  timeZoneOptions.push({ label: 'Browser', value: 'browser' });
+  timeZoneOptions.push({ label: 'UTC', value: 'utc' });
+  for (const tz of tzs) {
+    timeZoneOptions.push({ label: tz, value: tz });
+  }
 
   const onSelectField = useCallback(
     (idx: number) => (value: string | undefined) => {
@@ -90,6 +102,18 @@ export const ConvertFieldTypeTransformerEditor = ({
     [onChange, options]
   );
 
+  const onTzChange = useCallback(
+    (idx: number) => (value: SelectableValue<string>) => {
+      const conversions = options.conversions;
+      conversions[idx] = { ...conversions[idx], timezone: value?.value };
+      onChange({
+        ...options,
+        conversions: conversions,
+      });
+    },
+    [onChange, options]
+  );
+
   return (
     <>
       {options.conversions.map((c: ConvertFieldTypeOptions, idx: number) => {
@@ -128,14 +152,19 @@ export const ConvertFieldTypeTransformerEditor = ({
               )}
               {c.destinationType === FieldType.string &&
                 (c.dateFormat || findField(input?.[0], c.targetField)?.type === FieldType.time) && (
-                  <InlineField label="Date format" tooltip="Specify the output format.">
-                    <Input
-                      value={c.dateFormat}
-                      placeholder={'e.g. YYYY-MM-DD'}
-                      onChange={onInputFormat(idx)}
-                      width={24}
-                    />
-                  </InlineField>
+                  <>
+                    <InlineField label="Date format" tooltip="Specify the output format.">
+                      <Input
+                        value={c.dateFormat}
+                        placeholder={'e.g. YYYY-MM-DD'}
+                        onChange={onInputFormat(idx)}
+                        width={24}
+                      />
+                    </InlineField>
+                    <InlineField label="Set timezone" tooltip="Set the timezone of the date manually">
+                      <Select options={timeZoneOptions} value={c.timezone} onChange={onTzChange(idx)} isClearable />
+                    </InlineField>
+                  </>
                 )}
               <Button
                 size="md"
diff --git a/public/app/features/transformers/editors/FormatStringTransformerEditor.tsx b/public/app/features/transformers/editors/FormatStringTransformerEditor.tsx
new file mode 100644
index 0000000000000..d0af7b19da478
--- /dev/null
+++ b/public/app/features/transformers/editors/FormatStringTransformerEditor.tsx
@@ -0,0 +1,123 @@
+import React, { useCallback } from 'react';
+
+import {
+  DataTransformerID,
+  SelectableValue,
+  standardTransformers,
+  TransformerRegistryItem,
+  TransformerUIProps,
+  PluginState,
+  FieldType,
+  StandardEditorsRegistryItem,
+  FieldNamePickerConfigSettings,
+  TransformerCategory,
+} from '@grafana/data';
+import {
+  FormatStringOutput,
+  FormatStringTransformerOptions,
+} from '@grafana/data/src/transformations/transformers/formatString';
+import { Select, InlineFieldRow, InlineField } from '@grafana/ui';
+import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker';
+import { NumberInput } from 'app/core/components/OptionsUI/NumberInput';
+
+const fieldNamePickerSettings: StandardEditorsRegistryItem<string, FieldNamePickerConfigSettings> = {
+  settings: {
+    width: 30,
+    filter: (f) => f.type === FieldType.string,
+    placeholderText: 'Select text field',
+    noFieldsMessage: 'No text fields found',
+  },
+  name: '',
+  id: '',
+  editor: () => null,
+};
+
+function FormatStringTransfomerEditor({
+  input,
+  options,
+  onChange,
+}: TransformerUIProps<FormatStringTransformerOptions>) {
+  const onSelectField = useCallback(
+    (value: string | undefined) => {
+      const val = value ?? '';
+      onChange({
+        ...options,
+        stringField: val,
+      });
+    },
+    [onChange, options]
+  );
+
+  const onFormatChange = useCallback(
+    (value: SelectableValue<FormatStringOutput>) => {
+      const val = value.value ?? FormatStringOutput.UpperCase;
+      onChange({
+        ...options,
+        outputFormat: val,
+      });
+    },
+    [onChange, options]
+  );
+
+  const onSubstringStartChange = useCallback(
+    (value?: number) => {
+      onChange({
+        ...options,
+        substringStart: value ?? 0,
+      });
+    },
+    [onChange, options]
+  );
+
+  const onSubstringEndChange = useCallback(
+    (value?: number) => {
+      onChange({
+        ...options,
+        substringEnd: value ?? 0,
+      });
+    },
+    [onChange, options]
+  );
+
+  const ops = Object.values(FormatStringOutput).map((value) => ({ label: value, value }));
+
+  return (
+    <>
+      <InlineFieldRow>
+        <InlineField label={'Field'} labelWidth={10}>
+          <FieldNamePicker
+            context={{ data: input }}
+            value={options.stringField ?? ''}
+            onChange={onSelectField}
+            item={fieldNamePickerSettings}
+          />
+        </InlineField>
+
+        <InlineField label="Format" labelWidth={10}>
+          <Select options={ops} value={options.outputFormat} onChange={onFormatChange} width={20} />
+        </InlineField>
+      </InlineFieldRow>
+
+      {options.outputFormat === FormatStringOutput.Substring && (
+        <InlineFieldRow>
+          <InlineField label="Substring range" labelWidth={15}>
+            <NumberInput min={0} value={options.substringStart ?? 0} onChange={onSubstringStartChange} width={7} />
+          </InlineField>
+          <InlineField>
+            <NumberInput min={0} value={options.substringEnd ?? 0} onChange={onSubstringEndChange} width={7} />
+          </InlineField>
+        </InlineFieldRow>
+      )}
+    </>
+  );
+}
+
+export const formatStringTransformerRegistryItem: TransformerRegistryItem<FormatStringTransformerOptions> = {
+  id: DataTransformerID.formatString,
+  editor: FormatStringTransfomerEditor,
+  transformation: standardTransformers.formatStringTransformer,
+  name: standardTransformers.formatStringTransformer.name,
+  state: PluginState.beta,
+  description: standardTransformers.formatStringTransformer.description,
+  categories: new Set([TransformerCategory.Reformat]),
+};
diff --git a/public/app/features/transformers/editors/FormatTimeTransformerEditor.tsx b/public/app/features/transformers/editors/FormatTimeTransformerEditor.tsx
index 8ed438954ddec..402bdd1aa7c46 100644
--- a/public/app/features/transformers/editors/FormatTimeTransformerEditor.tsx
+++ b/public/app/features/transformers/editors/FormatTimeTransformerEditor.tsx
@@ -10,7 +10,9 @@ import {
   PluginState,
 } from '@grafana/data';
 import { FormatTimeTransformerOptions } from '@grafana/data/src/transformations/transformers/formatTime';
-import { Select, InlineFieldRow, InlineField, Input, InlineSwitch } from '@grafana/ui';
+import { Select, InlineFieldRow, InlineField, Input } from '@grafana/ui';
+
+import { getTimezoneOptions } from '../utils';
 
 export function FormatTimeTransfomerEditor({
   input,
@@ -18,6 +20,7 @@ export function FormatTimeTransfomerEditor({
   onChange,
 }: TransformerUIProps<FormatTimeTransformerOptions>) {
   const timeFields: Array<SelectableValue<string>> = [];
+  const timeZoneOptions: Array<SelectableValue<string>> = getTimezoneOptions(true);
 
   // Get time fields
   for (const frame of input) {
@@ -51,12 +54,16 @@ export function FormatTimeTransfomerEditor({
     [onChange, options]
   );
 
-  const onUseTzChange = useCallback(() => {
-    onChange({
-      ...options,
-      useTimezone: !options.useTimezone,
-    });
-  }, [onChange, options]);
+  const onTzChange = useCallback(
+    (value: SelectableValue<string>) => {
+      const val = value?.value !== undefined ? value.value : '';
+      onChange({
+        ...options,
+        timezone: val,
+      });
+    },
+    [onChange, options]
+  );
 
   return (
     <>
@@ -87,12 +94,8 @@ export function FormatTimeTransfomerEditor({
         >
           <Input onChange={onFormatChange} value={options.outputFormat} />
         </InlineField>
-        <InlineField
-          label="Use Timezone"
-          tooltip="Use the user's configured timezone when formatting time."
-          labelWidth={20}
-        >
-          <InlineSwitch value={options.useTimezone} transparent={true} onChange={onUseTzChange} />
+        <InlineField label="Set Timezone" tooltip="Set the timezone of the date manually" labelWidth={20}>
+          <Select options={timeZoneOptions} value={options.timezone} onChange={onTzChange} isClearable />
         </InlineField>
       </InlineFieldRow>
     </>
diff --git a/public/app/features/transformers/standardTransformers.ts b/public/app/features/transformers/standardTransformers.ts
index 5a188e091e088..c8af140e88936 100644
--- a/public/app/features/transformers/standardTransformers.ts
+++ b/public/app/features/transformers/standardTransformers.ts
@@ -9,6 +9,7 @@ import { concatenateTransformRegistryItem } from './editors/ConcatenateTransform
 import { convertFieldTypeTransformRegistryItem } from './editors/ConvertFieldTypeTransformerEditor';
 import { filterFieldsByNameTransformRegistryItem } from './editors/FilterByNameTransformerEditor';
 import { filterFramesByRefIdTransformRegistryItem } from './editors/FilterByRefIdTransformerEditor';
+import { formatStringTransformerRegistryItem } from './editors/FormatStringTransformerEditor';
 import { formatTimeTransformerRegistryItem } from './editors/FormatTimeTransformerEditor';
 import { groupByTransformRegistryItem } from './editors/GroupByTransformerEditor';
 import { groupingToMatrixTransformRegistryItem } from './editors/GroupingToMatrixTransformerEditor';
@@ -60,7 +61,8 @@ export const getStandardTransformers = (): Array<TransformerRegistryItem<any>> =
     limitTransformRegistryItem,
     joinByLabelsTransformRegistryItem,
     partitionByValuesTransformRegistryItem,
+    ...(config.featureToggles.formatString ? [formatStringTransformerRegistryItem] : []),
     formatTimeTransformerRegistryItem,
-    ...(config.featureToggles.timeSeriesTable ? [timeSeriesTableTransformRegistryItem] : []),
+    timeSeriesTableTransformRegistryItem,
   ];
 };
diff --git a/public/app/features/transformers/timeSeriesTable/TimeSeriesTableTransformEditor.tsx b/public/app/features/transformers/timeSeriesTable/TimeSeriesTableTransformEditor.tsx
index eb01f21de1be1..1d4d6ad5df224 100644
--- a/public/app/features/transformers/timeSeriesTable/TimeSeriesTableTransformEditor.tsx
+++ b/public/app/features/transformers/timeSeriesTable/TimeSeriesTableTransformEditor.tsx
@@ -1,17 +1,56 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 
-import { PluginState, TransformerRegistryItem, TransformerUIProps } from '@grafana/data';
+import { PluginState, TransformerRegistryItem, TransformerUIProps, ReducerID, isReducerID } from '@grafana/data';
+import { InlineFieldRow, InlineField, StatsPicker } from '@grafana/ui';
 
 import { timeSeriesTableTransformer, TimeSeriesTableTransformerOptions } from './timeSeriesTableTransformer';
 
-export interface Props extends TransformerUIProps<{}> {}
+export function TimeSeriesTableTransformEditor({
+  input,
+  options,
+  onChange,
+}: TransformerUIProps<TimeSeriesTableTransformerOptions>) {
+  const refIds: string[] = input.reduce<string[]>((acc, frame) => {
+    if (frame.refId && !acc.includes(frame.refId)) {
+      return [...acc, frame.refId];
+    }
+    return acc;
+  }, []);
 
-export function TimeSeriesTableTransformEditor({ input, options, onChange }: Props) {
-  if (input.length === 0) {
-    return null;
-  }
+  const onSelectStat = useCallback(
+    (refId: string, stats: string[]) => {
+      const reducerID = stats[0];
+      if (reducerID && isReducerID(reducerID)) {
+        onChange({
+          refIdToStat: {
+            ...options.refIdToStat,
+            [refId]: reducerID,
+          },
+        });
+      }
+    },
+    [onChange, options]
+  );
 
-  return <div></div>;
+  return (
+    <>
+      {refIds.map((refId) => {
+        return (
+          <div key={refId}>
+            <InlineFieldRow>
+              <InlineField label={`Trend ${refIds.length > 1 ? ` #${refId}` : ''} value`}>
+                <StatsPicker
+                  stats={[options.refIdToStat?.[refId] ?? ReducerID.lastNotNull]}
+                  onChange={onSelectStat.bind(null, refId)}
+                  filterOptions={(ext) => ext.id !== ReducerID.allValues && ext.id !== ReducerID.uniqueValues}
+                />
+              </InlineField>
+            </InlineFieldRow>
+          </div>
+        );
+      })}
+    </>
+  );
 }
 
 export const timeSeriesTableTransformRegistryItem: TransformerRegistryItem<TimeSeriesTableTransformerOptions> = {
diff --git a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.test.ts b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.test.ts
index 76a8898bff299..a281c4d5d2bc2 100644
--- a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.test.ts
+++ b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.test.ts
@@ -1,4 +1,4 @@
-import { toDataFrame, FieldType, Labels, DataFrame, Field } from '@grafana/data';
+import { toDataFrame, FieldType, Labels, DataFrame, Field, ReducerID } from '@grafana/data';
 
 import { timeSeriesToTableTransform } from './timeSeriesTableTransformer';
 
@@ -61,6 +61,35 @@ describe('timeSeriesTableTransformer', () => {
     expect(results[1].fields[2].values).toEqual(['A', 'B']);
     assertDataFrameField(results[1].fields[3], series.slice(3, 5));
   });
+
+  it('Will include last value by deault', () => {
+    const series = [
+      getTimeSeries('A', { instance: 'A', pod: 'B' }, [4, 2, 3]),
+      getTimeSeries('A', { instance: 'A', pod: 'C' }, [3, 4, 5]),
+    ];
+
+    const results = timeSeriesToTableTransform({}, series);
+    expect(results[0].fields[2].values[0].value).toEqual(3);
+    expect(results[0].fields[2].values[1].value).toEqual(5);
+  });
+
+  it('Will calculate average value if configured', () => {
+    const series = [
+      getTimeSeries('A', { instance: 'A', pod: 'B' }, [4, 2, 3]),
+      getTimeSeries('B', { instance: 'A', pod: 'C' }, [3, 4, 5]),
+    ];
+
+    const results = timeSeriesToTableTransform(
+      {
+        refIdToStat: {
+          B: ReducerID.mean,
+        },
+      },
+      series
+    );
+    expect(results[0].fields[2].values[0].value).toEqual(3);
+    expect(results[1].fields[2].values[0].value).toEqual(4);
+  });
 });
 
 function assertFieldsEqual(field1: Field, field2: Field) {
@@ -80,7 +109,7 @@ function assertDataFrameField(field: Field, matchesFrames: DataFrame[]) {
   });
 }
 
-function getTimeSeries(refId: string, labels: Labels) {
+function getTimeSeries(refId: string, labels: Labels, values: number[] = [10]) {
   return toDataFrame({
     refId,
     fields: [
@@ -88,7 +117,7 @@ function getTimeSeries(refId: string, labels: Labels) {
       {
         name: 'Value',
         type: FieldType.number,
-        values: [10],
+        values,
         labels,
       },
     ],
diff --git a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
index a2ddb2da6fb4d..5137b15f05027 100644
--- a/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
+++ b/public/app/features/transformers/timeSeriesTable/timeSeriesTableTransformer.ts
@@ -2,15 +2,20 @@ import { map } from 'rxjs/operators';
 
 import {
   DataFrame,
+  DataFrameWithValue,
   DataTransformerID,
   DataTransformerInfo,
   Field,
   FieldType,
   MutableDataFrame,
   isTimeSeriesFrame,
+  ReducerID,
+  reduceField,
 } from '@grafana/data';
 
-export interface TimeSeriesTableTransformerOptions {}
+export interface TimeSeriesTableTransformerOptions {
+  refIdToStat?: Record<string, ReducerID>;
+}
 
 export const timeSeriesTableTransformer: DataTransformerInfo<TimeSeriesTableTransformerOptions> = {
   id: DataTransformerID.timeSeriesTable,
@@ -44,7 +49,7 @@ export function timeSeriesToTableTransform(options: TimeSeriesTableTransformerOp
   // initialize fields from labels for each refId
   const refId2LabelFields = getLabelFields(data);
 
-  const refId2frameField: Record<string, Field<DataFrame>> = {};
+  const refId2frameField: Record<string, Field<DataFrameWithValue>> = {};
 
   const result: DataFrame[] = [];
 
@@ -83,8 +88,13 @@ export function timeSeriesToTableTransform(options: TimeSeriesTableTransformerOp
       const labelValue = labels?.[labelKey] ?? null;
       labelFields[labelKey].values.push(labelValue!);
     }
-
-    frameField.values.push(frame);
+    const reducerId = options.refIdToStat?.[refId] ?? ReducerID.lastNotNull;
+    const valueField = frame.fields.find((f) => f.type === FieldType.number);
+    const value = (valueField && reduceField({ field: valueField, reducers: [reducerId] })[reducerId]) || null;
+    frameField.values.push({
+      ...frame,
+      value,
+    });
   }
   return result;
 }
diff --git a/public/app/features/transformers/utils.ts b/public/app/features/transformers/utils.ts
index 23c927ba7f6a6..c9d060a595594 100644
--- a/public/app/features/transformers/utils.ts
+++ b/public/app/features/transformers/utils.ts
@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 
-import { DataFrame, getFieldDisplayName, TransformerCategory } from '@grafana/data';
+import { DataFrame, getFieldDisplayName, TransformerCategory, SelectableValue, getTimeZones } from '@grafana/data';
 import { config } from '@grafana/runtime';
 
 export function useAllFieldNamesFromDataFrames(input: DataFrame[]): string[] {
@@ -61,3 +61,23 @@ export const numberOrVariableValidator = (value: string | number) => {
   }
   return false;
 };
+
+export function getTimezoneOptions(includeInternal: boolean) {
+  const timeZoneOptions: Array<SelectableValue<string>> = [];
+
+  // There are currently only two internal timezones
+  // Browser and UTC. We add the manually to avoid
+  // funky string manipulation.
+  if (includeInternal) {
+    timeZoneOptions.push({ label: 'Browser', value: 'browser' });
+    timeZoneOptions.push({ label: 'UTC', value: 'utc' });
+  }
+
+  // Add all other timezones
+  const tzs = getTimeZones();
+  for (const tz of tzs) {
+    timeZoneOptions.push({ label: tz, value: tz });
+  }
+
+  return timeZoneOptions;
+}
diff --git a/public/app/features/variables/inspect/utils.ts b/public/app/features/variables/inspect/utils.ts
index 16e1f3cf88d1a..281d8df449b20 100644
--- a/public/app/features/variables/inspect/utils.ts
+++ b/public/app/features/variables/inspect/utils.ts
@@ -193,7 +193,7 @@ export const createUsagesNetwork = (variables: VariableModel[], dashboard: Dashb
 
   const unUsed: VariableModel[] = [];
   let usages: VariableUsageTree[] = [];
-  const model = dashboard.getSaveModelClone();
+  const model = dashboard.getSaveModelCloneOld();
 
   for (const variable of variables) {
     const variableId = variable.id;
@@ -233,7 +233,7 @@ function createUnknownsNetwork(variables: VariableModel[], dashboard: DashboardM
   }
 
   let unknown: VariableUsageTree[] = [];
-  const model = dashboard.getSaveModelClone();
+  const model = dashboard.getSaveModelCloneOld();
 
   const unknownVariables = getUnknownVariableStrings(variables, model);
   for (const unknownVariable of unknownVariables) {
diff --git a/public/app/features/visualization/data-hover/DataHoverView.tsx b/public/app/features/visualization/data-hover/DataHoverView.tsx
index f8f2f075b608a..5c651d3ff10c5 100644
--- a/public/app/features/visualization/data-hover/DataHoverView.tsx
+++ b/public/app/features/visualization/data-hover/DataHoverView.tsx
@@ -11,7 +11,7 @@ import {
   LinkModel,
 } from '@grafana/data';
 import { SortOrder, TooltipDisplayMode } from '@grafana/schema';
-import { LinkButton, useStyles2, VerticalGroup } from '@grafana/ui';
+import { TextLink, useStyles2 } from '@grafana/ui';
 import { renderValue } from 'app/plugins/panel/geomap/utils/uiUtils';
 
 export interface Props {
@@ -60,8 +60,10 @@ export const DataHoverView = ({ data, rowIndex, columnIndex, sortOrder, mode, he
     if (mode === TooltipDisplayMode.Single && columnIndex != null && !field.hovered) {
       continue;
     }
+
     const value = field.values[rowIndex];
     const fieldDisplay = field.display ? field.display(value) : { text: `${value}`, numeric: +value };
+
     if (field.getLinks) {
       field.getLinks({ calculatedValue: fieldDisplay, valueRowIndex: rowIndex }).forEach((link) => {
         const key = `${link.title}/${link.href}`;
@@ -87,29 +89,6 @@ export const DataHoverView = ({ data, rowIndex, columnIndex, sortOrder, mode, he
     displayValues.sort((a, b) => arrayUtils.sortValues(sortOrder)(a.value, b.value));
   }
 
-  const renderLinks = () =>
-    links.length > 0 && (
-      <tr>
-        <td colSpan={2}>
-          <VerticalGroup>
-            {links.map((link, i) => (
-              <LinkButton
-                key={i}
-                icon={'external-link-alt'}
-                target={link.target}
-                href={link.href}
-                onClick={link.onClick}
-                fill="text"
-                style={{ width: '100%' }}
-              >
-                {link.title}
-              </LinkButton>
-            ))}
-          </VerticalGroup>
-        </td>
-      </tr>
-    );
-
   return (
     <div className={styles.wrapper}>
       {header && (
@@ -125,7 +104,16 @@ export const DataHoverView = ({ data, rowIndex, columnIndex, sortOrder, mode, he
               <td>{renderValue(displayValue.valueString)}</td>
             </tr>
           ))}
-          {renderLinks()}
+          {links.map((link, i) => (
+            <tr key={i}>
+              <th>Link</th>
+              <td colSpan={2}>
+                <TextLink href={link.href} external={link.target === '_blank'} weight={'medium'} inline={false}>
+                  {link.title}
+                </TextLink>
+              </td>
+            </tr>
+          ))}
         </tbody>
       </table>
     </div>
diff --git a/public/app/plugins/datasource/alertmanager/consts.ts b/public/app/plugins/datasource/alertmanager/consts.ts
index 3d0aef240df5b..7e63f989f84fc 100644
--- a/public/app/plugins/datasource/alertmanager/consts.ts
+++ b/public/app/plugins/datasource/alertmanager/consts.ts
@@ -10,4 +10,5 @@ export const receiverTypeNames: Record<string, string> = {
   webex: 'Cisco Webex Teams',
   sns: 'Amazon SNS',
   telegram: 'Telegram',
+  msteams: 'Microsoft Teams',
 };
diff --git a/public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.ts b/public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.ts
index 827bd8ce1ba3e..bf035aed1d820 100644
--- a/public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.ts
+++ b/public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.ts
@@ -248,4 +248,8 @@ export default class AzureLogAnalyticsDatasource extends DataSourceWithBackend<
   private isValidConfigField(field: string | undefined): boolean {
     return typeof field === 'string' && field.length > 0;
   }
+
+  async getAzureLogAnalyticsCheatsheetQueries() {
+    return await this.getResource(`${this.resourcePath}/v1/metadata`);
+  }
 }
diff --git a/public/app/plugins/datasource/azuremonitor/components/AzureCheatSheet.tsx b/public/app/plugins/datasource/azuremonitor/components/AzureCheatSheet.tsx
new file mode 100644
index 0000000000000..7611ad31c924f
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/AzureCheatSheet.tsx
@@ -0,0 +1,263 @@
+import { css } from '@emotion/css';
+import React, { useEffect, useMemo, useState } from 'react';
+
+import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
+import {
+  Button,
+  Card,
+  Collapse,
+  CustomScrollbar,
+  Field,
+  Input,
+  LoadingPlaceholder,
+  Select,
+  useStyles2,
+} from '@grafana/ui';
+
+import AzureLogAnalyticsDatasource from '../azure_log_analytics/azure_log_analytics_datasource';
+import {
+  AzureMonitorQuery,
+  AzureQueryType,
+  Category,
+  CheatsheetQueries,
+  CheatsheetQuery,
+  DropdownCategories,
+} from '../types';
+
+import { RawQuery } from './RawQuery';
+import tokenizer from './syntax';
+
+export interface AzureCheatSheetProps {
+  onChange: (query: AzureMonitorQuery) => void;
+  query: AzureMonitorQuery;
+  datasource: AzureLogAnalyticsDatasource;
+}
+
+const AzureCheatSheet = (props: AzureCheatSheetProps) => {
+  const [cheatsheetQueries, setCheatsheetQueries] = useState<CheatsheetQueries | null>(null);
+  const [areDropdownsOpen, setAreDropdownsOpen] = useState<DropdownCategories>({});
+  const [visibleQueries, setVisibleQueries] = useState<CheatsheetQueries | null>(null);
+  const [isLoading, setIsLoading] = useState(true);
+  const [searchInputValue, setSearchInputValue] = useState('');
+  const styles = useStyles2(getStyles);
+  const lang = { grammar: tokenizer, name: 'kql' };
+  const dropdownMenu = useMemo(() => {
+    if (cheatsheetQueries) {
+      return Object.keys(cheatsheetQueries).map((category): SelectableValue<string> => {
+        return {
+          label: category,
+          value: category,
+        };
+      });
+    }
+    return [];
+  }, [cheatsheetQueries]);
+
+  const getCheatsheetQueries = async () => {
+    await props.datasource.getAzureLogAnalyticsCheatsheetQueries().then((result) => {
+      result.categories.sort((a: Category, b: Category) => {
+        return a.displayName.toLowerCase() === b.displayName.toLowerCase()
+          ? 0
+          : a.displayName.toLowerCase() < b.displayName.toLowerCase()
+          ? -1
+          : 1;
+      });
+      const alphabetizedQueries = result.categories.reduce(
+        (queriesByCategory: CheatsheetQueries, category: Category) => {
+          const categoryQueries = category.related.queries.map((queryId: string) => {
+            return result.queries.find((query: CheatsheetQuery) => query.id === queryId);
+          });
+          queriesByCategory[category.displayName] = categoryQueries;
+          setAreDropdownsOpen({ ...areDropdownsOpen, [category.id]: false });
+          return queriesByCategory;
+        },
+        {}
+      );
+      setCheatsheetQueries(alphabetizedQueries);
+      setVisibleQueries(alphabetizedQueries);
+      setIsLoading(false);
+      return alphabetizedQueries;
+    });
+  };
+
+  useEffect(() => {
+    if (!cheatsheetQueries) {
+      getCheatsheetQueries();
+    }
+  });
+
+  const filterQueriesBySearch = (searchValue: string) => {
+    const visibleQueriesCategories = Object.keys(visibleQueries!);
+    if (searchValue.length > 0 && cheatsheetQueries) {
+      const filteredQueries: CheatsheetQueries = Object.keys(cheatsheetQueries).reduce(
+        (filteredQueriesBySearch: CheatsheetQueries, category) => {
+          const filters = cheatsheetQueries![category]!.filter((query) => {
+            return query.displayName.toLowerCase().includes(searchValue.toLowerCase());
+          });
+          if (visibleQueriesCategories.includes(category)) {
+            filteredQueriesBySearch[category] = filters;
+          }
+          return filteredQueriesBySearch;
+        },
+        {}
+      );
+
+      setVisibleQueries(filteredQueries);
+      return filteredQueries;
+    } else {
+      if (Object.keys(visibleQueries!).length !== Object.keys(cheatsheetQueries!).length) {
+        setVisibleQueries(visibleQueries);
+        return visibleQueries;
+      } else {
+        setVisibleQueries(cheatsheetQueries);
+        return cheatsheetQueries;
+      }
+    }
+  };
+
+  const filterQueriesByCategory = (categories: SelectableValue<string>) => {
+    if (categories.length > 0) {
+      const selectedCategories = categories.map((selectedCategory: SelectableValue) => selectedCategory.label);
+      const updatedVisibleQueries = selectedCategories.reduce(
+        (updatedVisibleQueries: CheatsheetQueries, queryCategory: string) => {
+          updatedVisibleQueries[queryCategory] = cheatsheetQueries![queryCategory]!;
+          return updatedVisibleQueries;
+        },
+        {}
+      );
+      setVisibleQueries(updatedVisibleQueries);
+    } else {
+      setVisibleQueries(cheatsheetQueries);
+    }
+  };
+
+  return (
+    <div>
+      {!isLoading && visibleQueries ? (
+        <div>
+          <div className={styles.filterAlignment}>
+            <Input
+              value={searchInputValue}
+              onChange={(e) => {
+                setSearchInputValue(e.currentTarget.value);
+                const filteredQueries = filterQueriesBySearch(e.currentTarget.value);
+                setVisibleQueries(filteredQueries);
+              }}
+              placeholder="Search Logs queries"
+              width={40}
+            />
+            <Field label="Categories" className={styles.categoryDropdown}>
+              <Select
+                options={dropdownMenu}
+                value={''}
+                onChange={(a) => filterQueriesByCategory(a)}
+                allowCustomValue={false}
+                backspaceRemovesValue={true}
+                placeholder="All categories"
+                isClearable={true}
+                noOptionsMessage="Unable to list all categories"
+                formatCreateLabel={(input: string) => `Category: ${input}`}
+                isSearchable={true}
+                isMulti={true}
+                width={40}
+              />
+            </Field>
+          </div>
+          <div className={styles.spacing}>
+            Query results:{' '}
+            {Object.keys(visibleQueries).reduce((totalQueries: number, category) => {
+              totalQueries = visibleQueries[category]!.length + totalQueries;
+              return totalQueries;
+            }, 0)}
+          </div>
+          <CustomScrollbar showScrollIndicators={true} autoHeightMax="350px">
+            {Object.keys(visibleQueries).map((category: string) => {
+              if (visibleQueries[category]!.length) {
+                return (
+                  <Collapse
+                    label={category + ' ' + `(${visibleQueries[category]!.length})`}
+                    collapsible={true}
+                    isOpen={areDropdownsOpen[category]}
+                    onToggle={(isOpen) => setAreDropdownsOpen({ ...areDropdownsOpen, [category]: isOpen })}
+                    key={category}
+                  >
+                    {visibleQueries[category]!.map((query) => {
+                      return (
+                        <Card className={styles.card} key={query.id}>
+                          <Card.Heading>{query.displayName}</Card.Heading>
+                          <CustomScrollbar showScrollIndicators={true} autoHeightMax="100px">
+                            <RawQuery
+                              aria-label={`${query.displayName} raw query`}
+                              query={query.body}
+                              lang={lang}
+                              className={styles.rawQuery}
+                            />
+                          </CustomScrollbar>
+                          <Card.Actions>
+                            <Button
+                              size="sm"
+                              aria-label="use this query button"
+                              onClick={() => {
+                                props.onChange({
+                                  refId: 'A',
+                                  queryType: AzureQueryType.LogAnalytics,
+                                  azureLogAnalytics: { query: query.body },
+                                  datasource: props.datasource,
+                                });
+                                reportInteraction('grafana_azure_cheatsheet_logs_query_selected', {
+                                  id: query.id,
+                                  queryName: query.displayName,
+                                  query: query.body,
+                                  queryCategories: query.related.categories,
+                                });
+                              }}
+                            >
+                              Use this query
+                            </Button>
+                          </Card.Actions>
+                        </Card>
+                      );
+                    })}
+                  </Collapse>
+                );
+              }
+              return;
+            })}
+          </CustomScrollbar>
+        </div>
+      ) : (
+        <LoadingPlaceholder text="Loading..." />
+      )}
+    </div>
+  );
+};
+
+export default AzureCheatSheet;
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    card: css({
+      width: '90%',
+      display: 'flex',
+      flexDirection: 'column',
+    }),
+    rawQuery: css({
+      backgroundColor: `${theme.colors.background.primary}`,
+      padding: `${theme.spacing(1)}`,
+      marginTop: `${theme.spacing(1)}`,
+    }),
+    spacing: css({
+      marginBottom: `${theme.spacing(1)}`,
+    }),
+    filterAlignment: css({
+      display: 'flex',
+    }),
+    categoryDropdown: css({
+      margin: '0 0 10px 10px',
+      display: 'flex',
+      flexDirection: 'row',
+      alignItems: 'center',
+    }),
+  };
+};
diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/AzureCheatSheetModal.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/AzureCheatSheetModal.tsx
new file mode 100644
index 0000000000000..a629823368a34
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/AzureCheatSheetModal.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+
+import { CoreApp } from '@grafana/data';
+import { Modal } from '@grafana/ui';
+
+import AzureLogAnalyticsDatasource from '../../azure_log_analytics/azure_log_analytics_datasource';
+import { AzureMonitorQuery } from '../../dataquery.gen';
+import AzureCheatSheet from '../AzureCheatSheet';
+
+type Props = {
+  isOpen: boolean;
+  app?: CoreApp;
+  onClose: () => void;
+  onChange: (query: AzureMonitorQuery) => void;
+  onAddQuery?: (query: AzureMonitorQuery) => void;
+  datasource: AzureLogAnalyticsDatasource;
+};
+
+export const AzureCheatSheetModal = (props: Props) => {
+  const { isOpen, onClose, datasource, onChange } = props;
+
+  return (
+    <Modal aria-label="Kick start your query modal" isOpen={isOpen} title="Kick start your query" onDismiss={onClose}>
+      <AzureCheatSheet
+        onChange={(a) => {
+          onChange(a);
+          onClose();
+        }}
+        query={{ refId: 'A' }}
+        datasource={datasource}
+      ></AzureCheatSheet>
+    </Modal>
+  );
+};
diff --git a/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx
index 22056cceed08d..789c36000b900 100644
--- a/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx
+++ b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx
@@ -1,8 +1,10 @@
+import { css } from '@emotion/css';
 import { debounce } from 'lodash';
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 
 import { QueryEditorProps } from '@grafana/data';
-import { Alert, CodeEditor } from '@grafana/ui';
+import { reportInteraction } from '@grafana/runtime';
+import { Alert, Button, CodeEditor } from '@grafana/ui';
 
 import AzureMonitorDatasource from '../../datasource';
 import {
@@ -15,6 +17,7 @@ import {
 import useLastError from '../../utils/useLastError';
 import ArgQueryEditor from '../ArgQueryEditor';
 import LogsQueryEditor from '../LogsQueryEditor';
+import { AzureCheatSheetModal } from '../LogsQueryEditor/AzureCheatSheetModal';
 import NewMetricsQueryEditor from '../MetricsQueryEditor/MetricsQueryEditor';
 import { QueryHeader } from '../QueryHeader';
 import { Space } from '../Space';
@@ -38,6 +41,7 @@ const QueryEditor = ({
 }: AzureMonitorQueryEditorProps) => {
   const [errorMessage, setError] = useLastError();
   const onRunQuery = useMemo(() => debounce(baseOnRunQuery, 500), [baseOnRunQuery]);
+  const [azureLogsCheatSheetModalOpen, setAzureLogsCheatSheetModalOpen] = useState(false);
 
   const onQueryChange = useCallback(
     (newQuery: AzureMonitorQuery) => {
@@ -57,8 +61,32 @@ const QueryEditor = ({
 
   return (
     <div data-testid="azure-monitor-query-editor">
-      <QueryHeader query={query} onQueryChange={onQueryChange} />
-
+      <AzureCheatSheetModal
+        datasource={datasource.azureLogAnalyticsDatasource}
+        isOpen={azureLogsCheatSheetModalOpen}
+        onClose={() => setAzureLogsCheatSheetModalOpen(false)}
+        onChange={(a) => onChange({ ...a, queryType: AzureQueryType.LogAnalytics })}
+      />
+      <div className={css({ display: 'flex', alignItems: 'center' })}>
+        <QueryHeader query={query} onQueryChange={onQueryChange} />
+        {query.queryType === AzureQueryType.LogAnalytics && (
+          <Button
+            aria-label="Azure logs kick start your query button"
+            variant="secondary"
+            size="sm"
+            onClick={() => {
+              setAzureLogsCheatSheetModalOpen((prevValue) => !prevValue);
+
+              reportInteraction('grafana_azure_logs_query_patterns_opened', {
+                version: 'v2',
+                editorMode: query.azureLogAnalytics,
+              });
+            }}
+          >
+            Kick start your query
+          </Button>
+        )}
+      </div>
       <EditorForQueryType
         data={data}
         subscriptionId={subscriptionId}
diff --git a/public/app/plugins/datasource/azuremonitor/components/RawQuery.tsx b/public/app/plugins/datasource/azuremonitor/components/RawQuery.tsx
new file mode 100644
index 0000000000000..4d1f727e9f369
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/RawQuery.tsx
@@ -0,0 +1,37 @@
+import { css, cx } from '@emotion/css';
+import Prism, { Grammar } from 'prismjs';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data/src';
+import { useTheme2 } from '@grafana/ui/src';
+
+export interface Props {
+  query: string;
+  lang: {
+    grammar: Grammar;
+    name: string;
+  };
+  className?: string;
+}
+export function RawQuery({ query, lang, className }: Props) {
+  const theme = useTheme2();
+  const styles = getStyles(theme);
+  const highlighted = Prism.highlight(query, lang.grammar, lang.name);
+
+  return (
+    <div
+      className={cx(styles.editorField, 'prism-syntax-highlight', className)}
+      aria-label="selector"
+      dangerouslySetInnerHTML={{ __html: highlighted }}
+    />
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    editorField: css({
+      fontFamily: theme.typography.fontFamilyMonospace,
+      fontSize: theme.typography.bodySmall.fontSize,
+    }),
+  };
+};
diff --git a/public/app/plugins/datasource/azuremonitor/components/syntax.ts b/public/app/plugins/datasource/azuremonitor/components/syntax.ts
new file mode 100644
index 0000000000000..8fc879e85d3cb
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/components/syntax.ts
@@ -0,0 +1,366 @@
+import { Grammar } from 'prismjs';
+
+import { CompletionItem } from '@grafana/ui';
+
+export const QUERY_COMMANDS: CompletionItem[] = [
+  {
+    label: 'fields',
+    documentation: 'Retrieves the specified fields from log events',
+  },
+  { label: 'display', documentation: 'Specifies which fields to display in the query results' },
+  {
+    label: 'filter',
+    documentation: 'Filters the results of a query based on one or more conditions',
+  },
+  {
+    label: 'stats',
+    documentation: 'Calculates aggregate statistics based on the values of log fields',
+  },
+  { label: 'sort', documentation: 'Sorts the retrieved log events' },
+  { label: 'limit', documentation: 'Specifies the number of log events returned by the query' },
+  {
+    label: 'parse',
+    documentation:
+      'Extracts data from a log field, creating one or more ephemeral fields that you can process further in the query',
+  },
+];
+
+export const COMPARISON_OPERATORS = ['=', '!=', '<', '<=', '>', '>='];
+export const ARITHMETIC_OPERATORS = ['+', '-', '*', '/', '^', '%'];
+
+export const NUMERIC_OPERATORS = [
+  {
+    label: 'abs',
+    detail: 'abs(a)',
+    documentation: 'Absolute value.',
+  },
+  {
+    label: 'ceil',
+    detail: 'ceil(a)',
+    documentation: 'Round to ceiling (the smallest integer that is greater than the value of a).',
+  },
+  {
+    label: 'floor',
+    detail: 'floor(a)',
+    documentation: 'Round to floor (the largest integer that is smaller than the value of a).',
+  },
+  {
+    label: 'greatest',
+    detail: 'greatest(a,b, ... z)',
+    documentation: 'Returns the largest value.',
+  },
+  {
+    label: 'least',
+    detail: 'least(a, b, ... z)',
+    documentation: 'Returns the smallest value.',
+  },
+  {
+    label: 'log',
+    detail: 'log(a)',
+    documentation: 'Natural logarithm.',
+  },
+  {
+    label: 'sqrt',
+    detail: 'sqrt(a)',
+    documentation: 'Square root.',
+  },
+];
+
+export const GENERAL_FUNCTIONS = [
+  {
+    label: 'ispresent',
+    detail: 'ispresent(fieldname)',
+    documentation: 'Returns true if the field exists.',
+  },
+  {
+    label: 'coalesce',
+    detail: 'coalesce(fieldname1, fieldname2, ... fieldnamex)',
+    documentation: 'Returns the first non-null value from the list.',
+  },
+];
+
+export const STRING_FUNCTIONS = [
+  {
+    label: 'isempty',
+    detail: 'isempty(fieldname)',
+    documentation: 'Returns true if the field is missing or is an empty string.',
+  },
+  {
+    label: 'isblank',
+    detail: 'isblank(fieldname)',
+    documentation: 'Returns true if the field is missing, an empty string, or contains only white space.',
+  },
+  {
+    label: 'concat',
+    detail: 'concat(string1, string2, ... stringz)',
+    documentation: 'Concatenates the strings.',
+  },
+  {
+    label: 'ltrim',
+    detail: 'ltrim(string) or ltrim(string1, string2)',
+    documentation:
+      'Remove white space from the left of the string. If the function has a second string argument, it removes the characters of string2 from the left of string1.',
+  },
+  {
+    label: 'rtrim',
+    detail: 'rtrim(string) or rtrim(string1, string2)',
+    documentation:
+      'Remove white space from the right of the string. If the function has a second string argument, it removes the characters of string2 from the right of string1.',
+  },
+  {
+    label: 'trim',
+    detail: 'trim(string) or trim(string1, string2)',
+    documentation:
+      'Remove white space from both ends of the string. If the function has a second string argument, it removes the characters of string2 from both sides of string1.',
+  },
+  {
+    label: 'strlen',
+    detail: 'strlen(string)',
+    documentation: 'Returns the length of the string in Unicode code points.',
+  },
+  {
+    label: 'toupper',
+    detail: 'toupper(string)',
+    documentation: 'Converts the string to uppercase.',
+  },
+  {
+    label: 'tolower',
+    detail: 'tolower(string)',
+    documentation: 'Converts the string to lowercase.',
+  },
+  {
+    label: 'substr',
+    detail: 'substr(string1, x), or substr(string1, x, y)',
+    documentation:
+      'Returns a substring from the index specified by the number argument to the end of the string. If the function has a second number argument, it contains the length of the substring to be retrieved.',
+  },
+  {
+    label: 'replace',
+    detail: 'replace(string1, string2, string3)',
+    documentation: 'Replaces all instances of string2 in string1 with string3.',
+  },
+  {
+    label: 'strcontains',
+    detail: 'strcontains(string1, string2)',
+    documentation: 'Returns 1 if string1 contains string2 and 0 otherwise.',
+  },
+];
+
+export const DATETIME_FUNCTIONS = [
+  {
+    label: 'bin',
+    detail: 'bin(period)',
+    documentation: 'Rounds the value of @timestamp to the given period and then truncates.',
+  },
+  {
+    label: 'datefloor',
+    detail: 'datefloor(a, period)',
+    documentation: 'Truncates the timestamp to the given period.',
+  },
+  {
+    label: 'dateceil',
+    detail: 'dateceil(a, period)',
+    documentation: 'Rounds up the timestamp to the given period and then truncates.',
+  },
+  {
+    label: 'fromMillis',
+    detail: 'fromMillis(fieldname)',
+    documentation:
+      'Interprets the input field as the number of milliseconds since the Unix epoch and converts it to a timestamp.',
+  },
+  {
+    label: 'toMillis',
+    detail: 'toMillis(fieldname)',
+    documentation:
+      'Converts the timestamp found in the named field into a number representing the milliseconds since the Unix epoch.',
+  },
+];
+
+export const IP_FUNCTIONS = [
+  {
+    label: 'isValidIp',
+    detail: 'isValidIp(fieldname)',
+    documentation: 'Returns true if the field is a valid v4 or v6 IP address.',
+  },
+  {
+    label: 'isValidIpV4',
+    detail: 'isValidIpV4(fieldname)',
+    documentation: 'Returns true if the field is a valid v4 IP address.',
+  },
+  {
+    label: 'isValidIpV6',
+    detail: 'isValidIpV6(fieldname)',
+    documentation: 'Returns true if the field is a valid v6 IP address.',
+  },
+  {
+    label: 'isIpInSubnet',
+    detail: 'isIpInSubnet(fieldname, string)',
+    documentation: 'Returns true if the field is a valid v4 or v6 IP address within the specified v4 or v6 subnet.',
+  },
+  {
+    label: 'isIpv4InSubnet',
+    detail: 'isIpv4InSubnet(fieldname, string)',
+    documentation: 'Returns true if the field is a valid v4 IP address within the specified v4 subnet.',
+  },
+  {
+    label: 'isIpv6InSubnet',
+    detail: 'isIpv6InSubnet(fieldname, string)',
+    documentation: 'Returns true if the field is a valid v6 IP address within the specified v6 subnet.',
+  },
+];
+
+export const BOOLEAN_FUNCTIONS = [
+  {
+    label: 'ispresent',
+    detail: 'ispresent(fieldname)',
+    documentation: 'Returns true if the field exists.',
+  },
+  {
+    label: 'isempty',
+    detail: 'isempty(fieldname)',
+    documentation: 'Returns true if the field is missing or is an empty string.',
+  },
+  {
+    label: 'isblank',
+    detail: 'isblank(fieldname)',
+    documentation: 'Returns true if the field is missing, an empty string, or contains only white space.',
+  },
+  {
+    label: 'strcontains',
+    detail: 'strcontains(string1, string2)',
+    documentation: 'Returns 1 if string1 contains string2 and 0 otherwise.',
+  },
+  ...IP_FUNCTIONS,
+];
+
+export const AGGREGATION_FUNCTIONS_STATS = [
+  {
+    label: 'avg',
+    detail: 'avg(NumericFieldname)',
+    documentation: 'The average of the values in the specified field.',
+  },
+  {
+    label: 'count',
+    detail: 'count(fieldname) or count(*)',
+    documentation: 'Counts the log records.',
+  },
+  {
+    label: 'count_distinct',
+    detail: 'count_distinct(fieldname)',
+    documentation: 'Returns the number of unique values for the field.',
+  },
+  {
+    label: 'max',
+    detail: 'max(fieldname)',
+    documentation: 'The maximum of the values for this log field in the queried logs.',
+  },
+  {
+    label: 'min',
+    detail: 'min(fieldname)',
+    documentation: 'The minimum of the values for this log field in the queried logs.',
+  },
+  {
+    label: 'pct',
+    detail: 'pct(fieldname, value)',
+    documentation: 'A percentile indicates the relative standing of a value in a datas.',
+  },
+  {
+    label: 'stddev',
+    detail: 'stddev(NumericFieldname)',
+    documentation: 'The standard deviation of the values in the specified field.',
+  },
+  {
+    label: 'sum',
+    detail: 'sum(NumericFieldname)',
+    documentation: 'The sum of the values in the specified field.',
+  },
+];
+
+export const NON_AGGREGATION_FUNCS_STATS = [
+  {
+    label: 'earliest',
+    detail: 'earliest(fieldname)',
+    documentation:
+      'Returns the value of fieldName from the log event that has the earliest time stamp in the queried logs.',
+  },
+  {
+    label: 'latest',
+    detail: 'latest(fieldname)',
+    documentation:
+      'Returns the value of fieldName from the log event that has the latest time stamp in the queried logs.',
+  },
+  {
+    label: 'sortsFirst',
+    detail: 'sortsFirst(fieldname)',
+    documentation: 'Returns the value of fieldName that sorts first in the queried logs.',
+  },
+  {
+    label: 'sortsLast',
+    detail: 'sortsLast(fieldname)',
+    documentation: 'Returns the value of fieldName that sorts last in the queried logs.',
+  },
+];
+
+export const STATS_FUNCS = [...AGGREGATION_FUNCTIONS_STATS, ...NON_AGGREGATION_FUNCS_STATS];
+
+export const KEYWORDS = ['as', 'like', 'by', 'in', 'desc', 'asc'];
+export const FIELD_AND_FILTER_FUNCTIONS = [
+  ...NUMERIC_OPERATORS,
+  ...GENERAL_FUNCTIONS,
+  ...STRING_FUNCTIONS,
+  ...DATETIME_FUNCTIONS,
+  ...IP_FUNCTIONS,
+];
+
+export const FUNCTIONS = [...FIELD_AND_FILTER_FUNCTIONS, ...STATS_FUNCS];
+
+const tokenizer: Grammar = {
+  comment: {
+    pattern: /^#.*/,
+    greedy: true,
+  },
+  backticks: {
+    pattern: /`.*?`/,
+    alias: 'string',
+    greedy: true,
+  },
+  quote: {
+    pattern: /".*?"/,
+    alias: 'string',
+    greedy: true,
+  },
+  regex: {
+    pattern: /\/.*?\/(?=\||\s*$|,)/,
+    greedy: true,
+  },
+  'query-command': {
+    pattern: new RegExp(`\\b(?:${QUERY_COMMANDS.map((command) => command.label).join('|')})\\b`, 'i'),
+    alias: 'function',
+  },
+  function: {
+    pattern: new RegExp(`\\b(?:${FUNCTIONS.map((f) => f.label).join('|')})\\b`, 'i'),
+  },
+  keyword: {
+    pattern: new RegExp(`(\\s+)(${KEYWORDS.join('|')})(?=\\s+)`, 'i'),
+    lookbehind: true,
+  },
+  'log-group-name': {
+    pattern: /[\.\-_/#A-Za-z0-9]+/,
+  },
+  'field-name': {
+    pattern: /(@?[_a-zA-Z]+[_.0-9a-zA-Z]*)|(`((\\`)|([^`]))*?`)/,
+    greedy: true,
+  },
+  number: /\b-?\d+((\.\d*)?([eE][+-]?\d+)?)?\b/,
+  'command-separator': {
+    pattern: /\|/,
+    alias: 'punctuation',
+  },
+  'comparison-operator': {
+    pattern: /([<>]=?)|(!?=)/,
+  },
+  punctuation: /[{}()`,.]/,
+  whitespace: /\s+/,
+};
+
+export default tokenizer;
diff --git a/public/app/plugins/datasource/azuremonitor/dashboards/appInsights.json b/public/app/plugins/datasource/azuremonitor/dashboards/appInsights.json
index d6cc70066d91f..1b6e82299b8a5 100644
--- a/public/app/plugins/datasource/azuremonitor/dashboards/appInsights.json
+++ b/public/app/plugins/datasource/azuremonitor/dashboards/appInsights.json
@@ -1,34 +1,75 @@
 {
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "target": {
-          "limit": 100,
-          "matchAny": false,
-          "tags": [],
-          "type": "dashboard"
-        },
-        "type": "dashboard"
-      }
-    ]
-  },
+  "__inputs": [],
+  "__elements": {},
+  "__requires": [
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "9.5.2"
+    },
+    {
+      "type": "datasource",
+      "id": "grafana-azure-monitor-datasource",
+      "name": "Azure Monitor",
+      "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "stat",
+      "name": "Stat",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "timeseries",
+      "name": "Time series",
+      "version": ""
+    }
+  ],
   "description": "The dashboard provides insights of Azure Apps via different metrics for app monitoring through Application Insights.",
   "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
   "id": null,
-  "iteration": 1644348036942,
-  "links": [],
+  "links": [
+    {
+      "asDropdown": true,
+      "icon": "dashboard",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": ["Azure-AppInsights-Perf"],
+      "targetBlank": true,
+      "title": "Performance",
+      "tooltip": "",
+      "type": "dashboards",
+      "url": ""
+    },
+    {
+      "asDropdown": true,
+      "icon": "dashboard",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": ["Azure-AppInsights-Failures"],
+      "targetBlank": true,
+      "title": "Failures",
+      "tooltip": "",
+      "type": "dashboards",
+      "url": ""
+    }
+  ],
+  "liveNow": false,
   "panels": [
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -41,7 +82,6 @@
       "type": "row"
     },
     {
-      "datasource": null,
       "gridPos": {
         "h": 3,
         "w": 5,
@@ -50,14 +90,22 @@
       },
       "id": 10,
       "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
         "content": "<a style=\"color: inherit;\" href=\"https://portal.azure.com/#@${tenant}/resource/subscriptions/${sub}/resourceGroups/${rg}/providers/microsoft.insights/components/${res}/overview\" target=\"_blank\">\n  <div>\n    <h3 style=\"color: #a16feb\"> ${res} </h1>\n    <h5 style=\"margin-bottom: 0px;\"> Application Insights  </h5>\n  </div>\n</a>",
         "mode": "html"
       },
-      "pluginVersion": "8.2.7",
+      "pluginVersion": "9.5.2",
       "type": "text"
     },
     {
-      "datasource": "${ds}",
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -121,18 +169,9 @@
         "text": {},
         "textMode": "auto"
       },
-      "pluginVersion": "8.2.7",
+      "pluginVersion": "9.5.2",
       "targets": [
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
           "azureMonitor": {
             "aggOptions": [],
             "aggregation": "Average",
@@ -148,12 +187,9 @@
             "timeGrains": [],
             "top": "50"
           },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Monitor",
           "refId": "A",
@@ -165,7 +201,6 @@
       "type": "stat"
     },
     {
-      "datasource": null,
       "gridPos": {
         "h": 3,
         "w": 4,
@@ -175,20 +210,18 @@
       "id": 44,
       "links": [],
       "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
         "content": "<a style=\"color: inherit;\" href=\"https://portal.azure.com/#blade/AppInsightsExtension/ProactiveDetectionFeedBlade/ComponentId/%7B%22Name%22%3A%22${res}%22%2C%22SubscriptionId%22%3A%22${sub}%22%2C%22ResourceGroup%22%3A%22${rg}%22%7D/TimeContext/%7B%22durationMs%22%3A604800000%2C%22endTime%22%3Anull%2C%22createdTime%22%3A%222021-10-18T19%3A26%3A58.876Z%22%2C%22isInitialTime%22%3Atrue%2C%22grain%22%3A1%2C%22useDashboardTimeRange%22%3Afalse%7D\" target=\"_blank\">\n<div style=\"padding-top: 20px\">\n  <center><p style=\"color: #4d99b8; font-size:18px;\">Smart detection</p></center>\n  <center><p style=\"margin-top:0px;\">${res}</p></center>\n</div>\n</a>",
         "mode": "html"
       },
-      "pluginVersion": "8.2.7",
-      "targets": [
-        {
-          "queryType": "randomWalk",
-          "refId": "A"
-        }
-      ],
+      "pluginVersion": "9.5.2",
       "type": "text"
     },
     {
-      "datasource": "Azure Monitor",
       "gridPos": {
         "h": 3,
         "w": 3,
@@ -198,20 +231,18 @@
       "id": 46,
       "links": [],
       "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
         "content": "<a style=\"color: inherit;\" href=\"https://portal.azure.com/#@${tenant}/resource/subscriptions/${sub}/resourceGroups/${rg}/providers/microsoft.insights/components/${res}/quickPulse\" target=\"_blank\">\n<div style=\"padding-top: 20px\">\n  <center><p style=\"color: #2272b9; font-size:18px;\">Live Metrics</p></center>\n  <center><p style=\"margin-top:0px;\">${res}</p></center>\n</div>\n</a>\n           \n           ",
         "mode": "html"
       },
-      "pluginVersion": "8.2.7",
-      "targets": [
-        {
-          "queryType": "randomWalk",
-          "refId": "A"
-        }
-      ],
+      "pluginVersion": "9.5.2",
       "type": "text"
     },
     {
-      "datasource": null,
       "gridPos": {
         "h": 3,
         "w": 3,
@@ -220,21 +251,23 @@
       },
       "id": 42,
       "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
         "content": "<a style=\"color: inherit;\" href=\"https://portal.azure.com/#@${tenant}/resource/subscriptions/${sub}/resourceGroups/${rg}/providers/microsoft.insights/components/${res}/applicationMap\" target=\"_blank\">\n<div style=\"padding-top: 20px;\">\n  <center><p style=\"position:center; color: #ff8c00; font-size:18px\">App map</p></center>\n  <center><p style=\"margin-top:0px;\">${res}</p></center>\n</div>\n</a>\n           ",
         "mode": "html"
       },
-      "pluginVersion": "8.2.7",
-      "targets": [
-        {
-          "queryType": "randomWalk",
-          "refId": "A"
-        }
-      ],
+      "pluginVersion": "9.5.2",
       "type": "text"
     },
     {
       "collapsed": false,
-      "datasource": null,
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -243,11 +276,10 @@
       },
       "id": 54,
       "panels": [],
-      "title": "Application Insights",
+      "title": "Application Insights Overview",
       "type": "row"
     },
     {
-      "datasource": null,
       "gridPos": {
         "h": 3,
         "w": 4,
@@ -256,20 +288,22 @@
       },
       "id": 12,
       "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
         "content": "<h1 style=\"font-size: 20px; color:#73bf69;\"> Usage </h1>",
         "mode": "html"
       },
-      "pluginVersion": "8.2.7",
-      "targets": [
-        {
-          "queryType": "randomWalk",
-          "refId": "A"
-        }
-      ],
+      "pluginVersion": "9.5.2",
       "type": "text"
     },
     {
-      "datasource": "${ds}",
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -336,41 +370,17 @@
         "text": {},
         "textMode": "auto"
       },
-      "pluginVersion": "8.2.7",
+      "pluginVersion": "9.5.2",
       "targets": [
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
           "azureLogAnalytics": {
             "query": "union\n    (traces\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo),\n    (requests\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo),\n    (pageViews\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo),\n    (dependencies\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo),\n    (customEvents\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo),\n    (availabilityResults\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo),\n    (exceptions\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo),\n    (customMetrics\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo),\n    (browserTimings\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo)\n| where notempty(user_Id)\n| summarize ['users/count_unique'] = dcount(user_Id) by bin(timestamp, 1m)\n| order by timestamp desc",
             "resource": "/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res",
             "resultFormat": "time_series"
           },
-          "azureMonitor": {
-            "aggOptions": [],
-            "aggregation": "Count",
-            "allowedTimeGrainsMs": [60000, 300000, 900000, 1800000, 3600000, 21600000, 43200000, 86400000],
-            "dimensionFilter": "*",
-            "dimensionFilters": [],
-            "metricDefinition": "microsoft.insights/components",
-            "metricName": "requests/count",
-            "metricNamespace": "microsoft.insights/components",
-            "resourceGroup": "$rg",
-            "resourceName": "$res",
-            "timeGrain": "auto",
-            "timeGrains": [],
-            "top": "50"
-          },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "hide": false,
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Log Analytics",
           "refId": "B",
@@ -382,7 +392,6 @@
       "type": "stat"
     },
     {
-      "datasource": "Azure Monitor",
       "gridPos": {
         "h": 3,
         "w": 4,
@@ -391,50 +400,18 @@
       },
       "id": 14,
       "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
         "content": "<h1 style=\"font-size:20px; color:#ec008c;\">Reliability</h1>",
         "mode": "html"
       },
-      "pluginVersion": "8.2.7",
-      "targets": [
-        {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
-          "azureMonitor": {
-            "aggOptions": [],
-            "dimensionFilter": "*",
-            "dimensionFilters": [],
-            "metricDefinition": "Microsoft.Insights/components",
-            "metricNamespace": "microsoft.insights/components",
-            "resourceGroup": "$rg",
-            "resourceName": "$res",
-            "timeGrain": "",
-            "timeGrains": [],
-            "top": "10"
-          },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
-          },
-          "queryType": "Azure Monitor",
-          "refId": "A",
-          "subscription": "$sub",
-          "subscriptions": []
-        }
-      ],
+      "pluginVersion": "9.5.2",
       "type": "text"
     },
     {
-      "datasource": null,
       "gridPos": {
         "h": 3,
         "w": 2,
@@ -444,20 +421,18 @@
       "id": 36,
       "links": [],
       "options": {
-        "content": "<a href=\"https://portal.azure.com/#@${tenant}/resource/subscriptions/${sub}/resourceGroups/${rg}/providers/microsoft.insights/components/${res}/failures\" target=\"_blank\">\n<div>\n  <p style=\"font-size:16px; margin-bottom:0px; margin-top:0px;\"> Failures </p>\n  <p style=\"margin-top: 0px;\">${res}</p>\n</div>\n</a>\n",
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "<a href=\"/d/Azure-AppInsights-Failures-Operations?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}\" target=\"_blank\">\n<div>\n  <p style=\"font-size:16px; margin-bottom:0px; margin-top:0px;\"> Failures </p>\n  <p style=\"margin-top: 0px;\">${res}</p>\n</div>\n</a>\n",
         "mode": "html"
       },
-      "pluginVersion": "8.2.7",
-      "targets": [
-        {
-          "queryType": "randomWalk",
-          "refId": "A"
-        }
-      ],
+      "pluginVersion": "9.5.2",
       "type": "text"
     },
     {
-      "datasource": "Azure Monitor",
       "gridPos": {
         "h": 3,
         "w": 3,
@@ -466,50 +441,18 @@
       },
       "id": 17,
       "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
         "content": "<h1 style=\"font-size:20px; color:#7e58ff;\">Responsiveness</h1>",
         "mode": "html"
       },
-      "pluginVersion": "8.2.7",
-      "targets": [
-        {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
-          "azureMonitor": {
-            "aggOptions": [],
-            "dimensionFilter": "*",
-            "dimensionFilters": [],
-            "metricDefinition": "Microsoft.Insights/components",
-            "metricNamespace": "microsoft.insights/components",
-            "resourceGroup": "$rg",
-            "resourceName": "$res",
-            "timeGrain": "",
-            "timeGrains": [],
-            "top": "10"
-          },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
-          },
-          "queryType": "Azure Monitor",
-          "refId": "A",
-          "subscription": "$sub",
-          "subscriptions": []
-        }
-      ],
+      "pluginVersion": "9.5.2",
       "type": "text"
     },
     {
-      "datasource": null,
       "gridPos": {
         "h": 3,
         "w": 3,
@@ -519,20 +462,18 @@
       "id": 38,
       "links": [],
       "options": {
-        "content": "<a href=\"https://portal.azure.com/#@${tenant}/resource/subscriptions/${sub}/resourceGroups/${rg}/providers/microsoft.insights/components/${res}/performance\" target=\"_blank\">\n<div>\n  <p style=\"font-size:16px; margin-bottom:0px;margin-top:0px;\"> Performance </p>\n  <p style=\"margin-top:0px;\">${res}</p>\n</div>\n</a>\n",
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "<a href=\"/d/Azure-AppInsights-Perf-Operations?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}\" target=\"_blank\">\n<div>\n  <p style=\"font-size:16px; margin-bottom:0px;margin-top:0px;\"> Performance </p>\n  <p style=\"margin-top:0px;\">${res}</p>\n</div>\n</a>\n",
         "mode": "html"
       },
-      "pluginVersion": "8.2.7",
-      "targets": [
-        {
-          "queryType": "randomWalk",
-          "refId": "A"
-        }
-      ],
+      "pluginVersion": "9.5.2",
       "type": "text"
     },
     {
-      "datasource": "Azure Monitor",
       "gridPos": {
         "h": 3,
         "w": 4,
@@ -541,50 +482,18 @@
       },
       "id": 18,
       "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
         "content": "<h1 style=\"font-size:20px; color:#3274d9;\">Browser</h1>",
         "mode": "html"
       },
-      "pluginVersion": "8.2.7",
-      "targets": [
-        {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
-          "azureMonitor": {
-            "aggOptions": [],
-            "dimensionFilter": "*",
-            "dimensionFilters": [],
-            "metricDefinition": "Microsoft.Insights/components",
-            "metricNamespace": "microsoft.insights/components",
-            "resourceGroup": "$rg",
-            "resourceName": "$res",
-            "timeGrain": "",
-            "timeGrains": [],
-            "top": "10"
-          },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
-          },
-          "queryType": "Azure Monitor",
-          "refId": "A",
-          "subscription": "$sub",
-          "subscriptions": []
-        }
-      ],
+      "pluginVersion": "9.5.2",
       "type": "text"
     },
     {
-      "datasource": null,
       "gridPos": {
         "h": 3,
         "w": 2,
@@ -593,21 +502,23 @@
       },
       "id": 50,
       "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
         "content": "<a style=\"color: #ffffff;\" href=\"https://portal.azure.com/#blade/Microsoft_Azure_MonitoringMetrics/Metrics.ReactView/ResourceId/%2Fsubscriptions%2F${sub}%2FresourceGroups%2F${rg}%2Fproviders%2Fmicrosoft.insights%2Fcomponents%2F${res}/id/%2Fsubscriptions%2F${sub}%2FresourceGroups%2F${rg}%2Fproviders%2Fmicrosoft.insights%2Fcomponents%2F${res}/detailBlade/MetricsExplorerBlade/sourceExtension/AppInsightsExtension/TimeContext/%7B%22relative%22%3A%7B%22duration%22%3A86400000%7D%2C%22grain%22%3A1%2C%22options%22%3A%7B%22grain%22%3A1%2C%22showUTCTime%22%3Afalse%7D%7D/Chart/%7B%22v2charts%22%3A%5B%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F${sub}%2FresourceGroups%2F${rg}%2Fproviders%2Fmicrosoft.insights%2Fcomponents%2F${res}%22%2C%22sku%22%3A%7B%22name%22%3A%22${res}%22%7D%7D%2C%22metricVisualization%22%3A%7B%22resourceDisplayName%22%3A%22pageViews%2Fduration%22%2C%22color%22%3A%22msportalfx-bgcolor-g2%22%7D%2C%22name%22%3A%22pageViews%2Fduration%22%2C%22namespace%22%3A%22microsoft.insights%2Fcomponents%2Fkusto%22%2C%22aggregationType%22%3A4%7D%5D%2C%22visualization%22%3A%7B%22chartType%22%3A2%2C%22axisVisualization%22%3A%7B%22y%22%3A%7B%22isVisible%22%3Atrue%7D%7D%7D%2C%22grouping%22%3A%7B%22dimension%22%3A%22operation%2Fname%22%7D%2C%22filterCollection%22%3A%7B%22filters%22%3A%5B%7B%22key%22%3A%22client%2Ftype%22%2C%22operator%22%3A0%2C%22values%22%3A%5B%22Browser%22%5D%7D%5D%7D%2C%22title%22%3A%22Browsers%22%2C%22timespan%22%3A%7B%22relative%22%3A%7B%22duration%22%3A86400000%7D%2C%22grain%22%3A1%2C%22options%22%3A%7B%22grain%22%3A1%2C%22showUTCTime%22%3Afalse%7D%7D%7D%2C%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F${sub}%2FresourceGroups%2F${rg}%2Fproviders%2Fmicrosoft.insights%2Fcomponents%2F${res}%22%2C%22sku%22%3A%7B%22name%22%3A%22${res}%22%7D%7D%2C%22metricVisualization%22%3A%7B%22resourceDisplayName%22%3A%22dependencies%2Fduration%22%2C%22color%22%3A%22msportalfx-bgcolor-g2%22%7D%2C%22name%22%3A%22dependencies%2Fduration%22%2C%22namespace%22%3A%22microsoft.insights%2Fcomponents%2Fkusto%22%2C%22aggregationType%22%3A4%7D%5D%2C%22visualization%22%3A%7B%22chartType%22%3A2%2C%22axisVisualization%22%3A%7B%22y%22%3A%7B%22isVisible%22%3Atrue%7D%7D%7D%2C%22grouping%22%3A%7B%22dimension%22%3A%22dependency%2Fname%22%7D%2C%22filterCollection%22%3A%7B%22filters%22%3A%5B%7B%22key%22%3A%22client%2Ftype%22%2C%22operator%22%3A0%2C%22values%22%3A%5B%22Browser%22%5D%7D%5D%7D%2C%22title%22%3A%22Have%20AJAX%20calls%20been%20slow%3F%22%2C%22timespan%22%3A%7B%22relative%22%3A%7B%22duration%22%3A86400000%7D%2C%22grain%22%3A1%2C%22options%22%3A%7B%22grain%22%3A1%2C%22showUTCTime%22%3Afalse%7D%7D%7D%2C%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F${sub}%2FresourceGroups%2F${rg}%2Fproviders%2Fmicrosoft.insights%2Fcomponents%2F${res}%22%2C%22sku%22%3A%7B%22name%22%3A%22${res}%22%7D%7D%2C%22metricVisualization%22%3A%7B%22resourceDisplayName%22%3A%22pageViews%2Fcount%22%2C%22color%22%3A%22msportalfx-bgcolor-g2%22%7D%2C%22name%22%3A%22pageViews%2Fcount%22%2C%22namespace%22%3A%22microsoft.insights%2Fcomponents%2Fkusto%22%2C%22aggregationType%22%3A1%7D%5D%2C%22visualization%22%3A%7B%22chartType%22%3A2%2C%22axisVisualization%22%3A%7B%22y%22%3A%7B%22isVisible%22%3Atrue%7D%7D%7D%2C%22grouping%22%3A%7B%22dimension%22%3A%22operation%2Fname%22%7D%2C%22filterCollection%22%3A%7B%22filters%22%3A%5B%7B%22key%22%3A%22client%2Ftype%22%2C%22operator%22%3A0%2C%22values%22%3A%5B%22Browser%22%5D%7D%5D%7D%2C%22title%22%3A%22Has%20page%20view%20traffic%20changed%3F%22%2C%22timespan%22%3A%7B%22relative%22%3A%7B%22duration%22%3A86400000%7D%2C%22grain%22%3A1%2C%22options%22%3A%7B%22grain%22%3A1%2C%22showUTCTime%22%3Afalse%7D%7D%7D%2C%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F${sub}%2FresourceGroups%2F${rg}%2Fproviders%2Fmicrosoft.insights%2Fcomponents%2F${res}%22%2C%22sku%22%3A%7B%22name%22%3A%22${res}%22%7D%7D%2C%22metricVisualization%22%3A%7B%22resourceDisplayName%22%3A%22exceptions%2Fbrowser%22%2C%22color%22%3A%22msportalfx-bgcolor-g2%22%7D%2C%22name%22%3A%22exceptions%2Fbrowser%22%2C%22namespace%22%3A%22microsoft.insights%2Fcomponents%2Fkusto%22%2C%22aggregationType%22%3A1%7D%5D%2C%22visualization%22%3A%7B%22chartType%22%3A2%2C%22axisVisualization%22%3A%7B%22y%22%3A%7B%22isVisible%22%3Atrue%7D%7D%7D%2C%22grouping%22%3A%7B%22dimension%22%3A%22exception%2FproblemId%22%7D%2C%22filterCollection%22%3A%7B%22filters%22%3A%5B%7B%22key%22%3A%22client%2Ftype%22%2C%22operator%22%3A0%2C%22values%22%3A%5B%22Browser%22%5D%7D%5D%7D%2C%22title%22%3A%22When%20are%20script%20errors%20occurring%3F%22%2C%22timespan%22%3A%7B%22relative%22%3A%7B%22duration%22%3A86400000%7D%2C%22grain%22%3A1%2C%22options%22%3A%7B%22grain%22%3A1%2C%22showUTCTime%22%3Afalse%7D%7D%7D%2C%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F${sub}%2FresourceGroups%2F${rg}%2Fproviders%2Fmicrosoft.insights%2Fcomponents%2F${res}%22%2C%22sku%22%3A%7B%22name%22%3A%22${res}%22%7D%7D%2C%22metricVisualization%22%3A%7B%22resourceDisplayName%22%3A%22pageViews%2Fduration%22%2C%22color%22%3A%22msportalfx-bgcolor-g0%22%7D%2C%22name%22%3A%22pageViews%2Fduration%22%2C%22namespace%22%3A%22microsoft.insights%2Fcomponents%2Fkusto%22%2C%22aggregationType%22%3A4%7D%5D%2C%22visualization%22%3A%7B%22chartType%22%3A5%2C%22axisVisualization%22%3A%7B%22y%22%3A%7B%22isVisible%22%3Atrue%7D%7D%7D%2C%22grouping%22%3A%7B%22dimension%22%3Afalse%7D%2C%22filterCollection%22%3A%7B%22filters%22%3A%5B%7B%22key%22%3A%22client%2Ftype%22%2C%22operator%22%3A0%2C%22values%22%3A%5B%22Browser%22%5D%7D%5D%7D%2C%22title%22%3A%22What%20are%20my%20slowest%20pages%3F%22%7D%2C%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F${sub}%2FresourceGroups%2F${rg}%2Fproviders%2Fmicrosoft.insights%2Fcomponents%2F${res}%22%2C%22sku%22%3A%7B%22name%22%3A%22${res}%22%7D%7D%2C%22metricVisualization%22%3A%7B%22resourceDisplayName%22%3A%22pageViews%2Fduration%22%7D%2C%22name%22%3A%22pageViews%2Fduration%22%2C%22namespace%22%3A%22microsoft.insights%2Fcomponents%2Fkusto%22%2C%22aggregationType%22%3A4%7D%5D%2C%22visualization%22%3A%7B%22chartType%22%3A5%2C%22axisVisualization%22%3A%7B%22y%22%3A%7B%22isVisible%22%3Atrue%7D%7D%7D%2C%22grouping%22%3A%7B%22dimension%22%3Afalse%7D%2C%22filterCollection%22%3A%7B%22filters%22%3A%5B%7B%22key%22%3A%22client%2Ftype%22%2C%22operator%22%3A0%2C%22values%22%3A%5B%22Browser%22%5D%7D%5D%7D%2C%22title%22%3A%22What%20are%20my%20slowest%20pages%3F%22%7D%2C%7B%22metrics%22%3A%5B%7B%22resourceMetadata%22%3A%7B%22id%22%3A%22%2Fsubscriptions%2F${sub}%2FresourceGroups%2F${rg}%2Fproviders%2Fmicrosoft.insights%2Fcomponents%2F${res}%22%2C%22sku%22%3A%7B%22name%22%3A%22${res}%22%7D%7D%2C%22metricVisualization%22%3A%7B%22resourceDisplayName%22%3A%22exceptions%2Fbrowser%22%2C%22color%22%3A%22msportalfx-bgcolor-d0%22%7D%2C%22name%22%3A%22exceptions%2Fbrowser%22%2C%22namespace%22%3A%22microsoft.insights%2Fcomponents%2Fkusto%22%2C%22aggregationType%22%3A1%7D%5D%2C%22visualization%22%3A%7B%22chartType%22%3A5%2C%22axisVisualization%22%3A%7B%22y%22%3A%7B%22isVisible%22%3Atrue%7D%7D%7D%2C%22grouping%22%3A%7B%22dimension%22%3A%22exception%2FproblemId%22%7D%2C%22filterCollection%22%3A%7B%22filters%22%3A%5B%7B%22key%22%3A%22client%2Ftype%22%2C%22operator%22%3A0%2C%22values%22%3A%5B%22Browser%22%5D%7D%5D%7D%2C%22title%22%3A%22What%20are%20my%20most%20common%20script%20errors%3F%22%2C%22timespan%22%3A%7B%22relative%22%3A%7B%22duration%22%3A86400000%7D%2C%22grain%22%3A1%2C%22options%22%3A%7B%22grain%22%3A1%2C%22showUTCTime%22%3Afalse%7D%7D%7D%5D%7D/openInEditMode/\" target=\"_blank\">\n<div style=\"padding-top: 35px; background-color: #3274d9; width: 100%; height: 100%\">\n  <center><p style=\"font-size:16px; margin-bottom:0px;\"> Browsers </p></center>\n</div>\n</a>",
         "mode": "html"
       },
-      "pluginVersion": "8.2.7",
-      "targets": [
-        {
-          "queryType": "randomWalk",
-          "refId": "A"
-        }
-      ],
+      "pluginVersion": "9.5.2",
       "transparent": true,
       "type": "text"
     },
     {
-      "datasource": "${ds}",
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
       "description": "The resource path for this panel uses multiple template variables which requires modifying the dashboard JSON directly. If you would like to do something similar please go to Settings > JSON Model. Edit as you'd like in your new copy by going to Settings > Save as.",
       "fieldConfig": {
         "defaults": {
@@ -616,6 +527,8 @@
             "mode": "fixed"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "axisSoftMin": 0,
@@ -714,45 +627,24 @@
         "legend": {
           "calcs": ["sum"],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "targets": [
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
           "azureLogAnalytics": {
             "query": "union\n    (traces\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo),\n    (requests\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo),\n    (pageViews\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo),\n    (dependencies\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo),\n    (customEvents\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo),\n    (availabilityResults\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo),\n    (exceptions\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo),\n    (customMetrics\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo),\n    (browserTimings\n    | where timestamp >= $__timeFrom and timestamp < $__timeTo)\n| where notempty(user_Id)\n| summarize ['users/count_unique'] = dcount(user_Id) by bin(timestamp, $__interval)\n| order by timestamp desc",
             "resource": "/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res",
             "resultFormat": "time_series"
           },
-          "azureMonitor": {
-            "aggOptions": [],
-            "allowedTimeGrainsMs": [60000, 300000, 900000, 1800000, 3600000, 21600000, 43200000, 86400000],
-            "dimensionFilter": "*",
-            "dimensionFilters": [],
-            "metricDefinition": "microsoft.insights/components",
-            "metricName": "requests/count",
-            "metricNamespace": "microsoft.insights/components",
-            "resourceGroup": "$rg",
-            "resourceName": "$res",
-            "timeGrain": "auto",
-            "timeGrains": [],
-            "top": "50"
-          },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "hide": false,
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Log Analytics",
           "refId": "A",
@@ -765,8 +657,9 @@
             "resource": "/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res",
             "resultFormat": "time_series"
           },
-          "azureMonitor": {
-            "timeGrain": "auto"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "hide": false,
           "queryType": "Azure Log Analytics",
@@ -774,13 +667,15 @@
           "subscription": ""
         }
       ],
-      "timeShift": null,
       "title": "Users",
       "transformations": [],
       "type": "timeseries"
     },
     {
-      "datasource": "${ds}",
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -788,6 +683,8 @@
             "mode": "fixed"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -851,23 +748,16 @@
         "legend": {
           "calcs": ["sum"],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "targets": [
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
           "azureMonitor": {
             "aggOptions": [],
             "aggregation": "Count",
@@ -883,12 +773,9 @@
             "timeGrains": [],
             "top": "50"
           },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Monitor",
           "refId": "Failed requests",
@@ -900,7 +787,10 @@
       "type": "timeseries"
     },
     {
-      "datasource": "${ds}",
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -908,6 +798,8 @@
             "mode": "fixed"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "axisSoftMin": 0,
@@ -976,23 +868,16 @@
         "legend": {
           "calcs": ["mean"],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "targets": [
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
           "azureMonitor": {
             "aggOptions": [],
             "aggregation": "Average",
@@ -1004,16 +889,14 @@
             "metricNamespace": "microsoft.insights/components",
             "resourceGroup": "$rg",
             "resourceName": "$res",
+            "resourceUri": "/subscriptions/$sub/resourceGroups/$rg/providers/microsoft.insights/components/$res",
             "timeGrain": "auto",
             "timeGrains": [],
             "top": "50"
           },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Monitor",
           "refId": "A",
@@ -1026,7 +909,10 @@
       "type": "timeseries"
     },
     {
-      "datasource": "${ds}",
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -1034,6 +920,8 @@
             "mode": "fixed"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1101,23 +989,16 @@
         "legend": {
           "calcs": ["sum"],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "targets": [
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
           "azureMonitor": {
             "aggOptions": [],
             "aggregation": "Count",
@@ -1133,12 +1014,9 @@
             "timeGrains": [],
             "top": "50"
           },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Monitor",
           "refId": "A",
@@ -1150,7 +1028,10 @@
       "type": "timeseries"
     },
     {
-      "datasource": "${ds}",
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -1158,6 +1039,8 @@
             "mode": "fixed"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "axisWidth": 50,
@@ -1241,23 +1124,16 @@
         "legend": {
           "calcs": ["mean"],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "targets": [
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
           "azureMonitor": {
             "aggOptions": [],
             "aggregation": "Average",
@@ -1273,12 +1149,9 @@
             "timeGrains": [],
             "top": "50"
           },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Monitor",
           "refId": "A",
@@ -1290,7 +1163,10 @@
       "type": "timeseries"
     },
     {
-      "datasource": "${ds}",
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -1298,6 +1174,8 @@
             "mode": "fixed"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1389,23 +1267,16 @@
         "legend": {
           "calcs": ["sum"],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "targets": [
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
           "azureMonitor": {
             "aggOptions": [],
             "aggregation": "Count",
@@ -1422,13 +1293,9 @@
             "timeGrains": [],
             "top": "50"
           },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "hide": false,
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Monitor",
           "refId": "Server Exceptions",
@@ -1436,15 +1303,6 @@
           "subscriptions": []
         },
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
           "azureMonitor": {
             "aggOptions": [],
             "aggregation": "Count",
@@ -1461,13 +1319,9 @@
             "timeGrains": [],
             "top": "50"
           },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "hide": false,
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Monitor",
           "refId": "Dependency failures",
@@ -1480,7 +1334,10 @@
       "type": "timeseries"
     },
     {
-      "datasource": "${ds}",
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -1488,6 +1345,8 @@
             "mode": "fixed"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "axisSoftMax": -6,
@@ -1555,23 +1414,16 @@
         "legend": {
           "calcs": ["mean"],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "targets": [
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
           "azureMonitor": {
             "aggOptions": [],
             "aggregation": "Average",
@@ -1587,12 +1439,9 @@
             "timeGrains": [],
             "top": "50"
           },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Monitor",
           "refId": "Processor",
@@ -1600,15 +1449,6 @@
           "subscriptions": []
         },
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
           "azureMonitor": {
             "aggOptions": [],
             "aggregation": "Average",
@@ -1624,13 +1464,9 @@
             "timeGrains": [],
             "top": "50"
           },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "hide": false,
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Monitor",
           "refId": "Process CPU",
@@ -1642,7 +1478,10 @@
       "type": "timeseries"
     },
     {
-      "datasource": "${ds}",
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -1650,6 +1489,8 @@
             "mode": "continuous-BlPu"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1775,23 +1616,16 @@
         "legend": {
           "calcs": ["mean"],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "targets": [
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
           "azureMonitor": {
             "aggOptions": [],
             "aggregation": "Average",
@@ -1807,12 +1641,9 @@
             "timeGrains": [],
             "top": "50"
           },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Monitor",
           "refId": "Page load network connect time",
@@ -1820,15 +1651,6 @@
           "subscriptions": []
         },
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
           "azureMonitor": {
             "aggOptions": [],
             "aggregation": "Average",
@@ -1844,13 +1666,9 @@
             "timeGrains": [],
             "top": "50"
           },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "hide": false,
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Monitor",
           "refId": "Client processing time",
@@ -1858,15 +1676,6 @@
           "subscriptions": []
         },
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
           "azureMonitor": {
             "aggOptions": [],
             "aggregation": "Average",
@@ -1882,13 +1691,9 @@
             "timeGrains": [],
             "top": "50"
           },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "hide": false,
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Monitor",
           "refId": "Send request time",
@@ -1896,15 +1701,6 @@
           "subscriptions": []
         },
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
           "azureMonitor": {
             "aggOptions": [],
             "aggregation": "Average",
@@ -1920,13 +1716,9 @@
             "timeGrains": [],
             "top": "50"
           },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "hide": false,
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Monitor",
           "refId": "Receiving response time",
@@ -1938,13 +1730,18 @@
       "type": "timeseries"
     },
     {
-      "datasource": "${ds}",
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "axisSoftMin": 0,
@@ -1979,8 +1776,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2010,23 +1806,16 @@
         "legend": {
           "calcs": ["sum"],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "targets": [
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
           "azureMonitor": {
             "aggOptions": [],
             "aggregation": "Count",
@@ -2042,12 +1831,9 @@
             "timeGrains": [],
             "top": "50"
           },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Monitor",
           "refId": "A",
@@ -2059,7 +1845,10 @@
       "type": "timeseries"
     },
     {
-      "datasource": "${ds}",
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -2067,6 +1856,8 @@
             "mode": "fixed"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -2100,8 +1891,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2131,23 +1921,16 @@
         "legend": {
           "calcs": ["mean"],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "targets": [
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
           "azureMonitor": {
             "aggOptions": [],
             "aggregation": "Average",
@@ -2163,12 +1946,9 @@
             "timeGrains": [],
             "top": "100"
           },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Monitor",
           "refId": "A",
@@ -2180,7 +1960,10 @@
       "type": "timeseries"
     },
     {
-      "datasource": "${ds}",
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -2188,6 +1971,8 @@
             "mode": "fixed"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "axisSoftMin": 0,
@@ -2223,8 +2008,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2254,23 +2038,16 @@
         "legend": {
           "calcs": ["mean"],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "targets": [
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
           "azureMonitor": {
             "aggOptions": [],
             "aggregation": "Average",
@@ -2286,12 +2063,9 @@
             "timeGrains": [],
             "top": "50"
           },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Monitor",
           "refId": "A",
@@ -2303,7 +2077,10 @@
       "type": "timeseries"
     },
     {
-      "datasource": "${ds}",
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -2311,6 +2088,8 @@
             "mode": "fixed"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "axisSoftMin": 0,
@@ -2346,8 +2125,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2377,23 +2155,16 @@
         "legend": {
           "calcs": ["sum"],
           "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
         },
         "tooltip": {
-          "mode": "single"
+          "mode": "single",
+          "sort": "none"
         }
       },
       "targets": [
         {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series"
-          },
           "azureMonitor": {
             "aggOptions": [],
             "aggregation": "Count",
@@ -2409,12 +2180,9 @@
             "timeGrains": [],
             "top": "50"
           },
-          "azureResourceGraph": {
-            "resultFormat": "table"
-          },
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
           },
           "queryType": "Azure Monitor",
           "refId": "A",
@@ -2427,14 +2195,14 @@
     }
   ],
   "refresh": "",
-  "schemaVersion": 32,
+  "revision": 1,
+  "schemaVersion": 38,
+  "style": "dark",
   "tags": [],
   "templating": {
     "list": [
       {
         "current": {},
-        "description": null,
-        "error": null,
         "hide": 0,
         "includeAll": false,
         "label": "Datasource",
@@ -2449,32 +2217,39 @@
         "type": "datasource"
       },
       {
-        "allValue": null,
         "current": {},
-        "datasource": "${ds}",
-        "definition": "Subscriptions()",
-        "description": null,
-        "error": null,
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
         "hide": 0,
         "includeAll": false,
         "label": "Subscription",
         "multi": false,
         "name": "sub",
         "options": [],
-        "query": "Subscriptions()",
+        "query": {
+          "grafanaTemplateVariableFn": {
+            "kind": "SubscriptionsQuery",
+            "rawQuery": "Subscriptions()"
+          },
+          "queryType": "Azure Subscriptions",
+          "refId": "A"
+        },
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,
-        "sort": 5,
+        "sort": 0,
         "type": "query"
       },
       {
-        "allValue": null,
         "current": {},
-        "datasource": "${ds}",
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
         "definition": "",
-        "description": null,
-        "error": null,
         "hide": 0,
         "includeAll": false,
         "label": "Resource Group",
@@ -2482,26 +2257,28 @@
         "name": "rg",
         "options": [],
         "query": {
-          "azureResourceGraph": {
-            "query": "resources\r\n| where [\"type\"] =~ \"Microsoft.Insights/components\"\r\n| distinct resourceGroup"
+          "grafanaTemplateVariableFn": {
+            "kind": "ResourceGroupsQuery",
+            "rawQuery": "ResourceGroups($sub)",
+            "subscription": "$sub"
           },
-          "queryType": "Azure Resource Graph",
+          "queryType": "Azure Resource Groups",
           "refId": "A",
-          "subscriptions": ["$sub"]
+          "subscription": "$sub"
         },
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,
-        "sort": 5,
+        "sort": 0,
         "type": "query"
       },
       {
-        "allValue": null,
         "current": {},
-        "datasource": "${ds}",
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
         "definition": "",
-        "description": null,
-        "error": null,
         "hide": 2,
         "includeAll": false,
         "label": "Namespace",
@@ -2509,26 +2286,30 @@
         "name": "ns",
         "options": [],
         "query": {
-          "azureResourceGraph": {
-            "query": "resources\r\n| where [\"type\"] =~ \"Microsoft.Insights/components\" and resourceGroup =~ \"$rg\"\r\n| distinct [\"type\"]"
+          "grafanaTemplateVariableFn": {
+            "kind": "MetricNamespaceQuery",
+            "rawQuery": "Namespaces($sub, $rg)",
+            "resourceGroup": "$rg",
+            "subscription": "$sub"
           },
-          "queryType": "Azure Resource Graph",
+          "queryType": "Azure Namespaces",
           "refId": "A",
-          "subscriptions": ["$sub"]
+          "resourceGroup": "$rg",
+          "subscription": "$sub"
         },
         "refresh": 1,
-        "regex": "",
+        "regex": "([mM](icrosoft)\\.[iI](nsights)/(components))",
         "skipUrlSync": false,
-        "sort": 5,
+        "sort": 0,
         "type": "query"
       },
       {
-        "allValue": null,
         "current": {},
-        "datasource": "${ds}",
-        "definition": "",
-        "description": null,
-        "error": null,
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "ResourceNames($sub, $rg, $ns)",
         "hide": 0,
         "includeAll": false,
         "label": "Resource",
@@ -2545,38 +2326,7 @@
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,
-        "sort": 5,
-        "type": "query"
-      },
-      {
-        "current": {},
-        "datasource": {
-          "type": "grafana-azure-monitor-datasource",
-          "uid": "${ds}"
-        },
-        "definition": "resources\n| project tenantId",
-        "hide": 2,
-        "includeAll": false,
-        "label": "tenantId",
-        "multi": false,
-        "name": "tenant",
-        "options": [],
-        "query": {
-          "azureLogAnalytics": {
-            "query": "",
-            "resource": ""
-          },
-          "azureResourceGraph": {
-            "query": "Resources\r\n|project tenantId"
-          },
-          "queryType": "Azure Resource Graph",
-          "refId": "A",
-          "subscriptions": ["$sub"]
-        },
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 5,
+        "sort": 0,
         "type": "query"
       }
     ]
@@ -2587,7 +2337,7 @@
   },
   "timepicker": {},
   "timezone": "",
-  "uid": "Yo38mcvnz",
-  "title": "Azure / Insights / Applications",
-  "version": 10
+  "title": "Azure / Insights / Applications - Overview",
+  "uid": "Azure-AppInsights-Overview",
+  "version": 83
 }
diff --git a/public/app/plugins/datasource/azuremonitor/dashboards/appInsightsFailureDependencies.json b/public/app/plugins/datasource/azuremonitor/dashboards/appInsightsFailureDependencies.json
new file mode 100644
index 0000000000000..eaac78827c4d5
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/dashboards/appInsightsFailureDependencies.json
@@ -0,0 +1,1595 @@
+{
+  "__inputs": [],
+  "__elements": {},
+  "__requires": [
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "10.0.3"
+    },
+    {
+      "type": "datasource",
+      "id": "grafana-azure-monitor-datasource",
+      "name": "Azure Monitor",
+      "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "stat",
+      "name": "Stat",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "table",
+      "name": "Table",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "timeseries",
+      "name": "Time series",
+      "version": ""
+    }
+  ],
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "description": "The dashboard provides insights of dependency failures through Application Insights.",
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": null,
+  "links": [
+    {
+      "asDropdown": true,
+      "icon": "external link",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": ["Azure-AppInsights-Failures"],
+      "targetBlank": true,
+      "title": "Azure Application Insights Failures Dashboards",
+      "tooltip": "",
+      "type": "dashboards",
+      "url": ""
+    }
+  ],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 2,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 89,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "# Failures - Dependencies",
+        "mode": "markdown"
+      },
+      "pluginVersion": "10.0.3",
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 2
+      },
+      "id": 81,
+      "panels": [],
+      "title": "Application Insights - Failures - Dependencies",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "axisSoftMin": 0,
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 64,
+            "gradientMode": "opacity",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "users/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Users (Unique)"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "sessions/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Sessions (Unique)"
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "purple",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Max"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "semi-dark-orange",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "failedCount"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "FailedCount"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 13,
+        "x": 0,
+        "y": 3
+      },
+      "id": 80,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "dependencies\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| where \"All\" in ($dependency_result_code) or resultCode in ($dependency_result_code)\n| extend type=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), target=tostring(split(target, \" | cid-v1\")[0])\n| extend [\"Dependency Name\"] = strcat(type, \": \", name, \" \", target)\n| where (\"All\" in ($dependency) or [\"Dependency Name\"] in ($dependency))\n| summarize FailedCount=sumif(itemCount, success == false) by bin(timestamp, $__interval)\n| order by timestamp asc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Failed Dependencies (count)",
+      "transformations": [],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "dark-red",
+            "mode": "fixed"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "links": [
+            {
+              "targetBlank": false,
+              "title": "Filter Result code",
+              "url": "/d/Azure-AppInsights-Failures-Dependencies/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&${dependency:queryparam}&var-dependency_result_code=${__data.fields[\"Result Code\"]}"
+            }
+          ],
+          "mappings": [],
+          "min": 0,
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Count"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "basic",
+                  "type": "gauge"
+                }
+              },
+              {
+                "id": "custom.width",
+                "value": 584
+              },
+              {
+                "id": "links"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Result Code"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 252
+              },
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "title": "Filter result code",
+                    "url": "/d/Azure-AppInsights-Failures-Dependencies/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&${dependency:queryparam}&var-dependency_result_code=${__data.fields[\"Result Code\"]}"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 11,
+        "x": 13,
+        "y": 3
+      },
+      "id": 84,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": []
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "dependencies\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| where success == false\n| extend type=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), target=tostring(split(target, \" | cid-v1\")[0])\n| extend [\"Dependency Name\"] = strcat(type, \": \", name, \" \", target)\n| where (\"All\" in ($dependency) or [\"Dependency Name\"] in ($dependency))\n| summarize Count=sum(itemCount) by [\"Result Code\"]=resultCode\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Top response codes (count)",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "axisSoftMin": 0,
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 62,
+            "gradientMode": "opacity",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "users/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Users (Unique)"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "sessions/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Sessions (Unique)"
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "purple",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Max"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-blue",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 13,
+        "x": 0,
+        "y": 13
+      },
+      "id": 83,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "\ndependencies\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| extend type=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), target=tostring(split(target, \" | cid-v1\")[0])\n| extend [\"Dependency Name\"] = strcat(type, \": \", name, \" \", target)\n| where (\"All\" in ($dependency) or [\"Dependency Name\"] in ($dependency))\n// calculate average request duration for all requests\n| summarize Count = count() by bin(timestamp, $__interval)\n| order by timestamp asc\n\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Server Requests (count)",
+      "transformations": [],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "dark-red",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 22,
+            "gradientMode": "hue",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "normal"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "sum_itemCount 404"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "orange",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "sum_itemCount 500"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ResultCode 404"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-orange",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 11,
+        "x": 13,
+        "y": 13
+      },
+      "id": 82,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "9.0.8.1",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "dependencies\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| where \"All\" in ($dependency_result_code) or resultCode in ($dependency_result_code)\n| extend type=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), target=tostring(split(target, \" | cid-v1\")[0])\n| extend [\"Dependency Name\"] = strcat(type, \": \", name, \" \", target)\n| where (\"All\" in ($dependency) or [\"Dependency Name\"] in ($dependency))\n| summarize ResultCode = sum(itemCount) by resultCode, bin(timestamp, $__interval)\n| sort by timestamp asc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Response codes (count)",
+      "transformations": [],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "dark-red",
+            "mode": "fixed"
+          },
+          "links": [
+            {
+              "title": "Reset to All dependencies and All result codes",
+              "url": "/d/Azure-AppInsights-Failures-Dependencies/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&var-dependency=All&var-dependency_result_code=All"
+            }
+          ],
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 8,
+        "x": 0,
+        "y": 19
+      },
+      "id": 85,
+      "interval": "60s",
+      "links": [
+        {
+          "title": "Reset to All Failed Dependencies and All result codes",
+          "url": "/d/Azure-AppInsights-Failures-Dependencies/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&var-dependency=All&var-dependency_result_code=All"
+        }
+      ],
+      "maxDataPoints": 150,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "dependencies\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| summarize failedCount=sumif(itemCount, success == false)\n\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "All Failed dependencies (Count)",
+      "transformations": [],
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "Failed dependencies matching result code ${dependency_result_code:text} and dependency ${dependency:text}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "dark-red",
+            "mode": "fixed"
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "dark-red",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "failedCount"
+            },
+            "properties": [
+              {
+                "id": "links"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 8,
+        "x": 8,
+        "y": 19
+      },
+      "id": 77,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "dependencies\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where \"All\" in ($dependency_result_code) or resultCode in ($dependency_result_code)\n| where client_Type != \"Browser\"\n| extend type=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), target=tostring(split(target, \" | cid-v1\")[0])\n| extend [\"Dependency Name\"] = strcat(type, \": \", name, \" \", target)\n| where (\"All\" in ($dependency) or [\"Dependency Name\"] in ($dependency))\n| summarize failedCount=sumif(itemCount, success == false)\n\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Failed dependencies matching result code and dependency",
+      "transformations": [],
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "Click on a dependency name to filter dashboard.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "links": [
+            {
+              "targetBlank": true,
+              "title": "Show list of sample transactions",
+              "url": "/explore?left={\"datasource\":\"${ds:raw}\",\"queries\":[{\"refId\":\"A\",\"datasource\":\"${ds:raw}\",\"queryType\":\"Azure Traces\",\"azureTraces\":{\"resultFormat\":\"table\",\"resources\":[\"/subscriptions/${sub}/resourceGroups/${rg}/providers/${ns}/${res}\"],\"filters\":[{\"property\":\"type\",\"filters\":[\"${__data.fields.type}\"],\"operation\":\"eq\"}, {\"property\":\"target\",\"filters\":[\"${__data.fields.target}\"],\"operation\":\"eq\"}, {\"property\":\"name\",\"filters\":[\"${__data.fields.name}\"],\"operation\":\"eq\"},{\"property\":\"resultCode\",\"filters\":[${dependency_result_code:doublequote}],\"operation\":\"eq\"}],\"traceTypes\": [\"dependencies\"]}}],\"range\":{\"from\": \"${__from}\", \"to\":\"${__to}\" }}"
+            }
+          ],
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "#EAB839",
+                "value": 0.5
+              },
+              {
+                "color": "dark-red",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Dependency name"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 161
+              },
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "title": "Show list of matching dependencies",
+                    "url": "d/Azure-AppInsights-Failures-Dependencies/?orgId=1&${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&${dependency_result_code:queryparam}&var-dependency=${__data.fields[\"Dependency name\"]}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Failed count"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": false
+              },
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "lcd",
+                  "type": "gauge",
+                  "valueDisplayMode": "text"
+                }
+              },
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Open dependencies in explorer",
+                    "url": "/explore?left={\"datasource\":\"${ds:raw}\",\"queries\":[{\"refId\":\"A\",\"datasource\":\"${ds:raw}\",\"queryType\":\"Azure Traces\",\"azureTraces\":{\"resultFormat\":\"table\",\"resources\":[\"/subscriptions/${sub}/resourceGroups/${rg}/providers/${ns}/${res}\"],\"filters\":[{\"property\":\"type\",\"filters\":[\"${__data.fields.type}\"],\"operation\":\"eq\"}, {\"property\":\"name\",\"filters\":[\"${__data.fields.name}\"],\"operation\":\"eq\"}, {\"property\":\"target\",\"filters\":[\"${__data.fields.target}\"],\"operation\":\"eq\"}, {\"property\":\"resultCode\",\"filters\":[${dependency_result_code:doublequote}],\"operation\":\"eq\"}],\"traceTypes\": [\"dependencies\"]}}],\"range\":{\"from\": \"${__from}\", \"to\":\"${__to}\" }}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "type"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "target"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "name"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              },
+              {
+                "id": "filterable",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Impacted users"
+            },
+            "properties": [
+              {
+                "id": "links"
+              },
+              {
+                "id": "custom.width",
+                "value": 130
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Total count"
+            },
+            "properties": [
+              {
+                "id": "links"
+              },
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "lcd",
+                  "type": "gauge"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "text",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 8,
+        "x": 0,
+        "y": 22
+      },
+      "id": 87,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": [
+          {
+            "desc": true,
+            "displayName": "Count"
+          }
+        ]
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let m = dependencies\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| project itemCount, duration, typeTransform=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), targetTransform=tostring(split(target, \" | cid-v1\")[0]), name, type, target, user_Id, success, resultCode;\nm\n| summarize [\"Failed count\"]=sumif(itemCount, success == false and  (\"All\" in ($dependency_result_code) or resultCode in ($dependency_result_code))), [\"Impacted users\"]=dcountif(user_Id, success == false and  (\"All\" in ($dependency_result_code) or resultCode in ($dependency_result_code))), [\"Total count\"]=sum(itemCount)\n| project [\"Dependency name\"]=\"All\", [\"Failed count\"], [\"Impacted users\"], [\"Total count\"]\n| union(\nm\n| summarize [\"Failed count\"]=sumif(itemCount, success == false and  (\"All\" in ($dependency_result_code) or resultCode in ($dependency_result_code))), [\"Impacted users\"]=dcountif(user_Id, success == false and  (\"All\" in ($dependency_result_code) or resultCode in ($dependency_result_code))), [\"Total count\"]=sum(itemCount) by typeTransform=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), targetTransform=tostring(split(target, \" | cid-v1\")[0]), name, target, type\n| where [\"Failed count\"] > 0\n| sort by [\"Failed count\"] desc\n| project [\"Dependency name\"]=strcat(typeTransform, \": \", name , \" \", targetTransform), [\"Failed count\"], [\"Total count\"], [\"Impacted users\"], type, target, name)\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Top Dependencies by Avg Duration",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "Click on an OperationID or Dependency name to view the trace details in explorer.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "orange",
+                "value": 0.5
+              },
+              {
+                "color": "dark-red",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ResponseTime"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "basic",
+                  "type": "gauge"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-blue",
+                  "mode": "fixed"
+                }
+              },
+              {
+                "id": "links"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Dependency Name"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 300
+              },
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Open dependencies in explorer",
+                    "url": "/explore?left={\"datasource\":\"${ds:raw}\",\"queries\":[{\"refId\":\"A\",\"datasource\":\"${ds:raw}\",\"queryType\":\"Azure Traces\",\"azureTraces\":{\"resultFormat\":\"table\",\"resources\":[\"/subscriptions/${sub}/resourceGroups/${rg}/providers/${ns}/${res}\"],\"filters\":[{\"property\":\"type\",\"filters\":[\"${__data.fields.type}\"],\"operation\":\"eq\"}, {\"property\":\"name\",\"filters\":[\"${__data.fields.name}\"],\"operation\":\"eq\"}, {\"property\":\"target\",\"filters\":[\"${__data.fields.target}\"],\"operation\":\"eq\"}, {\"property\":\"resultCode\",\"filters\":[${dependency_result_code:doublequote}],\"operation\":\"eq\"}],\"traceTypes\": [\"dependencies\"]}}],\"range\":{\"from\": \"${__from}\", \"to\":\"${__to}\" }}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ResponseCode"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 211
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ResponseCode"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ResponseCode"
+            },
+            "properties": [
+              {
+                "id": "mappings",
+                "value": [
+                  {
+                    "options": {
+                      "200": {
+                        "color": "dark-green",
+                        "index": 0
+                      }
+                    },
+                    "type": "value"
+                  },
+                  {
+                    "options": {
+                      "from": 201,
+                      "result": {
+                        "color": "dark-orange",
+                        "index": 1
+                      },
+                      "to": 399
+                    },
+                    "type": "range"
+                  },
+                  {
+                    "options": {
+                      "from": 400,
+                      "result": {
+                        "color": "dark-red",
+                        "index": 2
+                      },
+                      "to": 999
+                    },
+                    "type": "range"
+                  }
+                ]
+              },
+              {
+                "id": "links"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "OperationID"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Open Trace Details",
+                    "url": "/explore?left={\r\n\t\"datasource\": \"${ds}\",\r\n\t\"queries\": [{\r\n\t\t\"azureTraces\": {\r\n\r\n\t\t\t\"operationId\": \"${__data.fields.OperationID}\",\r\n\r\n\t\t\t\"resources\": [\"/subscriptions/${sub}/resourceGroups/${rg}/providers/${ns}/${res}\"],\r\r\n\r\n\t\t\t\"resultFormat\": \"trace\"\r\n\r\n\r\n\r\n\r\n\t\t},\r\n\t\t\"datasource\": \"${ds}\",\r\n\t\t\"refId\": \"A\",\r\n\r\n\t\t\"queryType\": \"Azure Traces\"\r\n\t}],\r\n\t\"range\": {\r\n\t\t\"from\": \"${__from}\",\r\n\t\t\"to\": \"${__to}\"\r\n\t}\r\n}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "target"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 251
+              },
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "type"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "name"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Score"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 16,
+        "x": 8,
+        "y": 22
+      },
+      "id": 88,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": []
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let min_length_8 = (s: string) {\n    let len = strlen(s);\n    case(len == 1, strcat(s, s, s, s, s, s, s, s),\n        len == 2 or len == 3, strcat(s, s, s, s),\n        len == 4 or len == 5 or len == 6 or len == 7, strcat(s, s),\n        s)\n};\nlet ai_hash = (s: string) {\n    abs(toint(__hash_djb2(min_length_8(s))))\n};\n\ndependencies\n// additional filters can be applied here\n| where $__timeFilter(timestamp) and  (\"All\" in ($dependency_result_code) or resultCode in ($dependency_result_code))\n| extend typeTransform=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), targetTransform=tostring(split(target, \" | cid-v1\")[0])\n| extend [\"Dependency Name\"] = strcat(typeTransform, \": \", name, \" \", targetTransform)\n| where (\"All\" in ($dependency) or [\"Dependency Name\"] in ($dependency)) and isnotempty(operation_Id)\n| where (\"All\" in ($dependency_result_code) or resultCode in ($dependency_result_code))\n| project [\"Dependency Name\"], target, ResponseCode = resultCode, ResponseTime = duration, OperationID = operation_Id, type, name, Score=ai_hash(operation_Id)\n| top 20 by Score asc\n\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Top 20 Dependencies matching $dependency by Relevance",
+      "transformations": [],
+      "type": "table"
+    }
+  ],
+  "refresh": "",
+  "revision": 1,
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": ["Azure-AppInsights-Failures"],
+  "templating": {
+    "list": [
+      {
+        "current": {},
+        "hide": 0,
+        "includeAll": false,
+        "label": "Datasource",
+        "multi": false,
+        "name": "ds",
+        "options": [],
+        "query": "grafana-azure-monitor-datasource",
+        "queryValue": "",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Subscription",
+        "multi": false,
+        "name": "sub",
+        "options": [],
+        "query": {
+          "grafanaTemplateVariableFn": {
+            "kind": "SubscriptionsQuery",
+            "rawQuery": "Subscriptions()"
+          },
+          "queryType": "Azure Subscriptions",
+          "refId": "A"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Resource Group",
+        "multi": false,
+        "name": "rg",
+        "options": [],
+        "query": {
+          "grafanaTemplateVariableFn": {
+            "kind": "ResourceGroupsQuery",
+            "rawQuery": "ResourceGroups($sub)",
+            "subscription": "$sub"
+          },
+          "queryType": "Azure Resource Groups",
+          "refId": "A",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 2,
+        "includeAll": false,
+        "label": "Namespace",
+        "multi": false,
+        "name": "ns",
+        "options": [],
+        "query": {
+          "grafanaTemplateVariableFn": {
+            "kind": "MetricNamespaceQuery",
+            "rawQuery": "Namespaces($sub, $rg)",
+            "resourceGroup": "$rg",
+            "subscription": "$sub"
+          },
+          "queryType": "Azure Namespaces",
+          "refId": "A",
+          "resourceGroup": "$rg",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "([mM](icrosoft)\\.[iI](nsights)/(components))",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "ResourceNames($sub, $rg, $ns)",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Resource",
+        "multi": false,
+        "name": "res",
+        "options": [],
+        "query": "ResourceNames($sub, $rg, $ns)",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "allValue": "\"All\"",
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": true,
+        "label": "Dependency",
+        "multi": true,
+        "name": "dependency",
+        "options": [],
+        "query": {
+          "azureLogAnalytics": {
+            "query": "dependencies\r\n| where $__timeFilter(timestamp)\r\n| where client_Type != \"Browser\" and success == false\r\n| extend type=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), target=tostring(split(target, \" | cid-v1\")[0])\r\n| project [\"Dependency Name\"] = strcat(type, \": \", name, \" \", target), success\r\n| summarize count() by [\"Dependency Name\"]\r\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"]
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "allValue": "\"All\"",
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": true,
+        "label": "Result Code",
+        "multi": true,
+        "name": "dependency_result_code",
+        "options": [],
+        "query": {
+          "azureLogAnalytics": {
+            "query": "dependencies\r\n// additional filters can be applied here\r\n| where $__timeFilter(timestamp)\r\n| where client_Type != \"Browser\"\r\n| where success == false\r\n| summarize _count=sum(itemCount) by resultCode\r\n| sort by _count desc",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"]
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-30m",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "utc",
+  "title": "Azure / Insights / Applications - Failures - 2. Dependencies",
+  "uid": "Azure-AppInsights-Failures-Dependencies",
+  "version": 48
+}
diff --git a/public/app/plugins/datasource/azuremonitor/dashboards/appInsightsFailureExceptions.json b/public/app/plugins/datasource/azuremonitor/dashboards/appInsightsFailureExceptions.json
new file mode 100644
index 0000000000000..3c578e5207d21
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/dashboards/appInsightsFailureExceptions.json
@@ -0,0 +1,1278 @@
+{
+  "__inputs": [],
+  "__elements": {},
+  "__requires": [
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "10.0.3"
+    },
+    {
+      "type": "datasource",
+      "id": "grafana-azure-monitor-datasource",
+      "name": "Azure Monitor",
+      "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "stat",
+      "name": "Stat",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "table",
+      "name": "Table",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "timeseries",
+      "name": "Time series",
+      "version": ""
+    }
+  ],
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "description": "The dashboard provides insights of exceptions through Application Insights.",
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": null,
+  "links": [
+    {
+      "asDropdown": true,
+      "icon": "external link",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": ["Azure-AppInsights-Failures"],
+      "targetBlank": true,
+      "title": "Application Insights Failures Dashboards",
+      "tooltip": "",
+      "type": "dashboards",
+      "url": ""
+    }
+  ],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 2,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 97,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "# Failures - Exceptions",
+        "mode": "markdown"
+      },
+      "pluginVersion": "10.0.3",
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 2
+      },
+      "id": 89,
+      "panels": [],
+      "title": "Application Insights - Failures - Exceptions",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "The resource path for this panel uses multiple template variables which requires modifying the dashboard JSON directly. If you would like to do something similar please go to Settings > JSON Model. Edit as you'd like in your new copy by going to Settings > Save as.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "axisSoftMin": 0,
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 64,
+            "gradientMode": "opacity",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "users/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Users (Unique)"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "sessions/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Sessions (Unique)"
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "purple",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Max"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "semi-dark-orange",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "failedCount"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "FailedCount"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 13,
+        "x": 0,
+        "y": 3
+      },
+      "id": 91,
+      "interval": "60s",
+      "links": [
+        {
+          "targetBlank": true,
+          "title": "${res} | Users",
+          "url": "https://ms.portal.azure.com/#@microsoft.onmicrosoft.com/resource/subscriptions/${sub}/resourceGroups/${rg}/providers/microsoft.insights/components/${res}/segmentationUsers"
+        }
+      ],
+      "maxDataPoints": 150,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "\nexceptions\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where (\"All\" in ($exception_type) or type in ($exception_type))\n| summarize FailedCount=sum(itemCount) by bin(timestamp, $__interval)\n| order by timestamp asc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Exceptions (count)",
+      "transformations": [],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "The resource path for this panel uses multiple template variables which requires modifying the dashboard JSON directly. If you would like to do something similar please go to Settings > JSON Model. Edit as you'd like in your new copy by going to Settings > Save as.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "links": [],
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Count"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "basic",
+                  "type": "gauge"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "type"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 257
+              },
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": false,
+                    "title": "Filter by exception type",
+                    "url": "/d/Azure-AppInsights-Failures-Exceptions/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&${exception:queryparam}&var-exception_type=${__data.fields.type}"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 13,
+        "w": 11,
+        "x": 13,
+        "y": 3
+      },
+      "id": 90,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": []
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "\nexceptions\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| summarize Count=sum(itemCount) by type\n| top 10 by Count desc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Top 10 exception types (count)",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "The resource path for this panel uses multiple template variables which requires modifying the dashboard JSON directly. If you would like to do something similar please go to Settings > JSON Model. Edit as you'd like in your new copy by going to Settings > Save as.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "axisSoftMin": 0,
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 62,
+            "gradientMode": "opacity",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "users/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Users (Unique)"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "sessions/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Sessions (Unique)"
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "purple",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Max"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-blue",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 13,
+        "x": 0,
+        "y": 10
+      },
+      "id": 92,
+      "interval": "60s",
+      "links": [
+        {
+          "targetBlank": true,
+          "title": "${res} | Users",
+          "url": "https://ms.portal.azure.com/#@microsoft.onmicrosoft.com/resource/subscriptions/${sub}/resourceGroups/${rg}/providers/microsoft.insights/components/${res}/segmentationUsers"
+        }
+      ],
+      "maxDataPoints": 150,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "requests\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n// calculate average request duration for all requests\n| summarize Count = count() by bin(timestamp, $__interval)\n| order by timestamp asc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Server Requests (count)",
+      "transformations": [],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "The resource path for this panel uses multiple template variables which requires modifying the dashboard JSON directly. If you would like to do something similar please go to Settings > JSON Model. Edit as you'd like in your new copy by going to Settings > Save as.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "dark-red",
+            "mode": "fixed"
+          },
+          "links": [],
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 8,
+        "x": 0,
+        "y": 16
+      },
+      "id": 93,
+      "interval": "60s",
+      "links": [
+        {
+          "title": "Reset to All Failed exceptions",
+          "url": "/d/Azure-AppInsights-Failures-Exceptions/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&var-exception_type=All&var-exception=All"
+        }
+      ],
+      "maxDataPoints": 150,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "exceptions\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| summarize failedCount=sum(itemCount)\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "All Exceptions (Count)",
+      "transformations": [],
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "The resource path for this panel uses multiple template variables which requires modifying the dashboard JSON directly. If you would like to do something similar please go to Settings > JSON Model. Edit as you'd like in your new copy by going to Settings > Save as.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "dark-red",
+            "mode": "fixed"
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "dark-red",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 8,
+        "x": 8,
+        "y": 16
+      },
+      "id": 94,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "exceptions\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| where (\"All\" in ($exception) or problemId in ($exception))\n| where (\"All\" in ($exception_type) or type in ($exception_type))\n| summarize failedCount=sum(itemCount)\n\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Number of exceptions matching exception type $exception_type and exception $exception",
+      "transformations": [],
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "The resource path for this panel uses multiple template variables which requires modifying the dashboard JSON directly. If you would like to do something similar please go to Settings > JSON Model. Edit as you'd like in your new copy by going to Settings > Save as.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "links": [
+            {
+              "targetBlank": true,
+              "title": "Show list of sample transactions",
+              "url": "/explore?left={\"datasource\":\"${ds:raw}\",\"queries\":[{\"refId\":\"A\",\"datasource\":\"${ds:raw}\",\"queryType\":\"Azure Traces\",\"azureTraces\":{\"resultFormat\":\"table\",\"resources\":[\"/subscriptions/${sub}/resourceGroups/${rg}/providers/${ns}/${res}\"],\"filters\":[{\"property\":\"problemId\",\"filters\":[\"${__data.fields.Exception}\"],\"operation\":\"eq\"}],\"traceTypes\": [\"exceptions\"]}}],\"range\":{\"from\": \"${__from}\", \"to\":\"${__to}\" }}"
+            }
+          ],
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "#EAB839",
+                "value": 0.5
+              },
+              {
+                "color": "dark-red",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Dependency name"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 161
+              },
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "title": "Show list of matching dependencies",
+                    "url": "d/Azure-AppInsights-Failures-Exceptions/?orgId=1&${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&${__value.time}&${result_code:queryparam}&var-exception=${__data.fields.Exception}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Count"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": false
+              },
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "lcd",
+                  "type": "gauge",
+                  "valueDisplayMode": "text"
+                }
+              },
+              {
+                "id": "links",
+                "value": []
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "impactedUsers"
+            },
+            "properties": [
+              {
+                "id": "links"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Exception"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": false,
+                    "title": "Filter dashboards to Exception",
+                    "url": "/d/Azure-AppInsights-Failures-Exceptions/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&${exception_type:queryparam}&var-exception=${__data.fields.Exception}"
+                  }
+                ]
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "text",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 8,
+        "x": 0,
+        "y": 19
+      },
+      "id": 95,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": [
+          {
+            "desc": true,
+            "displayName": "Count"
+          }
+        ]
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let m = exceptions\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| where (\"All\" in ($exception_type) or type in ($exception_type))\n| project itemCount, user_Id, problemId;\nm\n| summarize Count=sum(itemCount), impactedUsers=dcount(user_Id)\n| project Exception=\"All\", Count, impactedUsers\n| union(\nm\n| summarize Count=sum(itemCount), impactedUsers=dcount(user_Id) by problemId\n| sort by Count desc\n| project Exception=problemId, Count, impactedUsers)\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Top Exceptions by Count",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "The resource path for this panel uses multiple template variables which requires modifying the dashboard JSON directly. If you would like to do something similar please go to Settings > JSON Model. Edit as you'd like in your new copy by going to Settings > Save as.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "orange",
+                "value": 0.5
+              },
+              {
+                "color": "dark-red",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ResponseTime"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "basic",
+                  "type": "gauge"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-blue",
+                  "mode": "fixed"
+                }
+              },
+              {
+                "id": "links"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Exception"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Open dependencies in explorer",
+                    "url": "/explore?left={\"datasource\":\"${ds:raw}\",\"queries\":[{\"refId\":\"A\",\"datasource\":\"${ds:raw}\",\"queryType\":\"Azure Traces\",\"azureTraces\":{\"resultFormat\":\"table\",\"resources\":[\"/subscriptions/${sub}/resourceGroups/${rg}/providers/${ns}/${res}\"],\"filters\":[{\"property\":\"problemId\",\"filters\":[\"${__data.fields.Exception}\"],\"operation\":\"eq\"}],\"traceTypes\": [\"exceptions\"]}}],\"range\":{\"from\": \"${__from}\", \"to\":\"${__to}\" }}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "OperationID"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Open Trace Details",
+                    "url": "/explore?left={\r\n\t\"datasource\": \"${ds}\",\r\n\t\"queries\": [{\r\n\t\t\"azureTraces\": {\r\n\r\n\t\t\t\"operationId\": \"${__data.fields.OperationID}\",\r\n\r\n\t\t\t\"resources\": [\"/subscriptions/${sub}/resourceGroups/${rg}/providers/${ns}/${res}\"],\r\r\n\r\n\t\t\t\"resultFormat\": \"trace\"\r\n\r\n\r\n\r\n\r\n\t\t},\r\n\t\t\"datasource\": \"${ds}\",\r\n\t\t\"refId\": \"A\",\r\n\r\n\t\t\"queryType\": \"Azure Traces\"\r\n\t}],\r\n\t\"range\": {\r\n\t\t\"from\": \"${__from}\",\r\n\t\t\"to\": \"${__to}\"\r\n\t}\r\n}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Score"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 16,
+        "x": 8,
+        "y": 19
+      },
+      "id": 96,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": []
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let min_length_8 = (s: string) {\n    let len = strlen(s);\n    case(len == 1, strcat(s, s, s, s, s, s, s, s),\n        len == 2 or len == 3, strcat(s, s, s, s),\n        len == 4 or len == 5 or len == 6 or len == 7, strcat(s, s),\n        s)\n};\nlet ai_hash = (s: string) {\n    abs(toint(__hash_djb2(min_length_8(s))))\n};\n\nexceptions\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where (\"All\" in ($exception_type) or type in ($exception_type))\n| where (\"All\" in ($exception) or problemId in ($exception))\n| where isnotempty(operation_Id)\n| project Exception=problemId, OperationID=operation_Id, Score=ai_hash(operation_Id)\n| top 20 by Score asc\n\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Top 20 exceptions level matching $exception by Relevance",
+      "transformations": [],
+      "type": "table"
+    }
+  ],
+  "refresh": "",
+  "revision": 1,
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": ["Azure-AppInsights-Failures"],
+  "templating": {
+    "list": [
+      {
+        "current": {
+          "selected": false,
+          "text": "Azure Monitor",
+          "value": "Azure Monitor"
+        },
+        "hide": 0,
+        "includeAll": false,
+        "label": "Datasource",
+        "multi": false,
+        "name": "ds",
+        "options": [],
+        "query": "grafana-azure-monitor-datasource",
+        "queryValue": "",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Subscription",
+        "multi": false,
+        "name": "sub",
+        "options": [],
+        "query": {
+          "grafanaTemplateVariableFn": {
+            "kind": "SubscriptionsQuery",
+            "rawQuery": "Subscriptions()"
+          },
+          "queryType": "Azure Subscriptions",
+          "refId": "A"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Resource Group",
+        "multi": false,
+        "name": "rg",
+        "options": [],
+        "query": {
+          "grafanaTemplateVariableFn": {
+            "kind": "ResourceGroupsQuery",
+            "rawQuery": "ResourceGroups($sub)",
+            "subscription": "$sub"
+          },
+          "queryType": "Azure Resource Groups",
+          "refId": "A",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 2,
+        "includeAll": false,
+        "label": "Namespace",
+        "multi": false,
+        "name": "ns",
+        "options": [],
+        "query": {
+          "grafanaTemplateVariableFn": {
+            "kind": "MetricNamespaceQuery",
+            "rawQuery": "Namespaces($sub, $rg)",
+            "resourceGroup": "$rg",
+            "subscription": "$sub"
+          },
+          "queryType": "Azure Namespaces",
+          "refId": "A",
+          "resourceGroup": "$rg",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "([mM](icrosoft)\\.[iI](nsights)/(components))",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "ResourceNames($sub, $rg, $ns)",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Resource",
+        "multi": false,
+        "name": "res",
+        "options": [],
+        "query": "ResourceNames($sub, $rg, $ns)",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "allValue": "\"All\"",
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": true,
+        "label": "Exception Type",
+        "multi": true,
+        "name": "exception_type",
+        "options": [],
+        "query": {
+          "azureLogAnalytics": {
+            "query": "exceptions\r\n| search \"*\"\r\n| where $__timeFilter(timestamp)\r\n| where client_Type != \"Browser\"\r\n| summarize count() by type\r\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"]
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "allValue": "\"All\"",
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": true,
+        "label": "Exception",
+        "multi": true,
+        "name": "exception",
+        "options": [],
+        "query": {
+          "azureLogAnalytics": {
+            "query": "exceptions\r\n| search \"*\"\r\n| where $__timeFilter(timestamp)\r\n| where client_Type != \"Browser\"\r\n| where (\"All\" in ($exception_type) or type in ($exception_type))\r\n| summarize count() by problemId\r\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"]
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-30m",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "utc",
+  "title": "Azure / Insights / Applications - Failures - 3. Exceptions",
+  "uid": "Azure-AppInsights-Failures-Exceptions",
+  "version": 37
+}
diff --git a/public/app/plugins/datasource/azuremonitor/dashboards/appInsightsFailureOperations.json b/public/app/plugins/datasource/azuremonitor/dashboards/appInsightsFailureOperations.json
new file mode 100644
index 0000000000000..9bcdc18a70abe
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/dashboards/appInsightsFailureOperations.json
@@ -0,0 +1,1753 @@
+{
+  "__inputs": [],
+  "__elements": {},
+  "__requires": [
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "10.0.3"
+    },
+    {
+      "type": "datasource",
+      "id": "grafana-azure-monitor-datasource",
+      "name": "Azure Monitor",
+      "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "stat",
+      "name": "Stat",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "table",
+      "name": "Table",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "timeseries",
+      "name": "Time series",
+      "version": ""
+    }
+  ],
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "description": "The dashboard provides insights of operation failures through Application Insights.",
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": null,
+  "links": [
+    {
+      "asDropdown": true,
+      "icon": "external link",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": ["Azure-AppInsights-Failures"],
+      "targetBlank": true,
+      "title": "Azure Application Insights Failures",
+      "tooltip": "",
+      "type": "dashboards",
+      "url": ""
+    }
+  ],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 2,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 87,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "# Failures - Operations",
+        "mode": "markdown"
+      },
+      "pluginVersion": "10.0.3",
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 2
+      },
+      "id": 68,
+      "panels": [],
+      "title": "Application Insights - Failures",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "axisSoftMin": 0,
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 64,
+            "gradientMode": "opacity",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "users/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Users (Unique)"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "sessions/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Sessions (Unique)"
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "purple",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Max"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "semi-dark-orange",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "failedCount"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "FailedCount"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 13,
+        "x": 0,
+        "y": 3
+      },
+      "id": 69,
+      "interval": "60s",
+      "links": [
+        {
+          "targetBlank": true,
+          "title": "${res} | Users",
+          "url": "https://ms.portal.azure.com/#@microsoft.onmicrosoft.com/resource/subscriptions/${sub}/resourceGroups/${rg}/providers/microsoft.insights/components/${res}/segmentationUsers"
+        }
+      ],
+      "maxDataPoints": 150,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "\nrequests\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where \"All\" in ($operation_name) or operation_Name in ($operation_name)\n| where \"All\" in ($result_code) or resultCode in ($result_code)\n| summarize FailedCount=sumif(itemCount, success == false) by bin(timestamp, $__interval)\n| order by timestamp asc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Failed Requests (count)",
+      "transformations": [],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "Click on a result code to filter this dashboard.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "dark-red",
+            "mode": "fixed"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "links": [
+            {
+              "targetBlank": false,
+              "title": "Filter Result code",
+              "url": "/d/Azure-AppInsights-Failures-Operations/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&${operation_name:queryparam}&var-result_code=${__data.fields[\"Result Code\"]}"
+            }
+          ],
+          "mappings": [],
+          "min": 0,
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Count"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "basic",
+                  "type": "gauge"
+                }
+              },
+              {
+                "id": "custom.width",
+                "value": 584
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Result Code"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 252
+              },
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "title": "Filter result code",
+                    "url": "/d/Azure-AppInsights-Failures-Operations/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&${operation_name:queryparam}&var-result_code=${__data.fields[\"Result Code\"]}"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 11,
+        "x": 13,
+        "y": 3
+      },
+      "id": 72,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": []
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "\nrequests\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| where success == false\n| where \"All\" in ($operation_name) or operation_Name in ($operation_name)\n| summarize Count=sum(itemCount) by [\"Result Code\"]=resultCode\n| top 5 by Count desc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Top 5 response codes",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "Click on an type to open the exceptions dashboard.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "links": [],
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Count"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "basic",
+                  "type": "gauge"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "type"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 257
+              },
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Open Exceptions Dashboard",
+                    "url": "/d/Azure-AppInsights-Failures-Exceptions?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&var-exception_type=${__data.fields.type}"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 11,
+        "x": 13,
+        "y": 9
+      },
+      "id": 73,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": []
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "\nexceptions\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| summarize Count=sum(itemCount) by type\n| top 5 by Count desc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Top 5 exception types",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "dark-red",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 22,
+            "gradientMode": "hue",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "normal"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "sum_itemCount 404"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "orange",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "sum_itemCount 500"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ResultCode 404"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-orange",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 13,
+        "x": 0,
+        "y": 13
+      },
+      "id": 79,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "9.0.8.1",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "\nrequests\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where \"All\" in ($operation_name) or operation_Name in ($operation_name)\n| where \"All\" in ($result_code) or resultCode in ($result_code)\n| where client_Type != \"Browser\"\n| where success == false\n| summarize ResultCode = sum(itemCount) by resultCode, bin(timestamp, $__interval)\n| sort by timestamp asc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Response codes (count)",
+      "transformations": [],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "links": [],
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Count"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "basic",
+                  "type": "gauge"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-red",
+                  "mode": "fixed"
+                }
+              },
+              {
+                "id": "links"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "type"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 264
+              },
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Open Dependencies Dashboard",
+                    "url": "/d/Azure-AppInsights-Failures-Dependencies/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 11,
+        "x": 13,
+        "y": 16
+      },
+      "id": 74,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": []
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "\ndependencies\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| where success == false\n| summarize Count=sum(itemCount) by type\n| top 5 by Count desc\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Top 5 failed dependencies",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "axisSoftMin": 0,
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 62,
+            "gradientMode": "opacity",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "users/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Users (Unique)"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "sessions/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Sessions (Unique)"
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "purple",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Max"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-blue",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 13,
+        "x": 0,
+        "y": 18
+      },
+      "id": 70,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "\nrequests\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| where \"All\" in ($operation_name) or operation_Name in ($operation_name)\n| where \"All\" in ($result_code) or resultCode in ($result_code)\n// calculate average request duration for all requests\n| summarize Count = count() by bin(timestamp, $__interval)\n| order by timestamp asc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Server Requests (count)",
+      "transformations": [],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "dark-red",
+            "mode": "fixed"
+          },
+          "links": [
+            {
+              "title": "Reset to All Operations and All Result codes",
+              "url": "/d/Azure-AppInsights-Failures-Operations/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&var-result_code=All${result_code:queryparam}&var-operation_name=All"
+            }
+          ],
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 8,
+        "x": 0,
+        "y": 24
+      },
+      "id": 78,
+      "interval": "60s",
+      "links": [
+        {
+          "title": "Reset to All Operation Names and All Result codes",
+          "url": "/d/Azure-AppInsights-Failures-Operations/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&var-result_code=All${result_code:queryparam}&var-operation_name=All"
+        }
+      ],
+      "maxDataPoints": 150,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "\nrequests\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where \"All\" in ($result_code) or resultCode in ($result_code)\n| where client_Type != \"Browser\"\n| summarize failedCount=sumif(itemCount, success == false)\n\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "All Failed Operations (Count) matching Result code $result_code",
+      "transformations": [],
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "dark-red",
+            "mode": "fixed"
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "dark-red",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "failedCount"
+            },
+            "properties": [
+              {
+                "id": "links"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 8,
+        "x": 8,
+        "y": 24
+      },
+      "id": 86,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "requests\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where \"All\" in ($result_code) or resultCode in ($result_code)\n| where client_Type != \"Browser\"\n| where \"All\" in ($operation_name) or operation_Name in ($operation_name)\n| summarize failedCount=sumif(itemCount, success == false)\n\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Number of failed transactions matching $operation_name",
+      "transformations": [],
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "uid": "${ds}",
+        "type": "grafana-azure-monitor-datasource"
+      },
+      "description": "Click on the Operation name to filter dashboard.",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "color": {
+            "fixedColor": "green",
+            "mode": "thresholds"
+          },
+          "links": [
+            {
+              "title": "View transactions with Operation name",
+              "url": "/explore?left={\"datasource\":\"${ds:raw}\",\"queries\":[{\"refId\":\"A\",\"datasource\":\"${ds:raw}\",\"queryType\":\"Azure Traces\",\"azureTraces\":{\"resultFormat\":\"table\",\"resources\":[\"/subscriptions/${sub}/resourceGroups/${rg}/providers/Microsoft.Insights/components/${res}\"],\"filters\":[{\"property\":\"operation_Name\",\"filters\":[\"${__data.fields.operation_Name}\"],\"operation\":\"eq\"}],\"traceTypes\": [\"requests\"]}}],\"range\":{\"from\": \"${__from}\", \"to\":\"${__to}\" }}"
+            }
+          ],
+          "noValue": "--"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Failed count"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "lcd",
+                  "type": "gauge"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-red",
+                  "mode": "fixed"
+                }
+              },
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "View transactions with Operation Name",
+                    "url": "/explore?left={\"datasource\":\"${ds:raw}\",\"queries\":[{\"refId\":\"A\",\"datasource\":\"${ds:raw}\",\"queryType\":\"Azure Traces\",\"azureTraces\":{\"resultFormat\":\"table\",\"resources\":[\"/subscriptions/${sub}/resourceGroups/${rg}/providers/Microsoft.Insights/components/${res}\"],\"filters\":[{\"property\":\"operation_Name\",\"filters\":[\"${__data.fields[\"Operation name\"]}\"],\"operation\":\"eq\"}, {\"property\":\"resultCode\",\"filters\":[${result_code:doublequote}],\"operation\":\"eq\"}],\"traceTypes\": [\"requests\"]}}],\"range\":{\"from\": \"${__from}\", \"to\":\"${__to}\" }}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Total count"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "lcd",
+                  "type": "gauge"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "text",
+                  "mode": "fixed"
+                }
+              },
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "View transactions with Operation name",
+                    "url": "/explore?left={\"datasource\":\"${ds:raw}\",\"queries\":[{\"refId\":\"A\",\"datasource\":\"${ds:raw}\",\"queryType\":\"Azure Traces\",\"azureTraces\":{\"resultFormat\":\"table\",\"resources\":[\"/subscriptions/${sub}/resourceGroups/${rg}/providers/Microsoft.Insights/components/${res}\"],\"filters\":[{\"property\":\"operation_Name\",\"filters\":[\"${__data.fields[\"Operation name\"]}\"],\"operation\":\"eq\"}, {\"property\":\"resultCode\",\"filters\":[${result_code:doublequote}],\"operation\":\"eq\"}],\"traceTypes\": [\"requests\"]}}],\"range\":{\"from\": \"${__from}\", \"to\":\"${__to}\" }}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Operation name"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 184
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Impacted users"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 130
+              },
+              {
+                "id": "links"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Operation name"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "title": "Filter dashboard to this failing operation",
+                    "url": "/d/Azure-AppInsights-Failures-Operations/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&var-operation_name=${__data.fields[\"Operation name\"]}&${result_code:queryparam}"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 13,
+        "w": 8,
+        "x": 0,
+        "y": 27
+      },
+      "id": 71,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "showHeader": true,
+        "cellHeight": "sm",
+        "footer": {
+          "show": false,
+          "reducer": ["sum"],
+          "countRows": false,
+          "fields": ""
+        },
+        "sortBy": [
+          {
+            "desc": true,
+            "displayName": "failedCount"
+          }
+        ]
+      },
+      "pluginVersion": "10.2.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "azureLogAnalytics": {
+            "query": "let dataset =\nrequests\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\";\ndataset\n| summarize\n    [\"Failed count\"]=sumif(itemCount, success == 'False' and (\"All\" in ($result_code) or resultCode in ($result_code))),\n    [\"Impacted users\"]=dcountif(user_Id, success == 'False' and (\"All\" in ($result_code) or resultCode in ($result_code))),\n    [\"Total count\"]=sum(itemCount)\n| project [\"Operation name\"]=\"All\", [\"Failed count\"], [\"Impacted users\"], [\"Total count\"]\n| union (dataset| summarize\n    [\"Failed count\"]=sumif(itemCount, success == 'False' and (\"All\" in ($result_code) or resultCode in ($result_code))),\n    [\"Impacted users\"]=dcountif(user_Id, success == 'False' and (\"All\" in ($result_code) or resultCode in ($result_code))),\n    [\"Total count\"]=sum(itemCount)\n    by [\"Operation name\"]=operation_Name\n| where [\"Failed count\"] > 0\n| top 10 by [\"Failed count\"] desc)\n\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table",
+            "dashboardTime": false
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Top 10 Failed Operation Name List",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "Click on the OperationID or Name to view trace details in explorer.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Response Time"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "basic",
+                  "type": "gauge"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-red",
+                  "mode": "fixed"
+                }
+              },
+              {
+                "id": "links"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Name"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 173
+              },
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Open explorer with this name",
+                    "url": "/explore?left={\"datasource\":\"${ds:raw}\",\"queries\":[{\"refId\":\"A\",\"datasource\":\"${ds:raw}\",\"queryType\":\"Azure Traces\",\"azureTraces\":{\"resultFormat\":\"table\",\"resources\":[\"/subscriptions/${sub}/resourceGroups/${rg}/providers/Microsoft.Insights/components/${res}\"],\"filters\":[{\"property\":\"operation_Name\",\"filters\":[\"${__data.fields.Name}\"],\"operation\":\"eq\"}, {\"property\":\"resultCode\",\"filters\":[${result_code:doublequote}],\"operation\":\"eq\"}],\"traceTypes\": [\"requests\"]}}],\"range\":{\"from\": \"${__from}\", \"to\":\"${__to}\" }}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Response Code"
+            },
+            "properties": [
+              {
+                "id": "mappings",
+                "value": [
+                  {
+                    "options": {
+                      "200": {
+                        "color": "dark-green",
+                        "index": 0
+                      }
+                    },
+                    "type": "value"
+                  },
+                  {
+                    "options": {
+                      "from": 201,
+                      "result": {
+                        "color": "dark-orange",
+                        "index": 1
+                      },
+                      "to": 399
+                    },
+                    "type": "range"
+                  },
+                  {
+                    "options": {
+                      "from": 400,
+                      "result": {
+                        "color": "dark-red",
+                        "index": 2
+                      },
+                      "to": 999
+                    },
+                    "type": "range"
+                  }
+                ]
+              },
+              {
+                "id": "links"
+              },
+              {
+                "id": "custom.width",
+                "value": 211
+              },
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "OperationID"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Show Trace Details",
+                    "url": "/explore?left={\r\n\t\"datasource\": \"${ds}\",\r\n\t\"queries\": [{\r\n\t\t\"azureTraces\": {\r\n\r\n\t\t\t\"operationId\": \"${__data.fields.OperationID}\",\r\n\r\n\t\t\t\"resources\": [\"/subscriptions/${sub}/resourceGroups/${rg}/providers/${ns}/${res}\"],\r\r\n\r\n\t\t\t\"resultFormat\": \"trace\"\r\n\r\n\r\n\r\n\r\n\t\t},\r\n\t\t\"datasource\": \"${ds}\",\r\n\t\t\"refId\": \"A\",\r\n\r\n\t\t\"queryType\": \"Azure Traces\"\r\n\t}],\r\n\t\"range\": {\r\n\t\t\"from\": \"${__from}\",\r\n\t\t\"to\": \"${__to}\"\r\n\t}\r\n}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Score"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 13,
+        "w": 16,
+        "x": 8,
+        "y": 27
+      },
+      "id": 75,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": []
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let min_length_8 = (s: string) {\n    let len = strlen(s);\n    case(len == 1, strcat(s, s, s, s, s, s, s, s),\n        len == 2 or len == 3, strcat(s, s, s, s),\n        len == 4 or len == 5 or len == 6 or len == 7, strcat(s, s),\n        s)\n};\nlet ai_hash = (s: string) {\n    abs(toint(__hash_djb2(min_length_8(s))))\n};\n\nrequests\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where \"All\" in ($operation_name) or operation_Name in ($operation_name)\n| where \"All\" in ($result_code) or resultCode in ($result_code)\n| where success == 'False'\n| project Name = operation_Name, [\"Response Code\"] = resultCode, [\"Response Time\"] = duration, OperationID = operation_Id, Score=ai_hash(operation_Id)\n| top 20 by Score asc\n\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Top 20 Sample Failed Operations matching $operation_name by relevance",
+      "transformations": [],
+      "type": "table"
+    }
+  ],
+  "refresh": "",
+  "revision": 1,
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": ["Azure-AppInsights-Failures"],
+  "templating": {
+    "list": [
+      {
+        "current": {
+          "selected": false,
+          "text": "Azure Monitor",
+          "value": "Azure Monitor"
+        },
+        "hide": 0,
+        "includeAll": false,
+        "label": "Datasource",
+        "multi": false,
+        "name": "ds",
+        "options": [],
+        "query": "grafana-azure-monitor-datasource",
+        "queryValue": "",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Subscription",
+        "multi": false,
+        "name": "sub",
+        "options": [],
+        "query": {
+          "grafanaTemplateVariableFn": {
+            "kind": "SubscriptionsQuery",
+            "rawQuery": "Subscriptions()"
+          },
+          "queryType": "Azure Subscriptions",
+          "refId": "A"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Resource Group",
+        "multi": false,
+        "name": "rg",
+        "options": [],
+        "query": {
+          "grafanaTemplateVariableFn": {
+            "kind": "ResourceGroupsQuery",
+            "rawQuery": "ResourceGroups($sub)",
+            "subscription": "$sub"
+          },
+          "queryType": "Azure Resource Groups",
+          "refId": "A",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 2,
+        "includeAll": false,
+        "label": "Namespace",
+        "multi": false,
+        "name": "ns",
+        "options": [],
+        "query": {
+          "grafanaTemplateVariableFn": {
+            "kind": "MetricNamespaceQuery",
+            "rawQuery": "Namespaces($sub, $rg)",
+            "resourceGroup": "$rg",
+            "subscription": "$sub"
+          },
+          "queryType": "Azure Namespaces",
+          "refId": "A",
+          "resourceGroup": "$rg",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "([mM](icrosoft)\\.[iI](nsights)/(components))",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "ResourceNames($sub, $rg, $ns)",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Resource",
+        "multi": false,
+        "name": "res",
+        "options": [],
+        "query": "ResourceNames($sub, $rg, $ns)",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "allValue": "\"All\"",
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": true,
+        "label": "Result Code",
+        "multi": true,
+        "name": "result_code",
+        "options": [],
+        "query": {
+          "azureLogAnalytics": {
+            "query": "requests\r\n// additional filters can be applied here\r\n| where $__timeFilter(timestamp)\r\n| where client_Type != \"Browser\"\r\n| where success == false\r\n| summarize Count=sum(itemCount) by resultCode\r\n| sort by Count desc",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"]
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "allValue": "\"All\"",
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": true,
+        "label": "Operation Names",
+        "multi": true,
+        "name": "operation_name",
+        "options": [],
+        "query": {
+          "azureLogAnalytics": {
+            "query": "requests\r\n// additional filters can be applied here\r\n| where $__timeFilter(timestamp)\r\n| where client_Type != \"Browser\"\r\n| where \"All\" in ($result_code) or resultCode in ($result_code)\r\n| summarize count=sumif(itemCount, success == false) by operation_Name",
+            "resource": "/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"]
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-30m",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Azure / Insights / Applications - Failures - 1. Operations",
+  "uid": "Azure-AppInsights-Failures-Operations",
+  "version": 127
+}
diff --git a/public/app/plugins/datasource/azuremonitor/dashboards/appInsightsPerfDependencies.json b/public/app/plugins/datasource/azuremonitor/dashboards/appInsightsPerfDependencies.json
new file mode 100644
index 0000000000000..a40b6ca601aaa
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/dashboards/appInsightsPerfDependencies.json
@@ -0,0 +1,1828 @@
+{
+  "__inputs": [],
+  "__elements": {},
+  "__requires": [
+    {
+      "type": "panel",
+      "id": "barchart",
+      "name": "Bar chart",
+      "version": ""
+    },
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "10.0.3"
+    },
+    {
+      "type": "datasource",
+      "id": "grafana-azure-monitor-datasource",
+      "name": "Azure Monitor",
+      "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "heatmap",
+      "name": "Heatmap",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "histogram",
+      "name": "Histogram",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "stat",
+      "name": "Stat",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "table",
+      "name": "Table",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "timeseries",
+      "name": "Time series",
+      "version": ""
+    }
+  ],
+  "description": "The dashboard provides insights of dependency performance of Azure Apps through Application Insights.",
+  "editable": true,
+  "id": null,
+  "links": [
+    {
+      "asDropdown": true,
+      "icon": "external link",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": ["Azure-AppInsights-Perf"],
+      "targetBlank": true,
+      "title": "Azure Application Insights Performance Dashboards",
+      "tooltip": "",
+      "type": "dashboards",
+      "url": ""
+    }
+  ],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 2,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 93,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "# Performance Dependencies",
+        "mode": "markdown"
+      },
+      "pluginVersion": "10.0.3",
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 2
+      },
+      "id": 83,
+      "panels": [],
+      "title": "Application Insights - Performance - Dependencies",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Count"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "basic",
+                  "type": "gauge",
+                  "valueDisplayMode": "text"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "type"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Open on Explorer",
+                    "url": "/explore?left={\"datasource\":\"${ds:raw}\",\"queries\":[{\"refId\":\"A\",\"datasource\":\"${ds:raw}\",\"queryType\":\"Azure Traces\",\"azureTraces\":{\"resultFormat\":\"table\",\"resources\":[\"/subscriptions/${sub}/resourceGroups/${rg}/providers/${ns}/${res}\"],\"filters\":[{\"property\":\"type\",\"filters\":[\"${__data.fields.type}\"],\"operation\":\"eq\"}],\"traceTypes\": [\"dependencies\"]}}],\"range\":{\"from\": \"${__from}\", \"to\":\"${__to}\" }}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Count"
+            },
+            "properties": [
+              {
+                "id": "links"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Duration_95th"
+            },
+            "properties": [
+              {
+                "id": "links"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "AVG_Duration"
+            },
+            "properties": [
+              {
+                "id": "links"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 24,
+        "x": 0,
+        "y": 3
+      },
+      "id": 82,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let minDuration = iif(isempty(\"$min_duration\"), \"0\", \"$min_duration\");\nlet maxDuration = iif(isempty(\"$max_duration\"), \"0\", \"$max_duration\");\n\nset truncationmaxrecords=10000;set truncationmaxsize=67108864;set truncationmaxrecords=10000;set truncationmaxsize=67108864;\r\ndependencies\r\n| where $__timeFilter(timestamp)\r\n| where client_Type != \"Browser\"\r\n| where duration >= todouble(minDuration) and duration <= todouble(maxDuration)\r\n| summarize Count=sum(itemCount), AVG_Duration=sum(duration * itemCount)/sum(itemCount), Duration_95th=percentile(duration,95) by type\r\n| sort by Count desc\r\n| take 3",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A"
+        }
+      ],
+      "title": "Top 3 Dependencies",
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "axisSoftMin": 0,
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 64,
+            "gradientMode": "opacity",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "users/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Users (Unique)"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "sessions/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Sessions (Unique)"
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "purple",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Max"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "semi-dark-orange",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "P95"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-yellow",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "MAX"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 13,
+        "x": 0,
+        "y": 8
+      },
+      "id": 80,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let minDuration = iif(isempty(\"$min_duration\"), \"0\", \"$min_duration\");\nlet maxDuration = iif(isempty(\"$max_duration\"), \"0\", \"$max_duration\");\n\ndependencies\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| extend type=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), target=tostring(split(target, \" | cid-v1\")[0])\n| extend [\"Dependency Name\"] = strcat(type, \": \", name, \" \", target)\n| where (\"All\" in ($dependency) or [\"Dependency Name\"] in ($dependency))\n| where duration >= todouble(minDuration) and duration <= todouble(maxDuration)\n// calculate average dependency duration for all dependencies\n| summarize AVG = avg(duration), P95 = percentiles(duration, 95), MAX = max(duration) by bin(timestamp, $__interval)\n| project timestamp, AVG = AVG/1000, P95 = P95/1000, MAX = MAX/1000\n| order by timestamp asc\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Server Dependencies Response Time (sec)",
+      "transformations": [],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "thresholds"
+          },
+          "custom": {
+            "fillOpacity": 46,
+            "gradientMode": "scheme",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1
+          },
+          "displayName": "Request Count",
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "dark-green",
+                "value": null
+              },
+              {
+                "color": "semi-dark-green",
+                "value": 80
+              },
+              {
+                "color": "green",
+                "value": 90
+              },
+              {
+                "color": "light-green",
+                "value": 100
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": [
+          {
+            "__systemRef": "hideSeriesFrom",
+            "matcher": {
+              "id": "byNames",
+              "options": {
+                "mode": "exclude",
+                "names": ["Request Count"],
+                "prefix": "All except:",
+                "readOnly": true
+              }
+            },
+            "properties": [
+              {
+                "id": "custom.hideFrom",
+                "value": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": true
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 11,
+        "x": 13,
+        "y": 8
+      },
+      "id": 81,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "bucketOffset": 0,
+        "legend": {
+          "calcs": [],
+          "displayMode": "table",
+          "placement": "bottom",
+          "showLegend": true
+        }
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let minDuration = iif(isempty(\"$min_duration\"), \"0\", \"$min_duration\");\nlet maxDuration = iif(isempty(\"$max_duration\"), \"0\", \"$max_duration\");\n\ndependencies\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| extend type=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), target=tostring(split(target, \" | cid-v1\")[0])\n| extend [\"Dependency Name\"] = strcat(type, \": \", name, \" \", target)\n| where (\"All\" in ($dependency) or [\"Dependency Name\"] in ($dependency))\n| where duration >= todouble(minDuration) and duration <= todouble(maxDuration)\n// calculate average request duration for all requests\n| extend ResponseTime = duration/1000\n| project timestamp, ResponseTime\n| order by timestamp asc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Distribution of Server Dependency Response Time (ms)",
+      "transformations": [],
+      "type": "histogram"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "axisSoftMin": 0,
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 62,
+            "gradientMode": "opacity",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "users/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Users (Unique)"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "sessions/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Sessions (Unique)"
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "purple",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Max"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-blue",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 13,
+        "x": 0,
+        "y": 18
+      },
+      "id": 84,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let minDuration = iif(isempty(\"$min_duration\"), \"0\", \"$min_duration\");\nlet maxDuration = iif(isempty(\"$max_duration\"), \"0\", \"$max_duration\");\n\ndependencies\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| extend type=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), target=tostring(split(target, \" | cid-v1\")[0])\n| extend [\"Dependency Name\"] = strcat(type, \": \", name, \" \", target)\n| where (\"All\" in ($dependency) or [\"Dependency Name\"] in ($dependency))\n| where duration >= todouble(minDuration) and duration <= todouble(maxDuration)\n// calculate average request duration for all requests\n| summarize Count = count() by bin(timestamp, $__interval)\n| order by timestamp asc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Server Requests (count)",
+      "transformations": [],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            }
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 11,
+        "x": 13,
+        "y": 18
+      },
+      "id": 85,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "calculate": true,
+        "calculation": {},
+        "cellGap": 2,
+        "cellValues": {},
+        "color": {
+          "exponent": 0.5,
+          "fill": "dark-orange",
+          "mode": "scheme",
+          "reverse": false,
+          "scale": "exponential",
+          "scheme": "Greens",
+          "steps": 128
+        },
+        "exemplars": {
+          "color": "rgba(255,0,255,0.7)"
+        },
+        "filterValues": {
+          "le": 1e-9
+        },
+        "legend": {
+          "show": true,
+          "showLegend": true
+        },
+        "rowsFrame": {
+          "layout": "auto"
+        },
+        "showValue": "never",
+        "tooltip": {
+          "show": true,
+          "yHistogram": false
+        },
+        "yAxis": {
+          "axisPlacement": "left",
+          "reverse": false,
+          "unit": "short"
+        }
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let minDuration = iif(isempty(\"$min_duration\"), \"0\", \"$min_duration\");\nlet maxDuration = iif(isempty(\"$max_duration\"), \"0\", \"$max_duration\");\n\ndependencies\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| extend type=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), target=tostring(split(target, \" | cid-v1\")[0])\n| extend [\"Dependency Name\"] = strcat(type, \": \", name, \" \", target)\n| where (\"All\" in ($dependency) or [\"Dependency Name\"] in ($dependency))\n| where duration >= todouble(minDuration) and duration <= todouble(maxDuration)\n// calculate average request duration for all requests\n| extend ResponseTime = duration/1000\n| project timestamp, ResponseTime\n| order by timestamp asc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Count of Requests by Server Response Time (sec)",
+      "transformations": [],
+      "type": "heatmap"
+    },
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 2,
+        "w": 24,
+        "x": 0,
+        "y": 27
+      },
+      "id": 92,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Click on a bar on the chart below to set the minimum and maximum duration. To reset the zoom, change the Minimum Duration and Maximum duration variables.",
+        "mode": "markdown"
+      },
+      "pluginVersion": "10.0.3",
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "Click on a bar on the chart below to set the minimum and maximum duration. To reset the zoom, change the Minimum Duration and Maximum duration variables.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": true,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "fillOpacity": 80,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "min": 0
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Count"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "title": "Set Minimum Duration (Current: $min_duration}",
+                    "url": "/d/Azure-AppInsights-Perf-Dependencies/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&${dependency:queryparam}&${max_duration:queryparam}&var-min_duration=${__data.fields[\"Duration (ms)\"]}"
+                  },
+                  {
+                    "title": "Set Maximum Duration (Current: $max_duration)",
+                    "url": "/d/Azure-AppInsights-Perf-Dependencies/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&${dependency:queryparam}&${min_duration:queryparam}&var-max_duration=${__data.fields[\"Duration (ms)\"]}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Duration (ms)"
+            },
+            "properties": [
+              {
+                "id": "links"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 24,
+        "x": 0,
+        "y": 29
+      },
+      "id": 91,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "barRadius": 0,
+        "barWidth": 0.97,
+        "fullHighlight": true,
+        "groupWidth": 0.7,
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "orientation": "auto",
+        "showValue": "never",
+        "stacking": "none",
+        "tooltip": {
+          "mode": "multi",
+          "sort": "none"
+        },
+        "xField": "Duration (ms)",
+        "xTickLabelRotation": 0,
+        "xTickLabelSpacing": 100
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let minDuration = iif(isempty(\"$min_duration\"), \"0\", \"$min_duration\");\nlet maxDuration = iif(isempty(\"$max_duration\"), \"0\", \"$max_duration\");\n\n// distribution of dependencies by logarithmic duration buckets\nlet numberOfBuckets = 100;\n// filter to a subset of dependencies\n\nlet dataset = dependencies\n| where client_Type != \"Browser\"\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| extend type=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), target=tostring(split(target, \" | cid-v1\")[0])\n| extend [\"Dependency Name\"] = strcat(type, \": \", name, \" \", target)\n| where (\"All\" in ($dependency) or [\"Dependency Name\"] in ($dependency))\n| where duration >= todouble(minDuration) and duration <= todouble(maxDuration)\n| extend value=duration\n| project itemCount, value;\n// calculate the maximum duration for all dependencies\nlet maxValue=toscalar(dataset | summarize max(value));\n// calculate the logarithmic base that determines the start of each bucket\n// use the max duration to ensure the scale spans all possible durations in the data set\nlet bucketBase = pow(maxValue, 1/todouble(numberOfBuckets));\n// define a table with an index for each bucket to allow for buckets with 0 dependencies\nlet bucketSlots=range bucketSlot from 0 to numberOfBuckets - 1 step 1;\n// map dependency counts to the correct bucket and apply to the scale by joining with the complete set of buckets\nbucketSlots | join kind=leftouter (dataset\n// any durations under 1ms are rounded up to 1 ms\n// calls with durations under 1ms can be viewed in more detail using the linear scale\n| extend adjustedValue = iff(value<1, 1.0, value)\n// calculate the bucket slot for each dependency by applying logarithmic scale\n| extend bucketSlotRaw = tolong(bin(log(adjustedValue)/log(bucketBase), 1))\n// calculate the dependency count by duration bucket (rounded to whole number)\n| summarize count_=sum(itemCount) by bucketSlot=iff(bucketSlotRaw > numberOfBuckets - 1, numberOfBuckets - 1, bucketSlotRaw)) on bucketSlot\n| order by bucketSlot asc\n// calculate the real duration value for each bucket based on both the index and the bucket base (rounded to whole number)\n| project\n    [\"Duration (ms)\"]=floor(pow(bucketBase, bucketSlot), 1),\n    counts=iff(isnull(count_), 0, count_)\n| summarize Count=sum(counts) by [\"Duration (ms)\"]\n| where ['Duration (ms)'] >= todouble(minDuration)\n| order by [\"Duration (ms)\"] asc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Dependency count by Duration (ms)",
+      "transformations": [],
+      "type": "barchart"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "fixed"
+          },
+          "links": [
+            {
+              "title": "",
+              "url": "/d/Azure-AppInsights-Perf-Dependencies/?orgId=1&${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&${__value.time}&${dependency:queryparam}"
+            }
+          ],
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 8,
+        "x": 0,
+        "y": 39
+      },
+      "id": 86,
+      "interval": "60s",
+      "links": [
+        {
+          "title": "Reset dependency to 'All'",
+          "url": "/d/Azure-AppInsights-Perf-Dependencies/?${__all_variables}"
+        }
+      ],
+      "maxDataPoints": 150,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let minDuration = iif(isempty(\"$min_duration\"), \"0\", \"$min_duration\");\nlet maxDuration = iif(isempty(\"$max_duration\"), \"0\", \"$max_duration\");\n\ndependencies\n| where $__timeFilter(timestamp)\n// additional filters can be applied here\n| extend type=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), target=tostring(split(target, \" | cid-v1\")[0])\n| extend [\"Dependency Name\"] = strcat(type, \": \", name, \" \", target)\n| where (\"All\" in ($dependency) or [\"Dependency Name\"] in ($dependency))\n| where duration >= todouble(minDuration) and duration <= todouble(maxDuration)\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| count\n\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "$dependency Dependencies (count)",
+      "transformations": [],
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "dark-red",
+            "mode": "fixed"
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "dark-red"
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Count"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Open on failures dashboard",
+                    "url": "/d/Azure-AppInsights-Failures-Dependencies/?${__all_variables}"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 8,
+        "x": 8,
+        "y": 39
+      },
+      "id": 87,
+      "interval": "60s",
+      "links": [
+        {
+          "targetBlank": true,
+          "title": "Open on failures dashboard",
+          "url": "/d/Azure-AppInsights-Failures-Dependencies/?${__all_variables}"
+        }
+      ],
+      "maxDataPoints": 150,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let minDuration = iif(isempty(\"$min_duration\"), \"0\", \"$min_duration\");\nlet maxDuration = iif(isempty(\"$max_duration\"), \"0\", \"$max_duration\");\n\ndependencies\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| extend type=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), target=tostring(split(target, \" | cid-v1\")[0])\n| extend [\"Dependency Name\"] = strcat(type, \": \", name, \" \", target)\n| where (\"All\" in ($dependency) or [\"Dependency Name\"] in ($dependency))\n| where duration >= todouble(minDuration) and duration <= todouble(maxDuration)\n| where success == false\n| count\n\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Number of failed dependencies matching $dependency",
+      "transformations": [],
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "Click on a dependency name to filter dashboard.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "links": [
+            {
+              "targetBlank": true,
+              "title": "Show list of sample transactions",
+              "url": "/explore?left={\"datasource\":\"${ds:raw}\",\"queries\":[{\"refId\":\"A\",\"datasource\":\"${ds:raw}\",\"queryType\":\"Azure Traces\",\"azureTraces\":{\"resultFormat\":\"table\",\"resources\":[\"/subscriptions/${sub}/resourceGroups/${rg}/providers/${ns}/${res}\"],\"filters\":[{\"property\":\"type\",\"filters\":[\"${__data.fields.type}\"],\"operation\":\"eq\"}, {\"property\":\"target\",\"filters\":[\"${__data.fields.target}\"],\"operation\":\"eq\"}, {\"property\":\"name\",\"filters\":[\"${__data.fields.name}\"],\"operation\":\"eq\"}],\"traceTypes\": [\"dependencies\"]}}],\"range\":{\"from\": \"${__from}\", \"to\":\"${__to}\" }}"
+            }
+          ],
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "#EAB839",
+                "value": 0.5
+              },
+              {
+                "color": "dark-red",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Avg"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "basic",
+                  "type": "gauge"
+                }
+              },
+              {
+                "id": "custom.width",
+                "value": 164
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Dependency name"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 161
+              },
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "title": "Show list of matching dependencies",
+                    "url": "d/Azure-AppInsights-Perf-Dependencies/?orgId=1&${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&${__value.time}&${min_duration:queryparam}&${max_duration:queryparam}&var-dependency=${__data.fields[\"Dependency name\"]}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Count"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": false
+              },
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "basic",
+                  "type": "gauge",
+                  "valueDisplayMode": "text"
+                }
+              },
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Open dependencies in explorer",
+                    "url": "/explore?left={\"datasource\":\"${ds:raw}\",\"queries\":[{\"refId\":\"A\",\"datasource\":\"${ds:raw}\",\"queryType\":\"Azure Traces\",\"azureTraces\":{\"resultFormat\":\"table\",\"resources\":[\"/subscriptions/${sub}/resourceGroups/${rg}/providers/${ns}/${res}\"],\"filters\":[{\"property\":\"type\",\"filters\":[\"${__data.fields.type}\"],\"operation\":\"eq\"}, {\"property\":\"name\",\"filters\":[\"${__data.fields.name}\"],\"operation\":\"eq\"}, {\"property\":\"target\",\"filters\":[\"${__data.fields.target}\"],\"operation\":\"eq\"}],\"traceTypes\": [\"dependencies\"]}}],\"range\":{\"from\": \"${__from}\", \"to\":\"${__to}\" }}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "type"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "target"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "name"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              },
+              {
+                "id": "filterable",
+                "value": true
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 8,
+        "x": 0,
+        "y": 42
+      },
+      "id": 88,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": [
+          {
+            "desc": true,
+            "displayName": "Count"
+          }
+        ]
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "set truncationmaxrecords=10000;set truncationmaxsize=67108864; \nlet m = dependencies\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"  \n| project itemCount, duration, typeTransform=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), targetTransform=tostring(split(target, \" | cid-v1\")[0]), name, type, target;\nm\n| summarize Count=sum(itemCount), Avg=sum(itemCount * duration) / sum(itemCount)\n| project [\"Dependency name\"]=\"All\", Avg, Count\n| union(\nm\n| summarize Count=sum(itemCount), Avg=sum(itemCount * duration) / sum(itemCount) by typeTransform=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), targetTransform=tostring(split(target, \" | cid-v1\")[0]), name, target, type\n| sort by Avg desc\n| project [\"Dependency name\"]=strcat(typeTransform, \": \", name , \" \", targetTransform), Avg, Count, type, target, name)\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Top Dependencies by Avg Duration",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "Click on the OperationID or dependency name to open the trace details in explorer",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "orange",
+                "value": 0.5
+              },
+              {
+                "color": "dark-red",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ResponseTime"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "basic",
+                  "type": "gauge"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-blue",
+                  "mode": "fixed"
+                }
+              },
+              {
+                "id": "links"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Dependency Name"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 300
+              },
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Open dependencies in explorer",
+                    "url": "/explore?left={\"datasource\":\"${ds:raw}\",\"queries\":[{\"refId\":\"A\",\"datasource\":\"${ds:raw}\",\"queryType\":\"Azure Traces\",\"azureTraces\":{\"resultFormat\":\"table\",\"resources\":[\"/subscriptions/${sub}/resourceGroups/${rg}/providers/${ns}/${res}\"],\"filters\":[{\"property\":\"type\",\"filters\":[\"${__data.fields.type}\"],\"operation\":\"eq\"}, {\"property\":\"name\",\"filters\":[\"${__data.fields.name}\"],\"operation\":\"eq\"}, {\"property\":\"target\",\"filters\":[\"${__data.fields.target}\"],\"operation\":\"eq\"}],\"traceTypes\": [\"dependencies\"]}}],\"range\":{\"from\": \"${__from}\", \"to\":\"${__to}\" }}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ResponseCode"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 211
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ResponseCode"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ResponseCode"
+            },
+            "properties": [
+              {
+                "id": "mappings",
+                "value": [
+                  {
+                    "options": {
+                      "200": {
+                        "color": "dark-green",
+                        "index": 0
+                      }
+                    },
+                    "type": "value"
+                  },
+                  {
+                    "options": {
+                      "from": 201,
+                      "result": {
+                        "color": "dark-orange",
+                        "index": 1
+                      },
+                      "to": 399
+                    },
+                    "type": "range"
+                  },
+                  {
+                    "options": {
+                      "from": 400,
+                      "result": {
+                        "color": "dark-red",
+                        "index": 2
+                      },
+                      "to": 999
+                    },
+                    "type": "range"
+                  }
+                ]
+              },
+              {
+                "id": "links"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "OperationID"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Open Trace Details",
+                    "url": "/explore?left={\r\n\t\"datasource\": \"${ds}\",\r\n\t\"queries\": [{\r\n\t\t\"azureTraces\": {\r\n\r\n\t\t\t\"operationId\": \"${__data.fields.OperationID}\",\r\n\r\n\t\t\t\"resources\": [\"/subscriptions/${sub}/resourceGroups/${rg}/providers/${ns}/${res}\"],\r\r\n\r\n\t\t\t\"resultFormat\": \"trace\"\r\n\r\n\r\n\r\n\r\n\t\t},\r\n\t\t\"datasource\": \"${ds}\",\r\n\t\t\"refId\": \"A\",\r\n\r\n\t\t\"queryType\": \"Azure Traces\"\r\n\t}],\r\n\t\"range\": {\r\n\t\t\"from\": \"${__from}\",\r\n\t\t\"to\": \"${__to}\"\r\n\t}\r\n}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "target"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 251
+              },
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "type"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "name"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Score"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 16,
+        "x": 8,
+        "y": 42
+      },
+      "id": 89,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": []
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let minDuration = iif(isempty(\"$min_duration\"), \"0\", \"$min_duration\");\nlet maxDuration = iif(isempty(\"$max_duration\"), \"0\", \"$max_duration\");\n\nlet min_length_8 = (s: string) {\n    let len = strlen(s);\n    case(len == 1, strcat(s, s, s, s, s, s, s, s),\n        len == 2 or len == 3, strcat(s, s, s, s),\n        len == 4 or len == 5 or len == 6 or len == 7, strcat(s, s),\n        s)\n};\nlet ai_hash = (s: string) {\n    abs(toint(__hash_djb2(min_length_8(s))))\n};\n\ndependencies\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| extend typeTransform=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), targetTransform=tostring(split(target, \" | cid-v1\")[0])\n| extend [\"Dependency Name\"] = strcat(typeTransform, \": \", name, \" \", targetTransform)\n| where (\"All\" in ($dependency) or [\"Dependency Name\"] in ($dependency))\n| where duration >= todouble(minDuration) and duration <= todouble(maxDuration)\n//| where returncode in ($return_code)\n| project [\"Dependency Name\"], target, ResponseCode = resultCode, ResponseTime = duration, OperationID = operation_Id, Score=ai_hash(operation_Id), type, name\n| top 20 by Score asc\n\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Top 20 Dependencies matching $dependency by Relevance",
+      "transformations": [],
+      "type": "table"
+    }
+  ],
+  "refresh": "",
+  "revision": 1,
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": ["Azure-AppInsights-Perf"],
+  "templating": {
+    "list": [
+      {
+        "current": {},
+        "hide": 0,
+        "includeAll": false,
+        "label": "Datasource",
+        "multi": false,
+        "name": "ds",
+        "options": [],
+        "query": "grafana-azure-monitor-datasource",
+        "queryValue": "",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Subscription",
+        "multi": false,
+        "name": "sub",
+        "options": [],
+        "query": {
+          "grafanaTemplateVariableFn": {
+            "kind": "SubscriptionsQuery",
+            "rawQuery": "Subscriptions()"
+          },
+          "queryType": "Azure Subscriptions",
+          "refId": "A"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Resource Group",
+        "multi": false,
+        "name": "rg",
+        "options": [],
+        "query": {
+          "grafanaTemplateVariableFn": {
+            "kind": "ResourceGroupsQuery",
+            "rawQuery": "ResourceGroups($sub)",
+            "subscription": "$sub"
+          },
+          "queryType": "Azure Resource Groups",
+          "refId": "A",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 2,
+        "includeAll": false,
+        "label": "Namespace",
+        "multi": false,
+        "name": "ns",
+        "options": [],
+        "query": {
+          "grafanaTemplateVariableFn": {
+            "kind": "MetricNamespaceQuery",
+            "rawQuery": "Namespaces($sub, $rg)",
+            "resourceGroup": "$rg",
+            "subscription": "$sub"
+          },
+          "queryType": "Azure Namespaces",
+          "refId": "A",
+          "resourceGroup": "$rg",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "([mM](icrosoft)\\.[iI](nsights)/(components))",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "ResourceNames($sub, $rg, $ns)",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Resource",
+        "multi": false,
+        "name": "res",
+        "options": [],
+        "query": "ResourceNames($sub, $rg, $ns)",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "allValue": "\"All\"",
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": true,
+        "label": "Dependency",
+        "multi": true,
+        "name": "dependency",
+        "options": [],
+        "query": {
+          "azureLogAnalytics": {
+            "query": "dependencies\r\n| where $__timeFilter(timestamp)\r\n| where client_Type != \"Browser\"\r\n| extend type=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), target=tostring(split(target, \" | cid-v1\")[0])\r\n| project [\"Dependency Name\"] = strcat(type, \": \", name, \" \", target)\r\n| summarize count() by [\"Dependency Name\"]\r\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"]
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Minimum Duration (ms)",
+        "multi": false,
+        "name": "min_duration",
+        "options": [],
+        "query": {
+          "azureLogAnalytics": {
+            "query": "dependencies\r\n| where $__timeFilter(timestamp)\r\n| where client_Type != \"Browser\"\r\n| extend type=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), target=tostring(split(target, \" | cid-v1\")[0])\r\n| project [\"Dependency Name\"] = strcat(type, \": \", name, \" \", target), duration\r\n| where (\"All\" in ($dependency) or [\"Dependency Name\"] in ($dependency))\r\n| top 1 by duration asc\r\n| project tostring(duration)",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"]
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Maximum Duration (ms)",
+        "multi": false,
+        "name": "max_duration",
+        "options": [],
+        "query": {
+          "azureLogAnalytics": {
+            "query": "dependencies\r\n| where $__timeFilter(timestamp)\r\n| where client_Type != \"Browser\"\r\n| extend type=iff(tolower(type) == \"http (tracked component)\", \"HTTP\", type), target=tostring(split(target, \" | cid-v1\")[0])\r\n| project [\"Dependency Name\"] = strcat(type, \": \", name, \" \", target), duration\r\n| where (\"All\" in ($dependency) or [\"Dependency Name\"] in ($dependency))\r\n| top 1 by duration desc\r\n| project tostring(duration)",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"]
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-30m",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Azure / Insights / Applications - Performance - 2. Dependencies",
+  "uid": "Azure-AppInsights-Perf-Dependencies",
+  "version": 50
+}
diff --git a/public/app/plugins/datasource/azuremonitor/dashboards/appInsightsPerfOperations.json b/public/app/plugins/datasource/azuremonitor/dashboards/appInsightsPerfOperations.json
new file mode 100644
index 0000000000000..971dfcdec375a
--- /dev/null
+++ b/public/app/plugins/datasource/azuremonitor/dashboards/appInsightsPerfOperations.json
@@ -0,0 +1,1654 @@
+{
+  "__inputs": [],
+  "__elements": {},
+  "__requires": [
+    {
+      "type": "panel",
+      "id": "barchart",
+      "name": "Bar chart",
+      "version": ""
+    },
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "10.0.3"
+    },
+    {
+      "type": "datasource",
+      "id": "grafana-azure-monitor-datasource",
+      "name": "Azure Monitor",
+      "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "heatmap",
+      "name": "Heatmap",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "histogram",
+      "name": "Histogram",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "stat",
+      "name": "Stat",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "table",
+      "name": "Table",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "timeseries",
+      "name": "Time series",
+      "version": ""
+    }
+  ],
+  "description": "The dashboard provides insights of request performance of Azure Apps through Application Insights.",
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": null,
+  "links": [
+    {
+      "asDropdown": true,
+      "icon": "external link",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": ["Azure-AppInsights-Perf"],
+      "targetBlank": true,
+      "title": "Azure Application Insights Performance Dashboards",
+      "tooltip": "",
+      "type": "dashboards",
+      "url": ""
+    }
+  ],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 2,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 68,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "# Performance - Operations",
+        "mode": "markdown"
+      },
+      "pluginVersion": "10.0.3",
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 2
+      },
+      "id": 57,
+      "panels": [],
+      "title": "Application Insights - Performance - Operations",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "axisSoftMin": 0,
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 64,
+            "gradientMode": "opacity",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "users/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Users (Unique)"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "sessions/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Sessions (Unique)"
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "purple",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Max"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "semi-dark-orange",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "P95"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-yellow",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "MAX"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 13,
+        "x": 0,
+        "y": 3
+      },
+      "id": 55,
+      "interval": "60s",
+      "links": [
+        {
+          "targetBlank": true,
+          "title": "${res} | Users",
+          "url": "https://ms.portal.azure.com/#@microsoft.onmicrosoft.com/resource/subscriptions/${sub}/resourceGroups/${rg}/providers/microsoft.insights/components/${res}/segmentationUsers"
+        }
+      ],
+      "maxDataPoints": 150,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let minDuration = iif(isempty(\"$min_duration\"), \"0\", \"$min_duration\");\nlet maxDuration = iif(isempty(\"$max_duration\"), \"0\", \"$max_duration\");\n\nrequests// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| where (\"All\" in ($operation_name) or operation_Name in ($operation_name))\n| where duration >= todouble(minDuration) and duration <= todouble(maxDuration)\n// calculate average request duration for all requests\n| summarize AVG = avg(duration), P95 = percentiles(duration, 95), MAX = max(duration) by bin(timestamp, $__interval)\n| project timestamp, AVG = AVG/1000, P95 = P95/1000, MAX = MAX/1000\n| order by timestamp asc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Server Response Time (sec)",
+      "transformations": [],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "thresholds"
+          },
+          "custom": {
+            "fillOpacity": 46,
+            "gradientMode": "scheme",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1
+          },
+          "displayName": "Request Count",
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "dark-green",
+                "value": null
+              },
+              {
+                "color": "semi-dark-green",
+                "value": 80
+              },
+              {
+                "color": "green",
+                "value": 90
+              },
+              {
+                "color": "light-green",
+                "value": 100
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": [
+          {
+            "__systemRef": "hideSeriesFrom",
+            "matcher": {
+              "id": "byNames",
+              "options": {
+                "mode": "exclude",
+                "names": ["Request Count"],
+                "prefix": "All except:",
+                "readOnly": true
+              }
+            },
+            "properties": [
+              {
+                "id": "custom.hideFrom",
+                "value": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": true
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 11,
+        "x": 13,
+        "y": 3
+      },
+      "id": 61,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "bucketOffset": 0,
+        "legend": {
+          "calcs": [],
+          "displayMode": "table",
+          "placement": "bottom",
+          "showLegend": true
+        }
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let minDuration = iif(isempty(\"$min_duration\"), \"0\", \"$min_duration\");\nlet maxDuration = iif(isempty(\"$max_duration\"), \"0\", \"$max_duration\");\n\nrequests\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| where (\"All\" in ($operation_name) or operation_Name in ($operation_name))\n| where duration >= todouble(minDuration) and duration <= todouble(maxDuration)\n// calculate average request duration for all requests\n| extend ResponseTime = duration/1000\n| project timestamp, ResponseTime\n| order by timestamp asc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Distribution of Server Response Time (ms)",
+      "transformations": [],
+      "type": "histogram"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "axisSoftMin": 0,
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 62,
+            "gradientMode": "opacity",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "users/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Users (Unique)"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "sessions/count_unique"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Sessions (Unique)"
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "purple",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Max"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-blue",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 13,
+        "x": 0,
+        "y": 13
+      },
+      "id": 58,
+      "interval": "60s",
+      "links": [
+        {
+          "targetBlank": true,
+          "title": "${res} | Users",
+          "url": "https://ms.portal.azure.com/#@microsoft.onmicrosoft.com/resource/subscriptions/${sub}/resourceGroups/${rg}/providers/microsoft.insights/components/${res}/segmentationUsers"
+        }
+      ],
+      "maxDataPoints": 150,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let minDuration = iif(isempty(\"$min_duration\"), \"0\", \"$min_duration\");\nlet maxDuration = iif(isempty(\"$max_duration\"), \"0\", \"$max_duration\");\n\nrequests\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| where (\"All\" in ($operation_name) or operation_Name in ($operation_name))\n| where duration >= todouble(minDuration) and duration <= todouble(maxDuration)\n// calculate average request duration for all requests\n| summarize Count = count() by bin(timestamp, $__interval)\n| order by timestamp asc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Server Requests (count)",
+      "transformations": [],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            }
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 11,
+        "x": 13,
+        "y": 13
+      },
+      "id": 62,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "calculate": true,
+        "calculation": {},
+        "cellGap": 2,
+        "cellValues": {},
+        "color": {
+          "exponent": 0.5,
+          "fill": "dark-orange",
+          "mode": "scheme",
+          "reverse": false,
+          "scale": "exponential",
+          "scheme": "Greens",
+          "steps": 128
+        },
+        "exemplars": {
+          "color": "rgba(255,0,255,0.7)"
+        },
+        "filterValues": {
+          "le": 1e-9
+        },
+        "legend": {
+          "show": true,
+          "showLegend": true
+        },
+        "rowsFrame": {
+          "layout": "auto"
+        },
+        "showValue": "never",
+        "tooltip": {
+          "show": true,
+          "yHistogram": false
+        },
+        "yAxis": {
+          "axisPlacement": "left",
+          "reverse": false,
+          "unit": "short"
+        }
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let minDuration = iif(isempty(\"$min_duration\"), \"0\", \"$min_duration\");\nlet maxDuration = iif(isempty(\"$max_duration\"), \"0\", \"$max_duration\");\n\nrequests\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| where (\"All\" in ($operation_name) or operation_Name in ($operation_name))\n| where duration >= todouble(minDuration) and duration <= todouble(maxDuration)\n// calculate average request duration for all requests\n| extend ResponseTime = duration/1000\n| project timestamp, ResponseTime\n| order by timestamp asc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Count of Requests by Server Response Time (sec)",
+      "transformations": [],
+      "type": "heatmap"
+    },
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "grafana"
+      },
+      "gridPos": {
+        "h": 2,
+        "w": 24,
+        "x": 0,
+        "y": 22
+      },
+      "id": 69,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "Click on a bar on the chart below to set the minimum and maximum duration. To reset the zoom, change the Minimum Duration and Maximum duration variables.",
+        "mode": "markdown"
+      },
+      "pluginVersion": "10.0.3",
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "Click on a bar on the chart below to set the minimum and maximum duration. To reset the zoom, change the Minimum Duration and Maximum duration variables.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "thresholds"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "fillOpacity": 80,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "dark-green",
+                "value": null
+              },
+              {
+                "color": "semi-dark-green",
+                "value": 80
+              },
+              {
+                "color": "green",
+                "value": 90
+              },
+              {
+                "color": "light-green",
+                "value": 100
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Duration (ms)"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "title": "Set Min Duration (Current: $min_duration)",
+                    "url": "/d/Azure-AppInsights-Perf-Operations/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&${operation_name:queryparam}&${max_duration:queryparam}&var-min_duration=${__data.fields[\"Duration (ms)\"]}"
+                  },
+                  {
+                    "title": "Set Max Duration (Current: $max_duration)",
+                    "url": "/d/Azure-AppInsights-Perf-Operations/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&${operation_name:queryparam}&${min_duration:queryparam}&var-max_duration=${__data.fields[\"Duration (ms)\"]}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Count"
+            },
+            "properties": [
+              {
+                "id": "links"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 24,
+        "x": 0,
+        "y": 24
+      },
+      "id": 67,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "barRadius": 0,
+        "barWidth": 0.97,
+        "fullHighlight": true,
+        "groupWidth": 0.7,
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "orientation": "auto",
+        "showValue": "never",
+        "stacking": "none",
+        "tooltip": {
+          "mode": "multi",
+          "sort": "none"
+        },
+        "xField": "Duration (ms)",
+        "xTickLabelRotation": 0,
+        "xTickLabelSpacing": 100
+      },
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let minDuration = iif(isempty(\"$min_duration\"), \"0\", \"$min_duration\");\nlet maxDuration = iif(isempty(\"$max_duration\"), \"0\", \"$max_duration\");\n\n// distribution of requests by logarithmic duration buckets\nlet timeGrain=5m;\nlet numberOfBuckets = 100;\n// filter to a subset of requests\n\nlet dataset = requests\n    | where $__timeFilter(timestamp)\n    | where client_Type != \"Browser\"\n    // additional filters can be applied here\n    | where (\"All\" in ($operation_name) or operation_Name in ($operation_name))\n    | where duration >= todouble(minDuration) and duration <= todouble(maxDuration)\n    | extend value=duration\n    | project itemCount, value;\n// calculate the maximum duration for all requests\nlet maxValue=toscalar(dataset\n    | summarize max(value));\n// calculate the logarithmic base that determines the start of each bucket\n// use the max duration to ensure the scale spans all possible durations in the data set\nlet bucketBase = pow(maxValue, 1 / todouble(numberOfBuckets));\n// define a table with an index for each bucket to allow for buckets with 0 requests\nlet bucketSlots=range bucketSlot from 0 to numberOfBuckets - 1 step 1;\n// map request counts to the correct bucket and apply to the scale by joining with the complete set of buckets\nbucketSlots\n| join kind=leftouter (dataset\n    // any durations under 1ms are rounded up to 1 ms\n    // calls with durations under 1ms can be viewed in more detail using the linear scale\n    | extend adjustedValue = iff(value < 1, 1.0, value)\n    // calculate the bucket slot for each request by applying logarithmic scale\n    | extend bucketSlotRaw = tolong(bin(log(adjustedValue) / log(bucketBase), 1))\n    // calculate the request count by duration bucket (rounded to whole number)\n    | summarize count_=sum(itemCount) by bucketSlot=iff(bucketSlotRaw > numberOfBuckets - 1, numberOfBuckets - 1, bucketSlotRaw))\n    on bucketSlot\n| order by bucketSlot asc\n// calculate the real duration value for each bucket based on both the index and the bucket base (rounded to whole number)\n| project\n    [\"Duration (ms)\"]=floor(pow(bucketBase, bucketSlot), 1),\n    counts=iff(isnull(count_), 0, count_)\n| where ['Duration (ms)'] >= $min_duration\n| summarize Count=sum(counts) by [\"Duration (ms)\"]\n| order by [\"Duration (ms)\"] asc\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "time_series"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Request Count by Duration (ms)",
+      "transformations": [],
+      "type": "barchart"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "fixed"
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 8,
+        "x": 0,
+        "y": 32
+      },
+      "id": 66,
+      "interval": "60s",
+      "links": [
+        {
+          "title": "Reset Operation names to 'All'",
+          "url": "/d/Azure-AppInsights-Perf-Operations/?${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&${min_duration:queryparam}&${max_duration:queryparam}&var-operation-name=All"
+        }
+      ],
+      "maxDataPoints": 150,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "requests\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n| count\n\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "All Operations (count)",
+      "transformations": [],
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "dark-red",
+            "mode": "fixed"
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "dark-red",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Count"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "title": "Open Failures Dashboard",
+                    "url": "/d/Azure-AppInsights-Failures-Operations/?${__all_variables}",
+                    "targetBlank": true
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 8,
+        "x": 8,
+        "y": 32
+      },
+      "id": 65,
+      "interval": "60s",
+      "links": [
+        {
+          "targetBlank": true,
+          "title": "Open Failures dashboard",
+          "url": "/d/Azure-AppInsights-Failures-Operations/?${__all_variables}"
+        }
+      ],
+      "maxDataPoints": 150,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["lastNotNull"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let minDuration = iif(isempty(\"$min_duration\"), \"0\", \"$min_duration\");\nlet maxDuration = iif(isempty(\"$max_duration\"), \"0\", \"$max_duration\");\n\nrequests\n// additional filters can be applied here\n| where $__timeFilter(timestamp)\n| where (\"All\" in ($operation_name) or operation_Name in ($operation_name))\n| where duration >= todouble(minDuration) and duration <= todouble(maxDuration)\n| where success == false\n| count\n\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Number of failed operations matching $operation_name",
+      "transformations": [],
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "Click on an operation name to filter this dashboard.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "links": [
+            {
+              "targetBlank": true,
+              "title": "Show list of sample transactions",
+              "url": "/explore?left={\"datasource\":\"${ds:raw}\",\"queries\":[{\"refId\":\"A\",\"datasource\":\"${ds:raw}\",\"queryType\":\"Azure Traces\",\"azureTraces\":{\"resultFormat\":\"table\",\"resources\":[\"/subscriptions/${sub}/resourceGroups/${rg}/providers/Microsoft.Insights/components/${res}\"],\"filters\":[{\"property\":\"operation_Name\",\"filters\":[\"${__data.fields.operation_Name}\"],\"operation\":\"eq\"}],\"traceTypes\": [\"requests\"]}}],\"range\":{\"from\": \"${__from}\", \"to\":\"${__to}\" }}"
+            }
+          ],
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "#EAB839",
+                "value": 0.5
+              },
+              {
+                "color": "dark-red",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Avg"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "basic",
+                  "type": "gauge"
+                }
+              },
+              {
+                "id": "custom.width",
+                "value": 164
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Max"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "basic",
+                  "type": "gauge"
+                }
+              },
+              {
+                "id": "custom.width",
+                "value": 111
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "operation_Name"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 161
+              },
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": false,
+                    "title": "Filter dashboard to this operation",
+                    "url": "/d/Azure-AppInsights-Perf-Operations?orgId=1&${ds:queryparam}&${sub:queryparam}&${rg:queryparam}&${ns:queryparam}&${res:queryparam}&${min_duration:queryparam}&${max_duration:queryparam}&${__value.time}&var-operation_name=${__data.fields.operation_Name}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Count"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Show list of transactions matching operation name ",
+                    "url": "/explore?left={\"datasource\":\"${ds:raw}\",\"queries\":[{\"refId\":\"A\",\"datasource\":\"${ds:raw}\",\"queryType\":\"Azure Traces\",\"azureTraces\":{\"resultFormat\":\"table\",\"resources\":[\"/subscriptions/${sub}/resourceGroups/${rg}/providers/${ns}/${res}\"],\"filters\":[{\"property\":\"operation_Name\",\"filters\":[\"${__data.fields.operation_Name}\"],\"operation\":\"eq\"}],\"traceTypes\": [\"requests\"]}}],\"range\":{\"from\": \"${__from}\", \"to\":\"${__to}\" }}"
+                  }
+                ]
+              },
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "basic",
+                  "type": "gauge",
+                  "valueDisplayMode": "text"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 8,
+        "x": 0,
+        "y": 35
+      },
+      "id": 59,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": [
+          {
+            "desc": true,
+            "displayName": "Count"
+          }
+        ]
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "\nlet dataset = requests\n| where $__timeFilter(timestamp)\n| where client_Type != \"Browser\"\n;\ndataset\n| summarize  Avg = avg(duration)/1000, Max = max(duration)/1000, Count = count()\n| project operation_Name=\"All\", Avg, Max, Count\n| union(dataset\n| summarize  Avg = avg(duration)/1000, Max = max(duration)/1000, Count = count() by operation_Name\n| top 20 by Avg desc\n)\n\n",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Top 20 Operation Names by count",
+      "transformations": [],
+      "type": "table"
+    },
+    {
+      "datasource": {
+        "type": "grafana-azure-monitor-datasource",
+        "uid": "${ds}"
+      },
+      "description": "Click on the OperationID or Name to open the trace details in explore mode.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "noValue": "--",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "orange",
+                "value": 0.5
+              },
+              {
+                "color": "dark-red",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ResponseTime"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "mode": "basic",
+                  "type": "gauge"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "dark-blue",
+                  "mode": "fixed"
+                }
+              },
+              {
+                "id": "links"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Name"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 173
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ResponseCode"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 211
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "ResponseCode"
+            },
+            "properties": [
+              {
+                "id": "mappings",
+                "value": [
+                  {
+                    "options": {
+                      "200": {
+                        "color": "dark-green",
+                        "index": 0
+                      }
+                    },
+                    "type": "value"
+                  },
+                  {
+                    "options": {
+                      "from": 201,
+                      "result": {
+                        "color": "dark-orange",
+                        "index": 1
+                      },
+                      "to": 399
+                    },
+                    "type": "range"
+                  },
+                  {
+                    "options": {
+                      "from": 400,
+                      "result": {
+                        "color": "dark-red",
+                        "index": 2
+                      },
+                      "to": 999
+                    },
+                    "type": "range"
+                  }
+                ]
+              },
+              {
+                "id": "links"
+              },
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "OperationID"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Open Trace Details",
+                    "url": "/explore?left={\r\n\t\"datasource\": \"${ds}\",\r\n\t\"queries\": [{\r\n\t\t\"azureTraces\": {\r\n\r\n\t\t\t\"operationId\": \"${__data.fields.OperationID}\",\r\n\r\n\t\t\t\"resources\": [\"/subscriptions/${sub}/resourceGroups/${rg}/providers/Microsoft.Insights/components/${res}\"],\r\r\n\r\n\t\t\t\"resultFormat\": \"trace\"\r\n\r\n\r\n\r\n\r\n\t\t},\r\n\t\t\"datasource\": \"${ds}\",\r\n\t\t\"refId\": \"A\",\r\n\r\n\t\t\"queryType\": \"Azure Traces\"\r\n\t}],\r\n\t\"range\": {\r\n\t\t\"from\": \"${__from}\",\r\n\t\t\"to\": \"${__to}\"\r\n\t}\r\n}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Name"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "Open explorer with this name",
+                    "url": "/explore?left={\"datasource\":\"${ds:raw}\",\"queries\":[{\"refId\":\"A\",\"datasource\":\"${ds:raw}\",\"queryType\":\"Azure Traces\",\"azureTraces\":{\"resultFormat\":\"table\",\"resources\":[\"/subscriptions/${sub}/resourceGroups/${rg}/providers/${ns}/${res}\"],\"filters\":[{\"property\":\"operation_Name\",\"filters\":[\"${__data.fields.Name}\"],\"operation\":\"eq\"}],\"traceTypes\": [\"requests\"]}}],\"range\":{\"from\": \"${__from}\", \"to\":\"${__to}\" }}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Score"
+            },
+            "properties": [
+              {
+                "id": "custom.hidden",
+                "value": true
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 16,
+        "x": 8,
+        "y": 35
+      },
+      "id": 63,
+      "interval": "60s",
+      "links": [],
+      "maxDataPoints": 150,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": []
+      },
+      "pluginVersion": "10.0.3",
+      "targets": [
+        {
+          "azureLogAnalytics": {
+            "query": "let minDuration = iif(isempty(\"$min_duration\"), \"0\", \"$min_duration\");\nlet maxDuration = iif(isempty(\"$max_duration\"), \"0\", \"$max_duration\");\n\nlet min_length_8 = (s: string) {\n    let len = strlen(s);\n    case(len == 1, strcat(s, s, s, s, s, s, s, s),\n        len == 2 or len == 3, strcat(s, s, s, s),\n        len == 4 or len == 5 or len == 6 or len == 7, strcat(s, s),\n        s)\n};\nlet ai_hash = (s: string) {\n    abs(toint(__hash_djb2(min_length_8(s))))\n};\nrequests\n| where (\"All\" in ($operation_name) or operation_Name in ($operation_name))\n| where $__timeFilter(timestamp)\n| where duration >= todouble(minDuration) and duration <= todouble(maxDuration)\n| project Name = operation_Name, ResponseCode = resultCode, ResponseTime = duration, OperationID = operation_Id, Score=ai_hash(operation_Id)\n| top 20 by Score asc",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"],
+            "resultFormat": "table"
+          },
+          "datasource": {
+            "type": "grafana-azure-monitor-datasource",
+            "uid": "${ds}"
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub",
+          "subscriptions": []
+        }
+      ],
+      "title": "Top 20 Sample Operations matching $operation_name by Relevance",
+      "transformations": [],
+      "type": "table"
+    }
+  ],
+  "refresh": "",
+  "revision": 1,
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": ["Azure-AppInsights-Perf"],
+  "templating": {
+    "list": [
+      {
+        "current": {},
+        "hide": 0,
+        "includeAll": false,
+        "label": "Datasource",
+        "multi": false,
+        "name": "ds",
+        "options": [],
+        "query": "grafana-azure-monitor-datasource",
+        "queryValue": "",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Subscription",
+        "multi": false,
+        "name": "sub",
+        "options": [],
+        "query": {
+          "grafanaTemplateVariableFn": {
+            "kind": "SubscriptionsQuery",
+            "rawQuery": "Subscriptions()"
+          },
+          "queryType": "Azure Subscriptions",
+          "refId": "A"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Resource Group",
+        "multi": false,
+        "name": "rg",
+        "options": [],
+        "query": {
+          "grafanaTemplateVariableFn": {
+            "kind": "ResourceGroupsQuery",
+            "rawQuery": "ResourceGroups($sub)",
+            "subscription": "$sub"
+          },
+          "queryType": "Azure Resource Groups",
+          "refId": "A",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 2,
+        "includeAll": false,
+        "label": "Namespace",
+        "multi": false,
+        "name": "ns",
+        "options": [],
+        "query": {
+          "grafanaTemplateVariableFn": {
+            "kind": "MetricNamespaceQuery",
+            "rawQuery": "Namespaces($sub, $rg)",
+            "resourceGroup": "$rg",
+            "subscription": "$sub"
+          },
+          "queryType": "Azure Namespaces",
+          "refId": "A",
+          "resourceGroup": "$rg",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "([mM](icrosoft)\\.[iI](nsights)/(components))",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "ResourceNames($sub, $rg, $ns)",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Resource",
+        "multi": false,
+        "name": "res",
+        "options": [],
+        "query": "ResourceNames($sub, $rg, $ns)",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "allValue": "\"All\"",
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": true,
+        "label": "Operation names",
+        "multi": true,
+        "name": "operation_name",
+        "options": [],
+        "query": {
+          "azureLogAnalytics": {
+            "query": "requests\r\n| where $__timeFilter(timestamp)\r\n| where client_Type != \"Browser\"\r\n| summarize count() by operation_Name\r\n",
+            "resource": "/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"]
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "allValue": "\"All\"",
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Minimum Duration (ms)",
+        "multi": false,
+        "name": "min_duration",
+        "options": [],
+        "query": {
+          "azureLogAnalytics": {
+            "query": "requests\r\n| where $__timeFilter(timestamp)\r\n| where client_Type != \"Browser\"\r\n| where (\"All\" in ($operation_name) or operation_Name in ($operation_name))\r\n| top 1 by duration asc\r\n| project tostring(duration)\r\n",
+            "resource": "/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"]
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "allValue": "\"All\"",
+        "current": {},
+        "datasource": {
+          "type": "grafana-azure-monitor-datasource",
+          "uid": "${ds}"
+        },
+        "definition": "",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Maximum Duration (ms)",
+        "multi": false,
+        "name": "max_duration",
+        "options": [],
+        "query": {
+          "azureLogAnalytics": {
+            "query": "requests\r\n| where $__timeFilter(timestamp)\r\n| where client_Type != \"Browser\"\r\n| where (\"All\" in ($operation_name) or operation_Name in ($operation_name))\r\n| top 1 by duration\r\n| project tostring(duration)\r\n",
+            "resource": "/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res",
+            "resources": ["/subscriptions/$sub/resourceGroups/$rg/providers/$ns/$res"]
+          },
+          "queryType": "Azure Log Analytics",
+          "refId": "A",
+          "subscription": "$sub"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-30m",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Azure / Insights / Applications - Performance - 1. Operations",
+  "uid": "Azure-AppInsights-Perf-Operations",
+  "version": 68
+}
diff --git a/public/app/plugins/datasource/azuremonitor/plugin.json b/public/app/plugins/datasource/azuremonitor/plugin.json
index 4cc4a4b75053f..e9824fb547b2e 100644
--- a/public/app/plugins/datasource/azuremonitor/plugin.json
+++ b/public/app/plugins/datasource/azuremonitor/plugin.json
@@ -15,6 +15,31 @@
       "name": "Azure / Insights / Applications",
       "path": "dashboards/appInsights.json"
     },
+    {
+      "type": "dashboard",
+      "name": "Azure / Insights / Applications / Performance / Operations",
+      "path": "dashboards/appInsightsPerfOperations.json"
+    },
+    {
+      "type": "dashboard",
+      "name": "Azure / Insights / Applications / Performance / Dependencies",
+      "path": "dashboards/appInsightsPerfDependencies.json"
+    },
+    {
+      "type": "dashboard",
+      "name": "Azure / Insights / Applications / Failures / Operations",
+      "path": "dashboards/appInsightsFailureOperations.json"
+    },
+    {
+      "type": "dashboard",
+      "name": "Azure / Insights / Applications / Failures / Dependencies",
+      "path": "dashboards/appInsightsFailureDependencies.json"
+    },
+    {
+      "type": "dashboard",
+      "name": "Azure / Insights / Applications / Failures / Exceptions",
+      "path": "dashboards/appInsightsFailureExceptions.json"
+    },
     {
       "type": "dashboard",
       "name": "Azure / Insights / Applications Test Availability Geo Map",
diff --git a/public/app/plugins/datasource/azuremonitor/types/types.ts b/public/app/plugins/datasource/azuremonitor/types/types.ts
index 85cfca2caaaf2..b0372b757240c 100644
--- a/public/app/plugins/datasource/azuremonitor/types/types.ts
+++ b/public/app/plugins/datasource/azuremonitor/types/types.ts
@@ -420,3 +420,41 @@ interface MetricMetadataValue {
   name: AzureMonitorLocalizedValue;
   value: string;
 }
+
+export type Category = {
+  displayName: string;
+  id: string;
+  related: {
+    queries: string[];
+    tables: string[];
+  };
+};
+
+export type CheatsheetQuery = {
+  body: string;
+  description: string;
+  displayName: string;
+  id: string;
+  properties: {
+    ExampleQuery: boolean;
+    QueryAttributes: {
+      isMultiResource: boolean;
+    };
+  };
+  related: {
+    categories: string[];
+    resourceTypes: string[];
+    tables: string[];
+  };
+  tags: {
+    Topic: string[];
+  };
+};
+
+export type CheatsheetQueries = {
+  [key: string]: CheatsheetQuery[];
+};
+
+export type DropdownCategories = {
+  [key: string]: boolean;
+};
diff --git a/public/app/plugins/datasource/cloudwatch/language/logs/language.ts b/public/app/plugins/datasource/cloudwatch/language/logs/language.ts
index 4d4cec2875a87..c994d328e4239 100644
--- a/public/app/plugins/datasource/cloudwatch/language/logs/language.ts
+++ b/public/app/plugins/datasource/cloudwatch/language/logs/language.ts
@@ -10,12 +10,13 @@ interface CloudWatchLogsLanguage extends monacoType.languages.IMonarchLanguage {
 export const DISPLAY = 'display';
 export const FIELDS = 'fields';
 export const FILTER = 'filter';
+export const PATTERN = 'pattern';
 export const STATS = 'stats';
 export const SORT = 'sort';
 export const LIMIT = 'limit';
 export const PARSE = 'parse';
 export const DEDUP = 'dedup';
-export const LOGS_COMMANDS = [DISPLAY, FIELDS, FILTER, STATS, SORT, LIMIT, PARSE, DEDUP];
+export const LOGS_COMMANDS = [DISPLAY, FIELDS, FILTER, PATTERN, STATS, SORT, LIMIT, PARSE, DEDUP];
 
 export const LOGS_LOGIC_OPERATORS = ['and', 'or', 'not'];
 
diff --git a/public/app/plugins/datasource/elasticsearch/configuration/DataLink.tsx b/public/app/plugins/datasource/elasticsearch/configuration/DataLink.tsx
index dd4292cee11fd..37a0fab60b1b5 100644
--- a/public/app/plugins/datasource/elasticsearch/configuration/DataLink.tsx
+++ b/public/app/plugins/datasource/elasticsearch/configuration/DataLink.tsx
@@ -3,13 +3,20 @@ import React, { Dispatch, SetStateAction, useEffect, useState } from 'react';
 import { usePrevious } from 'react-use';
 
 import { DataSourceInstanceSettings, VariableSuggestion } from '@grafana/data';
-import { Button, LegacyForms, DataLinkInput, stylesFactory } from '@grafana/ui';
+import {
+  Button,
+  DataLinkInput,
+  stylesFactory,
+  InlineField,
+  InlineSwitch,
+  InlineFieldRow,
+  InlineLabel,
+  Input,
+} from '@grafana/ui';
 import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
 
 import { DataLinkConfig } from '../types';
 
-const { FormField, Switch } = LegacyForms;
-
 const getStyles = stylesFactory(() => ({
   firstRow: css`
     display: flex;
@@ -25,6 +32,7 @@ const getStyles = stylesFactory(() => ({
     align-items: baseline;
   `,
   urlField: css`
+    display: flex;
     flex: 1;
   `,
   urlDisplayLabelField: css`
@@ -53,18 +61,21 @@ export const DataLink = (props: Props) => {
 
   return (
     <div className={className}>
-      <div className={styles.firstRow + ' gf-form'}>
-        <FormField
-          className={styles.nameField}
-          labelWidth={6}
-          // A bit of a hack to prevent using default value for the width from FormField
-          inputWidth={null}
+      <div className={styles.firstRow}>
+        <InlineField
           label="Field"
-          type="text"
-          value={value.field}
+          htmlFor="elasticsearch-datasource-config-field"
+          labelWidth={12}
           tooltip={'Can be exact field name or a regex pattern that will match on the field name.'}
-          onChange={handleChange('field')}
-        />
+        >
+          <Input
+            type="text"
+            id="elasticsearch-datasource-config-field"
+            value={value.field}
+            onChange={handleChange('field')}
+            width={100}
+          />
+        </InlineField>
         <Button
           variant={'destructive'}
           title="Remove field"
@@ -75,52 +86,58 @@ export const DataLink = (props: Props) => {
           }}
         />
       </div>
-      <div className="gf-form">
-        <FormField
-          label={showInternalLink ? 'Query' : 'URL'}
-          labelWidth={6}
-          inputEl={
-            <DataLinkInput
-              placeholder={showInternalLink ? '${__value.raw}' : 'http://example.com/${__value.raw}'}
-              value={value.url || ''}
-              onChange={(newValue) =>
-                onChange({
-                  ...value,
-                  url: newValue,
-                })
-              }
-              suggestions={suggestions}
-            />
-          }
-          className={styles.urlField}
-        />
-        <FormField
-          className={styles.urlDisplayLabelField}
-          inputWidth={null}
-          labelWidth={7}
-          label="URL Label"
-          type="text"
-          value={value.urlDisplayLabel}
-          onChange={handleChange('urlDisplayLabel')}
-          tooltip={'Use to override the button label.'}
-        />
-      </div>
 
-      <div className={styles.row}>
-        <Switch
-          labelClass={'width-6'}
-          label="Internal link"
-          checked={showInternalLink}
-          onChange={() => {
-            if (showInternalLink) {
+      <InlineFieldRow>
+        <div className={styles.urlField}>
+          <InlineLabel htmlFor="elasticsearch-datasource-internal-link" width={12}>
+            {showInternalLink ? 'Query' : 'URL'}
+          </InlineLabel>
+          <DataLinkInput
+            placeholder={showInternalLink ? '${__value.raw}' : 'http://example.com/${__value.raw}'}
+            value={value.url || ''}
+            onChange={(newValue) =>
               onChange({
                 ...value,
-                datasourceUid: undefined,
-              });
+                url: newValue,
+              })
             }
-            setShowInternalLink(!showInternalLink);
-          }}
-        />
+            suggestions={suggestions}
+          />
+        </div>
+
+        <div className={styles.urlDisplayLabelField}>
+          <InlineField
+            label="URL Label"
+            htmlFor="elasticsearch-datasource-url-label"
+            labelWidth={14}
+            tooltip={'Use to override the button label.'}
+          >
+            <Input
+              type="text"
+              id="elasticsearch-datasource-url-label"
+              value={value.urlDisplayLabel}
+              onChange={handleChange('urlDisplayLabel')}
+            />
+          </InlineField>
+        </div>
+      </InlineFieldRow>
+
+      <div className={styles.row}>
+        <InlineField label="Internal link" labelWidth={12}>
+          <InlineSwitch
+            label="Internal link"
+            value={showInternalLink || false}
+            onChange={() => {
+              if (showInternalLink) {
+                onChange({
+                  ...value,
+                  datasourceUid: undefined,
+                });
+              }
+              setShowInternalLink(!showInternalLink);
+            }}
+          />
+        </InlineField>
 
         {showInternalLink && (
           <DataSourcePicker
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/.eslintignore b/public/app/plugins/datasource/grafana-testdata-datasource/.eslintignore
new file mode 100644
index 0000000000000..59ac0834c7a79
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/.eslintignore
@@ -0,0 +1,2 @@
+# TS generate from cue by cuetsy
+**/*.gen.ts
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/CHANGELOG.md b/public/app/plugins/datasource/grafana-testdata-datasource/CHANGELOG.md
new file mode 100644
index 0000000000000..825c32f0d03d9
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/CHANGELOG.md
@@ -0,0 +1 @@
+# Changelog
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/README.md b/public/app/plugins/datasource/grafana-testdata-datasource/README.md
new file mode 100644
index 0000000000000..fa12e4ebd5481
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/README.md
@@ -0,0 +1,3 @@
+# Grafana TestData data source
+
+This data source is used for testing and development of Grafana. Generates test data in different forms.
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/nodeGraphUtils.ts b/public/app/plugins/datasource/grafana-testdata-datasource/nodeGraphUtils.ts
index c0630dd1c4b19..cd74289ba7fed 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/nodeGraphUtils.ts
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/nodeGraphUtils.ts
@@ -139,6 +139,8 @@ export function generateRandomNodes(count = 10) {
     nodeFields.arc__errors.values.push(node.error);
     const rnd = Math.random();
     nodeFields[NodeGraphDataFrameFieldNames.icon].values.push(rnd > 0.9 ? 'database' : rnd < 0.1 ? 'cloud' : '');
+    nodeFields[NodeGraphDataFrameFieldNames.nodeRadius].values.push(rnd > 0.5 ? 30 : 40);
+
     for (const edge of node.edges) {
       const id = `${node.id}--${edge}`;
       // We can have duplicate edges when we added some more by random
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/package.json b/public/app/plugins/datasource/grafana-testdata-datasource/package.json
new file mode 100644
index 0000000000000..27d9cc34a1488
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/package.json
@@ -0,0 +1,42 @@
+{
+  "name": "@grafana-plugins/grafana-testdata-datasource",
+  "description": "Generates test data in different forms",
+  "private": true,
+  "version": "10.3.0-pre",
+  "dependencies": {
+    "@emotion/css": "11.11.2",
+    "@grafana/data": "10.3.0-pre",
+    "@grafana/experimental": "1.7.0",
+    "@grafana/runtime": "10.3.0-pre",
+    "@grafana/schema": "10.3.0-pre",
+    "@grafana/ui": "10.3.0-pre",
+    "lodash": "4.17.21",
+    "react": "18.2.0",
+    "react-use": "17.4.0",
+    "rxjs": "7.8.1",
+    "tslib": "2.6.0"
+  },
+  "devDependencies": {
+    "@grafana/e2e-selectors": "10.3.0-pre",
+    "@grafana/plugin-configs": "10.3.0-pre",
+    "@testing-library/react": "14.0.0",
+    "@testing-library/user-event": "14.5.1",
+    "@types/jest": "29.5.4",
+    "@types/lodash": "4.14.195",
+    "@types/node": "18.18.5",
+    "@types/react": "18.2.15",
+    "@types/testing-library__jest-dom": "5.14.8",
+    "swc-loader": "0.2.3",
+    "ts-node": "10.9.1",
+    "webpack": "5.88.1"
+  },
+  "peerDependencies": {
+    "@grafana/runtime": "*"
+  },
+  "scripts": {
+    "build": "webpack -c ./webpack.config.ts --env production",
+    "build:commit": "webpack -c ./webpack.config.ts --env production --env commit=$(git rev-parse --short HEAD)",
+    "dev": "webpack -w -c ./webpack.config.ts --env development"
+  },
+  "packageManager": "yarn@3.6.0"
+}
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/plugin.json b/public/app/plugins/datasource/grafana-testdata-datasource/plugin.json
index 2792259a77973..fb45906c18714 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/plugin.json
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/plugin.json
@@ -3,6 +3,7 @@
   "name": "TestData",
   "id": "grafana-testdata-datasource",
   "aliasIDs": ["testdata"],
+  "executable": "gpx_testdata",
 
   "metrics": true,
   "logs": true,
@@ -24,7 +25,8 @@
     "logos": {
       "small": "img/testdata.svg",
       "large": "img/testdata.svg"
-    }
+    },
+    "version": "%VERSION%"
   },
 
   "includes": [
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/tsconfig.json b/public/app/plugins/datasource/grafana-testdata-datasource/tsconfig.json
new file mode 100644
index 0000000000000..7daf2ee8abab6
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "@grafana/plugin-configs/tsconfig.json",
+  "include": ["."]
+}
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/webpack.config.ts b/public/app/plugins/datasource/grafana-testdata-datasource/webpack.config.ts
new file mode 100644
index 0000000000000..4da5a990cfa57
--- /dev/null
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/webpack.config.ts
@@ -0,0 +1,3 @@
+import config from '@grafana/plugin-configs/webpack.config';
+
+export default config;
diff --git a/public/app/plugins/datasource/graphite/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/graphite/configuration/ConfigEditor.tsx
index aef4ad9a92391..7cfb530ab0b5b 100644
--- a/public/app/plugins/datasource/graphite/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/graphite/configuration/ConfigEditor.tsx
@@ -6,7 +6,7 @@ import {
   onUpdateDatasourceJsonDataOptionSelect,
   onUpdateDatasourceJsonDataOptionChecked,
 } from '@grafana/data';
-import { Alert, DataSourceHttpSettings, InlineFormLabel, LegacyForms, Select } from '@grafana/ui';
+import { Alert, DataSourceHttpSettings, Field, FieldSet, Select, Switch } from '@grafana/ui';
 import { config } from 'app/core/config';
 import store from 'app/core/store';
 
@@ -16,7 +16,6 @@ import { DEFAULT_GRAPHITE_VERSION, GRAPHITE_VERSIONS } from '../versions';
 import { MappingsConfiguration } from './MappingsConfiguration';
 import { fromString, toString } from './parseLokiLabelMappings';
 
-const { Switch } = LegacyForms;
 export const SHOW_MAPPINGS_HELP_KEY = 'grafana.datasources.graphite.config.showMappingsHelp';
 
 const graphiteVersions = GRAPHITE_VERSIONS.map((version) => ({ label: `${version}.x`, value: version }));
@@ -40,20 +39,6 @@ export class ConfigEditor extends PureComponent<Props, State> {
     };
   }
 
-  renderTypeHelp = () => {
-    return (
-      <p>
-        There are different types of Graphite compatible backends. Here you can specify the type you are using. If you
-        are using{' '}
-        <a href="https://github.com/grafana/metrictank" className="pointer" target="_blank" rel="noreferrer">
-          Metrictank
-        </a>{' '}
-        then select that here. This will enable Metrictank specific features like query processing meta data. Metrictank
-        is a multi-tenant timeseries engine for Graphite and friends.
-      </p>
-    );
-  };
-
   componentDidMount() {
     updateDatasourcePluginJsonDataOption(this.props, 'graphiteVersion', this.currentGraphiteVersion);
   }
@@ -77,48 +62,48 @@ export class ConfigEditor extends PureComponent<Props, State> {
           onChange={onOptionsChange}
           secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
         />
-        <h3 className="page-heading">Graphite details</h3>
-        <div className="gf-form-group">
-          <div className="gf-form-inline">
-            <div className="gf-form">
-              <InlineFormLabel tooltip="This option controls what functions are available in the Graphite query editor.">
-                Version
-              </InlineFormLabel>
-              <Select
-                aria-label="Graphite version"
-                value={currentVersion}
-                options={graphiteVersions}
-                className="width-8"
-                onChange={onUpdateDatasourceJsonDataOptionSelect(this.props, 'graphiteVersion')}
-              />
-            </div>
-          </div>
-          <div className="gf-form-inline">
-            <div className="gf-form">
-              <InlineFormLabel tooltip={this.renderTypeHelp}>Type</InlineFormLabel>
-              <Select
-                aria-label="Graphite backend type"
-                options={graphiteTypes}
-                value={graphiteTypes.find((type) => type.value === options.jsonData.graphiteType)}
-                className="width-8"
-                onChange={onUpdateDatasourceJsonDataOptionSelect(this.props, 'graphiteType')}
-              />
-            </div>
-          </div>
+        <FieldSet>
+          <legend className="page-heading">Graphite details</legend>
+          <Field
+            label="Version"
+            description="This option controls what functions are available in the Graphite query editor."
+          >
+            <Select
+              id="graphite-version"
+              aria-label="Graphite version"
+              value={currentVersion}
+              options={graphiteVersions}
+              width={16}
+              onChange={onUpdateDatasourceJsonDataOptionSelect(this.props, 'graphiteVersion')}
+            />
+          </Field>
+
+          <Field
+            label="Graphite backend type"
+            description="There are different types of Graphite compatible backends. Here you can specify the type you are using. For Metrictank, this will enable specific features, like query processing meta data. Metrictank
+        is a multi-tenant timeseries engine for Graphite and friends."
+          >
+            <Select
+              id="backend-type"
+              options={graphiteTypes}
+              value={graphiteTypes.find((type) => type.value === options.jsonData.graphiteType)}
+              width={16}
+              onChange={onUpdateDatasourceJsonDataOptionSelect(this.props, 'graphiteType')}
+            />
+          </Field>
           {options.jsonData.graphiteType === GraphiteType.Metrictank && (
-            <div className="gf-form-inline">
-              <div className="gf-form">
-                <Switch
-                  label="Rollup indicator"
-                  labelClass={'width-10'}
-                  tooltip="Shows up as an info icon in panel headers when data is aggregated"
-                  checked={!!options.jsonData.rollupIndicatorEnabled}
-                  onChange={onUpdateDatasourceJsonDataOptionChecked(this.props, 'rollupIndicatorEnabled')}
-                />
-              </div>
-            </div>
+            <Field
+              label="Rollup indicator"
+              description="Shows up as an info icon in panel headers when data is aggregated."
+            >
+              <Switch
+                id="rollup-indicator"
+                value={!!options.jsonData.rollupIndicatorEnabled}
+                onChange={onUpdateDatasourceJsonDataOptionChecked(this.props, 'rollupIndicatorEnabled')}
+              />
+            </Field>
           )}
-        </div>
+        </FieldSet>
         <MappingsConfiguration
           mappings={(options.jsonData.importConfiguration?.loki?.mappings || []).map(toString)}
           showHelp={this.state.showMappingsHelp}
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config/ConfigEditor.tsx b/public/app/plugins/datasource/influxdb/components/editor/config/ConfigEditor.tsx
index e7b0e30b47927..3b41e7c34436b 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config/ConfigEditor.tsx
@@ -8,9 +8,8 @@ import {
   DataSourceSettings,
   SelectableValue,
   updateDatasourcePluginJsonDataOption,
-  updateDatasourcePluginResetOption,
 } from '@grafana/data/src';
-import { Alert, DataSourceHttpSettings, InlineField, LegacyForms, Select } from '@grafana/ui/src';
+import { Alert, DataSourceHttpSettings, InlineField, Select, Field, Input, FieldSet } from '@grafana/ui/src';
 import { config } from 'app/core/config';
 
 import { BROWSER_MODE_DISABLED_MESSAGE } from '../../../constants';
@@ -20,31 +19,33 @@ import { InfluxFluxConfig } from './InfluxFluxConfig';
 import { InfluxInfluxQLConfig } from './InfluxInfluxQLConfig';
 import { InfluxSqlConfig } from './InfluxSQLConfig';
 
-export const PROM_CONFIG_LABEL_WIDTH = 30;
-
-const { Input } = LegacyForms;
-
-const versions: Array<SelectableValue<InfluxVersion>> = [
-  {
+const versionMap: Record<InfluxVersion, SelectableValue<InfluxVersion>> = {
+  [InfluxVersion.InfluxQL]: {
     label: 'InfluxQL',
     value: InfluxVersion.InfluxQL,
     description: 'The InfluxDB SQL-like query language.',
   },
-  {
+  [InfluxVersion.SQL]: {
+    label: 'SQL',
+    value: InfluxVersion.SQL,
+    description: 'Native SQL language. Supported in InfluxDB 3.0',
+  },
+  [InfluxVersion.Flux]: {
     label: 'Flux',
     value: InfluxVersion.Flux,
     description: 'Supported in InfluxDB 2.x and 1.8+',
   },
+};
+
+const versions: Array<SelectableValue<InfluxVersion>> = [
+  versionMap[InfluxVersion.InfluxQL],
+  versionMap[InfluxVersion.Flux],
 ];
 
 const versionsWithSQL: Array<SelectableValue<InfluxVersion>> = [
-  { ...versions[0] },
-  {
-    label: 'SQL',
-    value: InfluxVersion.SQL,
-    description: 'Native SQL language. Supported in InfluxDB 3.0',
-  },
-  { ...versions[1] },
+  versionMap[InfluxVersion.InfluxQL],
+  versionMap[InfluxVersion.SQL],
+  versionMap[InfluxVersion.Flux],
 ];
 
 export type Props = DataSourcePluginOptionsEditorProps<InfluxOptions>;
@@ -70,16 +71,6 @@ export class ConfigEditor extends PureComponent<Props, State> {
     SQL: 'Support for SQL in Grafana is currently in alpha',
   };
 
-  // 1x
-  onResetPassword = () => {
-    updateDatasourcePluginResetOption(this.props, 'password');
-  };
-
-  // 2x
-  onResetToken = () => {
-    updateDatasourcePluginResetOption(this.props, 'token');
-  };
-
   onVersionChanged = (selected: SelectableValue<InfluxVersion>) => {
     const { options, onOptionsChange } = this.props;
 
@@ -104,19 +95,6 @@ export class ConfigEditor extends PureComponent<Props, State> {
     }
   };
 
-  getQueryLanguageDropdownValue = (v?: InfluxVersion) => {
-    switch (v) {
-      case InfluxVersion.InfluxQL:
-        return versionsWithSQL[0];
-      case InfluxVersion.Flux:
-        return versionsWithSQL[1];
-      case InfluxVersion.SQL:
-        return versionsWithSQL[2];
-      default:
-        return versionsWithSQL[0];
-    }
-  };
-
   renderJsonDataOptions() {
     switch (this.props.options.jsonData.version) {
       case InfluxVersion.InfluxQL:
@@ -136,21 +114,19 @@ export class ConfigEditor extends PureComponent<Props, State> {
 
     return (
       <>
-        <h3 className="page-heading">Query Language</h3>
-        <div className="gf-form-group">
-          <div className="gf-form-inline">
-            <div className="gf-form">
-              <Select
-                aria-label="Query language"
-                className="width-30"
-                value={this.getQueryLanguageDropdownValue(options.jsonData.version)}
-                options={config.featureToggles.influxdbSqlSupport ? versionsWithSQL : versions}
-                defaultValue={versions[0]}
-                onChange={this.onVersionChanged}
-              />
-            </div>
-          </div>
-        </div>
+        <FieldSet>
+          <h3 className="page-heading">Query language</h3>
+          <Field>
+            <Select
+              aria-label="Query language"
+              className="width-30"
+              value={versionMap[options.jsonData.version ?? InfluxVersion.InfluxQL]}
+              options={config.featureToggles.influxdbSqlSupport ? versionsWithSQL : versions}
+              defaultValue={versionMap[InfluxVersion.InfluxQL]}
+              onChange={this.onVersionChanged}
+            />
+          </Field>
+        </FieldSet>
 
         {options.jsonData.version !== InfluxVersion.InfluxQL && (
           <Alert severity="info" title={this.versionNotice[options.jsonData.version!]}>
@@ -176,34 +152,29 @@ export class ConfigEditor extends PureComponent<Props, State> {
           onChange={onOptionsChange}
           secureSocksDSProxyEnabled={config.secureSocksDSProxyEnabled}
         />
-
-        <div className="gf-form-group">
-          <div>
-            <h3 className="page-heading">InfluxDB Details</h3>
-          </div>
+        <FieldSet>
+          <h3 className="page-heading">InfluxDB Details</h3>
           {this.renderJsonDataOptions()}
-          <div className="gf-form-inline">
-            <InlineField
-              labelWidth={20}
-              label="Max series"
-              tooltip="Limit the number of series/tables that Grafana will process. Lower this number to prevent abuse, and increase it if you have lots of small time series and not all are shown. Defaults to 1000."
-            >
-              <Input
-                placeholder="1000"
-                type="number"
-                className="width-20"
-                value={this.state.maxSeries}
-                onChange={(event) => {
-                  // We duplicate this state so that we allow to write freely inside the input. We don't have
-                  // any influence over saving so this seems to be only way to do this.
-                  this.setState({ maxSeries: event.currentTarget.value });
-                  const val = parseInt(event.currentTarget.value, 10);
-                  updateDatasourcePluginJsonDataOption(this.props, 'maxSeries', Number.isFinite(val) ? val : undefined);
-                }}
-              />
-            </InlineField>
-          </div>
-        </div>
+          <InlineField
+            labelWidth={20}
+            label="Max series"
+            tooltip="Limit the number of series/tables that Grafana will process. Lower this number to prevent abuse, and increase it if you have lots of small time series and not all are shown. Defaults to 1000."
+          >
+            <Input
+              placeholder="1000"
+              type="number"
+              className="width-20"
+              value={this.state.maxSeries}
+              onChange={(event: { currentTarget: { value: string } }) => {
+                // We duplicate this state so that we allow to write freely inside the input. We don't have
+                // any influence over saving so this seems to be only way to do this.
+                this.setState({ maxSeries: event.currentTarget.value });
+                const val = parseInt(event.currentTarget.value, 10);
+                updateDatasourcePluginJsonDataOption(this.props, 'maxSeries', Number.isFinite(val) ? val : undefined);
+              }}
+            />
+          </InlineField>
+        </FieldSet>
       </>
     );
   }
diff --git a/public/app/plugins/datasource/influxdb/components/editor/config/InfluxFluxConfig.tsx b/public/app/plugins/datasource/influxdb/components/editor/config/InfluxFluxConfig.tsx
index 7aad0b0aed5cf..dd28a7c73b3f9 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config/InfluxFluxConfig.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config/InfluxFluxConfig.tsx
@@ -7,11 +7,11 @@ import {
   onUpdateDatasourceSecureJsonDataOption,
   updateDatasourcePluginResetOption,
 } from '@grafana/data';
-import { InlineFormLabel, LegacyForms } from '@grafana/ui';
+import { InlineField, InlineFieldRow, Input, SecretInput } from '@grafana/ui';
 
 import { InfluxOptions, InfluxSecureJsonData } from '../../../types';
 
-const { Input, SecretFormField } = LegacyForms;
+const WIDTH_SHORT = 20;
 
 export type Props = DataSourcePluginOptionsEditorProps<InfluxOptions, InfluxSecureJsonData>;
 
@@ -23,68 +23,55 @@ export const InfluxFluxConfig = (props: Props) => {
 
   return (
     <>
-      <div className="gf-form-inline">
-        <div className="gf-form">
-          <InlineFormLabel htmlFor={`${htmlPrefix}-org`} className="width-10">
-            Organization
-          </InlineFormLabel>
-          <div className="width-10">
-            <Input
-              id={`${htmlPrefix}-org`}
-              className="width-20"
-              value={jsonData.organization || ''}
-              onChange={onUpdateDatasourceJsonDataOption(props, 'organization')}
-            />
-          </div>
-        </div>
-      </div>
-      <div className="gf-form-inline">
-        <div className="gf-form">
-          <SecretFormField
+      <InlineFieldRow>
+        <InlineField labelWidth={WIDTH_SHORT} label="Organization" htmlFor={`${htmlPrefix}-org`}>
+          <Input
+            id={`${htmlPrefix}-org`}
+            className="width-20"
+            value={jsonData.organization || ''}
+            onChange={onUpdateDatasourceJsonDataOption(props, 'organization')}
+          />
+        </InlineField>
+      </InlineFieldRow>
+      <InlineFieldRow>
+        <InlineField labelWidth={WIDTH_SHORT} label="Token">
+          <SecretInput
             isConfigured={Boolean(secureJsonFields && secureJsonFields.token)}
             value={secureJsonData?.token || ''}
             label="Token"
             aria-label="Token"
-            labelWidth={10}
-            inputWidth={20}
+            className="width-20"
             onReset={() => updateDatasourcePluginResetOption(props, 'token')}
             onChange={onUpdateDatasourceSecureJsonDataOption(props, 'token')}
           />
-        </div>
-      </div>
-      <div className="gf-form-inline">
-        <div className="gf-form">
-          <InlineFormLabel className="width-10">Default Bucket</InlineFormLabel>
-          <div className="width-10">
-            <Input
-              className="width-20"
-              placeholder="default bucket"
-              value={jsonData.defaultBucket || ''}
-              onChange={onUpdateDatasourceJsonDataOption(props, 'defaultBucket')}
-            />
-          </div>
-        </div>
-      </div>
+        </InlineField>
+      </InlineFieldRow>
+      <InlineFieldRow>
+        <InlineField labelWidth={WIDTH_SHORT} label="Default Bucket">
+          <Input
+            className="width-20"
+            placeholder="default bucket"
+            value={jsonData.defaultBucket || ''}
+            onChange={onUpdateDatasourceJsonDataOption(props, 'defaultBucket')}
+          />
+        </InlineField>
+      </InlineFieldRow>
 
-      <div className="gf-form-inline">
-        <div className="gf-form">
-          <InlineFormLabel
-            className="width-10"
-            tooltip="A lower limit for the auto group by time interval. Recommended to be set to write frequency,
+      <InlineFieldRow>
+        <InlineField
+          labelWidth={WIDTH_SHORT}
+          label="Min time interval"
+          tooltip="A lower limit for the auto group by time interval. Recommended to be set to write frequency,
 				for example 1m if your data is written every minute."
-          >
-            Min time interval
-          </InlineFormLabel>
-          <div className="width-10">
-            <Input
-              className="width-20"
-              placeholder="10s"
-              value={jsonData.timeInterval || ''}
-              onChange={onUpdateDatasourceJsonDataOption(props, 'timeInterval')}
-            />
-          </div>
-        </div>
-      </div>
+        >
+          <Input
+            className="width-20"
+            placeholder="10s"
+            value={jsonData.timeInterval || ''}
+            onChange={onUpdateDatasourceJsonDataOption(props, 'timeInterval')}
+          />
+        </InlineField>
+      </InlineFieldRow>
     </>
   );
 };
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx b/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx
index 5b077651eba4d..1bd4c2afec58d 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx
@@ -61,13 +61,20 @@ const LANG_ID = 'logql';
 // we must only run the lang-setup code once
 let LANGUAGE_SETUP_STARTED = false;
 
+export const defaultWordPattern = /(-?\d*\.\d\w*)|([^`~!#%^&*()\-=+\[{\]}\\|;:'",.<>\/?\s]+)/g;
+
 function ensureLogQL(monaco: Monaco) {
   if (LANGUAGE_SETUP_STARTED === false) {
     LANGUAGE_SETUP_STARTED = true;
     monaco.languages.register({ id: LANG_ID });
 
     monaco.languages.setMonarchTokensProvider(LANG_ID, monarchlanguage);
-    monaco.languages.setLanguageConfiguration(LANG_ID, languageConfiguration);
+    monaco.languages.setLanguageConfiguration(LANG_ID, {
+      ...languageConfiguration,
+      wordPattern: /(-?\d*\.\d\w*)|([^`~!#%^&*()+\[{\]}\\|;:',.<>\/?\s]+)/g,
+      // Default:  /(-?\d*\.\d\w*)|([^`~!#%^&*()\-=+\[{\]}\\|;:'",.<>\/?\s]+)/g
+      // Removed `"`, `=`, and `-`, from the exclusion list, so now the completion provider can decide to overwrite any matching words, or just insert text at the cursor
+    });
   }
 }
 
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.test.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.test.ts
index e41985f7f896d..56f691e9f8ac5 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.test.ts
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.test.ts
@@ -1,10 +1,14 @@
+import { Monaco, monacoTypes } from '@grafana/ui/src';
+
 import LokiLanguageProvider from '../../../LanguageProvider';
 import { LokiDatasource } from '../../../datasource';
 import { createLokiDatasource } from '../../../mocks';
 
 import { CompletionDataProvider } from './CompletionDataProvider';
 import { getAfterSelectorCompletions, getCompletions } from './completions';
-import { Label, Situation } from './situation';
+import { getSituation, Label, Situation } from './situation';
+
+import { calculateRange } from './index';
 
 jest.mock('../../../querybuilder/operations', () => ({
   explainOperator: () => 'Operator docs',
@@ -797,4 +801,101 @@ describe('IN_LOGFMT completions', () => {
       ]
     `);
   });
+
+  describe('calculateRange', () => {
+    let monaco: Monaco;
+    beforeEach(() => {
+      monaco = {
+        Range: {
+          lift(range: monacoTypes.Range): monacoTypes.Range {
+            return range;
+          },
+        },
+      } as Monaco;
+    });
+
+    it('getSituation fails to return autocomplete when inserting before any other labels', () => {
+      // Ideally we'd be able to autocomplete in this situation as well, but currently not supported to insert labels at the start.
+      //{^label1="value1",label2="value2"}
+      const situation: Situation | null = getSituation('{label1="value1",label2="value2"}', 1);
+      expect(situation).toBe(null);
+    });
+    it('tests inserting new label before existing label name', () => {
+      const situation: Situation | null = getSituation('{label1="value1",label2="value2"}', 17);
+      expect(situation?.type).toBe('IN_LABEL_SELECTOR_NO_LABEL_NAME');
+      const word: monacoTypes.editor.IWordAtPosition = {
+        word: 'label2="value2"',
+        startColumn: 17,
+        endColumn: 32,
+      };
+      const wordUntil: monacoTypes.editor.IWordAtPosition = {
+        word: '',
+        startColumn: 17,
+        endColumn: 17,
+      };
+      const position: monacoTypes.Position = {
+        lineNumber: 1,
+        column: 17,
+      } as monacoTypes.Position;
+
+      expect(calculateRange(situation, word, wordUntil, monaco, position)).toMatchObject({
+        startLineNumber: 1,
+        endLineNumber: 1,
+        startColumn: 17,
+        endColumn: 32,
+      });
+    });
+    it('tests inserting new label within existing label value', () => {
+      //{label1="value1",label2="^value2"}
+      const situation: Situation | null = getSituation('{label1="value1",label2="value"}', 25);
+      expect(situation?.type).toBe('IN_LABEL_SELECTOR_WITH_LABEL_NAME');
+      const word: monacoTypes.editor.IWordAtPosition = {
+        word: 'label2="value2"',
+        startColumn: 18,
+        endColumn: 33,
+      };
+      const wordUntil: monacoTypes.editor.IWordAtPosition = {
+        word: 'label2="',
+        startColumn: 18,
+        endColumn: 26,
+      };
+      const position: monacoTypes.Position = {
+        lineNumber: 1,
+        column: 25,
+      } as monacoTypes.Position;
+
+      expect(calculateRange(situation, word, wordUntil, monaco, position)).toMatchObject({
+        startLineNumber: 1,
+        endLineNumber: 1,
+        startColumn: 26,
+        endColumn: 32,
+      });
+    });
+    it('tests inserting new label within existing label value containing dashes', () => {
+      // {label1="value1",label2="value2^-value"}
+      const situation: Situation | null = getSituation('{label1="value1",label2="value2-value"}', 30);
+      expect(situation?.type).toBe('IN_LABEL_SELECTOR_WITH_LABEL_NAME');
+      const word: monacoTypes.editor.IWordAtPosition = {
+        word: 'label2="value2-value"',
+        startColumn: 18,
+        endColumn: 39,
+      };
+      const wordUntil: monacoTypes.editor.IWordAtPosition = {
+        word: 'label2="value2',
+        startColumn: 18,
+        endColumn: 32,
+      };
+      const position: monacoTypes.Position = {
+        lineNumber: 1,
+        column: 25,
+      } as monacoTypes.Position;
+
+      expect(calculateRange(situation, word, wordUntil, monaco, position)).toMatchObject({
+        startLineNumber: 1,
+        endLineNumber: 1,
+        startColumn: 26,
+        endColumn: 38,
+      });
+    });
+  });
 });
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/index.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/index.ts
index 57fcf1435ede8..4cacc11339388 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/index.ts
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/index.ts
@@ -2,8 +2,8 @@ import type { Monaco, monacoTypes } from '@grafana/ui';
 
 import { CompletionDataProvider } from './CompletionDataProvider';
 import { NeverCaseError } from './NeverCaseError';
-import { getCompletions, CompletionType } from './completions';
-import { getSituation } from './situation';
+import { CompletionType, getCompletions } from './completions';
+import { getSituation, Situation } from './situation';
 
 // from: monacoTypes.languages.CompletionItemInsertTextRule.InsertAsSnippet
 const INSERT_AS_SNIPPET_ENUM_VALUE = 4;
@@ -53,6 +53,7 @@ function getMonacoCompletionItemKind(type: CompletionType, monaco: Monaco): mona
       throw new NeverCaseError(type);
   }
 }
+
 export function getCompletionProvider(
   monaco: Monaco,
   dataProvider: CompletionDataProvider
@@ -62,15 +63,8 @@ export function getCompletionProvider(
     position: monacoTypes.Position
   ): monacoTypes.languages.ProviderResult<monacoTypes.languages.CompletionList> => {
     const word = model.getWordAtPosition(position);
-    const range =
-      word != null
-        ? monaco.Range.lift({
-            startLineNumber: position.lineNumber,
-            endLineNumber: position.lineNumber,
-            startColumn: word.startColumn,
-            endColumn: word.endColumn,
-          })
-        : monaco.Range.fromPositions(position);
+    const wordUntil = model.getWordUntilPosition(position);
+
     // documentation says `position` will be "adjusted" in `getOffsetAt`
     // i don't know what that means, to be sure i clone it
     const positionClone = {
@@ -79,6 +73,7 @@ export function getCompletionProvider(
     };
     const offset = model.getOffsetAt(positionClone);
     const situation = getSituation(model.getValue(), offset);
+    const range = calculateRange(situation, word, wordUntil, monaco, position);
     const completionsPromise = situation != null ? getCompletions(situation, dataProvider) : Promise.resolve([]);
     return completionsPromise.then((items) => {
       // monaco by default alphabetically orders the items.
@@ -93,7 +88,7 @@ export function getCompletionProvider(
         detail: item.detail,
         documentation: item.documentation,
         sortText: index.toString().padStart(maxIndexDigits, '0'), // to force the order we have
-        range,
+        range: range,
         command: item.triggerOnInsert
           ? {
               id: 'editor.action.triggerSuggest',
@@ -110,3 +105,68 @@ export function getCompletionProvider(
     provideCompletionItems,
   };
 }
+
+export const calculateRange = (
+  situation: Situation | null,
+  word: monacoTypes.editor.IWordAtPosition | null,
+  wordUntil: monacoTypes.editor.IWordAtPosition,
+  monaco: Monaco,
+  position: monacoTypes.Position
+): monacoTypes.Range => {
+  if (
+    situation &&
+    situation?.type === 'IN_LABEL_SELECTOR_WITH_LABEL_NAME' &&
+    'betweenQuotes' in situation &&
+    situation.betweenQuotes
+  ) {
+    // Word until won't have second quote if they are between quotes
+    const indexOfFirstQuote = wordUntil?.word?.indexOf('"') ?? 0;
+
+    const indexOfLastQuote = word?.word?.lastIndexOf('"') ?? 0;
+
+    const indexOfEquals = word?.word.indexOf('=');
+    const indexOfLastEquals = word?.word.lastIndexOf('=');
+
+    // Just one equals "=" the cursor is somewhere within a label value
+    // e.g. value="labe^l-value" or value="^label-value" etc
+    // We want the word to include everything within the quotes, so the result from autocomplete overwrites the existing label value
+    if (
+      indexOfLastEquals === indexOfEquals &&
+      indexOfFirstQuote !== -1 &&
+      indexOfLastQuote !== -1 &&
+      indexOfLastEquals !== -1
+    ) {
+      return word != null
+        ? monaco.Range.lift({
+            startLineNumber: position.lineNumber,
+            endLineNumber: position.lineNumber,
+            startColumn: wordUntil.startColumn + indexOfFirstQuote + 1,
+            endColumn: wordUntil.startColumn + indexOfLastQuote,
+          })
+        : monaco.Range.fromPositions(position);
+    }
+  }
+
+  if (situation && situation.type === 'IN_LABEL_SELECTOR_WITH_LABEL_NAME') {
+    // Otherwise we want the range to be calculated as the cursor position, as we want to insert the autocomplete, instead of overwriting existing text
+    // The cursor position is the length of the wordUntil
+    return word != null
+      ? monaco.Range.lift({
+          startLineNumber: position.lineNumber,
+          endLineNumber: position.lineNumber,
+          startColumn: wordUntil.endColumn,
+          endColumn: wordUntil.endColumn,
+        })
+      : monaco.Range.fromPositions(position);
+  }
+
+  // And for all other non-label cases, we want to use the word start and end column
+  return word != null
+    ? monaco.Range.lift({
+        startLineNumber: position.lineNumber,
+        endLineNumber: position.lineNumber,
+        startColumn: word.startColumn,
+        endColumn: word.endColumn,
+      })
+    : monaco.Range.fromPositions(position);
+};
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.test.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.test.ts
index 0945af69f09a4..13444c8dcb882 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.test.ts
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.test.ts
@@ -288,6 +288,98 @@ describe('situation', () => {
     });
   });
 
+  it('identifies all labels from queries when cursor is at start', () => {
+    assertSituation('{^,one="val1",two!="val2",three=~"val3",four!~"val4"}', {
+      type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+      otherLabels: [
+        { name: 'one', value: 'val1', op: '=' },
+        { name: 'two', value: 'val2', op: '!=' },
+        { name: 'three', value: 'val3', op: '=~' },
+        { name: 'four', value: 'val4', op: '!~' },
+      ],
+    });
+  });
+
+  describe('tests that should return IN_LABEL_SELECTOR_NO_LABEL_NAME, but currently are null', () => {
+    it('fails to identify when cursor is before any labels with no comma before first label', () => {
+      assertSituation('{^ one="val1",two!="val2",three=~"val3",four!~"val4"}', null);
+    });
+
+    it('fails to identify situation when missing space within label list', () => {
+      assertSituation('{one="val1",two!="val2"^ three=~"val3",four!~"val4"}', null);
+    });
+
+    it('fails to identify situation when missing comma within label list', () => {
+      assertSituation('{one="val1",two!="val2" ^ three=~"val3",four!~"val4"}', null);
+    });
+
+    it('fails to identify situation when missing comma at end of label list', () => {
+      assertSituation('{one="val1",two!="val2",three=~"val3",four!~"val4" ^ }', null);
+    });
+    it('fails to identify situation when attempting to insert before first label', () => {
+      assertSituation('{^one="val1",two!="val2",three=~"val3",four!~"val4"}', null);
+    });
+  });
+
+  it('identifies all labels correctly when error node is from missing comma within label list', () => {
+    assertSituation('{one="val1",two!="val2",^ three=~"val3",four!~"val4"}', {
+      type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+      otherLabels: [
+        { name: 'one', value: 'val1', op: '=' },
+        { name: 'two', value: 'val2', op: '!=' },
+        { name: 'three', value: 'val3', op: '=~' },
+        { name: 'four', value: 'val4', op: '!~' },
+      ],
+    });
+  });
+
+  it('identifies labels when inserting before last, no space, size 2', () => {
+    assertSituation('{one="val1",^two!="val2"}', {
+      type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+      otherLabels: [
+        { name: 'one', value: 'val1', op: '=' },
+        { name: 'two', value: 'val2', op: '!=' },
+      ],
+    });
+  });
+
+  it('identifies labels when inserting before last, no space, size 3', () => {
+    assertSituation('{one="val1",two!="val2",^three="val3"}', {
+      type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+      otherLabels: [
+        { name: 'one', value: 'val1', op: '=' },
+        { name: 'two', value: 'val2', op: '!=' },
+        { name: 'three', value: 'val3', op: '=' },
+      ],
+    });
+  });
+
+  it('identifies all labels from queries when cursor is in middle', () => {
+    // Note the extra whitespace, if the cursor is after whitespace, the situation will fail to resolve
+    assertSituation('{one="val1", ^,two!="val2",three=~"val3",four!~"val4"}', {
+      type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+      otherLabels: [
+        { name: 'one', value: 'val1', op: '=' },
+        { name: 'two', value: 'val2', op: '!=' },
+        { name: 'three', value: 'val3', op: '=~' },
+        { name: 'four', value: 'val4', op: '!~' },
+      ],
+    });
+  });
+
+  it('identifies all labels from queries when cursor is at end', () => {
+    // Note the extra whitespace, if the cursor is after whitespace, the situation will fail to resolve
+    assertSituation('{one="val1",two!="val2",three=~"val3",four!~"val4",^}', {
+      type: 'IN_LABEL_SELECTOR_NO_LABEL_NAME',
+      otherLabels: [
+        { name: 'one', value: 'val1', op: '=' },
+        { name: 'two', value: 'val2', op: '!=' },
+        { name: 'three', value: 'val3', op: '=~' },
+        { name: 'four', value: 'val4', op: '!~' },
+      ],
+    });
+  });
+
   it('identifies AFTER_UNWRAP autocomplete situations', () => {
     assertSituation('sum(sum_over_time({one="val1"} | unwrap^', {
       type: 'AFTER_UNWRAP',
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.ts
index 2c426c3bf487b..ce8d939873b83 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.ts
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/situation.ts
@@ -42,6 +42,30 @@ function move(node: SyntaxNode, direction: Direction): SyntaxNode | null {
   return node[direction];
 }
 
+/**
+ * Iteratively calls walk with given path until it returns null, then we return the last non-null node.
+ * @param node
+ * @param path
+ */
+function traverse(node: SyntaxNode, path: Path): SyntaxNode | null {
+  let current: SyntaxNode | null = node;
+  let next = walk(current, path);
+  while (next) {
+    let nextTmp = walk(next, path);
+    if (nextTmp) {
+      next = nextTmp;
+    } else {
+      return next;
+    }
+  }
+  return null;
+}
+
+/**
+ * Walks a single step from the provided node, following the path.
+ * @param node
+ * @param path
+ */
 function walk(node: SyntaxNode, path: Path): SyntaxNode | null {
   let current: SyntaxNode | null = node;
   for (const [direction, expectedNode] of path) {
@@ -161,7 +185,7 @@ const ERROR_NODE_ID = 0;
 
 const RESOLVERS: Resolver[] = [
   {
-    paths: [[Selector], [ERROR_NODE_ID, Matchers, Selector]],
+    paths: [[Selector], [Selector, Matchers], [Matchers], [ERROR_NODE_ID, Matchers, Selector]],
     fun: resolveSelector,
   },
   {
@@ -194,7 +218,10 @@ const RESOLVERS: Resolver[] = [
     fun: resolveLogRange,
   },
   {
-    paths: [[ERROR_NODE_ID, Matcher]],
+    paths: [
+      [ERROR_NODE_ID, Matcher],
+      [ERROR_NODE_ID, Matchers, Selector],
+    ],
     fun: resolveMatcher,
   },
   {
@@ -276,11 +303,25 @@ function getLabel(matcherNode: SyntaxNode, text: string): Label | null {
 }
 
 function getLabels(selectorNode: SyntaxNode, text: string): Label[] {
-  if (selectorNode.type.id !== Selector) {
+  if (selectorNode.type.id !== Selector && selectorNode.type.id !== Matchers) {
     return [];
   }
 
-  let listNode: SyntaxNode | null = walk(selectorNode, [['firstChild', Matchers]]);
+  let listNode: SyntaxNode | null = null;
+
+  // If parent node is selector, we want to start with the current Matcher node
+  if (selectorNode?.parent?.type.id === Selector) {
+    listNode = selectorNode;
+  } else {
+    // Parent node needs to be returned first because otherwise both of the other walks will return a non-null node and this function will return the labels on the left side of the current node, the other two walks should be mutually exclusive when the parent is null
+    listNode =
+      // Node in-between labels
+      traverse(selectorNode, [['parent', Matchers]]) ??
+      // Node after all other labels
+      walk(selectorNode, [['firstChild', Matchers]]) ??
+      // Node before all other labels
+      walk(selectorNode, [['lastChild', Matchers]]);
+  }
 
   const labels: Label[] = [];
 
diff --git a/public/app/plugins/datasource/loki/configuration/QuerySettings.tsx b/public/app/plugins/datasource/loki/configuration/QuerySettings.tsx
index 932f120fd3bec..27b2265c7c1bf 100644
--- a/public/app/plugins/datasource/loki/configuration/QuerySettings.tsx
+++ b/public/app/plugins/datasource/loki/configuration/QuerySettings.tsx
@@ -2,11 +2,9 @@ import React from 'react';
 
 import { ConfigSubSection } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
-import { Badge, LegacyForms } from '@grafana/ui';
+import { Badge, InlineField, InlineFieldRow, Input } from '@grafana/ui';
 import { ConfigDescriptionLink } from 'app/core/components/ConfigDescriptionLink';
 
-const { FormField } = LegacyForms;
-
 type Props = {
   maxLines: string;
   onMaxLinedChange: (value: string) => void;
@@ -27,64 +25,64 @@ export const QuerySettings = (props: Props) => {
         />
       }
     >
-      <div className="gf-form-inline">
-        <div className="gf-form">
-          <FormField
-            label="Maximum lines"
-            labelWidth={11}
-            inputWidth={20}
-            inputEl={
-              <input
-                type="number"
-                className="gf-form-input width-8 gf-form-input--has-help-icon"
-                value={maxLines}
-                onChange={(event) => onMaxLinedChange(event.currentTarget.value)}
-                spellCheck={false}
-                placeholder="1000"
-              />
-            }
+      <InlineField
+        label="Maximum lines"
+        htmlFor="loki_config_maxLines"
+        labelWidth={22}
+        tooltip={
+          <>
+            Loki queries must contain a limit of the maximum number of lines returned (default: 1000). Increase this
+            limit to have a bigger result set for ad-hoc analysis. Decrease this limit if your browser becomes sluggish
+            when displaying the log results.
+          </>
+        }
+      >
+        <Input
+          type="number"
+          id="loki_config_maxLines"
+          value={maxLines}
+          onChange={(event: React.FormEvent<HTMLInputElement>) => onMaxLinedChange(event.currentTarget.value)}
+          width={16}
+          placeholder="1000"
+          spellCheck={false}
+        />
+      </InlineField>
+
+      {config.featureToggles.lokiPredefinedOperations && (
+        <InlineFieldRow>
+          <InlineField
+            label="Predefined operations"
+            htmlFor="loki_config_predefinedOperations"
+            labelWidth={22}
             tooltip={
               <>
-                Loki queries must contain a limit of the maximum number of lines returned (default: 1000). Increase this
-                limit to have a bigger result set for ad-hoc analysis. Decrease this limit if your browser becomes
-                sluggish when displaying the log results.
+                {
+                  'Predefined operations are used as an initial state for your queries. They are useful, if you want to unpack, parse or format all log lines. Currently we support only log operations starting with |. For example: | unpack | line_format "{{.message}}".'
+                }
               </>
             }
-          />
-        </div>
-      </div>
-      {config.featureToggles.lokiPredefinedOperations && (
-        <div className="gf-form-inline">
-          <div className="gf-form">
-            <FormField
-              label="Predefined operations"
-              labelWidth={11}
-              inputEl={
-                <input
-                  type="string"
-                  className="gf-form-input width-20 gf-form-input--has-help-icon"
-                  value={predefinedOperations}
-                  onChange={(event) => onPredefinedOperationsChange(event.currentTarget.value)}
-                  spellCheck={false}
-                  placeholder="| unpack | line_format"
-                />
-              }
-              tooltip={
-                <div>
-                  {
-                    'Predefined operations are used as an initial state for your queries. They are useful, if you want to unpack, parse or format all log lines. Currently we support only log operations starting with |. For example: | unpack | line_format "{{.message}}".'
-                  }
-                </div>
+          >
+            <Input
+              type="string"
+              id="loki_config_predefinedOperations"
+              value={predefinedOperations}
+              onChange={(event: React.FormEvent<HTMLInputElement>) =>
+                onPredefinedOperationsChange(event.currentTarget.value)
               }
+              width={40}
+              placeholder="| unpack | line_format"
+              spellCheck={false}
             />
+          </InlineField>
+          <InlineField>
             <Badge
               text="Experimental"
               color="orange"
               icon="exclamation-triangle"
               tooltip="Predefined operations is an experimental feature that may change in the future."
             />
-          </div>
-        </div>
+          </InlineField>
+        </InlineFieldRow>
       )}
     </ConfigSubSection>
   );
diff --git a/public/app/plugins/datasource/loki/querybuilder/parsing.ts b/public/app/plugins/datasource/loki/querybuilder/parsing.ts
index b78146a2dda7c..dc17bae32a242 100644
--- a/public/app/plugins/datasource/loki/querybuilder/parsing.ts
+++ b/public/app/plugins/datasource/loki/querybuilder/parsing.ts
@@ -259,7 +259,7 @@ export function handleExpression(expr: string, node: SyntaxNode, context: Contex
 function getLabel(expr: string, node: SyntaxNode): QueryBuilderLabelFilter {
   const labelNode = node.getChild(Identifier);
   const label = getString(expr, labelNode);
-  const op = getString(expr, labelNode!.nextSibling);
+  const op = getString(expr, labelNode?.nextSibling);
   let value = getString(expr, node.getChild(String));
   // `value` is wrapped in double quotes, so we need to remove them. As a value can contain double quotes, we can't use RegEx here.
   value = value.substring(1, value.length - 1);
diff --git a/public/app/plugins/datasource/opentsdb/components/OpenTsdbDetails.tsx b/public/app/plugins/datasource/opentsdb/components/OpenTsdbDetails.tsx
index ef6e1946b46ec..fa7c5955d257f 100644
--- a/public/app/plugins/datasource/opentsdb/components/OpenTsdbDetails.tsx
+++ b/public/app/plugins/datasource/opentsdb/components/OpenTsdbDetails.tsx
@@ -1,12 +1,10 @@
 import React, { SyntheticEvent, useId } from 'react';
 
 import { DataSourceSettings, SelectableValue } from '@grafana/data';
-import { InlineFormLabel, LegacyForms } from '@grafana/ui';
+import { Select, Input, Field, FieldSet } from '@grafana/ui';
 
 import { OpenTsdbOptions } from '../types';
 
-const { Select, Input } = LegacyForms;
-
 const tsdbVersions = [
   { label: '<=2.1', value: 1 },
   { label: '==2.2', value: 2 },
@@ -30,43 +28,38 @@ export const OpenTsdbDetails = (props: Props) => {
 
   return (
     <>
-      <h5>OpenTSDB settings</h5>
-      <div className="gf-form">
-        <InlineFormLabel width={7} htmlFor={`select-version-${idSuffix}`}>
-          Version
-        </InlineFormLabel>
-        <Select
-          inputId={`select-version-${idSuffix}`}
-          options={tsdbVersions}
-          value={tsdbVersions.find((version) => version.value === value.jsonData.tsdbVersion) ?? tsdbVersions[0]}
-          onChange={onSelectChangeHandler('tsdbVersion', value, onChange)}
-        />
-      </div>
-      <div className="gf-form">
-        <InlineFormLabel width={7} htmlFor={`select-resolution-${idSuffix}`}>
-          Resolution
-        </InlineFormLabel>
-        <Select
-          inputId={`select-resolution-${idSuffix}`}
-          options={tsdbResolutions}
-          value={
-            tsdbResolutions.find((resolution) => resolution.value === value.jsonData.tsdbResolution) ??
-            tsdbResolutions[0]
-          }
-          onChange={onSelectChangeHandler('tsdbResolution', value, onChange)}
-        />
-      </div>
-      <div className="gf-form">
-        <InlineFormLabel width={7} htmlFor={`lookup-input-${idSuffix}`}>
-          Lookup limit
-        </InlineFormLabel>
-        <Input
-          id={`lookup-input-${idSuffix}`}
-          type="number"
-          value={value.jsonData.lookupLimit ?? 1000}
-          onChange={onInputChangeHandler('lookupLimit', value, onChange)}
-        />
-      </div>
+      <FieldSet label="OpenTSDB settings">
+        <Field htmlFor={`select-version-${idSuffix}`} label="Version">
+          <Select
+            inputId={`select-version-${idSuffix}`}
+            options={tsdbVersions}
+            value={tsdbVersions.find((version) => version.value === value.jsonData.tsdbVersion) ?? tsdbVersions[0]}
+            onChange={onSelectChangeHandler('tsdbVersion', value, onChange)}
+            width={20}
+          />
+        </Field>
+        <Field htmlFor={`select-resolution-${idSuffix}`} label="Resolution">
+          <Select
+            inputId={`select-resolution-${idSuffix}`}
+            options={tsdbResolutions}
+            value={
+              tsdbResolutions.find((resolution) => resolution.value === value.jsonData.tsdbResolution) ??
+              tsdbResolutions[0]
+            }
+            onChange={onSelectChangeHandler('tsdbResolution', value, onChange)}
+            width={20}
+          />
+        </Field>
+        <Field htmlFor={`lookup-input-${idSuffix}`} label="Lookup limit">
+          <Input
+            id={`lookup-input-${idSuffix}`}
+            type="number"
+            value={value.jsonData.lookupLimit ?? 1000}
+            onChange={onInputChangeHandler('lookupLimit', value, onChange)}
+            width={20}
+          />
+        </Field>
+      </FieldSet>
     </>
   );
 };
diff --git a/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.test.tsx b/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.test.tsx
index ae76f2a2dcc22..7d0af5aa56de1 100644
--- a/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.test.tsx
@@ -108,6 +108,27 @@ describe('PromVariableQueryEditor', () => {
     expect(migration).toEqual(expected);
   });
 
+  test('Migrates a query object with no metric and only label filters to an expression correctly', () => {
+    const query: PromVariableQuery = {
+      qryType: PromVariableQueryType.LabelValues,
+      label: 'name',
+      labelFilters: [
+        {
+          label: 'label',
+          op: '=',
+          value: 'value',
+        },
+      ],
+      refId: 'PrometheusDatasource-VariableQuery',
+    };
+
+    const migration: string = migrateVariableEditorBackToVariableSupport(query);
+
+    const expected = 'label_values({label="value"},name)';
+
+    expect(migration).toEqual(expected);
+  });
+
   beforeEach(() => {
     props = {
       datasource: {
diff --git a/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.tsx b/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.tsx
index 165236b0ba0b4..43f4badad79e5 100644
--- a/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.tsx
+++ b/public/app/plugins/datasource/prometheus/components/VariableQueryEditor.tsx
@@ -50,7 +50,7 @@ export const PromVariableQueryEditor = ({ onChange, query, datasource }: Props)
   // seriesQuery is only a whole
   const [seriesQuery, setSeriesQuery] = useState('');
 
-  // the original variable query implementation
+  // the original variable query implementation, e.g. label_value(metric, label_name)
   const [classicQuery, setClassicQuery] = useState('');
 
   // list of label names for label_values(), /api/v1/labels, contains the same results as label_names() function
diff --git a/public/app/plugins/datasource/prometheus/configuration/DataSourceHttpSettingsOverhaul.tsx b/public/app/plugins/datasource/prometheus/configuration/DataSourceHttpSettingsOverhaul.tsx
index 6f14514444119..51b84c12f0e74 100644
--- a/public/app/plugins/datasource/prometheus/configuration/DataSourceHttpSettingsOverhaul.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/DataSourceHttpSettingsOverhaul.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 
 import { DataSourceSettings } from '@grafana/data';
-import { Auth, ConnectionSettings, convertLegacyAuthProps } from '@grafana/experimental';
+import { Auth, ConnectionSettings, convertLegacyAuthProps, AuthMethod } from '@grafana/experimental';
 import { SecureSocksProxySettings, useTheme2 } from '@grafana/ui';
 import { AzureAuthSettings } from '@grafana/ui/src/components/DataSourceSettings/types';
 
@@ -127,21 +127,12 @@ export const DataSourcehttpSettingsOverhaul = (props: Props) => {
       />
       <hr className={`${styles.hrTopSpace} ${styles.hrBottomSpace}`} />
       <Auth
-        // Reshaped legacy props
         {...newAuthProps}
-        // Your custom auth methods
         customMethods={customMethods}
-        // Still need to call `onAuthMethodSelect` function from
-        // `newAuthProps` to store the legacy data correctly.
-        // Also make sure to store the data about your component
-        // being selected/unselected.
         onAuthMethodSelect={(method) => {
-          // handle selecting of custom methods
           // sigV4Id
           if (sigV4AuthToggleEnabled) {
             setSigV4Selected(method === sigV4Id);
-            // mutate jsonData here to store the selected option because of auth component issue with onOptionsChange being overridden
-            options.jsonData.sigV4Auth = method === sigV4Id;
           }
 
           // Azure
@@ -150,7 +141,16 @@ export const DataSourcehttpSettingsOverhaul = (props: Props) => {
             azureAuthSettings.setAzureAuthEnabled(options, method === azureAuthId);
           }
 
-          newAuthProps.onAuthMethodSelect(method);
+          onOptionsChange({
+            ...options,
+            basicAuth: method === AuthMethod.BasicAuth,
+            withCredentials: method === AuthMethod.CrossSiteCredentials,
+            jsonData: {
+              ...options.jsonData,
+              sigV4Auth: method === sigV4Id,
+              oauthPassThru: method === AuthMethod.OAuthForward,
+            },
+          });
         }}
         // If your method is selected pass its id to `selectedMethod`,
         // otherwise pass the id from converted legacy data
diff --git a/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
index 4d0ce1931c86e..ad4d2ba2d34c4 100644
--- a/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
+++ b/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
@@ -13,10 +13,9 @@ import { getBackendSrv } from '@grafana/runtime/src';
 import { InlineField, Input, Select, Switch, useTheme2 } from '@grafana/ui';
 
 import { useUpdateDatasource } from '../../../../features/datasources/state';
-import { PromApplication, PromBuildInfoResponse } from '../../../../types/unified-alerting-dto';
 import { QueryEditorMode } from '../querybuilder/shared/types';
 import { defaultPrometheusQueryOverlapWindow } from '../querycache/QueryCache';
-import { PrometheusCacheLevel, PromOptions } from '../types';
+import { PromApplication, PromBuildInfoResponse, PrometheusCacheLevel, PromOptions } from '../types';
 
 import { docsTip, overhaulStyles, PROM_CONFIG_LABEL_WIDTH, validateInput } from './ConfigEditor';
 import { ExemplarsSettings } from './ExemplarsSettings';
diff --git a/public/app/plugins/datasource/prometheus/datasource.tsx b/public/app/plugins/datasource/prometheus/datasource.ts
similarity index 92%
rename from public/app/plugins/datasource/prometheus/datasource.tsx
rename to public/app/plugins/datasource/prometheus/datasource.ts
index e5ea02a88e951..5c684e2c31096 100644
--- a/public/app/plugins/datasource/prometheus/datasource.tsx
+++ b/public/app/plugins/datasource/prometheus/datasource.ts
@@ -1,12 +1,11 @@
 import { cloneDeep, defaults } from 'lodash';
-import { LRUCache } from 'lru-cache';
-import React from 'react';
 import { forkJoin, lastValueFrom, merge, Observable, of, OperatorFunction, pipe, throwError } from 'rxjs';
 import { catchError, filter, map, tap } from 'rxjs/operators';
 import semver from 'semver/preload';
 
 import {
   AbstractQuery,
+  AdHocVariableFilter,
   AnnotationEvent,
   AnnotationQueryRequest,
   CoreApp,
@@ -14,20 +13,19 @@ import {
   DataQueryError,
   DataQueryRequest,
   DataQueryResponse,
+  DataSourceGetTagKeysOptions,
+  DataSourceGetTagValuesOptions,
   DataSourceInstanceSettings,
   DataSourceWithQueryExportSupport,
   DataSourceWithQueryImportSupport,
   dateTime,
   LoadingState,
+  MetricFindValue,
   QueryFixAction,
   rangeUtil,
+  renderLegendFormat,
   ScopedVars,
   TimeRange,
-  renderLegendFormat,
-  DataSourceGetTagKeysOptions,
-  DataSourceGetTagValuesOptions,
-  MetricFindValue,
-  AdHocVariableFilter,
 } from '@grafana/data';
 import {
   BackendDataSourceResponse,
@@ -39,12 +37,9 @@ import {
   isFetchError,
   toDataQueryResponse,
 } from '@grafana/runtime';
-import { Badge, BadgeColor, Tooltip } from '@grafana/ui';
 import { safeStringifyValue } from 'app/core/utils/explore';
-import { discoverDataSourceFeatures } from 'app/features/alerting/unified/api/buildInfo';
 import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv';
-import { PromApiFeatures, PromApplication } from 'app/types/unified-alerting-dto';
 
 import { addLabelToQuery } from './add_label_to_query';
 import { AnnotationQueryEditor } from './components/AnnotationQueryEditor';
@@ -64,6 +59,7 @@ import { getOriginalMetricName, transform, transformV2 } from './result_transfor
 import { trackQuery } from './tracking';
 import {
   ExemplarTraceIdDestination,
+  PromApplication,
   PromDataErrorResponse,
   PromDataSuccessResponse,
   PrometheusCacheLevel,
@@ -95,7 +91,6 @@ export class PrometheusDatasource
   access: 'direct' | 'proxy';
   basicAuth: any;
   withCredentials: any;
-  metricsNameCache = new LRUCache<string, string[]>({ max: 10 });
   interval: string;
   queryTimeout: string | undefined;
   httpMethod: string;
@@ -108,8 +103,6 @@ export class PrometheusDatasource
   disableRecordingRules: boolean;
   defaultEditor?: QueryEditorMode;
   exemplarsAvailable: boolean;
-  subType: PromApplication;
-  rulerEnabled: boolean;
   cacheLevel: PrometheusCacheLevel;
   cache: QueryCache<PromQuery>;
 
@@ -122,8 +115,6 @@ export class PrometheusDatasource
     super(instanceSettings);
 
     this.type = 'prometheus';
-    this.subType = PromApplication.Prometheus;
-    this.rulerEnabled = false;
     this.id = instanceSettings.id;
     this.url = instanceSettings.url!;
     this.access = instanceSettings.access;
@@ -481,10 +472,6 @@ export class PrometheusDatasource
     return processedTargets;
   }
 
-  intepolateStringHelper = (query: PromQuery): string => {
-    return this.interpolateString(query.expr);
-  };
-
   query(request: DataQueryRequest<PromQuery>): Observable<DataQueryResponse> {
     if (this.access === 'proxy') {
       let fullOrPartialRequest: DataQueryRequest<PromQuery>;
@@ -1023,94 +1010,6 @@ export class PrometheusDatasource
     return result?.data?.data?.map((value: any) => ({ text: value })) ?? [];
   }
 
-  async getBuildInfo() {
-    try {
-      const buildInfo = await discoverDataSourceFeatures({ url: this.url, name: this.name, type: 'prometheus' });
-      return buildInfo;
-    } catch (error) {
-      // We don't want to break the rest of functionality if build info does not work correctly
-      return undefined;
-    }
-  }
-
-  getBuildInfoMessage(buildInfo: PromApiFeatures) {
-    const enabled = <Badge color="green" icon="check" text="Ruler API enabled" />;
-    const disabled = <Badge color="orange" icon="exclamation-triangle" text="Ruler API not enabled" />;
-    const unsupported = (
-      <Tooltip
-        placement="top"
-        content="Prometheus does not allow editing rules, connect to either a Mimir or Cortex datasource to manage alerts via Grafana."
-      >
-        <div>
-          <Badge color="red" icon="exclamation-triangle" text="Ruler API not supported" />
-        </div>
-      </Tooltip>
-    );
-
-    const LOGOS = {
-      [PromApplication.Cortex]: '/public/app/plugins/datasource/prometheus/img/cortex_logo.svg',
-      [PromApplication.Mimir]: '/public/app/plugins/datasource/prometheus/img/mimir_logo.svg',
-      [PromApplication.Prometheus]: '/public/app/plugins/datasource/prometheus/img/prometheus_logo.svg',
-      [PromApplication.Thanos]: '/public/app/plugins/datasource/prometheus/img/thanos_logo.svg',
-    };
-
-    const COLORS: Record<PromApplication, BadgeColor> = {
-      [PromApplication.Cortex]: 'blue',
-      [PromApplication.Mimir]: 'orange',
-      [PromApplication.Prometheus]: 'red',
-      [PromApplication.Thanos]: 'purple', // Purple hex taken from thanos.io
-    };
-
-    const AppDisplayNames: Record<PromApplication, string> = {
-      [PromApplication.Cortex]: 'Cortex',
-      [PromApplication.Mimir]: 'Mimir',
-      [PromApplication.Prometheus]: 'Prometheus',
-      [PromApplication.Thanos]: 'Thanos',
-    };
-
-    const application = this.datasourceConfigurationPrometheusFlavor ?? buildInfo.application;
-
-    // this will inform the user about what "subtype" the datasource is; Mimir, Cortex or vanilla Prometheus
-    const applicationSubType = (
-      <Badge
-        text={
-          <span>
-            <img
-              style={{ width: 14, height: 14, verticalAlign: 'text-bottom' }}
-              src={LOGOS[application ?? PromApplication.Prometheus]}
-              alt=""
-            />{' '}
-            {application ? AppDisplayNames[application] : 'Unknown'}
-          </span>
-        }
-        color={COLORS[application ?? PromApplication.Prometheus]}
-      />
-    );
-
-    return (
-      <div
-        style={{
-          display: 'grid',
-          gridTemplateColumns: 'max-content max-content',
-          rowGap: '0.5rem',
-          columnGap: '2rem',
-          marginTop: '1rem',
-        }}
-      >
-        <div>Type</div>
-        <div>{applicationSubType}</div>
-        <>
-          <div>Ruler API</div>
-          {/* Prometheus does not have a Ruler API – so show that it is not supported */}
-          {buildInfo.application === PromApplication.Prometheus && <div>{unsupported}</div>}
-          {buildInfo.application !== PromApplication.Prometheus && (
-            <div>{buildInfo.features.rulerApiEnabled ? enabled : disabled}</div>
-          )}
-        </>
-      </div>
-    );
-  }
-
   interpolateVariablesInQueries(
     queries: PromQuery[],
     scopedVars: ScopedVars,
diff --git a/public/app/plugins/datasource/prometheus/metric_find_query.test.ts b/public/app/plugins/datasource/prometheus/metric_find_query.test.ts
index 2acf59a6228d9..8e23307f1b320 100644
--- a/public/app/plugins/datasource/prometheus/metric_find_query.test.ts
+++ b/public/app/plugins/datasource/prometheus/metric_find_query.test.ts
@@ -6,11 +6,9 @@ import { FetchResponse } from '@grafana/runtime';
 import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__
 import { TemplateSrv } from 'app/features/templating/template_srv';
 
-import { PromApplication } from '../../../types/unified-alerting-dto';
-
 import { PrometheusDatasource } from './datasource';
 import PrometheusMetricFindQuery from './metric_find_query';
-import { PromOptions } from './types';
+import { PromApplication, PromOptions } from './types';
 
 jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
diff --git a/public/app/plugins/datasource/prometheus/migrations/variableMigration.ts b/public/app/plugins/datasource/prometheus/migrations/variableMigration.ts
index 8cf87585d5d2a..302191f98fbe7 100644
--- a/public/app/plugins/datasource/prometheus/migrations/variableMigration.ts
+++ b/public/app/plugins/datasource/prometheus/migrations/variableMigration.ts
@@ -105,7 +105,7 @@ export function migrateVariableEditorBackToVariableSupport(QueryVariable: PromVa
       }
       return 'label_names()';
     case QueryType.LabelValues:
-      if (QueryVariable.metric) {
+      if (QueryVariable.metric || (QueryVariable.labelFilters && QueryVariable.labelFilters.length !== 0)) {
         const visualQueryQuery = {
           metric: QueryVariable.metric,
           labels: QueryVariable.labelFilters ?? [],
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.test.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.test.tsx
index 7a04f3224dc05..3e3b148cd3251 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.test.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.test.tsx
@@ -12,11 +12,10 @@ import {
   TimeRange,
 } from '@grafana/data';
 
-import { PromApplication } from '../../../../../types/unified-alerting-dto';
 import { PrometheusDatasource } from '../../datasource';
 import PromQlLanguageProvider from '../../language_provider';
 import { EmptyLanguageProviderMock } from '../../language_provider.mock';
-import { PromOptions } from '../../types';
+import { PromApplication, PromOptions } from '../../types';
 import { getLabelSelects } from '../testUtils';
 import { PromVisualQuery } from '../types';
 
diff --git a/public/app/plugins/datasource/prometheus/types.ts b/public/app/plugins/datasource/prometheus/types.ts
index 266a0f089a087..2f0e26f9a9715 100644
--- a/public/app/plugins/datasource/prometheus/types.ts
+++ b/public/app/plugins/datasource/prometheus/types.ts
@@ -1,8 +1,6 @@
 import { DataSourceJsonData, QueryResultMeta, ScopedVars } from '@grafana/data';
 import { DataQuery } from '@grafana/schema';
 
-import { PromApplication } from '../../../types/unified-alerting-dto';
-
 import { Prometheus as GenPromQuery } from './dataquery.gen';
 import { QueryBuilderLabelFilter, QueryEditorMode } from './querybuilder/shared/types';
 
@@ -30,6 +28,13 @@ export enum PrometheusCacheLevel {
   None = 'None',
 }
 
+export enum PromApplication {
+  Cortex = 'Cortex',
+  Mimir = 'Mimir',
+  Prometheus = 'Prometheus',
+  Thanos = 'Thanos',
+}
+
 export interface PromOptions extends DataSourceJsonData {
   timeInterval?: string;
   queryTimeout?: string;
@@ -46,6 +51,7 @@ export interface PromOptions extends DataSourceJsonData {
   incrementalQueryOverlapWindow?: string;
   disableRecordingRules?: boolean;
   sigV4Auth?: boolean;
+  oauthPassThru?: boolean;
 }
 
 export type ExemplarTraceIdDestination = {
@@ -158,12 +164,20 @@ export interface TransformOptions {
   meta: QueryResultMeta;
 }
 
-export interface PromLabelQueryResponse {
+export interface PromBuildInfoResponse {
   data: {
-    status: string;
-    data: string[];
+    application?: string;
+    version: string;
+    revision: string;
+    features?: {
+      ruler_config_api?: 'true' | 'false';
+      alertmanager_config_api?: 'true' | 'false';
+      query_sharding?: 'true' | 'false';
+      federated_rules?: 'true' | 'false';
+    };
+    [key: string]: unknown;
   };
-  cancelled?: boolean;
+  status: 'success';
 }
 
 /**
diff --git a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/SearchField.tsx b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/SearchField.tsx
index d8b4a741ce130..01424057f1750 100644
--- a/public/app/plugins/datasource/tempo/SearchTraceQLEditor/SearchField.tsx
+++ b/public/app/plugins/datasource/tempo/SearchTraceQLEditor/SearchField.tsx
@@ -81,7 +81,9 @@ const SearchField = ({
     setError,
     query,
   ]);
-  if (filter.value && options && !options.find((o) => o === filter.value)) {
+
+  // Add selected option if it doesn't exist in the current list of options
+  if (filter.value && !Array.isArray(filter.value) && options && !options.find((o) => o.value === filter.value)) {
     options.push({ label: filter.value.toString(), value: filter.value.toString(), type: filter.valueType });
   }
 
diff --git a/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx
index db84833b9e65d..43d5cf502cfa2 100644
--- a/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx
@@ -81,7 +81,7 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
           description={
             <ConfigDescriptionLink
               description="Select a Prometheus data source that contains the service graph data."
-              suffix="tempo/#service-graph"
+              suffix="tempo/configure-tempo-data-source/#service-graph"
               feature="the service graph"
             />
           }
@@ -98,7 +98,7 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
           description={
             <ConfigDescriptionLink
               description="Modify how traces are searched."
-              suffix="tempo/#tempo-search"
+              suffix="tempo/configure-tempo-data-source/#tempo-search"
               feature="Tempo search"
             />
           }
@@ -112,7 +112,7 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
           description={
             <ConfigDescriptionLink
               description="Select a Loki data source to search for traces. Derived fields must be configured in the Loki data source."
-              suffix="tempo/#loki-search"
+              suffix="tempo/configure-tempo-data-source/#loki-search"
               feature="Loki search"
             />
           }
@@ -126,7 +126,7 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
           description={
             <ConfigDescriptionLink
               description="Modify how TraceID queries are run."
-              suffix="tempo/#traceid-query"
+              suffix="tempo/configure-tempo-data-source/#traceid-query"
               feature="the TraceID query"
             />
           }
diff --git a/public/app/plugins/panel/alertlist/AlertList.tsx b/public/app/plugins/panel/alertlist/AlertList.tsx
index f0d8c893103a9..3ef7825186680 100644
--- a/public/app/plugins/panel/alertlist/AlertList.tsx
+++ b/public/app/plugins/panel/alertlist/AlertList.tsx
@@ -4,7 +4,7 @@ import React, { useState } from 'react';
 import { useAsync } from 'react-use';
 
 import { dateMath, dateTime, GrafanaTheme2, PanelProps } from '@grafana/data';
-import { getBackendSrv, getTemplateSrv } from '@grafana/runtime';
+import { getBackendSrv } from '@grafana/runtime';
 import { Card, CustomScrollbar, Icon, useStyles2 } from '@grafana/ui';
 import alertDef from 'app/features/alerting/state/alertDef';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
@@ -23,10 +23,9 @@ export function AlertList(props: PanelProps<AlertListOptions>) {
     const params: any = {
       state: getStateFilter(props.options.stateFilter),
     };
-    const panel = getDashboardSrv().getCurrent()?.getPanelById(props.id)!;
 
     if (props.options.alertName) {
-      params.query = getTemplateSrv().replace(props.options.alertName, panel.scopedVars);
+      params.query = props.replaceVariables(props.options.alertName);
     }
 
     if (props.options.folderId >= 0) {
diff --git a/public/app/plugins/panel/canvas/editor/element/APIEditor.tsx b/public/app/plugins/panel/canvas/editor/element/APIEditor.tsx
index 9a4e9445a2ea9..5eb7b606a8e59 100644
--- a/public/app/plugins/panel/canvas/editor/element/APIEditor.tsx
+++ b/public/app/plugins/panel/canvas/editor/element/APIEditor.tsx
@@ -6,7 +6,6 @@ import {
   StringFieldConfigSettings,
   SelectableValue,
 } from '@grafana/data';
-import { config } from '@grafana/runtime';
 import { Button, Field, InlineField, InlineFieldRow, JSONFormatter, RadioButtonGroup, Select } from '@grafana/ui';
 import { StringValueEditor } from 'app/core/components/OptionsUI/string';
 import { defaultApiConfig } from 'app/features/canvas/elements/button';
@@ -132,7 +131,7 @@ export function APIEditor({ value, context, onChange }: Props) {
   const renderTestAPIButton = (api: APIEditorConfig) => {
     if (api && api.endpoint) {
       return (
-        <Button onClick={() => callApi(api, true)} title="Test API">
+        <Button onClick={() => callApi(api)} title="Test API">
           Test API
         </Button>
       );
@@ -141,7 +140,7 @@ export function APIEditor({ value, context, onChange }: Props) {
     return;
   };
 
-  return config.disableSanitizeHtml ? (
+  return (
     <>
       <InlineFieldRow>
         <InlineField label="Endpoint" labelWidth={LABEL_WIDTH} grow={true}>
@@ -158,36 +157,36 @@ export function APIEditor({ value, context, onChange }: Props) {
           <RadioButtonGroup value={value?.method} options={httpMethodOptions} onChange={onMethodChange} fullWidth />
         </InlineField>
       </InlineFieldRow>
+      {value?.method === HttpRequestMethod.POST && (
+        <InlineFieldRow>
+          <InlineField label="Content-Type" labelWidth={LABEL_WIDTH} grow={true}>
+            <Select
+              options={contentTypeOptions}
+              allowCustomValue={true}
+              formatCreateLabel={formatCreateLabel}
+              value={value?.contentType}
+              onChange={onContentTypeChange}
+            />
+          </InlineField>
+        </InlineFieldRow>
+      )}
+
+      <br />
       <Field label="Query parameters">
         <ParamsEditor value={value?.queryParams ?? []} onChange={onQueryParamsChange} />
       </Field>
       <Field label="Header parameters">
         <ParamsEditor value={value?.headerParams ?? []} onChange={onHeaderParamsChange} />
       </Field>
-      {value?.method === HttpRequestMethod.POST && (
-        <>
-          <InlineFieldRow>
-            <InlineField label="Content-Type" labelWidth={LABEL_WIDTH} grow={true}>
-              <Select
-                options={contentTypeOptions}
-                allowCustomValue={true}
-                formatCreateLabel={formatCreateLabel}
-                value={value?.contentType}
-                onChange={onContentTypeChange}
-              />
-            </InlineField>
-          </InlineFieldRow>
-          {value?.contentType && (
-            <Field label="Payload">
-              <StringValueEditor
-                context={context}
-                value={value?.data ?? '{}'}
-                onChange={onDataChange}
-                item={{ ...dummyStringSettings, settings: { useTextarea: true } }}
-              />
-            </Field>
-          )}
-        </>
+      {value?.method === HttpRequestMethod.POST && value?.contentType && (
+        <Field label="Payload">
+          <StringValueEditor
+            context={context}
+            value={value?.data ?? '{}'}
+            onChange={onDataChange}
+            item={{ ...dummyStringSettings, settings: { useTextarea: true } }}
+          />
+        </Field>
       )}
       {renderTestAPIButton(value)}
       <br />
@@ -195,7 +194,5 @@ export function APIEditor({ value, context, onChange }: Props) {
         value?.contentType === defaultApiConfig.contentType &&
         renderJSON(value?.data ?? '{}')}
     </>
-  ) : (
-    <>Must enable disableSanitizeHtml feature flag to access</>
   );
 }
diff --git a/public/app/plugins/panel/canvas/editor/element/utils.ts b/public/app/plugins/panel/canvas/editor/element/utils.ts
index 46201539f15e6..8b34aee5836f0 100644
--- a/public/app/plugins/panel/canvas/editor/element/utils.ts
+++ b/public/app/plugins/panel/canvas/editor/element/utils.ts
@@ -7,11 +7,14 @@ import { HttpRequestMethod } from '../../panelcfg.gen';
 
 import { APIEditorConfig } from './APIEditor';
 
-export const callApi = (api: APIEditorConfig, isTest = false) => {
+type IsLoadingCallback = (loading: boolean) => void;
+
+export const callApi = (api: APIEditorConfig, updateLoadingStateCallback?: IsLoadingCallback) => {
   if (api && api.endpoint) {
     // If API endpoint origin matches Grafana origin, don't call it.
     if (requestMatchesGrafanaOrigin(api.endpoint)) {
       appEvents.emit(AppEvents.alertError, ['Cannot call API at Grafana origin.']);
+      updateLoadingStateCallback && updateLoadingStateCallback(false);
       return;
     }
     const request = getRequest(api);
@@ -20,15 +23,12 @@ export const callApi = (api: APIEditorConfig, isTest = false) => {
       .fetch(request)
       .subscribe({
         error: (error) => {
-          if (isTest) {
-            appEvents.emit(AppEvents.alertError, ['Error has occurred: ', JSON.stringify(error)]);
-            console.error(error);
-          }
+          appEvents.emit(AppEvents.alertError, ['An error has occurred: ', JSON.stringify(error)]);
+          updateLoadingStateCallback && updateLoadingStateCallback(false);
         },
         complete: () => {
-          if (isTest) {
-            appEvents.emit(AppEvents.alertSuccess, ['Test successful']);
-          }
+          appEvents.emit(AppEvents.alertSuccess, ['API call was successful']);
+          updateLoadingStateCallback && updateLoadingStateCallback(false);
         },
       });
   }
diff --git a/public/app/plugins/panel/geomap/GeomapOverlay.tsx b/public/app/plugins/panel/geomap/GeomapOverlay.tsx
index 0c48318a4a87b..d7135e0068254 100644
--- a/public/app/plugins/panel/geomap/GeomapOverlay.tsx
+++ b/public/app/plugins/panel/geomap/GeomapOverlay.tsx
@@ -28,29 +28,29 @@ export const GeomapOverlay = ({ topRight1, topRight2, bottomLeft, blStyle }: Ove
 };
 
 const getStyles = (topRight1Exists: boolean) => (theme: GrafanaTheme2) => ({
-  overlay: css`
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    z-index: 500;
-    pointer-events: none;
-  `,
-  TR1: css`
-    right: 0.5em;
-    pointer-events: auto;
-    position: absolute;
-    top: 0.5em;
-  `,
-  TR2: css`
-    position: absolute;
-    top: ${topRight1Exists ? '80' : '8'}px;
-    right: 8px;
-    pointer-events: auto;
-  `,
-  BL: css`
-    position: absolute;
-    bottom: 8px;
-    left: 8px;
-    pointer-events: auto;
-  `,
+  overlay: css({
+    position: 'absolute',
+    width: '100%',
+    height: '100%',
+    zIndex: 500,
+    pointerEvents: 'none',
+  }),
+  TR1: css({
+    right: '0.5em',
+    pointerEvents: 'auto',
+    position: 'absolute',
+    top: '0.5em',
+  }),
+  TR2: css({
+    position: 'absolute',
+    top: topRight1Exists ? '80px' : '8px',
+    right: '8px',
+    pointerEvents: 'auto',
+  }),
+  BL: css({
+    position: 'absolute',
+    bottom: '8px',
+    left: '8px',
+    pointerEvents: 'auto',
+  }),
 });
diff --git a/public/app/plugins/panel/geomap/GeomapPanel.tsx b/public/app/plugins/panel/geomap/GeomapPanel.tsx
index f9cdad583d34e..151192bae4c21 100644
--- a/public/app/plugins/panel/geomap/GeomapPanel.tsx
+++ b/public/app/plugins/panel/geomap/GeomapPanel.tsx
@@ -400,15 +400,15 @@ export class GeomapPanel extends Component<Props, State> {
 }
 
 const styles = {
-  wrap: css`
-    position: relative;
-    width: 100%;
-    height: 100%;
-  `,
-  map: css`
-    position: absolute;
-    z-index: 0;
-    width: 100%;
-    height: 100%;
-  `,
+  wrap: css({
+    position: 'relative',
+    width: '100%',
+    height: '100%',
+  }),
+  map: css({
+    position: 'absolute',
+    zIndex: 0,
+    width: '100%',
+    height: '100%',
+  }),
 };
diff --git a/public/app/plugins/panel/geomap/components/DebugOverlay.tsx b/public/app/plugins/panel/geomap/components/DebugOverlay.tsx
index 4cfbba909d760..c30b7a6683252 100644
--- a/public/app/plugins/panel/geomap/components/DebugOverlay.tsx
+++ b/public/app/plugins/panel/geomap/components/DebugOverlay.tsx
@@ -7,7 +7,6 @@ import tinycolor from 'tinycolor2';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors/src';
-import { stylesFactory } from '@grafana/ui';
 import { config } from 'app/core/config';
 
 interface Props {
@@ -64,11 +63,11 @@ export class DebugOverlay extends PureComponent<Props, State> {
   }
 }
 
-const getStyles = stylesFactory((theme: GrafanaTheme2) => ({
-  infoWrap: css`
-    color: ${theme.colors.text.primary};
-    background: ${tinycolor(theme.components.panel.background).setAlpha(0.7).toString()};
-    border-radius: 2px;
-    padding: 8px;
-  `,
-}));
+const getStyles = (theme: GrafanaTheme2) => ({
+  infoWrap: css({
+    color: theme.colors.text.primary,
+    background: tinycolor(theme.components.panel.background).setAlpha(0.7).toString(),
+    borderRadius: theme.shape.radius.default,
+    padding: theme.spacing(1),
+  }),
+});
diff --git a/public/app/plugins/panel/geomap/components/MarkersLegend.tsx b/public/app/plugins/panel/geomap/components/MarkersLegend.tsx
index 3abe7e0a6dd26..a322627b7fbe6 100644
--- a/public/app/plugins/panel/geomap/components/MarkersLegend.tsx
+++ b/public/app/plugins/panel/geomap/components/MarkersLegend.tsx
@@ -131,53 +131,54 @@ export function MarkersLegend(props: MarkersLegendProps) {
 }
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  infoWrap: css`
-    display: flex;
-    flex-direction: column;
-    background: ${theme.colors.background.secondary};
-    border-radius: 1px;
-    padding: ${theme.spacing(1)};
-    border-bottom: 2px solid ${theme.colors.border.strong};
-    min-width: 150px;
-  `,
-  layerName: css`
-    font-size: ${theme.typography.body.fontSize};
-  `,
-  layerBody: css`
-    padding-left: 10px;
-  `,
-  legend: css`
-    line-height: 18px;
-    display: flex;
-    flex-direction: column;
-    font-size: ${theme.typography.bodySmall.fontSize};
-    padding: 5px 10px 0;
-
-    i {
-      width: 15px;
-      height: 15px;
-      float: left;
-      margin-right: 8px;
-      opacity: 0.7;
-      border-radius: ${theme.shape.radius.circle};
-    }
-  `,
-  legendItem: css`
-    white-space: nowrap;
-  `,
-  fixedColorContainer: css`
-    min-width: 80px;
-    font-size: ${theme.typography.bodySmall.fontSize};
-    padding-top: 5px;
-  `,
-  legendSymbol: css`
-    height: 18px;
-    width: 18px;
-    margin: auto;
-  `,
-  colorScaleWrapper: css`
-    min-width: 200px;
-    font-size: ${theme.typography.bodySmall.fontSize};
-    padding-top: 10px;
-  `,
+  infoWrap: css({
+    display: 'flex',
+    flexDirection: 'column',
+    background: theme.colors.background.secondary,
+    // eslint-disable-next-line @grafana/no-border-radius-literal
+    borderRadius: '1px',
+    padding: theme.spacing(1),
+    borderBottom: `2px solid ${theme.colors.border.strong}`,
+    minWidth: '150px',
+  }),
+  layerName: css({
+    fontSize: theme.typography.body.fontSize,
+  }),
+  layerBody: css({
+    paddingLeft: '10px',
+  }),
+  legend: css({
+    lineHeight: '18px',
+    display: 'flex',
+    flexDirection: 'column',
+    fontSize: theme.typography.bodySmall.fontSize,
+    padding: '5px 10px 0',
+
+    i: {
+      width: '15px',
+      height: '15px',
+      float: 'left',
+      marginRight: '8px',
+      opacity: 0.7,
+      borderRadius: theme.shape.radius.circle,
+    },
+  }),
+  legendItem: css({
+    whiteSpace: 'nowrap',
+  }),
+  fixedColorContainer: css({
+    minWidth: '80px',
+    fontSize: theme.typography.bodySmall.fontSize,
+    paddingTop: '5px',
+  }),
+  legendSymbol: css({
+    height: '18px',
+    width: '18px',
+    margin: 'auto',
+  }),
+  colorScaleWrapper: css({
+    minWidth: '200px',
+    fontSize: theme.typography.bodySmall.fontSize,
+    paddingTop: '10px',
+  }),
 });
diff --git a/public/app/plugins/panel/geomap/components/MeasureOverlay.tsx b/public/app/plugins/panel/geomap/components/MeasureOverlay.tsx
index 945bc99a5e061..600b813e8a71a 100644
--- a/public/app/plugins/panel/geomap/components/MeasureOverlay.tsx
+++ b/public/app/plugins/panel/geomap/components/MeasureOverlay.tsx
@@ -3,7 +3,7 @@ import Map from 'ol/Map';
 import React, { useMemo, useRef, useState } from 'react';
 
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { Button, IconButton, RadioButtonGroup, Select, stylesFactory } from '@grafana/ui';
+import { Button, IconButton, RadioButtonGroup, Select } from '@grafana/ui';
 import { config } from 'app/core/config';
 
 import { MapMeasure, MapMeasureOptions, measures } from '../utils/measure';
@@ -109,32 +109,33 @@ export const MeasureOverlay = ({ map, menuActiveState }: Props) => {
   );
 };
 
-const getStyles = stylesFactory((theme: GrafanaTheme2) => ({
-  button: css`
-    margin-left: auto;
-  `,
-  icon: css`
-    background-color: ${theme.colors.secondary.main};
-    display: inline-block;
-    height: 19.25px;
-    margin: 1px;
-    width: 19.25px;
-  `,
-  infoWrap: css`
-    color: ${theme.colors.text};
-    background-color: ${theme.colors.background.secondary};
-    border-radius: 4px;
-    padding: 2px;
-  `,
-  infoWrapClosed: css`
-    height: 25.25px;
-    width: 25.25px;
-  `,
-  rowGroup: css`
-    display: flex;
-    justify-content: flex-end;
-  `,
-  unitSelect: css`
-    min-width: 200px;
-  `,
-}));
+const getStyles = (theme: GrafanaTheme2) => ({
+  button: css({
+    marginLeft: 'auto',
+  }),
+  icon: css({
+    backgroundColor: theme.colors.secondary.main,
+    display: 'inline-block',
+    height: '19.25px',
+    margin: '1px',
+    width: '19.25px',
+  }),
+  infoWrap: css({
+    color: `${theme.colors.text}`,
+    backgroundColor: theme.colors.background.secondary,
+    // eslint-disable-next-line @grafana/no-border-radius-literal
+    borderRadius: '4px',
+    padding: '2px',
+  }),
+  infoWrapClosed: css({
+    height: '25.25px',
+    width: '25.25px',
+  }),
+  rowGroup: css({
+    display: 'flex',
+    justifyContent: 'flex-end',
+  }),
+  unitSelect: css({
+    minWidth: '200px',
+  }),
+});
diff --git a/public/app/plugins/panel/geomap/editor/StyleRuleEditor.tsx b/public/app/plugins/panel/geomap/editor/StyleRuleEditor.tsx
index d395569d2b714..3aadfa756563d 100644
--- a/public/app/plugins/panel/geomap/editor/StyleRuleEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/StyleRuleEditor.tsx
@@ -200,23 +200,23 @@ export const StyleRuleEditor = ({ value, onChange, item, context }: Props) => {
 };
 
 const getStyles = (theme: GrafanaTheme2) => ({
-  rule: css`
-    margin-bottom: ${theme.spacing(1)};
-  `,
-  row: css`
-    display: flex;
-    margin-bottom: 4px;
-  `,
-  inline: css`
-    margin-bottom: 0;
-    margin-left: 4px;
-  `,
-  button: css`
-    margin-left: 4px;
-  `,
-  flexRow: css`
-    display: flex;
-    flex-direction: row;
-    align-items: flex-start;
-  `,
+  rule: css({
+    marginBottom: theme.spacing(1),
+  }),
+  row: css({
+    display: 'flex',
+    marginBottom: '4px',
+  }),
+  inline: css({
+    marginBottom: 0,
+    marginLeft: '4px',
+  }),
+  button: css({
+    marginLeft: '4px',
+  }),
+  flexRow: css({
+    display: 'flex',
+    flexDirection: 'row',
+    alignItems: 'flex-start',
+  }),
 });
diff --git a/public/app/plugins/panel/geomap/globalStyles.ts b/public/app/plugins/panel/geomap/globalStyles.ts
index 6b43228b50ffe..56b1eb9d302cd 100644
--- a/public/app/plugins/panel/geomap/globalStyles.ts
+++ b/public/app/plugins/panel/geomap/globalStyles.ts
@@ -46,39 +46,39 @@ export function getGlobalStyles(theme: GrafanaTheme2) {
   //   border: 2px dotted rgba(0,60,136,0.7);
   // }
 
-  return css`
-    .ol-scale-line {
-      background: ${theme.colors.border.weak}; // rgba(0,60,136,0.3);
-    }
-    .ol-scale-line-inner {
-      border: 1px solid ${theme.colors.text.primary}; // #eee;
-      border-top: 0px;
-      color: ${theme.colors.text.primary}; //  #eee;
-    }
-    .ol-control {
-      background-color: ${theme.colors.background.primary}; //rgba(255,255,255,0.4);
-    }
-    .ol-control:hover {
-      background-color: ${theme.colors.background.secondary}; // rgba(255,255,255,0.6);
-    }
-    .ol-control button {
-      color: ${theme.colors.secondary.text}; // white;
-      background-color: ${theme.colors.secondary.main}; // rgba(0,60,136,0.5);
-    }
-    .ol-control button:hover {
-      color: ${theme.colors.secondary.text};
-      background-color: ${theme.colors.secondary.shade}; // rgba(0,60,136,0.5);
-    }
-    .ol-control button:focus {
-      color: ${theme.colors.secondary.text};
-      background-color: ${theme.colors.secondary.main}; // rgba(0,60,136,0.5);
-    }
-    .ol-attribution ul {
-      color: ${theme.colors.text.primary}; //  #000;
-      text-shadow: none;
-    }
-    .ol-attribution:not(.ol-collapsed) {
-      background-color: ${theme.colors.background.secondary}; // rgba(255,255,255,0.8);
-    }
-  `;
+  return css({
+    '.ol-scale-line': {
+      background: theme.colors.border.weak, // rgba(0,60,136,0.3);
+    },
+    '.ol-scale-line-inner': {
+      border: `1px solid ${theme.colors.text.primary}`, // #eee;
+      borderTop: 0, // 0px;
+      color: theme.colors.text.primary, //  #eee;
+    },
+    '.ol-control': {
+      backgroundColor: theme.colors.background.primary, // rgba(255,255,255,0.4);
+    },
+    '.ol-control:hover': {
+      backgroundColor: theme.colors.background.secondary, // rgba(255,255,255,0.6);
+    },
+    '.ol-control button': {
+      color: theme.colors.secondary.text, // white;
+      backgroundColor: theme.colors.secondary.main, // rgba(0,60,136,0.5);
+    },
+    '.ol-control button:hover': {
+      color: theme.colors.secondary.text,
+      backgroundColor: theme.colors.secondary.shade, // rgba(0,60,136,0.5);
+    },
+    '.ol-control button:focus': {
+      color: theme.colors.secondary.text,
+      backgroundColor: theme.colors.secondary.main, // rgba(0,60,136,0.5);
+    },
+    '.ol-attribution ul': {
+      color: theme.colors.text.primary, //  #000;
+      textShadow: 'none',
+    },
+    '.ol-attribution:not(.ol-collapsed)': {
+      backgroundColor: theme.colors.background.secondary, // rgba(255,255,255,0.8);
+    },
+  });
 }
diff --git a/public/app/plugins/panel/table/TableCellOptionEditor.tsx b/public/app/plugins/panel/table/TableCellOptionEditor.tsx
index b90fb577279e2..5eb8b698b3665 100644
--- a/public/app/plugins/panel/table/TableCellOptionEditor.tsx
+++ b/public/app/plugins/panel/table/TableCellOptionEditor.tsx
@@ -3,7 +3,7 @@ import { merge } from 'lodash';
 import React, { useState } from 'react';
 
 import { GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { config, reportInteraction } from '@grafana/runtime';
+import { reportInteraction } from '@grafana/runtime';
 import { TableCellOptions } from '@grafana/schema';
 import { Field, Select, TableCellDisplayMode, useStyles2 } from '@grafana/ui';
 
@@ -77,14 +77,9 @@ export const TableCellOptionEditor = ({ value, onChange }: Props) => {
   );
 };
 
-const SparklineDisplayModeOption: SelectableValue<TableCellOptions> = {
-  value: { type: TableCellDisplayMode.Sparkline },
-  label: 'Sparkline',
-};
-
 const cellDisplayModeOptions: Array<SelectableValue<TableCellOptions>> = [
   { value: { type: TableCellDisplayMode.Auto }, label: 'Auto' },
-  ...(config.featureToggles.timeSeriesTable ? [SparklineDisplayModeOption] : []),
+  { value: { type: TableCellDisplayMode.Sparkline }, label: 'Sparkline' },
   { value: { type: TableCellDisplayMode.ColorText }, label: 'Colored text' },
   { value: { type: TableCellDisplayMode.ColorBackground }, label: 'Colored background' },
   { value: { type: TableCellDisplayMode.Gauge }, label: 'Gauge' },
diff --git a/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx b/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx
index 2e7ade9d591d4..61799c51c18ac 100644
--- a/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx
+++ b/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx
@@ -1,7 +1,7 @@
 import { css } from '@emotion/css';
 import React, { useMemo } from 'react';
 
-import { createFieldConfigRegistry } from '@grafana/data';
+import { createFieldConfigRegistry, SetFieldConfigOptionsArgs } from '@grafana/data';
 import { GraphFieldConfig, TableSparklineCellOptions } from '@grafana/schema';
 import { VerticalGroup, Field, useStyles2 } from '@grafana/ui';
 import { defaultSparklineCellConfig } from '@grafana/ui/src/components/Table/SparklineCell';
@@ -11,7 +11,8 @@ import { TableCellEditorProps } from '../TableCellOptionEditor';
 
 type OptionKey = keyof TableSparklineCellOptions;
 
-const optionIds: Array<keyof GraphFieldConfig> = [
+const optionIds: Array<keyof TableSparklineCellOptions> = [
+  'hideValue',
   'drawStyle',
   'lineInterpolation',
   'barAlignment',
@@ -24,11 +25,25 @@ const optionIds: Array<keyof GraphFieldConfig> = [
   'pointSize',
 ];
 
+function getChartCellConfig(cfg: GraphFieldConfig): SetFieldConfigOptionsArgs<GraphFieldConfig> {
+  const graphFieldConfig = getGraphFieldConfig(cfg);
+  return {
+    ...graphFieldConfig,
+    useCustomConfig: (builder) => {
+      graphFieldConfig.useCustomConfig?.(builder);
+      builder.addBooleanSwitch({
+        path: 'hideValue',
+        name: 'Hide value',
+      });
+    },
+  };
+}
+
 export const SparklineCellOptionsEditor = (props: TableCellEditorProps<TableSparklineCellOptions>) => {
   const { cellOptions, onChange } = props;
 
   const registry = useMemo(() => {
-    const config = getGraphFieldConfig(defaultSparklineCellConfig);
+    const config = getChartCellConfig(defaultSparklineCellConfig);
     return createFieldConfigRegistry(config, 'ChartCell');
   }, []);
 
diff --git a/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx
index ee6573ff7cff4..d3e06eaf2d9b4 100644
--- a/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx
+++ b/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import React, { useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useClickAway } from 'react-use';
 
 import { CartesianCoords2D, DataFrame, getFieldDisplayName, InterpolateFunction, TimeZone } from '@grafana/data';
@@ -11,7 +11,6 @@ import {
   MenuItem,
   UPlotConfigBuilder,
 } from '@grafana/ui';
-import { pluginLog } from '@grafana/ui/src/components/uPlot/utils';
 
 type ContextMenuSelectionCoords = { viewport: CartesianCoords2D; plotCanvas: CartesianCoords2D };
 type ContextMenuSelectionPoint = { seriesIdx: number | null; dataIdx: number | null };
@@ -39,108 +38,37 @@ export const ContextMenuPlugin = ({
   replaceVariables,
   ...otherProps
 }: ContextMenuPluginProps) => {
-  const plotCanvas = useRef<HTMLDivElement>();
   const [coords, setCoords] = useState<ContextMenuSelectionCoords | null>(null);
   const [point, setPoint] = useState<ContextMenuSelectionPoint | null>(null);
   const [isOpen, setIsOpen] = useState(false);
 
-  const openMenu = useCallback(() => {
-    setIsOpen(true);
-  }, [setIsOpen]);
-
-  const closeMenu = useCallback(() => {
-    setIsOpen(false);
-  }, [setIsOpen]);
-
-  const clearSelection = useCallback(() => {
-    pluginLog('ContextMenuPlugin', false, 'clearing click selection');
-    setPoint(null);
-  }, [setPoint]);
-
-  // Add uPlot hooks to the config, or re-add when the config changed
   useLayoutEffect(() => {
-    let bbox: DOMRect | undefined = undefined;
-
-    const onMouseCapture = (e: MouseEvent) => {
-      let update = {
-        viewport: {
-          x: e.clientX,
-          y: e.clientY,
-        },
-        plotCanvas: {
-          x: 0,
-          y: 0,
-        },
-      };
-      if (bbox) {
-        update = {
-          ...update,
-          plotCanvas: {
-            x: e.clientX - bbox.left,
-            y: e.clientY - bbox.top,
-          },
-        };
-      }
-      setCoords(update);
-    };
-
-    // cache uPlot plotting area bounding box
-    config.addHook('syncRect', (u, rect) => {
-      bbox = rect;
-    });
+    let seriesIdx: number | null = null;
 
     config.addHook('init', (u) => {
-      const canvas = u.over;
-      plotCanvas.current = canvas || undefined;
-      plotCanvas.current?.addEventListener('mousedown', onMouseCapture);
-
-      pluginLog('ContextMenuPlugin', false, 'init');
-      // for naive click&drag check
-      let isClick = false;
-
-      // REF: https://github.com/leeoniya/uPlot/issues/239
-      let pts = Array.from(u.root.querySelectorAll<HTMLDivElement>('.u-cursor-pt'));
-
-      plotCanvas.current?.addEventListener('mousedown', () => {
-        isClick = true;
-      });
-
-      plotCanvas.current?.addEventListener('mousemove', () => {
-        isClick = false;
-      });
-
-      // TODO: remove listeners on unmount
-      plotCanvas.current?.addEventListener('mouseup', (e: MouseEvent) => {
-        // ignore cmd+click, this is handled by annotation editor
-        if (!isClick || e.metaKey || e.ctrlKey) {
-          setPoint(null);
-          return;
-        }
-        isClick = true;
-
-        if (e.target instanceof HTMLElement) {
-          if (!e.target.classList.contains('u-cursor-pt')) {
-            pluginLog('ContextMenuPlugin', false, 'canvas click');
-            setPoint({ seriesIdx: null, dataIdx: null });
-          }
+      u.over.addEventListener('click', (e) => {
+        // only open when have a focused point, and not for explicit annotations, zooms, etc.
+        if (seriesIdx != null && !e.metaKey && !e.ctrlKey && !e.shiftKey) {
+          setCoords({
+            viewport: {
+              x: e.clientX,
+              y: e.clientY,
+            },
+            plotCanvas: {
+              x: e.clientX - u.rect.left,
+              y: e.clientY - u.rect.top,
+            },
+          });
+          setPoint({ seriesIdx, dataIdx: u.cursor.idxs![seriesIdx] });
+          setIsOpen(true);
         }
-
-        openMenu();
       });
+    });
 
-      if (pts.length > 0) {
-        pts.forEach((pt, i) => {
-          // TODO: remove listeners on unmount
-          pt.addEventListener('click', () => {
-            const seriesIdx = i + 1;
-            const dataIdx = u.cursor.idx;
-            pluginLog('ContextMenuPlugin', false, seriesIdx, dataIdx);
-            setPoint({ seriesIdx, dataIdx: dataIdx ?? null });
-          });
-        });
-      }
+    config.addHook('setSeries', (u, _seriesIdx) => {
+      seriesIdx = _seriesIdx;
     });
-  }, [config, openMenu, setCoords, setPoint]);
+  }, [config]);
 
   const defaultItems = useMemo(() => {
     return otherProps.defaultItems
@@ -175,8 +103,8 @@ export const ContextMenuPlugin = ({
           selection={{ point, coords }}
           replaceVariables={replaceVariables}
           onClose={() => {
-            clearSelection();
-            closeMenu();
+            setPoint(null);
+            setIsOpen(false);
             if (onClose) {
               onClose();
             }
diff --git a/public/app/plugins/panel/trend/TrendPanel.tsx b/public/app/plugins/panel/trend/TrendPanel.tsx
index 1241485acc1e4..371b0679a6521 100644
--- a/public/app/plugins/panel/trend/TrendPanel.tsx
+++ b/public/app/plugins/panel/trend/TrendPanel.tsx
@@ -14,7 +14,6 @@ import {
 import { XYFieldMatchers } from '@grafana/ui/src/components/GraphNG/types';
 import { findFieldIndex } from 'app/features/dimensions';
 
-import { ContextMenuPlugin } from '../timeseries/plugins/ContextMenuPlugin';
 import { prepareGraphableFields, regenerateLinksSupplier } from '../timeseries/utils';
 
 import { Options } from './panelcfg.gen';
@@ -137,15 +136,6 @@ export const TrendPanel = ({
                 timeZone={timeZone}
               />
             )}
-
-            <ContextMenuPlugin
-              data={alignedDataFrame}
-              frames={info.frames!}
-              config={config}
-              timeZone={timeZone}
-              replaceVariables={replaceVariables}
-              defaultItems={[]}
-            />
           </>
         );
       }}
diff --git a/public/app/types/alerting.ts b/public/app/types/alerting.ts
index dbec1fdeb20be..4f4fee28e19e9 100644
--- a/public/app/types/alerting.ts
+++ b/public/app/types/alerting.ts
@@ -71,7 +71,8 @@ export type CloudNotifierType =
   | 'webex'
   | 'telegram'
   | 'sns'
-  | 'discord';
+  | 'discord'
+  | 'msteams';
 
 export type NotifierType = GrafanaNotifierType | CloudNotifierType;
 export interface NotifierDTO<T = NotifierType> {
diff --git a/public/img/grafana_text_logo_dark.svg b/public/img/grafana_text_logo_dark.svg
new file mode 100644
index 0000000000000..68d56d355d981
--- /dev/null
+++ b/public/img/grafana_text_logo_dark.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 394 92.9" style="enable-background:new 0 0 394 92.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#414142;}
+	.st1{fill:url(#SVGID_1_);}
+</style>
+<g>
+	<path class="st0" d="M160.7,50.1C160.1,66.3,147.3,79,131.4,79c-16.8,0-29.2-13.6-29.2-30c0-16.5,13.5-30.1,30-30.1
+		c7.4,0,14.7,3.2,20.9,8.9l-4.8,5.9c-4.7-4.1-10.4-6.9-16.1-6.9c-12.1,0-22,9.9-22,22.1c0,12.4,9.3,22,21.3,22
+		c10.7,0,19.1-7.8,20.8-17.9h-24.3V46h32.8L160.7,50.1L160.7,50.1z"/>
+	<path class="st0" d="M188.6,46.2h-4.5c-4.9,0-8.9,4-8.9,9v23.3h-8v-40h6.6v3.4c2.2-2.2,5.6-3.4,9.4-3.4h8.6L188.6,46.2z"/>
+	<path class="st0" d="M232.1,78.5h-6.8v-5c-5.2,5.1-13.5,7.6-21.9,3.9c-6.2-2.7-10.9-8.4-12.1-15.1c-2.4-12.9,7.6-24.4,20.3-24.4
+		c5.4,0,10.1,2.2,13.7,5.7v-5h6.9L232.1,78.5L232.1,78.5z M223.9,61.4c1.9-8.1-4.3-15.5-12.3-15.5c-6.9,0-12.6,5.7-12.6,12.5
+		c0,7.8,6.8,13.8,14.8,12.4C218.8,70,222.8,66.2,223.9,61.4z"/>
+	<path class="st0" d="M248.2,36.3v2.2h12.7v7h-12.7v32.9h-7.9v-42c0-8.8,6.3-14,14.2-14h9.6l-3.2,7.5h-6.4
+		C251,30.1,248.2,32.9,248.2,36.3z"/>
+	<path class="st0" d="M303.3,78.5h-6.8v-5c-5.2,5.1-13.5,7.6-21.9,3.9c-6.2-2.7-10.9-8.4-12.1-15.1c-2.4-12.9,7.6-24.4,20.3-24.4
+		c5.4,0,10.1,2.2,13.7,5.7v-5h6.9L303.3,78.5L303.3,78.5z M295.1,61.4c1.9-8.1-4.3-15.5-12.3-15.5c-7,0-12.5,5.7-12.5,12.5
+		c0,7.8,6.8,13.8,14.8,12.4C290,70,294,66.2,295.1,61.4z"/>
+	<path class="st0" d="M346,54.8v23.7h-8V54.8c0-5-4.1-9-9-9c-5,0-9,4-9,9v23.7h-8v-40h6.6V42c2.9-2.6,6.7-4.1,10.7-4.1
+		C338.6,37.9,346,45.5,346,54.8z"/>
+	<path class="st0" d="M393,78.5h-6.8v-5c-5.2,5.1-13.5,7.6-21.9,3.9c-6.2-2.7-10.9-8.4-12.1-15.1c-2.4-12.9,7.6-24.4,20.3-24.4
+		c5.4,0,10.1,2.2,13.7,5.7v-5h6.9L393,78.5L393,78.5z M384.8,61.4c1.9-8.1-4.3-15.5-12.3-15.5c-7,0-12.5,5.7-12.5,12.5
+		c0,7.8,6.8,13.8,14.8,12.4C379.6,70,383.6,66.2,384.8,61.4z"/>
+</g>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="42.81" y1="-19.8217" x2="42.81" y2="65.0744" gradientTransform="matrix(1 0 0 -1 0 94)">
+	<stop  offset="0" style="stop-color:#FCEE1D"/>
+	<stop  offset="1" style="stop-color:#F15A29"/>
+</linearGradient>
+<path class="st1" d="M85.4,41c-0.1-1.6-0.4-3.4-0.9-5.3c-0.5-2-1.3-4.1-2.4-6.4c-1.1-2.2-2.6-4.6-4.5-6.9c-0.7-0.9-1.6-1.8-2.4-2.6
+	c1.3-5.2-1.6-9.7-1.6-9.7c-5-0.3-8.2,1.6-9.4,2.4c-0.2-0.1-0.4-0.2-0.6-0.2c-0.8-0.4-1.7-0.7-2.6-0.9s-1.8-0.5-2.8-0.8
+	c-0.9-0.2-1.9-0.4-2.9-0.6c-0.2,0-0.3-0.1-0.5-0.1c-2.2-7-8.5-9.9-8.5-9.9c-7,4.4-8.3,10.6-8.3,10.6s0,0.1-0.1,0.4
+	c-0.4,0.1-0.8,0.2-1.2,0.3c-0.5,0.2-1.1,0.4-1.6,0.6c-0.5,0.2-1.1,0.4-1.6,0.6c-1,0.4-2.1,1-3.1,1.5c-1,0.6-2,1.2-2.9,1.8
+	c-0.1-0.1-0.2-0.1-0.2-0.1c-9.7-3.7-18.3,0.8-18.3,0.8C8.4,26.8,13,33.3,13.9,34.5c-0.2,0.6-0.4,1.3-0.6,1.9
+	c-0.7,2.3-1.2,4.7-1.6,7.2c-0.1,0.3-0.1,0.7-0.1,1.1C2.7,49.1,0,58.1,0,58.1c7.5,8.6,16.1,9.1,16.1,9.1c0,0,0,0,0,0
+	c1.1,2,2.4,3.8,3.8,5.6c0.6,0.7,1.2,1.4,1.9,2.1c-2.7,7.8,0.4,14.2,0.4,14.2c8.3,0.3,13.8-3.6,14.9-4.5c0.8,0.3,1.7,0.5,2.5,0.8
+	c2.5,0.7,5.2,1,7.8,1.2c0.7,0,1.3,0,2,0h0.3l0.2,0l0.4,0l0.4,0l0,0c3.9,5.6,10.8,6.4,10.8,6.4c4.9-5.2,5.2-10.3,5.2-11.4l0,0
+	c0,0,0,0,0-0.1c0-0.1,0-0.2,0-0.2l0,0c0-0.1,0-0.2,0-0.2c1-0.7,2-1.5,2.9-2.3c2-1.8,3.7-3.8,5.1-6c0.1-0.2,0.3-0.4,0.4-0.6
+	c5.5,0.3,9.4-3.4,9.4-3.4c-0.9-5.8-4.2-8.6-4.9-9.1l0,0c0,0,0,0-0.1,0s-0.1,0-0.1,0l0,0c0,0-0.1,0-0.1-0.1c0-0.3,0.1-0.7,0.1-1
+	c0-0.6,0.1-1.2,0.1-1.9v-0.5v-0.2v-0.1c0-0.2,0-0.1,0-0.2l0-0.4l0-0.5c0-0.2,0-0.3,0-0.5c0-0.2,0-0.3-0.1-0.5l-0.1-0.5l-0.1-0.5
+	c-0.1-0.6-0.2-1.3-0.4-1.9c-0.6-2.5-1.6-4.8-2.8-7c-1.3-2.1-2.9-4-4.7-5.6c-1.8-1.6-3.8-2.9-5.9-3.8s-4.3-1.6-6.5-1.8
+	c-1.1-0.1-2.2-0.2-3.3-0.2l-0.4,0h-0.1c0,0-0.2,0-0.1,0l-0.2,0l-0.4,0c-0.2,0-0.3,0-0.5,0c-0.6,0-1.1,0.1-1.7,0.2
+	c-2.2,0.4-4.3,1.2-6.1,2.3c-1.8,1.1-3.4,2.5-4.7,4c-1.3,1.5-2.3,3.3-3,5s-1.1,3.6-1.2,5.4c0,0.4,0,0.9,0,1.3c0,0.1,0,0.2,0,0.3
+	l0,0.4c0,0.2,0,0.4,0,0.6c0.1,0.9,0.2,1.8,0.5,2.6c0.5,1.7,1.2,3.2,2.2,4.5c1,1.3,2.1,2.3,3.3,3.2c1.2,0.8,2.5,1.4,3.8,1.8
+	c1.3,0.4,2.5,0.5,3.8,0.5c0.2,0,0.3,0,0.5,0c0.1,0,0.2,0,0.2,0s0.2,0,0.2,0c0.1,0,0.2,0,0.4,0c0,0,0.1,0,0.1,0l0.1,0
+	c0.1,0,0.2,0,0.2,0c0.2,0,0.3-0.1,0.4-0.1c0.1,0,0.3-0.1,0.4-0.1c0.3-0.1,0.5-0.1,0.8-0.2c0.5-0.2,1-0.4,1.5-0.6
+	c0.5-0.2,0.9-0.5,1.3-0.8c0.1-0.1,0.2-0.2,0.3-0.2c0.4-0.3,0.5-0.9,0.2-1.3c-0.3-0.4-0.8-0.5-1.2-0.2c-0.1,0-0.2,0.1-0.3,0.2
+	c-0.3,0.2-0.7,0.3-1.1,0.5c-0.4,0.1-0.8,0.2-1.2,0.3c-0.2,0-0.4,0.1-0.6,0.1c-0.1,0-0.2,0-0.3,0c-0.1,0-0.2,0-0.3,0s-0.2,0-0.3,0
+	c-0.1,0-0.3,0-0.4,0c0,0-0.1,0,0,0h0l-0.1,0c-0.1,0-0.1,0-0.2,0c-0.1,0-0.2,0-0.3,0c-0.9-0.1-1.9-0.4-2.8-0.8
+	c-0.9-0.4-1.8-1-2.6-1.7s-1.5-1.6-2-2.5s-0.9-2-1.1-3.2c-0.1-0.6-0.1-1.2-0.1-1.7c0-0.2,0-0.3,0-0.5c0,0,0,0,0,0v-0.1l0-0.1
+	c0-0.1,0-0.2,0-0.2c0-0.3,0.1-0.6,0.1-0.9c0.4-2.5,1.7-4.9,3.6-6.7c0.5-0.5,1-0.9,1.5-1.2c0.5-0.4,1.1-0.7,1.7-1
+	c0.6-0.3,1.2-0.5,1.9-0.7c0.7-0.2,1.3-0.3,2-0.3c0.3,0,0.7,0,1,0c0.1,0,0.2,0,0.2,0l0.3,0l0.2,0c0.1,0,0,0,0,0h0.1l0.3,0
+	c0.7,0.1,1.5,0.2,2.2,0.3c1.4,0.3,2.8,0.8,4.2,1.6c2.6,1.5,4.8,3.7,6.2,6.4c0.7,1.4,1.2,2.8,1.4,4.3c0.1,0.4,0.1,0.8,0.1,1.1l0,0.3
+	l0,0.3c0,0.1,0,0.2,0,0.3c0,0.1,0,0.2,0,0.3v0.2l0,0.3c0,0.2,0,0.5,0,0.7c0,0.4-0.1,0.8-0.1,1.2c-0.1,0.4-0.1,0.8-0.2,1.2
+	c-0.1,0.4-0.2,0.8-0.3,1.2c-0.2,0.8-0.5,1.6-0.8,2.4c-0.6,1.5-1.4,3-2.4,4.4c-2,2.7-4.7,4.9-7.7,6.3c-1.5,0.7-3.2,1.2-4.8,1.5
+	c-0.8,0.1-1.7,0.2-2.5,0.2l-0.2,0h-0.1h-0.3h-0.4h-0.2c0.1,0,0,0,0,0h-0.1c-0.5,0-0.9,0-1.3-0.1c-1.8-0.1-3.6-0.4-5.3-0.9
+	s-3.4-1.2-5-2c-3.2-1.7-6-4-8.2-6.8c-1.1-1.4-2.1-2.9-2.9-4.5c-0.8-1.6-1.4-3.2-1.9-4.9c-0.5-1.7-0.8-3.4-0.9-5.2l0-0.3l0-0.1V50
+	v-0.1l0-0.3v-0.1v-0.1v-0.2l0-0.4v-0.1c0,0,0,0,0,0v-0.2c0-0.2,0-0.4,0-0.6c0-0.9,0.1-1.7,0.2-2.6c0.1-0.9,0.3-1.8,0.4-2.7
+	s0.4-1.8,0.6-2.6c0.5-1.7,1.1-3.4,1.8-4.9c1.5-3.1,3.4-5.9,5.6-8.1c0.6-0.6,1.2-1.1,1.8-1.6c0.6-0.5,1.2-1,1.9-1.4
+	c0.7-0.4,1.3-0.8,2-1.2c0.3-0.2,0.7-0.4,1-0.5c0.2-0.1,0.4-0.2,0.5-0.2s0.4-0.2,0.5-0.2c0.7-0.3,1.5-0.6,2.2-0.8
+	c0.2-0.1,0.4-0.1,0.6-0.2s0.4-0.1,0.6-0.2c0.4-0.1,0.8-0.2,1.2-0.3c0.2,0,0.4-0.1,0.6-0.1c0.2,0,0.4-0.1,0.6-0.1
+	c0.2,0,0.4-0.1,0.6-0.1l0.3,0l0.3,0c0.2,0,0.4-0.1,0.6-0.1c0.2,0,0.4,0,0.7-0.1c0.2,0,0.5-0.1,0.7-0.1c0.1,0,0.3,0,0.4,0l0.3,0
+	l0.1,0l0.2,0c0.2,0,0.4,0,0.7,0l0.3,0c0,0,0.1,0,0,0h0.1l0.1,0c0.2,0,0.4,0,0.6,0c0.8,0,1.5,0,2.2,0c1.5,0.1,3,0.2,4.4,0.5
+	c2.8,0.5,5.5,1.4,7.9,2.6c2.4,1.2,4.6,2.6,6.5,4.2c0.1,0.1,0.2,0.2,0.3,0.3c0.1,0.1,0.2,0.2,0.3,0.3c0.2,0.2,0.4,0.4,0.7,0.6
+	s0.4,0.4,0.6,0.6c0.2,0.2,0.4,0.4,0.6,0.6c0.8,0.9,1.5,1.7,2.2,2.6c1.3,1.7,2.4,3.5,3.3,5.1c0.1,0.1,0.1,0.2,0.2,0.3
+	c0.1,0.1,0.1,0.2,0.2,0.3c0.1,0.2,0.2,0.4,0.3,0.6c0.1,0.2,0.2,0.4,0.3,0.6c0.1,0.2,0.2,0.4,0.2,0.6c0.3,0.8,0.6,1.5,0.8,2.2
+	c0.4,1.1,0.7,2.1,0.9,3c0.1,0.3,0.4,0.6,0.8,0.5c0.4,0,0.7-0.3,0.7-0.7C85.6,43.4,85.5,42.3,85.4,41z"/>
+</svg>
diff --git a/public/img/grafana_text_logo_light.svg b/public/img/grafana_text_logo_light.svg
new file mode 100644
index 0000000000000..1dd0ec6a841b6
--- /dev/null
+++ b/public/img/grafana_text_logo_light.svg
@@ -0,0 +1,20 @@
+<svg width="51" height="12" viewBox="0 0 51 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group">
+<g id="Group_2">
+<path id="Vector" d="M21.0019 6.47335C20.9193 8.56783 19.269 10.2013 17.2145 10.2013C15.0477 10.2013 13.4375 8.44774 13.4375 6.32744C13.4388 5.29889 13.8469 4.3126 14.5726 3.58373C15.2983 2.85486 16.2828 2.44256 17.3114 2.43677C18.2708 2.43677 19.2096 2.84998 20.005 3.59893L19.3865 4.36209C18.7783 3.83524 18.0448 3.47497 17.3127 3.47497C16.5573 3.47804 15.8339 3.78064 15.3014 4.31636C14.7688 4.85209 14.4705 5.5772 14.4718 6.3326C14.4718 7.93252 15.6792 9.17345 17.2171 9.17345C17.8666 9.17164 18.494 8.93767 18.9861 8.5138C19.4782 8.08992 19.8025 7.50407 19.9004 6.86203H16.7639V5.94005H21.0045V6.47723L21.0019 6.47335Z" fill="#E6E7E8"/>
+<path id="Vector_2" d="M24.6028 5.96833H24.0243C23.7161 5.96833 23.4205 6.09077 23.2025 6.30872C22.9846 6.52667 22.8621 6.82227 22.8621 7.13049V10.1366H21.8291V4.97791H22.6749V5.41178C22.9538 5.13286 23.3967 4.97791 23.8926 4.97791H25.007L24.6028 5.96833Z" fill="#E6E7E8"/>
+<path id="Vector_3" d="M30.2256 10.1367H29.3488V9.49102C28.9837 9.85236 28.5173 10.0942 28.0115 10.1843C27.5058 10.2745 26.9846 10.2088 26.517 9.99592C25.9545 9.75428 25.4927 9.32574 25.2098 8.78279C24.9269 8.23984 24.8402 7.61583 24.9645 7.01633C25.0887 6.41683 25.4162 5.87866 25.8916 5.49287C26.367 5.10708 26.9611 4.89735 27.5733 4.89918C27.9011 4.89862 28.2258 4.96303 28.5285 5.0887C28.8313 5.21437 29.1062 5.39881 29.3372 5.63135V4.9857H30.2243V10.1509L30.2256 10.1367ZM29.1693 7.92856C29.2504 7.58815 29.2195 7.23067 29.0812 6.90925C28.9428 6.58782 28.7045 6.31961 28.4015 6.14447C28.0986 5.96933 27.7472 5.8966 27.3996 5.93711C27.0521 5.97762 26.7268 6.12919 26.4723 6.3693C26.2177 6.60941 26.0475 6.92525 25.9867 7.26987C25.926 7.61449 25.9781 7.9695 26.1353 8.28215C26.2925 8.59479 26.5464 8.84837 26.8592 9.00522C27.172 9.16206 27.527 9.21378 27.8716 9.15271C28.1838 9.09754 28.473 8.95224 28.7036 8.73473C28.9342 8.51721 29.0961 8.23697 29.1693 7.92856Z" fill="#E6E7E8"/>
+<path id="Vector_4" d="M32.3036 4.68881V4.97806H33.9449V5.88196H32.3036V10.1368H31.2822V4.7198C31.2822 3.58475 32.097 2.91199 33.1184 2.91199H34.3568L33.9436 3.88175H33.1184C33.0118 3.88073 32.906 3.90085 32.8072 3.94095C32.7084 3.98105 32.6185 4.04033 32.5428 4.11538C32.467 4.19042 32.4068 4.27974 32.3658 4.37816C32.3248 4.47659 32.3036 4.58217 32.3036 4.68881Z" fill="#E6E7E8"/>
+<path id="Vector_5" d="M39.4141 10.1367H38.5373V9.49102C38.1721 9.85236 37.7058 10.0942 37.2 10.1843C36.6943 10.2745 36.1731 10.2088 35.7055 9.99592C35.143 9.75428 34.6812 9.32574 34.3983 8.78279C34.1154 8.23984 34.0287 7.61583 34.1529 7.01633C34.2772 6.41683 34.6047 5.87866 35.0801 5.49287C35.5555 5.10708 36.1495 4.89735 36.7618 4.89918C37.0896 4.89862 37.4143 4.96303 37.717 5.0887C38.0198 5.21437 38.2946 5.39881 38.5257 5.63135V4.9857H39.4128V10.1509L39.4141 10.1367ZM38.3591 7.92856C38.4402 7.58815 38.4093 7.23067 38.2709 6.90925C38.1326 6.58782 37.8942 6.31961 37.5913 6.14447C37.2884 5.96933 36.937 5.8966 36.5894 5.93711C36.2418 5.97762 35.9166 6.12919 35.6621 6.3693C35.4075 6.60941 35.2372 6.92525 35.1765 7.26987C35.1158 7.61449 35.1679 7.9695 35.3251 8.28215C35.4823 8.59479 35.7361 8.84837 36.0489 9.00522C36.3617 9.16206 36.7168 9.21378 37.0614 9.15271C37.3735 9.09754 37.6627 8.95224 37.8933 8.73473C38.1239 8.51721 38.2858 8.23697 38.3591 7.92856Z" fill="#E6E7E8"/>
+<path id="Vector_6" d="M44.9304 7.08282V10.1367H43.8974V7.08282C43.8974 6.77459 43.775 6.47899 43.557 6.26104C43.3391 6.0431 43.0435 5.92065 42.7352 5.92065C42.427 5.92065 42.1314 6.0431 41.9135 6.26104C41.6955 6.47899 41.5731 6.77459 41.5731 7.08282V10.1367H40.54V4.97801H41.3962V5.42351C41.7778 5.08571 42.2695 4.89883 42.7791 4.89795C43.0643 4.89878 43.3464 4.95611 43.6092 5.06662C43.872 5.17713 44.1103 5.33863 44.3104 5.54179C44.5104 5.74495 44.6682 5.98574 44.7746 6.25025C44.8811 6.51475 44.934 6.79773 44.9304 7.08282Z" fill="#E6E7E8"/>
+<path id="Vector_7" d="M51 10.1367H50.1233V9.49102C49.7581 9.85236 49.2917 10.0942 48.7859 10.1843C48.2802 10.2745 47.759 10.2088 47.2914 9.99592C46.7289 9.75428 46.2671 9.32574 45.9842 8.78279C45.7013 8.23984 45.6146 7.61583 45.7389 7.01633C45.8631 6.41683 46.1906 5.87866 46.666 5.49287C47.1414 5.10708 47.7355 4.89735 48.3477 4.89918C48.6755 4.89862 49.0002 4.96303 49.303 5.0887C49.6057 5.21437 49.8806 5.39881 50.1116 5.63135V4.9857H50.9987V10.1509L51 10.1367ZM49.9451 7.92856C50.0259 7.58786 49.9946 7.23015 49.8558 6.90867C49.717 6.58719 49.4781 6.31912 49.1747 6.14435C48.8712 5.96959 48.5195 5.89746 48.1717 5.93871C47.824 5.97996 47.4989 6.13238 47.2448 6.37329C46.9906 6.6142 46.8211 6.93073 46.7614 7.27576C46.7016 7.62079 46.7549 7.97589 46.9132 8.28822C47.0715 8.60055 47.3265 8.85341 47.6401 9.00917C47.9537 9.16494 48.3092 9.21528 48.6538 9.15271C48.9636 9.09525 49.25 8.94894 49.4781 8.73159C49.7062 8.51424 49.8662 8.23523 49.9386 7.92856H49.9451Z" fill="#E6E7E8"/>
+</g>
+<path id="Vector_8" d="M11.5393 5.29431C11.5186 5.06109 11.4784 4.83 11.4193 4.60347C11.3438 4.31793 11.2399 4.04065 11.1093 3.77575C10.9505 3.45985 10.7555 3.16345 10.5283 2.8925C10.4296 2.7744 10.3248 2.66148 10.2145 2.55418C10.306 2.1257 10.2327 1.67846 10.0092 1.30162C9.5824 1.26237 9.15524 1.37235 8.80051 1.61283L8.72432 1.58054C8.61456 1.53535 8.50092 1.49403 8.38471 1.45142C8.26849 1.4088 8.14969 1.38169 8.02831 1.35199C7.90693 1.32229 7.78297 1.29904 7.65771 1.27967L7.59185 1.27063C7.40573 0.722157 7.01476 0.266876 6.50071 0C5.5968 0.572043 5.42764 1.37265 5.42764 1.37265C5.42764 1.37265 5.42764 1.39072 5.4186 1.42042L5.26881 1.46433C5.19908 1.48499 5.13194 1.51081 5.06221 1.53535C4.99248 1.55988 4.92533 1.58829 4.85689 1.61799C4.71925 1.67679 4.58477 1.74274 4.45401 1.81556C4.3266 1.88787 4.20134 1.96664 4.07824 2.05187L4.04725 2.03766C3.27896 1.75969 2.43225 1.79447 1.68935 2.13451C1.58863 3.46325 2.1865 4.30001 2.30659 4.45109C2.27689 4.53374 2.24977 4.61638 2.22394 4.70031C2.13 5.00396 2.06175 5.31496 2.01992 5.63004C2.01346 5.67524 2.0083 5.72173 2.00313 5.76821C1.30016 6.13427 0.764799 6.75654 0.507812 7.5063C1.47112 8.61423 2.59325 8.68266 2.59325 8.68266C2.73802 8.93664 2.90435 9.17771 3.0904 9.40321C3.16788 9.49747 3.25052 9.58915 3.33446 9.67696C3.12558 10.2757 3.14303 10.9303 3.38353 11.5171C4.07332 11.5496 4.75313 11.3425 5.30755 10.9308C5.41473 10.967 5.52191 10.9992 5.63167 11.0277C5.96004 11.1121 6.29628 11.1623 6.635 11.1774C6.71894 11.1774 6.80287 11.1774 6.89326 11.1774H7.01465H7.06759C7.57248 11.898 8.46089 12 8.46089 12C9.09234 11.3337 9.12849 10.6738 9.12849 10.5305V10.5008C9.12849 10.4905 9.12849 10.4814 9.12849 10.4698C9.26068 10.3779 9.38704 10.2778 9.50684 10.1702C9.75829 9.94127 9.9792 9.68087 10.1641 9.39546L10.2145 9.3154C10.6623 9.32792 11.0981 9.16957 11.4335 8.87249C11.3752 8.41555 11.1504 7.9962 10.802 7.69482H10.793L10.7852 7.68837L10.7697 7.67804C10.7697 7.63284 10.7775 7.58894 10.7801 7.54891C10.7852 7.46885 10.7878 7.38879 10.7878 7.30873V7.1796V7.12924V7.06209C10.7878 7.03885 10.7878 7.01819 10.7878 6.99752C10.7878 6.97686 10.7878 6.9562 10.7878 6.93554L10.7801 6.87356L10.771 6.81158C10.7594 6.73023 10.7426 6.64888 10.7245 6.56752C10.5791 5.93936 10.2404 5.3726 9.75606 4.94695C9.52736 4.74555 9.26966 4.5797 8.99162 4.45497C8.71699 4.33197 8.42527 4.25142 8.12645 4.21608C7.98512 4.19829 7.84276 4.19009 7.70032 4.19154H7.59444H7.54278H7.48468C7.4127 4.19789 7.34114 4.20823 7.27032 4.22253C6.72555 4.32296 6.23283 4.61019 5.87701 5.03476C5.71412 5.22782 5.58332 5.44582 5.48963 5.68041C5.40326 5.90272 5.35186 6.13707 5.33725 6.37512C5.33725 6.43194 5.33725 6.49005 5.33725 6.54557C5.33725 6.55978 5.33725 6.57398 5.33725 6.58818V6.63467C5.33725 6.66179 5.33725 6.6902 5.33725 6.71731C5.34825 6.8309 5.36942 6.94326 5.40053 7.05305C5.51638 7.45364 5.76791 7.80149 6.11203 8.03702C6.39929 8.23998 6.7417 8.35036 7.09341 8.35338H7.2135H7.26257H7.27678H7.29227H7.32197L7.37879 8.34305C7.39687 8.34305 7.41495 8.34305 7.43302 8.33143C7.46804 8.32367 7.50254 8.31376 7.53633 8.30173C7.60146 8.28019 7.6649 8.25386 7.72615 8.22296C7.78283 8.19327 7.8376 8.16006 7.89014 8.12353L7.93276 8.09125C7.95692 8.0709 7.97279 8.04239 7.97735 8.01113C7.98191 7.97987 7.97486 7.94802 7.95751 7.92161C7.94017 7.8952 7.91375 7.87606 7.88325 7.86782C7.85275 7.85958 7.82028 7.86281 7.792 7.8769L7.75327 7.89756C7.70725 7.92004 7.6598 7.93945 7.61122 7.95567C7.5599 7.97145 7.50773 7.98439 7.45498 7.9944L7.37233 8.00473H7.33101H7.24966H7.1993H7.18122H7.15927H7.11407C6.91493 7.9772 6.72488 7.90387 6.55885 7.7905C6.39283 7.67713 6.25535 7.52681 6.15723 7.35134C6.08629 7.22426 6.03821 7.08571 6.01518 6.942C6.00335 6.86859 5.9986 6.79422 6.00098 6.7199C6.00098 6.69924 6.00098 6.67987 6.00098 6.65921V6.63209C6.00098 6.62176 6.00098 6.61272 6.00098 6.60239C6.00098 6.56236 6.01131 6.52233 6.01777 6.4823C6.07602 6.15314 6.23747 5.85105 6.47876 5.61971C6.54061 5.56067 6.60711 5.50669 6.67762 5.4583C6.74832 5.40906 6.82305 5.36587 6.90101 5.32917C6.97965 5.29285 7.06131 5.26347 7.14507 5.24136C7.22975 5.21914 7.31613 5.20403 7.40332 5.19617C7.44723 5.19617 7.49113 5.19617 7.53245 5.19617H7.63317H7.66933C7.7641 5.20332 7.8582 5.21756 7.95083 5.23878C8.13989 5.27423 8.32293 5.33641 8.49447 5.42344C8.83851 5.61431 9.1174 5.90399 9.29507 6.25503C9.38451 6.43079 9.44595 6.61944 9.47714 6.81416C9.48489 6.86323 9.49006 6.9123 9.49393 6.96137V6.99882V7.03626C9.49457 7.04874 9.49457 7.06124 9.49393 7.07371C9.49458 7.08532 9.49458 7.09696 9.49393 7.10858V7.17702C9.49393 7.20155 9.49393 7.24029 9.49393 7.26482C9.49393 7.31906 9.48489 7.372 9.47843 7.42623C9.47198 7.48047 9.46294 7.53212 9.4539 7.58506C9.44486 7.63801 9.43195 7.68966 9.41903 7.74131C9.39292 7.84548 9.3597 7.94773 9.3196 8.04735C9.23979 8.24808 9.13525 8.43808 9.0084 8.61293C8.75126 8.96564 8.40806 9.2466 8.01152 9.42903C7.71468 9.5648 7.39383 9.6403 7.06759 9.65114H6.90359C6.84549 9.65114 6.78738 9.65114 6.72927 9.6421C6.49789 9.62536 6.26892 9.58424 6.04617 9.51942C5.6036 9.3896 5.19213 9.17093 4.8369 8.87676C4.48167 8.58258 4.19014 8.21908 3.9801 7.80846C3.8776 7.60618 3.79542 7.39423 3.73476 7.17572C3.67533 6.95838 3.63812 6.73557 3.62371 6.51071V6.46809V6.26407C3.62371 6.23695 3.62371 6.20984 3.62371 6.18143C3.62751 6.06825 3.63699 5.95533 3.65211 5.84311C3.66632 5.72947 3.68569 5.61455 3.70893 5.50091C3.73217 5.38728 3.76058 5.27494 3.79157 5.16518C3.85365 4.94673 3.93266 4.73345 4.02788 4.52728C4.20413 4.13559 4.45102 3.77972 4.75617 3.47746C4.82907 3.40537 4.90579 3.33726 4.98602 3.27343C5.06479 3.21016 5.14743 3.1443 5.23266 3.09523C5.31592 3.0394 5.40213 2.9881 5.49092 2.94157C5.53482 2.91703 5.58131 2.89637 5.6265 2.87442L5.69623 2.84343L5.76596 2.81373C5.85894 2.7737 5.95578 2.74142 6.05263 2.71043L6.12623 2.68848L6.19984 2.66781C6.24891 2.65361 6.29927 2.64199 6.34834 2.63037L6.42323 2.61358L6.49813 2.59808L6.57431 2.58388L6.61176 2.57742H6.64921L6.7254 2.5658C6.7538 2.5658 6.78221 2.5658 6.81062 2.55418L6.89585 2.54385H6.95008H6.98624H7.02498H7.11149H7.1541H7.1838H7.25741C7.35469 2.54385 7.45153 2.54385 7.54795 2.54385C7.73735 2.55102 7.92596 2.57217 8.11225 2.60712C8.46763 2.67313 8.81221 2.78785 9.13624 2.94803C9.43592 3.0949 9.7165 3.2779 9.97171 3.49295L10.0169 3.53169L10.0608 3.57043L10.1473 3.6492C10.1757 3.67502 10.2029 3.70214 10.23 3.72926C10.2571 3.75638 10.2842 3.78349 10.3087 3.81061C10.4089 3.91599 10.5037 4.02632 10.5928 4.14118C10.753 4.34734 10.8939 4.56779 11.0138 4.79974C11.0138 4.81265 11.028 4.82557 11.0344 4.83977L11.0538 4.8798C11.0667 4.90563 11.0796 4.93145 11.0913 4.95728C11.1029 4.98311 11.1158 5.00893 11.1261 5.03347L11.1584 5.10836C11.1997 5.20779 11.2372 5.30206 11.2669 5.39115C11.3172 5.53449 11.3547 5.66491 11.3831 5.77854C11.3893 5.80022 11.403 5.819 11.4217 5.83155C11.4404 5.84411 11.463 5.84965 11.4854 5.84717C11.5078 5.8447 11.5287 5.83438 11.5442 5.81804C11.5597 5.8017 11.569 5.78039 11.5703 5.75788C11.5561 5.59905 11.5535 5.45701 11.5393 5.29431Z" fill="url(#paint0_linear_121_904)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_121_904" x1="6.03584" y1="14.6975" x2="6.03584" y2="3.73571" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FCEE1D"/>
+<stop offset="1" stop-color="#F15A29"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/public/img/transformations/dark/formatString.svg b/public/img/transformations/dark/formatString.svg
new file mode 100644
index 0000000000000..1ef2c0ce65b97
--- /dev/null
+++ b/public/img/transformations/dark/formatString.svg
@@ -0,0 +1,25 @@
+<svg width="58" height="48" viewBox="0 0 58 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 1.04083V13H15V0H0.626828C0.460583 0 0.301147 0.109659 0.183594 0.304853C0.0660407 0.500047 0 0.764787 0 1.04083Z" fill="url(#paint0_linear_1810_47693)"/>
+<path d="M15 17.5H0V30.5H15V17.5Z" fill="#84AFF1"/>
+<path d="M15 35H0V48H15V35Z" fill="#84AFF1"/>
+<path d="M9.65 9.3H9.3V3.35C9.3 3.25717 9.26313 3.16815 9.19749 3.10251C9.13185 3.03687 9.04283 3 8.95 3H7.725C7.66392 3.00037 7.604 3.01672 7.5512 3.04742C7.49839 3.07812 7.45454 3.1221 7.424 3.175L3.8505 9.3H3.35C3.25717 9.3 3.16815 9.33687 3.10251 9.40251C3.03687 9.46815 3 9.55717 3 9.65C3 9.74283 3.03687 9.83185 3.10251 9.89749C3.16815 9.96313 3.25717 10 3.35 10H4.75C4.84283 10 4.93185 9.96313 4.99749 9.89749C5.06313 9.83185 5.1 9.74283 5.1 9.65C5.1 9.55717 5.06313 9.46815 4.99749 9.40251C4.93185 9.33687 4.84283 9.3 4.75 9.3H4.659L5.884 7.2H8.6V9.3H8.25C8.15717 9.3 8.06815 9.33687 8.00251 9.40251C7.93687 9.46815 7.9 9.55717 7.9 9.65C7.9 9.74283 7.93687 9.83185 8.00251 9.89749C8.06815 9.96313 8.15717 10 8.25 10H9.65C9.74283 10 9.83185 9.96313 9.89749 9.89749C9.96313 9.83185 10 9.74283 10 9.65C10 9.55717 9.96313 9.46815 9.89749 9.40251C9.83185 9.33687 9.74283 9.3 9.65 9.3ZM8.6 6.5H6.2935L7.9245 3.7H8.6V6.5Z" fill="white"/>
+<path d="M6.84608 27C7.52244 27 7.9902 26.7377 8.25569 26.2415H8.29362V26.9178H9.74747V23.6182C9.74747 22.591 8.83407 22 7.59829 22C6.29298 22 5.55341 22.6574 5.43015 23.5424L6.85556 23.5929C6.92193 23.2832 7.17794 23.0936 7.58565 23.0936C7.96492 23.0936 8.20512 23.2769 8.20512 23.6024V23.6182C8.20512 23.9153 7.88274 23.9785 7.05468 24.0512C6.07174 24.1334 5.25 24.4968 5.25 25.5714C5.25 26.5322 5.91688 27 6.84608 27ZM7.32333 25.9886C6.96618 25.9886 6.71334 25.818 6.71334 25.4956C6.71334 25.1827 6.95986 24.993 7.39918 24.9267C7.68679 24.8856 8.04077 24.8224 8.2146 24.7307V25.1922C8.2146 25.6662 7.81637 25.9886 7.32333 25.9886Z" fill="#24292E"/>
+<path d="M5 44.4362H6.56634V43.7145H6.61489C6.81553 44.1261 7.26214 44.5 8.01294 44.5C9.11327 44.5 10 43.729 10 42.213C10 40.642 9.06149 39.9261 8.02265 39.9261C7.23625 39.9261 6.80583 40.3377 6.61489 40.7464H6.58252V38.5H5V44.4362ZM6.55016 42.2101C6.55016 41.4826 6.88673 41.0333 7.46602 41.0333C8.05178 41.0333 8.3754 41.4942 8.3754 42.2101C8.3754 42.929 8.05178 43.3957 7.46602 43.3957C6.88673 43.3957 6.55016 42.9319 6.55016 42.2101Z" fill="#24292E"/>
+<path d="M28.9067 30C29.6011 30 34.9327 26 34.9327 24C34.9327 22 29.7357 18 28.9067 18C28.0777 18 27.4023 18.5 27.4023 19.4756C27.4023 20.4512 30.9067 22.9206 30.9067 22.9206C30.9067 22.9206 23.2539 22.25 23 22.9206C22.7461 23.5911 22.7461 24.4089 23 25.0794C23.2539 25.75 30.9067 25.0794 30.9067 25.0794C30.9067 25.0794 27.4023 27.75 27.4023 28.5301C27.4023 29.3103 28.2123 30 28.9067 30Z" fill="#CCCCDC"/>
+<path d="M43 1.04083V13H58V0H43.6268C43.4606 0 43.3011 0.109659 43.1836 0.304853C43.066 0.500047 43 0.764787 43 1.04083Z" fill="url(#paint1_linear_1810_47693)"/>
+<path d="M58 17.5H43V30.5H58V17.5Z" fill="#84AFF1"/>
+<path d="M58 35H43V48H58V35Z" fill="#84AFF1"/>
+<path d="M52.65 9.3H52.3V3.35C52.3 3.25717 52.2631 3.16815 52.1975 3.10251C52.1318 3.03687 52.0428 3 51.95 3H50.725C50.6639 3.00037 50.604 3.01672 50.5512 3.04742C50.4984 3.07812 50.4545 3.1221 50.424 3.175L46.8505 9.3H46.35C46.2572 9.3 46.1682 9.33687 46.1025 9.40251C46.0369 9.46815 46 9.55717 46 9.65C46 9.74283 46.0369 9.83185 46.1025 9.89749C46.1682 9.96313 46.2572 10 46.35 10H47.75C47.8428 10 47.9318 9.96313 47.9975 9.89749C48.0631 9.83185 48.1 9.74283 48.1 9.65C48.1 9.55717 48.0631 9.46815 47.9975 9.40251C47.9318 9.33687 47.8428 9.3 47.75 9.3H47.659L48.884 7.2H51.6V9.3H51.25C51.1572 9.3 51.0682 9.33687 51.0025 9.40251C50.9369 9.46815 50.9 9.55717 50.9 9.65C50.9 9.74283 50.9369 9.83185 51.0025 9.89749C51.0682 9.96313 51.1572 10 51.25 10H52.65C52.7428 10 52.8318 9.96313 52.8975 9.89749C52.9631 9.83185 53 9.74283 53 9.65C53 9.55717 52.9631 9.46815 52.8975 9.40251C52.8318 9.33687 52.7428 9.3 52.65 9.3ZM51.6 6.5H49.2935L50.9245 3.7H51.6V6.5Z" fill="white"/>
+<path d="M49.0114 26.8182H47.5L49.4631 21H51.3352L53.2983 26.8182H51.7869L51.4034 25.5966H49.3949L49.0114 26.8182ZM49.7301 24.5284H51.0682L50.4205 22.4659H50.375L49.7301 24.5284Z" fill="black"/>
+<path d="M48.5 44.8182V39H50.9261C52.233 39 52.9091 39.5938 52.9091 40.4716C52.9091 41.1364 52.4602 41.5994 51.821 41.733V41.7898C52.5256 41.821 53.1364 42.3494 53.1364 43.1903C53.1364 44.1307 52.3977 44.8182 51.1108 44.8182H48.5ZM49.9062 43.6847H50.7756C51.3835 43.6847 51.6676 43.4403 51.6676 43.0284C51.6676 42.5824 51.3381 42.2983 50.8011 42.2983H49.9062V43.6847ZM49.9062 41.392H50.6847C51.1449 41.392 51.4744 41.1534 51.4744 40.7443C51.4744 40.358 51.1761 40.1165 50.7074 40.1165H49.9062V41.392Z" fill="black"/>
+<defs>
+<linearGradient id="paint0_linear_1810_47693" x1="0" y1="6.5052" x2="15" y2="6.5052" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2CC0C"/>
+<stop offset="1" stop-color="#FF9830"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1810_47693" x1="43" y1="6.5052" x2="58" y2="6.5052" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2CC0C"/>
+<stop offset="1" stop-color="#FF9830"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/public/img/transformations/disabled/formatTime.svg b/public/img/transformations/disabled/formatTime.svg
new file mode 100644
index 0000000000000..b9a2635478b90
--- /dev/null
+++ b/public/img/transformations/disabled/formatTime.svg
@@ -0,0 +1,22 @@
+<svg width="122" height="48" viewBox="0 0 122 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1764_106222)">
+<path d="M0 1.04083V13H54V0H2.25658C1.6581 0 0 0 0 0C0 0 0 0.764787 0 1.04083Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M54 18H0V31H54V18Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M4.28977 28.6364C3.95739 28.6364 3.64773 28.5824 3.4375 28.4972L3.74432 27.4886C4.15341 27.6222 4.45455 27.6165 4.58807 27.2898L4.64205 27.1591L3.09091 22.6364H4.54545L5.34943 25.75H5.39489L6.21023 22.6364H7.6733L6.02841 27.4176C5.78693 28.1307 5.28977 28.6364 4.28977 28.6364ZM9.0554 28.6364C8.72301 28.6364 8.41335 28.5824 8.20312 28.4972L8.50994 27.4886C8.91903 27.6222 9.22017 27.6165 9.35369 27.2898L9.40767 27.1591L7.85653 22.6364H9.31108L10.1151 25.75H10.1605L10.9759 22.6364H12.4389L10.794 27.4176C10.5526 28.1307 10.0554 28.6364 9.0554 28.6364ZM13.821 28.6364C13.4886 28.6364 13.179 28.5824 12.9688 28.4972L13.2756 27.4886C13.6847 27.6222 13.9858 27.6165 14.1193 27.2898L14.1733 27.1591L12.6222 22.6364H14.0767L14.8807 25.75H14.9261L15.7415 22.6364H17.2045L15.5597 27.4176C15.3182 28.1307 14.821 28.6364 13.821 28.6364ZM18.5866 28.6364C18.2543 28.6364 17.9446 28.5824 17.7344 28.4972L18.0412 27.4886C18.4503 27.6222 18.7514 27.6165 18.8849 27.2898L18.9389 27.1591L17.3878 22.6364H18.8423L19.6463 25.75H19.6918L20.5071 22.6364H21.9702L20.3253 27.4176C20.0838 28.1307 19.5866 28.6364 18.5866 28.6364ZM25.2955 24.1108V25.1818H22.6023V24.1108H25.2955ZM26.2763 27V22.6364H27.5973V23.4375H27.6456C27.8274 22.9062 28.282 22.5795 28.8786 22.5795C29.4837 22.5795 29.9524 22.9148 30.0689 23.4375H30.1143C30.2763 22.9176 30.7848 22.5795 31.4297 22.5795C32.2536 22.5795 32.8217 23.1392 32.8217 24.0625V27H31.4325V24.3807C31.4325 23.946 31.1825 23.7102 30.8303 23.7102C30.4467 23.7102 30.2166 23.9773 30.2166 24.3949V27H28.8814V24.3665C28.8814 23.9631 28.6428 23.7102 28.282 23.7102C27.9183 23.7102 27.6655 23.9858 27.6655 24.4176V27H26.2763ZM33.6825 27V22.6364H35.0036V23.4375H35.0518C35.2337 22.9062 35.6882 22.5795 36.2848 22.5795C36.8899 22.5795 37.3587 22.9148 37.4751 23.4375H37.5206C37.6825 22.9176 38.1911 22.5795 38.8359 22.5795C39.6598 22.5795 40.228 23.1392 40.228 24.0625V27H38.8388V24.3807C38.8388 23.946 38.5888 23.7102 38.2365 23.7102C37.853 23.7102 37.6229 23.9773 37.6229 24.3949V27H36.2876V24.3665C36.2876 23.9631 36.049 23.7102 35.6882 23.7102C35.3246 23.7102 35.0717 23.9858 35.0717 24.4176V27H33.6825ZM43.8814 24.1108V25.1818H41.1882V24.1108H43.8814ZM46.456 27.0625C45.4929 27.0625 44.7116 26.3068 44.7116 24.821C44.7116 23.2812 45.5384 22.5795 46.4503 22.5795C47.1378 22.5795 47.5185 22.983 47.6832 23.3835H47.7116V21.1818H49.1009V27H47.7259V26.2926H47.6832C47.5071 26.696 47.1151 27.0625 46.456 27.0625ZM46.9389 25.9801C47.4446 25.9801 47.7429 25.5256 47.7429 24.8182C47.7429 24.1051 47.4474 23.6648 46.9389 23.6648C46.4219 23.6648 46.1378 24.1165 46.1378 24.8182C46.1378 25.5227 46.4247 25.9801 46.9389 25.9801Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M54 35H0V48H54V35Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M5.28977 45.6364C4.95739 45.6364 4.64773 45.5824 4.4375 45.4972L4.74432 44.4886C5.15341 44.6222 5.45455 44.6165 5.58807 44.2898L5.64205 44.1591L4.09091 39.6364H5.54545L6.34943 42.75H6.39489L7.21023 39.6364H8.6733L7.02841 44.4176C6.78693 45.1307 6.28977 45.6364 5.28977 45.6364ZM10.0554 45.6364C9.72301 45.6364 9.41335 45.5824 9.20312 45.4972L9.50994 44.4886C9.91903 44.6222 10.2202 44.6165 10.3537 44.2898L10.4077 44.1591L8.85653 39.6364H10.3111L11.1151 42.75H11.1605L11.9759 39.6364H13.4389L11.794 44.4176C11.5526 45.1307 11.0554 45.6364 10.0554 45.6364ZM14.821 45.6364C14.4886 45.6364 14.179 45.5824 13.9688 45.4972L14.2756 44.4886C14.6847 44.6222 14.9858 44.6165 15.1193 44.2898L15.1733 44.1591L13.6222 39.6364H15.0767L15.8807 42.75H15.9261L16.7415 39.6364H18.2045L16.5597 44.4176C16.3182 45.1307 15.821 45.6364 14.821 45.6364ZM19.5866 45.6364C19.2543 45.6364 18.9446 45.5824 18.7344 45.4972L19.0412 44.4886C19.4503 44.6222 19.7514 44.6165 19.8849 44.2898L19.9389 44.1591L18.3878 39.6364H19.8423L20.6463 42.75H20.6918L21.5071 39.6364H22.9702L21.3253 44.4176C21.0838 45.1307 20.5866 45.6364 19.5866 45.6364ZM26.2955 41.1108V42.1818H23.6023V41.1108H26.2955ZM27.2763 44V39.6364H28.5973V40.4375H28.6456C28.8274 39.9062 29.282 39.5795 29.8786 39.5795C30.4837 39.5795 30.9524 39.9148 31.0689 40.4375H31.1143C31.2763 39.9176 31.7848 39.5795 32.4297 39.5795C33.2536 39.5795 33.8217 40.1392 33.8217 41.0625V44H32.4325V41.3807C32.4325 40.946 32.1825 40.7102 31.8303 40.7102C31.4467 40.7102 31.2166 40.9773 31.2166 41.3949V44H29.8814V41.3665C29.8814 40.9631 29.6428 40.7102 29.282 40.7102C28.9183 40.7102 28.6655 40.9858 28.6655 41.4176V44H27.2763ZM34.6825 44V39.6364H36.0036V40.4375H36.0518C36.2337 39.9062 36.6882 39.5795 37.2848 39.5795C37.8899 39.5795 38.3587 39.9148 38.4751 40.4375H38.5206C38.6825 39.9176 39.1911 39.5795 39.8359 39.5795C40.6598 39.5795 41.228 40.1392 41.228 41.0625V44H39.8388V41.3807C39.8388 40.946 39.5888 40.7102 39.2365 40.7102C38.853 40.7102 38.6229 40.9773 38.6229 41.3949V44H37.2876V41.3665C37.2876 40.9631 37.049 40.7102 36.6882 40.7102C36.3246 40.7102 36.0717 40.9858 36.0717 41.4176V44H34.6825ZM44.8814 41.1108V42.1818H42.1882V41.1108H44.8814ZM47.456 44.0625C46.4929 44.0625 45.7116 43.3068 45.7116 41.821C45.7116 40.2812 46.5384 39.5795 47.4503 39.5795C48.1378 39.5795 48.5185 39.983 48.6832 40.3835H48.7116V38.1818H50.1009V44H48.7259V43.2926H48.6832C48.5071 43.696 48.1151 44.0625 47.456 44.0625ZM47.9389 42.9801C48.4446 42.9801 48.7429 42.5256 48.7429 41.8182C48.7429 41.1051 48.4474 40.6648 47.9389 40.6648C47.4219 40.6648 47.1378 41.1165 47.1378 41.8182C47.1378 42.5227 47.4247 42.9801 47.9389 42.9801Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M27 3C26.3078 3 25.6311 3.20527 25.0555 3.58986C24.4799 3.97444 24.0313 4.52107 23.7664 5.16061C23.5015 5.80015 23.4322 6.50388 23.5673 7.18282C23.7023 7.86175 24.0356 8.48539 24.5251 8.97487C25.0146 9.46436 25.6383 9.7977 26.3172 9.93275C26.9961 10.0678 27.6999 9.99848 28.3394 9.73358C28.9789 9.46867 29.5256 9.02007 29.9101 8.44449C30.2947 7.86892 30.5 7.19223 30.5 6.5C30.5 6.04037 30.4095 5.58525 30.2336 5.16061C30.0577 4.73597 29.7999 4.35013 29.4749 4.02513C29.1499 3.70012 28.764 3.44231 28.3394 3.26642C27.9148 3.09053 27.4596 3 27 3ZM27 9.3C26.4462 9.3 25.9049 9.13578 25.4444 8.82811C24.9839 8.52045 24.6251 8.08315 24.4131 7.57151C24.2012 7.05988 24.1458 6.49689 24.2538 5.95375C24.3618 5.4106 24.6285 4.91169 25.0201 4.5201C25.4117 4.12851 25.9106 3.86184 26.4537 3.7538C26.9969 3.64576 27.5599 3.70121 28.0715 3.91314C28.5831 4.12506 29.0204 4.48395 29.3281 4.9444C29.6358 5.40486 29.8 5.94621 29.8 6.5C29.8 7.24261 29.505 7.9548 28.9799 8.4799C28.4548 9.005 27.7426 9.3 27 9.3ZM27 4.4C26.9072 4.4 26.8182 4.43687 26.7525 4.50251C26.6869 4.56815 26.65 4.65717 26.65 4.75V6.15H25.95C25.8572 6.15 25.7682 6.18687 25.7025 6.25251C25.6369 6.31815 25.6 6.40717 25.6 6.5C25.6 6.59283 25.6369 6.68185 25.7025 6.74749C25.7682 6.81312 25.8572 6.85 25.95 6.85H27C27.0928 6.85 27.1819 6.81312 27.2475 6.74749C27.3131 6.68185 27.35 6.59283 27.35 6.5V4.75C27.35 4.65717 27.3131 4.56815 27.2475 4.50251C27.1819 4.43687 27.0928 4.4 27 4.4Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<path d="M67.9067 30C68.6011 30 73.9327 26 73.9327 24C73.9327 22 68.7357 18 67.9067 18C67.0777 18 66.4023 18.5 66.4023 19.4756C66.4023 20.4512 69.9067 22.9206 69.9067 22.9206C69.9067 22.9206 62.2539 22.25 62 22.9206C61.7461 23.5911 61.7461 24.4089 62 25.0794C62.2539 25.75 69.9067 25.0794 69.9067 25.0794C69.9067 25.0794 66.4023 27.75 66.4023 28.5301C66.4023 29.3103 67.2123 30 67.9067 30Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M82 1.04083V13H122V0H83.6715H82V1.04083Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M122 18H82V31H122V18Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M88.4403 27.5V23.1364H89.7614V23.9375H89.8097C89.9915 23.4062 90.446 23.0795 91.0426 23.0795C91.6477 23.0795 92.1165 23.4148 92.233 23.9375H92.2784C92.4403 23.4176 92.9489 23.0795 93.5938 23.0795C94.4176 23.0795 94.9858 23.6392 94.9858 24.5625V27.5H93.5966V24.8807C93.5966 24.446 93.3466 24.2102 92.9943 24.2102C92.6108 24.2102 92.3807 24.4773 92.3807 24.8949V27.5H91.0455V24.8665C91.0455 24.4631 90.8068 24.2102 90.446 24.2102C90.0824 24.2102 89.8295 24.4858 89.8295 24.9176V27.5H88.4403ZM95.8466 27.5V23.1364H97.1676V23.9375H97.2159C97.3977 23.4062 97.8523 23.0795 98.4489 23.0795C99.054 23.0795 99.5227 23.4148 99.6392 23.9375H99.6847C99.8466 23.4176 100.355 23.0795 101 23.0795C101.824 23.0795 102.392 23.6392 102.392 24.5625V27.5H101.003V24.8807C101.003 24.446 100.753 24.2102 100.401 24.2102C100.017 24.2102 99.7869 24.4773 99.7869 24.8949V27.5H98.4517V24.8665C98.4517 24.4631 98.2131 24.2102 97.8523 24.2102C97.4886 24.2102 97.2358 24.4858 97.2358 24.9176V27.5H95.8466ZM106.045 24.6108V25.6818H103.352V24.6108H106.045ZM108.62 27.5625C107.657 27.5625 106.876 26.8068 106.876 25.321C106.876 23.7812 107.702 23.0795 108.614 23.0795C109.302 23.0795 109.683 23.483 109.847 23.8835H109.876V21.6818H111.265V27.5H109.89V26.7926H109.847C109.671 27.196 109.279 27.5625 108.62 27.5625ZM109.103 26.4801C109.609 26.4801 109.907 26.0256 109.907 25.3182C109.907 24.6051 109.612 24.1648 109.103 24.1648C108.586 24.1648 108.302 24.6165 108.302 25.3182C108.302 26.0227 108.589 26.4801 109.103 26.4801ZM113.737 27.5625C112.774 27.5625 111.993 26.8068 111.993 25.321C111.993 23.7812 112.82 23.0795 113.732 23.0795C114.419 23.0795 114.8 23.483 114.964 23.8835H114.993V21.6818H116.382V27.5H115.007V26.7926H114.964C114.788 27.196 114.396 27.5625 113.737 27.5625ZM114.22 26.4801C114.726 26.4801 115.024 26.0256 115.024 25.3182C115.024 24.6051 114.729 24.1648 114.22 24.1648C113.703 24.1648 113.419 24.6165 113.419 25.3182C113.419 26.0227 113.706 26.4801 114.22 26.4801Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M122 35H82V48H122V35Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M102 3C101.308 3 100.631 3.20527 100.056 3.58986C99.4799 3.97444 99.0313 4.52107 98.7664 5.16061C98.5015 5.80015 98.4322 6.50388 98.5673 7.18282C98.7023 7.86175 99.0356 8.48539 99.5251 8.97487C100.015 9.46436 100.638 9.7977 101.317 9.93275C101.996 10.0678 102.7 9.99848 103.339 9.73358C103.979 9.46867 104.526 9.02007 104.91 8.44449C105.295 7.86892 105.5 7.19223 105.5 6.5C105.5 6.04037 105.409 5.58525 105.234 5.16061C105.058 4.73597 104.8 4.35013 104.475 4.02513C104.15 3.70012 103.764 3.44231 103.339 3.26642C102.915 3.09053 102.46 3 102 3ZM102 9.3C101.446 9.3 100.905 9.13578 100.444 8.82811C99.9839 8.52045 99.6251 8.08315 99.4131 7.57151C99.2012 7.05988 99.1458 6.49689 99.2538 5.95375C99.3618 5.4106 99.6285 4.91169 100.02 4.5201C100.412 4.12851 100.911 3.86184 101.454 3.7538C101.997 3.64576 102.56 3.70121 103.072 3.91314C103.583 4.12506 104.02 4.48395 104.328 4.9444C104.636 5.40486 104.8 5.94621 104.8 6.5C104.8 7.24261 104.505 7.9548 103.98 8.4799C103.455 9.005 102.743 9.3 102 9.3ZM102 4.4C101.907 4.4 101.818 4.43687 101.753 4.50251C101.687 4.56815 101.65 4.65717 101.65 4.75V6.15H100.95C100.857 6.15 100.768 6.18687 100.703 6.25251C100.637 6.31815 100.6 6.40717 100.6 6.5C100.6 6.59283 100.637 6.68185 100.703 6.74749C100.768 6.81312 100.857 6.85 100.95 6.85H102C102.093 6.85 102.182 6.81312 102.247 6.74749C102.313 6.68185 102.35 6.59283 102.35 6.5V4.75C102.35 4.65717 102.313 4.56815 102.247 4.50251C102.182 4.43687 102.093 4.4 102 4.4Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M93.2898 45.6364C92.9574 45.6364 92.6477 45.5824 92.4375 45.4972L92.7443 44.4886C93.1534 44.6222 93.4545 44.6165 93.5881 44.2898L93.642 44.1591L92.0909 39.6364H93.5455L94.3494 42.75H94.3949L95.2102 39.6364H96.6733L95.0284 44.4176C94.7869 45.1307 94.2898 45.6364 93.2898 45.6364ZM98.0554 45.6364C97.723 45.6364 97.4134 45.5824 97.2031 45.4972L97.5099 44.4886C97.919 44.6222 98.2202 44.6165 98.3537 44.2898L98.4077 44.1591L96.8565 39.6364H98.3111L99.1151 42.75H99.1605L99.9759 39.6364H101.439L99.794 44.4176C99.5526 45.1307 99.0554 45.6364 98.0554 45.6364ZM102.821 45.6364C102.489 45.6364 102.179 45.5824 101.969 45.4972L102.276 44.4886C102.685 44.6222 102.986 44.6165 103.119 44.2898L103.173 44.1591L101.622 39.6364H103.077L103.881 42.75H103.926L104.741 39.6364H106.205L104.56 44.4176C104.318 45.1307 103.821 45.6364 102.821 45.6364ZM107.587 45.6364C107.254 45.6364 106.945 45.5824 106.734 45.4972L107.041 44.4886C107.45 44.6222 107.751 44.6165 107.885 44.2898L107.939 44.1591L106.388 39.6364H107.842L108.646 42.75H108.692L109.507 39.6364H110.97L109.325 44.4176C109.084 45.1307 108.587 45.6364 107.587 45.6364Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<defs>
+<clipPath id="clip0_1764_106222">
+<rect width="54" height="48" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/transformations/disabled/groupBy.svg b/public/img/transformations/disabled/groupBy.svg
new file mode 100644
index 0000000000000..737996e2a759d
--- /dev/null
+++ b/public/img/transformations/disabled/groupBy.svg
@@ -0,0 +1,28 @@
+<svg width="78" height="51" viewBox="0 0 78 51" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1764_105818)">
+<path d="M2 0.800642V10H26V1.05456e-06H3.00292L2.0002 0L2 0.800642Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M26 13H2V22.5H26V13Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M26 25.75H2V35.25H26V25.75Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M26 38.5H2V48H26V38.5Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M15.5 14.75H14.0716L12.5 15.6699V16.9238L13.9253 16.1035H13.9627V20.75H15.5V14.75Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M12.0873 33.5H16.5V32.3468H14.0841V32.3092L14.7972 31.6561C16.0896 30.5376 16.4272 29.9682 16.4272 29.289C16.4272 28.2225 15.5511 27.5 14.1976 27.5C12.879 27.5 11.9971 28.2543 12 29.4595H13.3651C13.3651 28.9249 13.697 28.6156 14.1918 28.6156C14.6779 28.6156 15.0301 28.9133 15.0301 29.4017C15.0301 29.8439 14.7506 30.1445 14.2616 30.5809L12.0873 32.4711V33.5Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M12.0873 46.5H16.5V45.3468H14.0841V45.3092L14.7972 44.6561C16.0896 43.5376 16.4272 42.9682 16.4272 42.289C16.4272 41.2225 15.5511 40.5 14.1976 40.5C12.879 40.5 11.9971 41.2543 12 42.4595H13.3651C13.3651 41.9249 13.697 41.6156 14.1918 41.6156C14.6779 41.6156 15.0301 41.9133 15.0301 42.4017C15.0301 42.8439 14.7506 43.1445 14.2616 43.5809L12.0873 45.4711V46.5Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<path d="M39.9067 30C40.6011 30 45.9327 26 45.9327 24C45.9327 22 40.7357 18 39.9067 18C39.0777 18 38.4023 18.5 38.4023 19.4756C38.4023 20.4512 41.9067 22.9206 41.9067 22.9206C41.9067 22.9206 34.2539 22.25 34 22.9206C33.7461 23.5911 33.7461 24.4089 34 25.0794C34.2539 25.75 41.9067 25.0794 41.9067 25.0794C41.9067 25.0794 38.4023 27.75 38.4023 28.5301C38.4023 29.3103 39.2123 30 39.9067 30Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<g clip-path="url(#clip1_1764_105818)">
+<path d="M54 0.800642V10H78V1.13097e-06H55.0029C54.7369 1.13097e-06 54.0001 0 54.0001 0C54.0001 0 54 0.588299 54 0.800642Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M78 13H54V29H78V13Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M78 32H54V48H78V32Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M67.5 18H66.0716L64.5 18.9199V20.1738L65.9253 19.3535H65.9627V24H67.5V18Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M64.0873 43H68.5V41.8468H66.0841V41.8092L66.7972 41.1561C68.0896 40.0376 68.4272 39.4682 68.4272 38.789C68.4272 37.7225 67.5511 37 66.1976 37C64.879 37 63.9971 37.7543 64 38.9595H65.3651C65.3651 38.4249 65.697 38.1156 66.1918 38.1156C66.6779 38.1156 67.0301 38.4133 67.0301 38.9017C67.0301 39.3439 66.7506 39.6445 66.2616 40.0809L64.0873 41.9711V43Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26 25.7421H2V48H26V25.7421ZM0 23.6179V50H28V23.6179L0 23.6179Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<defs>
+<clipPath id="clip0_1764_105818">
+<rect width="24" height="48" fill="white" transform="translate(2)"/>
+</clipPath>
+<clipPath id="clip1_1764_105818">
+<rect width="24" height="48" fill="white" transform="translate(54)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/transformations/disabled/groupingToMatrix.svg b/public/img/transformations/disabled/groupingToMatrix.svg
new file mode 100644
index 0000000000000..d0c6e07de66ee
--- /dev/null
+++ b/public/img/transformations/disabled/groupingToMatrix.svg
@@ -0,0 +1,74 @@
+<svg width="188" height="48" viewBox="0 0 188 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1764_105505)">
+<path d="M0 0.800641V10H24V1.05456e-06H1.00292L0.000198677 0L0 0.800641Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M24 13H0V22.5H24V13Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M24 25.75H0V35.25H24V25.75Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M24 38.5H0V48H24V38.5Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M13 14.6179H11.5716L10 15.5378V16.7917L11.4253 15.9714H11.4627V20.6179H13V14.6179Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M9.83733 33.5H14.25V32.3468H11.8341V32.3092L12.5472 31.6561C13.8396 30.5376 14.1772 29.9682 14.1772 29.289C14.1772 28.2225 13.3011 27.5 11.9476 27.5C10.629 27.5 9.7471 28.2543 9.75001 29.4595H11.1151C11.1151 28.9249 11.447 28.6156 11.9418 28.6156C12.4279 28.6156 12.7801 28.9133 12.7801 29.4017C12.7801 29.8439 12.5006 30.1445 12.0116 30.5809L9.83733 32.4711V33.5Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M9.83733 46.25H14.25V45.0968H11.8341V45.0592L12.5472 44.4061C13.8396 43.2876 14.1772 42.7182 14.1772 42.039C14.1772 40.9725 13.3011 40.25 11.9476 40.25C10.629 40.25 9.7471 41.0043 9.75001 42.2095H11.1151C11.1151 41.6749 11.447 41.3656 11.9418 41.3656C12.4279 41.3656 12.7801 41.6633 12.7801 42.1517C12.7801 42.5939 12.5006 42.8945 12.0116 43.3309L9.83733 45.2211V46.25Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<g clip-path="url(#clip1_1764_105505)">
+<path d="M28 0.800641V10H52V1.05456e-06H29.0029L28.0002 0L28 0.800641Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M52 13H28V22.5H52V13Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M52 25.75H28V35.25H52V25.75Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M52 38.5H28V48H52V38.5Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M40.1058 46.25C41.5564 46.25 42.4563 45.4582 42.5 44.2595H40.9654C40.905 44.7737 40.5759 45.0544 40.1259 45.0544C39.5484 45.0544 39.1723 44.597 39.1723 43.7358C39.1723 42.8809 39.5517 42.4235 40.1259 42.4235C40.596 42.4235 40.9016 42.7232 40.9654 43.2185H42.5C42.4631 42.026 41.5363 41.25 40.1024 41.25C38.4805 41.25 37.5 42.2658 37.5 43.7516C37.5 45.2311 38.4738 46.25 40.1058 46.25Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<g clip-path="url(#clip2_1764_105505)">
+<path d="M56 0.800641V10H80V1.05456e-06H57.0029L56.0002 0L56 0.800641Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M80 13H56V22.5H80V13Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M80 25.75H56V35.25H80V25.75Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M80 38.5H56V48H80V38.5Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M67.5383 20.75C68.2141 20.75 68.616 20.3761 68.7966 19.9645H68.8403V20.6862H70.25V14.75H68.8257V16.9964H68.7966C68.6277 16.5877 68.2374 16.1761 67.5325 16.1761C66.5976 16.1761 65.75 16.892 65.75 18.463C65.75 19.979 66.551 20.75 67.5383 20.75ZM68.0335 19.6457C67.5063 19.6457 67.2121 19.179 67.2121 18.4601C67.2121 17.7442 67.5034 17.2833 68.0335 17.2833C68.5549 17.2833 68.8578 17.7326 68.8578 18.4601C68.8578 19.1819 68.5519 19.6457 68.0335 19.6457Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M68.0797 33C69.4177 33 70.2975 32.3849 70.4834 31.4322L68.9927 31.3912C68.8665 31.7129 68.5345 31.8864 68.1096 31.8864C67.4854 31.8864 67.1003 31.4921 67.1003 30.8991V30.858H70.5V30.4732C70.5 28.877 69.4774 28 68.0299 28C66.4894 28 65.5 29.0032 65.5 30.5047C65.5 32.0568 66.4761 33 68.0797 33ZM67.1003 29.9621C67.1235 29.4795 67.5252 29.1136 68.0631 29.1136C68.5976 29.1136 68.9827 29.4669 68.9894 29.9621H67.1003Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M69.2936 41.9515H68.4651V41.7108C68.4651 41.4646 68.5669 41.3134 68.8893 41.3134C69.0193 41.3134 69.1777 41.3414 69.2795 41.3722L69.5 40.3703C69.336 40.3256 68.9599 40.25 68.5782 40.25C67.6932 40.25 67.0853 40.7369 67.0853 41.7332V41.9515H66.5V42.959H67.0853V46.25H68.4651V42.959H69.2936V41.9515Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<path d="M93.9067 30C94.6011 30 99.9327 26 99.9327 24C99.9327 22 94.7357 18 93.9067 18C93.0777 18 92.4023 18.5 92.4023 19.4756C92.4023 20.4512 95.9067 22.9206 95.9067 22.9206C95.9067 22.9206 88.2539 22.25 88 22.9206C87.7461 23.5911 87.7461 24.4089 88 25.0794C88.2539 25.75 95.9067 25.0794 95.9067 25.0794C95.9067 25.0794 92.4023 27.75 92.4023 28.5301C92.4023 29.3103 93.2123 30 93.9067 30Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<g clip-path="url(#clip3_1764_105505)">
+<path d="M108 0.800641V10H132V1.05456e-06H109.003L108 0L108 0.800641Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M132 13H108V22.5H132V13Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M132 25.75H108V35.25H132V25.75Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M132 38.5H108V48H132V38.5Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M120.106 46.25C121.556 46.25 122.456 45.4582 122.5 44.2595H120.965C120.905 44.7737 120.576 45.0544 120.126 45.0544C119.548 45.0544 119.172 44.597 119.172 43.7358C119.172 42.8809 119.552 42.4235 120.126 42.4235C120.596 42.4235 120.902 42.7232 120.965 43.2185H122.5C122.463 42.026 121.536 41.25 120.102 41.25C118.481 41.25 117.5 42.2658 117.5 43.7516C117.5 45.2311 118.474 46.25 120.106 46.25Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M117.75 33.4362H119.16V32.7145H119.203C119.384 33.1261 119.786 33.5 120.462 33.5C121.452 33.5 122.25 32.729 122.25 31.213C122.25 29.642 121.405 28.9261 120.47 28.9261C119.763 28.9261 119.375 29.3377 119.203 29.7464H119.174V27.5H117.75V33.4362ZM119.145 31.2101C119.145 30.4826 119.448 30.0333 119.969 30.0333C120.497 30.0333 120.788 30.4942 120.788 31.2101C120.788 31.929 120.497 32.3957 119.969 32.3957C119.448 32.3957 119.145 31.9319 119.145 31.2101Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M119.346 20.25C120.022 20.25 120.49 19.9877 120.756 19.4915H120.794V20.1678H122.247V16.8682C122.247 15.841 121.334 15.25 120.098 15.25C118.793 15.25 118.053 15.9074 117.93 16.7924L119.356 16.8429C119.422 16.5332 119.678 16.3436 120.086 16.3436C120.465 16.3436 120.705 16.5269 120.705 16.8524V16.8682C120.705 17.1653 120.383 17.2285 119.555 17.3012C118.572 17.3834 117.75 17.7468 117.75 18.8214C117.75 19.7822 118.417 20.25 119.346 20.25ZM119.823 19.2386C119.466 19.2386 119.213 19.068 119.213 18.7456C119.213 18.4327 119.46 18.243 119.899 18.1767C120.187 18.1356 120.541 18.0724 120.715 17.9807V18.4422C120.715 18.9162 120.316 19.2386 119.823 19.2386Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<g clip-path="url(#clip4_1764_105505)">
+<path d="M136 0.800641V10H160V1.05456e-06H137.003L136 0L136 0.800641Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M160 13H136V22.5H160V13Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M160 25.75H136V35.25H160V25.75Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M160 38.5H136V48H160V38.5Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M149.5 2H148.072L146.5 2.91992V4.17383L147.925 3.35352H147.963V8H149.5V2Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M147.538 21C148.214 21 148.616 20.6261 148.797 20.2145H148.84V20.9362H150.25V15H148.826V17.2464H148.797C148.628 16.8377 148.237 16.4261 147.533 16.4261C146.598 16.4261 145.75 17.142 145.75 18.713C145.75 20.229 146.551 21 147.538 21ZM148.033 19.8957C147.506 19.8957 147.212 19.429 147.212 18.7101C147.212 17.9942 147.503 17.5333 148.033 17.5333C148.555 17.5333 148.858 17.9826 148.858 18.7101C148.858 19.4319 148.552 19.8957 148.033 19.8957Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<g clip-path="url(#clip5_1764_105505)">
+<path d="M164 0.800641V10H188V1.05456e-06H165.003L164 0L164 0.800641Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M188 13H164V22.5H188V13Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M188 25.75H164V35.25H188V25.75Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M188 38.5H164V48H188V38.5Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M173.837 8H178.25V6.84682H175.834V6.80925L176.547 6.15607C177.84 5.03757 178.177 4.46821 178.177 3.78902C178.177 2.72254 177.301 2 175.948 2C174.629 2 173.747 2.75434 173.75 3.95954H175.115C175.115 3.42486 175.447 3.11561 175.942 3.11561C176.428 3.11561 176.78 3.41329 176.78 3.90173C176.78 4.34393 176.501 4.64451 176.012 5.08093L173.837 6.9711V8Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M176.08 33C177.418 33 178.297 32.3849 178.483 31.4322L176.993 31.3912C176.867 31.7129 176.535 31.8864 176.11 31.8864C175.485 31.8864 175.1 31.4921 175.1 30.8991V30.858H178.5V30.4732C178.5 28.877 177.477 28 176.03 28C174.489 28 173.5 29.0032 173.5 30.5047C173.5 32.0568 174.476 33 176.08 33ZM175.1 29.9621C175.124 29.4795 175.525 29.1136 176.063 29.1136C176.598 29.1136 176.983 29.4669 176.989 29.9621H175.1Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M177.294 41.7015H176.465V41.4608C176.465 41.2146 176.567 41.0634 176.889 41.0634C177.019 41.0634 177.178 41.0914 177.279 41.1222L177.5 40.1203C177.336 40.0756 176.96 40 176.578 40C175.693 40 175.085 40.4869 175.085 41.4832V41.7015H174.5V42.709H175.085V46H176.465V42.709H177.294V41.7015Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<defs>
+<clipPath id="clip0_1764_105505">
+<rect width="24" height="48" fill="white"/>
+</clipPath>
+<clipPath id="clip1_1764_105505">
+<rect width="24" height="48" fill="white" transform="translate(28)"/>
+</clipPath>
+<clipPath id="clip2_1764_105505">
+<rect width="24" height="48" fill="white" transform="translate(56)"/>
+</clipPath>
+<clipPath id="clip3_1764_105505">
+<rect width="24" height="48" fill="white" transform="translate(108)"/>
+</clipPath>
+<clipPath id="clip4_1764_105505">
+<rect width="24" height="48" fill="white" transform="translate(136)"/>
+</clipPath>
+<clipPath id="clip5_1764_105505">
+<rect width="24" height="48" fill="white" transform="translate(164)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/transformations/disabled/heatmap.svg b/public/img/transformations/disabled/heatmap.svg
new file mode 100644
index 0000000000000..775794a8e8520
--- /dev/null
+++ b/public/img/transformations/disabled/heatmap.svg
@@ -0,0 +1,58 @@
+<svg width="124" height="48" viewBox="0 0 124 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1764_105348)">
+<path d="M0 0.611699V7.64012H14.394V0H0.601504C0.441975 0 0.28898 0.0644467 0.176176 0.179162C0.0633725 0.293878 0 0.449466 0 0.611699Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M33.606 7.64012H47.9999V0.611699C47.9999 0.449466 47.9366 0.293878 47.8238 0.179162C47.711 0.0644467 47.558 0 47.3984 0L33.606 0V7.64012Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M31.194 0H16.8V7.64012H31.194V0Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M31.194 10.0869H16.8V17.727H31.194V10.0869Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M14.394 10.0869H0V17.727H14.394V10.0869Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M47.9999 10.0869H33.606V17.727H47.9999V10.0869Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M47.9999 20.1799H33.606V27.8262H47.9999V20.1799Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M31.194 20.1799H16.8V27.8262H31.194V20.1799Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M14.394 20.1799H0V27.8262H14.394V20.1799Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M31.194 30.2669H16.8V37.907H31.194V30.2669Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M47.9999 30.2669H33.606V37.907H47.9999V30.2669Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M14.394 30.2669H0V37.907H14.394V30.2669Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M31.194 40.3599H16.8V48H31.194V40.3599Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M47.9999 47.3883V40.3721H33.606V48H47.3984C47.558 48 47.711 47.9356 47.8238 47.8208C47.9366 47.7061 47.9999 47.5505 47.9999 47.3883Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M14.394 48V40.3721H0V47.3883C0 47.5505 0.0633725 47.7061 0.176176 47.8208C0.28898 47.9356 0.441975 48 0.601504 48H14.394Z" fill="#CCCCDC" fill-opacity="0.04"/>
+</g>
+<path d="M61.9067 30.4C62.6011 30.4 67.9327 26.1333 67.9327 24C67.9327 21.8667 62.7357 17.6 61.9067 17.6C61.0777 17.6 60.4023 18.1333 60.4023 19.174C60.4023 20.2146 63.9067 22.8486 63.9067 22.8486C63.9067 22.8486 56.2539 22.1333 56 22.8486C55.7461 23.5639 55.7461 24.4361 56 25.1514C56.2539 25.8667 63.9067 25.1514 63.9067 25.1514C63.9067 25.1514 60.4023 28 60.4023 28.8322C60.4023 29.6643 61.2123 30.4 61.9067 30.4Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<g clip-path="url(#clip1_1764_105348)">
+<path d="M81.4059 0H76.5993C76.2683 0 76 0.268327 76 0.599326V5.40592C76 5.73692 76.2683 6.00524 76.5993 6.00524H81.4059C81.7369 6.00524 82.0052 5.73692 82.0052 5.40592V0.599326C82.0052 0.268327 81.7369 0 81.4059 0Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M98.205 0H93.3984C93.0674 0 92.7991 0.268327 92.7991 0.599326V5.40592C92.7991 5.73692 93.0674 6.00524 93.3984 6.00524H98.205C98.536 6.00524 98.8043 5.73692 98.8043 5.40592V0.599326C98.8043 0.268327 98.536 0 98.205 0Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M106.608 0H101.801C101.47 0 101.202 0.268327 101.202 0.599326V5.40592C101.202 5.73692 101.47 6.00524 101.801 6.00524H106.608C106.939 6.00524 107.207 5.73692 107.207 5.40592V0.599326C107.207 0.268327 106.939 0 106.608 0Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M115.004 0H110.197C109.866 0 109.598 0.268327 109.598 0.599326V5.40592C109.598 5.73692 109.866 6.00524 110.197 6.00524H115.004C115.335 6.00524 115.603 5.73692 115.603 5.40592V0.599326C115.603 0.268327 115.335 0 115.004 0Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M123.407 8.40255H118.6C118.269 8.40255 118.001 8.67087 118.001 9.00187V13.8085C118.001 14.1395 118.269 14.4078 118.6 14.4078H123.407C123.738 14.4078 124.006 14.1395 124.006 13.8085V9.00187C124.006 8.67087 123.738 8.40255 123.407 8.40255Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M98.205 16.7991H93.3984C93.0674 16.7991 92.7991 17.0674 92.7991 17.3984V22.205C92.7991 22.536 93.0674 22.8043 93.3984 22.8043H98.205C98.536 22.8043 98.8043 22.536 98.8043 22.205V17.3984C98.8043 17.0674 98.536 16.7991 98.205 16.7991Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M106.608 16.7991H101.801C101.47 16.7991 101.202 17.0674 101.202 17.3984V22.205C101.202 22.536 101.47 22.8043 101.801 22.8043H106.608C106.939 22.8043 107.207 22.536 107.207 22.205V17.3984C107.207 17.0674 106.939 16.7991 106.608 16.7991Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M115.004 16.7991H110.197C109.866 16.7991 109.598 17.0674 109.598 17.3984V22.205C109.598 22.536 109.866 22.8043 110.197 22.8043H115.004C115.335 22.8043 115.603 22.536 115.603 22.205V17.3984C115.603 17.0674 115.335 16.7991 115.004 16.7991Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M123.407 16.7991H118.6C118.269 16.7991 118.001 17.0674 118.001 17.3984V22.205C118.001 22.536 118.269 22.8043 118.6 22.8043H123.407C123.738 22.8043 124.006 22.536 124.006 22.205V17.3984C124.006 17.0674 123.738 16.7991 123.407 16.7991Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M81.4059 25.2016H76.5993C76.2683 25.2016 76 25.47 76 25.801V30.6076C76 30.9386 76.2683 31.2069 76.5993 31.2069H81.4059C81.7369 31.2069 82.0052 30.9386 82.0052 30.6076V25.801C82.0052 25.47 81.7369 25.2016 81.4059 25.2016Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M106.608 25.2016H101.801C101.47 25.2016 101.202 25.47 101.202 25.801V30.6076C101.202 30.9386 101.47 31.2069 101.801 31.2069H106.608C106.939 31.2069 107.207 30.9386 107.207 30.6076V25.801C107.207 25.47 106.939 25.2016 106.608 25.2016Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M115.004 25.2016H110.197C109.866 25.2016 109.598 25.47 109.598 25.801V30.6076C109.598 30.9386 109.866 31.2069 110.197 31.2069H115.004C115.335 31.2069 115.603 30.9386 115.603 30.6076V25.801C115.603 25.47 115.335 25.2016 115.004 25.2016Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M123.407 25.2016H118.6C118.269 25.2016 118.001 25.47 118.001 25.801V30.6076C118.001 30.9386 118.269 31.2069 118.6 31.2069H123.407C123.738 31.2069 124.006 30.9386 124.006 30.6076V25.801C124.006 25.47 123.738 25.2016 123.407 25.2016Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M89.8085 33.5982H85.0019C84.6709 33.5982 84.4026 33.8665 84.4026 34.1975V39.0041C84.4026 39.3351 84.6709 39.6035 85.0019 39.6035H89.8085C90.1395 39.6035 90.4078 39.3351 90.4078 39.0041V34.1975C90.4078 33.8665 90.1395 33.5982 89.8085 33.5982Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M89.8085 42.0008H85.0019C84.6709 42.0008 84.4026 42.2691 84.4026 42.6001V47.4067C84.4026 47.7377 84.6709 48.006 85.0019 48.006H89.8085C90.1395 48.006 90.4078 47.7377 90.4078 47.4067V42.6001C90.4078 42.2691 90.1395 42.0008 89.8085 42.0008Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M98.205 42.0008H93.3984C93.0674 42.0008 92.7991 42.2691 92.7991 42.6001V47.4067C92.7991 47.7377 93.0674 48.006 93.3984 48.006H98.205C98.536 48.006 98.8043 47.7377 98.8043 47.4067V42.6001C98.8043 42.2691 98.536 42.0008 98.205 42.0008Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M106.608 42.0008H101.801C101.47 42.0008 101.202 42.2691 101.202 42.6001V47.4067C101.202 47.7377 101.47 48.006 101.801 48.006H106.608C106.939 48.006 107.207 47.7377 107.207 47.4067V42.6001C107.207 42.2691 106.939 42.0008 106.608 42.0008Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M89.8085 0H85.0019C84.6709 0 84.4026 0.268327 84.4026 0.599326V5.40592C84.4026 5.73692 84.6709 6.00524 85.0019 6.00524H89.8085C90.1395 6.00524 90.4078 5.73692 90.4078 5.40592V0.599326C90.4078 0.268327 90.1395 0 89.8085 0Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M82.0051 22.205V17.3984C82.0051 17.0674 81.7368 16.7991 81.4058 16.7991H76.5992C76.2682 16.7991 75.9999 17.0674 75.9999 17.3984V22.205C75.9999 22.536 76.2682 22.8043 76.5992 22.8043H81.4058C81.7368 22.8043 82.0051 22.536 82.0051 22.205Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M124.006 39.0041V34.1975C124.006 33.8665 123.738 33.5982 123.407 33.5982H118.6C118.269 33.5982 118.001 33.8665 118.001 34.1975V39.0041C118.001 39.3351 118.269 39.6034 118.6 39.6034H123.407C123.738 39.6034 124.006 39.3351 124.006 39.0041Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M124 5.40592V0.599327C124 0.268328 123.732 9.53674e-07 123.401 9.53674e-07L118.594 9.53674e-07C118.263 9.53674e-07 117.995 0.268328 117.995 0.599327V5.40592C117.995 5.73692 118.263 6.00524 118.594 6.00524H123.401C123.732 6.00524 124 5.73692 124 5.40592Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M81.3939 14.3838H76.5993C76.4404 14.3838 76.2879 14.3207 76.1755 14.2083C76.0631 14.0959 76 13.9434 76 13.7845V8.98989C76 8.83094 76.0631 8.6785 76.1755 8.5661C76.2879 8.4537 76.4404 8.39056 76.5993 8.39056H81.3939C81.5529 8.39056 81.7053 8.4537 81.8177 8.5661C81.9301 8.6785 81.9933 8.83094 81.9933 8.98989V13.7845C81.9933 13.9434 81.9301 14.0959 81.8177 14.2083C81.7053 14.3207 81.5529 14.3838 81.3939 14.3838ZM90.3838 13.7845V8.98989C90.3838 8.83094 90.3207 8.6785 90.2083 8.5661C90.0959 8.4537 89.9434 8.39056 89.7845 8.39056H84.9899C84.8309 8.39056 84.6785 8.4537 84.5661 8.5661C84.4537 8.6785 84.3906 8.83094 84.3906 8.98989V13.7845C84.3906 13.9434 84.4537 14.0959 84.5661 14.2083C84.6785 14.3207 84.8309 14.3838 84.9899 14.3838H89.7845C89.9434 14.3838 90.0959 14.3207 90.2083 14.2083C90.3207 14.0959 90.3838 13.9434 90.3838 13.7845ZM98.7744 13.7845V8.98989C98.7744 8.83094 98.7112 8.6785 98.5988 8.5661C98.4864 8.4537 98.334 8.39056 98.1751 8.39056H93.3804C93.2215 8.39056 93.0691 8.4537 92.9567 8.5661C92.8443 8.6785 92.7811 8.83094 92.7811 8.98989V13.7845C92.7811 13.9434 92.8443 14.0959 92.9567 14.2083C93.0691 14.3207 93.2215 14.3838 93.3804 14.3838H98.1751C98.2562 14.3879 98.3374 14.3754 98.4136 14.3471C98.4898 14.3188 98.5595 14.2753 98.6183 14.2192C98.6772 14.1632 98.7241 14.0957 98.756 14.021C98.788 13.9462 98.8044 13.8658 98.8043 13.7845H98.7744ZM115.556 13.7845V8.98989C115.556 8.83094 115.492 8.6785 115.38 8.5661C115.268 8.4537 115.115 8.39056 114.956 8.39056H110.162C110.003 8.39056 109.85 8.4537 109.738 8.5661C109.625 8.6785 109.562 8.83094 109.562 8.98989V13.7845C109.562 13.9434 109.625 14.0959 109.738 14.2083C109.85 14.3207 110.003 14.3838 110.162 14.3838H114.956C115.039 14.3905 115.122 14.3799 115.2 14.3527C115.279 14.3256 115.35 14.2825 115.411 14.2262C115.472 14.1698 115.521 14.1015 115.554 14.0255C115.587 13.9495 115.604 13.8674 115.603 13.7845H115.556ZM106.566 14.3838H101.771C101.612 14.3838 101.46 14.3207 101.347 14.2083C101.235 14.0959 101.172 13.9434 101.172 13.7845V8.98989C101.172 8.83094 101.235 8.6785 101.347 8.5661C101.46 8.4537 101.612 8.39056 101.771 8.39056H106.566C106.725 8.39056 106.877 8.4537 106.989 8.5661C107.102 8.6785 107.165 8.83094 107.165 8.98989V13.7845C107.165 13.9374 107.107 14.0846 107.002 14.1961C106.898 14.3075 106.754 14.3746 106.602 14.3838H106.566Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M89.8085 16.7991H85.0019C84.6709 16.7991 84.4026 17.0674 84.4026 17.3984V22.205C84.4026 22.536 84.6709 22.8043 85.0019 22.8043H89.8085C90.1395 22.8043 90.4078 22.536 90.4078 22.205V17.3984C90.4078 17.0674 90.1395 16.7991 89.8085 16.7991Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M98.205 33.5982H93.3984C93.0674 33.5982 92.7991 33.8665 92.7991 34.1975V39.0041C92.7991 39.3351 93.0674 39.6035 93.3984 39.6035H98.205C98.536 39.6035 98.8043 39.3351 98.8043 39.0041V34.1975C98.8043 33.8665 98.536 33.5982 98.205 33.5982Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M98.205 31.2009H93.3804C93.2215 31.2009 93.0691 31.1378 92.9567 31.0254C92.8443 30.913 92.7811 30.7605 92.7811 30.6016V25.807C92.7811 25.648 92.8443 25.4956 92.9567 25.3832C93.0691 25.2708 93.2215 25.2076 93.3804 25.2076H98.1751C98.334 25.2076 98.4864 25.2708 98.5988 25.3832C98.7112 25.4956 98.7744 25.648 98.7744 25.807V30.6016C98.7746 30.7555 98.7156 30.9035 98.6096 31.0151C98.5036 31.1267 98.3587 31.1932 98.205 31.2009ZM89.8145 31.2009H84.9899C84.8309 31.2009 84.6785 31.1378 84.5661 31.0254C84.4537 30.913 84.3906 30.7605 84.3906 30.6016V25.807C84.3906 25.648 84.4537 25.4956 84.5661 25.3832C84.6785 25.2708 84.8309 25.2076 84.9899 25.2076H89.7845C89.9434 25.2076 90.0959 25.2708 90.2083 25.3832C90.3207 25.4956 90.3838 25.648 90.3838 25.807V30.6016C90.3838 30.7605 90.3207 30.913 90.2083 31.0254C90.0959 31.1378 89.9434 31.2009 89.7845 31.2009H89.8145ZM82.0232 38.9921V34.1975C82.0232 34.0386 81.9601 33.8861 81.8477 33.7737C81.7353 33.6613 81.5828 33.5982 81.4239 33.5982H76.5993C76.4404 33.5982 76.2879 33.6613 76.1755 33.7737C76.0631 33.8861 76 34.0386 76 34.1975V38.9921C76 39.1511 76.0631 39.3035 76.1755 39.4159C76.2879 39.5283 76.4404 39.5915 76.5993 39.5915H81.3939C81.5508 39.5915 81.7015 39.53 81.8135 39.4202C81.9256 39.3104 81.9901 39.161 81.9933 39.0041L82.0232 38.9921ZM107.195 38.9921V34.1975C107.195 34.0386 107.132 33.8861 107.019 33.7737C106.907 33.6613 106.755 33.5982 106.596 33.5982H101.801C101.642 33.5982 101.49 33.6613 101.377 33.7737C101.265 33.8861 101.202 34.0386 101.202 34.1975V38.9921C101.202 39.1511 101.265 39.3035 101.377 39.4159C101.49 39.5283 101.642 39.5915 101.801 39.5915H106.596C106.754 39.5931 106.906 39.5323 107.019 39.4223C107.132 39.3123 107.198 39.162 107.201 39.0041L107.195 38.9921ZM115.585 38.9921V34.1975C115.585 34.0386 115.522 33.8861 115.41 33.7737C115.298 33.6613 115.145 33.5982 114.986 33.5982H110.192C110.033 33.5982 109.88 33.6613 109.768 33.7737C109.655 33.8861 109.592 34.0386 109.592 34.1975V38.9921C109.592 39.1511 109.655 39.3035 109.768 39.4159C109.88 39.5283 110.033 39.5915 110.192 39.5915H114.986C115.065 39.5939 115.144 39.5805 115.218 39.5522C115.292 39.5239 115.36 39.4812 115.417 39.4266C115.475 39.372 115.521 39.3065 115.553 39.234C115.585 39.1615 115.602 39.0834 115.603 39.0041L115.585 38.9921Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M81.4059 42.0008H76.5993C76.2683 42.0008 76 42.2691 76 42.6001V47.4067C76 47.7377 76.2683 48.006 76.5993 48.006H81.4059C81.7369 48.006 82.0052 47.7377 82.0052 47.4067V42.6001C82.0052 42.2691 81.7369 42.0008 81.4059 42.0008Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M115.004 42.0008H110.197C109.866 42.0008 109.598 42.2691 109.598 42.6001V47.4067C109.598 47.7377 109.866 48.006 110.197 48.006H115.004C115.335 48.006 115.603 47.7377 115.603 47.4067V42.6001C115.603 42.2691 115.335 42.0008 115.004 42.0008Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M123.407 42.0008H118.6C118.269 42.0008 118.001 42.2691 118.001 42.6001V47.4067C118.001 47.7377 118.269 48.006 118.6 48.006H123.407C123.738 48.006 124.006 47.7377 124.006 47.4067V42.6001C124.006 42.2691 123.738 42.0008 123.407 42.0008Z" fill="#CCCCDC" fill-opacity="0.12"/>
+</g>
+<defs>
+<clipPath id="clip0_1764_105348">
+<rect width="48" height="48" fill="white"/>
+</clipPath>
+<clipPath id="clip1_1764_105348">
+<rect width="48" height="48" fill="white" transform="translate(76)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/transformations/disabled/merge.svg b/public/img/transformations/disabled/merge.svg
new file mode 100644
index 0000000000000..f8561735deb5a
--- /dev/null
+++ b/public/img/transformations/disabled/merge.svg
@@ -0,0 +1,64 @@
+<svg width="177" height="48" viewBox="0 0 177 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1764_105554)">
+<path d="M0 1.04083V13H15V0H0.626828C0.460583 0 0.301147 0.109659 0.183594 0.304853C0.0660407 0.500047 0 0.764787 0 1.04083Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M15 17.5H0V30.5H15V17.5Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M15 35H0V48H15V35Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M8.5 21H7.07158L5.5 21.9199V23.1738L6.92531 22.3535H6.96266V27H8.5V21Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M5.33733 44.5H9.75V43.3468H7.33409V43.3092L8.04722 42.6561C9.33959 41.5376 9.67723 40.9682 9.67723 40.289C9.67723 39.2225 8.8011 38.5 7.44761 38.5C6.12905 38.5 5.2471 39.2543 5.25001 40.4595H6.61514C6.61514 39.9249 6.94696 39.6156 7.44179 39.6156C7.92788 39.6156 8.28008 39.9133 8.28008 40.4017C8.28008 40.8439 8.00065 41.1445 7.51165 41.5809L5.33733 43.4711V44.5Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M6.77442 9.5C7.52635 9.5 8.04638 9.23767 8.34153 8.74147H8.3837V9.41783H10V6.1182C10 5.09102 8.98454 4.5 7.61068 4.5C6.15952 4.5 5.33732 5.1574 5.20028 6.04235L6.78496 6.09292C6.85875 5.78319 7.14336 5.59355 7.59663 5.59355C8.01827 5.59355 8.28531 5.77686 8.28531 6.1024V6.1182C8.28531 6.4153 7.92692 6.47851 7.00633 6.5512C5.91356 6.63338 5 6.99684 5 8.07143C5 9.03224 5.74139 9.5 6.77442 9.5ZM7.30499 8.48862C6.90794 8.48862 6.62684 8.31795 6.62684 7.99558C6.62684 7.68268 6.90091 7.49305 7.38932 7.42668C7.70907 7.38559 8.1026 7.32238 8.29585 7.23072V7.69216C8.29585 8.16624 7.85313 8.48862 7.30499 8.48862Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<g clip-path="url(#clip1_1764_105554)">
+<path d="M19 13H34V1.04083C34 0.764787 33.934 0.500047 33.8164 0.304853C33.6989 0.109659 33.5394 0 33.3732 0L19 0V13Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M34 17.5H19V30.5H34V17.5Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M34 35H19V48H34V35Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M24 9.68623H25.5663V8.96449H25.6149C25.8155 9.37609 26.2621 9.75 27.0129 9.75C28.1133 9.75 29 8.97898 29 7.46304C29 5.89203 28.0615 5.17609 27.0227 5.17609C26.2362 5.17609 25.8058 5.58768 25.6149 5.99638H25.5825V3.75H24V9.68623ZM25.5502 7.46015C25.5502 6.73261 25.8867 6.28333 26.466 6.28333C27.0518 6.28333 27.3754 6.7442 27.3754 7.46015C27.3754 8.17899 27.0518 8.64565 26.466 8.64565C25.8867 8.64565 25.5502 8.18188 25.5502 7.46015Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<path d="M46.3343 30H49.674V25.674H54V22.3343H49.674V18H46.3343V22.3343H42V25.674H46.3343V30Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<g clip-path="url(#clip2_1764_105554)">
+<path d="M77 26.25H62V39.25H77V26.25Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M62 9.79083V21.75H77V8.75H62.6268C62.4606 8.75 62.3011 8.85966 62.1836 9.05485C62.066 9.25005 62 9.51479 62 9.79083Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M69.4792 35.75C70.8085 35.75 71.7528 35.0257 71.75 34.0105C71.7528 33.2918 71.2958 32.7785 70.4208 32.673V32.6274C71.0771 32.5304 71.5423 32.077 71.5395 31.4211C71.5423 30.4686 70.706 29.75 69.4903 29.75C68.2663 29.75 67.3746 30.48 67.3635 31.5181H68.6734C68.6845 31.1188 69.0334 30.8508 69.4903 30.8508C69.9251 30.8508 70.2214 31.1217 70.2186 31.5124C70.2214 31.9173 69.8725 32.1968 69.3685 32.1968H68.8174V33.2006H69.3685C69.9417 33.2006 70.3155 33.4914 70.31 33.9021C70.3155 34.3156 69.9721 34.6036 69.4848 34.6036C69.0001 34.6036 68.6429 34.3384 68.6291 33.9534H67.25C67.2611 35.0086 68.1832 35.75 69.4792 35.75Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M67 18.4362H68.5663V17.7145H68.6149C68.8155 18.1261 69.2621 18.5 70.0129 18.5C71.1133 18.5 72 17.729 72 16.213C72 14.642 71.0615 13.9261 70.0227 13.9261C69.2362 13.9261 68.8058 14.3377 68.6149 14.7464H68.5825V12.5H67V18.4362ZM68.5502 16.2101C68.5502 15.4826 68.8867 15.0333 69.466 15.0333C70.0518 15.0333 70.3754 15.4942 70.3754 16.2101C70.3754 16.929 70.0518 17.3957 69.466 17.3957C68.8867 17.3957 68.5502 16.9319 68.5502 16.2101Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<g clip-path="url(#clip3_1764_105554)">
+<path d="M96 26.25H81V39.25H96V26.25Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M81 21.75H96V9.79083C96 9.51479 95.934 9.25005 95.8164 9.05485C95.6989 8.85966 95.5394 8.75 95.3732 8.75H81V21.75Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M88.6058 18.5C90.0564 18.5 90.9563 17.7082 91 16.5095H89.4654C89.405 17.0237 89.0759 17.3044 88.6259 17.3044C88.0484 17.3044 87.6723 16.847 87.6723 15.9858C87.6723 15.1309 88.0517 14.6735 88.6259 14.6735C89.096 14.6735 89.4016 14.9732 89.4654 15.4685H91C90.9631 14.276 90.0363 13.5 88.6024 13.5C86.9805 13.5 86 14.5158 86 16.0016C86 17.4811 86.9738 18.5 88.6058 18.5Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<path d="M109.907 30C110.601 30 115.933 26 115.933 24C115.933 22 110.736 18 109.907 18C109.078 18 108.402 18.5 108.402 19.4756C108.402 20.4512 111.907 22.9206 111.907 22.9206C111.907 22.9206 104.254 22.25 104 22.9206C103.746 23.5911 103.746 24.4089 104 25.0794C104.254 25.75 111.907 25.0794 111.907 25.0794C111.907 25.0794 108.402 27.75 108.402 28.5301C108.402 29.3103 109.212 30 109.907 30Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M124 0.720576V9H139V0H124.627C124.461 0 124.301 0.0759177 124.184 0.211052C124.066 0.346186 124 0.529468 124 0.720576Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M139 13H124V22H139V13Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M139 26H124V35H139V26Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M139 39H124V48H139V39Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M124.5 47.5V39.5H138.5V47.5H124.5Z" stroke="#CCCCDC" stroke-opacity="0.25"/>
+<path d="M132.5 15H131.31L130 15.7666V16.8115L131.188 16.1279H131.219V20H132.5V15Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M130.072 33H133.724V32.039H131.724V32.0077L132.315 31.4634C133.384 30.5313 133.663 30.0568 133.663 29.4908C133.663 28.6021 132.938 28 131.818 28C130.727 28 129.998 28.6286 130 29.6329H131.13C131.13 29.1874 131.404 28.9297 131.814 28.9297C132.216 28.9297 132.507 29.1777 132.507 29.5848C132.507 29.9533 132.276 30.2038 131.871 30.5674L130.072 32.1426V33Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M129 7.68623H130.566V6.96449H130.615C130.816 7.37609 131.262 7.75 132.013 7.75C133.113 7.75 134 6.97898 134 5.46304C134 3.89203 133.061 3.17609 132.023 3.17609C131.236 3.17609 130.806 3.58768 130.615 3.99638H130.583V1.75H129V7.68623ZM130.55 5.46015C130.55 4.73261 130.887 4.28333 131.466 4.28333C132.052 4.28333 132.375 4.7442 132.375 5.46015C132.375 6.17899 132.052 6.64565 131.466 6.64565C130.887 6.64565 130.55 6.18188 130.55 5.46015Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M143 0.720576V9H158V0H143.627C143.461 0 143.301 0.0759177 143.184 0.211052C143.066 0.346186 143 0.529468 143 0.720576Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M158 13H143V22H158V13Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M158 26H143V35H158V26Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M158 39H143V48H158V39Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M150.913 46C152.054 46 152.864 45.3964 152.862 44.5504C152.864 43.9515 152.472 43.5238 151.721 43.4358V43.3978C152.284 43.317 152.683 42.9392 152.681 42.3926C152.683 41.5989 151.966 41 150.923 41C149.872 41 149.107 41.6084 149.097 42.4734H150.221C150.231 42.1407 150.53 41.9173 150.923 41.9173C151.296 41.9173 151.55 42.1431 151.548 42.4686C151.55 42.8061 151.25 43.039 150.818 43.039H150.345V43.8755H150.818C151.31 43.8755 151.631 44.1179 151.626 44.4601C151.631 44.8047 151.336 45.0447 150.918 45.0447C150.502 45.0447 150.195 44.8237 150.183 44.5029H149C149.01 45.3821 149.801 46 150.913 46Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M149.774 7.5C150.526 7.5 151.046 7.23767 151.342 6.74147H151.384V7.41783H153V4.1182C153 3.09102 151.985 2.5 150.611 2.5C149.16 2.5 148.337 3.1574 148.2 4.04235L149.785 4.09292C149.859 3.78319 150.143 3.59355 150.597 3.59355C151.018 3.59355 151.285 3.77686 151.285 4.1024V4.1182C151.285 4.4153 150.927 4.47851 150.006 4.5512C148.914 4.63338 148 4.99684 148 6.07143C148 7.03224 148.741 7.5 149.774 7.5ZM150.305 6.48862C149.908 6.48862 149.627 6.31795 149.627 5.99558C149.627 5.68268 149.901 5.49305 150.389 5.42668C150.709 5.38559 151.103 5.32238 151.296 5.23072V5.69216C151.296 6.16624 150.853 6.48862 150.305 6.48862Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M162 9H177V0.720577C177 0.529468 176.934 0.346186 176.816 0.211052C176.699 0.0759177 176.539 0 176.373 0L162 0V9Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M177 39H162V48H177V39Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M177 26H162V35H177V26Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M162.5 34.5V26.5H176.5V34.5H162.5Z" stroke="#CCCCDC" stroke-opacity="0.25"/>
+<path d="M177 13H162V22H177V13Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M162.5 21.5V13.5H176.5V21.5H162.5Z" stroke="#CCCCDC" stroke-opacity="0.25"/>
+<path d="M169.606 7.5C171.056 7.5 171.956 6.7082 172 5.50946H170.465C170.405 6.02366 170.076 6.30442 169.626 6.30442C169.048 6.30442 168.672 5.847 168.672 4.9858C168.672 4.13092 169.052 3.6735 169.626 3.6735C170.096 3.6735 170.402 3.97319 170.465 4.46845H172C171.963 3.27602 171.036 2.5 169.602 2.5C167.981 2.5 167 3.51577 167 5.00158C167 6.48107 167.974 7.5 169.606 7.5Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<defs>
+<clipPath id="clip0_1764_105554">
+<rect width="15" height="48" fill="white"/>
+</clipPath>
+<clipPath id="clip1_1764_105554">
+<rect width="15" height="48" fill="white" transform="translate(19)"/>
+</clipPath>
+<clipPath id="clip2_1764_105554">
+<rect width="15" height="30.5" fill="white" transform="translate(62 8.75)"/>
+</clipPath>
+<clipPath id="clip3_1764_105554">
+<rect width="15" height="30.5" fill="white" transform="translate(81 8.75)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/transformations/disabled/organize.svg b/public/img/transformations/disabled/organize.svg
new file mode 100644
index 0000000000000..fc3ed53d19ec7
--- /dev/null
+++ b/public/img/transformations/disabled/organize.svg
@@ -0,0 +1,53 @@
+<svg width="154" height="48" viewBox="0 0 154 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 2.57189C15.0002 2.53241 14.9927 2.49327 14.9777 2.45672C14.9628 2.42018 14.9408 2.38693 14.913 2.3589L13.641 1.087C13.613 1.0592 13.5797 1.0372 13.5432 1.02227C13.5066 1.00734 13.4675 0.999777 13.428 1.00001C13.3885 0.999777 13.3494 1.00734 13.3128 1.02227C13.2763 1.0372 13.243 1.0592 13.215 1.087L12.366 1.93594L9.087 5.21469C9.0592 5.24272 9.0372 5.27596 9.02227 5.31251C9.00734 5.34906 8.99978 5.3882 9.00001 5.42767V6.69958C9.00001 6.77914 9.03161 6.85544 9.08787 6.9117C9.14413 6.96795 9.22044 6.99956 9.3 6.99956H10.572C10.614 7.00184 10.656 6.99528 10.6952 6.98029C10.7345 6.9653 10.7702 6.94223 10.8 6.91256L14.061 3.63381L14.913 2.79987C14.9404 2.7708 14.9627 2.73733 14.979 2.70088C14.9819 2.67697 14.9819 2.65279 14.979 2.62888C14.9804 2.61492 14.9804 2.60085 14.979 2.58689L15 2.57189ZM10.449 6.3996H9.6V5.55067L12.579 2.57189L13.428 3.42082L10.449 6.3996ZM13.851 2.99786L13.002 2.14892L13.428 1.72595L14.274 2.57189L13.851 2.99786Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<g clip-path="url(#clip0_1764_105742)">
+<path d="M0 11.3611V27H24V10H1.00293C0.736933 10 0.481835 10.1434 0.29375 10.3987C0.105665 10.6539 0 11.0001 0 11.3611Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M24 31H0V48H24V31Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M10.7744 21.5C11.5264 21.5 12.0464 21.2377 12.3415 20.7415H12.3837V21.4178H14V18.1182C14 17.091 12.9845 16.5 11.6107 16.5C10.1595 16.5 9.33732 17.1574 9.20028 18.0424L10.785 18.0929C10.8587 17.7832 11.1434 17.5936 11.5966 17.5936C12.0183 17.5936 12.2853 17.7769 12.2853 18.1024V18.1182C12.2853 18.4153 11.9269 18.4785 11.0063 18.5512C9.91356 18.6334 9 18.9968 9 20.0714C9 21.0322 9.74139 21.5 10.7744 21.5ZM11.305 20.4886C10.9079 20.4886 10.6268 20.318 10.6268 19.9956C10.6268 19.6827 10.9009 19.493 11.3893 19.4267C11.7091 19.3856 12.1026 19.3224 12.2959 19.2307V19.6922C12.2959 20.1662 11.8531 20.4886 11.305 20.4886Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M13 36.5H11.5716L10 37.4199V38.6738L11.4253 37.8535H11.4627V42.5H13V36.5Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<path d="M35.7975 2.10148C35.7642 2.06962 35.7249 2.04465 35.682 2.02799C35.5968 1.993 35.5012 1.993 35.416 2.02799C35.3731 2.04465 35.3339 2.06962 35.3006 2.10148L34.6007 2.80134C34.5348 2.86723 34.4978 2.9566 34.4978 3.04979C34.4978 3.14297 34.5348 3.23234 34.6007 3.29823C34.6666 3.36413 34.756 3.40115 34.8492 3.40115C34.9423 3.40115 35.0317 3.36413 35.0976 3.29823L35.1991 3.19326V5.84921C35.1991 5.94202 35.236 6.03103 35.3016 6.09665C35.3672 6.16227 35.4562 6.19914 35.549 6.19914C35.6418 6.19914 35.7308 6.16227 35.7965 6.09665C35.8621 6.03103 35.8989 5.94202 35.8989 5.84921V3.19326L36.0004 3.29823C36.033 3.33103 36.0717 3.35707 36.1143 3.37483C36.1569 3.3926 36.2027 3.40174 36.2489 3.40174C36.2951 3.40174 36.3408 3.3926 36.3835 3.37483C36.4261 3.35707 36.4648 3.33103 36.4973 3.29823C36.5301 3.2657 36.5562 3.227 36.5739 3.18436C36.5917 3.14172 36.6008 3.09598 36.6008 3.04979C36.6008 3.00359 36.5917 2.95785 36.5739 2.91521C36.5562 2.87257 36.5301 2.83387 36.4973 2.80134L35.7975 2.10148ZM37.6486 2.69986H41.1479C41.2407 2.69986 41.3297 2.66299 41.3953 2.59737C41.4609 2.53174 41.4978 2.44274 41.4978 2.34993C41.4978 2.25712 41.4609 2.16812 41.3953 2.10249C41.3297 2.03687 41.2407 2 41.1479 2H37.6486C37.5558 2 37.4668 2.03687 37.4012 2.10249C37.3355 2.16812 37.2987 2.25712 37.2987 2.34993C37.2987 2.44274 37.3355 2.53174 37.4012 2.59737C37.4668 2.66299 37.5558 2.69986 37.6486 2.69986ZM41.1479 5.49928H37.6486C37.5558 5.49928 37.4668 5.53615 37.4012 5.60178C37.3355 5.6674 37.2987 5.75641 37.2987 5.84921C37.2987 5.94202 37.3355 6.03103 37.4012 6.09665C37.4668 6.16227 37.5558 6.19914 37.6486 6.19914H41.1479C41.2407 6.19914 41.3297 6.16227 41.3953 6.09665C41.4609 6.03103 41.4978 5.94202 41.4978 5.84921C41.4978 5.75641 41.4609 5.6674 41.3953 5.60178C41.3297 5.53615 41.2407 5.49928 41.1479 5.49928ZM41.1479 3.74964H37.6486C37.5558 3.74964 37.4668 3.78651 37.4012 3.85213C37.3355 3.91776 37.2987 4.00676 37.2987 4.09957C37.2987 4.19238 37.3355 4.28138 37.4012 4.34701C37.4668 4.41263 37.5558 4.4495 37.6486 4.4495H41.1479C41.2407 4.4495 41.3297 4.41263 41.3953 4.34701C41.4609 4.28138 41.4978 4.19238 41.4978 4.09957C41.4978 4.00676 41.4609 3.91776 41.3953 3.85213C41.3297 3.78651 41.2407 3.74964 41.1479 3.74964Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<g clip-path="url(#clip1_1764_105742)">
+<path d="M26 27H50V11.3611V10H48.9971H26V27Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M50 31H26V48H50V31Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M35.5 21.4362H37.0663V20.7145H37.1149C37.3155 21.1261 37.7621 21.5 38.5129 21.5C39.6133 21.5 40.5 20.729 40.5 19.213C40.5 17.642 39.5615 16.9261 38.5227 16.9261C37.7362 16.9261 37.3058 17.3377 37.1149 17.7464H37.0825V15.5H35.5V21.4362ZM37.0502 19.2101C37.0502 18.4826 37.3867 18.0333 37.966 18.0333C38.5518 18.0333 38.8754 18.4942 38.8754 19.2101C38.8754 19.929 38.5518 20.3957 37.966 20.3957C37.3867 20.3957 37.0502 19.9319 37.0502 19.2101Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M35.5873 42.5H40V41.3468H37.5841V41.3092L38.2972 40.6561C39.5896 39.5376 39.9272 38.9682 39.9272 38.289C39.9272 37.2225 39.0511 36.5 37.6976 36.5C36.379 36.5 35.4971 37.2543 35.5 38.4595H36.8651C36.8651 37.9249 37.197 37.6156 37.6918 37.6156C38.1779 37.6156 38.5301 37.9133 38.5301 38.4017C38.5301 38.8439 38.2506 39.1445 37.7616 39.5809L35.5873 41.4711V42.5Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<path d="M63.6797 2.22255C63.7849 2.20642 63.8911 2.19841 63.9975 2.19856C64.9511 2.19856 65.8476 2.88522 66.3694 3.99767C66.2896 4.16696 66.1995 4.33119 66.0995 4.48943C66.0678 4.53854 66.0511 4.59587 66.0515 4.65434C66.0522 4.71978 66.0743 4.78321 66.1143 4.83494C66.1544 4.88667 66.2103 4.92387 66.2735 4.94086C66.3367 4.95784 66.4037 4.95369 66.4644 4.92903C66.525 4.90437 66.5759 4.86055 66.6093 4.80427C66.749 4.58476 66.8703 4.35409 66.9721 4.11461C66.9882 4.0772 66.9965 4.0369 66.9965 3.99617C66.9965 3.95544 66.9882 3.91514 66.9721 3.87773C66.3664 2.47142 65.2269 1.59886 63.9975 1.59886C63.8568 1.59815 63.7163 1.61019 63.5778 1.63484C63.5384 1.64153 63.5007 1.65592 63.4669 1.67717C63.4331 1.69842 63.4038 1.72613 63.3807 1.75871C63.3575 1.79128 63.3411 1.82809 63.3322 1.86704C63.3233 1.90598 63.3222 1.94629 63.3289 1.98566C63.3356 2.02504 63.35 2.06271 63.3712 2.09653C63.3925 2.13035 63.4202 2.15965 63.4527 2.18276C63.4853 2.20587 63.5221 2.22234 63.5611 2.23122C63.6 2.24011 63.6403 2.24123 63.6797 2.23454V2.22255ZM61.5118 1.08611C61.4838 1.05815 61.4506 1.03597 61.4141 1.02084C61.3776 1.00571 61.3384 0.997925 61.2989 0.997925C61.2593 0.997925 61.2202 1.00571 61.1837 1.02084C61.1471 1.03597 61.1139 1.05815 61.086 1.08611C61.0295 1.14257 60.9978 1.21915 60.9978 1.299C60.9978 1.37885 61.0295 1.45543 61.086 1.5119L62.0155 2.43844C61.5914 2.8467 61.2539 3.33619 61.023 3.87773C61.0065 3.91556 60.998 3.95639 60.998 3.99767C60.998 4.03895 61.0065 4.07978 61.023 4.11761C61.6287 5.52391 62.7682 6.39648 63.9975 6.39648C64.5364 6.39276 65.0626 6.23231 65.5118 5.93471L66.4833 6.90923C66.5112 6.93733 66.5444 6.95964 66.5809 6.97486C66.6174 6.99009 66.6566 6.99792 66.6962 6.99792C66.7358 6.99792 66.775 6.99009 66.8115 6.97486C66.8481 6.95964 66.8812 6.93733 66.9091 6.90923C66.9372 6.88135 66.9595 6.84819 66.9747 6.81165C66.99 6.77511 66.9978 6.73592 66.9978 6.69633C66.9978 6.65675 66.99 6.61756 66.9747 6.58102C66.9595 6.54448 66.9372 6.51131 66.9091 6.48344L61.5118 1.08611ZM63.4188 3.84175L64.1535 4.57638C64.1028 4.59092 64.0503 4.59799 63.9975 4.59737C63.8385 4.59737 63.686 4.53419 63.5735 4.42172C63.461 4.30926 63.3978 4.15672 63.3978 3.99767C63.3972 3.94495 63.4043 3.89242 63.4188 3.84175ZM63.9975 5.79678C63.044 5.79678 62.1475 5.11012 61.6287 3.99767C61.8224 3.57 62.0974 3.18404 62.4383 2.86123L62.9691 3.39797C62.8444 3.62549 62.7969 3.88731 62.8336 4.14413C62.8703 4.40096 62.9894 4.63895 63.1728 4.8224C63.3563 5.00586 63.5943 5.12488 63.8511 5.16162C64.1079 5.19835 64.3697 5.15082 64.5972 5.02616L65.074 5.49693C64.7475 5.6891 64.3764 5.79247 63.9975 5.79678Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<g clip-path="url(#clip2_1764_105742)">
+<path d="M52 27H76V11.3611C76 11.0001 75.8943 10.6539 75.7063 10.3987C75.5182 10.1434 75.2631 10 74.9971 10H52V27Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M76 31H52V48H76V31Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M64.1058 21.5C65.5564 21.5 66.4563 20.7082 66.5 19.5095H64.9654C64.905 20.0237 64.5759 20.3044 64.1259 20.3044C63.5484 20.3044 63.1723 19.847 63.1723 18.9858C63.1723 18.1309 63.5517 17.6735 64.1259 17.6735C64.596 17.6735 64.9016 17.9732 64.9654 18.4685H66.5C66.4631 17.276 65.5363 16.5 64.1024 16.5C62.4805 16.5 61.5 17.5158 61.5 19.0016C61.5 20.4811 62.4738 21.5 64.1058 21.5Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M63.9769 42.5C65.4538 42.5 66.5031 41.7757 66.5 40.7605C66.5031 40.0418 65.9954 39.5285 65.0231 39.423V39.3774C65.7523 39.2804 66.2692 38.827 66.2661 38.1711C66.2692 37.2186 65.34 36.5 63.9892 36.5C62.6292 36.5 61.6385 37.23 61.6262 38.2681H63.0815C63.0938 37.8688 63.4815 37.6008 63.9892 37.6008C64.4723 37.6008 64.8015 37.8717 64.7985 38.2624C64.8015 38.6673 64.4138 38.9468 63.8538 38.9468H63.2415V39.9506H63.8538C64.4908 39.9506 64.9061 40.2414 64.9 40.6521C64.9061 41.0656 64.5246 41.3536 63.9831 41.3536C63.4446 41.3536 63.0477 41.0884 63.0323 40.7034H61.5C61.5123 41.7586 62.5369 42.5 63.9769 42.5Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<path d="M89.9067 30C90.6011 30 95.9327 26 95.9327 24C95.9327 22 90.7357 18 89.9067 18C89.0777 18 88.4023 18.5 88.4023 19.4756C88.4023 20.4512 91.9067 22.9206 91.9067 22.9206C91.9067 22.9206 84.2539 22.25 84 22.9206C83.7461 23.5911 83.7461 24.4089 84 25.0794C84.2539 25.75 91.9067 25.0794 91.9067 25.0794C91.9067 25.0794 88.4023 27.75 88.4023 28.5301C88.4023 29.3103 89.2123 30 89.9067 30Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<g clip-path="url(#clip3_1764_105742)">
+<path d="M130 27H154V11.3611C154 11.0001 153.894 10.6539 153.706 10.3987C153.518 10.1434 153.263 10 152.997 10H130V27Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M154 31H130V48H154V31Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M143 36.5H141.572L140 37.4199V38.6738L141.425 37.8535H141.463V42.5H143V36.5Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M140.987 21.5C141.738 21.5 142.184 21.1261 142.385 20.7145H142.434V21.4362H144V15.5H142.417V17.7464H142.385C142.197 17.3377 141.764 16.9261 140.981 16.9261C139.942 16.9261 139 17.642 139 19.213C139 20.729 139.89 21.5 140.987 21.5ZM141.537 20.3957C140.951 20.3957 140.625 19.929 140.625 19.2101C140.625 18.4942 140.948 18.0333 141.537 18.0333C142.117 18.0333 142.453 18.4826 142.453 19.2101C142.453 19.9319 142.113 20.3957 141.537 20.3957Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<g clip-path="url(#clip4_1764_105742)">
+<path d="M128 31H104V48H128V31Z" fill="#CCCCDC" fill-opacity="0.12"/>
+<path d="M104 11.3611V27H128V10H105.003C104.737 10 104.482 10.1434 104.294 10.3987C104.106 10.6539 104 11.0001 104 11.3611Z" fill="#CCCCDC" fill-opacity="0.04"/>
+<path d="M113.5 21.4362H115.066V20.7145H115.115C115.316 21.1261 115.762 21.5 116.513 21.5C117.613 21.5 118.5 20.729 118.5 19.213C118.5 17.642 117.561 16.9261 116.523 16.9261C115.736 16.9261 115.306 17.3377 115.115 17.7464H115.083V15.5H113.5V21.4362ZM115.05 19.2101C115.05 18.4826 115.387 18.0333 115.966 18.0333C116.552 18.0333 116.875 18.4942 116.875 19.2101C116.875 19.929 116.552 20.3957 115.966 20.3957C115.387 20.3957 115.05 19.9319 115.05 19.2101Z" fill="#CCCCDC" fill-opacity="0.4"/>
+<path d="M113.587 42.5H118V41.3468H115.584V41.3092L116.297 40.6561C117.59 39.5376 117.927 38.9682 117.927 38.289C117.927 37.2225 117.051 36.5 115.698 36.5C114.379 36.5 113.497 37.2543 113.5 38.4595H114.865C114.865 37.9249 115.197 37.6156 115.692 37.6156C116.178 37.6156 116.53 37.9133 116.53 38.4017C116.53 38.8439 116.251 39.1445 115.762 39.5809L113.587 41.4711V42.5Z" fill="#CCCCDC" fill-opacity="0.4"/>
+</g>
+<defs>
+<clipPath id="clip0_1764_105742">
+<rect width="24" height="38" fill="white" transform="translate(0 10)"/>
+</clipPath>
+<clipPath id="clip1_1764_105742">
+<rect width="24" height="38" fill="white" transform="translate(26 10)"/>
+</clipPath>
+<clipPath id="clip2_1764_105742">
+<rect width="24" height="38" fill="white" transform="translate(52 10)"/>
+</clipPath>
+<clipPath id="clip3_1764_105742">
+<rect width="24" height="38" fill="white" transform="translate(130 10)"/>
+</clipPath>
+<clipPath id="clip4_1764_105742">
+<rect width="24" height="38" fill="white" transform="translate(104 10)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/img/transformations/light/formatString.svg b/public/img/transformations/light/formatString.svg
new file mode 100644
index 0000000000000..5d1a829a4dc16
--- /dev/null
+++ b/public/img/transformations/light/formatString.svg
@@ -0,0 +1,25 @@
+<svg width="58" height="48" viewBox="0 0 58 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 1.04083V13H15V0H0.626828C0.460583 0 0.301147 0.109659 0.183594 0.304853C0.0660407 0.500047 0 0.764787 0 1.04083Z" fill="url(#paint0_linear_1811_57031)"/>
+<path d="M15 17.5H0V30.5H15V17.5Z" fill="#84AFF1"/>
+<path d="M15 35H0V48H15V35Z" fill="#84AFF1"/>
+<path d="M9.65 9.3H9.3V3.35C9.3 3.25717 9.26313 3.16815 9.19749 3.10251C9.13185 3.03687 9.04283 3 8.95 3H7.725C7.66392 3.00037 7.604 3.01672 7.5512 3.04742C7.49839 3.07812 7.45454 3.1221 7.424 3.175L3.8505 9.3H3.35C3.25717 9.3 3.16815 9.33687 3.10251 9.40251C3.03687 9.46815 3 9.55717 3 9.65C3 9.74283 3.03687 9.83185 3.10251 9.89749C3.16815 9.96313 3.25717 10 3.35 10H4.75C4.84283 10 4.93185 9.96313 4.99749 9.89749C5.06313 9.83185 5.1 9.74283 5.1 9.65C5.1 9.55717 5.06313 9.46815 4.99749 9.40251C4.93185 9.33687 4.84283 9.3 4.75 9.3H4.659L5.884 7.2H8.6V9.3H8.25C8.15717 9.3 8.06815 9.33687 8.00251 9.40251C7.93687 9.46815 7.9 9.55717 7.9 9.65C7.9 9.74283 7.93687 9.83185 8.00251 9.89749C8.06815 9.96313 8.15717 10 8.25 10H9.65C9.74283 10 9.83185 9.96313 9.89749 9.89749C9.96313 9.83185 10 9.74283 10 9.65C10 9.55717 9.96313 9.46815 9.89749 9.40251C9.83185 9.33687 9.74283 9.3 9.65 9.3ZM8.6 6.5H6.2935L7.9245 3.7H8.6V6.5Z" fill="white"/>
+<path d="M6.84608 27C7.52244 27 7.9902 26.7377 8.25569 26.2415H8.29362V26.9178H9.74747V23.6182C9.74747 22.591 8.83407 22 7.59829 22C6.29298 22 5.55341 22.6574 5.43015 23.5424L6.85556 23.5929C6.92193 23.2832 7.17794 23.0936 7.58565 23.0936C7.96492 23.0936 8.20512 23.2769 8.20512 23.6024V23.6182C8.20512 23.9153 7.88274 23.9785 7.05468 24.0512C6.07174 24.1334 5.25 24.4968 5.25 25.5714C5.25 26.5322 5.91688 27 6.84608 27ZM7.32333 25.9886C6.96618 25.9886 6.71334 25.818 6.71334 25.4956C6.71334 25.1827 6.95986 24.993 7.39918 24.9267C7.68679 24.8856 8.04077 24.8224 8.2146 24.7307V25.1922C8.2146 25.6662 7.81637 25.9886 7.32333 25.9886Z" fill="#24292E"/>
+<path d="M5 44.4362H6.56634V43.7145H6.61489C6.81553 44.1261 7.26214 44.5 8.01294 44.5C9.11327 44.5 10 43.729 10 42.213C10 40.642 9.06149 39.9261 8.02265 39.9261C7.23625 39.9261 6.80583 40.3377 6.61489 40.7464H6.58252V38.5H5V44.4362ZM6.55016 42.2101C6.55016 41.4826 6.88673 41.0333 7.46602 41.0333C8.05178 41.0333 8.3754 41.4942 8.3754 42.2101C8.3754 42.929 8.05178 43.3957 7.46602 43.3957C6.88673 43.3957 6.55016 42.9319 6.55016 42.2101Z" fill="#24292E"/>
+<path d="M28.9067 30C29.6011 30 34.9327 26 34.9327 24C34.9327 22 29.7357 18 28.9067 18C28.0778 18 27.4023 18.5 27.4023 19.4756C27.4023 20.4512 30.9067 22.9206 30.9067 22.9206C30.9067 22.9206 23.2539 22.25 23 22.9206C22.7461 23.5911 22.7461 24.4089 23 25.0794C23.2539 25.75 30.9067 25.0794 30.9067 25.0794C30.9067 25.0794 27.4023 27.75 27.4023 28.5301C27.4023 29.3103 28.2124 30 28.9067 30Z" fill="#24292E"/>
+<path d="M43 1.04083V13H58V0H43.6268C43.4606 0 43.3011 0.109659 43.1836 0.304853C43.066 0.500047 43 0.764787 43 1.04083Z" fill="url(#paint1_linear_1811_57031)"/>
+<path d="M58 17.5H43V30.5H58V17.5Z" fill="#84AFF1"/>
+<path d="M58 35H43V48H58V35Z" fill="#84AFF1"/>
+<path d="M52.65 9.3H52.3V3.35C52.3 3.25717 52.2631 3.16815 52.1975 3.10251C52.1318 3.03687 52.0428 3 51.95 3H50.725C50.6639 3.00037 50.604 3.01672 50.5512 3.04742C50.4984 3.07812 50.4545 3.1221 50.424 3.175L46.8505 9.3H46.35C46.2572 9.3 46.1682 9.33687 46.1025 9.40251C46.0369 9.46815 46 9.55717 46 9.65C46 9.74283 46.0369 9.83185 46.1025 9.89749C46.1682 9.96313 46.2572 10 46.35 10H47.75C47.8428 10 47.9318 9.96313 47.9975 9.89749C48.0631 9.83185 48.1 9.74283 48.1 9.65C48.1 9.55717 48.0631 9.46815 47.9975 9.40251C47.9318 9.33687 47.8428 9.3 47.75 9.3H47.659L48.884 7.2H51.6V9.3H51.25C51.1572 9.3 51.0682 9.33687 51.0025 9.40251C50.9369 9.46815 50.9 9.55717 50.9 9.65C50.9 9.74283 50.9369 9.83185 51.0025 9.89749C51.0682 9.96313 51.1572 10 51.25 10H52.65C52.7428 10 52.8318 9.96313 52.8975 9.89749C52.9631 9.83185 53 9.74283 53 9.65C53 9.55717 52.9631 9.46815 52.8975 9.40251C52.8318 9.33687 52.7428 9.3 52.65 9.3ZM51.6 6.5H49.2935L50.9245 3.7H51.6V6.5Z" fill="white"/>
+<path d="M49.0114 26.8182H47.5L49.4631 21H51.3352L53.2983 26.8182H51.7869L51.4034 25.5966H49.3949L49.0114 26.8182ZM49.7301 24.5284H51.0682L50.4205 22.4659H50.375L49.7301 24.5284Z" fill="black"/>
+<path d="M48.5 44.8182V39H50.9261C52.233 39 52.9091 39.5938 52.9091 40.4716C52.9091 41.1364 52.4602 41.5994 51.821 41.733V41.7898C52.5256 41.821 53.1364 42.3494 53.1364 43.1903C53.1364 44.1307 52.3977 44.8182 51.1108 44.8182H48.5ZM49.9062 43.6847H50.7756C51.3835 43.6847 51.6676 43.4403 51.6676 43.0284C51.6676 42.5824 51.3381 42.2983 50.8011 42.2983H49.9062V43.6847ZM49.9062 41.392H50.6847C51.1449 41.392 51.4744 41.1534 51.4744 40.7443C51.4744 40.358 51.1761 40.1165 50.7074 40.1165H49.9062V41.392Z" fill="black"/>
+<defs>
+<linearGradient id="paint0_linear_1811_57031" x1="0" y1="6.5052" x2="15" y2="6.5052" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2CC0C"/>
+<stop offset="1" stop-color="#FF9830"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1811_57031" x1="43" y1="6.5052" x2="58" y2="6.5052" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2CC0C"/>
+<stop offset="1" stop-color="#FF9830"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index ec68dffd9adaf..d2bd547ab4db6 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -422,6 +422,16 @@
     },
     "title": ""
   },
+  "inspector": {
+    "query": {
+      "collapse-all": "",
+      "copy-to-clipboard": "",
+      "description": "",
+      "expand-all": "",
+      "no-data": "",
+      "refresh": ""
+    }
+  },
   "library-panel": {
     "add-modal": {
       "cancel": "Abbrechen",
@@ -763,6 +773,7 @@
   "panel": {
     "header-menu": {
       "copy": "Kopieren",
+      "create-alert": "",
       "create-library-panel": "Bibliotheksleiste erstellen",
       "duplicate": "Duplikat",
       "edit": "Bearbeiten",
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 6422a2a423fe0..d0369489aa91d 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -422,6 +422,16 @@
     },
     "title": "Shortcuts"
   },
+  "inspector": {
+    "query": {
+      "collapse-all": "Collapse all",
+      "copy-to-clipboard": "Copy to clipboard",
+      "description": "Query inspector allows you to view raw request and response. To collect this data Grafana needs to issue a new query. Click refresh button below to trigger a new query.",
+      "expand-all": "Expand all",
+      "no-data": "No request and response collected yet. Hit refresh button",
+      "refresh": "Refresh"
+    }
+  },
   "library-panel": {
     "add-modal": {
       "cancel": "Cancel",
@@ -763,6 +773,7 @@
   "panel": {
     "header-menu": {
       "copy": "Copy",
+      "create-alert": "Create alert",
       "create-library-panel": "Create library panel",
       "duplicate": "Duplicate",
       "edit": "Edit",
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index b8a17d435b230..d80df14b05f09 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -427,6 +427,16 @@
     },
     "title": ""
   },
+  "inspector": {
+    "query": {
+      "collapse-all": "",
+      "copy-to-clipboard": "",
+      "description": "",
+      "expand-all": "",
+      "no-data": "",
+      "refresh": ""
+    }
+  },
   "library-panel": {
     "add-modal": {
       "cancel": "Cancelar",
@@ -769,6 +779,7 @@
   "panel": {
     "header-menu": {
       "copy": "Copiar",
+      "create-alert": "",
       "create-library-panel": "Crear panel de librería",
       "duplicate": "Duplicar",
       "edit": "Editar",
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index d61babbf93da7..f703114f1ff70 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -427,6 +427,16 @@
     },
     "title": ""
   },
+  "inspector": {
+    "query": {
+      "collapse-all": "",
+      "copy-to-clipboard": "",
+      "description": "",
+      "expand-all": "",
+      "no-data": "",
+      "refresh": ""
+    }
+  },
   "library-panel": {
     "add-modal": {
       "cancel": "Annuler",
@@ -769,6 +779,7 @@
   "panel": {
     "header-menu": {
       "copy": "Copier",
+      "create-alert": "",
       "create-library-panel": "Créer un panneau Bibliothèque",
       "duplicate": "Dupliquer",
       "edit": "Modifier",
diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json
index 0ee6280028e06..172d2a2111438 100644
--- a/public/locales/pseudo-LOCALE/grafana.json
+++ b/public/locales/pseudo-LOCALE/grafana.json
@@ -422,6 +422,16 @@
     },
     "title": "Ŝĥőřŧčūŧş"
   },
+  "inspector": {
+    "query": {
+      "collapse-all": "Cőľľäpşę äľľ",
+      "copy-to-clipboard": "Cőpy ŧő čľįpþőäřđ",
+      "description": "Qūęřy įʼnşpęčŧőř äľľőŵş yőū ŧő vįęŵ řäŵ řęqūęşŧ äʼnđ řęşpőʼnşę. Ŧő čőľľęčŧ ŧĥįş đäŧä Ğřäƒäʼnä ʼnęęđş ŧő įşşūę ä ʼnęŵ qūęřy. Cľįčĸ řęƒřęşĥ þūŧŧőʼn þęľőŵ ŧő ŧřįģģęř ä ʼnęŵ qūęřy.",
+      "expand-all": "Ēχpäʼnđ äľľ",
+      "no-data": "Ńő řęqūęşŧ äʼnđ řęşpőʼnşę čőľľęčŧęđ yęŧ. Ħįŧ řęƒřęşĥ þūŧŧőʼn",
+      "refresh": "Ŗęƒřęşĥ"
+    }
+  },
   "library-panel": {
     "add-modal": {
       "cancel": "Cäʼnčęľ",
@@ -763,6 +773,7 @@
   "panel": {
     "header-menu": {
       "copy": "Cőpy",
+      "create-alert": "Cřęäŧę äľęřŧ",
       "create-library-panel": "Cřęäŧę ľįþřäřy päʼnęľ",
       "duplicate": "Đūpľįčäŧę",
       "edit": "Ēđįŧ",
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index d84950044147a..9e5da4eb6d7dc 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -417,6 +417,16 @@
     },
     "title": ""
   },
+  "inspector": {
+    "query": {
+      "collapse-all": "",
+      "copy-to-clipboard": "",
+      "description": "",
+      "expand-all": "",
+      "no-data": "",
+      "refresh": ""
+    }
+  },
   "library-panel": {
     "add-modal": {
       "cancel": "取消",
@@ -757,6 +767,7 @@
   "panel": {
     "header-menu": {
       "copy": "复制",
+      "create-alert": "",
       "create-library-panel": "创建库面板",
       "duplicate": "复制",
       "edit": "编辑",
diff --git a/public/test/jest-setup.ts b/public/test/jest-setup.ts
index b9d85c2bbcf2c..4e77c25a542cc 100644
--- a/public/test/jest-setup.ts
+++ b/public/test/jest-setup.ts
@@ -7,6 +7,7 @@ import { TextEncoder, TextDecoder } from 'util';
 
 import { EventBusSrv } from '@grafana/data';
 import { GrafanaBootConfig } from '@grafana/runtime';
+import { initIconCache } from 'app/core/icons/iconBundle';
 
 import 'blob-polyfill';
 import 'mutationobserver-shim';
@@ -15,6 +16,10 @@ import './mocks/workers';
 import '../vendor/flot/jquery.flot';
 import '../vendor/flot/jquery.flot.time';
 
+// icon cache needs to be initialized for test to prevent
+// libraries such as msw from throwing "unhandled resource"-errors
+initIconCache();
+
 const testAppEvents = new EventBusSrv();
 const global = window as any;
 global.$ = global.jQuery = $;
diff --git a/scripts/check-breaking-changes.sh b/scripts/check-breaking-changes.sh
index 74d76eaa12031..31de6ecbbaab3 100755
--- a/scripts/check-breaking-changes.sh
+++ b/scripts/check-breaking-changes.sh
@@ -4,6 +4,7 @@
 PACKAGES=$(ls -d ./packages/*/)
 EXIT_CODE=0
 GITHUB_MESSAGE=""
+SKIP_PACKAGES=("grafana-eslint-rules" "grafana-plugin-configs")
 
 # Loop through the packages
 while IFS=" " read -r -a package; do
@@ -16,7 +17,7 @@ while IFS=" " read -r -a package; do
     CURRENT="./pr/$PACKAGE_PATH"
 
     # Temporarily skipping these packages as they don't have any exposed static typing
-    if [[ "$PACKAGE_PATH" == 'grafana-eslint-rules' ]]; then
+    if [[ ${SKIP_PACKAGES[@]} =~ "$PACKAGE_PATH" ]]; then
         continue
     fi
 
diff --git a/scripts/drone/events/main.star b/scripts/drone/events/main.star
index 9f20d8864819a..ee47392ee5ce9 100644
--- a/scripts/drone/events/main.star
+++ b/scripts/drone/events/main.star
@@ -41,7 +41,6 @@ load(
 )
 load(
     "scripts/drone/utils/utils.star",
-    "drone_change_template",
     "failure_template",
     "notify_pipeline",
 )
@@ -65,24 +64,6 @@ trigger = {
 }
 
 def main_pipelines():
-    drone_change_trigger = {
-        "event": [
-            "push",
-        ],
-        "branch": "main",
-        "repo": [
-            "grafana/grafana",
-        ],
-        "paths": {
-            "include": [
-                ".drone.yml",
-            ],
-            "exclude": [
-                "exclude",
-            ],
-        },
-    }
-
     pipelines = [
         docs_pipelines(ver_mode, trigger_docs_main()),
         test_frontend(trigger, ver_mode),
@@ -92,13 +73,6 @@ def main_pipelines():
         build_e2e(trigger, ver_mode),
         integration_tests(trigger, prefix = ver_mode, ver_mode = ver_mode),
         windows(trigger, ver_mode = ver_mode),
-        notify_pipeline(
-            name = "notify-drone-changes",
-            slack_channel = "slack-webhooks-test",
-            trigger = drone_change_trigger,
-            template = drone_change_template,
-            secret = "drone-changes-webhook",
-        ),
         enterprise_downstream_pipeline(),
         notify_pipeline(
             name = "main-notify",
diff --git a/scripts/drone/pipelines/build.star b/scripts/drone/pipelines/build.star
index 753275befaaf1..88b5ed8e52a37 100644
--- a/scripts/drone/pipelines/build.star
+++ b/scripts/drone/pipelines/build.star
@@ -18,7 +18,6 @@ load(
     "store_storybook_step",
     "test_a11y_frontend_step",
     "trigger_oss",
-    "trigger_test_release",
     "update_package_json_version",
     "upload_cdn_step",
     "upload_packages_step",
@@ -70,7 +69,6 @@ def build_e2e(trigger, ver_mode):
         build_steps.extend(
             [
                 build_frontend_package_step(),
-                trigger_test_release(),
                 enterprise_downstream_step(ver_mode = ver_mode),
             ],
         )
diff --git a/scripts/drone/rgm.star b/scripts/drone/rgm.star
index 79c346122f3f5..cd4df9b9de855 100644
--- a/scripts/drone/rgm.star
+++ b/scripts/drone/rgm.star
@@ -30,7 +30,6 @@ load(
 )
 load(
     "scripts/drone/utils/utils.star",
-    "ignore_failure",
     "pipeline",
     "with_deps",
 )
@@ -76,6 +75,17 @@ tag_trigger = {
     },
 }
 
+main_trigger = {
+    "event": [
+        "push",
+    ],
+    "branch": "main",
+    "paths": docs_paths,
+    "repo": [
+        "grafana/grafana",
+    ],
+}
+
 nightly_trigger = {
     "event": {
         "include": [
@@ -208,20 +218,9 @@ def rgm_publish_packages(bucket = "grafana-packages"):
 
 def rgm_main():
     # Runs a package / build process (with some distros) when commits are merged to main
-    trigger = {
-        "event": [
-            "push",
-        ],
-        "branch": "main",
-        "paths": docs_paths,
-        "repo": [
-            "grafana/grafana",
-        ],
-    }
-
     return pipeline(
         name = "rgm-main-prerelease",
-        trigger = trigger,
+        trigger = main_trigger,
         steps = rgm_run("rgm-build", "drone_publish_main.sh"),
         depends_on = ["main-test-backend", "main-test-frontend"],
     )
@@ -239,11 +238,9 @@ def rgm_tag_windows():
     return pipeline(
         name = "rgm-tag-prerelease-windows",
         trigger = tag_trigger,
-        steps = ignore_failure(
-            get_windows_steps(
-                ver_mode = "release",
-                bucket = "grafana-prerelease",
-            ),
+        steps = get_windows_steps(
+            ver_mode = "release",
+            bucket = "grafana-prerelease",
         ),
         depends_on = ["rgm-tag-prerelease"],
         platform = "windows",
diff --git a/scripts/drone/services/services.star b/scripts/drone/services/services.star
index 2b99d4f7e397c..911aacfb000c3 100644
--- a/scripts/drone/services/services.star
+++ b/scripts/drone/services/services.star
@@ -54,7 +54,7 @@ def integration_test_services():
             "commands": ["docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password"],
         },
         {
-            "name": "mimir",
+            "name": "mimir_backend",
             "image": images["mimir"],
             "environment": {},
             "commands": ["/bin/mimir -target=backend"],
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index cab5d5f0c756f..c723d84dd6148 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -964,10 +964,16 @@ def redis_integration_tests_steps():
 def remote_alertmanager_integration_tests_steps():
     cmds = [
         "go clean -testcache",
-        "go test -run IntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/...",
+        "go test -run TestIntegrationRemoteAlertmanager -covermode=atomic -timeout=2m ./pkg/services/ngalert/notifier/...",
     ]
 
-    return integration_tests_steps("remote-alertmanager", cmds, "mimir", "8080", None)
+    environment = {
+        "AM_TENANT_ID": "test",
+        "AM_PASSWORD": "test",
+        "AM_URL": "http://mimir_backend:8080",
+    }
+
+    return integration_tests_steps("remote-alertmanager", cmds, "mimir_backend", "8080", environment = environment)
 
 def memcached_integration_tests_steps():
     cmds = [
@@ -1133,40 +1139,6 @@ def verify_gen_jsonnet_step():
         ],
     }
 
-def trigger_test_release():
-    return {
-        "name": "trigger-test-release",
-        "image": images["git"],
-        "environment": {
-            "GITHUB_TOKEN": from_secret("github_token"),
-            "TEST_TAG": "v0.0.0-test",
-        },
-        "commands": [
-            'git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" --depth=1',
-            "cd grafana-enterprise",
-            'git fetch origin "refs/tags/*:refs/tags/*" --quiet',
-            "if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git push --delete origin $${TEST_TAG}; fi",
-            "git tag $${TEST_TAG} && git push origin $${TEST_TAG}",
-            "cd -",
-            'git fetch https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git "refs/tags/*:refs/tags/*" --quiet && git fetch --quiet',
-            "if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git push --delete https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG}; fi",
-            "git tag $${TEST_TAG} && git push https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG}",
-        ],
-        "failure": "ignore",
-        "when": {
-            "paths": {
-                "include": [
-                    ".drone.yml",
-                    "pkg/build/**",
-                ],
-            },
-            "repo": [
-                "grafana/grafana",
-            ],
-            "branch": "main",
-        },
-    }
-
 def end_to_end_tests_deps():
     return [
         "end-to-end-tests-dashboards-suite",
diff --git a/scripts/drone/utils/utils.star b/scripts/drone/utils/utils.star
index 82cc0dca59294..aea832018cf70 100644
--- a/scripts/drone/utils/utils.star
+++ b/scripts/drone/utils/utils.star
@@ -9,7 +9,6 @@ load(
 load("scripts/drone/vault.star", "pull_secret")
 
 failure_template = "Build {{build.number}} failed for commit: <https://github.com/{{repo.owner}}/{{repo.name}}/commit/{{build.commit}}|{{ truncate build.commit 8 }}>: {{build.link}}\nBranch: <https://github.com/{{ repo.owner }}/{{ repo.name }}/commits/{{ build.branch }}|{{ build.branch }}>\nAuthor: {{build.author}}"
-drone_change_template = "`.drone.yml` and `starlark` files have been changed on the OSS repo, by: {{build.author}}. \nBranch: <https://github.com/{{ repo.owner }}/{{ repo.name }}/commits/{{ build.branch }}|{{ build.branch }}>\nCommit hash: <https://github.com/{{repo.owner}}/{{repo.name}}/commit/{{build.commit}}|{{ truncate build.commit 8 }}>"
 
 def pipeline(
         name,
diff --git a/packages/grafana-ui/scripts/generate-icon-bundle.js b/scripts/generate-icon-bundle.js
similarity index 77%
rename from packages/grafana-ui/scripts/generate-icon-bundle.js
rename to scripts/generate-icon-bundle.js
index d8dc0ef1ac5ea..ffa13c2f4c9e7 100644
--- a/packages/grafana-ui/scripts/generate-icon-bundle.js
+++ b/scripts/generate-icon-bundle.js
@@ -2,18 +2,18 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
-const cachedListPath = path.join(__dirname, '../src/components/Icon/cached.json');
+const cachedListPath = path.join(__dirname, '../public/app/core/icons/cached.json');
 const iconsList = require(cachedListPath);
 
-const iconsBundleJsTemplatePath = path.join(__dirname, '../src/components/Icon/iconBundle.ts.template');
-const iconsBundleJsPath = path.join(__dirname, '../src/components/Icon/iconBundle.ts');
+const iconsBundleJsTemplatePath = path.join(__dirname, '../public/app/core/icons/iconBundle.ts.template');
+const iconsBundleJsPath = path.join(__dirname, '../public/app/core/icons/iconBundle.ts');
 
 const iconsBundleJsTemplate = fs.readFileSync(iconsBundleJsTemplatePath).toString();
 
 const importsStatements = [];
 const cacheStatements = [];
 
-const grafanaIconsPublicPath = '../../../../../public/img/icons/';
+const grafanaIconsPublicPath = '../../../img/icons/';
 
 function generateIconBundle({ outputPath, verbose = false }) {
   const modulePrefix = 'u';
@@ -28,7 +28,7 @@ function generateIconBundle({ outputPath, verbose = false }) {
     importsStatements.push(
       `import ${modulePrefix}${moduleNameCount} from '${grafanaIconsPublicPath}${iconEntry}.svg';`
     );
-    cacheStatements.push(`  cacheItem(${modulePrefix}${moduleNameCount}, '${iconEntry}.svg');`);
+    cacheStatements.push(`  cacheItem(${modulePrefix}${moduleNameCount}, resolvePath('${iconEntry}.svg'));`);
     moduleNameCount++;
   }
   const output = iconsBundleJsTemplate
diff --git a/scripts/grafana-server/custom.ini b/scripts/grafana-server/custom.ini
index bf91c63aec172..8a45c8ed2fb68 100644
--- a/scripts/grafana-server/custom.ini
+++ b/scripts/grafana-server/custom.ini
@@ -8,3 +8,5 @@ enable = publicDashboards
 [database]
 type=sqlite3
 wal=true
+max_idle_conn = 2
+max_open_conn = 2
diff --git a/tsconfig.json b/tsconfig.json
index fa4ee214a1ce5..65e4f668b3bff 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -23,5 +23,6 @@
     "public/vendor/**/*.ts",
     "packages/grafana-data/typings",
     "packages/grafana-ui/src/types"
-  ]
+  ],
+  "exclude": ["public/app/**/webpack.config.ts"]
 }
diff --git a/yarn.lock b/yarn.lock
index deb268817e794..3ebd452b4d3b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -50,10 +50,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.20.5, @babel/compat-data@npm:^7.22.20, @babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9":
-  version: 7.22.20
-  resolution: "@babel/compat-data@npm:7.22.20"
-  checksum: efedd1d18878c10fde95e4d82b1236a9aba41395ef798cbb651f58dbf5632dbff475736c507b8d13d4c8f44809d41c0eb2ef0d694283af9ba5dd8339b6dab451
+"@babel/compat-data@npm:^7.20.5, @babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9, @babel/compat-data@npm:^7.23.2":
+  version: 7.23.2
+  resolution: "@babel/compat-data@npm:7.23.2"
+  checksum: d8dc27437d40907b271161d4c88ffe72ccecb034c730deb1960a417b59a14d7c5ebca8cd80dd458a01cd396a7a329eb48cddcc3791b5a84da33d7f278f7bec6a
   languageName: node
   linkType: hard
 
@@ -110,7 +110,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.20.7, @babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.5, @babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.22.9":
+"@babel/helper-compilation-targets@npm:^7.20.7, @babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.5, @babel/helper-compilation-targets@npm:^7.22.6":
   version: 7.22.15
   resolution: "@babel/helper-compilation-targets@npm:7.22.15"
   dependencies:
@@ -155,9 +155,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-define-polyfill-provider@npm:^0.4.2":
-  version: 0.4.2
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.4.2"
+"@babel/helper-define-polyfill-provider@npm:^0.4.3":
+  version: 0.4.3
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.4.3"
   dependencies:
     "@babel/helper-compilation-targets": ^7.22.6
     "@babel/helper-plugin-utils": ^7.22.5
@@ -166,7 +166,7 @@ __metadata:
     resolve: ^1.14.2
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 1f6dec0c5d0876d278fe15b71238eccc5f74c4e2efa2c78aaafa8bc2cc96336b8e68d94cd1a78497356c96e8b91b8c1f4452179820624d1702aee2f9832e6569
+  checksum: 5d21e3f47b320e4b5b644195ec405e7ebc3739e48e65899efc808c5fa9c3bf5b06ce0d8ff5246ca99d1411e368f4557bc66730196c5781a5c4e986ee703bee79
   languageName: node
   linkType: hard
 
@@ -245,7 +245,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-remap-async-to-generator@npm:^7.22.5, @babel/helper-remap-async-to-generator@npm:^7.22.9":
+"@babel/helper-remap-async-to-generator@npm:^7.22.20, @babel/helper-remap-async-to-generator@npm:^7.22.5":
   version: 7.22.20
   resolution: "@babel/helper-remap-async-to-generator@npm:7.22.20"
   dependencies:
@@ -361,7 +361,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.15, @babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.5":
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.22.15"
   dependencies:
@@ -372,7 +372,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.22.15, @babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.22.5":
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.22.15"
   dependencies:
@@ -446,18 +446,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-unicode-property-regex@npm:^7.4.4":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-unicode-property-regex@npm:7.18.6"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a8575ecb7ff24bf6c6e94808d5c84bb5a0c6dd7892b54f09f4646711ba0ee1e1668032b3c43e3e1dfec2c5716c302e851ac756c1645e15882d73df6ad21ae951
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-syntax-async-generators@npm:^7.8.4":
   version: 7.8.4
   resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4"
@@ -712,17 +700,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.22.15, @babel/plugin-transform-async-generator-functions@npm:^7.22.7":
-  version: 7.22.15
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.22.15"
+"@babel/plugin-transform-async-generator-functions@npm:^7.23.2":
+  version: 7.23.2
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.2"
   dependencies:
-    "@babel/helper-environment-visitor": ^7.22.5
+    "@babel/helper-environment-visitor": ^7.22.20
     "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-remap-async-to-generator": ^7.22.9
+    "@babel/helper-remap-async-to-generator": ^7.22.20
     "@babel/plugin-syntax-async-generators": ^7.8.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: fad98786b446ce63bde0d14a221e2617eef5a7bbca62b49d96f16ab5e1694521234cfba6145b830fbf9af16d60a8a3dbf148e8694830bd91796fe333b0599e73
+  checksum: e1abae0edcda7304d7c17702ac25a127578791b89c4f767d60589249fa3e50ec33f8c9ff39d3d8d41f00b29947654eaddd4fd586e04c4d598122db745fab2868
   languageName: node
   linkType: hard
 
@@ -750,7 +738,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.22.15, @babel/plugin-transform-block-scoping@npm:^7.22.5":
+"@babel/plugin-transform-block-scoping@npm:^7.23.0":
   version: 7.23.0
   resolution: "@babel/plugin-transform-block-scoping@npm:7.23.0"
   dependencies:
@@ -773,7 +761,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-static-block@npm:^7.22.11, @babel/plugin-transform-class-static-block@npm:^7.22.5":
+"@babel/plugin-transform-class-static-block@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-class-static-block@npm:7.22.11"
   dependencies:
@@ -786,7 +774,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.22.15, @babel/plugin-transform-classes@npm:^7.22.6":
+"@babel/plugin-transform-classes@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-classes@npm:7.22.15"
   dependencies:
@@ -817,7 +805,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.22.15, @babel/plugin-transform-destructuring@npm:^7.22.5":
+"@babel/plugin-transform-destructuring@npm:^7.23.0":
   version: 7.23.0
   resolution: "@babel/plugin-transform-destructuring@npm:7.23.0"
   dependencies:
@@ -828,7 +816,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dotall-regex@npm:^7.22.5, @babel/plugin-transform-dotall-regex@npm:^7.4.4":
+"@babel/plugin-transform-dotall-regex@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-dotall-regex@npm:7.22.5"
   dependencies:
@@ -851,7 +839,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dynamic-import@npm:^7.22.11, @babel/plugin-transform-dynamic-import@npm:^7.22.5":
+"@babel/plugin-transform-dynamic-import@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-dynamic-import@npm:7.22.11"
   dependencies:
@@ -875,7 +863,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-export-namespace-from@npm:^7.22.11, @babel/plugin-transform-export-namespace-from@npm:^7.22.5":
+"@babel/plugin-transform-export-namespace-from@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-export-namespace-from@npm:7.22.11"
   dependencies:
@@ -899,7 +887,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-for-of@npm:^7.22.15, @babel/plugin-transform-for-of@npm:^7.22.5":
+"@babel/plugin-transform-for-of@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-for-of@npm:7.22.15"
   dependencies:
@@ -923,7 +911,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-json-strings@npm:^7.22.11, @babel/plugin-transform-json-strings@npm:^7.22.5":
+"@babel/plugin-transform-json-strings@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-json-strings@npm:7.22.11"
   dependencies:
@@ -946,7 +934,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-logical-assignment-operators@npm:^7.22.11, @babel/plugin-transform-logical-assignment-operators@npm:^7.22.5":
+"@babel/plugin-transform-logical-assignment-operators@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.22.11"
   dependencies:
@@ -969,19 +957,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-amd@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.22.5"
+"@babel/plugin-transform-modules-amd@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.23.0"
   dependencies:
-    "@babel/helper-module-transforms": ^7.22.5
+    "@babel/helper-module-transforms": ^7.23.0
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7da4c4ebbbcf7d182abb59b2046b22d86eee340caf8a22a39ef6a727da2d8acfec1f714fcdcd5054110b280e4934f735e80a6848d192b6834c5d4459a014f04d
+  checksum: 5d92875170a37b8282d4bcd805f55829b8fab0f9c8d08b53d32a7a0bfdc62b868e489b52d329ae768ecafc0c993eed0ad7a387baa673ac33211390a9f833ab5d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.13.8, @babel/plugin-transform-modules-commonjs@npm:^7.22.15, @babel/plugin-transform-modules-commonjs@npm:^7.22.5, @babel/plugin-transform-modules-commonjs@npm:^7.23.0":
+"@babel/plugin-transform-modules-commonjs@npm:^7.13.8, @babel/plugin-transform-modules-commonjs@npm:^7.23.0":
   version: 7.23.0
   resolution: "@babel/plugin-transform-modules-commonjs@npm:7.23.0"
   dependencies:
@@ -994,7 +982,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.22.11, @babel/plugin-transform-modules-systemjs@npm:^7.22.5":
+"@babel/plugin-transform-modules-systemjs@npm:^7.23.0":
   version: 7.23.0
   resolution: "@babel/plugin-transform-modules-systemjs@npm:7.23.0"
   dependencies:
@@ -1043,7 +1031,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.11, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.5":
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.22.11"
   dependencies:
@@ -1055,7 +1043,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-numeric-separator@npm:^7.22.11, @babel/plugin-transform-numeric-separator@npm:^7.22.5":
+"@babel/plugin-transform-numeric-separator@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-numeric-separator@npm:7.22.11"
   dependencies:
@@ -1067,7 +1055,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-rest-spread@npm:^7.22.15, @babel/plugin-transform-object-rest-spread@npm:^7.22.5":
+"@babel/plugin-transform-object-rest-spread@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-object-rest-spread@npm:7.22.15"
   dependencies:
@@ -1094,7 +1082,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-catch-binding@npm:^7.22.11, @babel/plugin-transform-optional-catch-binding@npm:^7.22.5":
+"@babel/plugin-transform-optional-catch-binding@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.22.11"
   dependencies:
@@ -1106,7 +1094,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-chaining@npm:^7.22.15, @babel/plugin-transform-optional-chaining@npm:^7.22.6":
+"@babel/plugin-transform-optional-chaining@npm:^7.22.15, @babel/plugin-transform-optional-chaining@npm:^7.23.0":
   version: 7.23.0
   resolution: "@babel/plugin-transform-optional-chaining@npm:7.23.0"
   dependencies:
@@ -1119,7 +1107,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.20.7, @babel/plugin-transform-parameters@npm:^7.22.15, @babel/plugin-transform-parameters@npm:^7.22.5":
+"@babel/plugin-transform-parameters@npm:^7.20.7, @babel/plugin-transform-parameters@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-transform-parameters@npm:7.22.15"
   dependencies:
@@ -1142,7 +1130,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-property-in-object@npm:^7.22.11, @babel/plugin-transform-private-property-in-object@npm:^7.22.5":
+"@babel/plugin-transform-private-property-in-object@npm:^7.22.11":
   version: 7.22.11
   resolution: "@babel/plugin-transform-private-property-in-object@npm:7.22.11"
   dependencies:
@@ -1227,7 +1215,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-regenerator@npm:^7.22.10, @babel/plugin-transform-regenerator@npm:^7.22.5":
+"@babel/plugin-transform-regenerator@npm:^7.22.10":
   version: 7.22.10
   resolution: "@babel/plugin-transform-regenerator@npm:7.22.10"
   dependencies:
@@ -1250,19 +1238,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-runtime@npm:7.22.9":
-  version: 7.22.9
-  resolution: "@babel/plugin-transform-runtime@npm:7.22.9"
+"@babel/plugin-transform-runtime@npm:7.23.2":
+  version: 7.23.2
+  resolution: "@babel/plugin-transform-runtime@npm:7.23.2"
   dependencies:
-    "@babel/helper-module-imports": ^7.22.5
+    "@babel/helper-module-imports": ^7.22.15
     "@babel/helper-plugin-utils": ^7.22.5
-    babel-plugin-polyfill-corejs2: ^0.4.4
-    babel-plugin-polyfill-corejs3: ^0.8.2
-    babel-plugin-polyfill-regenerator: ^0.5.1
+    babel-plugin-polyfill-corejs2: ^0.4.6
+    babel-plugin-polyfill-corejs3: ^0.8.5
+    babel-plugin-polyfill-regenerator: ^0.5.3
     semver: ^6.3.1
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2fe5e41f83015ca174feda841d77aa9012fc855c907f9b360a11927f41b100537c8c83487771769147668e797eec26d5294e972b997f4759133cc43a22a43eec
+  checksum: 09f4273bfe9600c67e72e26f853f11c24ee4c1cbb3935c4a28a94d388e7c0d8733479d868c333cb34e9c236f1765788c6daef7852331f5c70a3b5543fd0247a1
   languageName: node
   linkType: hard
 
@@ -1350,7 +1338,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-escapes@npm:^7.22.10, @babel/plugin-transform-unicode-escapes@npm:^7.22.5":
+"@babel/plugin-transform-unicode-escapes@npm:^7.22.10":
   version: 7.22.10
   resolution: "@babel/plugin-transform-unicode-escapes@npm:7.22.10"
   dependencies:
@@ -1407,101 +1395,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:7.22.9":
-  version: 7.22.9
-  resolution: "@babel/preset-env@npm:7.22.9"
-  dependencies:
-    "@babel/compat-data": ^7.22.9
-    "@babel/helper-compilation-targets": ^7.22.9
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-option": ^7.22.5
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.22.5
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.22.5
-    "@babel/plugin-proposal-private-property-in-object": 7.21.0-placeholder-for-preset-env.2
-    "@babel/plugin-syntax-async-generators": ^7.8.4
-    "@babel/plugin-syntax-class-properties": ^7.12.13
-    "@babel/plugin-syntax-class-static-block": ^7.14.5
-    "@babel/plugin-syntax-dynamic-import": ^7.8.3
-    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
-    "@babel/plugin-syntax-import-assertions": ^7.22.5
-    "@babel/plugin-syntax-import-attributes": ^7.22.5
-    "@babel/plugin-syntax-import-meta": ^7.10.4
-    "@babel/plugin-syntax-json-strings": ^7.8.3
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
-    "@babel/plugin-syntax-numeric-separator": ^7.10.4
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
-    "@babel/plugin-syntax-optional-chaining": ^7.8.3
-    "@babel/plugin-syntax-private-property-in-object": ^7.14.5
-    "@babel/plugin-syntax-top-level-await": ^7.14.5
-    "@babel/plugin-syntax-unicode-sets-regex": ^7.18.6
-    "@babel/plugin-transform-arrow-functions": ^7.22.5
-    "@babel/plugin-transform-async-generator-functions": ^7.22.7
-    "@babel/plugin-transform-async-to-generator": ^7.22.5
-    "@babel/plugin-transform-block-scoped-functions": ^7.22.5
-    "@babel/plugin-transform-block-scoping": ^7.22.5
-    "@babel/plugin-transform-class-properties": ^7.22.5
-    "@babel/plugin-transform-class-static-block": ^7.22.5
-    "@babel/plugin-transform-classes": ^7.22.6
-    "@babel/plugin-transform-computed-properties": ^7.22.5
-    "@babel/plugin-transform-destructuring": ^7.22.5
-    "@babel/plugin-transform-dotall-regex": ^7.22.5
-    "@babel/plugin-transform-duplicate-keys": ^7.22.5
-    "@babel/plugin-transform-dynamic-import": ^7.22.5
-    "@babel/plugin-transform-exponentiation-operator": ^7.22.5
-    "@babel/plugin-transform-export-namespace-from": ^7.22.5
-    "@babel/plugin-transform-for-of": ^7.22.5
-    "@babel/plugin-transform-function-name": ^7.22.5
-    "@babel/plugin-transform-json-strings": ^7.22.5
-    "@babel/plugin-transform-literals": ^7.22.5
-    "@babel/plugin-transform-logical-assignment-operators": ^7.22.5
-    "@babel/plugin-transform-member-expression-literals": ^7.22.5
-    "@babel/plugin-transform-modules-amd": ^7.22.5
-    "@babel/plugin-transform-modules-commonjs": ^7.22.5
-    "@babel/plugin-transform-modules-systemjs": ^7.22.5
-    "@babel/plugin-transform-modules-umd": ^7.22.5
-    "@babel/plugin-transform-named-capturing-groups-regex": ^7.22.5
-    "@babel/plugin-transform-new-target": ^7.22.5
-    "@babel/plugin-transform-nullish-coalescing-operator": ^7.22.5
-    "@babel/plugin-transform-numeric-separator": ^7.22.5
-    "@babel/plugin-transform-object-rest-spread": ^7.22.5
-    "@babel/plugin-transform-object-super": ^7.22.5
-    "@babel/plugin-transform-optional-catch-binding": ^7.22.5
-    "@babel/plugin-transform-optional-chaining": ^7.22.6
-    "@babel/plugin-transform-parameters": ^7.22.5
-    "@babel/plugin-transform-private-methods": ^7.22.5
-    "@babel/plugin-transform-private-property-in-object": ^7.22.5
-    "@babel/plugin-transform-property-literals": ^7.22.5
-    "@babel/plugin-transform-regenerator": ^7.22.5
-    "@babel/plugin-transform-reserved-words": ^7.22.5
-    "@babel/plugin-transform-shorthand-properties": ^7.22.5
-    "@babel/plugin-transform-spread": ^7.22.5
-    "@babel/plugin-transform-sticky-regex": ^7.22.5
-    "@babel/plugin-transform-template-literals": ^7.22.5
-    "@babel/plugin-transform-typeof-symbol": ^7.22.5
-    "@babel/plugin-transform-unicode-escapes": ^7.22.5
-    "@babel/plugin-transform-unicode-property-regex": ^7.22.5
-    "@babel/plugin-transform-unicode-regex": ^7.22.5
-    "@babel/plugin-transform-unicode-sets-regex": ^7.22.5
-    "@babel/preset-modules": ^0.1.5
-    "@babel/types": ^7.22.5
-    babel-plugin-polyfill-corejs2: ^0.4.4
-    babel-plugin-polyfill-corejs3: ^0.8.2
-    babel-plugin-polyfill-regenerator: ^0.5.1
-    core-js-compat: ^3.31.0
-    semver: ^6.3.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 6caa2897bbda30c6932aed0a03827deb1337c57108050c9f97dc9a857e1533c7125b168b6d70b9d191965bf05f9f233f0ad20303080505dff7ce39740aaa759d
-  languageName: node
-  linkType: hard
-
-"@babel/preset-env@npm:^7.22.9":
-  version: 7.22.20
-  resolution: "@babel/preset-env@npm:7.22.20"
+"@babel/preset-env@npm:7.23.2, @babel/preset-env@npm:^7.22.9":
+  version: 7.23.2
+  resolution: "@babel/preset-env@npm:7.23.2"
   dependencies:
-    "@babel/compat-data": ^7.22.20
+    "@babel/compat-data": ^7.23.2
     "@babel/helper-compilation-targets": ^7.22.15
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/helper-validator-option": ^7.22.15
@@ -1527,15 +1425,15 @@ __metadata:
     "@babel/plugin-syntax-top-level-await": ^7.14.5
     "@babel/plugin-syntax-unicode-sets-regex": ^7.18.6
     "@babel/plugin-transform-arrow-functions": ^7.22.5
-    "@babel/plugin-transform-async-generator-functions": ^7.22.15
+    "@babel/plugin-transform-async-generator-functions": ^7.23.2
     "@babel/plugin-transform-async-to-generator": ^7.22.5
     "@babel/plugin-transform-block-scoped-functions": ^7.22.5
-    "@babel/plugin-transform-block-scoping": ^7.22.15
+    "@babel/plugin-transform-block-scoping": ^7.23.0
     "@babel/plugin-transform-class-properties": ^7.22.5
     "@babel/plugin-transform-class-static-block": ^7.22.11
     "@babel/plugin-transform-classes": ^7.22.15
     "@babel/plugin-transform-computed-properties": ^7.22.5
-    "@babel/plugin-transform-destructuring": ^7.22.15
+    "@babel/plugin-transform-destructuring": ^7.23.0
     "@babel/plugin-transform-dotall-regex": ^7.22.5
     "@babel/plugin-transform-duplicate-keys": ^7.22.5
     "@babel/plugin-transform-dynamic-import": ^7.22.11
@@ -1547,9 +1445,9 @@ __metadata:
     "@babel/plugin-transform-literals": ^7.22.5
     "@babel/plugin-transform-logical-assignment-operators": ^7.22.11
     "@babel/plugin-transform-member-expression-literals": ^7.22.5
-    "@babel/plugin-transform-modules-amd": ^7.22.5
-    "@babel/plugin-transform-modules-commonjs": ^7.22.15
-    "@babel/plugin-transform-modules-systemjs": ^7.22.11
+    "@babel/plugin-transform-modules-amd": ^7.23.0
+    "@babel/plugin-transform-modules-commonjs": ^7.23.0
+    "@babel/plugin-transform-modules-systemjs": ^7.23.0
     "@babel/plugin-transform-modules-umd": ^7.22.5
     "@babel/plugin-transform-named-capturing-groups-regex": ^7.22.5
     "@babel/plugin-transform-new-target": ^7.22.5
@@ -1558,7 +1456,7 @@ __metadata:
     "@babel/plugin-transform-object-rest-spread": ^7.22.15
     "@babel/plugin-transform-object-super": ^7.22.5
     "@babel/plugin-transform-optional-catch-binding": ^7.22.11
-    "@babel/plugin-transform-optional-chaining": ^7.22.15
+    "@babel/plugin-transform-optional-chaining": ^7.23.0
     "@babel/plugin-transform-parameters": ^7.22.15
     "@babel/plugin-transform-private-methods": ^7.22.5
     "@babel/plugin-transform-private-property-in-object": ^7.22.11
@@ -1575,15 +1473,15 @@ __metadata:
     "@babel/plugin-transform-unicode-regex": ^7.22.5
     "@babel/plugin-transform-unicode-sets-regex": ^7.22.5
     "@babel/preset-modules": 0.1.6-no-external-plugins
-    "@babel/types": ^7.22.19
-    babel-plugin-polyfill-corejs2: ^0.4.5
-    babel-plugin-polyfill-corejs3: ^0.8.3
-    babel-plugin-polyfill-regenerator: ^0.5.2
+    "@babel/types": ^7.23.0
+    babel-plugin-polyfill-corejs2: ^0.4.6
+    babel-plugin-polyfill-corejs3: ^0.8.5
+    babel-plugin-polyfill-regenerator: ^0.5.3
     core-js-compat: ^3.31.0
     semver: ^6.3.1
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 99357a5cb30f53bacdc0d1cd6dff0f052ea6c2d1ba874d969bba69897ef716e87283e84a59dc52fb49aa31fd1b6f55ed756c64c04f5678380700239f6030b881
+  checksum: 49327ef584b529b56aedd6577937b80c0d89603c68b23795495a13af04b5aa008db9ad04cd280423600cdc0d3cce13ae9d0d9a977db5c8193697b20ced8a10b2
   languageName: node
   linkType: hard
 
@@ -1613,21 +1511,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-modules@npm:^0.1.5":
-  version: 0.1.5
-  resolution: "@babel/preset-modules@npm:0.1.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.0.0
-    "@babel/plugin-proposal-unicode-property-regex": ^7.4.4
-    "@babel/plugin-transform-dotall-regex": ^7.4.4
-    "@babel/types": ^7.4.4
-    esutils: ^2.0.2
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 8430e0e9e9d520b53e22e8c4c6a5a080a12b63af6eabe559c2310b187bd62ae113f3da82ba33e9d1d0f3230930ca702843aae9dd226dec51f7d7114dc1f51c10
-  languageName: node
-  linkType: hard
-
 "@babel/preset-react@npm:7.22.5":
   version: 7.22.5
   resolution: "@babel/preset-react@npm:7.22.5"
@@ -1707,7 +1590,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:7.23.1, @babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.19.4, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
+"@babel/runtime@npm:7.23.1":
   version: 7.23.1
   resolution: "@babel/runtime@npm:7.23.1"
   dependencies:
@@ -1716,6 +1599,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.19.4, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
+  version: 7.23.2
+  resolution: "@babel/runtime@npm:7.23.2"
+  dependencies:
+    regenerator-runtime: ^0.14.0
+  checksum: 6c4df4839ec75ca10175f636d6362f91df8a3137f86b38f6cd3a4c90668a0fe8e9281d320958f4fbd43b394988958585a17c3aab2a4ea6bf7316b22916a371fb
+  languageName: node
+  linkType: hard
+
 "@babel/template@npm:^7.22.15, @babel/template@npm:^7.22.5, @babel/template@npm:^7.3.3":
   version: 7.22.15
   resolution: "@babel/template@npm:7.22.15"
@@ -2303,6 +2195,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@es-joy/jsdoccomment@npm:~0.40.1":
+  version: 0.40.1
+  resolution: "@es-joy/jsdoccomment@npm:0.40.1"
+  dependencies:
+    comment-parser: 1.4.0
+    esquery: ^1.5.0
+    jsdoc-type-pratt-parser: ~4.0.0
+  checksum: 6098394cd97ad0532dde4f3171980e700e4199c231969311efd2362c2b5a4eefa9d59a0bc1fe513afbb5cc456ef7633491a2984d64252e7bd8ebe22489120610
+  languageName: node
+  linkType: hard
+
 "@esbuild/android-arm64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/android-arm64@npm:0.17.19"
@@ -2776,16 +2679,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint-community/regexpp@npm:^4.4.0":
-  version: 4.5.1
-  resolution: "@eslint-community/regexpp@npm:4.5.1"
-  checksum: 6d901166d64998d591fab4db1c2f872981ccd5f6fe066a1ad0a93d4e11855ecae6bfb76660869a469563e8882d4307228cebd41142adb409d182f2966771e57e
+"@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.6.1":
+  version: 4.9.1
+  resolution: "@eslint-community/regexpp@npm:4.9.1"
+  checksum: 06fb839e9c756f6375cc545c2f2e05a0a64576bd6370e8e3c07983fd29a3d6e164ef4aa48a361f7d27e6713ab79c83053ff6a2ccb78748bc955e344279c4a3b6
   languageName: node
   linkType: hard
 
-"@eslint/eslintrc@npm:^2.0.3, @eslint/eslintrc@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "@eslint/eslintrc@npm:2.1.0"
+"@eslint/eslintrc@npm:^2.0.3, @eslint/eslintrc@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "@eslint/eslintrc@npm:2.1.2"
   dependencies:
     ajv: ^6.12.4
     debug: ^4.3.2
@@ -2796,7 +2699,7 @@ __metadata:
     js-yaml: ^4.1.0
     minimatch: ^3.1.2
     strip-json-comments: ^3.1.1
-  checksum: d5ed0adbe23f6571d8c9bb0ca6edf7618dc6aed4046aa56df7139f65ae7b578874e0d9c796df784c25bda648ceb754b6320277d828c8b004876d7443b8dc018c
+  checksum: bc742a1e3b361f06fedb4afb6bf32cbd27171292ef7924f61c62f2aed73048367bcc7ac68f98c06d4245cd3fabc43270f844e3c1699936d4734b3ac5398814a7
   languageName: node
   linkType: hard
 
@@ -2807,10 +2710,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:8.44.0":
-  version: 8.44.0
-  resolution: "@eslint/js@npm:8.44.0"
-  checksum: fc539583226a28f5677356e9f00d2789c34253f076643d2e32888250e509a4e13aafe0880cb2425139051de0f3a48d25bfc5afa96b7304f203b706c17340e3cf
+"@eslint/js@npm:8.51.0":
+  version: 8.51.0
+  resolution: "@eslint/js@npm:8.51.0"
+  checksum: 0228bf1e1e0414843e56d9ff362a2a72d579c078f93174666f29315690e9e30a8633ad72c923297f7fd7182381b5a476805ff04dac8debe638953eb1ded3ac73
   languageName: node
   linkType: hard
 
@@ -2940,13 +2843,45 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@grafana-plugins/grafana-testdata-datasource@workspace:*, @grafana-plugins/grafana-testdata-datasource@workspace:public/app/plugins/datasource/grafana-testdata-datasource":
+  version: 0.0.0-use.local
+  resolution: "@grafana-plugins/grafana-testdata-datasource@workspace:public/app/plugins/datasource/grafana-testdata-datasource"
+  dependencies:
+    "@emotion/css": 11.11.2
+    "@grafana/data": 10.3.0-pre
+    "@grafana/e2e-selectors": 10.3.0-pre
+    "@grafana/experimental": 1.7.0
+    "@grafana/plugin-configs": 10.3.0-pre
+    "@grafana/runtime": 10.3.0-pre
+    "@grafana/schema": 10.3.0-pre
+    "@grafana/ui": 10.3.0-pre
+    "@testing-library/react": 14.0.0
+    "@testing-library/user-event": 14.5.1
+    "@types/jest": 29.5.4
+    "@types/lodash": 4.14.195
+    "@types/node": 18.18.5
+    "@types/react": 18.2.15
+    "@types/testing-library__jest-dom": 5.14.8
+    lodash: 4.17.21
+    react: 18.2.0
+    react-use: 17.4.0
+    rxjs: 7.8.1
+    swc-loader: 0.2.3
+    ts-node: 10.9.1
+    tslib: 2.6.0
+    webpack: 5.88.1
+  peerDependencies:
+    "@grafana/runtime": "*"
+  languageName: unknown
+  linkType: soft
+
 "@grafana-plugins/input-datasource@workspace:plugins-bundled/internal/input-datasource":
   version: 0.0.0-use.local
   resolution: "@grafana-plugins/input-datasource@workspace:plugins-bundled/internal/input-datasource"
   dependencies:
-    "@grafana/data": 10.2.0-pre
+    "@grafana/data": 10.3.0-pre
     "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 10.2.0-pre
+    "@grafana/ui": 10.3.0-pre
     "@types/jest": 26.0.15
     "@types/react": 18.0.28
     copy-webpack-plugin: 11.0.0
@@ -2972,22 +2907,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/aws-sdk@npm:0.1.3":
-  version: 0.1.3
-  resolution: "@grafana/aws-sdk@npm:0.1.3"
+"@grafana/aws-sdk@npm:0.2.0":
+  version: 0.2.0
+  resolution: "@grafana/aws-sdk@npm:0.2.0"
   dependencies:
     "@grafana/async-query-data": 0.1.4
     "@grafana/experimental": 1.1.0
-  checksum: 9126354c52722c029ed3d597576577502e17566375e711aa64e8df39277092a3269aa45b1c66d0873736276535decdcbb4618b7afde21418dc0a60268f2e69c8
+  checksum: 0ca92f9661c4557344a3ed0b696d3ef655b8c69fa2299de1cc9fd3a8f77c566be832492827aedf4ea38c1a5e892d0e170b7bd1e86d2892644cc274ebd72d21a0
   languageName: node
   linkType: hard
 
-"@grafana/data@10.2.0-pre, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
+"@grafana/data@10.3.0-pre, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
   version: 0.0.0-use.local
   resolution: "@grafana/data@workspace:packages/grafana-data"
   dependencies:
     "@braintree/sanitize-url": 6.0.2
-    "@grafana/schema": 10.2.0-pre
+    "@grafana/schema": 10.3.0-pre
     "@grafana/tsconfig": ^1.2.0-rc1
     "@rollup/plugin-commonjs": 25.0.2
     "@rollup/plugin-json": 6.0.0
@@ -3047,7 +2982,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/e2e-selectors@10.2.0-pre, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
+"@grafana/e2e-selectors@10.3.0-pre, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
   version: 0.0.0-use.local
   resolution: "@grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors"
   dependencies:
@@ -3082,10 +3017,10 @@ __metadata:
   resolution: "@grafana/e2e@workspace:packages/grafana-e2e"
   dependencies:
     "@babel/core": 7.23.0
-    "@babel/preset-env": 7.22.9
+    "@babel/preset-env": 7.23.2
     "@cypress/webpack-preprocessor": 5.17.1
-    "@grafana/e2e-selectors": 10.2.0-pre
-    "@grafana/schema": 10.2.0-pre
+    "@grafana/e2e-selectors": 10.3.0-pre
+    "@grafana/schema": 10.3.0-pre
     "@grafana/tsconfig": ^1.2.0-rc1
     "@mochajs/json-file-reporter": ^1.2.0
     "@rollup/plugin-node-resolve": 15.2.3
@@ -3150,7 +3085,7 @@ __metadata:
   dependencies:
     "@typescript-eslint/types": ^5.46.1
     "@typescript-eslint/utils": ^5.46.1
-    eslint: 8.44.0
+    eslint: 8.51.0
     tslib: 2.6.0
   languageName: unknown
   linkType: soft
@@ -3220,12 +3155,12 @@ __metadata:
   resolution: "@grafana/flamegraph@workspace:packages/grafana-flamegraph"
   dependencies:
     "@babel/core": 7.23.0
-    "@babel/preset-env": 7.22.9
+    "@babel/preset-env": 7.23.2
     "@babel/preset-react": 7.22.5
     "@emotion/css": 11.11.2
-    "@grafana/data": 10.2.0-pre
+    "@grafana/data": 10.3.0-pre
     "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 10.2.0-pre
+    "@grafana/ui": 10.3.0-pre
     "@leeoniya/ufuzzy": 1.0.8
     "@rollup/plugin-node-resolve": 15.2.3
     "@testing-library/jest-dom": ^6.1.2
@@ -3272,12 +3207,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/lezer-logql@npm:0.2.0":
-  version: 0.2.0
-  resolution: "@grafana/lezer-logql@npm:0.2.0"
+"@grafana/lezer-logql@npm:0.2.1":
+  version: 0.2.1
+  resolution: "@grafana/lezer-logql@npm:0.2.1"
   peerDependencies:
     "@lezer/lr": ^1.0.0
-  checksum: 7f4382291f9f745b39fcd64aea146140723c5c30d1b86ba5418db2c3a5121bc12742c71129462bc0b78620f6a02598e1dafe555b437e4b4cacef7e2268a15b65
+  checksum: c964cec7ae846f480d6d8bbdc523e2063ebdd48ee2f168745b849be9a1cd6b36636980e777d62c13b7276715e90f8eb5adcdfd1112749fc1367f1bd9ca1c4e9b
   languageName: node
   linkType: hard
 
@@ -3299,15 +3234,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime":
+"@grafana/plugin-configs@10.3.0-pre, @grafana/plugin-configs@workspace:packages/grafana-plugin-configs":
+  version: 0.0.0-use.local
+  resolution: "@grafana/plugin-configs@workspace:packages/grafana-plugin-configs"
+  dependencies:
+    "@grafana/tsconfig": ^1.2.0-rc1
+    copy-webpack-plugin: 11.0.0
+    eslint-webpack-plugin: 4.0.1
+    fork-ts-checker-webpack-plugin: 8.0.0
+    glob: 10.3.3
+    replace-in-file-webpack-plugin: 1.0.6
+    tslib: 2.6.0
+    webpack: 5.88.1
+  languageName: unknown
+  linkType: soft
+
+"@grafana/runtime@10.3.0-pre, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime":
   version: 0.0.0-use.local
   resolution: "@grafana/runtime@workspace:packages/grafana-runtime"
   dependencies:
-    "@grafana/data": 10.2.0-pre
-    "@grafana/e2e-selectors": 10.2.0-pre
+    "@grafana/data": 10.3.0-pre
+    "@grafana/e2e-selectors": 10.3.0-pre
     "@grafana/faro-web-sdk": 1.2.1
     "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 10.2.0-pre
+    "@grafana/ui": 10.3.0-pre
     "@rollup/plugin-commonjs": 25.0.2
     "@rollup/plugin-node-resolve": 15.2.3
     "@testing-library/dom": 9.3.3
@@ -3343,9 +3293,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/scenes@npm:^1.15.0":
-  version: 1.17.0
-  resolution: "@grafana/scenes@npm:1.17.0"
+"@grafana/scenes@npm:^1.18.0":
+  version: 1.19.0
+  resolution: "@grafana/scenes@npm:1.19.0"
   dependencies:
     "@grafana/e2e-selectors": 10.0.2
     react-grid-layout: 1.3.4
@@ -3357,11 +3307,11 @@ __metadata:
     "@grafana/runtime": 10.0.3
     "@grafana/schema": 10.0.3
     "@grafana/ui": 10.0.3
-  checksum: 0bd8603ae59c199c595a45a7bc31e318a1928b18307469bcd5ee5f83c3aaee89c5c27a1341a479440d928505681ab6a2479809a5cac56e8e93ba7acf06adff93
+  checksum: ce6f7db1126417c7516f0d72c9fd327f7952fdef0da14951798088e1d30498033e47cb988abcd90d72db9c9882328e1804fd6ec0be68bc021c5830b122e5b575
   languageName: node
   linkType: hard
 
-"@grafana/schema@10.2.0-pre, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
+"@grafana/schema@10.3.0-pre, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
   version: 0.0.0-use.local
   resolution: "@grafana/schema@workspace:packages/grafana-schema"
   dependencies:
@@ -3395,17 +3345,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/ui@10.2.0-pre, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
+"@grafana/ui@10.3.0-pre, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
   version: 0.0.0-use.local
   resolution: "@grafana/ui@workspace:packages/grafana-ui"
   dependencies:
     "@babel/core": 7.23.0
     "@emotion/css": 11.11.2
     "@emotion/react": 11.11.1
-    "@grafana/data": 10.2.0-pre
-    "@grafana/e2e-selectors": 10.2.0-pre
+    "@grafana/data": 10.3.0-pre
+    "@grafana/e2e-selectors": 10.3.0-pre
     "@grafana/faro-web-sdk": 1.2.1
-    "@grafana/schema": 10.2.0-pre
+    "@grafana/schema": 10.3.0-pre
     "@grafana/tsconfig": ^1.2.0-rc1
     "@leeoniya/ufuzzy": 1.0.8
     "@mdx-js/react": 1.6.22
@@ -3490,14 +3440,14 @@ __metadata:
     ol: 7.4.0
     prismjs: 1.29.0
     process: ^0.11.10
-    rc-cascader: 3.12.1
-    rc-drawer: 6.3.0
-    rc-slider: 10.2.1
+    rc-cascader: 3.18.1
+    rc-drawer: 6.5.2
+    rc-slider: 10.3.1
     rc-time-picker: ^3.7.3
-    rc-tooltip: 6.0.1
+    rc-tooltip: 6.1.1
     react: 18.2.0
     react-beautiful-dnd: 13.1.1
-    react-calendar: 4.3.0
+    react-calendar: 4.6.0
     react-colorful: 5.6.1
     react-custom-scrollbars-2: 4.5.0
     react-dom: 18.2.0
@@ -3519,10 +3469,10 @@ __metadata:
     react-window: 1.8.9
     rimraf: 5.0.1
     rollup: 2.79.1
+    rollup-plugin-copy: 3.5.0
     rollup-plugin-dts: ^5.0.0
     rollup-plugin-esbuild: 5.0.0
     rollup-plugin-node-externals: ^5.0.0
-    rollup-plugin-svg-import: ^1.6.0
     rxjs: 7.8.1
     sass-loader: 13.3.2
     slate: 0.47.9
@@ -3572,14 +3522,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@humanwhocodes/config-array@npm:^0.11.10":
-  version: 0.11.10
-  resolution: "@humanwhocodes/config-array@npm:0.11.10"
+"@humanwhocodes/config-array@npm:^0.11.10, @humanwhocodes/config-array@npm:^0.11.11":
+  version: 0.11.11
+  resolution: "@humanwhocodes/config-array@npm:0.11.11"
   dependencies:
     "@humanwhocodes/object-schema": ^1.2.1
     debug: ^4.1.1
     minimatch: ^3.0.5
-  checksum: 1b1302e2403d0e35bc43e66d67a2b36b0ad1119efc704b5faff68c41f791a052355b010fb2d27ef022670f550de24cd6d08d5ecf0821c16326b7dcd0ee5d5d8a
+  checksum: db84507375ab77b8ffdd24f498a5b49ad6b64391d30dd2ac56885501d03964d29637e05b1ed5aefa09d57ac667e28028bc22d2da872bfcd619652fbdb5f4ca19
   languageName: node
   linkType: hard
 
@@ -5043,19 +4993,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mswjs/interceptors@npm:^0.17.5":
-  version: 0.17.6
-  resolution: "@mswjs/interceptors@npm:0.17.6"
+"@mswjs/interceptors@npm:^0.17.10":
+  version: 0.17.10
+  resolution: "@mswjs/interceptors@npm:0.17.10"
   dependencies:
     "@open-draft/until": ^1.0.3
     "@types/debug": ^4.1.7
     "@xmldom/xmldom": ^0.8.3
     debug: ^4.3.3
-    headers-polyfill: ^3.1.0
+    headers-polyfill: 3.2.5
     outvariant: ^1.2.1
     strict-event-emitter: ^0.2.4
     web-encoding: ^1.1.5
-  checksum: 4a70ed035191fab270fc219b741371eafdb126d6913414f76c0b57fc711391e72b5a95314733a2bc17f5a771058a3bba9c317a55898c1000b684d8fe834d8495
+  checksum: 0e6d32f399144b5cefe6fd7620f2776c83adc9bbbbccf2eb4ea347332be059f585136c44168c09b544c41cd3d686f88e43432e10192227a24fbb0c98a2f52dc8
   languageName: node
   linkType: hard
 
@@ -6430,21 +6380,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rc-component/trigger@npm:^1.0.4, @rc-component/trigger@npm:^1.5.0":
-  version: 1.14.1
-  resolution: "@rc-component/trigger@npm:1.14.1"
+"@rc-component/trigger@npm:^1.17.0, @rc-component/trigger@npm:^1.5.0":
+  version: 1.17.1
+  resolution: "@rc-component/trigger@npm:1.17.1"
   dependencies:
-    "@babel/runtime": ^7.18.3
+    "@babel/runtime": ^7.23.2
     "@rc-component/portal": ^1.1.0
     classnames: ^2.3.2
-    rc-align: ^4.0.0
     rc-motion: ^2.0.0
     rc-resize-observer: ^1.3.1
-    rc-util: ^5.33.0
+    rc-util: ^5.38.0
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: 51355dee2ff651e8a3333b01dbfcfcda64c149ee1396830d8d3c16be2bb2a518fe8625f94528f071b54231be6c339d90391cf22310d1b4341d0c778c42bfc678
+  checksum: 7bb2e2ebc9bbd21450a3f20036aadb41517efb17822c7359c8e1646af5bc95b8e067fa793ffec60749fc1efaca6ee15ef1f14ba3029dc452fe4701317f234d67
   languageName: node
   linkType: hard
 
@@ -6925,16 +6874,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/pluginutils@npm:^4.1.1":
-  version: 4.2.0
-  resolution: "@rollup/pluginutils@npm:4.2.0"
-  dependencies:
-    estree-walker: ^2.0.1
-    picomatch: ^2.2.2
-  checksum: 2e86d9bfb95919727bcba0bbbdbedc98e25a1e51fe3047f18ec6d85e0743d1c73e1c0de3f9fdbd2ff6b90c32f30d4b2706c9e794f3c2e7a80156980081558e2e
-  languageName: node
-  linkType: hard
-
 "@rollup/pluginutils@npm:^5.0.1":
   version: 5.0.2
   resolution: "@rollup/pluginutils@npm:5.0.2"
@@ -9001,6 +8940,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/diff@npm:^5":
+  version: 5.0.5
+  resolution: "@types/diff@npm:5.0.5"
+  checksum: 5f093341d5488cd33079400d4b2ff463dfd4f589bf0a54fbb25f7c87a7bdc16bd1e6125f252c081fa9a3ad44fc78b156c0a5f38bd8128edceb40ba084e051885
+  languageName: node
+  linkType: hard
+
 "@types/doctrine@npm:^0.0.3":
   version: 0.0.3
   resolution: "@types/doctrine@npm:0.0.3"
@@ -9116,6 +9062,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/fs-extra@npm:^8.0.1":
+  version: 8.1.3
+  resolution: "@types/fs-extra@npm:8.1.3"
+  dependencies:
+    "@types/node": "*"
+  checksum: e2800ba91fd7978baaa9d75050836b9a7b8aabc0be27ba57c939ba6568e6ac7a5faae614a2f36370cce4d1cd1b86d4c3a8c95e3f1a5bc4db36292f8181b92ac6
+  languageName: node
+  linkType: hard
+
 "@types/geojson@npm:*":
   version: 7946.0.8
   resolution: "@types/geojson@npm:7946.0.8"
@@ -9123,6 +9078,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/glob@npm:^7.1.1":
+  version: 7.2.0
+  resolution: "@types/glob@npm:7.2.0"
+  dependencies:
+    "@types/minimatch": "*"
+    "@types/node": "*"
+  checksum: 6ae717fedfdfdad25f3d5a568323926c64f52ef35897bcac8aca8e19bc50c0bd84630bbd063e5d52078b2137d8e7d3c26eabebd1a2f03ff350fff8a91e79fc19
+  languageName: node
+  linkType: hard
+
 "@types/glob@npm:^8.0.0":
   version: 8.1.0
   resolution: "@types/glob@npm:8.1.0"
@@ -9372,6 +9337,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/minimatch@npm:*, @types/minimatch@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "@types/minimatch@npm:5.1.2"
+  checksum: 0391a282860c7cb6fe262c12b99564732401bdaa5e395bee9ca323c312c1a0f45efbf34dce974682036e857db59a5c9b1da522f3d6055aeead7097264c8705a8
+  languageName: node
+  linkType: hard
+
 "@types/minimatch@npm:^3.0.3":
   version: 3.0.5
   resolution: "@types/minimatch@npm:3.0.5"
@@ -9379,13 +9351,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/minimatch@npm:^5.1.2":
-  version: 5.1.2
-  resolution: "@types/minimatch@npm:5.1.2"
-  checksum: 0391a282860c7cb6fe262c12b99564732401bdaa5e395bee9ca323c312c1a0f45efbf34dce974682036e857db59a5c9b1da522f3d6055aeead7097264c8705a8
-  languageName: node
-  linkType: hard
-
 "@types/minimist@npm:^1.2.0, @types/minimist@npm:^1.2.2":
   version: 1.2.2
   resolution: "@types/minimist@npm:1.2.2"
@@ -9433,7 +9398,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:18.18.4, @types/node@npm:>=13.7.0":
+"@types/node@npm:*, @types/node@npm:18.18.5, @types/node@npm:>=13.7.0":
+  version: 18.18.5
+  resolution: "@types/node@npm:18.18.5"
+  checksum: fc8c9b2bf226270cf9085a7dac76ce09dd7c3519ec9b687ee2b50385954ab3709c45ca82d002d1536e24286803cd194d7ab7008acebdcd6681b8b19d4277fa5c
+  languageName: node
+  linkType: hard
+
+"@types/node@npm:18.18.4":
   version: 18.18.4
   resolution: "@types/node@npm:18.18.4"
   checksum: 4901e91c4cc479bb58acbcd79236a97a0ad6db4a53cb1f4ba4cf32af15324c61b16faa6e31c1b09bf538a20feb5f5274239157ce5237f5741db0b9ab71e69c52
@@ -9864,7 +9836,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/testing-library__jest-dom@npm:5.14.8, @types/testing-library__jest-dom@npm:^5.9.1":
+"@types/testing-library__jest-dom@npm:5.14.8":
   version: 5.14.8
   resolution: "@types/testing-library__jest-dom@npm:5.14.8"
   dependencies:
@@ -9873,6 +9845,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/testing-library__jest-dom@npm:^5.9.1":
+  version: 5.14.9
+  resolution: "@types/testing-library__jest-dom@npm:5.14.9"
+  dependencies:
+    "@types/jest": "*"
+  checksum: d364494fc2545316292e88861146146af1e3818792ca63b62a63758b2f737669b687f4aaddfcfbcb7d0e1ed7890a9bd05de23ff97f277d5e68de574497a9ee72
+  languageName: node
+  linkType: hard
+
 "@types/tinycolor2@npm:1.4.3":
   version: 1.4.3
   resolution: "@types/tinycolor2@npm:1.4.3"
@@ -11274,6 +11255,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"array-buffer-byte-length@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "array-buffer-byte-length@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.2
+    is-array-buffer: ^3.0.1
+  checksum: 044e101ce150f4804ad19c51d6c4d4cfa505c5b2577bd179256e4aa3f3f6a0a5e9874c78cd428ee566ac574c8a04d7ce21af9fe52e844abfdccb82b33035a7c3
+  languageName: node
+  linkType: hard
+
 "array-differ@npm:^3.0.0":
   version: 3.0.0
   resolution: "array-differ@npm:3.0.0"
@@ -11329,6 +11320,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"array.prototype.findlastindex@npm:^1.2.2":
+  version: 1.2.3
+  resolution: "array.prototype.findlastindex@npm:1.2.3"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    es-shim-unscopables: ^1.0.0
+    get-intrinsic: ^1.2.1
+  checksum: 31f35d7b370c84db56484618132041a9af401b338f51899c2e78ef7690fbba5909ee7ca3c59a7192085b328cc0c68c6fd1f6d1553db01a689a589ae510f3966e
+  languageName: node
+  linkType: hard
+
 "array.prototype.flat@npm:^1.3.1":
   version: 1.3.1
   resolution: "array.prototype.flat@npm:1.3.1"
@@ -11366,6 +11370,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"arraybuffer.prototype.slice@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "arraybuffer.prototype.slice@npm:1.0.2"
+  dependencies:
+    array-buffer-byte-length: ^1.0.0
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    get-intrinsic: ^1.2.1
+    is-array-buffer: ^3.0.2
+    is-shared-array-buffer: ^1.0.2
+  checksum: c200faf437786f5b2c80d4564ff5481c886a16dee642ef02abdc7306c7edd523d1f01d1dd12b769c7eb42ac9bc53874510db19a92a2c035c0f6696172aafa5d3
+  languageName: node
+  linkType: hard
+
 "arrify@npm:^1.0.1":
   version: 1.0.1
   resolution: "arrify@npm:1.0.1"
@@ -11486,6 +11505,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"asynciterator.prototype@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "asynciterator.prototype@npm:1.0.0"
+  dependencies:
+    has-symbols: ^1.0.3
+  checksum: e8ebfd9493ac651cf9b4165e9d64030b3da1d17181bb1963627b59e240cdaf021d9b59d44b827dc1dde4e22387ec04c2d0f8720cf58a1c282e34e40cc12721b3
+  languageName: node
+  linkType: hard
+
 "asynckit@npm:^0.4.0":
   version: 0.4.0
   resolution: "asynckit@npm:0.4.0"
@@ -11727,39 +11755,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs2@npm:^0.4.4, babel-plugin-polyfill-corejs2@npm:^0.4.5":
-  version: 0.4.5
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.5"
+"babel-plugin-polyfill-corejs2@npm:^0.4.6":
+  version: 0.4.6
+  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.6"
   dependencies:
     "@babel/compat-data": ^7.22.6
-    "@babel/helper-define-polyfill-provider": ^0.4.2
+    "@babel/helper-define-polyfill-provider": ^0.4.3
     semver: ^6.3.1
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 33a8e06aa54e2858d211c743d179f0487b03222f9ca1bfd7c4865bca243fca942a3358cb75f6bb894ed476cbddede834811fbd6903ff589f055821146f053e1a
+  checksum: 08896811df31530be6a9bcdd630cb9fd4b5ae5181039d18db3796efbc54e38d57a42af460845c10a04434e1bc45c0d47743c7e6c860383cc6b141083cde22030
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs3@npm:^0.8.2, babel-plugin-polyfill-corejs3@npm:^0.8.3":
-  version: 0.8.4
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.8.4"
+"babel-plugin-polyfill-corejs3@npm:^0.8.5":
+  version: 0.8.5
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.8.5"
   dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.4.2
+    "@babel/helper-define-polyfill-provider": ^0.4.3
     core-js-compat: ^3.32.2
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 7243241a5b978b1335d51bcbd1248d6c4df88f6b3726706e71e0392f111c59bbf01118c85bb0ed42dce65e90e8fc768d19eda0a81a321cbe54abd3df9a285dc8
+  checksum: 54ff3956c4f88e483d38b27ceec6199b9e73fceac10ebf969469d215e6a62929384e4433f85335c9a6ba809329636e27f9bdae2f54075f833e7a745341c07d84
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-regenerator@npm:^0.5.1, babel-plugin-polyfill-regenerator@npm:^0.5.2":
-  version: 0.5.2
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.2"
+"babel-plugin-polyfill-regenerator@npm:^0.5.3":
+  version: 0.5.3
+  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.3"
   dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.4.2
+    "@babel/helper-define-polyfill-provider": ^0.4.3
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: d962200f604016a9a09bc9b4aaf60a3db7af876bb65bcefaeac04d44ac9d9ec4037cf24ce117760cc141d7046b6394c7eb0320ba9665cb4a2ee64df2be187c93
+  checksum: 2bb546582cda1870d19e646a7183baeb2cccd56e0ef3e4eaeabd28e120daf17cb87399194a9ccdcf32506bcaa68d23e73440fc8ab990a7a0f8c5a77c12d5d4bc
   languageName: node
   linkType: hard
 
@@ -12483,16 +12511,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:4.1.1":
-  version: 4.1.1
-  resolution: "chalk@npm:4.1.1"
-  dependencies:
-    ansi-styles: ^4.1.0
-    supports-color: ^7.1.0
-  checksum: 036e973e665ba1a32c975e291d5f3d549bceeb7b1b983320d4598fb75d70fe20c5db5d62971ec0fe76cdbce83985a00ee42372416abfc3a5584465005a7855ed
-  languageName: node
-  linkType: hard
-
 "chalk@npm:^2.4.2":
   version: 2.4.2
   resolution: "chalk@npm:2.4.2"
@@ -12832,13 +12850,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clsx@npm:^1.1.1, clsx@npm:^1.2.1":
+"clsx@npm:^1.1.1":
   version: 1.2.1
   resolution: "clsx@npm:1.2.1"
   checksum: 30befca8019b2eb7dbad38cff6266cf543091dae2825c856a62a8ccf2c3ab9c2907c4d12b288b73101196767f66812365400a227581484a05f968b0307cfaf12
   languageName: node
   linkType: hard
 
+"clsx@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "clsx@npm:2.0.0"
+  checksum: a2cfb2351b254611acf92faa0daf15220f4cd648bdf96ce369d729813b85336993871a4bf6978ddea2b81b5a130478339c20d9d0b5c6fc287e5147f0c059276e
+  languageName: node
+  linkType: hard
+
 "cmd-shim@npm:^5.0.0":
   version: 5.0.0
   resolution: "cmd-shim@npm:5.0.0"
@@ -12936,6 +12961,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"colorette@npm:^1.1.0":
+  version: 1.4.0
+  resolution: "colorette@npm:1.4.0"
+  checksum: 01c3c16058b182a4ab4c126a65a75faa4d38a20fa7c845090b25453acec6c371bb2c5dceb0a2338511f17902b9d1a9af0cadd8509c9403894b79311032c256c3
+  languageName: node
+  linkType: hard
+
 "colorette@npm:^2.0.10, colorette@npm:^2.0.14, colorette@npm:^2.0.16, colorette@npm:^2.0.19":
   version: 2.0.20
   resolution: "colorette@npm:2.0.20"
@@ -13060,6 +13092,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"comment-parser@npm:1.4.0":
+  version: 1.4.0
+  resolution: "comment-parser@npm:1.4.0"
+  checksum: e086da3b14af9455177f1ab801bc54de9139a77fcef55dbfb751ae68d687ac83b0effb83d113ccf8cd217d9d93ce2b472002953cac342092a3fadfb9f5cd8e38
+  languageName: node
+  linkType: hard
+
 "common-ancestor-path@npm:^1.0.1":
   version: 1.0.1
   resolution: "common-ancestor-path@npm:1.0.1"
@@ -14560,6 +14599,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"define-data-property@npm:^1.0.1":
+  version: 1.1.1
+  resolution: "define-data-property@npm:1.1.1"
+  dependencies:
+    get-intrinsic: ^1.2.1
+    gopd: ^1.0.1
+    has-property-descriptors: ^1.0.0
+  checksum: a29855ad3f0630ea82e3c5012c812efa6ca3078d5c2aa8df06b5f597c1cde6f7254692df41945851d903e05a1668607b6d34e778f402b9ff9ffb38111f1a3f0d
+  languageName: node
+  linkType: hard
+
 "define-lazy-prop@npm:^2.0.0":
   version: 2.0.0
   resolution: "define-lazy-prop@npm:2.0.0"
@@ -14567,13 +14617,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "define-properties@npm:1.1.4"
+"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "define-properties@npm:1.2.1"
   dependencies:
+    define-data-property: ^1.0.1
     has-property-descriptors: ^1.0.0
     object-keys: ^1.1.1
-  checksum: ce0aef3f9eb193562b5cfb79b2d2c86b6a109dfc9fdcb5f45d680631a1a908c06824ddcdb72b7573b54e26ace07f0a23420aaba0d5c627b34d2c1de8ef527e2b
+  checksum: b4ccd00597dd46cb2d4a379398f5b19fca84a16f3374e2249201992f36b30f6835949a9429669ee6b41b6e837205a163eadd745e472069e70dfc10f03e5fcc12
   languageName: node
   linkType: hard
 
@@ -14767,6 +14818,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"diff@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "diff@npm:5.1.0"
+  checksum: c7bf0df7c9bfbe1cf8a678fd1b2137c4fb11be117a67bc18a0e03ae75105e8533dbfb1cda6b46beb3586ef5aed22143ef9d70713977d5fb1f9114e21455fba90
+  languageName: node
+  linkType: hard
+
 "dir-glob@npm:^3.0.1":
   version: 3.0.1
   resolution: "dir-glob@npm:3.0.1"
@@ -15270,17 +15328,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4":
-  version: 1.21.1
-  resolution: "es-abstract@npm:1.21.1"
+"es-abstract@npm:^1.20.4, es-abstract@npm:^1.22.1":
+  version: 1.22.2
+  resolution: "es-abstract@npm:1.22.2"
   dependencies:
+    array-buffer-byte-length: ^1.0.0
+    arraybuffer.prototype.slice: ^1.0.2
     available-typed-arrays: ^1.0.5
     call-bind: ^1.0.2
     es-set-tostringtag: ^2.0.1
     es-to-primitive: ^1.2.1
-    function-bind: ^1.1.1
-    function.prototype.name: ^1.1.5
-    get-intrinsic: ^1.1.3
+    function.prototype.name: ^1.1.6
+    get-intrinsic: ^1.2.1
     get-symbol-description: ^1.0.0
     globalthis: ^1.0.3
     gopd: ^1.0.1
@@ -15288,26 +15347,31 @@ __metadata:
     has-property-descriptors: ^1.0.0
     has-proto: ^1.0.1
     has-symbols: ^1.0.3
-    internal-slot: ^1.0.4
-    is-array-buffer: ^3.0.1
+    internal-slot: ^1.0.5
+    is-array-buffer: ^3.0.2
     is-callable: ^1.2.7
     is-negative-zero: ^2.0.2
     is-regex: ^1.1.4
     is-shared-array-buffer: ^1.0.2
     is-string: ^1.0.7
-    is-typed-array: ^1.1.10
+    is-typed-array: ^1.1.12
     is-weakref: ^1.0.2
-    object-inspect: ^1.12.2
+    object-inspect: ^1.12.3
     object-keys: ^1.1.1
     object.assign: ^4.1.4
-    regexp.prototype.flags: ^1.4.3
+    regexp.prototype.flags: ^1.5.1
+    safe-array-concat: ^1.0.1
     safe-regex-test: ^1.0.0
-    string.prototype.trimend: ^1.0.6
-    string.prototype.trimstart: ^1.0.6
+    string.prototype.trim: ^1.2.8
+    string.prototype.trimend: ^1.0.7
+    string.prototype.trimstart: ^1.0.7
+    typed-array-buffer: ^1.0.0
+    typed-array-byte-length: ^1.0.0
+    typed-array-byte-offset: ^1.0.0
     typed-array-length: ^1.0.4
     unbox-primitive: ^1.0.2
-    which-typed-array: ^1.1.9
-  checksum: 23ff60d42d17a55d150e7bcedbdb065d4077a8b98c436e0e2e1ef4dd532a6d78a56028673de0bd8ed464a43c46ba781c50d9af429b6a17e44dbd14c7d7fb7926
+    which-typed-array: ^1.1.11
+  checksum: cc70e592d360d7d729859013dee7a610c6b27ed8630df0547c16b0d16d9fe6505a70ee14d1af08d970fdd132b3f88c9ca7815ce72c9011608abf8ab0e55fc515
   languageName: node
   linkType: hard
 
@@ -15328,6 +15392,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-iterator-helpers@npm:^1.0.12":
+  version: 1.0.15
+  resolution: "es-iterator-helpers@npm:1.0.15"
+  dependencies:
+    asynciterator.prototype: ^1.0.0
+    call-bind: ^1.0.2
+    define-properties: ^1.2.1
+    es-abstract: ^1.22.1
+    es-set-tostringtag: ^2.0.1
+    function-bind: ^1.1.1
+    get-intrinsic: ^1.2.1
+    globalthis: ^1.0.3
+    has-property-descriptors: ^1.0.0
+    has-proto: ^1.0.1
+    has-symbols: ^1.0.3
+    internal-slot: ^1.0.5
+    iterator.prototype: ^1.1.2
+    safe-array-concat: ^1.0.1
+  checksum: 50081ae5c549efe62e5c1d244df0194b40b075f7897fc2116b7e1aa437eb3c41f946d2afda18c33f9b31266ec544765932542765af839f76fa6d7b7855d1e0e1
+  languageName: node
+  linkType: hard
+
 "es-module-lexer@npm:^0.9.0":
   version: 0.9.3
   resolution: "es-module-lexer@npm:0.9.3"
@@ -15731,7 +15817,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-module-utils@npm:^2.7.4":
+"eslint-module-utils@npm:^2.8.0":
   version: 2.8.0
   resolution: "eslint-module-utils@npm:2.8.0"
   dependencies:
@@ -15744,33 +15830,35 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-import@npm:^2.26.0":
-  version: 2.27.5
-  resolution: "eslint-plugin-import@npm:2.27.5"
+  version: 2.28.1
+  resolution: "eslint-plugin-import@npm:2.28.1"
   dependencies:
     array-includes: ^3.1.6
+    array.prototype.findlastindex: ^1.2.2
     array.prototype.flat: ^1.3.1
     array.prototype.flatmap: ^1.3.1
     debug: ^3.2.7
     doctrine: ^2.1.0
     eslint-import-resolver-node: ^0.3.7
-    eslint-module-utils: ^2.7.4
+    eslint-module-utils: ^2.8.0
     has: ^1.0.3
-    is-core-module: ^2.11.0
+    is-core-module: ^2.13.0
     is-glob: ^4.0.3
     minimatch: ^3.1.2
+    object.fromentries: ^2.0.6
+    object.groupby: ^1.0.0
     object.values: ^1.1.6
-    resolve: ^1.22.1
-    semver: ^6.3.0
-    tsconfig-paths: ^3.14.1
+    semver: ^6.3.1
+    tsconfig-paths: ^3.14.2
   peerDependencies:
     eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-  checksum: f500571a380167e25d72a4d925ef9a7aae8899eada57653e5f3051ec3d3c16d08271fcefe41a30a9a2f4fefc232f066253673ee4ea77b30dba65ae173dade85d
+  checksum: e8ae6dd8f06d8adf685f9c1cfd46ac9e053e344a05c4090767e83b63a85c8421ada389807a39e73c643b9bff156715c122e89778169110ed68d6428e12607edf
   languageName: node
   linkType: hard
 
-"eslint-plugin-jest@npm:27.2.3":
-  version: 27.2.3
-  resolution: "eslint-plugin-jest@npm:27.2.3"
+"eslint-plugin-jest@npm:27.4.2":
+  version: 27.4.2
+  resolution: "eslint-plugin-jest@npm:27.4.2"
   dependencies:
     "@typescript-eslint/utils": ^5.10.0
   peerDependencies:
@@ -15782,7 +15870,7 @@ __metadata:
       optional: true
     jest:
       optional: true
-  checksum: 4c7e07f52f17749ac6fd0ff5fcd5ce30b88983ba31eeee322e4d48859f55eaa112f06172e586ad2031c00ff28bb2dfdc3d35c83895251b9c0e860fa47dfc5ff4
+  checksum: 99a8301ae00c37da97866b8b13c89a077716d2c653b26bc417d242e7300a43237c0017fd488c43966fa38585f19050facdbbc71d03ca36a1ce6f2ba930a9143e
   languageName: node
   linkType: hard
 
@@ -15805,22 +15893,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-jsdoc@npm:46.4.3":
-  version: 46.4.3
-  resolution: "eslint-plugin-jsdoc@npm:46.4.3"
+"eslint-plugin-jsdoc@npm:46.8.2":
+  version: 46.8.2
+  resolution: "eslint-plugin-jsdoc@npm:46.8.2"
   dependencies:
-    "@es-joy/jsdoccomment": ~0.39.4
+    "@es-joy/jsdoccomment": ~0.40.1
     are-docs-informative: ^0.0.2
-    comment-parser: 1.3.1
+    comment-parser: 1.4.0
     debug: ^4.3.4
     escape-string-regexp: ^4.0.0
     esquery: ^1.5.0
     is-builtin-module: ^3.2.1
-    semver: ^7.5.1
+    semver: ^7.5.4
     spdx-expression-parse: ^3.0.1
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: 9cec116649f7bcd8abea165975ce5d5ae8fd095b3f7c53e00a93c0bd3aeeeb913c8ed3d5c9f67f04fe84d71d20c342b44cf41fc0f7dfd93bdafadeae8c235a81
+  checksum: ec2c435246cd45847b7c3ff3c04cc1713c658e3a6023e55577bda25c7ce1547d022aab0bf3b4920c6f792d52ff473c031d61167308e314183c15b57d23ce59c3
   languageName: node
   linkType: hard
 
@@ -15895,6 +15983,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-plugin-react@npm:7.33.2":
+  version: 7.33.2
+  resolution: "eslint-plugin-react@npm:7.33.2"
+  dependencies:
+    array-includes: ^3.1.6
+    array.prototype.flatmap: ^1.3.1
+    array.prototype.tosorted: ^1.1.1
+    doctrine: ^2.1.0
+    es-iterator-helpers: ^1.0.12
+    estraverse: ^5.3.0
+    jsx-ast-utils: ^2.4.1 || ^3.0.0
+    minimatch: ^3.1.2
+    object.entries: ^1.1.6
+    object.fromentries: ^2.0.6
+    object.hasown: ^1.1.2
+    object.values: ^1.1.6
+    prop-types: ^15.8.1
+    resolve: ^2.0.0-next.4
+    semver: ^6.3.1
+    string.prototype.matchall: ^4.0.8
+  peerDependencies:
+    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+  checksum: b4c3d76390b0ae6b6f9fed78170604cc2c04b48e6778a637db339e8e3911ec9ef22510b0ae77c429698151d0f1b245f282177f384105b6830e7b29b9c9b26610
+  languageName: node
+  linkType: hard
+
 "eslint-scope@npm:5.1.1, eslint-scope@npm:^5.1.1":
   version: 5.1.1
   resolution: "eslint-scope@npm:5.1.1"
@@ -15905,13 +16019,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-scope@npm:^7.2.0":
-  version: 7.2.0
-  resolution: "eslint-scope@npm:7.2.0"
+"eslint-scope@npm:^7.2.0, eslint-scope@npm:^7.2.2":
+  version: 7.2.2
+  resolution: "eslint-scope@npm:7.2.2"
   dependencies:
     esrecurse: ^4.3.0
     estraverse: ^5.2.0
-  checksum: 64591a2d8b244ade9c690b59ef238a11d5c721a98bcee9e9f445454f442d03d3e04eda88e95a4daec558220a99fa384309d9faae3d459bd40e7a81b4063980ae
+  checksum: ec97dbf5fb04b94e8f4c5a91a7f0a6dd3c55e46bfc7bbcd0e3138c3a76977570e02ed89a1810c778dcd72072ff0e9621ba1379b4babe53921d71e2e4486fda3e
   languageName: node
   linkType: hard
 
@@ -15933,10 +16047,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1":
-  version: 3.4.1
-  resolution: "eslint-visitor-keys@npm:3.4.1"
-  checksum: f05121d868202736b97de7d750847a328fcfa8593b031c95ea89425333db59676ac087fa905eba438d0a3c5769632f828187e0c1a0d271832a2153c1d3661c2c
+"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3":
+  version: 3.4.3
+  resolution: "eslint-visitor-keys@npm:3.4.3"
+  checksum: 36e9ef87fca698b6fd7ca5ca35d7b2b6eeaaf106572e2f7fd31c12d3bfdaccdb587bba6d3621067e5aece31c8c3a348b93922ab8f7b2cbc6aaab5e1d89040c60
   languageName: node
   linkType: hard
 
@@ -16021,26 +16135,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:8.44.0":
-  version: 8.44.0
-  resolution: "eslint@npm:8.44.0"
+"eslint@npm:8.51.0":
+  version: 8.51.0
+  resolution: "eslint@npm:8.51.0"
   dependencies:
     "@eslint-community/eslint-utils": ^4.2.0
-    "@eslint-community/regexpp": ^4.4.0
-    "@eslint/eslintrc": ^2.1.0
-    "@eslint/js": 8.44.0
-    "@humanwhocodes/config-array": ^0.11.10
+    "@eslint-community/regexpp": ^4.6.1
+    "@eslint/eslintrc": ^2.1.2
+    "@eslint/js": 8.51.0
+    "@humanwhocodes/config-array": ^0.11.11
     "@humanwhocodes/module-importer": ^1.0.1
     "@nodelib/fs.walk": ^1.2.8
-    ajv: ^6.10.0
+    ajv: ^6.12.4
     chalk: ^4.0.0
     cross-spawn: ^7.0.2
     debug: ^4.3.2
     doctrine: ^3.0.0
     escape-string-regexp: ^4.0.0
-    eslint-scope: ^7.2.0
-    eslint-visitor-keys: ^3.4.1
-    espree: ^9.6.0
+    eslint-scope: ^7.2.2
+    eslint-visitor-keys: ^3.4.3
+    espree: ^9.6.1
     esquery: ^1.4.2
     esutils: ^2.0.2
     fast-deep-equal: ^3.1.3
@@ -16050,7 +16164,6 @@ __metadata:
     globals: ^13.19.0
     graphemer: ^1.4.0
     ignore: ^5.2.0
-    import-fresh: ^3.0.0
     imurmurhash: ^0.1.4
     is-glob: ^4.0.0
     is-path-inside: ^3.0.3
@@ -16062,22 +16175,21 @@ __metadata:
     natural-compare: ^1.4.0
     optionator: ^0.9.3
     strip-ansi: ^6.0.1
-    strip-json-comments: ^3.1.0
     text-table: ^0.2.0
   bin:
     eslint: bin/eslint.js
-  checksum: d06309ce4aafb9d27d558c8e5e5aa5cba3bbec3ce8ceccbc7d4b7a35f2b67fd40189159155553270e2e6febeb69bd8a3b60d6241c8f5ddc2ef1702ccbd328501
+  checksum: 214fa5d1fcb67af1b8992ce9584ccd85e1aa7a482f8b8ea5b96edc28fa838a18a3b69456db45fc1ed3ef95f1e9efa9714f737292dc681e572d471d02fda9649c
   languageName: node
   linkType: hard
 
-"espree@npm:^9.5.2, espree@npm:^9.6.0":
-  version: 9.6.0
-  resolution: "espree@npm:9.6.0"
+"espree@npm:^9.5.2, espree@npm:^9.6.0, espree@npm:^9.6.1":
+  version: 9.6.1
+  resolution: "espree@npm:9.6.1"
   dependencies:
     acorn: ^8.9.0
     acorn-jsx: ^5.3.2
     eslint-visitor-keys: ^3.4.1
-  checksum: 1287979510efb052a6a97c73067ea5d0a40701b29adde87bbe2d3eb1667e39ca55e8129e20e2517fed3da570150e7ef470585228459a8f3e3755f45007a1c662
+  checksum: eb8c149c7a2a77b3f33a5af80c10875c3abd65450f60b8af6db1bfcfa8f101e21c1e56a561c6dc13b848e18148d43469e7cd208506238554fb5395a9ea5a1ab9
   languageName: node
   linkType: hard
 
@@ -16150,7 +16262,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"estree-walker@npm:^2.0.1, estree-walker@npm:^2.0.2":
+"estree-walker@npm:^2.0.2":
   version: 2.0.2
   resolution: "estree-walker@npm:2.0.2"
   checksum: 6151e6f9828abe2259e57f5fd3761335bb0d2ebd76dc1a01048ccee22fabcfef3c0859300f6d83ff0d1927849368775ec5a6d265dde2f6de5a1be1721cd94efc
@@ -16420,16 +16532,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "fast-glob@npm:3.3.0"
+"fast-glob@npm:^3.0.3, fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0":
+  version: 3.3.1
+  resolution: "fast-glob@npm:3.3.1"
   dependencies:
     "@nodelib/fs.stat": ^2.0.2
     "@nodelib/fs.walk": ^1.2.3
     glob-parent: ^5.1.2
     merge2: ^1.3.0
     micromatch: ^4.0.4
-  checksum: 20df62be28eb5426fe8e40e0d05601a63b1daceb7c3d87534afcad91bdcf1e4b1743cf2d5247d6e225b120b46df0b9053a032b2691ba34ee121e033acd81f547
+  checksum: b6f3add6403e02cf3a798bfbb1183d0f6da2afd368f27456010c0bc1f9640aea308243d4cb2c0ab142f618276e65ecb8be1661d7c62a7b4e5ba774b9ce5432e5
   languageName: node
   linkType: hard
 
@@ -17043,22 +17155,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"function.prototype.name@npm:^1.1.5":
-  version: 1.1.5
-  resolution: "function.prototype.name@npm:1.1.5"
+"function.prototype.name@npm:^1.1.5, function.prototype.name@npm:^1.1.6":
+  version: 1.1.6
+  resolution: "function.prototype.name@npm:1.1.6"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.3
-    es-abstract: ^1.19.0
-    functions-have-names: ^1.2.2
-  checksum: acd21d733a9b649c2c442f067567743214af5fa248dbeee69d8278ce7df3329ea5abac572be9f7470b4ec1cd4d8f1040e3c5caccf98ebf2bf861a0deab735c27
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    functions-have-names: ^1.2.3
+  checksum: 7a3f9bd98adab09a07f6e1f03da03d3f7c26abbdeaeee15223f6c04a9fb5674792bdf5e689dac19b97ac71de6aad2027ba3048a9b883aa1b3173eed6ab07f479
   languageName: node
   linkType: hard
 
-"functions-have-names@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "functions-have-names@npm:1.2.2"
-  checksum: 25f44b6d1c41ac86ffdf41f25d1de81c0a5b4a3fcf4307a33cdfb23b9d4bd5d0d8bf312eaef5ad368c6500c8a9e19f692b8ce9f96aaab99db9dd936554165558
+"functions-have-names@npm:^1.2.3":
+  version: 1.2.3
+  resolution: "functions-have-names@npm:1.2.3"
+  checksum: c3f1f5ba20f4e962efb71344ce0a40722163e85bee2101ce25f88214e78182d2d2476aa85ef37950c579eb6cf6ee811c17b3101bb84004bb75655f3e33f3fdb5
   languageName: node
   linkType: hard
 
@@ -17140,14 +17252,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "get-intrinsic@npm:1.1.3"
+"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "get-intrinsic@npm:1.2.1"
   dependencies:
     function-bind: ^1.1.1
     has: ^1.0.3
+    has-proto: ^1.0.1
     has-symbols: ^1.0.3
-  checksum: 152d79e87251d536cf880ba75cfc3d6c6c50e12b3a64e1ea960e73a3752b47c69f46034456eae1b0894359ce3bc64c55c186f2811f8a788b75b638b06fab228a
+  checksum: 5b61d88552c24b0cf6fa2d1b3bc5459d7306f699de060d76442cce49a4721f52b8c560a33ab392cf5575b7810277d54ded9d4d39a1ea61855619ebc005aa7e5f
   languageName: node
   linkType: hard
 
@@ -17546,6 +17659,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"globby@npm:10.0.1":
+  version: 10.0.1
+  resolution: "globby@npm:10.0.1"
+  dependencies:
+    "@types/glob": ^7.1.1
+    array-union: ^2.1.0
+    dir-glob: ^3.0.1
+    fast-glob: ^3.0.3
+    glob: ^7.1.3
+    ignore: ^5.1.1
+    merge2: ^1.2.3
+    slash: ^3.0.0
+  checksum: a16754b93eff58c1070ca9b0a92c69d9d97a184870fbc7dcb1b99a3ff202311ae66dd5662cbec874deaa888d0172024332e14d04d038c23949d5f8e29341dad2
+  languageName: node
+  linkType: hard
+
 "globby@npm:^11.0.1, globby@npm:^11.0.2, globby@npm:^11.1.0":
   version: 11.1.0
   resolution: "globby@npm:11.1.0"
@@ -17607,9 +17736,9 @@ __metadata:
     "@babel/plugin-proposal-optional-chaining": 7.21.0
     "@babel/plugin-syntax-dynamic-import": 7.8.3
     "@babel/plugin-transform-react-constant-elements": 7.22.5
-    "@babel/plugin-transform-runtime": 7.22.9
+    "@babel/plugin-transform-runtime": 7.23.2
     "@babel/plugin-transform-typescript": 7.22.9
-    "@babel/preset-env": 7.22.9
+    "@babel/preset-env": 7.23.2
     "@babel/preset-react": 7.22.5
     "@babel/preset-typescript": 7.23.0
     "@babel/runtime": 7.23.1
@@ -17624,7 +17753,8 @@ __metadata:
     "@emotion/react": 11.11.1
     "@fingerprintjs/fingerprintjs": ^3.4.2
     "@glideapps/glide-data-grid": ^5.2.1
-    "@grafana/aws-sdk": 0.1.3
+    "@grafana-plugins/grafana-testdata-datasource": "workspace:*"
+    "@grafana/aws-sdk": 0.2.0
     "@grafana/data": "workspace:*"
     "@grafana/e2e-selectors": "workspace:*"
     "@grafana/eslint-config": 6.0.1
@@ -17634,11 +17764,11 @@ __metadata:
     "@grafana/faro-web-sdk": 1.2.1
     "@grafana/flamegraph": "workspace:*"
     "@grafana/google-sdk": 0.1.1
-    "@grafana/lezer-logql": 0.2.0
+    "@grafana/lezer-logql": 0.2.1
     "@grafana/lezer-traceql": 0.0.7
     "@grafana/monaco-logql": ^0.0.7
     "@grafana/runtime": "workspace:*"
-    "@grafana/scenes": ^1.15.0
+    "@grafana/scenes": ^1.18.0
     "@grafana/schema": "workspace:*"
     "@grafana/tsconfig": ^1.3.0-rc1
     "@grafana/ui": "workspace:*"
@@ -17690,6 +17820,7 @@ __metadata:
     "@types/d3-force": ^3.0.0
     "@types/d3-scale-chromatic": 3.0.0
     "@types/debounce-promise": 3.1.6
+    "@types/diff": ^5
     "@types/eslint": 8.44.0
     "@types/file-saver": 2.0.5
     "@types/glob": ^8.0.0
@@ -17784,18 +17915,19 @@ __metadata:
     dangerously-set-html-content: 1.0.9
     date-fns: 2.30.0
     debounce-promise: 3.1.2
+    diff: ^5.1.0
     emotion: 11.0.0
     esbuild: 0.18.12
     esbuild-loader: 3.0.1
     esbuild-plugin-browserslist: ^0.8.0
-    eslint: 8.44.0
+    eslint: 8.51.0
     eslint-config-prettier: 8.8.0
     eslint-plugin-import: ^2.26.0
-    eslint-plugin-jest: 27.2.3
-    eslint-plugin-jsdoc: 46.4.3
+    eslint-plugin-jest: 27.4.2
+    eslint-plugin-jsdoc: 46.8.2
     eslint-plugin-jsx-a11y: 6.7.1
     eslint-plugin-lodash: 7.4.0
-    eslint-plugin-react: 7.32.2
+    eslint-plugin-react: 7.33.2
     eslint-plugin-react-hooks: 4.6.0
     eslint-webpack-plugin: 4.0.1
     eventemitter3: 5.0.1
@@ -17846,7 +17978,7 @@ __metadata:
     mousetrap: 1.6.5
     mousetrap-global-bind: 1.1.0
     moveable: 0.43.1
-    msw: 1.2.2
+    msw: 1.3.2
     mutationobserver-shim: 0.3.7
     ngtemplate-loader: 2.1.0
     node-forge: ^1.3.1
@@ -17863,11 +17995,11 @@ __metadata:
     prismjs: 1.29.0
     prop-types: 15.8.1
     pseudoizer: ^0.1.0
-    rc-cascader: 3.12.1
-    rc-drawer: 6.3.0
-    rc-slider: 10.2.1
+    rc-cascader: 3.18.1
+    rc-drawer: 6.5.2
+    rc-slider: 10.3.1
     rc-time-picker: 3.7.3
-    rc-tree: 5.7.9
+    rc-tree: 5.8.0
     re-resizable: 6.9.9
     react: 18.2.0
     react-beautiful-dnd: 13.1.1
@@ -17971,7 +18103,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"graphql@npm:^15.0.0 || ^16.0.0":
+"graphql@npm:^16.8.1":
   version: 16.8.1
   resolution: "graphql@npm:16.8.1"
   checksum: 8d304b7b6f708c8c5cc164b06e92467dfe36aff6d4f2cf31dd19c4c2905a0e7b89edac4b7e225871131fd24e21460836b369de0c06532644d15b461d55b1ccc0
@@ -18173,10 +18305,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"headers-polyfill@npm:^3.1.0, headers-polyfill@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "headers-polyfill@npm:3.1.2"
-  checksum: 510ca9637ef652404dbd432e680418f8d418ba18094ef2f64c3d8de955ebf6e68d553c7f0aeaa5fc937d130b139c1e2d7c2066cd4cf0f740a4627924eaaee9db
+"headers-polyfill@npm:3.2.5":
+  version: 3.2.5
+  resolution: "headers-polyfill@npm:3.2.5"
+  checksum: a3c4bdd661584fd39e40c0f91412abc514616edfbd20d29a75567e591f90ef5c445c8e209b7f3c2b2375d27e95e4690f33417368a168d4832484a93861ab6a3c
   languageName: node
   linkType: hard
 
@@ -18618,11 +18750,11 @@ __metadata:
   linkType: hard
 
 "i18next-browser-languagedetector@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "i18next-browser-languagedetector@npm:7.0.2"
+  version: 7.1.0
+  resolution: "i18next-browser-languagedetector@npm:7.1.0"
   dependencies:
     "@babel/runtime": ^7.19.4
-  checksum: ea6c5254308965ff9fe9870c16b546b67d065cc00bd3af961f1414ba73fbe323a7d1b76fe7524b1581307f7849fa6d04c36336693818a23d3690ebefc60d9071
+  checksum: 36981b9a9995ed66387f3735cceffe107ed3cdb6ca278d45fa243fabc65669c0eca095ed4a55a93dac046ca1eb23fd986ec0079723be7ebb8505e6ba25f379bb
   languageName: node
   linkType: hard
 
@@ -18722,7 +18854,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ignore@npm:^5.0.4, ignore@npm:^5.2.0, ignore@npm:^5.2.4":
+"ignore@npm:^5.0.4, ignore@npm:^5.1.1, ignore@npm:^5.2.0, ignore@npm:^5.2.4":
   version: 5.2.4
   resolution: "ignore@npm:5.2.4"
   checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef
@@ -18899,14 +19031,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "internal-slot@npm:1.0.4"
+"internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "internal-slot@npm:1.0.5"
   dependencies:
-    get-intrinsic: ^1.1.3
+    get-intrinsic: ^1.2.0
     has: ^1.0.3
     side-channel: ^1.0.4
-  checksum: 8974588d06bab4f675573a3b52975370facf6486df51bc0567a982c7024fa29495f10b76c0d4dc742dd951d1b72024fdc1e31bb0bedf1678dc7aacacaf5a4f73
+  checksum: 97e84046bf9e7574d0956bd98d7162313ce7057883b6db6c5c7b5e5f05688864b0978ba07610c726d15d66544ffe4b1050107d93f8a39ebc59b15d8b429b497a
   languageName: node
   linkType: hard
 
@@ -19017,14 +19149,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-array-buffer@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "is-array-buffer@npm:3.0.1"
+"is-array-buffer@npm:^3.0.1, is-array-buffer@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "is-array-buffer@npm:3.0.2"
   dependencies:
     call-bind: ^1.0.2
-    get-intrinsic: ^1.1.3
+    get-intrinsic: ^1.2.0
     is-typed-array: ^1.1.10
-  checksum: f26ab87448e698285daf707e52a533920449f7abf63714140ffab9d5571aa5a71ac2fa2677e8b793ad0d5d3e40078d4d2c8a0ab39c957e3cfc6513bb6c9dfdc9
+  checksum: dcac9dda66ff17df9cabdc58214172bf41082f956eab30bb0d86bc0fab1e44b690fc8e1f855cf2481245caf4e8a5a006a982a71ddccec84032ed41f9d8da8c14
   languageName: node
   linkType: hard
 
@@ -19035,6 +19167,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-async-function@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "is-async-function@npm:2.0.0"
+  dependencies:
+    has-tostringtag: ^1.0.0
+  checksum: e3471d95e6c014bf37cad8a93f2f4b6aac962178e0a5041e8903147166964fdc1c5c1d2ef87e86d77322c370ca18f2ea004fa7420581fa747bcaf7c223069dbd
+  languageName: node
+  linkType: hard
+
 "is-bigint@npm:^1.0.1":
   version: 1.0.4
   resolution: "is-bigint@npm:1.0.4"
@@ -19108,12 +19249,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.11.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0":
-  version: 2.12.1
-  resolution: "is-core-module@npm:2.12.1"
+"is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0":
+  version: 2.13.0
+  resolution: "is-core-module@npm:2.13.0"
   dependencies:
     has: ^1.0.3
-  checksum: f04ea30533b5e62764e7b2e049d3157dc0abd95ef44275b32489ea2081176ac9746ffb1cdb107445cf1ff0e0dfcad522726ca27c27ece64dadf3795428b8e468
+  checksum: 053ab101fb390bfeb2333360fd131387bed54e476b26860dc7f5a700bbf34a0ec4454f7c8c4d43e8a0030957e4b3db6e16d35e1890ea6fb654c833095e040355
   languageName: node
   linkType: hard
 
@@ -19163,6 +19304,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-finalizationregistry@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "is-finalizationregistry@npm:1.0.2"
+  dependencies:
+    call-bind: ^1.0.2
+  checksum: 4f243a8e06228cd45bdab8608d2cb7abfc20f6f0189c8ac21ea8d603f1f196eabd531ce0bb8e08cbab047e9845ef2c191a3761c9a17ad5cabf8b35499c4ad35d
+  languageName: node
+  linkType: hard
+
 "is-fullwidth-code-point@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-fullwidth-code-point@npm:1.0.0"
@@ -19186,7 +19336,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-generator-function@npm:^1.0.7":
+"is-generator-function@npm:^1.0.10, is-generator-function@npm:^1.0.7":
   version: 1.0.10
   resolution: "is-generator-function@npm:1.0.10"
   dependencies:
@@ -19398,6 +19548,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-plain-object@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "is-plain-object@npm:3.0.1"
+  checksum: d13fe75db350d4ac669595cdfe0242ae87fcecddf2bca858d2dd443a6ed6eb1f69951fac8c2fa85b16106c6b0d7738fea86c2aca2ecee7fd61de15c1574f2cc5
+  languageName: node
+  linkType: hard
+
 "is-potential-custom-element-name@npm:^1.0.1":
   version: 1.0.1
   resolution: "is-potential-custom-element-name@npm:1.0.1"
@@ -19492,16 +19649,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.3, is-typed-array@npm:^1.1.9":
-  version: 1.1.10
-  resolution: "is-typed-array@npm:1.1.10"
+"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.12, is-typed-array@npm:^1.1.3, is-typed-array@npm:^1.1.9":
+  version: 1.1.12
+  resolution: "is-typed-array@npm:1.1.12"
   dependencies:
-    available-typed-arrays: ^1.0.5
-    call-bind: ^1.0.2
-    for-each: ^0.3.3
-    gopd: ^1.0.1
-    has-tostringtag: ^1.0.0
-  checksum: aac6ecb59d4c56a1cdeb69b1f129154ef462bbffe434cb8a8235ca89b42f258b7ae94073c41b3cb7bce37f6a1733ad4499f07882d5d5093a7ba84dfc4ebb8017
+    which-typed-array: ^1.1.11
+  checksum: 4c89c4a3be07186caddadf92197b17fda663a9d259ea0d44a85f171558270d36059d1c386d34a12cba22dfade5aba497ce22778e866adc9406098c8fc4771796
   languageName: node
   linkType: hard
 
@@ -19705,6 +19858,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"iterator.prototype@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "iterator.prototype@npm:1.1.2"
+  dependencies:
+    define-properties: ^1.2.1
+    get-intrinsic: ^1.2.1
+    has-symbols: ^1.0.3
+    reflect.getprototypeof: ^1.0.4
+    set-function-name: ^2.0.1
+  checksum: d8a507e2ccdc2ce762e8a1d3f4438c5669160ac72b88b648e59a688eec6bc4e64b22338e74000518418d9e693faf2a092d2af21b9ec7dbf7763b037a54701168
+  languageName: node
+  linkType: hard
+
 "jackspeak@npm:^2.0.3, jackspeak@npm:^2.3.5":
   version: 2.3.6
   resolution: "jackspeak@npm:2.3.6"
@@ -20588,7 +20754,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json5@npm:^1.0.1":
+"json5@npm:^1.0.2":
   version: 1.0.2
   resolution: "json5@npm:1.0.2"
   dependencies:
@@ -21615,7 +21781,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"merge2@npm:^1.3.0, merge2@npm:^1.4.1":
+"merge2@npm:^1.2.3, merge2@npm:^1.3.0, merge2@npm:^1.4.1":
   version: 1.4.1
   resolution: "merge2@npm:1.4.1"
   checksum: 7268db63ed5169466540b6fb947aec313200bcf6d40c5ab722c22e242f651994619bcd85601602972d3c85bd2cc45a358a4c61937e9f11a061919a1da569b0c2
@@ -22083,20 +22249,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"msw@npm:1.2.2":
-  version: 1.2.2
-  resolution: "msw@npm:1.2.2"
+"msw@npm:1.3.2":
+  version: 1.3.2
+  resolution: "msw@npm:1.3.2"
   dependencies:
     "@mswjs/cookies": ^0.2.2
-    "@mswjs/interceptors": ^0.17.5
+    "@mswjs/interceptors": ^0.17.10
     "@open-draft/until": ^1.0.3
     "@types/cookie": ^0.4.1
     "@types/js-levenshtein": ^1.1.1
-    chalk: 4.1.1
+    chalk: ^4.1.1
     chokidar: ^3.4.2
     cookie: ^0.4.2
-    graphql: ^15.0.0 || ^16.0.0
-    headers-polyfill: ^3.1.2
+    graphql: ^16.8.1
+    headers-polyfill: 3.2.5
     inquirer: ^8.2.0
     is-node-process: ^1.2.0
     js-levenshtein: ^1.1.6
@@ -22107,13 +22273,13 @@ __metadata:
     type-fest: ^2.19.0
     yargs: ^17.3.1
   peerDependencies:
-    typescript: ">= 4.4.x <= 5.1.x"
+    typescript: ">= 4.4.x <= 5.2.x"
   peerDependenciesMeta:
     typescript:
       optional: true
   bin:
     msw: cli/index.js
-  checksum: e42cec8f5523663020bdecf6a7977a10aa86a4718d1920def3fbde0ff3734391873668cc6e3996d6790add3c74dac95a952f8560ce2543697280125eb55138e8
+  checksum: c2d4f7747f5806f0fd8d8cc3ca250ee1c2a7a6cd608de43f95bd072ba1fb13cdce0b52932ce9bf8f4a21b194d2815db535501e224ec8f7052593447fe1c0cb70
   languageName: node
   linkType: hard
 
@@ -22684,10 +22850,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-inspect@npm:^1.12.2, object-inspect@npm:^1.9.0":
-  version: 1.12.2
-  resolution: "object-inspect@npm:1.12.2"
-  checksum: a534fc1b8534284ed71f25ce3a496013b7ea030f3d1b77118f6b7b1713829262be9e6243acbcb3ef8c626e2b64186112cb7f6db74e37b2789b9c789ca23048b2
+"object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0":
+  version: 1.12.3
+  resolution: "object-inspect@npm:1.12.3"
+  checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db
   languageName: node
   linkType: hard
 
@@ -22742,6 +22908,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"object.groupby@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "object.groupby@npm:1.0.1"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    get-intrinsic: ^1.2.1
+  checksum: d7959d6eaaba358b1608066fc67ac97f23ce6f573dc8fc661f68c52be165266fcb02937076aedb0e42722fdda0bdc0bbf74778196ac04868178888e9fd3b78b5
+  languageName: node
+  linkType: hard
+
 "object.hasown@npm:^1.1.2":
   version: 1.1.2
   resolution: "object.hasown@npm:1.1.2"
@@ -24570,23 +24748,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-align@npm:^4.0.0":
-  version: 4.0.11
-  resolution: "rc-align@npm:4.0.11"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: 2.x
-    dom-align: ^1.7.0
-    lodash: ^4.17.21
-    rc-util: ^5.3.0
-    resize-observer-polyfill: ^1.5.1
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: e929f21d24b41314739221ed6527d006137d2f68b11c21c59759b3f98382f7b6cad7f8100732b84ac92934b0a427d69836ee8434fd73b09c4020b193ac3fdea0
-  languageName: node
-  linkType: hard
-
 "rc-animate@npm:2.x":
   version: 2.11.1
   resolution: "rc-animate@npm:2.11.1"
@@ -24602,36 +24763,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-cascader@npm:3.12.1":
-  version: 3.12.1
-  resolution: "rc-cascader@npm:3.12.1"
+"rc-cascader@npm:3.18.1":
+  version: 3.18.1
+  resolution: "rc-cascader@npm:3.18.1"
   dependencies:
     "@babel/runtime": ^7.12.5
     array-tree-filter: ^2.1.0
     classnames: ^2.3.1
-    rc-select: ~14.5.0
+    rc-select: ~14.9.0
     rc-tree: ~5.7.0
-    rc-util: ^5.6.1
+    rc-util: ^5.35.0
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: 11fddad49d7c6dcd06f7875b34fb40d798d912e2280e75e4f89777ade05d8a162f2c8f81e447dec44b327603e92f15c93b5c1a7489353732ca37f4c020d45624
+  checksum: 4a3ecee7385a8814b1a78c1e8921dd3194f052352a2d08d0c931f3edd83ee3ae4864eb535f9dd243dd9699e601372309ea5fb64c715d1c79231e309da703abf0
   languageName: node
   linkType: hard
 
-"rc-drawer@npm:6.3.0":
-  version: 6.3.0
-  resolution: "rc-drawer@npm:6.3.0"
+"rc-drawer@npm:6.5.2":
+  version: 6.5.2
+  resolution: "rc-drawer@npm:6.5.2"
   dependencies:
     "@babel/runtime": ^7.10.1
     "@rc-component/portal": ^1.1.1
     classnames: ^2.2.6
     rc-motion: ^2.6.1
-    rc-util: ^5.21.2
+    rc-util: ^5.36.0
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: 63c9c5d05590a35dc9a66b03544626180e8df08c593568e32f5ac86e0078b09a7388a60441f357b7c71a31715aa18f43fc4a1e165d745d58861380c88b8c9d36
+  checksum: e96908f641ea0a4b26e7142a932cefe60ee34c03c6c569a6070af770b0be8a883e89521217d8391957254b0ed88b4ac1735129c9e062528db0751bfd0222a0c1
   languageName: node
   linkType: hard
 
@@ -24649,18 +24810,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-overflow@npm:^1.0.0":
-  version: 1.2.2
-  resolution: "rc-overflow@npm:1.2.2"
+"rc-overflow@npm:^1.3.1":
+  version: 1.3.2
+  resolution: "rc-overflow@npm:1.3.2"
   dependencies:
     "@babel/runtime": ^7.11.1
     classnames: ^2.2.1
     rc-resize-observer: ^1.0.0
-    rc-util: ^5.5.1
+    rc-util: ^5.37.0
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: e8c0a0689fca6cb899ff3a2bdc19add737c22e9fa2d6dd9a446e1fa4e356d927041f07a29e3043aac1a53d838768404db66b5eca9dd00186286adba0eb94356b
+  checksum: 7041f72e881ead9a484bddb6b6b6eb94455911f6b1cb06b16979ffe7d79e81058d5c77d0ca3f14faa0d1e43c81b966e65ed11678d09c2344cfd84dcfd803e620
   languageName: node
   linkType: hard
 
@@ -24679,27 +24840,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-select@npm:~14.5.0":
-  version: 14.5.2
-  resolution: "rc-select@npm:14.5.2"
+"rc-select@npm:~14.9.0":
+  version: 14.9.1
+  resolution: "rc-select@npm:14.9.1"
   dependencies:
     "@babel/runtime": ^7.10.1
     "@rc-component/trigger": ^1.5.0
     classnames: 2.x
     rc-motion: ^2.0.1
-    rc-overflow: ^1.0.0
+    rc-overflow: ^1.3.1
     rc-util: ^5.16.1
     rc-virtual-list: ^3.5.2
   peerDependencies:
     react: "*"
     react-dom: "*"
-  checksum: d3f55543eae15ac9bf56019345ad94268f9e063ede38c3d8c46dc59b1bc47c0f4c724613a9e9a6f4dc0d5bc0e31c7f7029e6bef717b335432818fbeea0f7398f
+  checksum: 914e6ae273c6916e321710e6eaa69d3a5a50ce2a36fc91c22bd1c42d95cd8083d6f10fe0c2324f07829c60b9ad30b481910703d11638885e6ee29429d4c4f8e5
   languageName: node
   linkType: hard
 
-"rc-slider@npm:10.2.1":
-  version: 10.2.1
-  resolution: "rc-slider@npm:10.2.1"
+"rc-slider@npm:10.3.1":
+  version: 10.3.1
+  resolution: "rc-slider@npm:10.3.1"
   dependencies:
     "@babel/runtime": ^7.10.1
     classnames: ^2.2.5
@@ -24707,7 +24868,7 @@ __metadata:
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: 565eb55302c776a7a48bfbe6761f52bab6b0d3ea4f53fc10d32ae9958340708bc5072a9c254bb5ddfa822492093032b94cb03d5e52cdff774e076b90e20b9145
+  checksum: 67998137031ab0551538ba7aa038863ccd07c876d268f2ab05e408298105ab4e6136a532c97296231e91c6791442c2f7a495d9a604440bddaa094e73336705f2
   languageName: node
   linkType: hard
 
@@ -24725,21 +24886,37 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-tooltip@npm:6.0.1":
-  version: 6.0.1
-  resolution: "rc-tooltip@npm:6.0.1"
+"rc-tooltip@npm:6.1.1":
+  version: 6.1.1
+  resolution: "rc-tooltip@npm:6.1.1"
   dependencies:
     "@babel/runtime": ^7.11.2
-    "@rc-component/trigger": ^1.0.4
+    "@rc-component/trigger": ^1.17.0
     classnames: ^2.3.1
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: fe7f617a4f4e0085d8f5eb5e8da5598f0164841c841f62f77966706ae604491246441a469aeb44f1dec7001bb4716ee81d11ec646e8889f4164fcba3a024eea5
+  checksum: f3681cae6603973268cb0fd6db7c55efc99bf51f5387b7f41a05c4cc0ce1a00b7dbf4d0b2173fe6e77490674390e8283714324bdd705f1a3c4e89af72457c589
   languageName: node
   linkType: hard
 
-"rc-tree@npm:5.7.9, rc-tree@npm:~5.7.0":
+"rc-tree@npm:5.8.0":
+  version: 5.8.0
+  resolution: "rc-tree@npm:5.8.0"
+  dependencies:
+    "@babel/runtime": ^7.10.1
+    classnames: 2.x
+    rc-motion: ^2.0.1
+    rc-util: ^5.16.1
+    rc-virtual-list: ^3.5.1
+  peerDependencies:
+    react: "*"
+    react-dom: "*"
+  checksum: 69ed9f2adc2271b2789ec95159c6cfb5435e57ff1554f729934297512bfa73f2158054c7d80e2daa426ed3987d42b13a02ff2e3c882f6336d8458442053897ee
+  languageName: node
+  linkType: hard
+
+"rc-tree@npm:~5.7.0":
   version: 5.7.9
   resolution: "rc-tree@npm:5.7.9"
   dependencies:
@@ -24783,16 +24960,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-util@npm:^5.15.0, rc-util@npm:^5.16.1, rc-util@npm:^5.21.0, rc-util@npm:^5.21.2, rc-util@npm:^5.24.4, rc-util@npm:^5.27.0, rc-util@npm:^5.3.0, rc-util@npm:^5.33.0, rc-util@npm:^5.5.1, rc-util@npm:^5.6.1":
-  version: 5.34.1
-  resolution: "rc-util@npm:5.34.1"
+"rc-util@npm:^5.15.0, rc-util@npm:^5.16.1, rc-util@npm:^5.21.0, rc-util@npm:^5.24.4, rc-util@npm:^5.27.0, rc-util@npm:^5.35.0, rc-util@npm:^5.36.0, rc-util@npm:^5.37.0, rc-util@npm:^5.38.0":
+  version: 5.38.0
+  resolution: "rc-util@npm:5.38.0"
   dependencies:
     "@babel/runtime": ^7.18.3
-    react-is: ^16.12.0
+    react-is: ^18.2.0
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: ef4f0834db975ff77b1940c32f7ab75e201e06e16218dfc993066e994a0199330f433ab8587ab0a49101aa94ac009f8d553e3e8818185d9b6889e62791c77a16
+  checksum: 97a3e1dd94e199c12e69eed1f69e9a9be39b383f2b0d9e1d52d6fcdf676e91e6499fa7be4c48f37b08b6500747f2dc41014f9be54351a39f23b3b5087360690c
   languageName: node
   linkType: hard
 
@@ -24839,19 +25016,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-calendar@npm:4.3.0":
-  version: 4.3.0
-  resolution: "react-calendar@npm:4.3.0"
+"react-calendar@npm:4.6.0":
+  version: 4.6.0
+  resolution: "react-calendar@npm:4.6.0"
   dependencies:
-    "@types/react": "*"
     "@wojtekmaj/date-utils": ^1.1.3
-    clsx: ^1.2.1
+    clsx: ^2.0.0
     get-user-locale: ^2.2.1
     prop-types: ^15.6.0
+    tiny-warning: ^1.0.0
   peerDependencies:
+    "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 0abfb0e6c6c8ea6d5d10a9073db1861b9d6c746905573a1ba576d77e260c4cf4d90cc45a7eccb3166e8ccdad71df787cd629ae2d0b2839409db7e25c76f8cd32
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 2832d2a468a8f3a533e9f59a969774c6d608e9a2c60afa9fa599b3bbbbd23d5bc9fa1ca6dca4ac8809a4524bdb6095d8c743977a6d6a132e43f9cbbd460d1c62
   languageName: node
   linkType: hard
 
@@ -25954,6 +26135,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"reflect.getprototypeof@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "reflect.getprototypeof@npm:1.0.4"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    get-intrinsic: ^1.2.1
+    globalthis: ^1.0.3
+    which-builtin-type: ^1.1.3
+  checksum: 16e2361988dbdd23274b53fb2b1b9cefeab876c3941a2543b4cadac6f989e3db3957b07a44aac46cfceb3e06e2871785ec2aac992d824f76292f3b5ee87f66f2
+  languageName: node
+  linkType: hard
+
 "refractor@npm:^3.6.0":
   version: 3.6.0
   resolution: "refractor@npm:3.6.0"
@@ -26011,14 +26206,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.4.3":
-  version: 1.4.3
-  resolution: "regexp.prototype.flags@npm:1.4.3"
+"regexp.prototype.flags@npm:^1.4.3, regexp.prototype.flags@npm:^1.5.1":
+  version: 1.5.1
+  resolution: "regexp.prototype.flags@npm:1.5.1"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.3
-    functions-have-names: ^1.2.2
-  checksum: 51228bae732592adb3ededd5e15426be25f289e9c4ef15212f4da73f4ec3919b6140806374b8894036a86020d054a8d2657d3fee6bb9b4d35d8939c20030b7a6
+    define-properties: ^1.2.0
+    set-function-name: ^2.0.0
+  checksum: 869edff00288442f8d7fa4c9327f91d85f3b3acf8cbbef9ea7a220345cf23e9241b6def9263d2c1ebcf3a316b0aa52ad26a43a84aa02baca3381717b3e307f47
   languageName: node
   linkType: hard
 
@@ -26140,6 +26335,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"replace-in-file-webpack-plugin@npm:1.0.6":
+  version: 1.0.6
+  resolution: "replace-in-file-webpack-plugin@npm:1.0.6"
+  checksum: 0c00a074e544ebe1aef0615e594f6daad47427950a2454e88f94dcb185839d68ce07854b83bbcb5f9b2336f8e8ae24017db4eca085135a9be84e43585163301a
+  languageName: node
+  linkType: hard
+
 "request-progress@npm:^3.0.0":
   version: 3.0.0
   resolution: "request-progress@npm:3.0.0"
@@ -26431,6 +26633,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rollup-plugin-copy@npm:3.5.0":
+  version: 3.5.0
+  resolution: "rollup-plugin-copy@npm:3.5.0"
+  dependencies:
+    "@types/fs-extra": ^8.0.1
+    colorette: ^1.1.0
+    fs-extra: ^8.1.0
+    globby: 10.0.1
+    is-plain-object: ^3.0.0
+  checksum: 706ba6bd2052b95d1037f12963ff4b50749730f18aefad10544f9574aff7c035c88c5dd9ae1f0c0408cf09862e595a0ea4d68e13c2717addaea2bda3ade0d0e0
+  languageName: node
+  linkType: hard
+
 "rollup-plugin-dts@npm:^5.0.0":
   version: 5.3.0
   resolution: "rollup-plugin-dts@npm:5.3.0"
@@ -26488,17 +26703,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup-plugin-svg-import@npm:^1.6.0":
-  version: 1.6.0
-  resolution: "rollup-plugin-svg-import@npm:1.6.0"
-  dependencies:
-    "@rollup/pluginutils": ^4.1.1
-  peerDependencies:
-    rollup: ">=1.29.0 <3.0.0"
-  checksum: 453862c39d2301563d9d07f6647c295377ff66cf3174d2a0612389fda4bfd9fa72718d90279feb782d3525f1d6f9710e1dc78641cd9d4044360a0179f88054b0
-  languageName: node
-  linkType: hard
-
 "rollup-plugin-terser@npm:7.0.2":
   version: 7.0.2
   resolution: "rollup-plugin-terser@npm:7.0.2"
@@ -26589,6 +26793,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"safe-array-concat@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "safe-array-concat@npm:1.0.1"
+  dependencies:
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.2.1
+    has-symbols: ^1.0.3
+    isarray: ^2.0.5
+  checksum: 001ecf1d8af398251cbfabaf30ed66e3855127fbceee178179524b24160b49d15442f94ed6c0db0b2e796da76bb05b73bf3cc241490ec9c2b741b41d33058581
+  languageName: node
+  linkType: hard
+
 "safe-buffer@npm:5.1.1":
   version: 5.1.1
   resolution: "safe-buffer@npm:5.1.1"
@@ -26892,6 +27108,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"set-function-name@npm:^2.0.0, set-function-name@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "set-function-name@npm:2.0.1"
+  dependencies:
+    define-data-property: ^1.0.1
+    functions-have-names: ^1.2.3
+    has-property-descriptors: ^1.0.0
+  checksum: 4975d17d90c40168eee2c7c9c59d023429f0a1690a89d75656306481ece0c3c1fb1ebcc0150ea546d1913e35fbd037bace91372c69e543e51fc5d1f31a9fa126
+  languageName: node
+  linkType: hard
+
 "set-harmonic-interval@npm:^1.0.1":
   version: 1.0.1
   resolution: "set-harmonic-interval@npm:1.0.1"
@@ -27780,25 +28007,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string.prototype.trimend@npm:^1.0.6":
-  version: 1.0.6
-  resolution: "string.prototype.trimend@npm:1.0.6"
+"string.prototype.trim@npm:^1.2.8":
+  version: 1.2.8
+  resolution: "string.prototype.trim@npm:1.2.8"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-  checksum: 0fdc34645a639bd35179b5a08227a353b88dc089adf438f46be8a7c197fc3f22f8514c1c9be4629b3cd29c281582730a8cbbad6466c60f76b5f99cf2addb132e
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: 49eb1a862a53aba73c3fb6c2a53f5463173cb1f4512374b623bcd6b43ad49dd559a06fb5789bdec771a40fc4d2a564411c0a75d35fb27e76bbe738c211ecff07
   languageName: node
   linkType: hard
 
-"string.prototype.trimstart@npm:^1.0.6":
-  version: 1.0.6
-  resolution: "string.prototype.trimstart@npm:1.0.6"
+"string.prototype.trimend@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "string.prototype.trimend@npm:1.0.7"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-  checksum: 89080feef416621e6ef1279588994305477a7a91648d9436490d56010a1f7adc39167cddac7ce0b9884b8cdbef086987c4dcb2960209f2af8bac0d23ceff4f41
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: 2375516272fd1ba75992f4c4aa88a7b5f3c7a9ca308d963bcd5645adf689eba6f8a04ebab80c33e30ec0aefc6554181a3a8416015c38da0aa118e60ec896310c
+  languageName: node
+  linkType: hard
+
+"string.prototype.trimstart@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "string.prototype.trimstart@npm:1.0.7"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: 13d0c2cb0d5ff9e926fa0bec559158b062eed2b68cd5be777ffba782c96b2b492944e47057274e064549b94dd27cf81f48b27a31fee8af5b574cff253e7eb613
   languageName: node
   linkType: hard
 
@@ -28111,7 +28349,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"swc-loader@npm:^0.2.3":
+"swc-loader@npm:0.2.3, swc-loader@npm:^0.2.3":
   version: 0.2.3
   resolution: "swc-loader@npm:0.2.3"
   peerDependencies:
@@ -28820,15 +29058,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tsconfig-paths@npm:^3.14.1, tsconfig-paths@npm:^3.9.0":
-  version: 3.14.1
-  resolution: "tsconfig-paths@npm:3.14.1"
+"tsconfig-paths@npm:^3.14.2, tsconfig-paths@npm:^3.9.0":
+  version: 3.14.2
+  resolution: "tsconfig-paths@npm:3.14.2"
   dependencies:
     "@types/json5": ^0.0.29
-    json5: ^1.0.1
+    json5: ^1.0.2
     minimist: ^1.2.6
     strip-bom: ^3.0.0
-  checksum: 8afa01c673ebb4782ba53d3a12df97fa837ce524f8ad38ee4e2b2fd57f5ac79abc21c574e9e9eb014d93efe7fe8214001b96233b5c6ea75bd1ea82afe17a4c6d
+  checksum: a6162eaa1aed680537f93621b82399c7856afd10ec299867b13a0675e981acac4e0ec00896860480efc59fc10fd0b16fdc928c0b885865b52be62cadac692447
   languageName: node
   linkType: hard
 
@@ -28990,6 +29228,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typed-array-buffer@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "typed-array-buffer@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.2.1
+    is-typed-array: ^1.1.10
+  checksum: 3e0281c79b2a40cd97fe715db803884301993f4e8c18e8d79d75fd18f796e8cd203310fec8c7fdb5e6c09bedf0af4f6ab8b75eb3d3a85da69328f28a80456bd3
+  languageName: node
+  linkType: hard
+
+"typed-array-byte-length@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "typed-array-byte-length@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.2
+    for-each: ^0.3.3
+    has-proto: ^1.0.1
+    is-typed-array: ^1.1.10
+  checksum: b03db16458322b263d87a702ff25388293f1356326c8a678d7515767ef563ef80e1e67ce648b821ec13178dd628eb2afdc19f97001ceae7a31acf674c849af94
+  languageName: node
+  linkType: hard
+
+"typed-array-byte-offset@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "typed-array-byte-offset@npm:1.0.0"
+  dependencies:
+    available-typed-arrays: ^1.0.5
+    call-bind: ^1.0.2
+    for-each: ^0.3.3
+    has-proto: ^1.0.1
+    is-typed-array: ^1.1.10
+  checksum: 04f6f02d0e9a948a95fbfe0d5a70b002191fae0b8fe0fe3130a9b2336f043daf7a3dda56a31333c35a067a97e13f539949ab261ca0f3692c41603a46a94e960b
+  languageName: node
+  linkType: hard
+
 "typed-array-length@npm:^1.0.4":
   version: 1.0.4
   resolution: "typed-array-length@npm:1.0.4"
@@ -30128,6 +30402,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"which-builtin-type@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "which-builtin-type@npm:1.1.3"
+  dependencies:
+    function.prototype.name: ^1.1.5
+    has-tostringtag: ^1.0.0
+    is-async-function: ^2.0.0
+    is-date-object: ^1.0.5
+    is-finalizationregistry: ^1.0.2
+    is-generator-function: ^1.0.10
+    is-regex: ^1.1.4
+    is-weakref: ^1.0.2
+    isarray: ^2.0.5
+    which-boxed-primitive: ^1.0.2
+    which-collection: ^1.0.1
+    which-typed-array: ^1.1.9
+  checksum: 43730f7d8660ff9e33d1d3f9f9451c4784265ee7bf222babc35e61674a11a08e1c2925019d6c03154fcaaca4541df43abe35d2720843b9b4cbcebdcc31408f36
+  languageName: node
+  linkType: hard
+
 "which-collection@npm:^1.0.1":
   version: 1.0.1
   resolution: "which-collection@npm:1.0.1"
@@ -30140,17 +30434,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
-  version: 1.1.9
-  resolution: "which-typed-array@npm:1.1.9"
+"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
+  version: 1.1.11
+  resolution: "which-typed-array@npm:1.1.11"
   dependencies:
     available-typed-arrays: ^1.0.5
     call-bind: ^1.0.2
     for-each: ^0.3.3
     gopd: ^1.0.1
     has-tostringtag: ^1.0.0
-    is-typed-array: ^1.1.10
-  checksum: fe0178ca44c57699ca2c0e657b64eaa8d2db2372a4e2851184f568f98c478ae3dc3fdb5f7e46c384487046b0cf9e23241423242b277e03e8ba3dabc7c84c98ef
+  checksum: 711ffc8ef891ca6597b19539075ec3e08bb9b4c2ca1f78887e3c07a977ab91ac1421940505a197758fb5939aa9524976d0a5bbcac34d07ed6faa75cedbb17206
   languageName: node
   linkType: hard