[v9.4.x] LDAP: Fix user disabling (#74318 )

* [LDAP] Disable removed users on login (#74016) * manual backport of #74016 on legacy code * LDAP: Fix active sync with large quantities of users (#73834) * Fix authenticate user test
[v9.4.x] Docs: Fix broken link (#74185 )
2023-09-04 16:14:20 +02:00 · 2023-08-31 13:29:46 -04:00 · 2023-08-31 11:06:43 +01:00 · 2023-08-31 10:20:55 +01:00 · 2023-08-30 22:02:54 +03:00 · 2023-08-30 14:37:35 +03:00
3716 changed files with 90606 additions and 106283 deletions
--- a/.betterer.results
+++ b/.betterer.results
--- a/.betterer.ts
+++ b/.betterer.ts
@@ -1,32 +1,35 @@
 import { BettererFileTest } from '@betterer/betterer';
-import { promises as fs } from 'fs';
 import { ESLint, Linter } from 'eslint';
+import { existsSync } from 'fs';
 import path from 'path';
 import glob from 'glob';

 export default {
-  'better eslint': () =>
-    countEslintErrors()
-      .include('**/*.{ts,tsx}')
-      .exclude(/public\/app\/angular/),
+  'better eslint': () => countEslintErrors().include('**/*.{ts,tsx}'),
  'no undocumented stories': () => countUndocumentedStories().include('**/*.story.tsx'),
 };

 function countUndocumentedStories() {
  return new BettererFileTest(async (filePaths, fileTestResult) => {
-    await Promise.all(
-      filePaths.map(async (filePath) => {
-        // look for .mdx import in the story file
-        const regex = new RegExp("^import.*.mdx';$", 'gm');
-        const fileText = await fs.readFile(filePath, 'utf8');
-        if (!regex.test(fileText)) {
-          // In this case the file contents don't matter:
-          const file = fileTestResult.addFile(filePath, '');
-          // Add the issue to the first character of the file:
-          file.addIssue(0, 0, 'No undocumented stories are allowed, please add an .mdx file with some documentation');
-        }
-      })
-    );
+    filePaths.forEach((filePath) => {
+      if (!existsSync(filePath.replace(/\.story.tsx$/, '.mdx'))) {
+        // In this case the file contents don't matter:
+        const file = fileTestResult.addFile(filePath, '');
+        // Add the issue to the first character of the file:
+        file.addIssue(0, 0, 'No undocumented stories are allowed, please add an .mdx file with some documentation');
+      }
+    });
+  });
+}
+
+async function findEslintConfigFiles(): Promise<string[]> {
+  return new Promise((resolve, reject) => {
+    glob('**/.eslintrc', (err, files) => {
+      if (err) {
+        reject(err);
+      }
+      resolve(files);
+    });
  });
 }

@@ -35,7 +38,7 @@ function countEslintErrors() {
    const { baseDirectory } = resolver;
    const cli = new ESLint({ cwd: baseDirectory });

-    const eslintConfigFiles = await glob('**/.eslintrc');
+    const eslintConfigFiles = await findEslintConfigFiles();
    const eslintConfigMainPaths = eslintConfigFiles.map((file) => path.resolve(path.dirname(file)));

    const baseRules: Partial<Linter.RulesRecord> = {
--- a/.bingo/golangci-lint.mod
+++ b/.bingo/golangci-lint.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

-go 1.20
+go 1.19

 require github.com/golangci/golangci-lint v1.51.2 // cmd/golangci-lint
--- a/.bingo/golangci-lint.sum
+++ b/.bingo/golangci-lint.sum
--- a/.bra.toml
+++ b/.bra.toml
@@ -1,7 +1,8 @@
 [run]
 init_cmds = [
-  ["GO_BUILD_DEV=1", "make", "build-go"],
+  ["make", "gen-go"],
  ["make", "gen-jsonnet"],
+  ["GO_BUILD_DEV=1", "make", "build-go"],
  ["./bin/grafana", "server", "-packaging=dev", "cfg:app_mode=development"]
 ]
 watch_all = true
@@ -16,7 +17,8 @@ watch_exts = [".go", ".ini", ".toml", ".template.html"]
 ignore_files = [".*_gen.go"]
 build_delay = 1500
 cmds = [
-  ["GO_BUILD_DEV=1", "make", "build-go"],
+  ["make", "gen-go"],
  ["make", "gen-jsonnet"],
+  ["GO_BUILD_DEV=1", "make", "build-go"],
  ["./bin/grafana", "server", "-packaging=dev", "cfg:app_mode=development"]
 ]
--- a/.drone.star
+++ b/.drone.star
@@ -11,22 +11,28 @@ load("scripts/drone/events/pr.star", "pr_pipelines")
 load("scripts/drone/events/main.star", "main_pipelines")
 load(
    "scripts/drone/events/release.star",
-    "artifacts_page_pipeline",
-    "enterprise2_pipelines",
-    "enterprise_pipelines",
    "integration_test_pipelines",
-    "oss_pipelines",
    "publish_artifacts_pipelines",
    "publish_npm_pipelines",
    "publish_packages_pipeline",
 )
+load(
+    "scripts/drone/rgm.star",
+    "rgm",
+)
 load(
    "scripts/drone/pipelines/publish_images.star",
    "publish_image_pipelines_public",
-    "publish_image_pipelines_security",
 )
-load("scripts/drone/pipelines/github.star", "publish_github_pipeline")
-load("scripts/drone/pipelines/aws_marketplace.star", "publish_aws_marketplace_pipeline")
+load(
+    "scripts/drone/pipelines/ci_images.star",
+    "publish_ci_build_container_image_pipeline",
+    "publish_ci_windows_test_image_pipeline",
+)
+load(
+    "scripts/drone/pipelines/windows.star",
+    "windows_test_backend",
+)
 load("scripts/drone/version.star", "version_branch_pipelines")
 load("scripts/drone/events/cron.star", "cronjobs")
 load("scripts/drone/vault.star", "secrets")
@@ -35,25 +41,19 @@ def main(_ctx):
    return (
        pr_pipelines() +
        main_pipelines() +
-        oss_pipelines() +
-        enterprise_pipelines() +
-        enterprise2_pipelines() +
-        enterprise2_pipelines(
-            prefix = "custom-",
-            trigger = {"event": ["custom"]},
-        ) +
        publish_image_pipelines_public() +
-        publish_image_pipelines_security() +
-        publish_github_pipeline("public") +
-        publish_github_pipeline("security") +
-        publish_aws_marketplace_pipeline("public") +
-        publish_artifacts_pipelines("security") +
        publish_artifacts_pipelines("public") +
        publish_npm_pipelines() +
        publish_packages_pipeline() +
-        artifacts_page_pipeline() +
+        rgm() +
+        [windows_test_backend({
+            "event": ["promote"],
+            "target": ["test-windows"],
+        }, "oss", "testing")] +
        version_branch_pipelines() +
        integration_test_pipelines() +
+        publish_ci_windows_test_image_pipeline() +
+        publish_ci_build_container_image_pipeline() +
        cronjobs() +
        secrets()
    )
--- a/.drone.yml
+++ b/.drone.yml
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -12,25 +12,27 @@
 # This should make it easy to add new rules without breaking existing ones.

 # Documentation
-/.changelog-archive @grafana/docs-grafana
-/CHANGELOG.md @grafana/docs-grafana
-/CODE_OF_CONDUCT.md @grafana/docs-grafana
-/CONTRIBUTING.md @grafana/docs-grafana
-/GOVERNANCE.md @RichiH
-/HALL_OF_FAME.md @grafana/docs-grafana
-/ISSUE_TRIAGE.md @grafana/grafana-community-support
-/LICENSE @torkelo
-/LICENSING.md @torkelo
-/MAINTAINERS.md @RichiH
-/NOTICE.md @torkelo
-/README.md @grafana/docs-grafana
-/ROADMAP.md @torkelo
-/SECURITY.md @grafana/security-team
-/SUPPORT.md @torkelo
-/UPGRADING_DEPENDENCIES.md @grafana/docs-grafana
-/WORKFLOW.md @torkelo
+/docs/ @grafana/docs-grafana
 /contribute/ @grafana/docs-grafana
-/devenv/README.md @grafana/docs-grafana
+/docs/sources/developers/plugins/ @grafana/docs-grafana @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
+/docs/sources/developers/plugins/backend/ @grafana/docs-grafana @grafana/plugins-platform-backend
+/.changelog-archive @grafana/docs-grafana
+CHANGELOG.md @grafana/docs-grafana
+CODE_OF_CONDUCT.md @grafana/docs-grafana
+CONTRIBUTING.md @grafana/docs-grafana
+GOVERNANCE.md @RichiH
+HALL_OF_FAME.md @grafana/docs-grafana
+ISSUE_TRIAGE.md @grafana/grafana-community-support
+LICENSE @torkelo
+LICENSING.md @torkelo
+MAINTAINERS.md @RichiH
+NOTICE.md @torkelo
+README.md @grafana/docs-grafana
+ROADMAP.md @torkelo
+SECURITY.md @grafana/security-team
+SUPPORT.md @torkelo
+UPGRADING_DEPENDENCIES.md @grafana/docs-grafana
+WORKFLOW.md @torkelo

 # Technical documentation
 /docs/                                    @Eve832 @jdbaldry
@@ -66,7 +68,7 @@
 /pkg/bus/ @grafana/backend-platform
 /pkg/cmd/ @grafana/backend-platform
 /pkg/components/apikeygen/ @grafana/grafana-authnz-team
-/pkg/components/satokengen/ @grafana/grafana-authnz-team
+/pkg/components/apikeygenprefixed/ @grafana/grafana-authnz-team
 /pkg/components/dashdiffs/ @grafana/backend-platform
 /pkg/components/imguploader/ @grafana/backend-platform
 /pkg/components/loki/ @grafana/backend-platform
@@ -83,7 +85,6 @@
 /pkg/infra/metrics/ @grafana/backend-platform
 /pkg/infra/network/ @grafana/backend-platform
 /pkg/infra/process/ @grafana/backend-platform
-/pkg/infra/proxy/ @grafana/hosted-grafana-team
 /pkg/infra/remotecache/ @grafana/backend-platform
 /pkg/infra/serverlock/ @grafana/backend-platform
 /pkg/infra/slugify/ @grafana/backend-platform
@@ -96,6 +97,7 @@
 /pkg/services/annotations/ @grafana/backend-platform
 /pkg/services/apikey/ @grafana/backend-platform
 /pkg/services/cleanup/ @grafana/backend-platform
+/pkg/services/comments/ @grafana/backend-platform
 /pkg/services/contexthandler/ @grafana/backend-platform
 /pkg/services/correlations/ @grafana/backend-platform
 /pkg/services/dashboardimport/ @grafana/backend-platform
@@ -113,6 +115,7 @@
 /pkg/services/org/ @grafana/backend-platform
 /pkg/services/playlist/ @grafana/backend-platform
 /pkg/services/plugindashboards/ @grafana/backend-platform
+/pkg/services/pluginsettings/ @grafana/backend-platform
 /pkg/services/preference/ @grafana/backend-platform
 /pkg/services/provisioning/ @grafana/backend-platform
 /pkg/services/publicdashboards/ @grafana/dashboards-squad
@@ -159,6 +162,9 @@
 /devenv/docker/blocks/loki* @grafana/observability-logs
 /devenv/docker/blocks/elastic* @grafana/observability-logs

+# Performance tests
+/devenv/docker/loadtest-ts/ @grafana/multitenancy-squad
+
 /devenv/bulk-dashboards/ @grafana/dashboards-squad
 /devenv/bulk_alerting_dashboards/ @grafana/alerting-squad-backend
 /devenv/create_docker_compose.sh @grafana/backend-platform
@@ -207,7 +213,7 @@
 /devenv/docker/ha_test/ @grafana/backend-platform
 /devenv/docker/loadtest/ @grafana/backend-platform
 /devenv/docker/rpmtest/ @grafana/backend-platform
-/devenv/jsonnet/ @grafana/dataviz-squad
+/devenv/jsonnet/ @grafana/grafana-edge-squad
 /devenv/local-npm/ @grafana/frontend-ops
 /devenv/vscode/ @grafana/frontend-ops
 /devenv/setup.sh @grafana/backend-platform
@@ -228,9 +234,10 @@
 /Dockerfile @grafana/grafana-delivery
 /Makefile @grafana/grafana-delivery
 /scripts/build/ @grafana/grafana-delivery
+/scripts/list-release-artifacts.sh @grafana/grafana-delivery

 # OSS Plugin Partnerships backend code
-/pkg/tsdb/cloudwatch/ @grafana/aws-datasources
+/pkg/tsdb/cloudwatch/ @grafana/aws-plugins
 /pkg/tsdb/azuremonitor/ @grafana/partner-plugins
 /pkg/tsdb/cloudmonitoring/ @grafana/partner-plugins

@@ -253,14 +260,14 @@
 /pkg/services/sqlstore/migrations/ @grafana/backend-platform @grafana/hosted-grafana-team
 *_mig.go @grafana/backend-platform @grafana/hosted-grafana-team

-# Grafana app platform
-/pkg/services/live/ @grafana/grafana-app-platform-squad
-/pkg/services/searchV2/ @grafana/grafana-app-platform-squad
-/pkg/services/store/ @grafana/grafana-app-platform-squad
-/pkg/infra/filestorage/ @grafana/grafana-app-platform-squad
-/pkg/util/converter/ @grafana/grafana-app-platform-squad
-/pkg/modules/ @grafana/grafana-app-platform-squad
-/pkg/kindsysreport/ @grafana/grafana-app-platform-squad
+# Grafana multitenancy
+/pkg/services/live/ @grafana/multitenancy-squad
+/pkg/services/searchV2/ @grafana/multitenancy-squad
+/pkg/services/store/ @grafana/multitenancy-squad
+/pkg/services/querylibrary/ @grafana/multitenancy-squad
+/pkg/services/export/ @grafana/multitenancy-squad
+/pkg/infra/filestorage/ @grafana/multitenancy-squad
+/pkg/util/converter/ @grafana/multitenancy-squad

 # Alerting
 /pkg/services/ngalert/ @grafana/alerting-squad-backend
@@ -270,8 +277,8 @@
 /public/app/features/alerting/ @grafana/alerting-squad-frontend

 # Library Services
-/pkg/services/libraryelements/ @grafana/grafana-frontend-platform
-/pkg/services/librarypanels/ @grafana/grafana-frontend-platform
+/pkg/services/libraryelements/ @grafana/user-essentials
+/pkg/services/librarypanels/ @grafana/user-essentials

 # Plugins
 /pkg/api/pluginproxy/ @grafana/plugins-platform-backend
@@ -282,32 +289,30 @@
 /pkg/services/pluginsintegration/ @grafana/plugins-platform-backend
 /pkg/plugins/pfs/ @grafana/plugins-platform-backend @grafana/grafana-as-code
 /pkg/tsdb/testdatasource/ @grafana/plugins-platform-backend
-/pkg/services/pluginsintegration/pluginsettings/ @grafana/plugins-platform-backend

 # Dashboard previews / crawler (behind feature flag)
-/pkg/services/thumbs/ @grafana/grafana-app-platform-squad
+/pkg/services/thumbs/ @grafana/multitenancy-squad

 # Backend code docs
 /contribute/backend/ @grafana/backend-platform


-/crowdin.yml @grafana/grafana-frontend-platform
-/public/locales/ @grafana/grafana-frontend-platform
-/public/app/core/internationalization/ @grafana/grafana-frontend-platform
-/e2e/ @grafana/grafana-frontend-platform
+/crowdin.yml @grafana/user-essentials
+/public/locales/ @grafana/user-essentials
+/public/app/core/internationalization/ @grafana/user-essentials
+/e2e/ @grafana/user-essentials
 /e2e/cloud-plugins-suite/ @grafana/partner-plugins
-/packages/ @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend @grafana/dataviz-squad
-/packages/grafana-e2e-selectors/ @grafana/grafana-frontend-platform
-/packages/grafana-e2e/ @grafana/grafana-frontend-platform
+/packages/ @grafana/user-essentials @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
+/packages/grafana-e2e-selectors/ @grafana/user-essentials
+/packages/grafana-e2e/ @grafana/user-essentials
 /packages/grafana-toolkit/ @grafana/plugins-platform-frontend
 /packages/grafana-ui/.storybook/ @grafana/plugins-platform-frontend
-/packages/grafana-ui/src/components/ @grafana/grafana-frontend-platform
-/packages/grafana-ui/src/components/DateTimePickers/ @grafana/grafana-frontend-platform
-/packages/grafana-ui/src/components/GraphNG/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/DateTimePickers/ @grafana/user-essentials
+/packages/grafana-ui/src/components/GraphNG/ @grafana/grafana-bi-squad
 /packages/grafana-ui/src/components/Logs/ @grafana/observability-logs
 /packages/grafana-ui/src/components/Table/ @grafana/grafana-bi-squad
-/packages/grafana-ui/src/components/TimeSeries/ @grafana/dataviz-squad
-/packages/grafana-ui/src/components/uPlot/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/TimeSeries/ @grafana/grafana-bi-squad
+/packages/grafana-ui/src/components/uPlot/ @grafana/grafana-bi-squad
 /packages/grafana-ui/src/utils/storybook/ @grafana/plugins-platform-frontend
 /packages/grafana-data/src/**/*logs* @grafana/observability-logs
 /plugins-bundled/ @grafana/plugins-platform-frontend
@@ -327,7 +332,7 @@ tsconfig.json @grafana/frontend-ops
 /.yarn @grafana/frontend-ops
 /.yarnrc.yml @grafana/frontend-ops
 /yarn.lock @grafana/frontend-ops
-/.linguirc @grafana/grafana-frontend-platform
+/.linguirc @grafana/user-essentials
 /babel.config.json @grafana/frontend-ops
 lerna.json @grafana/frontend-ops
 /.prettierrc.js @grafana/frontend-ops
@@ -341,99 +346,99 @@ lerna.json @grafana/frontend-ops


 # public folder
-/public/app/core/ @grafana/grafana-frontend-platform
-/public/app/core/components/TimePicker/ @grafana/grafana-frontend-platform
-/public/app/core/components/Layers/ @grafana/dataviz-squad
-/public/app/features/all.ts @grafana/grafana-frontend-platform
+/public/app/core/ @grafana/user-essentials
+/public/app/core/components/TimePicker/ @grafana/user-essentials
+/public/app/core/components/Layers/ @grafana/grafana-edge-squad
+/public/app/features/all.ts @grafana/user-essentials
 /public/app/features/admin/ @grafana/grafana-authnz-team
-/public/app/features/annotations/ @grafana/grafana-frontend-platform
-/public/app/features/api-keys/ @grafana/grafana-frontend-platform
-/public/app/features/canvas/ @grafana/dataviz-squad
-/public/app/features/commandPalette/ @grafana/grafana-frontend-platform
+/public/app/features/annotations/ @grafana/user-essentials
+/public/app/features/api-keys/ @grafana/user-essentials
+/public/app/features/canvas/ @grafana/grafana-edge-squad
+/public/app/features/commandPalette/ @grafana/user-essentials
+/public/app/features/comments/ @grafana/grafana-edge-squad
 /public/app/features/connections/ @grafana/plugins-platform-frontend
 /public/app/features/correlations/ @grafana/explore-squad
 /public/app/features/dashboard/ @grafana/dashboards-squad
-/public/app/features/datasources/ @grafana/plugins-platform-frontend
-/public/app/features/dimensions/ @grafana/dataviz-squad
-/public/app/features/dataframe-import/ @grafana/grafana-bi-squad
-/public/app/features/datasource-drawer/ @grafana/grafana-bi-squad
+/public/app/features/datasources/ @grafana/user-essentials
+/public/app/features/dimensions/ @grafana/grafana-edge-squad
 /public/app/features/explore/ @grafana/explore-squad
 /public/app/features/expressions/ @grafana/observability-metrics
-/public/app/features/folders/ @grafana/grafana-frontend-platform
-/public/app/features/inspector/ @grafana/grafana-frontend-platform
-/public/app/features/invites/ @grafana/grafana-frontend-platform
-/public/app/features/geo/ @grafana/dataviz-squad
-/public/app/features/library-panels/ @grafana/grafana-frontend-platform
+/public/app/features/folders/ @grafana/user-essentials
+/public/app/features/inspector/ @grafana/user-essentials
+/public/app/features/invites/ @grafana/user-essentials
+/public/app/features/geo/ @grafana/grafana-edge-squad
+/public/app/features/library-panels/ @grafana/user-essentials
 /public/app/features/logs/ @grafana/observability-logs
-/public/app/features/live/ @grafana/grafana-app-platform-squad
+/public/app/features/live/ @grafana/multitenancy-squad
 /public/app/features/manage-dashboards/ @grafana/dashboards-squad
-/public/app/features/notifications/ @grafana/grafana-frontend-platform
-/public/app/features/org/ @grafana/grafana-frontend-platform
-/public/app/features/panel/ @grafana/grafana-frontend-platform
+/public/app/features/notifications/ @grafana/user-essentials
+/public/app/features/org/ @grafana/user-essentials
+/public/app/features/panel/ @grafana/user-essentials
 /public/app/features/playlist/ @grafana/dashboards-squad
 /public/app/features/plugins/ @grafana/plugins-platform-frontend
-/public/app/features/profile/ @grafana/grafana-frontend-platform
+/public/app/features/profile/ @grafana/user-essentials
 /public/app/features/runtime/ @ryantxu
 /public/app/features/query/ @grafana/dashboards-squad
-/public/app/features/sandbox/ @grafana/grafana-frontend-platform
+/public/app/features/query-library/ @grafana/grafana-edge-squad
+/public/app/features/sandbox/ @grafana/user-essentials
 /public/app/features/scenes/ @grafana/dashboards-squad
-/public/app/features/search/ @grafana/grafana-frontend-platform
+/public/app/features/search/ @grafana/user-essentials
 /public/app/features/serviceaccounts/ @grafana/grafana-authnz-team
-/public/app/features/storage/ @grafana/grafana-app-platform-squad
+/public/app/features/storage/ @grafana/multitenancy-squad
 /public/app/features/teams/ @grafana/grafana-authnz-team
 /public/app/features/templating/ @grafana/dashboards-squad
-/public/app/features/transformers/ @grafana/dataviz-squad
+/public/app/features/transformers/ @grafana/grafana-edge-squad
 /public/app/features/users/ @grafana/grafana-authnz-team
 /public/app/features/variables/ @grafana/dashboards-squad
 /public/app/plugins/panel/alertGroups/ @grafana/alerting-squad-frontend
 /public/app/plugins/panel/alertlist/ @grafana/alerting-squad-frontend
-/public/app/plugins/panel/annolist/ @grafana/grafana-frontend-platform
-/public/app/plugins/panel/barchart/ @grafana/dataviz-squad
-/public/app/plugins/panel/bargauge/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/dashlist/ @grafana/grafana-frontend-platform
+/public/app/plugins/panel/annolist/ @grafana/user-essentials
+/public/app/plugins/panel/barchart/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/bargauge/ @grafana/user-essentials
+/public/app/plugins/panel/dashlist/ @grafana/user-essentials
 /public/app/plugins/panel/debug/ @ryantxu
-/public/app/plugins/panel/gauge/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/gettingstarted/ @grafana/grafana-frontend-platform
-/public/app/plugins/panel/graph/ @grafana/dataviz-squad
-/public/app/plugins/panel/heatmap/ @grafana/dataviz-squad
-/public/app/plugins/panel/histogram/ @grafana/dataviz-squad
+/public/app/plugins/panel/gauge/ @grafana/user-essentials
+/public/app/plugins/panel/gettingstarted/ @grafana/user-essentials
+/public/app/plugins/panel/graph/ @grafana/user-essentials
+/public/app/plugins/panel/heatmap/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/histogram/ @grafana/grafana-bi-squad
 /public/app/plugins/panel/logs/ @grafana/observability-logs
 /public/app/plugins/panel/nodeGraph/ @grafana/observability-traces-and-profiling
 /public/app/plugins/panel/traces/ @grafana/observability-traces-and-profiling
 /public/app/plugins/panel/flamegraph/ @grafana/observability-traces-and-profiling
 /public/app/plugins/panel/piechart/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/state-timeline/ @grafana/dataviz-squad
-/public/app/plugins/panel/status-history/ @grafana/dataviz-squad
+/public/app/plugins/panel/state-timeline/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/status-history/ @grafana/grafana-bi-squad
 /public/app/plugins/panel/table/ @grafana/grafana-bi-squad
 /public/app/plugins/panel/table-old/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/timeseries/ @grafana/dataviz-squad
-/public/app/plugins/panel/geomap/ @grafana/dataviz-squad
-/public/app/plugins/panel/canvas/ @grafana/dataviz-squad
-/public/app/plugins/panel/candlestick/ @grafana/dataviz-squad
-/public/app/plugins/panel/icon/ @grafana/dataviz-squad
-/public/app/plugins/panel/live/ @grafana/grafana-app-platform-squad
-/public/app/plugins/panel/news/ @grafana/grafana-frontend-platform
-/public/app/plugins/panel/stat/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/text/ @grafana/grafana-frontend-platform
-/public/app/plugins/panel/welcome/ @grafana/grafana-frontend-platform
-/public/app/plugins/panel/xychart/ @grafana/dataviz-squad
+/public/app/plugins/panel/timeseries/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/geomap/ @grafana/grafana-edge-squad
+/public/app/plugins/panel/canvas/ @grafana/grafana-edge-squad
+/public/app/plugins/panel/candlestick/ @grafana/grafana-edge-squad
+/public/app/plugins/panel/icon/ @grafana/grafana-edge-squad
+/public/app/plugins/panel/live/ @grafana/multitenancy-squad
+/public/app/plugins/panel/news/ @grafana/user-essentials
+/public/app/plugins/panel/stat/ @grafana/user-essentials
+/public/app/plugins/panel/text/ @grafana/user-essentials
+/public/app/plugins/panel/welcome/ @grafana/user-essentials
+/public/app/plugins/panel/xychart/ @grafana/grafana-bi-squad
 /public/app/plugins/sdk.ts @grafana/plugins-platform-frontend
-/public/app/polyfills/old-mediaquerylist.ts @grafana/grafana-frontend-platform
-/public/app/routes/ @grafana/grafana-frontend-platform
-/public/app/store/ @grafana/grafana-frontend-platform
-/public/app/types/ @grafana/grafana-frontend-platform
+/public/app/polyfills/old-mediaquerylist.ts @grafana/user-essentials
+/public/app/routes/ @grafana/user-essentials
+/public/app/store/ @grafana/user-essentials
+/public/app/types/ @grafana/user-essentials
 /public/dashboards/ @grafana/dashboards-squad
 /public/fonts/ @grafana/alerting-squad-frontend
-/public/emails/ @grafana/grafana-frontend-platform
+/public/emails/ @grafana/user-essentials
 /public/gazetteer/ @ryantxu
-/public/img/ @grafana/grafana-frontend-platform
-/public/lib/ @grafana/grafana-frontend-platform
+/public/img/ @grafana/user-essentials
+/public/lib/ @grafana/user-essentials
 /public/maps/ @ryantxu
 /public/robots.txt @grafana/frontend-ops
-/public/sass/ @grafana/grafana-frontend-platform
-/public/test/ @grafana/grafana-frontend-platform
-/public/testdata/ @grafana/grafana-frontend-platform
-/public/views/ @grafana/grafana-frontend-platform
+/public/sass/ @grafana/user-essentials
+/public/test/ @grafana/user-essentials
+/public/testdata/ @grafana/user-essentials
+/public/views/ @grafana/user-essentials

 /public/app/features/explore/Logs.tsx @grafana/observability-logs
 /public/app/features/explore/LogsContainer.tsx @grafana/observability-logs
@@ -441,13 +446,14 @@ lerna.json @grafana/frontend-ops
 /public/app/features/explore/TraceView/ @grafana/observability-traces-and-profiling

 /public/api-merged.json @grafana/backend-platform
+/public/api-spec.json @grafana/backend-platform
 /public/openapi3.json @grafana/backend-platform
 /public/app/angular/ @torkelo
 /public/app/app.ts @grafana/frontend-ops
 /public/app/dev.ts @grafana/frontend-ops
 /public/app/index.ts @grafana/frontend-ops
 /public/app/AppWrapper.tsx @grafana/frontend-ops
-/public/app/partials/ @grafana/grafana-frontend-platform
+/public/app/partials/ @grafana/user-essentials



@@ -456,14 +462,14 @@ lerna.json @grafana/frontend-ops
 /scripts/check-breaking-changes.sh @grafana/plugins-platform-frontend
 /scripts/ci-* @grafana/grafana-delivery
 /scripts/circle-* @grafana/grafana-delivery
-/scripts/ci-frontend-metrics.sh @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
-/scripts/cli/ @grafana/grafana-frontend-platform
+/scripts/ci-frontend-metrics.sh @grafana/user-essentials @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
+/scripts/cli/ @grafana/user-essentials
 /scripts/clean-git-or-error.sh @grafana/grafana-as-code
-/scripts/grafana-server/ @grafana/grafana-frontend-platform
+/scripts/grafana-server/ @grafana/user-essentials
 /scripts/helpers/ @grafana/grafana-delivery
 /scripts/import_many_dashboards.sh @torkelo
 /scripts/mixin-check.sh @bergquist
-/scripts/openapi3/ @grafana/grafana-operator-experience-squad
+/scripts/openapi3/ @grafana/grafana-partnerships-team
 /scripts/prepare-packagejson.js @grafana/frontend-ops
 /scripts/protobuf-check.sh @grafana/plugins-platform-backend
 /scripts/stripnulls.sh @grafana/grafana-as-code
@@ -475,9 +481,9 @@ lerna.json @grafana/frontend-ops
 /scripts/verify-repo-update/ @grafana/grafana-delivery

 /scripts/webpack/ @grafana/frontend-ops
-/scripts/generate-a11y-report.sh @grafana/grafana-frontend-platform
-.pa11yci.conf.js @grafana/grafana-frontend-platform
-.pa11yci-pr.conf.js @grafana/grafana-frontend-platform
+/scripts/generate-a11y-report.sh @grafana/user-essentials
+.pa11yci.conf.js @grafana/user-essentials
+.pa11yci-pr.conf.js @grafana/user-essentials
 .betterer.results @joshhunt
 .betterer.ts @joshhunt

@@ -489,11 +495,11 @@ lerna.json @grafana/frontend-ops

 # Core datasources
 /public/app/plugins/datasource/dashboard/ @grafana/dashboards-squad
-/public/app/plugins/datasource/cloudwatch/ @grafana/aws-datasources
+/public/app/plugins/datasource/cloudwatch/ @grafana/aws-plugins
 /public/app/plugins/datasource/elasticsearch/ @grafana/observability-logs
-/public/app/plugins/datasource/grafana/ @grafana/grafana-frontend-platform
+/public/app/plugins/datasource/grafana/ @grafana/user-essentials
 /public/app/plugins/datasource/testdata/ @grafana/plugins-platform-frontend
-/public/app/plugins/datasource/azuremonitor/ @grafana/partner-plugins
+/public/app/plugins/datasource/grafana-azure-monitor-datasource/ @grafana/partner-plugins
 /public/app/plugins/datasource/graphite/ @grafana/observability-metrics
 /public/app/plugins/datasource/influxdb/ @grafana/observability-metrics
 /public/app/plugins/datasource/jaeger/ @grafana/observability-traces-and-profiling
@@ -528,6 +534,7 @@ lerna.json @grafana/frontend-ops
 /pkg/services/guardian/ @grafana/grafana-authnz-team
 /pkg/services/ldap/ @grafana/grafana-authnz-team
 /pkg/services/login/ @grafana/grafana-authnz-team
+/pkg/services/multildap/ @grafana/grafana-authnz-team
 /pkg/services/loginattempt/ @grafana/grafana-authnz-team
 /pkg/services/oauthtoken/ @grafana/grafana-authnz-team
 /pkg/services/serviceaccounts/ @grafana/grafana-authnz-team
@@ -537,9 +544,9 @@ lerna.json @grafana/frontend-ops
 /public/app/features/support-bundles/ @grafana/grafana-authnz-team
 /pkg/services/supportbundles/ @grafana/grafana-authnz-team

-# Grafana Operator Experience Team
-/pkg/infra/httpclient/httpclientprovider/sigv4_middleware.go @grafana/grafana-operator-experience-squad
-/pkg/infra/httpclient/httpclientprovider/sigv4_middleware_test.go @grafana/grafana-operator-experience-squad
+# Grafana Partnerships Team
+/pkg/infra/httpclient/httpclientprovider/sigv4_middleware.go @grafana/grafana-partnerships-team
+/pkg/infra/httpclient/httpclientprovider/sigv4_middleware_test.go @grafana/grafana-partnerships-team

 # Kind definitions
 /kinds/dashboard @grafana/dashboards-squad
@@ -551,6 +558,8 @@ embed.go @grafana/grafana-as-code
 /pkg/cuectx/ @grafana/grafana-as-code
 /pkg/registry/ @grafana/grafana-as-code
 /pkg/codegen/ @grafana/grafana-as-code
+/pkg/kindsys/ @grafana/grafana-as-code
+/pkg/kindsys/kindcat_custom.cue @grafana/apps-platform-core
 /pkg/kinds/*/*_gen.go @grafana/grafana-as-code
 /pkg/registry/corekind/ @grafana/grafana-as-code
 /public/app/plugins/*gen.go @grafana/grafana-as-code
@@ -563,25 +572,25 @@ embed.go @grafana/grafana-as-code
 /.github/bot.md @torkelo
 /.github/commands.json @torkelo
 /.github/dependabot.yml @grafana/frontend-ops
-/.github/issue-opened.json @grafana/grafana-community-support
 /.github/metrics-collector.json @torkelo
 /.github/pr-checks.json @marefr
 /.github/pr-commands.json @marefr
 /.github/renovate.json5 @grafana/frontend-ops
 /.github/teams.yml @armandgrillet
+/.github/workflows/auto-milestone.yml @grafana/grafana-delivery
 /.github/workflows/backport.yml @grafana/grafana-delivery
 /.github/workflows/bump-version.yml @grafana/grafana-delivery
 /.github/workflows/close-milestone.yml @grafana/grafana-delivery
-/.github/workflows/cloud-data-sources-code-coverage.yml @grafana/partner-plugins @grafana/aws-datasources
+/.github/workflows/cloud-data-sources-code-coverage.yml @grafana/partner-plugins @grafana/aws-plugins
 /.github/workflows/codeowners-validator.yml @tolzhabayev
 /.github/workflows/codeql-analysis.yml @DanCech
 /.github/workflows/commands.yml @torkelo
 /.github/workflows/detect-breaking-changes-* @grafana/plugins-platform-frontend
 /.github/workflows/doc-validator.yml @grafana/docs-grafana
+/.github/workflows/enterprise-pr-check.yml @grafana/grafana-release-eng
 /.github/workflows/epic-add-to-platform-ux-parent-project.yml @meanmina
 /.github/workflows/github-release.yml @torkelo
 /.github/workflows/issue-labeled.yml @armandgrillet
-/.github/workflows/issue-opened.yml @grafana/grafana-community-support
 /.github/workflows/metrics-collector.yml @torkelo
 /.github/workflows/milestone.yml @marefr
 /.github/workflows/ox-code-coverage.yml @grafana/explore-squad
@@ -591,17 +600,18 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/pr-codeql-analysis-python.yml @DanCech
 /.github/workflows/pr-commands-closed.yml @tolzhabayev
 /.github/workflows/pr-commands.yml @marefr
+/.github/workflows/pr-patch-check.yml @grafana/grafana-delivery
+/.github/workflows/sync-mirror.yml @grafana/grafana-delivery
 /.github/workflows/publish-technical-documentation-next.yml @grafana/docs-grafana
 /.github/workflows/publish-technical-documentation-release.yml @grafana/docs-grafana
-/.github/workflows/remove-milestone.yml @grafana/grafana-frontend-platform
+/.github/workflows/remove-milestone.yml @grafana/user-essentials
 /.github/workflows/sbom-report.yml @grafana/security-team
 /.github/workflows/scripts/json-file-to-job-output.js @grafana/plugins-platform-frontend
 /.github/workflows/scripts/pr-get-job-link.js @grafana/plugins-platform-frontend
-/.github/workflows/stale.yml @grafana/grafana-frontend-platform
+/.github/workflows/stale.yml @grafana/user-essentials
 /.github/workflows/update-changelog.yml @grafana/grafana-delivery
 /.github/workflows/snyk.yml @grafana/security-team

-
 # Conf
 /conf/defaults.ini @torkelo
 /conf/sample.ini @torkelo
--- a/.github/ISSUE_TEMPLATE/5-chore.md
+++ b/.github/ISSUE_TEMPLATE/5-chore.md
@@ -1,17 +0,0 @@
---
-name: Chore
-about: Create an issue for a chore needing completion
-labels: 'type: chore'
---
-
-<!--
-Please use this template to create your chore issue. You can use this template if you spot an out-of-date README, discover a misspelling, or happen upon a deeply nested 7-layer for-loop that could be better handled another way. Please use this template for your non-bug related fixes/updates/refactors.
-
- Questions should be posted to: https://community.grafana.com
- Use query inspector to troubleshoot issues: https://bit.ly/2XNF6YS
- How to record and attach gif: https://bit.ly/2Mi8T6K
-->
-
-**What is the chore?**:
-
-**Is there anything else we need to know?**:
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,7 +2,7 @@ blank_issues_enabled: false
 contact_links:
  - name: Feature Request
    url: https://github.com/grafana/grafana/discussions/new
-    about: Discuss ideas for new features or enhancements
+    about: Discuss ideas for new features of changes
  - name: Questions & Help
    url: https://community.grafana.com
    about: Please ask and answer questions here.
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -42,9 +42,5 @@ Usage: "Fixes #<issue number>", or "Fixes (paste link of issue)"

 Fixes #

-**Special notes for your reviewer:**
+**Special notes for your reviewer**:

-Please check that:
- [ ] It works as expected from a user's perspective.
- [ ] If this is a pre-GA feature, it is behind a feature toggle.
- [ ] The docs are updated, and if this is a [notable improvement](https://grafana.com/docs/writers-toolkit/writing-guide/contribute-release-notes/#how-to-determine-if-content-belongs-in-a-whats-new-document), it's added to our [What's New](https://grafana.com/docs/writers-toolkit/writing-guide/contribute-release-notes/) doc.
--- a/.github/commands.json
+++ b/.github/commands.json
@@ -11,7 +11,7 @@
    "type":"comment",
    "name":"duplicate",
    "allowUsers":[],
-    "action":"close",
+    "action":"updateLabels",
    "addLabel":"type/duplicate"
  },
  {
@@ -221,10 +221,10 @@
  },
  {
    "type": "label",
-    "name": "team/operator-experience",
+    "name": "team/grafana-partners",
    "action": "addToProject",
    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/336"
+      "url": "https://github.com/orgs/grafana/projects/87"
    }
  },
  {
--- a/.github/issue-opened.json
+++ b/.github/issue-opened.json
@@ -1,9 +0,0 @@
-[
-  {
-    "type": "author",
-    "memberOf": { "org": "grafana" },
-    "noLabels": true,
-    "addLabel": "internal",
-    "comment": " please add one or more appropriate labels. Here are some tips:\r\n\r\n- if you are making an issue, TODO, or reminder for yourself or your team, please add one label that best describes the product or feature area. Please also add the issue to your project board. :rocket:\r\n\r\n- if you are making an issue for any other reason (docs typo, you found a bug, etc), please add at least one label that best describes the product or feature that you are discussing (e.g. `area/alerting`, `datasource/loki`, `type/docs`, `type/bug`, etc). [Our issue triage](https://github.com/grafana/grafana/blob/main/ISSUE_TRIAGE.md#3-categorizing-an-issue) doc also provides additional guidance on labeling. :rocket:\r\n\r\n Thank you! :heart:"
-  }
-]
--- a/.github/metrics-collector.json
+++ b/.github/metrics-collector.json
@@ -2,23 +2,23 @@
  "queries": [
    {
      "name": "type_bug",
-      "query": "label:\"type/bug\" is:issue is:open"
+      "query": "label:\"type/bug\" is:open"
    },
    {
      "name": "type_docs",
-      "query": "label:\"type/docs\" is:issue is:open"
+      "query": "label:\"type/docs\" is:open"
    },
    {
      "name": "needs_investigation",
-      "query": "label:\"needs investigation\" is:issue is:open"
+      "query": "label:\"needs investigation\" is:open"
    },
    {
      "name": "needs_more_info",
-      "query": "label:\"needs more info\" is:issue is:open"
+      "query": "label:\"needs more info\" is:open"
    },
    {
      "name": "triage_needs_confirmation",
-      "query": "label:\"triage/needs-confirmation\" is:issue is:open"
+      "query": "label:\"triage/needs-confirmation\" is:open"
    },
    {
      "name": "unlabeled",
@@ -26,7 +26,7 @@
    },
    {
      "name": "open_prs",
-      "query": "is:open is:pull-request"
+      "query": "is:open is:pr"
    }
  ]
 }
--- a/.github/pr-checks.json
+++ b/.github/pr-checks.json
@@ -46,4 +46,4 @@
    },
    "targetUrl": "https://github.com/grafana/grafana/blob/main/contribute/merge-pull-request.md#include-in-changelog-and-release-notes"
  }
-]
+]
--- a/.github/pr-commands.json
+++ b/.github/pr-commands.json
@@ -83,7 +83,7 @@
  },
  {
    "type": "changedfiles",
-    "matches": [ "public/app/plugins/datasource/azuremonitor/**/*", "pkg/tsdb/azuremonitor/**/*"],
+    "matches": [ "public/app/plugins/datasource/grafana-azure-monitor-datasource/**/*", "pkg/tsdb/azuremonitor/**/*"],
    "action": "updateLabel",
    "addLabel": "datasource/Azure"
  },
@@ -190,13 +190,5 @@
    "ignoreList": ["renovate[bot]","dependabot[bot]"],
    "action": "updateLabel",
    "addLabel": "pr/external"
-  },
-  {
-    "type":"label",
-    "name":"type/docs",
-    "action":"addToProject",
-    "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/69"
-    }
  }
 ]
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -10,10 +10,12 @@
    "history", // we should bump this together with react-router-dom
    "@mdx-js/react", // storybook peer-depends on its 1.x version, we should upgrade this when we upgrade storybook
    "monaco-editor", // due to us exposing this via @grafana/ui/CodeEditor's props bumping can break plugins
+    "node-fetch", // we should bump this once we move to esm modules
    "react-hook-form", // due to us exposing these hooks via @grafana/ui form components bumping can break plugins
    "react-redux", // react-beautiful-dnd depends on react-redux 7.x, we need to update that one first
    "react-router-dom", // we should bump this together with history
    "systemjs",
+    "copy-webpack-plugin", // try to upgrade with newer yarn release. Not working with 3.1.1
    "ts-loader", // we should remove ts-loader and use babel-loader instead
    "ora", // we should bump this once we move to esm modules

@@ -24,7 +26,6 @@
    "@sentry/utils",

    // dep updates blocked by React 18
-    "@testing-library/dom",
    "@testing-library/react",
    "@types/react",
    "@types/react-dom",
@@ -83,15 +84,7 @@
      "matchPackagePrefixes": [
        "@visx/"
      ]
-    },
-    {
-      "groupName": "uLibraries",
-      "matchPackageNames": [
-        "@leeoniya/ufuzzy",
-        "uplot"
-      ],
-      "reviewers": ["leeoniya"],
-    },
+    }
  ],
  "pin": {
    "enabled": false
--- a/.github/workflows/auto-milestone.yml
+++ b/.github/workflows/auto-milestone.yml
@@ -0,0 +1,22 @@
+name: Auto-milestone
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Generate token"
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        with:
+          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
+          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
+
+      - name: Run auto-milestone
+        uses: grafana/grafana-github-actions-go/auto-milestone@main
+        with:
+          pr: ${{ github.event.pull_request.number }}
+          token: ${{ steps.generate_token.outputs.token }}
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -17,10 +17,16 @@ jobs:
          ref: main
      - name: Install Actions
        run: npm install --production --prefix ./actions
+      - name: "Generate token"
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        with:
+          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
+          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
      - name: Run backport
        uses: ./actions/backport
        with:
          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
-          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
+          token: ${{ steps.generate_token.outputs.token }}
          labelsToAdd: "backport,no-changelog"
          title: "[{{base}}] {{originalTitle}}"
--- a/.github/workflows/bump-version.yml
+++ b/.github/workflows/bump-version.yml
@@ -6,12 +6,12 @@ on:
        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
        required: true
 env:
-    YARN_ENABLE_IMMUTABLE_INSTALLS: false
+  YARN_ENABLE_IMMUTABLE_INSTALLS: false
 jobs:
  main:
    runs-on: ubuntu-latest
    steps:
-    # This is a basic workflow to help you get started with Actions
+      # This is a basic workflow to help you get started with Actions
      - uses: actions-ecosystem/action-regex-match@v2.0.2
        if: ${{ github.event.inputs.version != '' }}
        id: regex-match
@@ -68,8 +68,14 @@ jobs:
          node-version: '16'
      - name: Install Actions
        run: npm install --production --prefix ./actions
-      - name: Run bump version (manually invoked)        
+      - name: "Generate token"
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        with:
+          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
+          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
+      - name: Run bump version (manually invoked)
        uses: ./actions/bump-version
        with:
-          token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+          token: ${{ steps.generate_token.outputs.token }}
          metricsWriteAPIKey: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
--- a/.github/workflows/close-milestone.yml
+++ b/.github/workflows/close-milestone.yml
@@ -11,9 +11,7 @@ on:
        description: Needs to match, exactly, the name of a milestone
        required: true
        type: string
-    secrets:
-      token:
-        required: true
+
 jobs:
  main:
    runs-on: ubuntu-latest
@@ -26,14 +24,20 @@ jobs:
          ref: main
      - name: Install Actions
        run: npm install --production --prefix ./actions
+      - name: "Generate token"
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        with:
+          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
+          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
      - name: Close milestone (manually invoked)
        if: ${{ github.event.inputs.version != '' }}
        uses: ./actions/close-milestone
        with:
-          token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+          token: ${{ steps.generate_token.outputs.token }}
      - name: Close milestone (workflow invoked)
        if: ${{ inputs.version_call != '' }}
        uses: ./actions/close-milestone
        with:
          version_call: ${{ inputs.version_call }}
-          token: ${{ secrets.token }}
+          token: ${{ steps.generate_token.outputs.token }}
--- a/.github/workflows/cloud-data-sources-code-coverage.yml
+++ b/.github/workflows/cloud-data-sources-code-coverage.yml
@@ -5,7 +5,7 @@ on:
      - 'pkg/tsdb/azuremonitor/**'
      - 'pkg/tsdb/cloudwatch/**'
      - 'pkg/tsdb/cloudmonitoring/**'
-      - 'public/app/plugins/datasource/azuremonitor/**'
+      - 'public/app/plugins/datasource/grafana-azure-monitor-datasource/**'
      - 'public/app/plugins/datasource/cloudwatch/**'
      - 'public/app/plugins/datasource/cloud-monitoring/**'
    branches-ignore:
@@ -16,5 +16,5 @@ jobs:
  workflow-call:
    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.18
    with:
-      frontend-path-regexp: public\/app\/plugins\/datasource\/(azuremonitor|cloud-monitoring|cloudwatch)
+      frontend-path-regexp: public\/app\/plugins\/datasource\/(grafana-azure-monitor-datasource|cloud-monitoring|cloudwatch)
      backend-path-regexp: pkg\/tsdb\/(azuremonitor|cloudmonitoring|cloudwatch)
--- a/.github/workflows/commands.yml
+++ b/.github/workflows/commands.yml
@@ -22,5 +22,5 @@ jobs:
        uses: ./actions/commands
        with:
          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
-          token: ${{secrets.ISSUE_COMMANDS_TOKEN}}
+          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
          configPath: commands
--- a/.github/workflows/detect-breaking-changes-build.yml
+++ b/.github/workflows/detect-breaking-changes-build.yml
@@ -31,7 +31,7 @@ jobs:
      run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT

    - name: Restore yarn cache
-      uses: actions/cache@v3.3.1
+      uses: actions/cache@v3.0.11
      id: yarn-cache
      with:
        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -79,7 +79,7 @@ jobs:
      run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT

    - name: Restore yarn cache
-      uses: actions/cache@v3.3.1
+      uses: actions/cache@v3.0.11
      id: yarn-cache
      with:
        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
--- a/.github/workflows/enterprise-pr-check.yml
+++ b/.github/workflows/enterprise-pr-check.yml
@@ -0,0 +1,26 @@
+name: Enterprise PR check
+on:
+  pull_request:
+    branches:
+      - main
+      - 'v[0-9]+.[0-9]+.x'
+jobs:
+  dispatch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: "grafana/grafana-github-actions"
+          path: ./actions
+          ref: main
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
+      - name: Repository Dispatch
+        uses: ./actions/repository-dispatch
+        with:
+          token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+          repository: grafana/grafana-enterprise
+          event_type: oss-pull-request
+          client_payload:
+            '{"source_sha": "${{ github.event.pull_request.head.sha }}", "source_branch": "${{ github.head_ref }}", "target_branch": "${{ github.base_ref }}", "pr_number": "${{ github.event.number }}"}'
--- a/.github/workflows/epic-add-to-platform-ux-parent-project.yml
+++ b/.github/workflows/epic-add-to-platform-ux-parent-project.yml
@@ -19,7 +19,6 @@ concurrency:
  group: issue-add-to-parent-project-${{ github.event.number }}
 jobs:
  main:
-    if: contains(github.event.issue.labels.*.name, 'type/epic')
    runs-on: ubuntu-latest
    steps:
      - name: Check if issue is in child or parent projects
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@@ -3,7 +3,7 @@ on:
  workflow_dispatch:
    inputs:
      version:
-        required: true        
+        required: true
        description: Needs to match, exactly, the name of a milestone (NO v prefix)
 jobs:
  main:
@@ -14,11 +14,17 @@ jobs:
        with:
          repository: "grafana/grafana-github-actions"
          path: ./actions
-          ref: main    
+          ref: main
      - name: Install Actions
        run: npm install --production --prefix ./actions
+      - name: "Generate token"
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        with:
+          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
+          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
      - name: Run github release action
        uses: ./actions/github-release
        with:
-          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
+          token: ${{ steps.generate_token.outputs.token }}
          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
--- a/.github/workflows/issue-labeled.yml
+++ b/.github/workflows/issue-labeled.yml
@@ -39,7 +39,7 @@ jobs:

      - name: "Add to GitHub board"
        if: ${{ env.BOARD != 'null' }}
-        uses: leonsteinhaeuser/project-beta-automations@v2.1.0
+        uses: leonsteinhaeuser/project-beta-automations@v1.3.0
        with:
          project_id: ${{ env.BOARD }}
          organization: grafana
--- a/.github/workflows/issue-opened.yml
+++ b/.github/workflows/issue-opened.yml
@@ -1,28 +0,0 @@
-name: Run commands when issues are opened
-on:
-  issues:
-    types: [opened]
-concurrency:
-  group: issue-opened-${{ github.event.issue.number }}
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v3
-        with:
-          repository: "grafana/grafana-github-actions"
-          path: ./actions
-          ref: main
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      # give issue-openers a chance to add labels after submit
-      - name: Sleep for 2 minutes
-        run: sleep 2m
-        shell: bash
-      - name: Run Commands
-        uses: ./actions/commands
-        with:
-          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
-          token: ${{secrets.ISSUE_COMMANDS_TOKEN}}
-          configPath: "issue-opened"
--- a/.github/workflows/milestone.yml
+++ b/.github/workflows/milestone.yml
@@ -10,12 +10,10 @@ jobs:
    uses: grafana/grafana/.github/workflows/remove-milestone.yml@main
    with:
      version_call: ${{ github.event.inputs.version_input }}
-    secrets:
-      token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+    secrets: inherit
  call-close-milestone:
    uses: grafana/grafana/.github/workflows/close-milestone.yml@main
    with:
      version_call: ${{ github.event.inputs.version_input }}
-    secrets:
-      token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
-    needs: call-remove-milestone
+    secrets: inherit
+    needs: call-remove-milestone
--- a/.github/workflows/pr-commands.yml
+++ b/.github/workflows/pr-commands.yml
@@ -2,7 +2,6 @@ name: PR automation
 on:
  pull_request_target:
    types:
-      - labeled
      - opened
      - synchronize
 concurrency:
--- a/.github/workflows/pr-patch-check.yml
+++ b/.github/workflows/pr-patch-check.yml
@@ -0,0 +1,24 @@
+# Owned by grafana-delivery-squad
+# Intended to be dropped into the base repo Ex: grafana/grafana
+name: Check for patch conflicts
+run-name: check-patch-conflicts-${{ github.base_ref }}-${{ github.head_ref }}
+on:
+  pull_request_target:
+    types:
+      - opened
+    branches:
+      - "main"
+      - "v*.*.*"
+      - "release-*"
+
+# Since this is run on a pull request, we want to apply the patches intended for the
+# target branch onto the source branch, to verify compatibility before merging.
+jobs:
+  trigger_downstream_patch_check:
+    uses: grafana/security-patch-actions/.github/workflows/test-patches.yml@main
+    with:
+      src_repo: "${{ github.repository }}"
+      src_ref: "${{ github.head_ref }}" # this is the source branch name, Ex: "feature/newthing"
+      patch_repo: "${{ github.repository }}-security-patches"
+      patch_ref: "${{ github.base_ref }}" # this is the target branch name, Ex: "main"
+    secrets: inherit
--- a/.github/workflows/remove-milestone.yml
+++ b/.github/workflows/remove-milestone.yml
@@ -11,9 +11,7 @@ on:
        description: Needs to match, exactly, the name of a milestone
        required: true
        type: string
-    secrets:
-      token:
-        required: true
+
 jobs:
  main:
    runs-on: ubuntu-latest
@@ -26,14 +24,20 @@ jobs:
          ref: main
      - name: Install Actions
        run: npm install --production --prefix ./actions
+      - name: "Generate token"
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        with:
+          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
+          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
      - name: Remove milestone from open issues (manually invoked)
        if: ${{ github.event.inputs.version != '' }}
        uses: ./actions/remove-milestone
        with:
-          token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+          token: ${{ steps.generate_token.outputs.token }}
      - name: Remove milestone from open issues (workflow invoked)
        if: ${{ inputs.version_call != '' }}
        uses: ./actions/remove-milestone
        with:
          version_call: ${{ inputs.version_call }}
-          token: ${{ secrets.token }}
+          token: ${{ steps.generate_token.outputs.token }}
--- a/.github/workflows/snyk.yml
+++ b/.github/workflows/snyk.yml
@@ -1,14 +0,0 @@
-name: Snyk Monitor Scanning
-on:
- release:
-   types: [published] 
- push:
-    branches:
-      - 'main' 
- workflow_dispatch:
-
-jobs:
-  snyk-scan-ci:
-    uses: 'grafana/security-github-actions/.github/workflows/snyk_monitor.yml@main'
-    secrets:
-      SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
--- a/.github/workflows/sync-mirror.yml
+++ b/.github/workflows/sync-mirror.yml
@@ -0,0 +1,25 @@
+# Owned by grafana-delivery-squad
+# Intended to be dropped into the base repo, Ex: grafana/grafana
+name: Sync to mirror
+run-name: sync-to-mirror-${{ github.ref_name }}
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "main"
+      - "v*.*.*"
+      - "release-*"
+
+# This is run after the pull request has been merged, so we'll run against the target branch
+jobs:
+  trigger_downstream_patch_mirror:
+    concurrency: patch-mirror-${{ github.ref_name }}
+    uses: grafana/security-patch-actions/.github/workflows/mirror-branch-and-apply-patches.yml@main
+    if: github.repository == 'grafana/grafana'
+    with:
+      ref: "${{ github.ref_name }}" # this is the target branch name, Ex: "main"
+      src_repo: "${{ github.repository }}"
+      dest_repo: "${{ github.repository }}-security-mirror"
+      patch_repo: "${{ github.repository }}-security-patches"
+    secrets: inherit
+
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -9,6 +9,12 @@ jobs:
  main:
    runs-on: ubuntu-latest
    steps:
+      - name: "Generate token"
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        with:
+          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
+          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
      - name: Checkout Actions
        uses: actions/checkout@v3
        with:
@@ -17,9 +23,8 @@ jobs:
          ref: main
      - name: Install Actions
        run: npm install --production --prefix ./actions
-      - name: Run update changelog (manually invoked)        
+      - name: Run update changelog (manually invoked)
        uses: ./actions/update-changelog
        with:
-          token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+          token: ${{ steps.generate_token.outputs.token }}
          metricsWriteAPIKey: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
-          grafanabotForumKey: ${{ secrets.GRAFANABOT_FORUM_KEY }}
--- a/.gitignore
+++ b/.gitignore
@@ -96,8 +96,6 @@ profile.cov
 /pkg/cmd/grafana-server/grafana-server
 /pkg/cmd/grafana-server/debug
 /pkg/extensions/*
-/pkg/build/cmd/artifactspage.go
-/pkg/build/cmd/artifactspage.tmpl.html
 /pkg/server/wireexts_enterprise.go
 /pkg/cmd/grafana-cli/runner/wireexts_enterprise.go
 !/pkg/extensions/main.go
@@ -185,9 +183,9 @@ public/locales/_build/
 public/locales/*/*.js
 public/locales/*/grafana_old.json

-# Auto-generated swagger intermediate file
-public/api-spec.json
-
 deployment_tools_config.json

 .betterer.cache
+
+# Temporary file for backporting PRs
+.pr-body.txt
--- a/.golangci.toml
+++ b/.golangci.toml
@@ -20,9 +20,6 @@ packages = ["io/ioutil"]
 [[linters-settings.depguard.packages-with-error-message]]
 "io/ioutil" = "Deprecated: As of Go 1.16, the same functionality is now provided by package io or package os, and those implementations should be preferred in new code. See the specific function documentation for details."
 "gopkg.in/yaml.v2" = "Grafana packages are not allowed to depend on gopkg.in/yaml.v2 as gopkg.in/yaml.v3 is now available"
-"github.com/pkg/errors" = "Deprecated: Go 1.13 supports the functionality provided by pkg/errors in the standard library."
-"github.com/xorcare/pointer" = "Use pkg/util.Pointer instead, which is a generic one-liner alternative"
-"github.com/gofrs/uuid" = "Use github.com/google/uuid instead, which we already depend on."

 [linters-settings.gocritic]
 enabled-checks = ["ruleguard"]
--- a/.pa11yci-pr.conf.js
+++ b/.pa11yci-pr.conf.js
@@ -107,7 +107,7 @@ var config = {
      url: '${HOST}/datasources',
      wait: 500,
      rootElement: '.main-view',
-      threshold: 3,
+      threshold: 1,
    },
    {
      url: '${HOST}/org/users',
@@ -125,7 +125,7 @@ var config = {
      url: '${HOST}/plugins',
      wait: 500,
      rootElement: '.main-view',
-      threshold: 3,
+      threshold: 1,
    },
    {
      url: '${HOST}/org',
--- a/.prettierignore
+++ b/.prettierignore
@@ -27,6 +27,7 @@ theme.light.generated.json
 theme.dark.generated.json

 # Generated Swagger API specs
+public/api-spec.json
 public/api-merged.json
 public/openapi3.json

--- a/.yarn/cache/rst2html-https-e87da7ea2f-63d5ff3068.zip
+++ b/.yarn/cache/rst2html-https-e87da7ea2f-63d5ff3068.zip
--- a/.yarn/releases/yarn-3.3.0.cjs
+++ b/.yarn/releases/yarn-3.3.0.cjs
--- a/.yarn/releases/yarn-3.4.1.cjs
+++ b/.yarn/releases/yarn-3.4.1.cjs
--- a/.yarn/sdks/eslint/package.json
+++ b/.yarn/sdks/eslint/package.json
@@ -1,6 +1,6 @@
 {
  "name": "eslint",
-  "version": "8.34.0-sdk",
+  "version": "8.32.0-sdk",
  "main": "./lib/api.js",
  "type": "commonjs"
 }
--- a/.yarn/sdks/integrations.yml
+++ b/.yarn/sdks/integrations.yml
@@ -2,5 +2,5 @@
 # Manual changes might be lost!

 integrations:
-  - vscode
  - vim
+  - vscode
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -3,33 +3,33 @@ enableTelemetry: false
 nodeLinker: pnp

 packageExtensions:
-  '@storybook/addon-docs@6.5.16':
+  '@storybook/addon-docs@6.5.12':
    peerDependencies:
      '@babel/core': ^7.0.0
-      '@storybook/manager-webpack5': 6.5.16
+      '@storybook/manager-webpack5': 6.5.12
      'webpack': 5.74.0
-  '@storybook/addon-essentials@6.5.16':
+  '@storybook/addon-essentials@6.5.12':
    peerDependencies:
-      '@storybook/components': 6.5.16
-      '@storybook/core-events': 6.5.16
-      '@storybook/manager-webpack5': 6.5.16
-      '@storybook/theming': 6.5.16
-  '@storybook/core-server@6.5.16':
+      '@storybook/components': 6.5.12
+      '@storybook/core-events': 6.5.12
+      '@storybook/manager-webpack5': 6.5.12
+      '@storybook/theming': 6.5.12
+  '@storybook/core-server@6.5.12':
    peerDependencies:
      '@babel/core': ^7.0.0
-  '@storybook/core@6.5.16':
+  '@storybook/core@6.5.12':
    peerDependencies:
      '@babel/core': ^7.0.0
-      '@storybook/manager-webpack5': 6.5.16
-  '@storybook/csf-tools@6.5.16':
+      '@storybook/manager-webpack5': 6.5.12
+  '@storybook/csf-tools@6.5.12':
    peerDependencies:
      '@babel/core': ^7.0.0
  '@storybook/mdx2-csf@0.0.3':
    dependencies:
      '@babel/types': ^7.14.8
-  '@storybook/react@6.5.16':
+  '@storybook/react@6.5.12':
    peerDependencies:
-      '@storybook/manager-webpack5': 6.5.16
+      '@storybook/manager-webpack5': 6.5.12
  doctrine@3.0.0:
    dependencies:
      assert: 2.0.0
@@ -59,7 +59,7 @@ plugins:
  - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
    spec: 'https://mskelton.dev/yarn-outdated/v2'

-yarnPath: .yarn/releases/yarn-3.4.1.cjs
+yarnPath: .yarn/releases/yarn-3.3.0.cjs
 # Uncomment the following lines if you want to use Verdaccio local npm registry. Read more at packages/README.md
 # npmScopes:
 #   grafana:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,273 +1,59 @@
-<!-- 9.5.1 START -->
+<!-- 9.4.13 START -->

-# 9.5.1 (2023-04-26)
-
-### Features and enhancements
-
- **Chore:** Upgrade Go to 1.20.3. [#66831](https://github.com/grafana/grafana/issues/66831), [@sakjur](https://github.com/sakjur)
-
-<!-- 9.5.1 END -->
-<!-- 9.5.0 START -->
-
-# 9.5.0 (2023-04-04)
-
-### Features and enhancements
-
- **API keys:** Add deprecation to api keys. [#65948](https://github.com/grafana/grafana/pull/65948), [@eleijonmarck](https://github.com/eleijonmarck)
- **API:** Enable serving Swagger UI by default and add docs and guidelines. [#63489](https://github.com/grafana/grafana/pull/63489), [@papagian](https://github.com/papagian)
- **API:** Permit Cache-Control (browser caching) for datasource resources. [#62033](https://github.com/grafana/grafana/pull/62033), [@kylebrandt](https://github.com/kylebrandt)
- **Accessibility:** Make row actions keyboard accessible. [#63367](https://github.com/grafana/grafana/pull/63367), [@ashharrison90](https://github.com/ashharrison90)
- **Admin/Plugins:** Set category filter in connections link. [#64393](https://github.com/grafana/grafana/pull/64393), [@mikkancso](https://github.com/mikkancso)
- **Alerting:** Add CustomDetails field in PagerDuty contact point. [#64860](https://github.com/grafana/grafana/pull/64860), [@santihernandezc](https://github.com/santihernandezc)
- **Alerting:** Add dashboard and panel links to rule and instance annotations. [#63243](https://github.com/grafana/grafana/pull/63243), [@konrad147](https://github.com/konrad147)
- **Alerting:** Add filter and remove funcs for custom labels and annotations. [#63437](https://github.com/grafana/grafana/pull/63437), [@grobinson-grafana](https://github.com/grobinson-grafana)
- **Alerting:** Add fuzzy search to alert list view. [#63931](https://github.com/grafana/grafana/pull/63931), [@konrad147](https://github.com/konrad147)
- **Alerting:** Add metrics for active receiver and integrations. [#64050](https://github.com/grafana/grafana/pull/64050), [@gotjosh](https://github.com/gotjosh)
- **Alerting:** Better printing of labels. [#63348](https://github.com/grafana/grafana/pull/63348), [@grobinson-grafana](https://github.com/grobinson-grafana)
- **Alerting:** Create new state history "fanout" backend that dispatches to multiple other backends at once. [#64774](https://github.com/grafana/grafana/pull/64774), [@alexweav](https://github.com/alexweav)
- **Alerting:** Enable preview for recording rules. [#63260](https://github.com/grafana/grafana/pull/63260), [@VikaCep](https://github.com/VikaCep)
- **Alerting:** Fetch all applied alerting configurations. [#65728](https://github.com/grafana/grafana/pull/65728), [@santihernandezc](https://github.com/santihernandezc)
- **Alerting:** Introduce proper feature toggles for common state history backend combinations. [#65497](https://github.com/grafana/grafana/pull/65497), [@alexweav](https://github.com/alexweav)
- **Alerting:** Make time range query parameters not required when querying Loki. [#62985](https://github.com/grafana/grafana/pull/62985), [@alexweav](https://github.com/alexweav)
- **Alerting:** New notification policies view. [#61952](https://github.com/grafana/grafana/pull/61952), [@gillesdemey](https://github.com/gillesdemey)
- **Alerting:** No longer index state history log streams by instance labels. [#65474](https://github.com/grafana/grafana/pull/65474), [@alexweav](https://github.com/alexweav)
- **Alerting:** Respect "For" Duration for NoData alerts. [#65574](https://github.com/grafana/grafana/pull/65574), [@JacobsonMT](https://github.com/JacobsonMT)
- **Alerting:** Support filtering rules by multiple datasources. [#64355](https://github.com/grafana/grafana/pull/64355), [@VikaCep](https://github.com/VikaCep)
- **Alerting:** Switch to snappy-compressed-protobuf for outgoing push requests to Loki. [#65077](https://github.com/grafana/grafana/pull/65077), [@alexweav](https://github.com/alexweav)
- **Angular:** Prevent angular from loading when disabled. [#65755](https://github.com/grafana/grafana/pull/65755), [@torkelo](https://github.com/torkelo)
- **Auth:** Add Generic oauth skip org role sync setting. [#62418](https://github.com/grafana/grafana/pull/62418), [@eleijonmarck](https://github.com/eleijonmarck)
- **Auth:** Add feature flag to move token rotation to client. [#65060](https://github.com/grafana/grafana/pull/65060), [@kalleep](https://github.com/kalleep)
- **Auth:** Show user sync external Authentication status. [#62721](https://github.com/grafana/grafana/pull/62721), [@lokeswaran-aj](https://github.com/lokeswaran-aj)
- **Backend:** Use sdk version 0.148.0. [#62822](https://github.com/grafana/grafana/pull/62822), [@kylebrandt](https://github.com/kylebrandt)
- **Chore:** Add stat for remote cache config. [#64276](https://github.com/grafana/grafana/pull/64276), [@DanCech](https://github.com/DanCech)
- **Chore:** Replace short UID generation with more standard UUIDs. [#62731](https://github.com/grafana/grafana/pull/62731), [@ryantxu](https://github.com/ryantxu)
- **Chore:** Use DOMPurify to sanitize strings rather than js-xss. [#62787](https://github.com/grafana/grafana/pull/62787), [@KristianGrafana](https://github.com/KristianGrafana)
- **CloudMonitoring:** Add possibility to use path for private key. [#65252](https://github.com/grafana/grafana/pull/65252), [@zoltanbedi](https://github.com/zoltanbedi)
- **CloudWatch Logs:** Update default timeout to 30m. [#63155](https://github.com/grafana/grafana/pull/63155), [@ashnove](https://github.com/ashnove)
- **CloudWatch:** Add AWS/IotSiteWise namespace and metrics. [#63534](https://github.com/grafana/grafana/pull/63534), [@iwysiu](https://github.com/iwysiu)
- **CloudWatch:** Add account support to variable queries. [#63822](https://github.com/grafana/grafana/pull/63822), [@iwysiu](https://github.com/iwysiu)
- **CloudWatch:** Make deeplinks work for us-gov and china regions. [#64080](https://github.com/grafana/grafana/pull/64080), [@iwysiu](https://github.com/iwysiu)
- **Cloudwatch:** Add MeteredIOBytes metric for EFS. [#64793](https://github.com/grafana/grafana/pull/64793), [@xlagg5](https://github.com/xlagg5)
- **Command Palette:** Display dashboard location. [#63807](https://github.com/grafana/grafana/pull/63807), [@ashharrison90](https://github.com/ashharrison90)
- **Command palette:** Enable folder searching. [#62663](https://github.com/grafana/grafana/pull/62663), [@ashharrison90](https://github.com/ashharrison90)
- **Connections:** Turn on feature toggle by default. [#64885](https://github.com/grafana/grafana/pull/64885), [@mikkancso](https://github.com/mikkancso)
- **Cookies:** Provide a mechanism for per user control over cookies. [#61566](https://github.com/grafana/grafana/pull/61566), [@sakjur](https://github.com/sakjur)
- **Dashboard Datasource:** Update Query List & Improve UX. [#64429](https://github.com/grafana/grafana/pull/64429), [@codeincarnate](https://github.com/codeincarnate)
- **Dashboard:** Add a feature that creates a table panel when a spreadsheet file is dropped on the dashboard. [#62688](https://github.com/grafana/grafana/pull/62688), [@oscarkilhed](https://github.com/oscarkilhed)
- **Dashboard:** Add new visualization/row/library panel/pasted panel is now a dropdown menu. [#65361](https://github.com/grafana/grafana/pull/65361), [@polibb](https://github.com/polibb)
- **Dashboard:** Add value format for requests per minute. [#62258](https://github.com/grafana/grafana/pull/62258), [@dwradcliffe](https://github.com/dwradcliffe)
- **Dashboard:** Empty/No Panels dashboard with a new design. [#65161](https://github.com/grafana/grafana/pull/65161), [@polibb](https://github.com/polibb)
- **Dashboard:** When dashboard is not found show message instead of empty page. [#65508](https://github.com/grafana/grafana/pull/65508), [@polibb](https://github.com/polibb)
- **Dashboards:** Enable feature flag `newPanelChromeUI` by default. [#65593](https://github.com/grafana/grafana/pull/65593), [@axelavargas](https://github.com/axelavargas)
- **Dataplane:** Support timeSeriesLong without transform. [#62732](https://github.com/grafana/grafana/pull/62732), [@bohandley](https://github.com/bohandley)
- **Datasources:** Add user_agent header customization for outgoing HTTP requests. [#63769](https://github.com/grafana/grafana/pull/63769), [@zhichli](https://github.com/zhichli)
- **Datasources:** Use getDefaultQuery in annotations editors. [#61870](https://github.com/grafana/grafana/pull/61870), [@idastambuk](https://github.com/idastambuk)
- **Docs:** Add documentation on how to debug backend plugins. [#64814](https://github.com/grafana/grafana/pull/64814), [@xnyo](https://github.com/xnyo)
- **Docs:** Deprecate dashboard previews. [#65698](https://github.com/grafana/grafana/pull/65698), [@ArturWierzbicki](https://github.com/ArturWierzbicki)
- **Elasticsearch:** Detect Elasticsearch version. [#63341](https://github.com/grafana/grafana/pull/63341), [@gabor](https://github.com/gabor)
- **Elasticsearch:** Run Explore queries trough data source backend. [#65339](https://github.com/grafana/grafana/pull/65339), [@ivanahuckova](https://github.com/ivanahuckova)
- **Explore:** Add range option to internal data links. [#64063](https://github.com/grafana/grafana/pull/64063), [@connorlindsey](https://github.com/connorlindsey)
- **Explore:** Add transformations to correlation data links. [#61799](https://github.com/grafana/grafana/pull/61799), [@gelicia](https://github.com/gelicia)
- **Explore:** Support mixed data sources for supplementary query. [#63036](https://github.com/grafana/grafana/pull/63036), [@ifrost](https://github.com/ifrost)
- **Extensions:** Expose an enum for available placements. [#64586](https://github.com/grafana/grafana/pull/64586), [@leventebalogh](https://github.com/leventebalogh)
- **Feat:** Changing link destination for get more plugins. [#63517](https://github.com/grafana/grafana/pull/63517), [@tolzhabayev](https://github.com/tolzhabayev)
- **Feat:** Linking to plugin details page rather than externally for new datasources. [#63499](https://github.com/grafana/grafana/pull/63499), [@tolzhabayev](https://github.com/tolzhabayev)
- **FieldMatchers:** Add match by value (reducer). [#64477](https://github.com/grafana/grafana/pull/64477), [@leeoniya](https://github.com/leeoniya)
- **Flame graph:** Add context menu. [#62705](https://github.com/grafana/grafana/pull/62705), [@joey-grafana](https://github.com/joey-grafana)
- **Flame graph:** Add metadata above flame graph. [#61921](https://github.com/grafana/grafana/pull/61921), [@joey-grafana](https://github.com/joey-grafana)
- **Geomap:** Improve tooltip url for photos layer. [#63487](https://github.com/grafana/grafana/pull/63487), [@adela-almasan](https://github.com/adela-almasan)
- **Geomap:** Release night / day layer. [#63435](https://github.com/grafana/grafana/pull/63435), [@adela-almasan](https://github.com/adela-almasan)
- **InfluxDB:** Move database information into jsondata. [#62308](https://github.com/grafana/grafana/pull/62308), [@itsmylife](https://github.com/itsmylife)
- **Jaeger and Zipkin:** Config & docs upgrade. [#64250](https://github.com/grafana/grafana/pull/64250), [@joey-grafana](https://github.com/joey-grafana)
- **LDAP:** Allow setting minimum TLS version and accepted ciphers. [#63646](https://github.com/grafana/grafana/pull/63646), [@Jguer](https://github.com/Jguer)
- **Licensing:** Allow server admin user to log in even if the active user limit is reached. (Enterprise)
- **Live:** Remove (alpha) ability to configure live pipelines. [#65138](https://github.com/grafana/grafana/pull/65138), [@ryantxu](https://github.com/ryantxu)
- **Logger:** Add feature toggle for errors in HTTP request logs. [#64425](https://github.com/grafana/grafana/pull/64425), [@sakjur](https://github.com/sakjur)
- **Login:** Allow custom name and icon for social providers. [#63297](https://github.com/grafana/grafana/pull/63297), [@jkroepke](https://github.com/jkroepke)
- **Logs Panel:** Refactor style generation to improve rendering performance. [#62599](https://github.com/grafana/grafana/pull/62599), [@matyax](https://github.com/matyax)
- **Logs:** Add millisecond to timestamp in log line. [#64372](https://github.com/grafana/grafana/pull/64372), [@svennergr](https://github.com/svennergr)
- **Logs:** Rename dedup to deduplicate. [#62944](https://github.com/grafana/grafana/pull/62944), [@gwdawson](https://github.com/gwdawson)
- **Loki Query Editor:** Make Monaco the default editor. [#62247](https://github.com/grafana/grafana/pull/62247), [@matyax](https://github.com/matyax)
- **Loki:** Add `unpack` query builder hint. [#65608](https://github.com/grafana/grafana/pull/65608), [@svennergr](https://github.com/svennergr)
- **Loki:** Add descriptions to query builder operations. [#64046](https://github.com/grafana/grafana/pull/64046), [@gwdawson](https://github.com/gwdawson)
- **Loki:** Add placeholder to the loki query editor. [#62773](https://github.com/grafana/grafana/pull/62773), [@gwdawson](https://github.com/gwdawson)
- **Loki:** Always fetch for new label keys in the QueryBuilder. [#64597](https://github.com/grafana/grafana/pull/64597), [@svennergr](https://github.com/svennergr)
- **Loki:** Display error with label filter conflicts. [#63109](https://github.com/grafana/grafana/pull/63109), [@gwdawson](https://github.com/gwdawson)
- **Loki:** Improve the display of loki query stats. [#63623](https://github.com/grafana/grafana/pull/63623), [@gwdawson](https://github.com/gwdawson)
- **MSSQL/Postgres:** List views in table dropdown as well. [#62867](https://github.com/grafana/grafana/pull/62867), [@zoltanbedi](https://github.com/zoltanbedi)
- **MSSQL:** Update forked go-mssqldb dependency. [#65658](https://github.com/grafana/grafana/pull/65658), [@stephaniehingtgen](https://github.com/stephaniehingtgen)
- **Metrics:** Update comment to mention folders instead of dashboards. [#63312](https://github.com/grafana/grafana/pull/63312), [@monteiro-renato](https://github.com/monteiro-renato)
- **Navigation:** Enable new navigation by default. [#65335](https://github.com/grafana/grafana/pull/65335), [@ashharrison90](https://github.com/ashharrison90)
- **NodeGraph:** Support icons for nodes. [#60989](https://github.com/grafana/grafana/pull/60989), [@aocenas](https://github.com/aocenas)
- **Notifications:** Enable display of trace ID by default. [#64884](https://github.com/grafana/grafana/pull/64884), [@ashharrison90](https://github.com/ashharrison90)
- **Packaging:** Start Grafana service after InfluxDB. [#64090](https://github.com/grafana/grafana/pull/64090), [@MichaIng](https://github.com/MichaIng)
- **Panel Header:** Add CancelQuery option to panel header. [#64796](https://github.com/grafana/grafana/pull/64796), [@axelavargas](https://github.com/axelavargas)
- **Panel:** Show multiple errors info in the inspector. [#64340](https://github.com/grafana/grafana/pull/64340), [@andresmgot](https://github.com/andresmgot)
- **PanelChrome:** Add option to show actions on the right side (actions = leftItems). [#65762](https://github.com/grafana/grafana/pull/65762), [@torkelo](https://github.com/torkelo)
- **Phlare:** Allow variables in labelSelector (in query). [#64324](https://github.com/grafana/grafana/pull/64324), [@joey-grafana](https://github.com/joey-grafana)
- **Plugin:** Skip preloading disabled app plugins. [#63083](https://github.com/grafana/grafana/pull/63083), [@mckn](https://github.com/mckn)
- **Plugins:** Add optional logger for plugin requests sent to backend plugins. [#62981](https://github.com/grafana/grafana/pull/62981), [@bergquist](https://github.com/bergquist)
- **Plugins:** Extend panel menu with commands from plugins. [#63802](https://github.com/grafana/grafana/pull/63802), [@mckn](https://github.com/mckn)
- **Plugins:** Extend panel menu with links from plugins. [#63089](https://github.com/grafana/grafana/pull/63089), [@jackw](https://github.com/jackw)
- **Plugins:** Improve instrumentation by adding metrics and tracing. [#61035](https://github.com/grafana/grafana/pull/61035), [@xnyo](https://github.com/xnyo)
- **Plugins:** Support for distributed tracing in backend plugins SDK. [#63714](https://github.com/grafana/grafana/pull/63714), [@xnyo](https://github.com/xnyo)
- **Plugins:** Support for link extensions. [#61663](https://github.com/grafana/grafana/pull/61663), [@mckn](https://github.com/mckn)
- **Profiling:** Enable flame graph & Phlare/Parca data sources for all users. [#63488](https://github.com/grafana/grafana/pull/63488), [@joey-grafana](https://github.com/joey-grafana)
- **Prometheus Datasource:** Improve Prom query variable editor. [#58292](https://github.com/grafana/grafana/pull/58292), [@bohandley](https://github.com/bohandley)
- **Prometheus Metrics:** Add missing stat_total_teams metric. [#65133](https://github.com/grafana/grafana/pull/65133), [@gamab](https://github.com/gamab)
- **Prometheus/Loki:** Run query explicitly instead of onblur in panel edit. [#64815](https://github.com/grafana/grafana/pull/64815), [@torkelo](https://github.com/torkelo)
- **Prometheus:** Browser resource caching. [#60711](https://github.com/grafana/grafana/pull/60711), [@gtk-grafana](https://github.com/gtk-grafana)
- **Prometheus:** Improve prometheus query variable editor. [#63529](https://github.com/grafana/grafana/pull/63529), [@bohandley](https://github.com/bohandley)
- **Prometheus:** Use $\_\_rate_interval for rate queries generated by metric browser. [#65386](https://github.com/grafana/grafana/pull/65386), [@ivanahuckova](https://github.com/ivanahuckova)
- **Pubdash:** Email sharing handle dashboard deleted. [#64247](https://github.com/grafana/grafana/pull/64247), [@owensmallwood](https://github.com/owensmallwood)
- **Pubdash:** Email sharing handle dashboard deleted. (Enterprise)
- **PublicDashboards:** Backfills share column with default value. [#63407](https://github.com/grafana/grafana/pull/63407), [@owensmallwood](https://github.com/owensmallwood)
- **PublicDashboards:** Configuration modal redesign. [#63211](https://github.com/grafana/grafana/pull/63211), [@juanicabanas](https://github.com/juanicabanas)
- **PublicDashboards:** Email sharing. [#63762](https://github.com/grafana/grafana/pull/63762), [@juanicabanas](https://github.com/juanicabanas)
- **PublicDashboards:** Email sharing. (Enterprise)
- **PublicDashboards:** Enable creation when dashboard has template variables. [#64560](https://github.com/grafana/grafana/pull/64560), [@juanicabanas](https://github.com/juanicabanas)
- **PublicDashboards:** Paused or deleted public dashboard screen. [#63970](https://github.com/grafana/grafana/pull/63970), [@juanicabanas](https://github.com/juanicabanas)
- **PublicDashboards:** Viewer can request and claim magic link. (Enterprise)
- **QueryHistory:** Improve handling of mixed datasource entries. [#62214](https://github.com/grafana/grafana/pull/62214), [@Elfo404](https://github.com/Elfo404)
- **Rendering:** Experimental support to use JWTs as auth method. [#60841](https://github.com/grafana/grafana/pull/60841), [@joanlopez](https://github.com/joanlopez)
- **Reports:** Improve the UI for the new navigation. (Enterprise)
- **SQL Datasources:** Add back help content. [#65383](https://github.com/grafana/grafana/pull/65383), [@zoltanbedi](https://github.com/zoltanbedi)
- **Schema:** Remove exclusion for timeseries and update imports. [#65242](https://github.com/grafana/grafana/pull/65242), [@ryantxu](https://github.com/ryantxu)
- **Search:** Improvements for starred dashboard search. [#64758](https://github.com/grafana/grafana/pull/64758), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
- **Select:** Show icon in the grafana/ui Select component. [#63827](https://github.com/grafana/grafana/pull/63827), [@ryantxu](https://github.com/ryantxu)
- **Service accounts:** Creation logic simplification. [#63884](https://github.com/grafana/grafana/pull/63884), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
- **Service accounts:** Remove Add API keys buttons and remove one state of migrating for API keys tab. [#63411](https://github.com/grafana/grafana/pull/63411), [@eleijonmarck](https://github.com/eleijonmarck)
- **SplitOpen:** Update API to accept multiple queries. [#62245](https://github.com/grafana/grafana/pull/62245), [@ivanahuckova](https://github.com/ivanahuckova)
- **Stat Panel:** Add an option for a non-gradient/solid background. [#65052](https://github.com/grafana/grafana/pull/65052), [@baldm0mma](https://github.com/baldm0mma)
- **Stat:** Add ability to remove default single-color background gradient. [#64353](https://github.com/grafana/grafana/pull/64353), [@baldm0mma](https://github.com/baldm0mma)
- **SupportBundles:** Add OAuth bundle collectors. [#64810](https://github.com/grafana/grafana/pull/64810), [@Jguer](https://github.com/Jguer)
- **Table Panel:** Add ability to use text color for value or hide value in gauge cell. [#61477](https://github.com/grafana/grafana/pull/61477), [@torkelo](https://github.com/torkelo)
- **Table:** Introduce sparkline cell type. [#63182](https://github.com/grafana/grafana/pull/63182), [@domasx2](https://github.com/domasx2)
- **Tempo:** Config and doc updates. [#64017](https://github.com/grafana/grafana/pull/64017), [@joey-grafana](https://github.com/joey-grafana)
- **Tempo:** Update service graph view and docs. [#64875](https://github.com/grafana/grafana/pull/64875), [@joey-grafana](https://github.com/joey-grafana)
- **TraceView:** Add key and url escaping of json tag values. [#64331](https://github.com/grafana/grafana/pull/64331), [@aocenas](https://github.com/aocenas)
- **TraceView:** Reworked header. [#63105](https://github.com/grafana/grafana/pull/63105), [@joey-grafana](https://github.com/joey-grafana)
- **Tracing:** Add more detail to HTTP Outgoing Request. [#64757](https://github.com/grafana/grafana/pull/64757), [@bboreham](https://github.com/bboreham)
- **Tracing:** Docs and config improvements for Tempo/Jaeger/Zipkin. [#65255](https://github.com/grafana/grafana/pull/65255), [@joey-grafana](https://github.com/joey-grafana)
- **Tracing:** Support multiple OTel propagators. [#61199](https://github.com/grafana/grafana/pull/61199), [@hairyhenderson](https://github.com/hairyhenderson)
- **Transformations:** Support time format when converting time to strings. [#63826](https://github.com/grafana/grafana/pull/63826), [@ryantxu](https://github.com/ryantxu)
- **Transformers:** Support adding the row index using calculate field transformer. [#65148](https://github.com/grafana/grafana/pull/65148), [@ryantxu](https://github.com/ryantxu)
- **Units:** Format currency with negative before the symbol. [#65152](https://github.com/grafana/grafana/pull/65152), [@ryantxu](https://github.com/ryantxu)
+# 9.4.13 (2023-06-22)

 ### Bug fixes

- **API:** Fix "Updated by" Column in dashboard versions table. [#65351](https://github.com/grafana/grafana/pull/65351), [@papagian](https://github.com/papagian)
- **AccessControl:** Allow editors to access GET /api/datasources. [#66343](https://github.com/grafana/grafana/pull/66343), [@mgyongyosi](https://github.com/mgyongyosi)
- **Alerting:** Add "backend" label to state history writes metrics. [#65395](https://github.com/grafana/grafana/pull/65395), [@alexweav](https://github.com/alexweav)
- **Alerting:** Add alert instance labels to Loki log lines in addition to stream labels. [#65403](https://github.com/grafana/grafana/pull/65403), [@alexweav](https://github.com/alexweav)
- **Alerting:** Elide requests to Loki if nothing should be recorded. [#65011](https://github.com/grafana/grafana/pull/65011), [@alexweav](https://github.com/alexweav)
- **Alerting:** Fix DatasourceUID and RefID missing for DatasourceNoData alerts. [#66733](https://github.com/grafana/grafana/pull/66733), [@grobinson-grafana](https://github.com/grobinson-grafana)
- **Alerting:** Fix ambiguous handling of equals in labels when bucketing Loki state history streams. [#65013](https://github.com/grafana/grafana/pull/65013), [@alexweav](https://github.com/alexweav)
- **Alerting:** Fix attachment of external labels to Loki state history log streams. [#65140](https://github.com/grafana/grafana/pull/65140), [@alexweav](https://github.com/alexweav)
- **Alerting:** Fix creating a recording rule when having multiple datasources. [#66415](https://github.com/grafana/grafana/pull/66415), [@VikaCep](https://github.com/VikaCep)
- **Alerting:** Fix explore link in alert detail view. [#66106](https://github.com/grafana/grafana/pull/66106), [@gillesdemey](https://github.com/gillesdemey)
- **Alerting:** Fix share URL for Prometheus rules on subpath. [#66752](https://github.com/grafana/grafana/pull/66752), [@gillesdemey](https://github.com/gillesdemey)
- **Alerting:** Fix stats that display alert count when using unified alerting. [#64852](https://github.com/grafana/grafana/pull/64852), [@gotjosh](https://github.com/gotjosh)
- **Alerting:** Hide mute timing actions when dealing with vanilla prometheus. [#66457](https://github.com/grafana/grafana/pull/66457), [@gillesdemey](https://github.com/gillesdemey)
- **Alerting:** Paginate result previews. [#65257](https://github.com/grafana/grafana/pull/65257), [@gillesdemey](https://github.com/gillesdemey)
- **Alerting:** Prometheus-compatible Alertmanager timings editor. [#64526](https://github.com/grafana/grafana/pull/64526), [@konrad147](https://github.com/konrad147)
- **Alerting:** Update scheduler to get updates only from database. [#64635](https://github.com/grafana/grafana/pull/64635), [@yuri-tceretian](https://github.com/yuri-tceretian)
- **Alerting:** Use a completely isolated context for state history writes. [#64989](https://github.com/grafana/grafana/pull/64989), [@alexweav](https://github.com/alexweav)
- **Alerting:** Use displayNameFromDS if available in preview. [#65342](https://github.com/grafana/grafana/pull/65342), [@gillesdemey](https://github.com/gillesdemey)
- **Annotation List:** Fix panel not updating when variable is changed. [#65899](https://github.com/grafana/grafana/pull/65899), [@JoaoSilvaGrafana](https://github.com/JoaoSilvaGrafana)
- **Annotations:** Ignore unique constraint violations for tags. [#65935](https://github.com/grafana/grafana/pull/65935), [@sakjur](https://github.com/sakjur)
- **Auth:** Fix orgrole picker disabled if isSynced user. [#64033](https://github.com/grafana/grafana/pull/64033), [@eleijonmarck](https://github.com/eleijonmarck)
- **AzureMonitor:** Fix Log Analytics portal links. [#65482](https://github.com/grafana/grafana/pull/65482), [@aangelisc](https://github.com/aangelisc)
- **BrowseDashboards:** Fix move to General folder not working. [#65653](https://github.com/grafana/grafana/pull/65653), [@joshhunt](https://github.com/joshhunt)
- **Catalog:** Show install error with incompatible version. [#65059](https://github.com/grafana/grafana/pull/65059), [@andresmgot](https://github.com/andresmgot)
- **Chore:** Update Grafana to use Alertmanager v0.25.1-0.20230308154952-78fedf89728b. [#64778](https://github.com/grafana/grafana/pull/64778), [@yuri-tceretian](https://github.com/yuri-tceretian)
- **CloudMonitoring:** Add project selector for MQL editor[fix]. [#65567](https://github.com/grafana/grafana/pull/65567), [@alyssabull](https://github.com/alyssabull)
- **CloudWatch Logs:** Fix running logs queries with expressions. [#65306](https://github.com/grafana/grafana/pull/65306), [@iwysiu](https://github.com/iwysiu)
- **CloudWatch Logs:** Fix to make log queries use a relative time if available. [#65236](https://github.com/grafana/grafana/pull/65236), [@kevinwcyu](https://github.com/kevinwcyu)
- **CloudWatch Logs:** Revert "Queries in an expression should run synchronously (#64443)". [#65036](https://github.com/grafana/grafana/pull/65036), [@fridgepoet](https://github.com/fridgepoet)
- **CloudWatch:** Fix cachedQueries insights not being updated for metric queries. [#65495](https://github.com/grafana/grafana/pull/65495), [@kevinwcyu](https://github.com/kevinwcyu)
- **Cloudwatch:** Pass refId from query for expression queries. [#66147](https://github.com/grafana/grafana/pull/66147), [@idastambuk](https://github.com/idastambuk)
- **Dashboards:** Evaluate provisioned dashboard titles in a backwards compatible way. [#65184](https://github.com/grafana/grafana/pull/65184), [@sakjur](https://github.com/sakjur)
- **Dashboards:** Fix Mobile support dashboard issues on new iOS 16.3. [#65542](https://github.com/grafana/grafana/pull/65542), [@axelavargas](https://github.com/axelavargas)
- **Dashboards:** Fix broken internal data links. [#66567](https://github.com/grafana/grafana/pull/66567), [@ifrost](https://github.com/ifrost)
- **Database:** Don't sleep 10ms before every request. [#64832](https://github.com/grafana/grafana/pull/64832), [@bboreham](https://github.com/bboreham)
- **Elasticsearch:** Fix processing of response with multiple group by for alerting. [#65165](https://github.com/grafana/grafana/pull/65165), [@ivanahuckova](https://github.com/ivanahuckova)
- **Elasticsearch:** Handle multiple annotation structures. [#66762](https://github.com/grafana/grafana/pull/66762), [@gabor](https://github.com/gabor)
- **Email:** Mark HTML comments as "safe" in email templates. [#64546](https://github.com/grafana/grafana/pull/64546), [@gillesdemey](https://github.com/gillesdemey)
- **Emails:** Preserve HTML comments. (Enterprise)
- **ErrorHandling:** Fixes issues with bad error messages. [#63775](https://github.com/grafana/grafana/pull/63775), [@torkelo](https://github.com/torkelo)
- **ErrorView:** Better detection of no-data responses. [#65477](https://github.com/grafana/grafana/pull/65477), [@leeoniya](https://github.com/leeoniya)
- **Explore:** Make `DataSourcePicker` visible on small screens. [#65149](https://github.com/grafana/grafana/pull/65149), [@abdulhdr1](https://github.com/abdulhdr1)
- **Fix:** DataLinks from data sources override user defined data link. [#65996](https://github.com/grafana/grafana/pull/65996), [@axelavargas](https://github.com/axelavargas)
- **Fix:** Top table rendering and update docs. [#64497](https://github.com/grafana/grafana/pull/64497), [@joey-grafana](https://github.com/joey-grafana)
- **Frontend:** Fix broken links in /plugins when pathname has a trailing slash. [#64348](https://github.com/grafana/grafana/pull/64348), [@gassiss](https://github.com/gassiss)
- **Geomap:** Fix route layer zoom behavior. [#63409](https://github.com/grafana/grafana/pull/63409), [@drew08t](https://github.com/drew08t)
- **Google Cloud Monitoring:** Fix project variable. [#66524](https://github.com/grafana/grafana/pull/66524), [@asimpson](https://github.com/asimpson)
- **HeatMap:** Sort y buckets when all bucket names are numeric. [#65322](https://github.com/grafana/grafana/pull/65322), [@leeoniya](https://github.com/leeoniya)
- **InfluxDB:** Fix querying with hardcoded retention policy. [#66466](https://github.com/grafana/grafana/pull/66466), [@itsmylife](https://github.com/itsmylife)
- **InfluxDB:** Fix sending retention policy with InfluxQL queries. [#63820](https://github.com/grafana/grafana/pull/63820), [@itsmylife](https://github.com/itsmylife)
- **KVStore:** Include database field in migration. [#62790](https://github.com/grafana/grafana/pull/62790), [@zoltanbedi](https://github.com/zoltanbedi)
- **LDAP:** Always synchronize Server Admin role through role sync if role sync is enabled. [#58820](https://github.com/grafana/grafana/pull/58820), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
- **Library panels:** Ensure pagination controls are always correctly displayed. [#65283](https://github.com/grafana/grafana/pull/65283), [@ashharrison90](https://github.com/ashharrison90)
- **Loki:** Fix autocomplete situations with multiple escaped quotes. [#65520](https://github.com/grafana/grafana/pull/65520), [@svennergr](https://github.com/svennergr)
- **MegaMenu:** Fixes mega menu showing scroll indicator when it shouldn't. [#65452](https://github.com/grafana/grafana/pull/65452), [@torkelo](https://github.com/torkelo)
- **Navigation:** Redirect to root page when switching organization. [#66655](https://github.com/grafana/grafana/pull/66655), [@ashharrison90](https://github.com/ashharrison90)
- **Navigation:** Scrolled hamburger menu links now navigate correctly in Safari. [#66261](https://github.com/grafana/grafana/pull/66261), [@ashharrison90](https://github.com/ashharrison90)
- **NestedFolders:** Fix nested folder deletion. [#63572](https://github.com/grafana/grafana/pull/63572), [@ying-jeanne](https://github.com/ying-jeanne)
- **New Panel Header:** Fix when clicking submenu item the parent menu item onClick get's triggered. [#65691](https://github.com/grafana/grafana/pull/65691), [@axelavargas](https://github.com/axelavargas)
- **Phlare:** Fix error when there are no profileTypes to send from backend. [#65455](https://github.com/grafana/grafana/pull/65455), [@aocenas](https://github.com/aocenas)
- **PieChart:** Show long labels properly. [#65699](https://github.com/grafana/grafana/pull/65699), [@mdvictor](https://github.com/mdvictor)
- **PluginExtensions:** Fixed issue with incorrect type being exposed when configuring an extension. [#65910](https://github.com/grafana/grafana/pull/65910), [@mckn](https://github.com/mckn)
- **Plugins:** Ensure proxy route bodies are valid JSON. [#61771](https://github.com/grafana/grafana/pull/61771), [@wbrowne](https://github.com/wbrowne)
- **Plugins:** Fix width for README pages with tables. [#66872](https://github.com/grafana/grafana/pull/66872), [@andresmgot](https://github.com/andresmgot)
- **Plugins:** Markdown fetch retry with lowercase. [#65384](https://github.com/grafana/grafana/pull/65384), [@wbrowne](https://github.com/wbrowne)
- **Plugins:** Skip instrumenting plugin build info for core and bundled plugins. [#66105](https://github.com/grafana/grafana/pull/66105), [@wbrowne](https://github.com/wbrowne)
- **PublicDashboards:** Query collapsed panels inside rows. [#64779](https://github.com/grafana/grafana/pull/64779), [@evictorero](https://github.com/evictorero)
- **Query Splitting:** Fix for handling queries with no requestId. [#66161](https://github.com/grafana/grafana/pull/66161), [@domasx2](https://github.com/domasx2)
- **SQL Datasources:** Fix variable throwing error if query returns no data. [#65937](https://github.com/grafana/grafana/pull/65937), [@mdvictor](https://github.com/mdvictor)
- **SQL Datasources:** Prevent Call Stack Overflows with Large Numbers of Values for Variable. [#64937](https://github.com/grafana/grafana/pull/64937), [@codeincarnate](https://github.com/codeincarnate)
- **SQLStore:** Fix SQLite error propagation if query retries are disabled. [#64904](https://github.com/grafana/grafana/pull/64904), [@papagian](https://github.com/papagian)
- **Stat Panel:** Fix issue with clipping text values. [#64300](https://github.com/grafana/grafana/pull/64300), [@JoaoSilvaGrafana](https://github.com/JoaoSilvaGrafana)
- **Table Panel:** Fix panel migration for options cell type. [#66305](https://github.com/grafana/grafana/pull/66305), [@ryantxu](https://github.com/ryantxu)
- **Table:** Fix migrations from old angular table for cell color modes. [#65760](https://github.com/grafana/grafana/pull/65760), [@torkelo](https://github.com/torkelo)
- **Table:** Fixes issue with pagination summary causing scrollbar. [#65189](https://github.com/grafana/grafana/pull/65189), [@torkelo](https://github.com/torkelo)
- **Table:** Fixes table panel gauge alignment. [#64994](https://github.com/grafana/grafana/pull/64994), [@torkelo](https://github.com/torkelo)
- **TablePanel:** Fix table cells overflowing when there are multiple data links. [#65711](https://github.com/grafana/grafana/pull/65711), [@oscarkilhed](https://github.com/oscarkilhed)
- **TablePanel:** fix footer bug; no footer calculated values after "hidden" column override. [#64269](https://github.com/grafana/grafana/pull/64269), [@baldm0mma](https://github.com/baldm0mma)
- **Team sync:** Fix apply query string instead of param. (Enterprise)
- **Templating:** Allow percent encoding of variable with custom all. [#65266](https://github.com/grafana/grafana/pull/65266), [@dprokop](https://github.com/dprokop)
- **Tempo:** Set default limit if none is provided for traceql queries. [#65039](https://github.com/grafana/grafana/pull/65039), [@domasx2](https://github.com/domasx2)
- **TimeSeries:** Don't extend stepped interpolation to graph edges. [#65657](https://github.com/grafana/grafana/pull/65657), [@leeoniya](https://github.com/leeoniya)
- **TimeSeries:** Improve stacking direction heuristic. [#65499](https://github.com/grafana/grafana/pull/65499), [@leeoniya](https://github.com/leeoniya)
- **Trace View:** Update the queryType to traceql for checking if same trace when clicking span link. [#66645](https://github.com/grafana/grafana/pull/66645), [@ericmustin](https://github.com/ericmustin)
- **TraceView:** Don't require preferredVisualisationType to render. [#64920](https://github.com/grafana/grafana/pull/64920), [@aocenas](https://github.com/aocenas)
- **Utils:** Reimplement util.GetRandomString to avoid modulo bias. [#64481](https://github.com/grafana/grafana/pull/64481), [@DanCech](https://github.com/DanCech)
- **XYChart:** Add all dataset columns in tooltip. [#65027](https://github.com/grafana/grafana/pull/65027), [@mdvictor](https://github.com/mdvictor)
+- **Auth:** Fixed CVE-2023-3128. [#70579](https://github.com/grafana/grafana/issues/70579), [@zerok](https://github.com/zerok)

-### Breaking changes
+<!-- 9.4.13 END -->
+<!-- 9.4.12 START -->

-`default` named retention policies won't be used to query. Users who have a `default` named retention policy in their `influxdb` database, have to rename it to something else. Having `default` named retention policy is not breaking anything. We will make sure to use the actual default retention policy under the hood. To change the hardcoded retention policy in the `dashboard.json`, users must they select the right retention policy from dropdown and save the panel/dashboard. Issue [#66466](https://github.com/grafana/grafana/issues/66466)
+# 9.4.12 (2023-06-06)

-Grafana Alerting rules with `NoDataState` configuration set to `Alerting` will now respect "For" duration. Issue [#65574](https://github.com/grafana/grafana/issues/65574)
+### Bug fixes

-Users who use LDAP role sync to only sync Viewer, Editor and Admin roles, but grant Grafana Server Admin role manually will not be able to do that anymore. After this change, LDAP role sync will override any manual changes to Grafana Server Admin role assignments. If `grafana_admin` is left unset in [LDAP role mapping configuration](https://grafana.com/docs/grafana/latest/setup-grafana/configure-security/configure-authentication/ldap/#group-mappings), it will default to false. Issue [#58820](https://github.com/grafana/grafana/issues/58820)
+- **Query:** Prevent crash while executing concurrent mixed queries
+- **Alerting:** Require alert.notifications:write permissions to test receivers and templates
+- **RBAC:** Remove legacy AC editor and admin role on new dashboard route. [#68775](https://github.com/grafana/grafana/issues/68775), [@grafanabot](https://github.com/grafanabot)
+- **Revert:** Allow editors to access GET /datasources. [#68653](https://github.com/grafana/grafana/issues/68653), [@grafanabot](https://github.com/grafanabot)
+- **Explore:** Remove data source onboarding page. [#68642](https://github.com/grafana/grafana/issues/68642), [@grafanabot](https://github.com/grafanabot)

-### Plugin development fixes & changes
+<!-- 9.4.12 END -->
+<!-- 9.4.10 START -->

- **DateTimePicker:** Can now select time correctly. [#65428](https://github.com/grafana/grafana/pull/65428), [@eledobleefe](https://github.com/eledobleefe)
- **Grafana UI:** Fix tooltip prop of button component. [#64765](https://github.com/grafana/grafana/pull/64765), [@suleymanbariseser](https://github.com/suleymanbariseser)
- **DateTimePicker:** Add min date support to calendar. [#64632](https://github.com/grafana/grafana/pull/64632), [@nevermind89x](https://github.com/nevermind89x)
- **GrafanaUI:** Implement new component Toggletip. [#64459](https://github.com/grafana/grafana/pull/64459), [@yduartep](https://github.com/yduartep)
- **ContextMenu:** Fix padding and show border based on items. [#63948](https://github.com/grafana/grafana/pull/63948), [@aocenas](https://github.com/aocenas)
+# 9.4.10 (2023-05-08)

-<!-- 9.5.0 END -->
+### Features and enhancements
+
+- **Chore:** Upgrade Go to 1.20.4. [#67760](https://github.com/grafana/grafana/issues/67760), [@papagian](https://github.com/papagian)
+
+### Bug fixes
+
+- **AzureMonitor:** Fix logs query multi-resource and timespan values. [#67931](https://github.com/grafana/grafana/issues/67931), [@grafanabot](https://github.com/grafanabot)
+- **TimeSeries:** Fix leading null-fill for missing intervals. [#67572](https://github.com/grafana/grafana/issues/67572), [@leeoniya](https://github.com/leeoniya)
+- **Alerting:** Fix misleading status code in provisioning API. [#67357](https://github.com/grafana/grafana/issues/67357), [@grafanabot](https://github.com/grafanabot)
+- **Azure Monitor:** Fix bug that was not showing resources for certain locations. [#66617](https://github.com/grafana/grafana/issues/66617), [@grafanabot](https://github.com/grafanabot)
+
+<!-- 9.4.10 END -->
 <!-- 9.4.9 START -->

 # 9.4.9 (2023-04-24)

 ### Features and enhancements

- **Chore:** Upgrade Go to 1.20.3. [#66264](https://github.com/grafana/grafana/pull/66264), [@sakjur](https://github.com/sakjur)
+- **Chore:** Upgrade Go to 1.20.3. [#66836](https://github.com/grafana/grafana/issues/66836), [@sakjur](https://github.com/sakjur)
+
+### Bug fixes
+
+- **Expressions/threshold:** Fix incorrect thresholds args length. [#66925](https://github.com/grafana/grafana/issues/66925), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Fix share URL for Prometheus rules on subpath (#66752). [#66802](https://github.com/grafana/grafana/issues/66802), [@gillesdemey](https://github.com/gillesdemey)
+- **Trace View:** Update the queryType to traceql for checking if same trace when clicking span link. [#66670](https://github.com/grafana/grafana/issues/66670), [@ericmustin](https://github.com/ericmustin)
+- **Google Cloud Monitoring:** Fix project variable. [#66602](https://github.com/grafana/grafana/issues/66602), [@asimpson](https://github.com/asimpson)
+- **InfluxDB:** Fix querying with hardcoded retention policy. [#66587](https://github.com/grafana/grafana/issues/66587), [@itsmylife](https://github.com/itsmylife)
+- **Auth:** Remove the session cookie only if it's invalid or revoked. [#66430](https://github.com/grafana/grafana/issues/66430), [@mgyongyosi](https://github.com/mgyongyosi)
+- **AccessControl:** Allow editors to access GET /api/datasources. [#66375](https://github.com/grafana/grafana/issues/66375), [@mgyongyosi](https://github.com/mgyongyosi)
+- **CloudMonitoring:** Add project selector for MQL editor[fix]. [#65844](https://github.com/grafana/grafana/issues/65844), [@alyssabull](https://github.com/alyssabull)

 <!-- 9.4.9 END -->
 <!-- 9.4.7 START -->
@@ -637,36 +423,6 @@ Sentry frontend logging provider will be removed with next major version. Issue
 - **Toolkit:** Deprecate all plugin related commands. [#60290](https://github.com/grafana/grafana/pull/60290), [@academo](https://github.com/academo)
 - **Grafana UI:** Add experimental InteractiveTable component. [#58223](https://github.com/grafana/grafana/pull/58223), [@Elfo404](https://github.com/Elfo404)

-<!-- 9.3.11 START -->
-
-# 9.3.11 (2023-03-22)
-
-### Bug fixes
-
- **Alerting:** Update scheduler to receive rule updates only from database. [#64662](https://github.com/grafana/grafana/pull/64662), [@yuri-tceretian](https://github.com/yuri-tceretian)
- **Chore:** Update Grafana to use Alertmanager v0.25.1-0.20230308154952-78fedf89728b. [#64784](https://github.com/grafana/grafana/pull/64784), [@yuri-tceretian](https://github.com/yuri-tceretian)
-
-<!-- 9.3.11 END -->
-
-<!-- 9.3.8 START -->
-
-# 9.3.8 (2023-02-28)
-
-<!-- 9.3.8 END -->
-
-<!-- 9.3.7 START -->
-
-# 9.3.7 (2023-02-28)
-
-### Bug fixes
-
- **Alerting:** Validate that tags are 100 characters or less. [#62335](https://github.com/grafana/grafana/pull/62335), [@grobinson-grafana](https://github.com/grobinson-grafana)
- **Expressions:** Fixes the issue showing expressions editor. [#62510](https://github.com/grafana/grafana/pull/62510), [@itsmylife](https://github.com/itsmylife)
- **Logs:** Fix stats not being updated when log results change. [#62317](https://github.com/grafana/grafana/pull/62317), [@svennergr](https://github.com/svennergr)
- **Plugins:** Fix circular reference in customOptions leading to MarshalJSON errors. [#62328](https://github.com/grafana/grafana/pull/62328), [@yoziru](https://github.com/yoziru)
- **Time Series Panel:** Fix legend text selection in Firefox. [#60809](https://github.com/grafana/grafana/pull/60809), [@codeincarnate](https://github.com/codeincarnate)
-
-<!-- 9.3.7 END -->
 <!-- 9.4.0-beta1 END -->
 <!-- 9.3.6 START -->

@@ -994,16 +750,6 @@ The following functions and classes related to logs are deprecated in the `grafa
 - **Toolkit:** Deprecate `component:create` command. [#56086](https://github.com/grafana/grafana/pull/56086), [@academo](https://github.com/academo)
 - **Toolkit:** Remove changelog command. [#56073](https://github.com/grafana/grafana/pull/56073), [@gitstart](https://github.com/gitstart)

-<!-- 9.2.15 START -->
-
-# 9.2.15 (2023-03-22)
-
-<!-- 9.2.15 END -->
-
-<!-- 9.2.13 START -->
-
-<!-- 9.2.13 END -->
-
 <!-- 9.2.10 START -->

 # 9.2.10 (2023-01-24)
@@ -2686,18 +2432,6 @@ In the Loki data source, for consistency and performance reasons, we changed how

 The dependency to [grafana/aws-sdk](https://github.com/grafana/grafana-aws-sdk-react) is moved from [grafana/ui](https://github.com/grafana/grafana/blob/main/packages/grafana-ui/package.json) to the plugin. This means that any plugin that use SIGV4 auth need to pass a SIGV4 editor component as a prop to the `DataSourceHttpSettings` component. Issue [#43559](https://github.com/grafana/grafana/issues/43559)

-<!-- 8.5.22 START -->
-
-# 8.5.22 (2023-03-22)
-
-<!-- 8.5.22 END -->
-
-<!-- 8.5.21 START -->
-
-# 8.5.21 (2023-02-28)
-
-<!-- 8.5.21 END -->
-
 <!-- 8.5.20 START -->

 # 8.5.20 (2023-01-25)
--- a/34
+++ b/34
@@ -2,13 +2,12 @@

 ARG BASE_IMAGE=alpine:3.17
 ARG JS_IMAGE=node:18-alpine3.17
-ARG JS_PLATFORM=linux/amd64
 ARG GO_IMAGE=golang:1.20.4-alpine3.17

 ARG GO_SRC=go-builder
 ARG JS_SRC=js-builder

-FROM --platform=${JS_PLATFORM} ${JS_IMAGE} as js-builder
+FROM ${JS_IMAGE} as js-builder

 ENV NODE_OPTIONS=--max_old_space_size=8000

@@ -19,7 +18,7 @@ COPY .yarn .yarn
 COPY packages packages
 COPY plugins-bundled plugins-bundled

-RUN yarn install --immutable
+RUN yarn install

 COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js babel.config.json .linguirc ./
 COPY public public
@@ -31,15 +30,9 @@ RUN yarn build

 FROM ${GO_IMAGE} as go-builder

-ARG COMMIT_SHA=""
-ARG BUILD_BRANCH=""
-ARG GO_BUILD_TAGS="oss"
-ARG WIRE_TAGS="oss"
-ARG BINGO="true"
-
 # Install build dependencies
 RUN if grep -i -q alpine /etc/issue; then \
-      apk add --no-cache gcc g++ make git; \
+      apk add --no-cache gcc g++ make; \
    fi

 WORKDIR /tmp/grafana
@@ -47,11 +40,9 @@ WORKDIR /tmp/grafana
 COPY go.* ./
 COPY .bingo .bingo

-RUN go mod download
-RUN if [[ "$BINGO" = "true" ]]; then \
-      go install github.com/bwplotka/bingo@latest && \
-      bingo get -v; \
-    fi
+RUN go mod download && \
+    go install github.com/bwplotka/bingo@latest && \
+    bingo get

 COPY embed.go Makefile build.go package.json ./
 COPY cue.mod cue.mod
@@ -59,16 +50,14 @@ COPY kinds kinds
 COPY local local
 COPY packages/grafana-schema packages/grafana-schema
 COPY public/app/plugins public/app/plugins
-COPY public/api-merged.json public/api-merged.json
+COPY public/api-spec.json public/api-spec.json
 COPY pkg pkg
 COPY scripts scripts
 COPY conf conf
 COPY .github .github
+COPY LICENSE ./

-ENV COMMIT_SHA=${COMMIT_SHA}
-ENV BUILD_BRANCH=${BUILD_BRANCH}
-
-RUN make build-go GO_BUILD_TAGS=${GO_BUILD_TAGS} WIRE_TAGS=${WIRE_TAGS}
+RUN make build-go

 FROM ${BASE_IMAGE} as tgz-builder

@@ -105,12 +94,12 @@ WORKDIR $GF_PATHS_HOME

 # Install dependencies
 RUN if grep -i -q alpine /etc/issue; then \
-      apk add --no-cache ca-certificates bash curl tzdata musl-utils && \
+      apk add --no-cache ca-certificates bash tzdata musl-utils && \
      apk info -vv | sort; \
    elif grep -i -q ubuntu /etc/issue; then \
      DEBIAN_FRONTEND=noninteractive && \
      apt-get update && \
-      apt-get install -y ca-certificates curl tzdata && \
+      apt-get install -y ca-certificates curl tzdata musl && \
      apt-get autoremove -y && \
      rm -rf /var/lib/apt/lists/*; \
    else \
@@ -165,6 +154,7 @@ RUN if [ ! $(getent group "$GF_GID") ]; then \

 COPY --from=go-src /tmp/grafana/bin/grafana* /tmp/grafana/bin/*/grafana* ./bin/
 COPY --from=js-src /tmp/grafana/public ./public
+COPY --from=go-src /tmp/grafana/LICENSE ./

 EXPOSE 3000

--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -99,7 +99,7 @@ The current team members are:
 - Ryan McKinley ([Grafana Labs](https://grafana.com/))
 - Sofia Papagiannaki ([Grafana Labs](https://grafana.com/))
 - Stephanie Closson ([Grafana Labs](https://grafana.com/))
- Tobias Skarhed ([Grafana Labs](https://grafana.com/))
+- Tobias Skarhed ([CERN](https://home.web.cern.ch/))
 - Torkel Ödegaard ([Grafana Labs](https://grafana.com/))
 - Utkarsh Bhatnagar ([Tinder](https://www.tinder.com/))
 - Will Browne ([Grafana Labs](https://grafana.com/))
--- a/40
+++ b/40
@@ -16,8 +16,6 @@ GO_BUILD_FLAGS += $(if $(GO_BUILD_DEV),-dev)
 GO_BUILD_FLAGS += $(if $(GO_BUILD_DEV),-dev)
 GO_BUILD_FLAGS += $(if $(GO_BUILD_TAGS),-build-tags=$(GO_BUILD_TAGS))

-targets := $(shell echo '$(sources)' | tr "," " ")
-
 all: deps build

 ##@ Dependencies
@@ -51,7 +49,6 @@ $(SPEC_TARGET): $(SWAGGER) ## Generate API Swagger specification
 	-x "github.com/prometheus/alertmanager" \
 	-i pkg/api/swagger_tags.json \
 	--exclude-tag=alpha
-	go run pkg/services/ngalert/api/tooling/cmd/clean-swagger/main.go -if $@ -of $@

 swagger-api-spec: gen-go $(SPEC_TARGET) $(MERGED_SPEC_TARGET) validate-api-spec

@@ -59,7 +56,7 @@ validate-api-spec: $(MERGED_SPEC_TARGET) $(SWAGGER) ## Validate API spec
 	$(SWAGGER) validate $(<)

 clean-api-spec:
-	rm -f $(SPEC_TARGET) $(MERGED_SPEC_TARGET) $(OAPI_SPEC_TARGET)
+	rm $(SPEC_TARGET) $(MERGED_SPEC_TARGET) $(OAPI_SPEC_TARGET)

 ##@ OpenAPI 3
 OAPI_SPEC_TARGET = public/openapi3.json
@@ -77,7 +74,7 @@ gen-cue: ## Do all CUE/Thema code generation

 gen-go: $(WIRE) gen-cue
 	@echo "generate go files"
-	$(WIRE) gen -tags $(WIRE_TAGS) ./pkg/server
+	$(WIRE) gen -tags $(WIRE_TAGS) ./pkg/server ./pkg/cmd/grafana-cli/runner

 fix-cue: $(CUE)
 	@echo "formatting cue files"
@@ -87,7 +84,7 @@ fix-cue: $(CUE)
 gen-jsonnet:
 	go generate ./devenv/jsonnet

-build-go: gen-go ## Build all Go binaries.
+build-go: $(MERGED_SPEC_TARGET) gen-go ## Build all Go binaries.
 	@echo "build go files"
 	$(GO) run build.go $(GO_BUILD_FLAGS) build

@@ -165,36 +162,19 @@ shellcheck: $(SH_FILES) ## Run checks for shell scripts.

 ##@ Docker

-TAG_SUFFIX=$(if $(WIRE_TAGS)!=oss,-$(WIRE_TAGS))
-PLATFORM=linux/amd64
-
 build-docker-full: ## Build Docker image for development.
 	@echo "build docker container"
-	tar -ch . | \
-	docker buildx build - \
-	--platform $(PLATFORM) \
-	--build-arg BINGO=false \
-	--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
-	--build-arg WIRE_TAGS=$(WIRE_TAGS) \
-	--build-arg COMMIT_SHA=$$(git rev-parse --short HEAD) \
-	--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
-	--tag grafana/grafana$(TAG_SUFFIX):dev \
-	$(DOCKER_BUILD_ARGS)
+	DOCKER_BUILDKIT=1 \
+	docker build \
+	--tag grafana/grafana:dev .

 build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
 	@echo "build docker container"
-	tar -ch . | \
-	docker buildx build - \
-	--platform $(PLATFORM) \
-	--build-arg BINGO=false \
-	--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
-	--build-arg WIRE_TAGS=$(WIRE_TAGS) \
-	--build-arg COMMIT_SHA=$$(git rev-parse --short HEAD) \
-	--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
+	DOCKER_BUILDKIT=1 \
+	docker build \
 	--build-arg BASE_IMAGE=ubuntu:20.04 \
 	--build-arg GO_IMAGE=golang:1.20.4 \
-	--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
-	$(DOCKER_BUILD_ARGS)
+	--tag grafana/grafana:dev-ubuntu .

 ##@ Services

@@ -205,6 +185,8 @@ devenv:
 	@printf 'You have to define sources for this command \nexample: make devenv sources=postgres,openldap\n'
 else
 devenv: devenv-down ## Start optional services, e.g. postgres, prometheus, and elasticsearch.
+	$(eval targets := $(shell echo '$(sources)' | tr "," " "))
+
 	@cd devenv; \
 	./create_docker_compose.sh $(targets) || \
 	(rm -rf {docker-compose.yaml,conf.tmp,.env}; exit 1)
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -90,14 +90,6 @@ read_timeout = 0
 #exampleHeader1 = exampleValue1
 #exampleHeader2 = exampleValue2

-#################################### GRPC Server #########################
-[grpc_server]
-network = "tcp"
-address = "127.0.0.1:10000"
-use_tls = false
-cert_file =
-key_file =
-
 #################################### Database ############################
 [database]
 # You can configure the database connection by specifying type, host, name, user and password
@@ -221,9 +213,6 @@ response_limit = 0
 # Limits the number of rows that Grafana will process from SQL data sources.
 row_limit = 1000000

-# Sets a custom value for the `User-Agent` header for outgoing data proxy requests. If empty, the default value is `Grafana/<BuildVersion>` (for example `Grafana/9.0.0`).
-user_agent =
-
 #################################### Analytics ###########################
 [analytics]
 # Server reporting, sends usage counters to stats.grafana.org every 24 hours.
@@ -413,21 +402,6 @@ default_home_dashboard_path =
 # Upper limit of data sources that Grafana will return. This limit is a temporary configuration and it will be deprecated when pagination will be introduced on the list data sources API.
 datasource_limit = 5000

-
-################################### SQL Data Sources #####################
-[sql_datasources]
-# Default maximum number of open connections maintained in the connection pool 
-# when connecting to SQL based data sources
-max_open_conns_default = 100
-
-# Default maximum number of idle connections maintained in the connection pool
-# when connecting to SQL based data sources
-max_idle_conns_default = 100
-
-# Default maximum connection lifetime used when connecting
-# to SQL based data sources. 
-max_conn_lifetime_default = 14400
-
 #################################### Users ###############################
 [users]
 # disable user signup / registration
@@ -516,7 +490,6 @@ oauth_auto_login = false
 oauth_state_cookie_max_age = 600

 # Skip forced assignment of OrgID 1 or 'auto_assign_org_id' for social logins
-# Deprecated, use skip_org_role_sync option for specific provider instead.
 oauth_skip_org_role_update_sync = false

 # limit of api_key seconds to live before expiration
@@ -531,6 +504,9 @@ sigv4_verbose_logging = false
 # Set to true to enable Azure authentication option for HTTP-based datasources
 azure_auth_enabled = false

+# Use email lookup in addition to the unique ID provided by the IdP
+oauth_allow_insecure_email_lookup = false
+
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -547,8 +523,6 @@ hide_version = false

 #################################### GitHub Auth #########################
 [auth.github]
-name = GitHub
-icon = github
 enabled = false
 allow_sign_up = true
 auto_login = false
@@ -564,12 +538,14 @@ allowed_organizations =
 role_attribute_path =
 role_attribute_strict = false
 allow_assign_grafana_admin = false
+skip_org_role_sync = false
 tls_skip_verify_insecure = false
+tls_client_cert =
+tls_client_key =
+tls_client_ca =

 #################################### GitLab Auth #########################
 [auth.gitlab]
-name = GitLab
-icon = gitlab
 enabled = false
 allow_sign_up = true
 auto_login = false
@@ -585,12 +561,9 @@ role_attribute_path =
 role_attribute_strict = false
 allow_assign_grafana_admin = false
 skip_org_role_sync = false
-tls_skip_verify_insecure = false

 #################################### Google Auth #########################
 [auth.google]
-name = Google
-icon = google
 enabled = false
 allow_sign_up = true
 auto_login = false
@@ -603,7 +576,6 @@ api_url = https://www.googleapis.com/oauth2/v1/userinfo
 allowed_domains =
 hosted_domain =
 skip_org_role_sync = false
-tls_skip_verify_insecure = false

 #################################### Grafana.com Auth ####################
 # legacy key names (so they work in env variables)
@@ -616,8 +588,6 @@ scopes = user:email
 allowed_organizations =

 [auth.grafana_com]
-name = Grafana.com
-icon = grafana
 enabled = false
 allow_sign_up = true
 auto_login = false
@@ -629,8 +599,7 @@ skip_org_role_sync = false

 #################################### Azure AD OAuth #######################
 [auth.azuread]
-name = Microsoft
-icon = microsoft
+name = Azure AD
 enabled = false
 allow_sign_up = true
 auto_login = false
@@ -644,7 +613,6 @@ allowed_groups =
 role_attribute_strict = false
 allow_assign_grafana_admin = false
 force_use_graph_api = false
-tls_skip_verify_insecure = false

 #################################### Okta OAuth #######################
 [auth.okta]
@@ -665,7 +633,6 @@ role_attribute_path =
 role_attribute_strict = false
 allow_assign_grafana_admin = false
 skip_org_role_sync = false
-tls_skip_verify_insecure = false

 #################################### Generic OAuth #######################
 [auth.generic_oauth]
@@ -701,7 +668,6 @@ tls_client_ca =
 use_pkce = false
 auth_style =
 allow_assign_grafana_admin = false
-skip_org_role_sync = false

 #################################### Basic Auth ##########################
 [auth.basic]
@@ -943,9 +909,6 @@ global_alert_rule = -1
 # global limit of files uploaded to the SQL DB
 global_file = 1000

-# global limit of correlations
-global_correlations = -1
-
 #################################### Unified Alerting ####################
 [unified_alerting]
 # Enable the Unified Alerting sub-system and interface. When enabled we'll migrate all of your alert rules and notification channels to the new system. New alert rules will be created and your notification channels will be converted into an Alertmanager configuration. Previous data is preserved to enable backwards compatibility but new data is removed when switching. When this configuration section and flag are not defined, the state is defined at runtime. See the documentation for more details.
@@ -1266,8 +1229,6 @@ plugin_admin_external_manage_enabled = false
 plugin_catalog_url = https://grafana.com/grafana/plugins/
 # Enter a comma-separated list of plugin identifiers to hide in the plugin catalog.
 plugin_catalog_hidden_plugins =
-# Log all backend requests for core and external plugins.
-log_backend_requests = false

 #################################### Grafana Live ##########################################
 [live]
@@ -1423,14 +1384,6 @@ max_crawl_duration =
 # This setting should be expressed as a duration. Examples: 10s (seconds), 1m (minutes).
 scheduler_interval =

-#################################### Support Bundles #####################################
-[support_bundles]
-# Enable support bundle creation (default: true)
-enabled = true
-# Only server admins can generate and view support bundles (default: true)
-server_admin_only = true
-# If set, bundles will be encrypted with the provided public keys separated by whitespace
-public_keys = ""

 #################################### Storage ################################################

--- a/conf/ldap.toml
+++ b/conf/ldap.toml
@@ -11,11 +11,6 @@ port = 389
 use_ssl = false
 # If set to true, use LDAP with STARTTLS instead of LDAPS
 start_tls = false
-# The value of an accepted TLS cipher. By default, this value is empty. Example value: ["TLS_AES_256_GCM_SHA384"])
-# For a complete list of supported ciphers and TLS versions, refer to: https://go.dev/src/crypto/tls/cipher_suites.go
-tls_ciphers = []
-# This is the minimum TLS version allowed. By default, this value is empty. Accepted values are: TLS1.1, TLS1.2, TLS1.3.
-min_tls_version = ""
 # set to true if you want to skip ssl cert validation
 ssl_skip_verify = false
 # set to the path to your root CA certificate or leave unset to use system defaults
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -91,14 +91,6 @@
 #exampleHeader1 = exampleValue1
 #exampleHeader2 = exampleValue2

-#################################### GRPC Server #########################
-;[grpc_server]
-;network = "tcp"
-;address = "127.0.0.1:10000"
-;use_tls = false
-;cert_file =
-;key_file =
-
 #################################### Database ####################################
 [database]
 # You can configure the database connection by specifying type, host, name, user and password
@@ -228,9 +220,6 @@
 # Limits the number of rows that Grafana will process from SQL data sources.
 ;row_limit = 1000000

-# Sets a custom value for the `User-Agent` header for outgoing data proxy requests. If empty, the default value is `Grafana/<BuildVersion>` (for example `Grafana/9.0.0`).
-;user_agent =
-
 #################################### Analytics ####################################
 [analytics]
 # Server reporting, sends usage counters to stats.grafana.org every 24 hours.
@@ -502,7 +491,6 @@
 ;oauth_state_cookie_max_age = 600

 # Skip forced assignment of OrgID 1 or 'auto_assign_org_id' for social logins
-# Deprecated, use skip_org_role_sync option for specific provider instead.
 ;oauth_skip_org_role_update_sync = false

 # limit of api_key seconds to live before expiration
@@ -520,6 +508,9 @@
 # Set to skip the organization role from JWT login and use system's role assignment instead.
 ; skip_org_role_sync = false

+# Use email lookup in addition to the unique ID provided by the IdP
+;oauth_allow_insecure_email_lookup = false
+
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -536,8 +527,6 @@

 #################################### GitHub Auth ##########################
 [auth.github]
-;name = GitHub
-;icon = github
 ;enabled = false
 ;allow_sign_up = true
 ;auto_login = false
@@ -553,11 +542,10 @@
 ;role_attribute_path =
 ;role_attribute_strict = false
 ;allow_assign_grafana_admin = false
+;skip_org_role_sync = false

 #################################### GitLab Auth #########################
 [auth.gitlab]
-;name = GitLab
-;icon = gitlab
 ;enabled = false
 ;allow_sign_up = true
 ;auto_login = false
@@ -576,8 +564,6 @@

 #################################### Google Auth ##########################
 [auth.google]
-;name = Google
-;icon = google
 ;enabled = false
 ;allow_sign_up = true
 ;auto_login = false
@@ -593,8 +579,6 @@

 #################################### Grafana.com Auth ####################
 [auth.grafana_com]
-;name = Grafana.com
-;icon = grafana
 ;enabled = false
 ;allow_sign_up = true
 ;auto_login = false
@@ -606,8 +590,7 @@

 #################################### Azure AD OAuth #######################
 [auth.azuread]
-;name = Microsoft
-;icon = microsoft
+;name = Azure AD
 ;enabled = false
 ;allow_sign_up = true
 ;auto_login = false
@@ -912,9 +895,6 @@
 # global limit of alerts
 ;global_alert_rule = -1

-# global limit of correlations
-; global_correlations = -1
-
 #################################### Unified Alerting ####################
 [unified_alerting]
 #Enable the Unified Alerting sub-system and interface. When enabled we'll migrate all of your alert rules and notification channels to the new system. New alert rules will be created and your notification channels will be converted into an Alertmanager configuration. Previous data is preserved to enable backwards compatibility but new data is removed.```
@@ -1203,8 +1183,6 @@
 ;plugin_catalog_url = https://grafana.com/grafana/plugins/
 # Enter a comma-separated list of plugin identifiers to hide in the plugin catalog.
 ;plugin_catalog_hidden_plugins =
-# Log all backend requests for core and external plugins.
-;log_backend_requests = false

 #################################### Grafana Live ##########################################
 [live]
@@ -1289,14 +1267,6 @@
 ;grpc_host =
 ;grpc_port =

-[support_bundles]
-# Enable support bundle creation (default: true)
-#enabled = true
-# Only server admins can generate and view support bundles (default: true)
-#server_admin_only = true
-# If set, bundles will be encrypted with the provided public keys separated by whitespace
-#public_keys = ""
-
 [enterprise]
 # Path to a valid Grafana Enterprise license.jwt file
 ;license_path =
--- a/contribute/backend/README.md
+++ b/contribute/backend/README.md
@@ -1,24 +1,98 @@
 # Backend

-First read the [backend style guide](/contribute/backend/style-guide.md)
-to get a sense for how we work to ensure that the Grafana codebase is
-consistent and accessible. The rest of the backend contributor
-documentation is more relevant to reviewers and contributors looking to
-make larger changes.
+This document gives an overview of the directory structure, and ongoing refactorings.

-For anyone reviewing code for Grafana's backend, a basic understanding
-of content of the following files is expected:
+For more information on developing for the backend:

- [Currently recommended practices](/contribute/backend/recommended-practices.md)
- [Services](/contribute/backend/services.md)
- [Communication](/contribute/backend/communication.md)
- [Database](/contribute/backend/database.md)
- [HTTP API](/pkg/api/README.md)
+- [Backend style guide](/contribute/backend/style-guide.md)
+- [Architecture](/contribute/architecture)

-Reviewers who review large changes should additionally make a habit out
-of familiarizing themselves with the content of
-[/contribute/backend](/contribute/backend) from time to time.
+## Central folders of Grafana's backend
+
+| folder          | description                                                                                                                                                                                                                                                                                                |
+| --------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| /pkg/api        | HTTP handlers and routing. Almost all handler funcs are global which is something we would like to improve in the future. Handlers should be associated with a struct that refers to all dependencies.                                                                                                     |
+| /pkg/cmd        | The binaries that we build: grafana-server and grafana-cli.                                                                                                                                                                                                                                                |
+| /pkg/components | A mix of third-party packages and packages we have implemented ourselves. Includes our packages that have out-grown the util package and don't naturally belong somewhere else.                                                                                                                            |
+| /pkg/infra      | Packages in infra should be packages that are used in multiple places in Grafana without knowing anything about the Grafana domain.                                                                                                                                                                        |
+| /pkg/services   | Packages in services are responsible for persisting domain objects and manage the relationship between domain objects. Services should communicate with each other using DI when possible. Most of Grafana's codebase still relies on global state for this. Any new features going forward should use DI. |
+| /pkg/tsdb       | All backend implementations of the data sources in Grafana. Used by both Grafana's frontend and alerting.                                                                                                                                                                                                  |
+| /pkg/util       | Small helper functions that are used in multiple parts of the codebase. Many functions are placed directly in the util folders which is something we want to avoid. Its better to give the util function a more descriptive package name. Ex `errutil`.                                                    |
+
+## Central components of Grafana's backend
+
+| package                | description                                                                                                                                                                                                         |
+| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| /pkg/bus               | The bus is described in more details under [Communication](/contribute/backend/communication.md)                                                                                                                    |
+| /pkg/models            | This is where we keep our domain model. This package should not depend on any package outside standard library. It does contain some references within Grafana but that is something we should avoid going forward. |
+| /pkg/registry          | Package for managing services.                                                                                                                                                                                      |
+| /pkg/services/alerting | Grafana's alerting services. The alerting engine runs in a separate goroutine and shouldn't depend on anything else within Grafana.                                                                                 |
+| /pkg/services/sqlstore | Currently where the database logic resides.                                                                                                                                                                         |
+| /pkg/setting           | Anything related to Grafana global configuration should be dealt with in this package.                                                                                                                              |

 ## Dependency management

 Refer to [UPGRADING_DEPENDENCIES.md](https://github.com/grafana/grafana/blob/main/UPGRADING_DEPENDENCIES.md).
+
+## Ongoing refactoring
+
+These issues are not something we want to address all at once but something we will improve incrementally. Since Grafana is released at a regular schedule the preferred approach is to do this in batches. Not only is it easier to review, but it also reduces the risk of conflicts when cherry-picking fixes from main to release branches. Please try to submit changes that span multiple locations at the end of the release cycle. We prefer to wait until the end because we make fewer patch releases at the end of the release cycle, so there are fewer opportunities for complications.
+
+### Global state
+
+Global state makes testing and debugging software harder and it's something we want to avoid when possible. Unfortunately, there is quite a lot of global state in Grafana.
+
+We want to migrate away from this by using the `inject` package to wire up all dependencies either in `pkg/cmd/grafana-server/main.go` or self-registering using `registry.RegisterService` ex https://github.com/grafana/grafana/blob/main/pkg/services/cleanup/cleanup.go#L25.
+
+### Limit the use of the init() function
+
+Only use the init() function to register services/implementations.
+
+### Settings refactoring
+
+The plan is to move all settings to from package level vars in settings package to the [setting.Cfg](https://github.com/grafana/grafana/blob/df917663e6f358a076ed3daa9b199412e95c11f4/pkg/setting/setting.go#L210) struct. To access the settings, services and components can inject this setting.Cfg struct:
+
+[Cfg struct](https://github.com/grafana/grafana/blob/df917663e6f358a076ed3daa9b199412e95c11f4/pkg/setting/setting.go#L210)
+[Injection example](https://github.com/grafana/grafana/blob/df917663e6f358a076ed3daa9b199412e95c11f4/pkg/services/cleanup/cleanup.go#L20)
+
+### Reduce the use of GoConvey
+
+We want to migrate away from using GoConvey. Instead, we want to use stdlib testing, because it's the most common approach in the Go community and we think it will be easier for new contributors. Read more about how we want to write tests in the [style guide](/contribute/backend/style-guide.md).
+
+### Refactor SqlStore
+
+The `sqlstore` handlers all use a global xorm engine variable. Refactor them to use the `SqlStore` instance.
+
+### Avoid global HTTP handler functions
+
+Refactor HTTP handlers so that the handler methods are on the HttpServer instance or a more detailed handler struct. E.g (AuthHandler). This ensures they get access to HttpServer service dependencies (and Cfg object) and can avoid global state.
+
+### Date comparison
+
+Store newly introduced date columns in the database as epochs if they require date comparison. This permits a unified approach for comparing dates against all the supported databases instead of handling dates differently for each database. Also, by comparing epochs, we no longer need error pruning transformations to and from other time zones.
+
+### Avoid use of the simplejson package
+
+Use of the `simplejson` package (`pkg/components/simplejson`) in place of types (Go structs) results in code that is difficult to maintain. Instead, create types for objects and use the Go standard library's [`encoding/json`](https://golang.org/pkg/encoding/json/) package.
+
+### Provisionable\*
+
+All new features that require state should be possible to configure using config files. For example:
+
+- [Data sources](https://github.com/grafana/grafana/tree/main/pkg/services/provisioning/datasources)
+- [Alert notifiers](https://github.com/grafana/grafana/tree/main/pkg/services/provisioning/notifiers)
+- [Dashboards](https://github.com/grafana/grafana/tree/main/pkg/services/provisioning/dashboards)
+
+Today its only possible to provision data sources and dashboards but this is something we want to support all over Grafana.
+
+### Use context.Context "everywhere"
+
+The package [context](https://golang.org/pkg/context/) should be used and propagated through all the layers of the code. For example the `context.Context` of an incoming API request should be propagated to any other layers being used such as the bus, service and database layers. Utility functions/methods normally doesn't need `context.Context` To follow best practices, any function/method that receives a context.Context argument should receive it as its first argument.
+
+To be able to solve certain problems and/or implement and support certain features making sure that `context.Context` is passed down through all layers of the code is vital. Being able to provide contextual information for the full life-cycle of an API request allows us to use contextual logging, provide contextual information about the authenticated user, create multiple spans for a distributed trace of service calls and database queries etc.
+
+Code should use `context.TODO` when it's unclear which Context to use or it is not yet available (because the surrounding function has not yet been extended to accept a `context.Context` argument).
+
+More details in [Services](/contribute/backend/services.md), [Communication](/contribute/backend/communication.md) and [Database](/contribute/backend/database.md).
+
+[Original design doc](https://docs.google.com/document/d/1ebUhUVXU8FlShezsN-C64T0dOoo-DaC9_r-c8gB2XEU/edit#).
--- a/contribute/backend/communication.md
+++ b/contribute/backend/communication.md
@@ -1,7 +1,6 @@
 # Communication

-Grafana use dependency injection and method calls on Go interfaces to
-communicate between different parts of the backend.
+Grafana uses a _bus_ to pass messages between different parts of the application. All communication over the bus happens synchronously.

 ## Commands and queries

--- a/contribute/backend/recommended-practices.md
+++ b/contribute/backend/recommended-practices.md
@@ -1,169 +0,0 @@
-# Currently recommended practices
-
-We occasionally identify patterns that are either useful or harmful that
-we'll want to introduce or remove from the codebase. When the complexity
-or importance of introducing or removing such a pattern is sufficiently
-high, we'll document it here to provide an addressable local
-'currently recommended practice'. By collecting these practices in a
-single place, we're able to reference them and make it easier to have a
-shared understanding of how to write idiomatic code for the Grafana
-backend.
-
-Large-scale refactoring based on a new recommended practice is a
-delicate matter, and most of the time it's better to introduce the new
-way incrementally over multiple releases and over time to balance the
-want to introduce new useful patterns and the need to keep Grafana
-stable. It's also easier to review and revert smaller chunks of changes,
-reducing the risk of complications.
-
-| State            | Description                                                                                                                                       |
-| ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Proposed         | The practice has been proposed and been positively received by the Grafana team. Following the proposal is a discretionary choice for developers. |
-| Ongoing, active  | The practice is actively being worked on. New code should adhere to the practice where at all possible.                                           |
-| Ongoing, passive | There is no immediate active work on refactoring old code. New code should adhere to the practice where at all possible.                          |
-| Completed        | The work has been done and there is no, or negligible, legacy code left that need refactoring. New code must adhere to the practice.              |
-| Abandoned        | The practice has no longer any active ongoing work and new code don't need to comply with the practice described.                                 |
-
-## 1 - Idiomatic Grafana code should be idiomatic Go code
-
-**Status:** Ongoing, passive.
-
-It'll be easier for contributors to start contributing to Grafana if our
-code is easily understandable. When there isn't a more specific Grafana
-recommended practice, we recommend following the practices as put forth
-by the Go project for development of Go code or the Go compiler itself
-when applicable.
-
-The first resource we recommend everyone developing Grafana's backend to
-skim is "[Effective Go](https://golang.org/doc/effective_go.html)",
-which isn't updated to reflect more recent changes since Go was
-initially released but remain a good source for understanding the
-general differences between Go and other languages.
-
-Secondly, the guidelines for [Code Review Comments](https://github.com/golang/go/wiki/CodeReviewComments)
-for the Go compiler can mostly be applied directly to the Grafana
-codebase. There are idiosyncrasies in Grafana such as interfaces living
-closer to its declaration than to its users for services and don't
-enforce documentation of public declarations (prioritize high coverage
-of documentation aimed at end-users over documenting internals in the
-backend).
-
- [Effective Go](https://golang.org/doc/effective_go.html)
- [Code Review Comments](https://github.com/golang/go/wiki/CodeReviewComments)
-
-## 100 - Global state
-
-**State:** Ongoing, passive.
-
-Global state makes testing and debugging software harder, and it's something we want to avoid when possible. Unfortunately, there is quite a lot of global state in Grafana.
-
-We want to migrate away from this by using
-[Wire](https://github.com/google/wire) and dependency injection to pack
-
-## 101 - Limit the use of the init() function
-
-**State:** Ongoing, passive.
-
-Only use the init() function to register services/implementations.
-
-## 102 - Settings refactoring
-
-**State:** Ongoing, passive.
-
-The plan is to move all settings to from package level vars in settings package to the [setting.Cfg](https://github.com/grafana/grafana/blob/df917663e6f358a076ed3daa9b199412e95c11f4/pkg/setting/setting.go#L210) struct. To access the settings, services and components can inject this setting.Cfg struct:
-
- [Cfg struct](https://github.com/grafana/grafana/blob/df917663e6f358a076ed3daa9b199412e95c11f4/pkg/setting/setting.go#L210)
- [Injection example](https://github.com/grafana/grafana/blob/c9773e55b234b7637ea97b671161cd856a1d3d69/pkg/services/cleanup/cleanup.go#L34)
-
-## 103 - Reduce the use of GoConvey
-
-**State:** Completed.
-
-We want to migrate away from using GoConvey. Instead, we want to use
-stdlib testing with [testify](https://github.com/stretchr/testify),
-because it's the most common approach in the Go community, and we think
-it will be easier for new contributors. Read more about how we want to
-write tests in the [style guide](/contribute/backend/style-guide.md).
-
-## 104 - Refactor SqlStore
-
-**State:** Completed.
-
-The `sqlstore` handlers all use a global xorm engine variable. Refactor them to use the `SqlStore` instance.
-
-## 105 - Avoid global HTTP handler functions
-
-**State:** Ongoing, passive.
-
-Refactor HTTP handlers so that the handler methods are on the HttpServer instance or a more detailed handler struct. E.g (AuthHandler). This ensures they get access to HttpServer service dependencies (and Cfg object) and can avoid global state.
-
-## 106 - Date comparison
-
-**State:** Ongoing, passive.
-
-Store newly introduced date columns in the database as epoch based
-integers (i.e. unix timestamps) if they require date comparison. This
-permits a unified approach for comparing dates against all the supported
-databases instead of handling dates differently for each database. Also,
-by comparing epoch based integers, we no longer need error pruning
-transformations to and from other time zones.
-
-## 107 - Avoid use of the simplejson package
-
-**State:** Ongoing, passive
-
-Use of the `simplejson` package (`pkg/components/simplejson`) in place
-of types (Go structs) results in code that is difficult to maintain.
-Instead, create types for objects and use the Go standard library's
-[`encoding/json`](https://golang.org/pkg/encoding/json/) package.
-
-## 108 - Provisionable\*
-
-**State:** Abandoned: Grafana's file based refactoring is limited to work natively only on on-premise installations of Grafana. We're looking at enhancing the use of the API to enable provisioning for all Grafana instances.
-
-All new features that require state should be possible to configure using config files. For example:
-
- [Data sources](https://github.com/grafana/grafana/tree/main/pkg/services/provisioning/datasources)
- [Alert notifiers](https://github.com/grafana/grafana/tree/main/pkg/services/provisioning/notifiers)
- [Dashboards](https://github.com/grafana/grafana/tree/main/pkg/services/provisioning/dashboards)
-
-Today it's only possible to provision data sources and dashboards but this is something we want to support all over Grafana.
-
-### 109 - Use context.Context "everywhere"
-
-**State:** Completed.
-
-The package [context](https://golang.org/pkg/context/) should be used
-and propagated through all the layers of the code. For example the
-`context.Context` of an incoming API request should be propagated to any
-other layers being used such as the bus, service and database layers.
-Utility functions/methods normally doesn't need `context.Context`.
-To follow Go best practices, any function/method that receives a
-[`context.Context` argument should receive it as its first parameter](https://github.com/golang/go/wiki/CodeReviewComments#contexts).
-
-To be able to solve certain problems and/or implement and support
-certain features making sure that `context.Context` is passed down
-through all layers of the code is vital. Being able to provide
-contextual information for the full life-cycle of an API request allows
-us to use contextual logging, provide contextual information about the
-authenticated user, create multiple spans for a distributed trace of
-service calls and database queries etc.
-
-Code should use `context.TODO` when it's unclear which Context to use,
-or it is not yet available (because the surrounding function has not yet
-been extended to accept a `context.Context` argument).
-
-More details in [Services](/contribute/backend/services.md), [Communication](/contribute/backend/communication.md) and [Database](/contribute/backend/database.md).
-
-[Original design doc](https://docs.google.com/document/d/1ebUhUVXU8FlShezsN-C64T0dOoo-DaC9_r-c8gB2XEU/edit#).
-
-## 110 - Move API error handling to service layer
-
-**State:** Ongoing, passive.
-
-All errors returned from Grafana's services should carry a status and
-the information necessary to provide a structured end-user facing
-message that the frontend can display and internationalize for
-end-users.
-
-More details in [Errors](/contribute/backend/errors.md).
--- a/contribute/backend/style-guide.md
+++ b/contribute/backend/style-guide.md
@@ -10,12 +10,19 @@ Unless stated otherwise, use the guidelines listed in the following articles:

 ## Linting and formatting

-To ensure consistency across the Go codebase, we require all code to
-pass a number of linter checks.
+To ensure consistency across the Go codebase, we require all code to pass a number of linter checks.

-We use [GolangCI-Lint](https://github.com/golangci/golangci-lint) with a
-custom configuration [.golangci.toml](/.golangci.toml) to run these
-checks.
+We use the standard following linters:
+
+- [gofmt](https://golang.org/cmd/gofmt/)
+- [golint](https://github.com/golang/lint)
+- [go vet](https://golang.org/cmd/vet/)
+
+In addition to the standard linters, we also use:
+
+- [revive](https://revive.run/) with a [custom config](https://github.com/grafana/grafana/blob/main/conf/revive.toml)
+- [GolangCI-Lint](https://github.com/golangci/golangci-lint)
+- [gosec](https://github.com/securego/gosec)

 To run all linters, use the `lint-go` Makefile target:

@@ -29,6 +36,10 @@ We value clean and readable code, that is loosely coupled and covered by unit te

 Tests must use the standard library, `testing`. For assertions, prefer using [testify](https://github.com/stretchr/testify).

+The majority of our tests uses [GoConvey](http://goconvey.co/) but that's something we want to avoid going forward.
+
+In the `sqlstore` package we do database operations in tests and while some might say that's not suited for unit tests. We think they are fast enough and provide a lot of value.
+
 ### Integration Tests

 We run unit and integration tests separately, to help keep our CI pipeline running smoothly and provide a better developer experience.
@@ -44,8 +55,7 @@ func TestIntegrationFoo(t *testing.T) {
 }
 ```

-> Warning
-> If you do not follow this convention, your integration test may be run twice or not run at all.
+If you do not follow this convention, your integration test may be run twice or not run at all.

 ### Assertions

@@ -62,7 +72,8 @@ code, plus lets you run each test case in isolation when debugging. Don't use `t

 ### Cleanup

-Use [`t.Cleanup`](https://golang.org/pkg/testing/#T.Cleanup) to clean up resources in tests. It's a preferable to `defer`, as it can be called from helper functions. It will always execute after the test is over in reverse call order (last `t.Cleanup` first, same as `defer`).
+Use [`t.Cleanup`](https://golang.org/pkg/testing/#T.Cleanup) to clean up resources in tests. It's a less fragile choice than `defer`, since it's independent of which
+function you call it in. It will always execute after the test is over in reverse call order (last `t.Cleanup` first, same as `defer`).

 ### Mock

@@ -190,14 +201,11 @@ for context.

 If a column, or column combination, should be unique, add a corresponding uniqueness constraint through a migration.

-### Usage of XORM Session.Insert() and Session.InsertOne()
-
-The [Session.Insert()](https://pkg.go.dev/github.com/go-xorm/xorm#Session.Insert) and [Session.InsertOne()](https://pkg.go.dev/github.com/go-xorm/xorm#Session.InsertOne) are poorly documented and return the number of affected rows contrary to a common mistake that they return the newly introduced primary key. Therefore, contributors should be extra cautious when using them.
-
-The same applies for the respective [Engine.Insert()](https://pkg.go.dev/github.com/go-xorm/xorm#Engine.Insert) and [Engine.InsertOne()](https://pkg.go.dev/github.com/go-xorm/xorm#Engine.InsertOne)
-
 ## JSON

-The simplejson package is used a lot throughout the backend codebase,
-but it's legacy, so if at all possible avoid using it in new code.
-Use [encoding/json](https://golang.org/pkg/encoding/json/) instead.
+The simplejson package is used a lot throughout the backend codebase, but it's legacy, so if at all possible
+avoid using it in new code. Use [json-iterator](https://github.com/json-iterator/go) instead, which is a more performant
+drop-in alternative to the standard [encoding/json](https://golang.org/pkg/encoding/json/) package. While encoding/json
+is a fine choice, profiling shows that json-iterator may be 3-4 times more efficient for encoding. We haven't profiled
+its parsing performance yet, but according to json-iterator's own benchmarks, it appears even more superior in this
+department.
--- a/contribute/backend/support-bundles.md
+++ b/contribute/backend/support-bundles.md
@@ -1,82 +0,0 @@
-# Support bundles
-
-Support bundles are a way to collect all the information needed to debug a problem.
-They are generated from the support bundle menu in the UI under the Help section.
-
-The support bundle is an archive that contains one file per collector selected by
-the user.
-
-Collectors are functions in the backend that collect information about the service they are running in.
-Services can register collectors during their initialization.
-
-## Adding a new support bundle collector
-
-To add a new support bundle collector, you need to follow these steps,
-we'll use the usage stats service as an example:
-
-1. Import the support bundles registry in the service's `ProvideService` function:
-
-```go
-type UsageStats struct {
-    ...
-}
-
-func ProvideService(
-	...
-	bundleRegistry supportbundles.Service, // Bundle registry
-) (*UsageStats, error)
-```
-
-2. `make gen-go` will then be able to wire the registry to the service.
-
-3. Implement the collector
-
-```go
-func (uss *UsageStats) supportBundleCollector() supportbundles.Collector {
-	return supportbundles.Collector{
-		UID:               "usage-stats", // unique ID for the collector
-		DisplayName:       "Usage statistics", // display name for the collector in the UI
-		Description:       "Usage statistics of the Grafana instance", // description for the collector in the UI
-		IncludedByDefault: false, // whether the collector is included by default in the support bundle and can't be deselected. Most times you want this to be false.
-		Default:           false, // whether the collector is selected by default in the support bundle. User can still deselect it.
-        // Function that will actually collect the file during the support bundle generation.
-		Fn: func(ctx context.Context) (*supportbundles.SupportItem, error) {
-            // Add your service's logic to collect the information you need
-            // In this example we are collecting the usage stats and marshalling them to JSON
-            // This helps us get information about the usage of the Grafana instance
-			report, err := uss.GetUsageReport(context.Background())
-			if err != nil {
-				return nil, err
-			}
-
-			data, err := json.Marshal(report)
-			if err != nil {
-				return nil, err
-			}
-
-			return &supportbundles.SupportItem{
-                // filename of the file in the archive
-                // can be any extension. (most common is .json and .md)
-				Filename:  "usage-stats.json",
-				FileBytes: data, // []byte of the file
-			}, nil
-		},
-	}
-}
-```
-
-4. Register the collector in the service's `ProvideService` function:
-
-```go
-func ProvideService(
-    ...
-) (*UsageStats, error) {
-	s := &UsageStats{
-        //	...
-	}
-
-	bundleRegistry.RegisterSupportItemCollector(s.supportBundleCollector())
-
-	return s, nil
-}
-```
--- a/contribute/internationalization.md
+++ b/contribute/internationalization.md
@@ -4,7 +4,7 @@ Grafana uses the [i18next](https://www.i18next.com/) framework for managing tran

 ## tl;dr

-**Please note:** We do not currently accept contributions for translations. Please do not submit pull requests translating grafana.json files - they will be rejected. We do accept contributions to mark up phrases for translation.
+**Please note:** We do not currently accept contributions for translations. Please do not submit pull requests for grafana.json files - they will be rejected.

 - Use `<Trans i18nKey="search-results.panel-link">Go to {{ pageTitle }}</Trans>` in code to add a translatable phrase
 - Translations are stored in JSON files in `public/locales/{locale}/grafana.json`
--- a/contribute/merge-pull-request.md
+++ b/contribute/merge-pull-request.md
@@ -13,7 +13,6 @@ The following checklist/summary should give you a quick overview of what to ask/
 - Reviewed and approved?
 - All checks passed?
 - Proper pull request title?
- Milestone assigned?
 - Add to changelog/release notes?
 - Needs backporting?

@@ -40,10 +39,18 @@ See [formatting guidelines](create-pull-request.md#formatting-guidelines) for mo

 ### Assign a milestone

-A milestone **should** be added to every pull request. Several things in the Grafana release process requires at least pull requests to be in a milestone, for example [generating changelog/release notes](#include-in-changelog-and-release-notes).
+Several things in the Grafana release process requires at least pull requests to be in a milestone, for example [generating changelog/release notes](#include-in-changelog-and-release-notes).

 This makes it easier to track what changes go into a certain release. Without this information, release managers have to go through git commits which is not an efficient process.

+That being said, _you don't have to assign a milestone manually_ to a pull request.
+Instead, when it is merged & closed then a bot will look for the most appropriate miletone and assign it to the pull request.
+
+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).
+Backport pull requestss 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?

 At Grafana we generate the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md) and [release notes](https://grafana.com/docs/grafana/latest/release-notes/) based on merged pull requests. Including changes in the changelog/release notes is very important to provide a somewhat complete picture of what changes a Grafana release actually includes.
@@ -78,15 +85,15 @@ The changelog/release notes are divided into sections and here's a description o

 **Features and enhancements:**

-Milestone assigned and labeled with `add to changelog` and any of the other section rules don't apply.
+Labeled with `add to changelog` and any of the other section rules don't apply.

 **Bug fixes:**

-Milestone assigned and labeled with `add to changelog` and either labeled with `type/bug` or the pull request title contains `fix` or `fixes`.
+Labeled with `add to changelog` and either labeled with `type/bug` or the pull request title contains `fix` or `fixes`.

 **Plugin development fixes & changes:**

-Milestone assigned and labeled with `area/grafana/toolkit`, `area/grafana/ui` or `area/grafana/runtime`.
+Labeled with `area/grafana/toolkit`, `area/grafana/ui` or `area/grafana/runtime`.

 **Deprecations:**

--- a/contribute/style-guides/frontend.md
+++ b/contribute/style-guides/frontend.md
@@ -353,26 +353,12 @@ static defaultProps: Partial<Props> = { ... }

 ### How to declare functional components

-We prefer using function declarations over function expressions when creating a new react functional component.
+We recommend using named regular functions when creating a new react functional component.

 ```typescript
-// bad
-export const Component = (props: Props) => { ... }
-
-// bad
-export const Component: React.FC<Props> = (props) => { ... }
-
-// good
 export function Component(props: Props) { ... }
 ```

-Some interesting readings on the topic:
-
- [Create React App: Remove React.FC from typescript template](https://github.com/facebook/create-react-app/pull/8177)
- [Kent C. Dodds: How to write a React Component in Typescript](https://kentcdodds.com/blog/how-to-write-a-react-component-in-typescript)
- [Kent C. Dodds: Function forms](https://kentcdodds.com/blog/function-forms)
- [Sam Hendrickx: Why you probably shouldn't use React.FC?](https://medium.com/raccoons-group/why-you-probably-shouldnt-use-react-fc-to-type-your-react-components-37ca1243dd13)
-
 ## State management

 - Don't mutate state in reducers or thunks.
--- a/contribute/style-guides/styling.md
+++ b/contribute/style-guides/styling.md
@@ -13,12 +13,12 @@ To access the theme in your styles, use the `useStyles` hook. It provides basic
 > Please remember to put `getStyles` function at the end of the file!

 ```tsx
-import React from 'react';
+import React, { FC } from 'react';
 import { GrafanaTheme2 } from '@grafana/data';
 import { useStyles2 } from '@grafana/ui';
 import { css } from '@emotion/css';

-const Foo = (props: FooProps) => {
+const Foo: FC<FooProps> = () => {
  const styles = useStyles2(getStyles);

  // Use styles with classNames
@@ -48,7 +48,7 @@ interface ComponentAProps {
  isActive: boolean;
 }

-const ComponentA = ({ isActive }: ComponentAProps) => {
+const ComponentA: React.FC<ComponentAProps> = ({ isActive }) => {
  const theme = useTheme();
  const styles = useStyles2(theme);

--- a/devenv/datasources.yaml
+++ b/devenv/datasources.yaml
@@ -76,12 +76,11 @@ datasources:
  - name: gdev-influxdb1-influxql
    type: influxdb
    access: proxy
+    database: site
    user: grafana
    url: http://localhost:8087
    secureJsonData:
      password: grafana
-    jsonData:
-      dbName: site

  - name: gdev-influxdb-flux
    type: influxdb
@@ -99,9 +98,9 @@ datasources:
  - name: gdev-influxdb-influxql
    type: influxdb
    access: proxy
+    database: mybucket
    url: http://localhost:8086
    jsonData:
-      dbName: mybucket
      httpHeaderName1: "Authorization"
    secureJsonData:
      httpHeaderValue1: "Token mytoken"
@@ -132,6 +131,7 @@ datasources:
      timeField: "@timestamp"
      logLevelField: level
      logMessageField: line
+      esVersion: 8.1.4

  - name: gdev-elasticsearch-filebeat
    type: elasticsearch
@@ -141,6 +141,7 @@ datasources:
    jsonData:
      interval: Daily
      timeField: "@timestamp"
+      esVersion: 8.1.4
      timeInterval: "10s"
      logMessageField: message
      logLevelField: fields.level
@@ -153,6 +154,7 @@ datasources:
    jsonData:
      interval: Daily
      timeField: "@timestamp"
+      esVersion: 8.1.4
      timeInterval: "10s"

  - name: gdev-mysql
--- a/devenv/datasources_docker.yaml
+++ b/devenv/datasources_docker.yaml
@@ -32,12 +32,11 @@ datasources:
  - name: gdev-influxdb1-influxql
    type: influxdb
    access: proxy
+    database: site
    user: grafana
    url: http://influxdb1:8086
    secureJsonData:
      password: grafana
-    jsonData:
-      dbName: site

  - name: gdev-influxdb-flux
    type: influxdb
@@ -53,9 +52,9 @@ datasources:
  - name: gdev-influxdb-influxql
    type: influxdb
    access: proxy
+    database: mybucket
    url: http://influxdb:8086
    jsonData:
-      dbName: mybucket
      httpHeaderName1: "Authorization"
    secureJsonData:
      httpHeaderValue1: "Token mytoken"
@@ -76,6 +75,7 @@ datasources:
    jsonData:
      interval: Daily
      timeField: "@timestamp"
+      esVersion: 8.1.4

  - name: gdev-elasticsearch-filebeat
    type: elasticsearch
@@ -85,6 +85,7 @@ datasources:
    jsonData:
      interval: Daily
      timeField: "@timestamp"
+      esVersion: 8.1.4
      timeInterval: "10s"
      logMessageField: message
      logLevelField: fields.level
@@ -97,6 +98,7 @@ datasources:
    jsonData:
      interval: Daily
      timeField: "@timestamp"
+      esVersion: 8.1.4
      timeInterval: "10s"

  - name: gdev-mysql
--- a/devenv/dev-dashboards-without-uid/panel_tests_graph.json
+++ b/devenv/dev-dashboards-without-uid/panel_tests_graph.json
@@ -1629,6 +1629,7 @@
    }
  ],
  "refresh": false,
+  "revision": 8,
  "schemaVersion": 16,
  "style": "dark",
  "tags": ["gdev", "panel-tests"],
--- a/devenv/dev-dashboards-without-uid/panel_tests_polystat.json
+++ b/devenv/dev-dashboards-without-uid/panel_tests_polystat.json
@@ -1775,10 +1775,6 @@
              "text": "ops/min (opm)",
              "value": "opm"
            },
-            {
-              "text": "requests/min (rpm)",
-              "value": "reqpm"
-            },
            {
              "text": "reads/min (rpm)",
              "value": "rpm"
--- a/devenv/dev-dashboards/feature-templating/datadata-macros.json
+++ b/devenv/dev-dashboards/feature-templating/datadata-macros.json
@@ -1,871 +0,0 @@
-{
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": {
-            "type": "grafana",
-            "uid": "-- Grafana --"
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations & Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "editable": true,
-    "fiscalYearStartMonth": 0,
-    "graphTooltip": 0,
-    "id": 1267,
-    "links": [],
-    "liveNow": false,
-    "panels": [
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "PD8C576611E62080A"
-        },
-        "gridPos": {
-          "h": 3,
-          "w": 24,
-          "x": 0,
-          "y": 0
-        },
-        "id": 8,
-        "options": {
-          "code": {
-            "language": "plaintext",
-            "showLineNumbers": false,
-            "showMiniMap": false
-          },
-          "content": "* `__all_variables`=${__all_variables}\n* `__url_time_range`=${__url_time_range}",
-          "mode": "markdown"
-        },
-        "pluginVersion": "9.5.0-pre",
-        "title": "Panel Title",
-        "type": "text"
-      },
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "PD8C576611E62080A"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {
-              "align": "auto",
-              "cellOptions": {
-                "type": "auto"
-              },
-              "inspect": false
-            },
-            "links": [
-              {
-                "targetBlank": true,
-                "title": "value=${__value.raw}&time=${__value.time}&__value:percentencode=${__value:percentencode}&text=${__value.text}",
-                "url": "value=${__value.raw}&time=${__value.time}justvalue=${__value:percentencode}&text=${__value.text}"
-              }
-            ],
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            },
-            "unit": "percent"
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 0,
-          "y": 3
-        },
-        "id": 2,
-        "options": {
-          "cellHeight": "sm",
-          "footer": {
-            "countRows": false,
-            "fields": "",
-            "reducer": [
-              "sum"
-            ],
-            "show": false
-          },
-          "showHeader": true,
-          "showRowNums": false
-        },
-        "pluginVersion": "9.5.0-pre",
-        "title": "DataLink: with __value.raw=&__value.time=&__value:percentencode=",
-        "type": "table"
-      },
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "PD8C576611E62080A"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "links": [
-              {
-                "targetBlank": true,
-                "title": "Value link",
-                "url": "value=${__value.raw}"
-              }
-            ],
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 12,
-          "y": 3
-        },
-        "id": 3,
-        "options": {
-          "colorMode": "value",
-          "graphMode": "area",
-          "justifyMode": "auto",
-          "orientation": "auto",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "textMode": "auto"
-        },
-        "pluginVersion": "9.5.0-pre",
-        "targets": [
-          {
-            "datasource": {
-              "type": "testdata",
-              "uid": "PD8C576611E62080A"
-            },
-            "refId": "A",
-            "scenarioId": "random_walk",
-            "seriesCount": 5
-          }
-        ],
-        "title": "Stat panel with __value.raw ",
-        "type": "stat"
-      },
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "PD8C576611E62080A"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "continuous-GrYlRd"
-            },
-            "links": [
-              {
-                "title": "${__value.raw}",
-                "url": "${__value.raw}"
-              }
-            ],
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 0,
-          "y": 10
-        },
-        "id": 6,
-        "options": {
-          "displayMode": "basic",
-          "minVizHeight": 10,
-          "minVizWidth": 0,
-          "orientation": "horizontal",
-          "reduceOptions": {
-            "calcs": [],
-            "fields": "",
-            "values": true
-          },
-          "showUnfilled": true,
-          "valueMode": "color"
-        },
-        "pluginVersion": "9.5.0-pre",
-        "targets": [
-          {
-            "csvFileName": "browser_marketshare.csv",
-            "datasource": {
-              "type": "testdata",
-              "uid": "PD8C576611E62080A"
-            },
-            "refId": "A",
-            "scenarioId": "csv_file"
-          }
-        ],
-        "title": "data link __value.raw",
-        "transformations": [
-          {
-            "id": "limit",
-            "options": {
-              "limitField": 5
-            }
-          }
-        ],
-        "type": "bargauge"
-      },
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "PD8C576611E62080A"
-        },
-        "description": "Since this is using getFrameDisplayName it works kind badly (especially with testdata) and only returns the  `Series (refId)`. \n\nSo this should show:\n* Series (Query1)\n* Series (Query2)",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "displayName": "${__series.name}",
-            "links": [
-              {
-                "targetBlank": true,
-                "title": "Value link",
-                "url": "value=${__calc}"
-              }
-            ],
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 12,
-          "y": 10
-        },
-        "id": 12,
-        "options": {
-          "colorMode": "value",
-          "graphMode": "area",
-          "justifyMode": "auto",
-          "orientation": "auto",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "textMode": "auto"
-        },
-        "pluginVersion": "9.5.0-pre",
-        "targets": [
-          {
-            "alias": "",
-            "datasource": {
-              "type": "testdata",
-              "uid": "PD8C576611E62080A"
-            },
-            "refId": "Query1",
-            "scenarioId": "random_walk",
-            "seriesCount": 1
-          },
-          {
-            "alias": "",
-            "datasource": {
-              "type": "testdata",
-              "uid": "PD8C576611E62080A"
-            },
-            "hide": false,
-            "refId": "Query2",
-            "scenarioId": "random_walk",
-            "seriesCount": 1
-          }
-        ],
-        "title": "${series.name} in display name",
-        "type": "stat"
-      },
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "PD8C576611E62080A"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {
-              "align": "auto",
-              "cellOptions": {
-                "type": "auto"
-              },
-              "inspect": false
-            },
-            "links": [
-              {
-                "title": "__data.refId=${__data.refId}&__data.fields[0]=${__data.fields[0]}&cluster=${__field.labels.cluster}",
-                "url": "refId=${__data.refId}&__data.fields[0]=${__data.fields[0]}&cluster=${__field.labels.cluster}"
-              }
-            ],
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            },
-            "unit": "percent"
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 0,
-          "y": 17
-        },
-        "id": 11,
-        "options": {
-          "cellHeight": "sm",
-          "footer": {
-            "countRows": false,
-            "fields": "",
-            "reducer": [
-              "sum"
-            ],
-            "show": false
-          },
-          "showHeader": true,
-          "showRowNums": false
-        },
-        "pluginVersion": "9.5.0-pre",
-        "targets": [
-          {
-            "datasource": {
-              "type": "testdata",
-              "uid": "PD8C576611E62080A"
-            },
-            "labels": "cluster=US",
-            "refId": "A",
-            "scenarioId": "random_walk"
-          }
-        ],
-        "title": "DataLink: refId=${__data.refId}&__data.fields[0]=${__data.fields[0]}&cluster=${__field.labels.cluster}",
-        "type": "table"
-      },
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "PD8C576611E62080A"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisCenteredZero": false,
-              "axisColorMode": "text",
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "drawStyle": "line",
-              "fillOpacity": 0,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineInterpolation": "linear",
-              "lineWidth": 1,
-              "pointSize": 5,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "showPoints": "auto",
-              "spanNulls": false,
-              "stacking": {
-                "group": "A",
-                "mode": "none"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "links": [
-              {
-                "title": "${__value.raw}",
-                "url": "${__value.raw}"
-              }
-            ],
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 12,
-          "y": 17
-        },
-        "id": 10,
-        "options": {
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          },
-          "tooltip": {
-            "mode": "single",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "alias": "10,20,30,40",
-            "csvContent": "Time, value, test\n\"2023-03-24T17:12:12.347Z\", 10,hello\n\"2023-03-24T17:22:12.347Z\", 20,asd\n\"2023-03-24T17:32:12.347Z\", 30,asd2\n\"2023-03-24T17:42:12.347Z\", 40,as34\n",
-            "datasource": {
-              "type": "testdata",
-              "uid": "PD8C576611E62080A"
-            },
-            "refId": "A",
-            "scenarioId": "csv_content"
-          },
-          {
-            "alias": "5,6,7",
-            "csvContent": "Time, value, test\n\"2023-03-24T17:12:12.347Z\", 5,hello\n\"2023-03-24T17:22:12.347Z\", 6,asd\n\"2023-03-24T17:42:12.347Z\", 7,as34\n",
-            "datasource": {
-              "type": "testdata",
-              "uid": "PD8C576611E62080A"
-            },
-            "refId": "B",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Data links with ${__value.raw}",
-        "transformations": [
-          {
-            "id": "joinByField",
-            "options": {}
-          }
-        ],
-        "type": "timeseries"
-      },
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "PD8C576611E62080A"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {
-              "align": "auto",
-              "cellOptions": {
-                "type": "auto"
-              },
-              "inspect": false
-            },
-            "links": [
-              {
-                "title": "__field.name=${__field.name}&__field.labels.cluster=${__field.labels.cluster}",
-                "url": "__field.name=${__field.name}&__field.labels.cluster=${__field.labels.cluster}"
-              }
-            ],
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            },
-            "unit": "percent"
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 0,
-          "y": 24
-        },
-        "id": 13,
-        "options": {
-          "cellHeight": "sm",
-          "footer": {
-            "countRows": false,
-            "fields": "",
-            "reducer": [
-              "sum"
-            ],
-            "show": false
-          },
-          "showHeader": true,
-          "showRowNums": false
-        },
-        "pluginVersion": "9.5.0-pre",
-        "targets": [
-          {
-            "datasource": {
-              "type": "testdata",
-              "uid": "PD8C576611E62080A"
-            },
-            "labels": "cluster=US",
-            "refId": "A",
-            "scenarioId": "random_walk"
-          }
-        ],
-        "title": "DataLink: __field.name=&__field.labels.cluster",
-        "type": "table"
-      },
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "PD8C576611E62080A"
-        },
-        "description": "The stat display names should be \n*  Stockholm = Bad\n* New York = Good \n",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "displayName": "$__cell_0 = $__cell_2",
-            "links": [],
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 12,
-          "y": 24
-        },
-        "id": 14,
-        "options": {
-          "colorMode": "value",
-          "graphMode": "area",
-          "justifyMode": "auto",
-          "orientation": "auto",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": true
-          },
-          "textMode": "auto"
-        },
-        "pluginVersion": "9.5.0-pre",
-        "targets": [
-          {
-            "alias": "",
-            "csvContent": "name, value, name2\nStockholm, 10, Good\nNew York, 15, Bad",
-            "datasource": {
-              "type": "testdata",
-              "uid": "PD8C576611E62080A"
-            },
-            "refId": "A",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "DisplayName with __cell_0 = __cell_2",
-        "type": "stat"
-      },
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "PD8C576611E62080A"
-        },
-        "description": "The stat display names should be \n*  Stockholm = Bad\n* New York = Good \n",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {
-              "align": "auto",
-              "cellOptions": {
-                "type": "auto"
-              },
-              "inspect": false
-            },
-            "displayName": "${__field.name}",
-            "links": [
-              {
-                "targetBlank": true,
-                "title": "Value link",
-                "url": "value=${__calc}"
-              }
-            ],
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 0,
-          "y": 31
-        },
-        "id": 15,
-        "options": {
-          "cellHeight": "sm",
-          "footer": {
-            "countRows": false,
-            "fields": "",
-            "reducer": [
-              "sum"
-            ],
-            "show": false
-          },
-          "showHeader": true,
-          "showRowNums": false
-        },
-        "pluginVersion": "9.5.0-pre",
-        "targets": [
-          {
-            "alias": "",
-            "csvContent": "name, value, name2\nStockholm, 10, Good\nNew York, 15, Bad",
-            "datasource": {
-              "type": "testdata",
-              "uid": "PD8C576611E62080A"
-            },
-            "refId": "A",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "DisplayName: __field.name",
-        "type": "table"
-      },
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "PD8C576611E62080A"
-        },
-        "description": "The stat display names should be \n*  Stockholm = Bad\n* New York = Good \n",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "displayName": "${__data.fields[0]} = ${__data.fields[2]}",
-            "links": [
-              {
-                "targetBlank": true,
-                "title": "__data.fields[0] = ${__data.fields[0]} = __value.raw = ${__value.raw}",
-                "url": "__data.fields[0] = ${__data.fields[0]} = __value.raw = ${__value.raw}"
-              }
-            ],
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 12,
-          "y": 31
-        },
-        "id": 16,
-        "options": {
-          "colorMode": "value",
-          "graphMode": "area",
-          "justifyMode": "auto",
-          "orientation": "auto",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": true
-          },
-          "textMode": "auto"
-        },
-        "pluginVersion": "9.5.0-pre",
-        "targets": [
-          {
-            "alias": "",
-            "csvContent": "name, value, name2\nStockholm, 10, Good\nNew York, 15, Bad",
-            "datasource": {
-              "type": "testdata",
-              "uid": "PD8C576611E62080A"
-            },
-            "refId": "A",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "$__data.fields[0] = $__data.fields[2] with datalinks",
-        "type": "stat"
-      }
-    ],
-    "refresh": "",
-    "schemaVersion": 38,
-    "style": "dark",
-    "tags": ["gdev", "templating"],
-    "templating": {
-      "list": [
-        {
-          "current": {
-            "selected": false,
-            "text": "A",
-            "value": "A"
-          },
-          "hide": 0,
-          "includeAll": false,
-          "multi": false,
-          "name": "customVar",
-          "options": [
-            {
-              "selected": true,
-              "text": "A",
-              "value": "A"
-            },
-            {
-              "selected": false,
-              "text": "B",
-              "value": "B"
-            },
-            {
-              "selected": false,
-              "text": "C",
-              "value": "C"
-            }
-          ],
-          "query": "A,B,C",
-          "queryValue": "",
-          "skipUrlSync": false,
-          "type": "custom"
-        }
-      ]
-    },
-    "time": {
-      "from": "2023-03-24T17:12:12.347Z",
-      "to": "2023-03-24T17:42:12.347Z"
-    },
-    "timepicker": {},
-    "timezone": "",
-    "title": "Templating - Macros",
-    "uid": "e7c29343-6d1e-4167-9c13-803fe5be8c46",
-    "version": 48,
-    "weekStart": ""
-  }
--- a/devenv/dev-dashboards/migrations/migrations.json
+++ b/devenv/dev-dashboards/migrations/migrations.json
@@ -1,585 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": {
-          "type": "grafana",
-          "uid": "-- Grafana --"
-        },
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "fiscalYearStartMonth": 0,
-  "graphTooltip": 0,
-  "links": [
-    {
-      "asDropdown": false,
-      "icon": "dashboard",
-      "includeVars": false,
-      "keepTime": false,
-      "tags": [],
-      "targetBlank": true,
-      "title": "Auto migrate (TRUE)",
-      "tooltip": "",
-      "type": "link",
-      "url": "/d/cdd412c4/?__feature.autoMigrateOldPanels=true"
-    },
-    {
-      "asDropdown": false,
-      "icon": "external link",
-      "includeVars": false,
-      "keepTime": false,
-      "tags": [],
-      "targetBlank": true,
-      "title": "Auto migrate (FALSE)",
-      "tooltip": "",
-      "type": "link",
-      "url": "/d/cdd412c4/?__feature.autoMigrateOldPanels=false"
-    },
-    {
-      "asDropdown": false,
-      "icon": "dashboard",
-      "includeVars": false,
-      "keepTime": false,
-      "tags": [],
-      "targetBlank": true,
-      "title": "Disable angular (TRUE)",
-      "tooltip": "",
-      "type": "link",
-      "url": "/d/cdd412c4/?__feature.disableAngular=true"
-    },
-    {
-      "asDropdown": false,
-      "icon": "external link",
-      "includeVars": false,
-      "keepTime": false,
-      "tags": [],
-      "targetBlank": true,
-      "title": "Disable angular (FALSE)",
-      "tooltip": "",
-      "type": "link",
-      "url": "/d/cdd412c4/?__feature.disableAngular=false"
-    }
-  ],
-  "liveNow": false,
-  "panels": [
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 11,
-        "w": 16,
-        "x": 0,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 4,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true,
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "percentage": false,
-      "pluginVersion": "9.5.0-pre",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 3
-        }
-      ],
-      "thresholds": [],
-      "timeRegions": [],
-      "title": "Flot graph",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "timeseries",
-      "xaxis": {
-        "mode": "time",
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "logBase": 1,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false
-      }
-    },
-    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 16,
-        "y": 0
-      },
-      "id": 6,
-      "options": {
-        "code": {
-          "language": "plaintext",
-          "showLineNumbers": false,
-          "showMiniMap": false
-        },
-        "content": "# Graph panel >> Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
-        "mode": "markdown"
-      },
-      "pluginVersion": "9.5.0-pre",
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A"
-        }
-      ],
-      "title": "Status + Notes",
-      "type": "text"
-    },
-    {
-      "columns": [],
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "fontSize": "100%",
-      "gridPos": {
-        "h": 10,
-        "w": 16,
-        "x": 0,
-        "y": 11
-      },
-      "id": 2,
-      "options": {
-        "cellHeight": "sm",
-        "footer": {
-          "countRows": false,
-          "fields": "",
-          "reducer": [
-            "sum"
-          ],
-          "show": false
-        },
-        "showHeader": true,
-        "showRowNums": false
-      },
-      "pluginVersion": "9.5.0-pre",
-      "showHeader": true,
-      "sort": {
-        "col": 0,
-        "desc": true
-      },
-      "styles": [
-        {
-          "alias": "Time",
-          "align": "auto",
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "pattern": "Time",
-          "type": "date"
-        },
-        {
-          "alias": "",
-          "align": "right",
-          "colors": [
-            "rgba(245, 54, 54, 0.9)",
-            "rgba(237, 129, 40, 0.89)",
-            "rgba(50, 172, 45, 0.97)"
-          ],
-          "decimals": 2,
-          "pattern": "/.*/",
-          "thresholds": [],
-          "type": "number",
-          "unit": "short"
-        }
-      ],
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A",
-          "scenarioId": "random_walk_table"
-        }
-      ],
-      "title": "Table (old)",
-      "transform": "table",
-      "transformations": [
-        {
-          "id": "merge",
-          "options": {
-            "reducers": []
-          }
-        }
-      ],
-      "type": "table-old"
-    },
-    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 11
-      },
-      "id": 7,
-      "options": {
-        "code": {
-          "language": "plaintext",
-          "showLineNumbers": false,
-          "showMiniMap": false
-        },
-        "content": "# Table (old) >> Table\n\nKnown issues:\n* wrapping text\n* style changes",
-        "mode": "markdown"
-      },
-      "pluginVersion": "9.5.0-pre",
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A"
-        }
-      ],
-      "title": "Status + Notes",
-      "type": "text"
-    },
-    {
-      "colorBackground": false,
-      "colorValue": true,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "format": "areaF2",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 8,
-        "x": 0,
-        "y": 21
-      },
-      "id": 9,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "postfix": "b",
-      "postfixFontSize": "50%",
-      "prefix": "a",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": true
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A"
-        }
-      ],
-      "thresholds": "",
-      "title": "grafana-singlestat-panel",
-      "type": "grafana-singlestat-panel",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "avg"
-    },
-    {
-      "colorBackground": false,
-      "colorValue": true,
-      "colors": [
-        "#299c46",
-        "#73BF69",
-        "#d44a3a"
-      ],
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "format": "ms",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 8,
-        "x": 8,
-        "y": 21
-      },
-      "id": 23,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "pluginVersion": "6.2.0-pre",
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "p95",
-      "prefixFontSize": "80%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": true
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A"
-        }
-      ],
-      "thresholds": "",
-      "title": "singlestat (old, internal.  Migrated if schema < 28)",
-      "type": "singlestat",
-      "valueFontSize": "120%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "avg"
-    },
-    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 8,
-        "x": 16,
-        "y": 21
-      },
-      "id": 10,
-      "options": {
-        "code": {
-          "language": "plaintext",
-          "showLineNumbers": false,
-          "showMiniMap": false
-        },
-        "content": "# Singlestat >> Stat\n\nKnown issues:\n* limited options",
-        "mode": "markdown"
-      },
-      "pluginVersion": "9.5.0-pre",
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A"
-        }
-      ],
-      "title": "Status + Notes",
-      "type": "text"
-    }
-  ],
-  "refresh": "",
-  "schemaVersion": 34,
-  "style": "dark",
-  "tags": [
-    "gdev",
-    "migrations",
-    "angular"
-  ],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "Devenv - Panel migrations",
-  "uid": "cdd412c4",
-  "version": 6,
-  "weekStart": ""
-}
--- a/devenv/dev-dashboards/panel-bargauge/panel_tests_bar_gauge.json
+++ b/devenv/dev-dashboards/panel-bargauge/panel_tests_bar_gauge.json
--- a/devenv/dev-dashboards/panel-canvas/canvas-examples.json
+++ b/devenv/dev-dashboards/panel-canvas/canvas-examples.json
@@ -108,7 +108,7 @@
              "fixed": "transparent"
            },
            "image": {
-              "fixed": "https://dl.grafana.com/files/temp/ryan/landscape_2x.jpg"
+              "fixed": "https://grafana-plugin-resources.s3.us-west-2.amazonaws.com/ryan/landscape_2x.jpg"
            },
            "size": "original"
          },
--- a/devenv/dev-dashboards/panel-graph/graph_tests.json
+++ b/devenv/dev-dashboards/panel-graph/graph_tests.json
@@ -1629,6 +1629,7 @@
    }
  ],
  "refresh": false,
+  "revision": 8,
  "schemaVersion": 16,
  "style": "dark",
  "tags": ["gdev", "panel-tests", "graph"],
--- a/devenv/dev-dashboards/panel-heatmap/heatmap-x.json
+++ b/devenv/dev-dashboards/panel-heatmap/heatmap-x.json
@@ -305,6 +305,7 @@
        "type": "heatmap"
      }
    ],
+    "revision": 1,
    "schemaVersion": 37,
    "style": "dark",
    "tags": [],
--- a/devenv/dev-dashboards/panel-histogram/histogram_tests.json
+++ b/devenv/dev-dashboards/panel-histogram/histogram_tests.json
@@ -748,6 +748,7 @@
      "type": "histogram"
    }
  ],
+  "revision": 1,
  "schemaVersion": 37,
  "style": "dark",
  "tags": [
--- a/devenv/dev-dashboards/panel-polystat/polystat_test.json
+++ b/devenv/dev-dashboards/panel-polystat/polystat_test.json
@@ -2866,10 +2866,6 @@
              "text": "ops/min (opm)",
              "value": "opm"
            },
-            {
-              "text": "requests/min (rpm)",
-              "value": "reqpm"
-            },
            {
              "text": "reads/min (rpm)",
              "value": "rpm"
--- a/devenv/dev-dashboards/panel-table/table_tests.json
+++ b/devenv/dev-dashboards/panel-table/table_tests.json
@@ -430,6 +430,7 @@
    }
  ],
  "refresh": false,
+  "revision": 8,
  "schemaVersion": 16,
  "style": "dark",
  "tags": ["gdev", "panel-tests"],
--- a/devenv/dev-dashboards/panel-table/table_tests_new.json
+++ b/devenv/dev-dashboards/panel-table/table_tests_new.json
@@ -3,10 +3,7 @@
    "list": [
      {
        "builtIn": 1,
-        "datasource": {
-          "type": "datasource",
-          "uid": "grafana"
-        },
+        "datasource": "-- Grafana --",
        "enable": true,
        "hide": true,
        "iconColor": "rgba(0, 211, 255, 1)",
@@ -16,16 +13,12 @@
    ]
  },
  "editable": true,
-  "fiscalYearStartMonth": 0,
+  "gnetId": null,
  "graphTooltip": 0,
  "links": [],
-  "liveNow": false,
  "panels": [
    {
-      "datasource": {
-        "type": "datasource",
-        "uid": "grafana"
-      },
+      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
@@ -33,23 +26,11 @@
        "y": 0
      },
      "id": 7,
-      "targets": [
-        {
-          "datasource": {
-            "type": "datasource",
-            "uid": "grafana"
-          },
-          "refId": "A"
-        }
-      ],
      "title": "Cell styles",
      "type": "row"
    },
    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "gdev-testdata"
-      },
+      "datasource": "gdev-testdata",
      "fieldConfig": {
        "defaults": {
          "color": {
@@ -57,19 +38,16 @@
          },
          "custom": {
            "align": "center",
-            "cellOptions": {
-              "mode": "gradient",
-              "type": "color-background"
-            },
-            "filterable": false,
-            "inspect": false
+            "displayMode": "color-background",
+            "filterable": false
          },
          "mappings": [],
          "thresholds": {
            "mode": "percentage",
            "steps": [
              {
-                "color": "green"
+                "color": "green",
+                "value": null
              },
              {
                "color": "blue",
@@ -146,17 +124,7 @@
      },
      "id": 4,
      "options": {
-        "cellHeight": "md",
-        "footer": {
-          "countRows": false,
-          "fields": "",
-          "reducer": [
-            "sum"
-          ],
-          "show": false
-        },
        "showHeader": true,
-        "showRowNums": false,
        "sortBy": [
          {
            "desc": true,
@@ -164,19 +132,17 @@
          }
        ]
      },
-      "pluginVersion": "9.5.0-pre",
+      "pluginVersion": "",
      "targets": [
        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "gdev-testdata"
-          },
          "refId": "A",
          "scenarioId": "random_walk",
          "seriesCount": 15,
          "stringInput": ""
        }
      ],
+      "timeFrom": null,
+      "timeShift": null,
      "title": "Colored background",
      "transformations": [
        {
@@ -193,29 +159,23 @@
      "type": "table"
    },
    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
+      "datasource": "gdev-testdata",
      "fieldConfig": {
        "defaults": {
          "color": {
            "mode": "thresholds"
          },
          "custom": {
-            "align": "center",
-            "cellOptions": {
-              "type": "auto"
-            },
-            "filterable": false,
-            "inspect": false
+            "align": null,
+            "filterable": false
          },
          "mappings": [],
          "thresholds": {
            "mode": "percentage",
            "steps": [
              {
-                "color": "orange"
+                "color": "orange",
+                "value": null
              },
              {
                "color": "red",
@@ -228,51 +188,60 @@
          {
            "matcher": {
              "id": "byName",
-              "options": "Basic "
+              "options": "A"
            },
            "properties": [
              {
-                "id": "custom.cellOptions",
-                "value": {
-                  "mode": "basic",
-                  "type": "gauge"
-                }
-              },
-              {
-                "id": "custom.inspect",
-                "value": false
+                "id": "custom.displayMode",
+                "value": "gradient-gauge"
              }
            ]
          },
          {
            "matcher": {
              "id": "byName",
-              "options": "Gradient text color value"
+              "options": "Info"
            },
            "properties": [
              {
-                "id": "custom.cellOptions",
-                "value": {
-                  "mode": "gradient",
-                  "type": "gauge",
-                  "valueMode": "text"
-                }
+                "id": "custom.width",
+                "value": 92
              }
            ]
          },
          {
            "matcher": {
              "id": "byName",
-              "options": "LCD hidden value"
+              "options": "Min"
            },
            "properties": [
              {
-                "id": "custom.cellOptions",
-                "value": {
-                  "mode": "lcd",
-                  "type": "gauge",
-                  "valueMode": "hidden"
-                }
+                "id": "custom.width",
+                "value": 76
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Max"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 89
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Time"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 165
              }
            ]
          }
@@ -280,22 +249,13 @@
      },
      "gridPos": {
        "h": 16,
-        "w": 17,
+        "w": 8,
        "x": 7,
        "y": 1
      },
      "id": 2,
      "options": {
-        "footer": {
-          "countRows": false,
-          "fields": "",
-          "reducer": [
-            "sum"
-          ],
-          "show": false
-        },
        "showHeader": true,
-        "showRowNums": false,
        "sortBy": [
          {
            "desc": false,
@@ -303,25 +263,22 @@
          }
        ]
      },
-      "pluginVersion": "9.5.0-pre",
+      "pluginVersion": "",
      "targets": [
        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
          "refId": "A",
          "scenarioId": "random_walk_table",
          "stringInput": ""
        }
      ],
+      "timeFrom": null,
+      "timeShift": null,
      "title": "Bar gauge cells",
      "transformations": [
        {
          "id": "organize",
          "options": {
            "excludeByName": {
-              "Info": true,
              "Time": true
            },
            "indexByName": {
@@ -331,43 +288,35 @@
              "Time": 0,
              "Value": 4
            },
-            "renameByName": {
-              "A": "LCD hidden value",
-              "Max": "Gradient text color value",
-              "Min": "Basic "
-            }
+            "renameByName": {}
          }
        }
      ],
      "type": "table"
    },
    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
+      "datasource": "gdev-testdata",
+      "description": "",
      "fieldConfig": {
        "defaults": {
          "color": {
            "mode": "thresholds"
          },
          "custom": {
-            "align": "auto",
-            "cellOptions": {
-              "type": "auto"
-            },
-            "inspect": false
+            "align": null,
+            "filterable": false
          },
          "mappings": [],
          "thresholds": {
-            "mode": "absolute",
+            "mode": "percentage",
            "steps": [
              {
-                "color": "green"
+                "color": "blue",
+                "value": null
              },
              {
-                "color": "red",
-                "value": 80
+                "color": "green",
+                "value": 50
              }
            ]
          }
@@ -376,329 +325,82 @@
          {
            "matcher": {
              "id": "byName",
-              "options": "rate"
+              "options": "A"
            },
            "properties": [
              {
-                "id": "custom.cellOptions",
-                "value": {
-                  "fillOpacity": 29,
-                  "gradientMode": "opacity",
-                  "lineWidth": 1,
-                  "type": "sparkline"
-                }
+                "id": "custom.displayMode",
+                "value": "lcd-gauge"
              },
              {
-                "id": "color",
-                "value": {
-                  "mode": "continuous-GrYlRd"
-                }
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "cluster"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 120
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "service"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 120
+                "id": "custom.align",
+                "value": "center"
              }
            ]
          }
        ]
      },
      "gridPos": {
-        "h": 7,
+        "h": 16,
        "w": 9,
-        "x": 0,
-        "y": 17
+        "x": 15,
+        "y": 1
      },
-      "id": 14,
-      "maxDataPoints": 50,
+      "id": 5,
      "options": {
-        "cellHeight": "md",
-        "footer": {
-          "countRows": false,
-          "fields": "",
-          "reducer": [
-            "sum"
-          ],
-          "show": false
-        },
        "showHeader": true,
-        "showRowNums": false,
        "sortBy": []
      },
-      "pluginVersion": "9.5.0-pre",
+      "pluginVersion": "",
      "targets": [
        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "gdev-testdata"
-          },
-          "labels": "cluster=eu,service=checkout",
-          "min": 0.1,
          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 3
+          "scenarioId": "random_walk_table",
+          "stringInput": ""
        }
      ],
-      "title": "Sparkline cell",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Retro LCD cell",
      "transformations": [
-        {
-          "id": "timeSeriesTable",
-          "options": {}
-        },
-        {
-          "id": "organize",
-          "options": {
-            "excludeByName": {},
-            "indexByName": {},
-            "renameByName": {
-              "Trend": "rate"
-            }
-          }
-        }
-      ],
-      "type": "table"
-    },
-    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {
-            "align": "auto",
-            "cellOptions": {
-              "type": "auto"
-            },
-            "inspect": false
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "rate"
-            },
-            "properties": [
-              {
-                "id": "custom.cellOptions",
-                "value": {
-                  "drawStyle": "bars",
-                  "fillOpacity": 100,
-                  "gradientMode": "hue",
-                  "lineWidth": 0,
-                  "showPoints": "auto",
-                  "type": "sparkline"
-                }
-              },
-              {
-                "id": "color",
-                "value": {
-                  "mode": "continuous-GrYlRd"
-                }
-              },
-              {
-                "id": "color",
-                "value": {
-                  "fixedColor": "red",
-                  "mode": "fixed"
-                }
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "latency"
-            },
-            "properties": [
-              {
-                "id": "custom.cellOptions",
-                "value": {
-                  "fillOpacity": 40,
-                  "gradientMode": "opacity",
-                  "lineInterpolation": "stepBefore",
-                  "lineWidth": 1,
-                  "type": "sparkline"
-                }
-              },
-              {
-                "id": "color",
-                "value": {
-                  "fixedColor": "purple",
-                  "mode": "fixed"
-                }
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "service"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 120
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "cluster"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 120
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 15,
-        "x": 9,
-        "y": 17
-      },
-      "id": 15,
-      "maxDataPoints": 30,
-      "options": {
-        "cellHeight": "md",
-        "footer": {
-          "countRows": false,
-          "fields": "",
-          "reducer": [
-            "sum"
-          ],
-          "show": false
-        },
-        "showHeader": true,
-        "showRowNums": false
-      },
-      "pluginVersion": "9.5.0-pre",
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "gdev-testdata"
-          },
-          "labels": "cluster=eu,service=checkout",
-          "min": 0.1,
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 3
-        },
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "gdev-testdata"
-          },
-          "hide": false,
-          "labels": "cluster=eu,service=checkout",
-          "min": 0.1,
-          "refId": "B",
-          "scenarioId": "random_walk",
-          "seriesCount": 3
-        }
-      ],
-      "title": "Multiple sparkline cells per row",
-      "transformations": [
-        {
-          "id": "timeSeriesTable",
-          "options": {}
-        },
-        {
-          "id": "joinByField",
-          "options": {
-            "byField": "service",
-            "mode": "outer"
-          }
-        },
        {
          "id": "organize",
          "options": {
            "excludeByName": {
-              "cluster 2": true
+              "Info": false,
+              "Max": true,
+              "Min": true,
+              "Time": false
            },
-            "indexByName": {},
-            "renameByName": {
-              "Trend": "rate",
-              "Trend #A": "rate",
-              "Trend #B": "latency",
-              "cluster 1": "cluster"
-            }
+            "indexByName": {
+              "Info": 1,
+              "Max": 3,
+              "Min": 2,
+              "Time": 0,
+              "Value": 4
+            },
+            "renameByName": {}
          }
        }
      ],
      "type": "table"
    },
    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "gdev-testdata"
-      },
+      "collapsed": false,
+      "datasource": "gdev-testdata",
      "gridPos": {
        "h": 1,
        "w": 24,
        "x": 0,
-        "y": 24
+        "y": 17
      },
      "id": 9,
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "gdev-testdata"
-          },
-          "refId": "A"
-        }
-      ],
+      "panels": [],
      "title": "Data links",
      "type": "row"
    },
    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "gdev-testdata"
-      },
+      "datasource": "gdev-testdata",
      "fieldConfig": {
        "defaults": {
          "color": {
@@ -706,11 +408,8 @@
          },
          "custom": {
            "align": "center",
-            "cellOptions": {
-              "type": "color-text"
-            },
-            "filterable": false,
-            "inspect": false
+            "displayMode": "color-text",
+            "filterable": false
          },
          "decimals": 2,
          "mappings": [],
@@ -718,7 +417,8 @@
            "mode": "percentage",
            "steps": [
              {
-                "color": "green"
+                "color": "green",
+                "value": null
              },
              {
                "color": "blue",
@@ -744,7 +444,8 @@
            },
            "properties": [
              {
-                "id": "custom.align"
+                "id": "custom.align",
+                "value": null
              }
            ]
          },
@@ -771,30 +472,17 @@
        "h": 8,
        "w": 12,
        "x": 0,
-        "y": 25
+        "y": 18
      },
      "id": 3,
+      "maxDataPoints": "10",
      "options": {
-        "cellHeight": "md",
-        "footer": {
-          "countRows": false,
-          "fields": "",
-          "reducer": [
-            "sum"
-          ],
-          "show": false
-        },
-        "showHeader": true,
-        "showRowNums": false
+        "showHeader": true
      },
-      "pluginVersion": "9.5.0-pre",
+      "pluginVersion": "",
      "targets": [
        {
          "alias": "S1",
-          "datasource": {
-            "type": "testdata",
-            "uid": "gdev-testdata"
-          },
          "labels": "server=A",
          "refId": "A",
          "scenarioId": "random_walk",
@@ -803,10 +491,6 @@
        },
        {
          "alias": "S2",
-          "datasource": {
-            "type": "testdata",
-            "uid": "gdev-testdata"
-          },
          "labels": "server=B",
          "refId": "B",
          "scenarioId": "random_walk",
@@ -815,10 +499,6 @@
        },
        {
          "alias": "S3",
-          "datasource": {
-            "type": "testdata",
-            "uid": "gdev-testdata"
-          },
          "labels": "server=C",
          "refId": "C",
          "scenarioId": "random_walk",
@@ -826,6 +506,8 @@
          "stringInput": ""
        }
      ],
+      "timeFrom": null,
+      "timeShift": null,
      "title": "Data link with labels and numeric value",
      "transformations": [
        {
@@ -836,10 +518,7 @@
      "type": "table"
    },
    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "gdev-testdata"
-      },
+      "datasource": "gdev-testdata",
      "fieldConfig": {
        "defaults": {
          "color": {
@@ -847,18 +526,16 @@
          },
          "custom": {
            "align": "center",
-            "cellOptions": {
-              "type": "auto"
-            },
-            "filterable": false,
-            "inspect": false
+            "displayMode": "auto",
+            "filterable": false
          },
          "mappings": [],
          "thresholds": {
            "mode": "percentage",
            "steps": [
              {
-                "color": "green"
+                "color": "green",
+                "value": null
              },
              {
                "color": "blue",
@@ -882,21 +559,11 @@
        "h": 8,
        "w": 5,
        "x": 12,
-        "y": 25
+        "y": 18
      },
      "id": 10,
      "options": {
-        "cellHeight": "md",
-        "footer": {
-          "countRows": false,
-          "fields": "",
-          "reducer": [
-            "sum"
-          ],
-          "show": false
-        },
        "showHeader": false,
-        "showRowNums": false,
        "sortBy": [
          {
            "desc": true,
@@ -904,19 +571,17 @@
          }
        ]
      },
-      "pluginVersion": "9.5.0-pre",
+      "pluginVersion": "",
      "targets": [
        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "gdev-testdata"
-          },
          "refId": "A",
          "scenarioId": "random_walk_table",
          "seriesCount": 5,
          "stringInput": ""
        }
      ],
+      "timeFrom": null,
+      "timeShift": null,
      "title": "No header",
      "transformations": [
        {
@@ -941,10 +606,7 @@
      "type": "table"
    },
    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "gdev-testdata"
-      },
+      "datasource": "gdev-testdata",
      "fieldConfig": {
        "defaults": {
          "color": {
@@ -952,17 +614,15 @@
          },
          "custom": {
            "align": "auto",
-            "cellOptions": {
-              "type": "auto"
-            },
-            "inspect": false
+            "displayMode": "auto"
          },
          "mappings": [],
          "thresholds": {
            "mode": "absolute",
            "steps": [
              {
-                "color": "green"
+                "color": "green",
+                "value": 0
              },
              {
                "color": "red",
@@ -977,39 +637,25 @@
        "h": 8,
        "w": 12,
        "x": 0,
-        "y": 33
+        "y": 26
      },
      "id": 12,
      "options": {
-        "cellHeight": "md",
        "footer": {
-          "countRows": false,
+          "show": true,
          "fields": "",
          "reducer": [
            "sum"
-          ],
-          "show": true
+          ]
        },
-        "showHeader": true,
-        "showRowNums": false
+        "showHeader": true
      },
-      "pluginVersion": "9.5.0-pre",
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "gdev-testdata"
-          },
-          "refId": "A"
-        }
-      ],
+      "pluginVersion": "",
      "title": "Footer",
      "type": "table"
    }
  ],
-  "refresh": "",
-  "revision": 1,
-  "schemaVersion": 38,
+  "schemaVersion": 27,
  "style": "dark",
  "tags": [
    "gdev",
@@ -1038,6 +684,5 @@
  "timezone": "",
  "title": "Panel Tests - React Table",
  "uid": "U_bZIMRMk",
-  "version": 7,
-  "weekStart": ""
+  "version": 6
 }
--- a/devenv/dev-dashboards/panel-timeline/timeline-thresholds-mappings.json
+++ b/devenv/dev-dashboards/panel-timeline/timeline-thresholds-mappings.json
@@ -736,6 +736,7 @@
    }
  ],
  "refresh": false,
+  "revision": 1,
  "schemaVersion": 38,
  "style": "dark",
  "tags": [
--- a/devenv/dev-dashboards/panel-timeseries/timeseries-yaxis-ticks.json
+++ b/devenv/dev-dashboards/panel-timeseries/timeseries-yaxis-ticks.json
@@ -1343,6 +1343,7 @@
    }
  ],
  "refresh": "",
+  "revision": 1,
  "schemaVersion": 38,
  "style": "dark",
  "tags": [
--- a/devenv/docker/blocks/auth/authentik/README.md
+++ b/devenv/docker/blocks/auth/authentik/README.md
@@ -8,7 +8,7 @@ Useful for testing a second implementation

 - [x] LDAP
 - [x] SAML
- [x] OAuth
+- [ ] OAuth

 ## Deployment

@@ -71,23 +71,6 @@ allow_idp_initiated = true
 org_mapping = admin:1:Admin, editor:1:Editor, viewer:1:Viewer
 ```

-# OAuth Setup
-
-```ini
-[auth.generic_oauth]
-name = authentik
-enabled = true
-client_id = 43e8d2746fe2e508325a23cdf816d6ddd12e94f1
-client_secret = e50440f14a010fd69dfed85bc6c071653f22c73e2c6c8d7ba96a936937d92040936b7e5a4bcc1bf40d5cf1dc019b1db327a1a00e2183c53471fb7530d4a09d7e
-scopes = openid email profile
-auth_url = http://localhost:9000/application/o/authorize/
-token_url = http://localhost:9000/application/o/token/
-api_url = http://localhost:9000/application/o/userinfo/
-role_attribute_path = contains(groups[*], 'admin') && 'Admin' || contains(groups[*], 'editor') && 'Editor' || 'Viewer'
-
-[auth]
-signout_redirect_url = http://localhost:9000/application/o/grafana-oidc/end-session/
-```

 ## Available users and groups

--- a/devenv/docker/blocks/auth/authentik/cloak.sql
+++ b/devenv/docker/blocks/auth/authentik/cloak.sql
--- a/devenv/docker/blocks/auth/authentik/docker-compose.yaml
+++ b/devenv/docker/blocks/auth/authentik/docker-compose.yaml
@@ -39,7 +39,7 @@
      - "authentik:authentik"

  authentik:
-    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.2.3}
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.12.1}
    restart: unless-stopped
    container_name: authentik
    command: server
--- a/devenv/docker/blocks/elastic/data/data.js
+++ b/devenv/docker/blocks/elastic/data/data.js
@@ -53,6 +53,7 @@ async function elasticSendLogItem(timestamp, item) {
  const url = new URL(ELASTIC_BASE_URL);
  url.pathname = `/logs-${timestampText}/_doc`;
  await jsonRequest(item, 'POST', url, 201);
+  console.log(`posted to ${url.toString()}`);
 }

 async function elasticSetupIndexTemplate() {
--- a/devenv/docker/blocks/loki/data/Dockerfile
+++ b/devenv/docker/blocks/loki/data/Dockerfile
@@ -1,3 +1,3 @@
-FROM node:18-alpine
+FROM node:16-alpine

 COPY data.js /home/node/data.js
--- a/devenv/docker/blocks/loki/data/data.js
+++ b/devenv/docker/blocks/loki/data/data.js
@@ -47,7 +47,10 @@ async function sleep(duration) {
  });
 }

-async function lokiSendLogLine(timestampNs, line, tags) {
+async function lokiSendLogLine(timestampMs, line, tags) {
+  // we keep nanosecond-timestamp in a string because
+  // as a number it would be too large
+  const timestampNs = `${timestampMs}000000`;
  const data = {
    streams: [
      {
@@ -110,60 +113,21 @@ function logFmtLine(item) {
  return parts.join(' ');
 }

-const DAYS = 7;
-const POINTS_PER_DAY = 1000;
-
-// it's important to have good "delays" between
-// log-line-timestamps, because the "density" of log-lines
-// is what gives the loki metric queries shape.
-function calculateDelays(pointsCount) {
-  const delays = [];
-  for(let i=0;i<pointsCount; i+=1) {
-    const delay = Math.random();
-    delays.push(delay);
-  }
-  // now, i want to normalize the delays-array, so that the sum of
-  // all it's items adds up to `1`.
-  const allDelays = delays.reduce((acc, current) => acc + current, 0);
-
-  for(let i=0;i<delays.length; i++) {
-    delays[i] = delays[i] / allDelays
-  }
-
-  return delays;
+const SLEEP_ANGLE_STEP = Math.PI / 200;
+let sleepAngle = 0;
+function getNextSineWaveSleepDuration() {
+  sleepAngle += SLEEP_ANGLE_STEP;
+  return Math.trunc(1000 * Math.abs(Math.sin(sleepAngle)));
 }

-function getRandomNanosecPart() {
-  // we want to have cases with milliseconds-only, with microsec and nanosec.
-  const mode = Math.random();
-
-  if (mode < 0.333) {
-    // only milisec precision
-    return '000000';
-  }
-
-  if (mode < 0.666) {
-    // microsec precision
-    return Math.trunc(Math.random()*1000).toString().padStart(3, '0') + '000'
-  }
-
-  // nanosec precision
-  return Math.trunc(Math.random()*1000000).toString().padStart(6, '0')
-}
-
-
 async function main() {
-  const delays = calculateDelays(DAYS * POINTS_PER_DAY);
-  const timeRange = DAYS * 24 * 60 * 60 * 1000;
-  let timestampMs = new Date().getTime() - timeRange;
-  for(let i =0; i < delays.length; i++ ) { // i cannot do a forEach because of the `await` inside
-    const delay = delays[i];
-    timestampMs += Math.trunc(delay * timeRange);
-    const timestampNs = `${timestampMs}${getRandomNanosecPart()}`;
-    const item = getRandomLogItem(i + 1)
-    await lokiSendLogLine(timestampNs, JSON.stringify(item), {place:'moon', source: 'data', instance: 'server\\1', job: '"grafana/data"'});
-    await lokiSendLogLine(timestampNs, logFmtLine(item), {place:'luna', source: 'data', instance: 'server\\2', job: '"grafana/data"'});
-  };
+  for (let step = 0; step < 300; step++) {
+    await sleep(getNextSineWaveSleepDuration());
+    const timestampMs = new Date().getTime();
+    const item = getRandomLogItem(step + 1)
+    lokiSendLogLine(timestampMs, JSON.stringify(item), {place:'moon', source: 'data', instance: 'server\\1', job: '"grafana/data"'});
+    lokiSendLogLine(timestampMs, logFmtLine(item), {place:'luna', source: 'data', instance: 'server\\2', job: '"grafana/data"'});
+  }
 }

 // when running in docker, we catch the needed stop-signal, to shutdown fast
--- a/devenv/docker/blocks/tempo/README.md
+++ b/devenv/docker/blocks/tempo/README.md
@@ -3,4 +3,5 @@ This devenv docker-compose.yaml will allow you to;
 - view traces
 - upload/download trace JSON files
 - view service graphs
+- view the APM table
 - search traces via Loki
--- a/devenv/docker/blocks/tempo/docker-compose.yaml
+++ b/devenv/docker/blocks/tempo/docker-compose.yaml
@@ -81,7 +81,7 @@ services:
      - "4318:4318"  # otlp http

  prometheus:
-    image: prom/prometheus:latest
+    image: prom/prometheus:main
    command:
      - --config.file=/etc/prometheus.yaml
      - --web.enable-remote-write-receiver
--- a/devenv/docker/loadtest-ts/.babelrc
+++ b/devenv/docker/loadtest-ts/.babelrc
@@ -0,0 +1,10 @@
+{
+  "presets": [
+    "@babel/env",
+    "@babel/typescript"
+  ],
+  "plugins": [
+    "@babel/proposal-class-properties",
+    "@babel/proposal-object-rest-spread"
+  ]
+}
--- a/devenv/docker/loadtest-ts/.gitignore
+++ b/devenv/docker/loadtest-ts/.gitignore
@@ -0,0 +1,3 @@
+scripts/tmp
+dist/
+.yarn
--- a/devenv/docker/loadtest-ts/README.md
+++ b/devenv/docker/loadtest-ts/README.md
@@ -0,0 +1,14 @@
+# Grafana load tests written in typescript - EXPERIMENTAL
+
+Runs load tests written in typescript and checks Grafana's performance using [k6](https://k6.io/)
+
+This is **experimental** - please consider adding new tests to devenv/docker/loadtest while we are testing the typescript approach!
+
+
+
+# How to run
+
+```
+yarn install
+GRPC_TOKEN={REPLACE_WITH_SERVICE_ACCOUNT_ADMIN_TOKEN} ./run.sh test=object-store-test grpcAddress=127.0.0.1:10000 execution=local
+```
--- a/devenv/docker/loadtest-ts/package.json
+++ b/devenv/docker/loadtest-ts/package.json
@@ -0,0 +1,28 @@
+{
+  "private": true,
+  "license": "Apache-2.0",
+  "name": "@grafana/perf-tests",
+  "version": "9.4.0-pre",
+  "devDependencies": {
+    "@babel/core": "7.19.6",
+    "@babel/plugin-proposal-class-properties": "7.18.6",
+    "@babel/plugin-proposal-object-rest-spread": "7.19.4",
+    "@babel/preset-env": "7.19.4",
+    "@babel/preset-typescript": "7.18.6",
+    "@types/k6": "0.41.0",
+    "@types/shortid": "0.0.29",
+    "@types/webpack": "5.28.0",
+    "babel-loader": "9.1.0",
+    "shortid": "2.2.16",
+    "ts-node": "10.9.1",
+    "typescript": "4.8.4",
+    "webpack": "5.74.0",
+    "webpack-cli": "4.10.0",
+    "webpack-glob-entries": "1.0.1"
+  },
+  "scripts": {
+    "build": "webpack",
+    "prepare-testdata": "yarn run prepare-testdata:object-store-test",
+    "prepare-testdata:object-store-test": "ts-node scripts/prepareDashboardFileNames.ts ../../dev-dashboards ./scripts/tmp/filenames.json"
+  }
+}
--- a/devenv/docker/loadtest-ts/run.sh
+++ b/devenv/docker/loadtest-ts/run.sh
@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+
+if ((BASH_VERSINFO[0] < 4)); then
+  echo "Bash ver >= 4 is needed to run this script"
+  echo "Please upgrade your bash - run 'brew install bash' if you use Homebrew on MacOS"
+  exit 1;
+fi
+
+declare -A cfg=(
+  [grpcToken]=$GRPC_TOKEN
+  [grpcAddress]="127.0.0.1:10000"
+  [execution]="local"
+  [test]="object-store-test"
+  [k6CloudToken]=$K6_CLOUD_TOKEN
+)
+
+for ARGUMENT in "$@"
+do
+   KEY=$(echo $ARGUMENT | cut -f1 -d=)
+
+   KEY_LENGTH=${#KEY}
+   VALUE="${ARGUMENT:$KEY_LENGTH+1}"
+   cfg["$KEY"]="$VALUE"
+done
+
+function usage() {
+    echo "$0 grpcAddress= grpcToken= execution= k6CloudToken= test=
+- 'grpcAddress' is the address of Grafana gRPC server. 127.0.0.1:10000 is the default.
+- 'grpcToken' is the service account admin token used for Grafana gRPC server authentication.
+- 'execution' is the test execution mode; one of 'local', 'cloud-output', 'cloud'. 'local' is the default.
+- 'k6CloudToken' is the k6 cloud token required for 'cloud-output' and 'cloud' execution modes.
+- 'test' is the filepath of the test to execute relative to ./src, without the extension. example 'object-store-test'"
+    exit 0
+}
+
+if [ "${cfg[grpcToken]}" == "" ]; then
+	usage
+fi
+
+
+if [ "${cfg[execution]}" == "cloud" ]; then
+  echo "cloud execution mode is not yet implemented"
+  exit 0
+elif [ "${cfg[execution]}" == "cloud-output" ]; then
+   if [ "${cfg[k6CloudToken]}" == "" ]; then
+     usage
+   fi
+elif [ "${cfg[execution]}" != "local" ]; then
+   usage
+fi
+
+yarn run build
+yarn run prepare-testdata
+
+TEST_PATH="./dist/${cfg[test]}.js"
+echo "$(date '+%Y-%m-%d %H:%M:%S'): Executing test ${TEST_PATH} in ${cfg[execution]} mode"
+
+if [ "${cfg[execution]}" == "cloud-output" ]; then
+    GRPC_TOKEN="${cfg[grpcToken]}" GRPC_ADDRESS="${cfg[grpcAddress]}" K6_CLOUD_TOKEN="${cfg[k6CloudToken]}" k6 run --out cloud "$TEST_PATH"
+elif [ "${cfg[execution]}" == "local" ]; then
+    GRPC_TOKEN="${cfg[grpcToken]}" GRPC_ADDRESS="${cfg[grpcAddress]}" k6 run "$TEST_PATH"
+fi
+
+
--- a/devenv/docker/loadtest-ts/scripts/prepareDashboardFileNames.ts
+++ b/devenv/docker/loadtest-ts/scripts/prepareDashboardFileNames.ts
@@ -0,0 +1,24 @@
+import { readdirSync, writeFileSync, mkdirSync } from 'fs';
+import { dirname, resolve } from 'path';
+
+const args = process.argv.slice(2);
+
+if (args.length !== 2) {
+  throw new Error('expected dev dashboards dir and the output file path');
+}
+
+const devDashboardsDir = args[0];
+const outputFilePath = args[1];
+
+const getFiles = (dirPath: string, ext?: string): string[] =>
+  readdirSync(dirPath, { withFileTypes: true })
+    .flatMap((dirEntry) => {
+      const res = resolve(dirPath, dirEntry.name);
+      return dirEntry.isDirectory() ? getFiles(res) : res;
+    })
+    .filter((path) => (ext?.length ? path.endsWith(ext) : true));
+
+const files = getFiles(devDashboardsDir, '.json');
+
+mkdirSync(dirname(outputFilePath), { recursive: true });
+writeFileSync(outputFilePath, JSON.stringify(files, null, 2));
--- a/devenv/docker/loadtest-ts/src/get-large-dashboard.ts
+++ b/devenv/docker/loadtest-ts/src/get-large-dashboard.ts
@@ -0,0 +1,116 @@
+const testDash = {
+  annotations: { list: [] },
+  editable: true,
+  fiscalYearStartMonth: 0,
+  graphTooltip: 0,
+  id: 100,
+  links: [],
+  liveNow: false,
+  panels: [
+    {
+      datasource: {
+        type: 'testdata',
+        uid: 'testdata',
+      },
+      fieldConfig: {
+        defaults: {
+          color: {
+            mode: 'thresholds',
+          },
+          custom: {
+            align: 'auto',
+            displayMode: 'auto',
+            inspect: false,
+          },
+          mappings: [],
+          thresholds: {
+            mode: 'absolute',
+            steps: [
+              {
+                color: 'green',
+                value: null,
+              },
+              {
+                color: 'red',
+                value: 80,
+              },
+            ],
+          },
+        },
+        overrides: [],
+      },
+      gridPos: {
+        h: 9,
+        w: 12,
+        x: 0,
+        y: 0,
+      },
+      id: 2,
+      options: {
+        footer: {
+          fields: '',
+          reducer: ['sum'],
+          show: false,
+        },
+        showHeader: true,
+      },
+      pluginVersion: '9.4.0-pre',
+      targets: [
+        {
+          csvContent: '',
+          datasource: {
+            type: 'testdata',
+            uid: 'PD8C576611E62080A',
+          },
+          refId: 'A',
+          scenarioId: 'csv_content',
+        },
+      ],
+      title: 'Panel Title',
+      type: 'table',
+    },
+  ],
+  schemaVersion: 37,
+  style: 'dark',
+  tags: [],
+  templating: {
+    list: [],
+  },
+  time: {
+    from: 'now-6h',
+    to: 'now',
+  },
+  timepicker: {},
+  timezone: '',
+  title: 'New dashboard',
+  uid: '5v6e5VH4z',
+  version: 1,
+  weekStart: '',
+} as const;
+
+const getCsvContent = (lengthInKb: number): string => {
+  const lines: string[] = ['id,name'];
+  for (let i = 0; i < lengthInKb; i++) {
+    const prefix = `${i},`;
+    lines.push(prefix + 'a'.repeat(1024 - prefix.length));
+  }
+  return lines.join('\n');
+};
+
+export const prepareDashboard = (lengthInKb: number): Record<string, unknown> => {
+  const firstPanel = testDash.panels[0];
+  return {
+    ...testDash,
+    panels: [
+      {
+        ...firstPanel,
+        targets: [
+          {
+            ...firstPanel.targets[0],
+            csvContent: getCsvContent(lengthInKb),
+          },
+        ],
+      },
+    ],
+  };
+};
--- a/devenv/docker/loadtest-ts/src/object-store-client.ts
+++ b/devenv/docker/loadtest-ts/src/object-store-client.ts
@@ -0,0 +1,214 @@
+import { check } from 'k6';
+import { b64encode } from 'k6/encoding';
+import grpc from 'k6/net/grpc';
+
+import { Object } from './prepare-data';
+
+enum GRPCMethods {
+  ServerHealth = 'grpc.health.v1.Health/Check',
+  ObjectWrite = 'object.ObjectStore/Write',
+  ObjectDelete = 'object.ObjectStore/Delete',
+  ObjectRead = 'object.ObjectStore/Read',
+}
+
+export class GRPCObjectStoreClient {
+  private connected = false;
+  constructor(private client: grpc.Client, private grpcAddress: string, private grpcToken: string) {}
+
+  connect = () => {
+    if (!this.connected) {
+      this.client.connect(this.grpcAddress, { plaintext: true, reflect: true });
+      this.connected = true;
+    }
+  };
+
+  grpcRequestParams = () => {
+    return {
+      metadata: {
+        authorization: `Bearer ${this.grpcToken}`,
+      },
+    };
+  };
+
+  healthCheck = (): boolean => {
+    this.connect();
+    const response = this.client.invoke(GRPCMethods.ServerHealth, {});
+
+    return check(response, {
+      'server is healthy': (r) => {
+        const statusOK = r && r.status === grpc.StatusOK;
+        if (!statusOK) {
+          return false;
+        }
+
+        const body = r.message;
+        // @ts-ignore
+        return 'status' in body && body.status === 'SERVING';
+      },
+    });
+  };
+
+  deleteObject = (uid: string, kind: string, _?: {}) => {
+    this.connect();
+
+    const response = this.client.invoke(
+      GRPCMethods.ObjectDelete,
+      {
+        kind: kind,
+        UID: uid,
+      },
+      this.grpcRequestParams()
+    );
+
+    check(response, {
+      'object was deleted': (r) => {
+        const statusOK = r && r.status === grpc.StatusOK;
+        if (!statusOK) {
+          return false;
+        }
+
+        if (!isDeleteObjectResponse(r.message)) {
+          console.log(
+            JSON.stringify({
+              type: 'invalid_delete_response',
+              uid: uid,
+              kind: kind,
+              resp: r,
+            })
+          );
+          return false;
+        }
+
+        return true;
+      },
+    });
+  };
+
+  readObject = (uid: string, kind: string, _?: {}) => {
+    this.connect();
+
+    const response = this.client.invoke(
+      GRPCMethods.ObjectRead,
+      {
+        kind: kind,
+        UID: uid,
+        with_body: true,
+        with_summary: true,
+      },
+      this.grpcRequestParams()
+    );
+
+    check(response, {
+      'object exists': (r) => {
+        const statusOK = r && r.status === grpc.StatusOK;
+        if (!statusOK) {
+          return false;
+        }
+
+        const respBody = r.message;
+        if (!isReadObjectResponse(respBody)) {
+          console.log(
+            JSON.stringify({
+              type: 'invalid_read_response',
+              uid: uid,
+              kind: kind,
+              resp: r,
+            })
+          );
+          return false;
+        }
+
+        return typeof respBody.object.body === 'string';
+      },
+    });
+  };
+
+  writeObject = (object: Object, opts?: { randomizeData?: boolean; checkCreatedOrUpdated?: boolean }) => {
+    this.connect();
+
+    const data = opts?.randomizeData
+      ? {
+          ...object.data,
+          __random: `${Date.now() - Math.random()}`,
+        }
+      : object.data;
+
+    const response = this.client.invoke(
+      GRPCMethods.ObjectWrite,
+      {
+        body: b64encode(JSON.stringify(data)),
+        comment: '',
+        kind: object.kind,
+        UID: object.uid,
+      },
+      this.grpcRequestParams()
+    );
+
+    const checkName = opts?.checkCreatedOrUpdated ? 'object was created or updated' : 'object was created';
+    check(response, {
+      [checkName]: (r) => {
+        const statusOK = r && r.status === grpc.StatusOK;
+        if (!statusOK) {
+          return false;
+        }
+
+        const respBody = r.message;
+        if (!isWriteObjectResponse(respBody)) {
+          console.log(
+            JSON.stringify({
+              type: 'invalid_write_response',
+              uid: object.uid,
+              kind: object.kind,
+              resp: r,
+            })
+          );
+          return false;
+        }
+
+        return opts?.checkCreatedOrUpdated
+          ? respBody.status === WriteObjectResponseStatus.UPDATED ||
+              respBody.status === WriteObjectResponseStatus.CREATED
+          : respBody.status === WriteObjectResponseStatus.CREATED;
+      },
+    });
+  };
+}
+
+type DeleteObjectResponse = {
+  OK: boolean;
+};
+
+const isDeleteObjectResponse = (resp: object): resp is DeleteObjectResponse => {
+  return resp.hasOwnProperty('OK');
+};
+
+enum WriteObjectResponseStatus {
+  CREATED = 'CREATED',
+  UPDATED = 'UPDATED',
+}
+
+type WriteObjectResponse = {
+  status: WriteObjectResponseStatus;
+};
+
+const isWriteObjectResponse = (resp: object): resp is WriteObjectResponse => {
+  return resp.hasOwnProperty('status');
+};
+
+type ReadObjectResponse = {
+  object: {
+    UID: string;
+    kind: string;
+    body: string;
+  };
+};
+
+const isReadObjectResponse = (resp: object): resp is ReadObjectResponse => {
+  if (!resp.hasOwnProperty('object')) {
+    return false;
+  }
+
+  // @ts-ignore
+  const object = resp.object;
+  return Boolean(object && typeof object === 'object' && object.hasOwnProperty('body'));
+};
--- a/devenv/docker/loadtest-ts/src/object-store-test.ts
+++ b/devenv/docker/loadtest-ts/src/object-store-test.ts
@@ -0,0 +1,145 @@
+import { SharedArray } from 'k6/data';
+import execution from 'k6/execution';
+import grpc from 'k6/net/grpc';
+
+import { GRPCObjectStoreClient } from './object-store-client';
+import { Data, prepareData } from './prepare-data';
+
+const grpcToken = __ENV.GRPC_TOKEN;
+const grpcAddress = __ENV.GRPC_ADDRESS;
+
+if (typeof grpcToken !== 'string' || !grpcToken.length) {
+  throw new Error('GRPC_TOKEN env variable is missing');
+}
+
+if (typeof grpcAddress !== 'string' || !grpcAddress.length) {
+  throw new Error('GRPC_ADDRESS env variable is missing');
+}
+
+const client = new grpc.Client();
+const objectStoreClient = new GRPCObjectStoreClient(client, grpcAddress, grpcToken);
+
+const data: Data = new SharedArray('data', () => {
+  return [prepareData(JSON.parse(open('../scripts/tmp/filenames.json')), 50)];
+})[0];
+
+const scenarioDuration = '2m';
+
+export const options = {
+  setupTimeout: '5m',
+  teardownTimeout: '5m',
+  noConnectionReuse: true,
+  scenarios: {
+    writer: {
+      exec: 'writer',
+      executor: 'constant-arrival-rate',
+      rate: 1,
+      timeUnit: '2s',
+      duration: scenarioDuration,
+      preAllocatedVUs: 1,
+      maxVUs: 1,
+    },
+    reader: {
+      exec: 'reader',
+      executor: 'constant-arrival-rate',
+      rate: 10,
+      timeUnit: '2s',
+      duration: scenarioDuration,
+      preAllocatedVUs: 1,
+      maxVUs: 10,
+    },
+    writer1mb: {
+      exec: 'writer1mb',
+      executor: 'constant-arrival-rate',
+      rate: 1,
+      timeUnit: '20s',
+      duration: scenarioDuration,
+      preAllocatedVUs: 1,
+      maxVUs: 5,
+    },
+    reader1mb: {
+      startTime: '2s',
+      exec: 'reader1mb',
+      executor: 'constant-arrival-rate',
+      rate: 1,
+      timeUnit: '1s',
+      duration: scenarioDuration,
+      preAllocatedVUs: 1,
+      maxVUs: 5,
+    },
+    writer4mb: {
+      exec: 'writer4mb',
+      executor: 'constant-arrival-rate',
+      rate: 1,
+      timeUnit: '30s',
+      duration: scenarioDuration,
+      preAllocatedVUs: 1,
+      maxVUs: 5,
+    },
+    reader4mb: {
+      startTime: '3s',
+      exec: 'reader4mb',
+      executor: 'constant-arrival-rate',
+      rate: 1,
+      timeUnit: '5s',
+      duration: scenarioDuration,
+      preAllocatedVUs: 1,
+      maxVUs: 5,
+    },
+  },
+  // thresholds: { http_req_duration: ['avg<100', 'p(95)<200'] },
+};
+
+export function setup() {
+  if (!objectStoreClient.healthCheck()) {
+    execution.test.abort('server should be healthy');
+  }
+
+  console.log('inserting base objects');
+  for (let i = 0; i < data.base.length; i++) {
+    if (i % 100 === 0) {
+      console.log(`inserted ${i} / ${data.base.length}`);
+    }
+    objectStoreClient.writeObject(data.base[i], { randomizeData: false, checkCreatedOrUpdated: false });
+  }
+}
+
+export function teardown() {
+  const toDelete = [...data.base, ...data.toWrite, data.size1mb, data.size4mb, data.size100kb];
+
+  console.log('deleting base objects');
+  for (let i = 0; i < toDelete.length; i++) {
+    if (i % 100 === 0) {
+      console.log(`deleted ${i} / ${data.base.length}`);
+    }
+    objectStoreClient.deleteObject(toDelete[i].uid, toDelete[i].kind);
+  }
+}
+
+export function reader() {
+  const item = data.base[execution.scenario.iterationInTest % data.base.length];
+  objectStoreClient.readObject(item.uid, item.kind);
+}
+
+export function writer() {
+  const item = data.toWrite[execution.scenario.iterationInTest % data.toWrite.length];
+  objectStoreClient.writeObject(item, { randomizeData: true, checkCreatedOrUpdated: true });
+}
+
+export function writer1mb() {
+  objectStoreClient.writeObject(data.size1mb, { randomizeData: true, checkCreatedOrUpdated: true });
+}
+
+export function reader1mb() {
+  const item = data.size1mb;
+  objectStoreClient.readObject(item.uid, item.kind);
+}
+
+export function writer4mb() {
+  objectStoreClient.writeObject(data.size4mb, { randomizeData: true, checkCreatedOrUpdated: true });
+}
+
+export function reader4mb() {
+  const item = data.size4mb;
+  objectStoreClient.readObject(item.uid, item.kind);
+}
--- a/devenv/docker/loadtest-ts/src/prepare-data.ts
+++ b/devenv/docker/loadtest-ts/src/prepare-data.ts
@@ -0,0 +1,57 @@
+import shortid from 'shortid';
+
+import { prepareDashboard } from './get-large-dashboard';
+
+export type Object = {
+  data: Record<string, unknown>;
+  kind: string;
+  uid: string;
+};
+
+export type Data = {
+  base: Object[]; // objects that are inserted in the test setup and removed only in the teardown
+  toWrite: Object[]; // objects that are inserted by scenarios and removed after a short period of time: Object;
+  size100kb: Object;
+  size1mb: Object;
+  size4mb: Object;
+};
+
+export const readAsObjects = (paths: string[], kind: string): Object[] => {
+  return paths.map((p) => ({
+    data: JSON.parse(open(p)),
+    uid: shortid.generate(),
+    kind,
+  }));
+};
+
+export const getBase = (uniqueObjects: Object[], no: number): Object[] => {
+  const base = new Array<Object>(no);
+  for (let i = 0; i < no; i++) {
+    const obj = uniqueObjects[Math.floor(i % uniqueObjects.length)];
+    base[i] = {
+      ...obj,
+      uid: `${obj.uid}-${Math.floor(i / uniqueObjects.length)}`,
+    };
+  }
+
+  return base;
+};
+
+const prepareObject = (lengthInKb: number): Object => {
+  return {
+    data: prepareDashboard(lengthInKb),
+    kind: 'dashboard',
+    uid: shortid(),
+  };
+};
+
+export const prepareData = (dashboardFilePaths: string[], baseNumber: number): Data => {
+  const objects = readAsObjects(dashboardFilePaths, 'dashboard');
+  return {
+    base: getBase(objects, baseNumber),
+    toWrite: objects,
+    size100kb: prepareObject(100),
+    size1mb: prepareObject(1000),
+    size4mb: prepareObject(4000),
+  };
+};
--- a/devenv/docker/loadtest-ts/tsconfig.json
+++ b/devenv/docker/loadtest-ts/tsconfig.json
@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "moduleResolution": "node",
+    "module": "commonjs",
+    "noEmit": true,
+    "allowJs": true,
+    "removeComments": false,
+
+    "strict": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+
+    "skipLibCheck": true
+  }
+}
--- a/devenv/docker/loadtest-ts/webpack.config.js
+++ b/devenv/docker/loadtest-ts/webpack.config.js
@@ -0,0 +1,37 @@
+const path = require('path');
+const GlobEntries = require('webpack-glob-entries');
+
+module.exports = {
+  mode: 'production',
+  entry: GlobEntries('./src/*test*.ts'), // Generates multiple entry for each test
+  output: {
+    path: path.join(__dirname, 'dist'),
+    libraryTarget: 'commonjs',
+    filename: '[name].js',
+    clean: true,
+  },
+  resolve: {
+    extensions: ['.ts', '.js'],
+  },
+  module: {
+    rules: [
+      {
+        test: /\.ts$/,
+        use: 'babel-loader',
+        exclude: /node_modules/,
+      },
+    ],
+  },
+  target: 'web',
+  externals: /^(k6|https?\:\/\/)(\/.*)?/,
+  // Generate map files for compiled scripts
+  devtool: 'source-map',
+  stats: {
+    colors: true,
+  },
+  plugins: [],
+  optimization: {
+    // Don't minimize, as it's not used in the browser
+    minimize: false,
+  },
+};
--- a/devenv/docker/loadtest-ts/yarn.lock
+++ b/devenv/docker/loadtest-ts/yarn.lock
--- a/devenv/jsonnet/dev-dashboards.libsonnet
+++ b/devenv/jsonnet/dev-dashboards.libsonnet
@@ -149,13 +149,6 @@ local dashboard = grafana.dashboard;
        id: 0,
      }
    },
-    dashboard.new('datadata-macros', import '../dev-dashboards/feature-templating/datadata-macros.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
    dashboard.new('demo1', import '../dev-dashboards/datasource-testdata/demo1.json') +
    resource.addMetadata('folder', 'dev-dashboards') +
    {
@@ -380,13 +373,6 @@ local dashboard = grafana.dashboard;
        id: 0,
      }
    },
-    dashboard.new('migrations', import '../dev-dashboards/migrations/migrations.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
    dashboard.new('mssql_fakedata', import '../dev-dashboards/datasource-mssql/mssql_fakedata.json') +
    resource.addMetadata('folder', 'dev-dashboards') +
    {
--- a/Show More
+++ b/Show More