Update what's new url (#78065 )

[v10.2.x] Dashboards: Fix issue causing crashes when saving new dashboard (#77641 )
* Dashboards: Fix issue causing crashes when saving new dashboard (#77620) Closes #77593 (cherry picked from commit c98add6e5a) * Test fix --------- Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com> Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
2023-11-13 17:44:32 +02:00 · 2023-11-13 17:19:46 +02:00 · 2023-11-13 06:50:13 -08:00 · 2023-11-13 13:03:01 +00:00 · 2023-11-10 19:54:30 +02:00 · 2023-11-10 14:29:53 +01:00
5889 changed files with 164347 additions and 397509 deletions
--- a/.betterer.results
+++ b/.betterer.results
--- a/.betterer.results.json
+++ b/.betterer.results.json
--- a/.betterer.ts
+++ b/.betterer.ts
@@ -5,26 +5,19 @@ import path from 'path';
 import { glob } from 'glob';

 // Why are we ignoring these?
-// They're all deprecated/being removed so doesn't make sense to fix types
+// They're all deprecated/being removed soon so doesn't make sense to fix types
 const eslintPathsToIgnore = [
  'packages/grafana-e2e', // deprecated.
  'public/app/angular', // will be removed in Grafana 11
  'public/app/plugins/panel/graph', // will be removed alongside angular
-  'public/app/plugins/panel/table-old', // will be removed alongside angular
 ];

-// Avoid using functions that report the position of the issues, as this causes a lot of merge conflicts
 export default {
  'better eslint': () =>
    countEslintErrors()
      .include('**/*.{ts,tsx}')
      .exclude(new RegExp(eslintPathsToIgnore.join('|'))),
  'no undocumented stories': () => countUndocumentedStories().include('**/!(*.internal).story.tsx'),
-  'no gf-form usage': () =>
-    regexp(
-      /gf-form/gm,
-      'gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.'
-    ).include('**/*.{ts,tsx,html}'),
 };

 function countUndocumentedStories() {
@@ -32,16 +25,9 @@ function countUndocumentedStories() {
    await Promise.all(
      filePaths.map(async (filePath) => {
        // look for .mdx import in the story file
-        const mdxImportRegex = new RegExp("^import.*\\.mdx';$", 'gm');
-        // Looks for the "autodocs" string in the file
-        const autodocsStringRegex = /autodocs/;
-
+        const regex = new RegExp("^import.*.mdx';$", 'gm');
        const fileText = await fs.readFile(filePath, 'utf8');
-
-        const hasMdxImport = mdxImportRegex.test(fileText);
-        const hasAutodocsString = autodocsStringRegex.test(fileText);
-        // If both .mdx import and autodocs string are missing, add an issue
-        if (!hasMdxImport && !hasAutodocsString) {
+        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:
@@ -52,28 +38,6 @@ function countUndocumentedStories() {
  });
 }

-/**
- *  Generic regexp pattern matcher, similar to @betterer/regexp.
- *  The only difference is that the positions of the errors are not reported, as this may cause a lot of merge conflicts.
- */
-function regexp(pattern: RegExp, issueMessage: string) {
-  return new BettererFileTest(async (filePaths, fileTestResult) => {
-    await Promise.all(
-      filePaths.map(async (filePath) => {
-        const fileText = await fs.readFile(filePath, 'utf8');
-        const matches = fileText.match(pattern);
-        if (matches) {
-          // File contents doesn't matter, since we're not reporting the position
-          const file = fileTestResult.addFile(filePath, '');
-          matches.forEach(() => {
-            file.addIssue(0, 0, issueMessage);
-          });
-        }
-      })
-    );
-  });
-}
-
 function countEslintErrors() {
  return new BettererFileTest(async (filePaths, fileTestResult, resolver) => {
    const { baseDirectory } = resolver;
--- a/.bingo/Variables.mk
+++ b/.bingo/Variables.mk
@@ -2,12 +2,7 @@
 # All tools are designed to be build inside $GOBIN.
 BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 GOPATH ?= $(shell go env GOPATH)
-ifeq ($(OS),Windows_NT)
-	PATHSEP := $(if $(COMSPEC),;,:)
-	GOBIN  ?= $(firstword $(subst $(PATHSEP), ,$(subst \,/,${GOPATH})))/bin
-else
-	GOBIN  ?= $(firstword $(subst :, ,${GOPATH}))/bin
-endif
+GOBIN  ?= $(firstword $(subst :, ,${GOPATH}))/bin
 GO     ?= $(shell which go)

 # Below generated variables ensure that every time a tool under each variable is invoked, the correct version
--- a/.bingo/wire.mod
+++ b/.bingo/wire.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

 go 1.16

-require github.com/google/wire v0.6.0 // cmd/wire
+require github.com/google/wire v0.5.0 // cmd/wire
--- a/.bingo/wire.sum
+++ b/.bingo/wire.sum
@@ -1,66 +1,13 @@
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/subcommands v1.0.1 h1:/eqq+otEXm5vhfBrbREPCSVQbvofip6kIz+mX5TUH7k=
 github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
-github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE=
-github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8=
 github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU=
-github.com/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI=
-github.com/google/wire v0.6.0/go.mod h1:F4QhpQ9EDIdJ1Mbop/NZBRB+5yrR6qg3BnctaoUk6NA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
-golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
-golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
-golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b h1:NVD8gBK33xpdqCaZVVtd6OFJp+3dxkXuz7+U7KaVN6s=
 golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
-golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
-golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
--- a/.bra.toml
+++ b/.bra.toml
@@ -1,6 +1,5 @@
 [run]
 init_cmds = [
-  ["GO_BUILD_DEV=1", "make", "gen-go"],
  ["GO_BUILD_DEV=1", "make", "build-go"],
  ["make", "gen-jsonnet"],
  ["./bin/grafana", "server", "-packaging=dev", "cfg:app_mode=development"]
@@ -17,7 +16,6 @@ watch_exts = [".go", ".ini", ".toml", ".template.html"]
 ignore_files = [".*_gen.go"]
 build_delay = 1500
 cmds = [
-  ["GO_BUILD_DEV=1", "make", "gen-go"],
  ["GO_BUILD_DEV=1", "make", "build-go"],
  ["make", "gen-jsonnet"],
  ["./bin/grafana", "server", "-packaging=dev", "cfg:app_mode=development"]
--- a/.drone.star
+++ b/.drone.star
@@ -19,6 +19,7 @@ load(
 )
 load(
    "scripts/drone/pipelines/ci_images.star",
+    "publish_ci_build_container_image_pipeline",
    "publish_ci_windows_test_image_pipeline",
 )
 load(
@@ -50,6 +51,7 @@ def main(_ctx):
        }, "oss", "testing")] +
        integration_test_pipelines() +
        publish_ci_windows_test_image_pipeline() +
+        publish_ci_build_container_image_pipeline() +
        cronjobs() +
        secrets()
    )
--- a/.drone.yml
+++ b/.drone.yml
--- a/.eslintrc
+++ b/.eslintrc
@@ -96,26 +96,8 @@
    },
    {
      "files": [
-        "public/app/plugins/datasource/grafana-postgresql-datasource/*.{ts,tsx}",
-        "public/app/plugins/datasource/grafana-postgresql-datasource/**/*.{ts,tsx}",
-        "public/app/plugins/datasource/grafana-pyroscope-datasource/*.{ts,tsx}",
-        "public/app/plugins/datasource/grafana-pyroscope-datasource/**/*.{ts,tsx}",
        "public/app/plugins/datasource/grafana-testdata-datasource/*.{ts,tsx}",
-        "public/app/plugins/datasource/grafana-testdata-datasource/**/*.{ts,tsx}",
-        "public/app/plugins/datasource/azuremonitor/*.{ts,tsx}",
-        "public/app/plugins/datasource/azuremonitor/**/*.{ts,tsx}",
-        "public/app/plugins/datasource/cloud-monitoring/*.{ts,tsx}",
-        "public/app/plugins/datasource/cloud-monitoring/**/*.{ts,tsx}",
-        "public/app/plugins/datasource/mysql/*.{ts,tsx}",
-        "public/app/plugins/datasource/mysql/**/*.{ts,tsx}",
-        "public/app/plugins/datasource/parca/*.{ts,tsx}",
-        "public/app/plugins/datasource/parca/**/*.{ts,tsx}",
-        "public/app/plugins/datasource/tempo/*.{ts,tsx}",
-        "public/app/plugins/datasource/tempo/**/*.{ts,tsx}",
-        "public/app/plugins/datasource/loki/*.{ts,tsx}",
-        "public/app/plugins/datasource/loki/**/*.{ts,tsx}",
-        "public/app/plugins/datasource/elasticsearch/*.{ts,tsx}",
-        "public/app/plugins/datasource/elasticsearch/**/*.{ts,tsx}"
+        "public/app/plugins/datasource/grafana-testdata-datasource/**/*.{ts,tsx}"
      ],
      "settings": {
        "import/resolver": {
@@ -131,8 +113,8 @@
            "zones": [
              {
                "target": "./public/app/plugins",
-                "from": "./public",
-                "except": ["./app/plugins"],
+                "from": "./public/app",
+                "except": ["./plugins"],
                "message": "Core plugins are not allowed to depend on Grafana core packages"
              }
            ]
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -12,9 +12,9 @@
 # This should make it easy to add new rules without breaking existing ones.

 # Documentation
-/.changelog-archive @grafana/grafana-release-guild
+/.changelog-archive @grafana/grafana-delivery
 /.codespellignore @grafana/docs-tooling
-/CHANGELOG.md @grafana/grafana-release-guild
+/CHANGELOG.md @grafana/grafana-delivery
 /CODE_OF_CONDUCT.md @grafana/grafana-community-support
 /CONTRIBUTING.md @grafana/grafana-community-support
 /GOVERNANCE.md @RichiH
@@ -38,7 +38,7 @@
 # Documentation sources might have different owners.
 /docs/                                                                       @grafana/docs-tooling
 /docs/sources/                                                               @Eve832
-/docs/sources/administration/                                                @jdbaldry
+/docs/sources/administration/                                                @Eve832 @GrafanaWriter
 /docs/sources/alerting/                                                      @brendamuir
 /docs/sources/dashboards/                                                    @imatwawana
 /docs/sources/datasources/                                                   @lwandz13
@@ -48,7 +48,6 @@
 /docs/sources/introduction/                                                  @chri2547
 /docs/sources/old-alerting/                                                  @brendamuir
 /docs/sources/panels-visualizations/                                         @imatwawana
-/docs/sources/panels-visualizations/query-transform-data/transform-data/index.md  @imatwawana @baldm0mma
 /docs/sources/release-notes/                                                 @Eve832 @GrafanaWriter
 /docs/sources/setup-grafana/                                                 @chri2547
 /docs/sources/upgrade-guide/                                                 @imatwawana
@@ -65,15 +64,13 @@
 /.golangci.toml @grafana/backend-platform
 /build.go @grafana/backend-platform
 /scripts/modowners/ @grafana/backend-platform
-/hack/ @grafana/grafana-app-platform-squad

 /pkg/api/ @grafana/backend-platform
 /pkg/apis/ @grafana/grafana-app-platform-squad
 /pkg/bus/ @grafana/backend-platform
 /pkg/cmd/ @grafana/backend-platform
-/pkg/cmd/grafana/apiserver @grafana/grafana-app-platform-squad
-/pkg/components/apikeygen/ @grafana/identity-access-team
-/pkg/components/satokengen/ @grafana/identity-access-team
+/pkg/components/apikeygen/ @grafana/grafana-authnz-team
+/pkg/components/satokengen/ @grafana/grafana-authnz-team
 /pkg/components/dashdiffs/ @grafana/backend-platform
 /pkg/components/imguploader/ @grafana/backend-platform
 /pkg/components/loki/ @grafana/backend-platform
@@ -84,6 +81,7 @@
 /pkg/ifaces/ @grafana/backend-platform
 /pkg/infra/appcontext/ @grafana/backend-platform
 /pkg/infra/db/ @grafana/backend-platform
+/pkg/infra/grn/ @grafana/backend-platform
 /pkg/infra/localcache/ @grafana/backend-platform
 /pkg/infra/log/ @grafana/backend-platform
 /pkg/infra/metrics/ @grafana/backend-platform
@@ -99,16 +97,17 @@
 /pkg/models/ @grafana/backend-platform
 /pkg/server/ @grafana/backend-platform
 /pkg/services/annotations/ @grafana/backend-platform
-/pkg/services/apikey/ @grafana/identity-access-team
+/pkg/services/apikey/ @grafana/grafana-authnz-team
 /pkg/services/cleanup/ @grafana/backend-platform
 /pkg/services/contexthandler/ @grafana/backend-platform
 /pkg/services/correlations/ @grafana/explore-squad
 /pkg/services/dashboardimport/ @grafana/backend-platform
 /pkg/services/dashboards/ @grafana/backend-platform
+/pkg/services/dashboardsnapshots/ @grafana/sharing-squad
 /pkg/services/dashboardversion/ @grafana/backend-platform
 /pkg/services/encryption/ @grafana/backend-platform
 /pkg/services/folder/ @grafana/backend-platform
-/pkg/services/apiserver @grafana/grafana-app-platform-squad
+/pkg/services/grafana-apiserver @grafana/grafana-app-platform-squad
 /pkg/services/hooks/ @grafana/backend-platform
 /pkg/services/kmsproviders/ @grafana/backend-platform
 /pkg/services/licensing/ @grafana/backend-platform
@@ -116,8 +115,10 @@
 /pkg/services/notifications/ @grafana/backend-platform
 /pkg/services/org/ @grafana/backend-platform
 /pkg/services/playlist/ @grafana/grafana-app-platform-squad
+/pkg/services/plugindashboards/ @grafana/backend-platform
 /pkg/services/preference/ @grafana/backend-platform
 /pkg/services/provisioning/ @grafana/backend-platform
+/pkg/services/publicdashboards/ @grafana/sharing-squad
 /pkg/services/query/ @grafana/backend-platform
 /pkg/services/queryhistory/ @grafana/backend-platform
 /pkg/services/quota/ @grafana/backend-platform
@@ -128,26 +129,27 @@
 /pkg/services/secrets/ @grafana/backend-platform
 /pkg/services/shorturls/ @grafana/backend-platform
 /pkg/services/sqlstore/ @grafana/backend-platform
-/pkg/services/ssosettings/ @grafana/identity-access-team
 /pkg/services/star/ @grafana/backend-platform
 /pkg/services/stats/ @grafana/backend-platform
 /pkg/services/tag/ @grafana/backend-platform
-/pkg/services/team/ @grafana/identity-access-team
+/pkg/services/team/ @grafana/grafana-authnz-team
 /pkg/services/temp_user/ @grafana/backend-platform
 /pkg/services/updatechecker/ @grafana/backend-platform
-/pkg/services/user/ @grafana/identity-access-team
+/pkg/services/user/ @grafana/grafana-authnz-team
 /pkg/services/validations/ @grafana/backend-platform
 /pkg/setting/ @grafana/backend-platform
 /pkg/tests/ @grafana/backend-platform
-/pkg/tests/apis/ @grafana/grafana-app-platform-squad
 /pkg/tests/api/correlations/ @grafana/explore-squad
 /pkg/tsdb/grafanads/ @grafana/backend-platform
+/pkg/tsdb/intervalv2/ @grafana/backend-platform
 /pkg/tsdb/legacydata/ @grafana/backend-platform
 /pkg/tsdb/opentsdb/ @grafana/backend-platform
 /pkg/tsdb/sqleng/ @grafana/partner-datasources @grafana/oss-big-tent
+/pkg/tsdb/sqleng/proxyutil @grafana/hosted-grafana-team
 /pkg/util/ @grafana/backend-platform
 /pkg/web/ @grafana/backend-platform

+/pkg/services/grpcserver/ @grafana/backend-platform
 /pkg/infra/kvstore/ @grafana/backend-platform
 /pkg/infra/fs/ @grafana/backend-platform
 /pkg/infra/x/ @grafana/backend-platform
@@ -155,7 +157,7 @@

 # devenv
 # Backend code, developers environment
-/devenv/docker/blocks/auth/ @grafana/identity-access-team
+/devenv/docker/blocks/auth/ @grafana/grafana-authnz-team

 # Logs code, developers environment
 /devenv/docker/blocks/loki* @grafana/observability-logs
@@ -183,13 +185,13 @@
 /devenv/docker/blocks/influxdb1/ @grafana/observability-metrics
 /devenv/docker/blocks/jaeger/ @grafana/observability-traces-and-profiling
 /devenv/docker/blocks/maildev/ @grafana/alerting-frontend
-/devenv/docker/blocks/mariadb/ @grafana/oss-big-tent
+/devenv/docker/blocks/mariadb/ @grafana/grafana-bi-squad
 /devenv/docker/blocks/memcached/ @grafana/backend-platform
 /devenv/docker/blocks/mimir_backend/ @grafana/alerting-backend-product
-/devenv/docker/blocks/mssql/ @grafana/partner-datasources
-/devenv/docker/blocks/mssql_arm64/ @grafana/partner-datasources
-/devenv/docker/blocks/mssql_tests/ @grafana/partner-datasources
-/devenv/docker/blocks/mssql_tls/ @grafana/partner-datasources
+/devenv/docker/blocks/mssql/ @grafana/grafana-bi-squad
+/devenv/docker/blocks/mssql_arm64/ @grafana/grafana-bi-squad
+/devenv/docker/blocks/mssql_tests/ @grafana/grafana-bi-squad
+/devenv/docker/blocks/mssql_tls/ @grafana/grafana-bi-squad
 /devenv/docker/blocks/mysql/ @grafana/oss-big-tent
 /devenv/docker/blocks/mysql_exporter/ @grafana/oss-big-tent
 /devenv/docker/blocks/mysql_opendata/ @grafana/oss-big-tent
@@ -228,15 +230,15 @@


 # Continuous Integration
-.drone.yml @grafana/grafana-release-guild
-.drone.star @grafana/grafana-release-guild
-/scripts/drone/ @grafana/grafana-release-guild
-/pkg/build/ @grafana/grafana-release-guild
-/.dockerignore @grafana/grafana-release-guild
-/Dockerfile @grafana/grafana-release-guild
-/Makefile @grafana/grafana-release-guild
-/scripts/build/ @grafana/grafana-release-guild
-/scripts/list-release-artifacts.sh @grafana/grafana-release-guild
+.drone.yml @grafana/grafana-delivery
+.drone.star @grafana/grafana-delivery
+/scripts/drone/ @grafana/grafana-delivery
+/pkg/build/ @grafana/grafana-delivery
+/.dockerignore @grafana/grafana-delivery
+/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
@@ -253,12 +255,10 @@
 /pkg/tsdb/grafana-pyroscope-datasource/ @grafana/observability-traces-and-profiling
 /pkg/tsdb/parca/ @grafana/observability-traces-and-profiling

-# OSS Big Tent backend code
+# BI backend code
 /pkg/tsdb/mysql/ @grafana/oss-big-tent
-/pkg/tsdb/grafana-postgresql-datasource/ @grafana/oss-big-tent
-
-# Partner Datasources backend code
-/pkg/tsdb/mssql/ @grafana/partner-datasources
+/pkg/tsdb/postgres/ @grafana/oss-big-tent
+/pkg/tsdb/mssql/ @grafana/grafana-bi-squad

 # Database migrations
 /pkg/services/sqlstore/migrations/ @grafana/backend-platform @grafana/hosted-grafana-team
@@ -269,10 +269,9 @@
 /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
-/pkg/services/grpcserver/ @grafana/grafana-app-platform-squad
-/pkg/generated @grafana/grafana-app-platform-squad

 # Alerting
 /pkg/services/ngalert/ @grafana/alerting-backend-product
@@ -294,9 +293,7 @@
 /pkg/services/pluginsintegration/ @grafana/plugins-platform-backend
 /pkg/plugins/pfs/ @grafana/plugins-platform-backend @grafana/grafana-as-code
 /pkg/tsdb/grafana-testdata-datasource/ @grafana/plugins-platform-backend
-/pkg/tsdb/Magefile.go @grafana/plugins-platform-backend
 /pkg/services/pluginsintegration/pluginsettings/ @grafana/plugins-platform-backend
-/pkg/services/plugindashboards/ @grafana/plugins-platform-backend

 # Backend code docs
 /contribute/backend/ @grafana/backend-platform
@@ -313,10 +310,12 @@
 /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/Table/ @grafana/dataviz-squad
-/packages/grafana-ui/src/components/Table/SparklineCell.tsx @grafana/dataviz-squad @grafana/app-o11y-visualizations
+/packages/grafana-ui/src/components/Table/ @grafana/grafana-bi-squad
 /packages/grafana-ui/src/components/Gauge/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/BarGauge/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/GraphNG/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/Graph/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/TimeSeries/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/uPlot/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/DataLinks/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/ValuePicker/ @grafana/dataviz-squad
@@ -324,26 +323,18 @@
 /packages/grafana-ui/src/components/VizLegend/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/VizRepeater/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/VizTooltip/ @grafana/dataviz-squad
-/packages/grafana-ui/src/components/Sparkline/ @grafana/grafana-frontend-platform @grafana/app-o11y-visualizations
-/packages/grafana-ui/src/graveyard/Graph/ @grafana/dataviz-squad
-/packages/grafana-ui/src/graveyard/GraphNG/ @grafana/dataviz-squad
-/packages/grafana-ui/src/graveyard/TimeSeries/ @grafana/dataviz-squad
 /packages/grafana-ui/src/utils/storybook/ @grafana/plugins-platform-frontend
-/packages/grafana-data/src/transformations/ @grafana/dataviz-squad
+/packages/grafana-data/src/transformations/ @grafana/grafana-bi-squad
 /packages/grafana-data/src/**/*logs* @grafana/observability-logs
 /packages/grafana-schema/src/**/*tempo* @grafana/observability-traces-and-profiling
-/packages/grafana-schema/src/**/*canvas* @grafana/dataviz-squad
 /packages/grafana-flamegraph/ @grafana/observability-traces-and-profiling
 /plugins-bundled/ @grafana/plugins-platform-frontend
-/packages/grafana-plugin-configs/ @grafana/plugins-platform-frontend
-/packages/grafana-prometheus/ @grafana/observability-metrics
-/packages/grafana-o11y-ds-frontend/ @grafana/observability-logs @grafana/observability-traces-and-profiling
-/packages/grafana-sql/ @grafana/partner-datasources @grafana/oss-big-tent
+

 # root files, mostly frontend
-/.browserslistrc @grafana/frontend-ops
-/package.json @grafana/frontend-ops
-/tsconfig.json @grafana/frontend-ops
+.browserslistrc @grafana/frontend-ops
+package.json @grafana/frontend-ops
+tsconfig.json @grafana/frontend-ops
 /.editorconfig @grafana/frontend-ops
 /.eslintignore @grafana/frontend-ops
 /.gitattributes @grafana/frontend-ops
@@ -353,7 +344,8 @@
 /.yarn @grafana/frontend-ops
 /.yarnrc.yml @grafana/frontend-ops
 /yarn.lock @grafana/frontend-ops
-/lerna.json @grafana/frontend-ops
+/babel.config.json @grafana/frontend-ops
+lerna.json @grafana/frontend-ops
 /.prettierrc.js @grafana/frontend-ops
 /.eslintrc @grafana/frontend-ops
 /.vim @zoltanbedi
@@ -364,23 +356,21 @@
 /tools/ @grafana/frontend-ops
 /lefthook.yml @grafana/frontend-ops
 /lefthook.rc @grafana/frontend-ops
-/.husky/pre-commit @grafana/frontend-ops
-/cypress.config.js @grafana/grafana-frontend-platform
-/.levignore.js @grafana/plugins-platform-frontend
+.husky/pre-commit @grafana/frontend-ops
+cypress.config.js @grafana/grafana-frontend-platform
+.levignore.js @grafana/plugins-platform-frontend


 # 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/core/components/GraphNG/ @grafana/dataviz-squad
-/public/app/core/components/TimeSeries/ @grafana/dataviz-squad
-/public/app/core/components/TimelineChart/ @grafana/dataviz-squad
+/public/app/core/components/TraceToLogs @grafana/observability-traces-and-profiling
 /public/app/features/all.ts @grafana/grafana-frontend-platform
-/public/app/features/admin/ @grafana/identity-access-team
-/public/app/features/auth-config/ @grafana/identity-access-team
-/public/app/features/annotations/ @grafana/dashboards-squad
-/public/app/features/api-keys/ @grafana/identity-access-team
+/public/app/features/admin/ @grafana/grafana-authnz-team
+/public/app/features/auth-config/ @grafana/grafana-authnz-team
+/public/app/features/annotations/ @grafana/grafana-frontend-platform
+/public/app/features/api-keys/ @grafana/grafana-authnz-team
 /public/app/features/canvas/ @grafana/dataviz-squad
 /public/app/features/geo/ @grafana/dataviz-squad
 /public/app/features/visualization/data-hover/ @grafana/dataviz-squad
@@ -388,11 +378,11 @@
 /public/app/features/connections/ @grafana/plugins-platform-frontend @mikkancso
 /public/app/features/correlations/ @grafana/explore-squad
 /public/app/features/dashboard/ @grafana/dashboards-squad
-/public/app/features/dashboard/components/TransformationsEditor/ @grafana/dataviz-squad
+/public/app/features/dashboard/components/TransformationsEditor/ @grafana/grafana-bi-squad
 /public/app/features/dashboard-scene/ @grafana/dashboards-squad
 /public/app/features/datasources/ @grafana/plugins-platform-frontend @mikkancso
 /public/app/features/dimensions/ @grafana/dataviz-squad
-/public/app/features/dataframe-import/ @grafana/dataviz-squad
+/public/app/features/dataframe-import/ @grafana/grafana-bi-squad
 /public/app/features/explore/ @grafana/explore-squad
 /public/app/features/expressions/ @grafana/observability-metrics
 /public/app/features/folders/ @grafana/grafana-frontend-platform
@@ -407,20 +397,20 @@
 /public/app/features/panel/ @grafana/dashboards-squad
 /public/app/features/playlist/ @grafana/dashboards-squad
 /public/app/features/plugins/ @grafana/plugins-platform-frontend
+/public/app/features/plugins/sql/ @grafana/partner-datasources @grafana/oss-big-tent
 /public/app/features/profile/ @grafana/grafana-frontend-platform
 /public/app/features/runtime/ @ryantxu
 /public/app/features/query/ @grafana/dashboards-squad
 /public/app/features/sandbox/ @grafana/grafana-frontend-platform
+/public/app/features/scenes/ @grafana/dashboards-squad
 /public/app/features/browse-dashboards/ @grafana/grafana-frontend-platform
 /public/app/features/search/ @grafana/grafana-frontend-platform
-/public/app/features/serviceaccounts/ @grafana/identity-access-team
+/public/app/features/serviceaccounts/ @grafana/grafana-authnz-team
 /public/app/features/storage/ @grafana/grafana-app-platform-squad
-/public/app/features/teams/ @grafana/identity-access-team
+/public/app/features/teams/ @grafana/grafana-authnz-team
 /public/app/features/templating/ @grafana/dashboards-squad
-/public/app/features/trails/ @torkelo
 /public/app/features/transformers/ @grafana/dataviz-squad
-/public/app/features/transformers/timeSeriesTable/ @grafana/dataviz-squad @grafana/app-o11y-visualizations
-/public/app/features/users/ @grafana/identity-access-team
+/public/app/features/users/ @grafana/grafana-authnz-team
 /public/app/features/variables/ @grafana/dashboards-squad
 /public/app/plugins/panel/alertGroups/ @grafana/alerting-frontend
 /public/app/plugins/panel/alertlist/ @grafana/alerting-frontend
@@ -429,22 +419,21 @@
 /public/app/plugins/panel/bargauge/ @grafana/dataviz-squad
 /public/app/plugins/panel/dashlist/ @grafana/grafana-frontend-platform
 /public/app/plugins/panel/debug/ @ryantxu
-/public/app/plugins/panel/datagrid/ @grafana/dataviz-squad
+/public/app/plugins/panel/datagrid/ @grafana/grafana-bi-squad
 /public/app/plugins/panel/gauge/ @grafana/dataviz-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/logs/ @grafana/observability-logs
-/public/app/plugins/panel/nodeGraph/ @grafana/observability-traces-and-profiling @grafana/app-o11y-visualizations
+/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/dataviz-squad
 /public/app/plugins/panel/state-timeline/ @grafana/dataviz-squad
 /public/app/plugins/panel/status-history/ @grafana/dataviz-squad
-/public/app/plugins/panel/table/ @grafana/dataviz-squad
-/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx @grafana/dataviz-squad @grafana/app-o11y-visualizations
-/public/app/plugins/panel/table-old/ @grafana/dataviz-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/trend/ @grafana/dataviz-squad
 /public/app/plugins/panel/geomap/ @grafana/dataviz-squad
@@ -460,20 +449,18 @@
 /public/app/routes/ @grafana/grafana-frontend-platform
 /public/app/store/ @grafana/grafana-frontend-platform
 /public/app/types/ @grafana/grafana-frontend-platform
-/public/app/types/alerting.ts @grafana/alerting-frontend
 /public/dashboards/ @grafana/dashboards-squad
+/public/fonts/ @grafana/alerting-frontend
 /public/gazetteer/ @ryantxu
 /public/img/ @grafana/grafana-frontend-platform
 /public/lib/ @grafana/grafana-frontend-platform
 /public/lib/monaco-languages/kusto.ts @grafana/partner-datasources
 /public/maps/ @ryantxu
 /public/robots.txt @grafana/frontend-ops
-/public/fonts/ @grafana/grafana-frontend-platform
 /public/sass/ @grafana/grafana-frontend-platform
 /public/test/ @grafana/grafana-frontend-platform
 /public/test/helpers/alertingRuleEditor.tsx @grafana/alerting-frontend
 /public/views/ @grafana/grafana-frontend-platform
-/public/views/swagger.html @grafana/backend-platform

 /public/app/features/explore/Logs/ @grafana/observability-logs

@@ -497,39 +484,36 @@



-/scripts/benchmark-access-control.sh @grafana/identity-access-team
+/scripts/benchmark-access-control.sh @grafana/grafana-authnz-team
 /scripts/check-breaking-changes.sh @grafana/plugins-platform-frontend
-/scripts/ci-* @grafana/grafana-release-guild
-/scripts/circle-* @grafana/grafana-release-guild
-/scripts/publish-npm-packages.sh @grafana/grafana-release-guild @grafana/plugins-platform-frontend
-/scripts/validate-npm-packages.sh @grafana/grafana-release-guild @grafana/plugins-platform-frontend
-/scripts/ci-frontend-metrics.sh @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend @grafana/dataviz-squad
+/scripts/ci-* @grafana/grafana-delivery
+/scripts/circle-* @grafana/grafana-delivery
+/scripts/publish-npm-packages.sh @grafana/grafana-delivery @grafana/plugins-platform-frontend
+/scripts/validate-npm-packages.sh @grafana/grafana-delivery @grafana/plugins-platform-frontend
+/scripts/ci-frontend-metrics.sh @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
 /scripts/cli/ @grafana/grafana-frontend-platform
 /scripts/clean-git-or-error.sh @grafana/grafana-as-code
 /scripts/grafana-server/ @grafana/grafana-frontend-platform
-/scripts/helpers/ @grafana/grafana-release-guild
+/scripts/helpers/ @grafana/grafana-delivery
 /scripts/import_many_dashboards.sh @torkelo
 /scripts/mixin-check.sh @bergquist
 /scripts/openapi3/ @grafana/grafana-operator-experience-squad
 /scripts/prepare-packagejson.js @grafana/frontend-ops
 /scripts/protobuf-check.sh @grafana/plugins-platform-backend
 /scripts/stripnulls.sh @grafana/grafana-as-code
-/scripts/tag_release.sh @grafana/grafana-release-guild
-/scripts/trigger_docker_build.sh @grafana/grafana-release-guild
-/scripts/trigger_grafana_packer.sh @grafana/grafana-release-guild
-/scripts/trigger_windows_build.sh @grafana/grafana-release-guild
+/scripts/tag_release.sh @grafana/grafana-delivery
+/scripts/trigger_docker_build.sh @grafana/grafana-delivery
+/scripts/trigger_grafana_packer.sh @grafana/grafana-delivery
+/scripts/trigger_windows_build.sh @grafana/grafana-delivery
 /scripts/cleanup-husky.sh @grafana/frontend-ops
-/scripts/verify-repo-update/ @grafana/grafana-release-guild
-/scripts/generate-icon-bundle.js @grafana/plugins-platform-frontend @grafana/grafana-frontend-platform
-/scripts/levitate-parse-json-report.js @grafana/plugins-platform-frontend
+/scripts/verify-repo-update/ @grafana/grafana-delivery
+scripts/generate-icon-bundle.js @grafana/plugins-platform-frontend @grafana/grafana-frontend-platform

-/scripts/docs/generate-transformations.ts @grafana/dataviz-squad
 /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
 .betterer.results @grafanabot
-.betterer.results.json @grafanabot
 .betterer.ts @grafana/grafana-frontend-platform

 # @grafana/ui component documentation
@@ -550,10 +534,10 @@
 /public/app/plugins/datasource/jaeger/ @grafana/observability-traces-and-profiling
 /public/app/plugins/datasource/loki/ @grafana/observability-logs
 /public/app/plugins/datasource/mixed/ @grafana/dashboards-squad
-/public/app/plugins/datasource/mssql/ @grafana/partner-datasources
+/public/app/plugins/datasource/mssql/ @grafana/grafana-bi-squad
 /public/app/plugins/datasource/mysql/ @grafana/oss-big-tent
 /public/app/plugins/datasource/opentsdb/ @grafana/observability-metrics
-/public/app/plugins/datasource/grafana-postgresql-datasource/ @grafana/oss-big-tent
+/public/app/plugins/datasource/postgres/ @grafana/oss-big-tent
 /public/app/plugins/datasource/prometheus/ @grafana/observability-metrics
 /public/app/plugins/datasource/cloud-monitoring/ @grafana/partner-datasources
 /public/app/plugins/datasource/zipkin/ @grafana/observability-traces-and-profiling
@@ -562,14 +546,6 @@
 /public/app/plugins/datasource/parca/ @grafana/observability-traces-and-profiling
 /public/app/plugins/datasource/alertmanager/ @grafana/alerting-squad

-# Grafana Sharing Squad
-/public/app/features/dashboard/components/ShareModal/ @grafana/sharing-squad
-/public/app/features/manage-dashboards/components/PublicDashboardListTable/ @grafana/sharing-squad
-/public/app/features/dashboard/containers/PublicDashboardPage.tsx @grafana/sharing-squad
-/public/app/features/manage-dashboards/components/SnapshotListTable.tsx @grafana/sharing-squad
-/pkg/services/dashboardsnapshots/ @grafana/sharing-squad
-/pkg/services/publicdashboards/ @grafana/sharing-squad
-
 # SSE - Server Side Expressions
 /pkg/expr/ @grafana/observability-metrics

@@ -577,32 +553,31 @@
 /grafana-mixin/ @grafana/hosted-grafana-team

 # Grafana authentication and authorization
-/pkg/login/ @grafana/identity-access-team
-/pkg/services/accesscontrol/ @grafana/identity-access-team
-/pkg/services/anonymous/ @grafana/identity-access-team
-/pkg/services/auth/ @grafana/identity-access-team
-/pkg/services/authn/ @grafana/identity-access-team
-/pkg/services/signingkeys/ @grafana/identity-access-team
-/pkg/services/dashboards/accesscontrol.go @grafana/identity-access-team
-/pkg/services/datasources/guardian/ @grafana/identity-access-team
-/pkg/services/guardian/ @grafana/identity-access-team
-/pkg/services/ldap/ @grafana/identity-access-team
-/pkg/services/login/ @grafana/identity-access-team
-/pkg/services/loginattempt/ @grafana/identity-access-team
-/pkg/services/extsvcauth/ @grafana/identity-access-team
-/pkg/services/oauthtoken/ @grafana/identity-access-team
-/pkg/services/serviceaccounts/ @grafana/identity-access-team
+/pkg/login/ @grafana/grafana-authnz-team
+/pkg/services/accesscontrol/ @grafana/grafana-authnz-team
+/pkg/services/anonymous/ @grafana/grafana-authnz-team
+/pkg/services/auth/ @grafana/grafana-authnz-team
+/pkg/services/authn/ @grafana/grafana-authnz-team
+/pkg/services/signingkeys/ @grafana/grafana-authnz-team
+/pkg/services/dashboards/accesscontrol.go @grafana/grafana-authnz-team
+/pkg/services/datasources/guardian/ @grafana/grafana-authnz-team
+/pkg/services/guardian/ @grafana/grafana-authnz-team
+/pkg/services/ldap/ @grafana/grafana-authnz-team
+/pkg/services/login/ @grafana/grafana-authnz-team
+/pkg/services/loginattempt/ @grafana/grafana-authnz-team
+/pkg/services/extsvcauth/ @grafana/grafana-authnz-team
+/pkg/services/oauthtoken/ @grafana/grafana-authnz-team
+/pkg/services/serviceaccounts/ @grafana/grafana-authnz-team

 # Support bundles
-/public/app/features/support-bundles/ @grafana/identity-access-team
-/pkg/services/supportbundles/ @grafana/identity-access-team
+/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
 /pkg/services/caching/ @grafana/grafana-operator-experience-squad
 /pkg/services/featuremgmt/ @grafana/grafana-operator-experience-squad
-/pkg/services/cloudmigrations/ @grafana/grafana-operator-experience-squad

 # Kind definitions
 /kinds/dashboard @grafana/dashboards-squad
@@ -613,7 +588,6 @@ embed.go @grafana/grafana-as-code
 /pkg/kinds/ @grafana/grafana-as-code
 /pkg/cuectx/ @grafana/grafana-as-code
 /pkg/registry/ @grafana/grafana-as-code
-/pkg/registry/apis/ @grafana/grafana-app-platform-squad
 /pkg/codegen/ @grafana/grafana-as-code
 /pkg/kinds/*/*_gen.go @grafana/grafana-as-code
 /pkg/registry/corekind/ @grafana/grafana-as-code
@@ -634,52 +608,49 @@ embed.go @grafana/grafana-as-code
 /.github/renovate.json5 @grafana/frontend-ops
 /.github/teams.yml @armandgrillet
 /.github/workflows/alerting-swagger-gen.yml @grafana/alerting-backend-product
-/.github/workflows/auto-milestone.yml @grafana/grafana-release-guild
-/.github/workflows/backport.yml @grafana/grafana-release-guild
-/.github/workflows/bump-version.yml @grafana/grafana-release-guild
-/.github/workflows/close-milestone.yml @grafana/grafana-release-guild
+/.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/codeowners-validator.yml @tolzhabayev
 /.github/workflows/codeql-analysis.yml @DanCech
 /.github/workflows/commands.yml @torkelo
-/.github/workflows/community-release.yml @grafana/grafana-release-guild
+/.github/workflows/community-release.yml @grafana/grafana-delivery
 /.github/workflows/detect-breaking-changes-* @grafana/plugins-platform-frontend
 /.github/workflows/doc-validator.yml @grafana/docs-tooling
 /.github/workflows/epic-add-to-platform-ux-parent-project.yml @meanmina
-/.github/workflows/github-release.yml @grafana/grafana-release-guild
+/.github/workflows/github-release.yml @grafana/grafana-delivery
 /.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
 /.github/workflows/pr-checks.yml @marefr
 /.github/workflows/pr-codeql-analysis-go.yml @DanCech
 /.github/workflows/pr-codeql-analysis-javascript.yml @DanCech
 /.github/workflows/pr-codeql-analysis-python.yml @DanCech
 /.github/workflows/pr-commands.yml @marefr
-/.github/workflows/pr-patch-check.yml @grafana/grafana-release-guild
-/.github/workflows/sync-mirror.yml @grafana/grafana-release-guild
+/.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-tooling
 /.github/workflows/publish-technical-documentation-release.yml @grafana/docs-tooling
-/.github/workflows/remove-milestone.yml @grafana/grafana-release-guild
+/.github/workflows/remove-milestone.yml @grafana/grafana-delivery
 /.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-release-guild
-/.github/workflows/update-changelog.yml @grafana/grafana-release-guild
+/.github/workflows/stale.yml @grafana/grafana-delivery
+/.github/workflows/update-changelog.yml @grafana/grafana-delivery
 /.github/workflows/update-make-docs.yml @grafana/docs-tooling
 /.github/workflows/snyk.yml @grafana/security-team
-/.github/workflows/scripts/kinds/verify-kinds.go @grafana/platform-cat
-/.github/workflows/publish-kinds-next.yml @grafana/platform-cat
-/.github/workflows/publish-kinds-release.yml @grafana/platform-cat
-/.github/workflows/verify-kinds.yml @grafana/platform-cat
+/.github/workflows/scripts/kinds/verify-kinds.go @grafana/grafana-as-code
+/.github/workflows/publish-kinds-next.yml @grafana/grafana-as-code
+/.github/workflows/publish-kinds-release.yml @grafana/grafana-as-code
+/.github/workflows/verify-kinds.yml @grafana/grafana-as-code
 /.github/workflows/dashboards-issue-add-label.yml @grafana/dashboards-squad
 /.github/workflows/ephemeral-instances-pr-comment.yml @grafana/grafana-operator-experience-squad
 /.github/workflows/ephemeral-instances-pr-opened-closed.yml @grafana/grafana-operator-experience-squad
-/.github/workflows/create-security-patch-from-security-mirror.yml @grafana/grafana-release-guild
-/.github/workflows/core-plugins-build-and-release.yml @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
-/.github/workflows/i18n-crowdin-upload.yml @grafana/grafana-frontend-platform
-/.github/workflows/i18n-crowdin-download.yml @grafana/grafana-frontend-platform
-/.github/workflows/feature-toggle-cleanup.yml @tolzhabayev
-/.github/workflows/scripts/feature-toggle-cleanup/feature-toggle-cleanup.js @tolzhabayev
+/.github/workflows/create-security-patch-from-security-mirror.yml @grafana/grafana-delivery
+

 # Generated files not requiring owner approval
 /packages/grafana-data/src/types/featureToggles.gen.ts @grafanabot
@@ -691,9 +662,9 @@ embed.go @grafana/grafana-as-code
 # Conf
 /conf/defaults.ini @torkelo
 /conf/sample.ini @torkelo
-/conf/ldap.toml @grafana/identity-access-team
-/conf/ldap_multiple.toml @grafana/identity-access-team
-/conf/provisioning/access-control/ @grafana/identity-access-team
+/conf/ldap.toml @grafana/grafana-authnz-team
+/conf/ldap_multiple.toml @grafana/grafana-authnz-team
+/conf/provisioning/access-control/ @grafana/grafana-authnz-team
 /conf/provisioning/alerting/ @grafana/alerting-backend-product
 /conf/provisioning/dashboards/ @grafana/dashboards-squad
 /conf/provisioning/datasources/ @grafana/plugins-platform-backend
--- a/.github/ISSUE_TEMPLATE/1-feature_requests.md
+++ b/.github/ISSUE_TEMPLATE/1-feature_requests.md
@@ -1,6 +1,7 @@
 ---
 name: Feature Requests
 about: Suggest an enhancement or new feature for the Grafana project
+labels: 'type/feature-request'
 ---

 <!-- Please only use this template for submitting feature requests -->
@@ -17,4 +18,4 @@ about: Suggest an enhancement or new feature for the Grafana project

 **Who is this feature for?**

-[Add information on what kind of user the feature is for.]
+[Add information on what kind of user the feature is for.]
--- a/.github/bot.md
+++ b/.github/bot.md
@@ -9,8 +9,8 @@ Comment commands:

 Label commands:

-* Add label `bot/question` the bot will close with standard question message and add label `type/question`
-* Add label `bot/duplicate` the bot will close with standard duplicate message and add label `type/duplicate`
+* Add label `bot/question` the the bot will close with standard question message and add label `type/question`
+* Add label `bot/duplicate` the the bot will close with standard duplicate message and add label `type/duplicate`
 * Add label `bot/needs more info` for bot to request more info (or use comment command mentioned above)
 * Add label `bot/close feature request` for bot to close a feature request with standard message and adds label `not implemented`
 * Add label `bot/no new info` for bot to close an issue where we asked for more info but has not received any updates in at least 14 days.
--- a/.github/commands.json
+++ b/.github/commands.json
@@ -442,13 +442,5 @@
    "addToProject": {
      "url": "https://github.com/orgs/grafana/projects/72"
    }
-  },
-   {
-    "type": "label",
-    "name": "grafana program",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/471"
-    }
  }
 ]
--- a/.github/pr-checks.json
+++ b/.github/pr-checks.json
@@ -6,6 +6,25 @@
    "success": "Milestone set",
    "failure": "Milestone not set"
  },
+  {
+    "type": "check-label",
+    "title": "Backport Check",
+    "labels": {
+      "exists": "Backport enabled",
+      "notExists": "Backport decision needed",
+      "matches": [
+        "backport v*"
+      ]
+    },
+    "skip": {
+      "message": "Backport skipped",
+      "matches": [
+        "backport",
+        "no-backport"
+      ]
+    },
+    "targetUrl": "https://github.com/grafana/grafana/blob/main/contribute/merge-pull-request.md#should-the-pull-request-be-backported"
+  },
  {
    "type": "check-changelog",
    "title": "Changelog Check",
--- a/.github/pr-commands.json
+++ b/.github/pr-commands.json
@@ -23,6 +23,7 @@
        "package.json",
        "tsconfig.json",
        "lerna.json",
+        ".babelrc",
        ".prettierrc.js",
        ".eslintrc",
        "**/*.mdx"
@@ -148,13 +149,7 @@
  },
  {
    "type": "changedfiles",
-    "matches": [ "public/app/plugins/datasource/grafana-pyroscope-datasource/**/*", "pkg/tsdb/grafana-pyroscope-datasource/**/*"],
-    "action": "updateLabel",
-    "addLabel": "datasource/grafana-pyroscope"
-  },
-  {
-    "type": "changedfiles",
-    "matches": [ "public/app/plugins/datasource/grafana-postgresql-datasource/**/*", "pkg/tsdb/grafana-postgresql-datasource/**/*"],
+    "matches": [ "public/app/plugins/datasource/postgres/**/*", "pkg/tsdb/postgres/**/*"],
    "action": "updateLabel",
    "addLabel": "datasource/Postgres"
  },
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -4,22 +4,30 @@
  ],
  "enabledManagers": ["npm"],
  "ignoreDeps": [
-    "history", // we should bump this together with react-router-dom (see https://github.com/grafana/grafana/issues/76744)
-    "react-router-dom", // we should bump this together with history (see https://github.com/grafana/grafana/issues/76744)
-    "loader-utils", // v3 requires upstream changes in ngtemplate-loader. ignore, and remove when we remove angular.
+    "commander", // we are planning to remove this, so no need to update it
+    "execa", // we should bump this once we move to esm modules
+    "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
-    "@fingerprintjs/fingerprintjs", // we don't want to bump to v4 due to licensing changes
+    "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
+    "ts-loader", // we should remove ts-loader and use babel-loader instead
+    "ora", // we should bump this once we move to esm modules
+    "@locker/near-membrane-dom", // critical library. we need to bump this only intentionally
+    "@locker/near-membrane-shared", // critical library. we need to bump this only intentionally
+    "@locker/near-membrane-shared-dom", // critical library. we need to bump this only intentionally
  ],
  "includePaths": ["package.json", "packages/**", "public/app/plugins/**"],
-  "ignorePaths": ["emails/**", "plugins-bundled/**", "**/mocks/**", "packages/grafana-e2e/**"],
-  "labels": ["area/frontend", "dependencies", "no-changelog"],
+  "ignorePaths": ["emails/**", "plugins-bundled/**", "**/mocks/**"],
+  "labels": ["area/frontend", "dependencies", "no-backport", "no-changelog"],
  "postUpdateOptions": ["yarnDedupeHighest"],
  "packageRules": [
    {
-      "automerge": true,
-      "matchCurrentVersion": "!/^0/",
      "matchUpdateTypes": ["patch"],
-      "excludePackagePatterns": ["^@?storybook", "^@locker"]
+      "excludePackagePatterns": ["^@?storybook"],
+      "extends": ["schedule:monthly"],
+      "groupName": "Monthly patch updates"
    },
    {
      "matchPackagePatterns": ["^@?storybook"],
@@ -70,13 +78,6 @@
      ],
      "reviewers": ["leeoniya"],
    },
-    {
-      "groupName": "locker",
-      "matchPackagePrefixes": [
-        "@locker/"
-      ],
-      "reviewers": ["team:grafana/plugins-platform-frontend"],
-    },
  ],
  "pin": {
    "enabled": false
--- a/.github/workflows/alerting-swagger-gen.yml
+++ b/.github/workflows/alerting-swagger-gen.yml
@@ -16,7 +16,7 @@ jobs:
      - name: Set go version
        uses: actions/setup-go@v4
        with:
-          go-version: '1.21.10'
+          go-version: '1.20.10'
      - name: Build swagger
        run: |
          make -C pkg/services/ngalert/api/tooling post.json api.json
@@ -31,7 +31,7 @@ jobs:
            Please review and merge.
          branch: update-alerting-swagger-spec
          delete-branch: true
-          labels: 'area/alerting,type/docs,no-changelog'
+          labels: 'area/alerting,type/docs,no-backport,no-changelog'
          team-reviewers: 'grafana/alerting-backend-product'
          draft: false

--- a/.github/workflows/bump-version.yml
+++ b/.github/workflows/bump-version.yml
@@ -58,10 +58,10 @@ jobs:
      # Go is required for also updating the schema versions as part of the precommit hook:
      - uses: actions/setup-go@v4
        with:
-          go-version: '1.21'
-      - uses: actions/setup-node@v4
+          go-version: '1.20'
+      - uses: actions/setup-node@v3.8.1
        with:
-          node-version: '18'
+          node-version: '16'
      - name: Install Actions
        run: npm install --production --prefix ./actions
      - name: "Generate token"
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -47,7 +47,7 @@ jobs:
      name: Set go version
      uses: actions/setup-go@v4
      with:
-        go-version: '1.21.10'
+        go-version: '1.20.10'

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
--- a/.github/workflows/core-plugins-build-and-release.yml
+++ b/.github/workflows/core-plugins-build-and-release.yml
@@ -1,267 +0,0 @@
-name: Build and release core plugins
-
-on:
-  workflow_dispatch:
-    inputs:
-      plugin_id:
-        description: "ID of the plugin you want to publish"
-        required: true
-        type: choice
-        options:
-          - grafana-azure-monitor-datasource
-          - grafana-pyroscope-datasource
-          - grafana-testdata-datasource
-          - parca
-          - stackdriver
-          - tempo
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ inputs.plugin_id }}
-  cancel-in-progress: true
-
-env:
-  GRABPL_VERSION: 3.0.44
-  GCP_BUCKET: integration-artifacts # Dev: plugins-community-staging
-  GCOM_API: https://grafana.com # Dev: https://grafana-dev.com
-
-# These permissions are needed to assume roles from Github's OIDC.
-permissions:
-  contents: read
-  id-token: write
-
-jobs:
-  build-and-publish:
-    name: Build and publish ${{ inputs.plugin_id }}
-    runs-on: ubuntu-latest
-    outputs:
-      type: ${{ steps.get_dir.outputs.dir }}
-      has_backend: ${{ steps.check_backend.outputs.has_backend }}
-      version: ${{ steps.build_frontend.outputs.version }}
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-      - name: Verify inputs
-        run: |
-          if [ -z ${{ inputs.plugin_id }} ]; then echo "Missing plugin ID"; exit 1; fi
-      - id: get-secrets
-        uses: grafana/shared-workflows/actions/get-vault-secrets@main
-        with:
-          # Secrets placed in the ci/repo/grafana/<repo>/<path> path in Vault
-          repo_secrets: |
-            PLUGINS_GOOGLE_CREDENTIALS=core-plugins-build-and-release:PLUGINS_GOOGLE_CREDENTIALS
-            PLUGINS_GRAFANA_API_KEY=core-plugins-build-and-release:PLUGINS_GRAFANA_API_KEY
-            PLUGINS_GCOM_TOKEN=core-plugins-build-and-release:PLUGINS_GCOM_TOKEN
-      - name: 'Authenticate to Google Cloud'
-        uses: 'google-github-actions/auth@v2'
-        with:
-          credentials_json: '${{ env.PLUGINS_GOOGLE_CREDENTIALS }}'
-      - name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@v2'
-      - name: Setup nodejs environment
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-          cache: yarn
-      - name: Find plugin directory
-        shell: bash
-        id: get_dir
-        run: |
-          dir=$(dirname \
-            $(egrep -lir --include=plugin.json --exclude-dir=dist \
-              '"id": "${{ inputs.plugin_id }}"' \
-              public/app/plugins \
-            ) \
-          )
-          echo "dir=${dir}" >> $GITHUB_OUTPUT
-      - name: Install frontend dependencies
-        shell: bash
-        working-directory: ${{ steps.get_dir.outputs.dir }}
-        run: |
-          yarn install --immutable
-      - name: Download grabpl executable
-        shell: sh
-        working-directory: ${{ steps.get_dir.outputs.dir }}
-        run: |
-          [ ! -d ./bin ] && mkdir -pv ./bin || true
-          curl -fL -o ./bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v${{ env.GRABPL_VERSION }}/grabpl
-          chmod 0755 ./bin/grabpl
-      - name: Check backend
-        id: check_backend
-        shell: bash
-        run: |
-          if egrep -qr --include=main.go 'datasource.Manage\("${{ inputs.plugin_id }}"' pkg/tsdb; then
-            echo "has_backend=true" >> $GITHUB_OUTPUT
-          else
-            echo "has_backend=false" >> $GITHUB_OUTPUT
-          fi
-      - name: Setup golang environment
-        uses: actions/setup-go@v4
-        if: steps.check_backend.outputs.has_backend == 'true'
-        with:
-          go-version-file: go.mod
-      - name: Install Mage
-        shell: bash
-        if: steps.check_backend.outputs.has_backend == 'true'
-        run: |
-          go install github.com/magefile/mage
-      - name: Check tools
-        shell: bash
-        working-directory: ${{ steps.get_dir.outputs.dir }}
-        run: |
-          echo "======================================="
-          echo "  Frontend tools"
-          echo "======================================="
-          echo "-------- node version -----"
-          node --version
-          echo "-------- npm version -----"
-          npm --version
-          echo "-------- yarn version -----"
-          yarn --version
-          echo "======================================="
-          echo "  Misc tools"
-          echo "======================================="
-          echo "-------- docker version -----"
-          docker --version
-          echo "-------- jq version -----"
-          jq --version
-          echo "-------- grabpl version -----"
-          ./bin/grabpl --version
-          echo "======================================="
-      - name: Check backend tools
-        shell: bash
-        if: steps.check_backend.outputs.has_backend == 'true'
-        working-directory: ${{ steps.get_dir.outputs.dir }}
-        run: |
-          echo "======================================="
-          echo "  Backend tools"
-          echo "======================================="
-          echo "-------- go version -----"
-          go version
-          echo "-------- mage version -----"
-          mage --version
-          echo "======================================="
-      - name: build:frontend
-        shell: bash
-        id: build_frontend
-        run: |
-          command="plugin:build:commit"
-          if [ "$GITHUB_REF" != "refs/heads/main" ]; then
-            # Release branch, do not add commit hash to version
-            command="plugin:build"
-          fi
-          yarn $command --scope="@grafana-plugins/${{ inputs.plugin_id }}"
-          version=$(cat ${{ steps.get_dir.outputs.dir }}/dist/plugin.json | jq -r .info.version)
-          echo "version=${version}" >> $GITHUB_OUTPUT
-      - name: build:backend
-        if: steps.check_backend.outputs.has_backend == 'true'
-        shell: bash
-        env:
-          VERSION: ${{ steps.build_frontend.outputs.version }}  
-        run: |
-          make build-plugin-go PLUGIN_ID=${{ inputs.plugin_id }}
-      - name: package
-        working-directory: ${{ steps.get_dir.outputs.dir }}
-        run: |
-          mkdir -p ci/jobs/package
-          bin/grabpl plugin package
-        env:
-          GRAFANA_API_KEY: ${{ env.PLUGINS_GRAFANA_API_KEY }}
-          PLUGIN_SIGNATURE_TYPE: grafana
-      - name: Check existing release
-        env:
-          GCOM_TOKEN: ${{ env.PLUGINS_GCOM_TOKEN }}
-          VERSION: ${{ steps.build_frontend.outputs.version }}  
-        run: |
-          api_res=$(curl -X 'GET' -H "Authorization: Bearer $GCOM_TOKEN" \
-            '${{ env.GCOM_API}}/api/plugins/${{ inputs.plugin_id }}?version=$VERSION' \
-            -H 'accept: application/json')
-          api_res_code=$(echo $api_res | jq -r .code)
-          if [ "$api_res_code" = "NotFound" ]; then
-            echo "No existing release found"
-          else
-            echo "Expecting a missing release, got:"
-            echo $api_res
-            exit 1
-          fi
-      - name: store build artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: build-artifacts
-          path: ${{ steps.get_dir.outputs.dir }}/ci/packages/*.zip
-      - name: Publish release to Google Cloud Storage
-        working-directory: ${{ steps.get_dir.outputs.dir }}
-        env:
-          VERSION: ${{ steps.build_frontend.outputs.version }}  
-        run: |
-          echo "Publish release to Google Cloud Storage:"
-          touch ci/packages/windows ci/packages/darwin ci/packages/linux ci/packages/any
-          gsutil -m cp -r ci/packages/*windows* gs://${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/windows
-          gsutil -m cp -r ci/packages/*linux* gs://${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/linux 
-          gsutil -m cp -r ci/packages/*darwin* gs://${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/darwin
-          gsutil -m cp -r ci/packages/*any* gs://${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/any
-      - name: Publish new plugin version on grafana.com
-        if: steps.check_backend.outputs.has_backend == 'true'
-        working-directory: ${{ steps.get_dir.outputs.dir }}
-        env:
-          GCOM_TOKEN: ${{ env.PLUGINS_GCOM_TOKEN }}
-          VERSION: ${{ steps.build_frontend.outputs.version }}  
-        run: |
-          echo "Publish new plugin version on grafana.com:"
-          echo "Plugin version: ${VERSION}"
-          result=`curl -H "Authorization: Bearer $GCOM_TOKEN" -H "Content-Type: application/json" ${{ env.GCOM_API}}/api/plugins -d "{
-            \"url\": \"https://github.com/grafana/grafana/tree/main/${{ steps.get_dir.outputs.dir }}\",
-            \"download\": {
-              \"linux-amd64\": {
-                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/linux/${{ inputs.plugin_id }}-${VERSION}.linux_amd64.zip\",
-                \"md5\": \"$(cat ci/packages/info-linux_amd64.json | jq -r .plugin.md5)\"
-              },
-              \"linux-arm64\": {
-                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/linux/${{ inputs.plugin_id }}-${VERSION}.linux_arm64.zip\",
-                \"md5\": \"$(cat ci/packages/info-linux_arm64.json | jq -r .plugin.md5)\"
-              },
-              \"linux-arm\": {
-                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/linux/${{ inputs.plugin_id }}-${VERSION}.linux_arm.zip\",
-                \"md5\": \"$(cat ci/packages/info-linux_arm.json | jq -r .plugin.md5)\"
-              },
-              \"windows-amd64\": {
-                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/windows/${{ inputs.plugin_id }}-${VERSION}.windows_amd64.zip\",
-                \"md5\": \"$(cat ci/packages/info-windows_amd64.json | jq -r .plugin.md5)\"
-              },
-              \"darwin-amd64\": {
-                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/darwin/${{ inputs.plugin_id }}-${VERSION}.darwin_amd64.zip\",
-                \"md5\": \"$(cat ci/packages/info-darwin_amd64.json | jq -r .plugin.md5)\"
-              },
-              \"darwin-arm64\": {
-                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/darwin/${{ inputs.plugin_id }}-${VERSION}.darwin_arm64.zip\",
-                \"md5\": \"$(cat ci/packages/info-darwin_arm64.json | jq -r .plugin.md5)\"
-              }
-            }
-          }"`
-          if [[ "$(echo $result | jq -r .version)" == "null" ]]; then
-            echo "Failed to publish plugin version. Got:"
-            echo $result
-            exit 1
-          fi
-      - name: Publish new plugin version on grafana.com (frontend only)
-        if: steps.check_backend.outputs.has_backend == 'false'
-        working-directory: ${{ steps.get_dir.outputs.dir }}
-        env:
-          GCOM_TOKEN: ${{ env.PLUGINS_GCOM_TOKEN }}
-          VERSION: ${{ steps.build_frontend.outputs.version }}
-        run: |
-          echo "Publish new plugin version on grafana.com:"
-          echo "Plugin version: ${VERSION}"
-          result=`curl -H "Authorization: Bearer $GCOM_TOKEN" -H "Content-Type: application/json" ${{ env.GCOM_API}}/api/plugins -d "{
-            \"url\": \"https://github.com/grafana/grafana/tree/main/${{ steps.get_dir.outputs.dir }}\",
-            \"download\": {
-              \"any\": {
-                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/any/${{ inputs.plugin_id }}-${VERSION}.any.zip\",
-                \"md5\": \"$(cat ci/packages/info-any.json | jq -r .plugin.md5)\"
-              }
-            }
-          }"`
-          if [[ "$(echo $result | jq -r .version)" == "null" ]]; then
-            echo "Failed to publish plugin version. Got:"
-            echo $result
-            exit 1
-          fi
--- a/.github/workflows/create-security-patch-from-security-mirror.yml
+++ b/.github/workflows/create-security-patch-from-security-mirror.yml
@@ -1,5 +1,5 @@
-# Owned by grafana-release-guild
-# Intended to be dropped into the base repo (Ex: grafana/grafana) for use in the security mirror.
+# Owned by grafana-delivery-squad
+# Intended to be dropped into the base repo (Ex: grafana/grafana) for use in the security mirror. 
 name: Create security patch
 run-name: create-security-patch
 on:
@@ -17,7 +17,7 @@ jobs:
  trigger_downstream_create_security_patch:
    concurrency: create-patch-${{ github.ref_name }}
    uses: grafana/security-patch-actions/.github/workflows/create-patch.yml@main
-    if: github.repository == 'grafana/grafana-security-mirror'
+    if: github.repository == 'grafana/grafana-security-mirror' 
    with:
      repo: "${{ github.repository }}"
      src_ref: "${{ github.head_ref }}" # this is the source branch name, Ex: "feature/newthing"
--- a/.github/workflows/detect-breaking-changes-build-skip.yml
+++ b/.github/workflows/detect-breaking-changes-build-skip.yml
@@ -0,0 +1,34 @@
+# Workflow for skipping the Levitate detection
+# (This is needed because workflows that are skipped due to path filtering will show up as pending in Github.
+# As this has the same name as the one in detect-breaking-changes-build.yml it will take over in these cases and succeed quickly.)
+
+name: Levitate / Detect breaking changes
+
+on:
+  pull_request:
+    paths-ignore:
+      - "packages/**"
+    branches:
+      - 'main'
+
+jobs:
+  detect:
+    name: Detect breaking changes
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Skipping
+        run: echo "No modifications in the public API (packages/), skipping."
+
+        # Build and persist output as a JSON (we need to tell the report workflow that the check has been skipped)
+      - name: Persisting the check output
+        run: |
+          mkdir -p ./levitate
+          echo "{ \"shouldSkip\": true }" > ./levitate/result.json
+
+      # Upload artifact (so it can be used in the more privileged "report" workflow)
+      - name: Upload check output as artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: levitate
+          path: levitate/
--- a/.github/workflows/detect-breaking-changes-build.yml
+++ b/.github/workflows/detect-breaking-changes-build.yml
@@ -0,0 +1,163 @@
+# Only runs if anything under the packages/ directory changes. 
+# (Otherwise detect-breaking-changes-build-skip.yml takes over)
+
+name: Levitate / Detect breaking changes
+
+on: 
+  pull_request:
+    paths:
+      - 'packages/**'
+    branches:
+      - 'main'
+
+jobs:
+  buildPR:
+    name: Build PR
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: './pr'
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        path: './pr'
+    - uses: actions/setup-node@v3.8.1
+      with:
+        node-version: 16.16.0
+
+    - name: Get yarn cache directory path
+      id: yarn-cache-dir-path
+      run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+
+    - name: Restore yarn cache
+      uses: actions/cache@v3.3.1
+      id: yarn-cache
+      with:
+        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+        key: yarn-cache-folder-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
+        restore-keys: |
+          yarn-cache-folder-
+
+    - name: Install dependencies
+      run: yarn install --immutable
+
+    - name: Build packages
+      run: yarn packages:build
+
+    - name: Pack packages
+      run: yarn packages:pack --out ./%s.tgz
+
+    - name: Zip built tarballed packages
+      run: zip -r ./pr_built_packages.zip ./packages/**/*.tgz
+
+    - name: Upload build output as artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: buildPr
+        path: './pr/pr_built_packages.zip'
+
+  buildBase:
+    name: Build Base
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: './base'
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        path: './base'
+        ref: ${{ github.event.pull_request.base.ref }}
+
+    - uses: actions/setup-node@v3.8.1
+      with:
+        node-version: 16.16.0
+
+    - name: Get yarn cache directory path
+      id: yarn-cache-dir-path
+      run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+
+    - name: Restore yarn cache
+      uses: actions/cache@v3.3.1
+      id: yarn-cache
+      with:
+        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+        key: yarn-cache-folder-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
+        restore-keys: |
+          yarn-cache-folder-
+
+    - name: Install dependencies
+      run: yarn install --immutable
+
+    - name: Build packages
+      run: yarn packages:build
+
+    - name: Pack packages
+      run: yarn packages:pack --out ./%s.tgz
+
+    - name: Zip built tarballed packages
+      run: zip -r ./base_built_packages.zip ./packages/**/*.tgz
+
+    - name: Upload build output as artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: buildBase
+        path: './base/base_built_packages.zip'
+
+  Detect:
+    name: Detect breaking changes
+    runs-on: ubuntu-latest
+    needs: ['buildPR', 'buildBase']
+    env:
+      GITHUB_STEP_NUMBER: 8
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get built packages from pr
+        uses: actions/download-artifact@v3
+        with:
+          name: buildPr
+
+      - name: Get built packages from base
+        uses: actions/download-artifact@v3
+        with:
+          name: buildBase
+
+      - name: Unzip artifact from pr
+        run: unzip -j pr_built_packages.zip -d ./pr && rm pr_built_packages.zip
+
+      - name: Unzip artifact from base
+        run: unzip -j base_built_packages.zip -d ./base && rm base_built_packages.zip
+
+      - name: Get link for the Github Action job
+        id: job
+        uses: actions/github-script@v6
+        with:
+          script: |
+              const name = 'Detect breaking changes';
+              const script = require('./.github/workflows/scripts/pr-get-job-link.js')
+              await script({name, github, context, core})
+
+      - name: Detect breaking changes
+        id: breaking-changes
+        run: ./scripts/check-breaking-changes.sh
+        env:
+          FORCE_COLOR: 3
+          GITHUB_JOB_LINK: ${{ steps.job.outputs.link }}
+
+      - name: Persisting the check output
+        run: |
+            mkdir -p ./levitate
+            echo "{ \"exit_code\": ${{ steps.breaking-changes.outputs.is_breaking }}, \"message\": \"${{ steps.breaking-changes.outputs.message }}\", \"job_link\": \"${{ steps.job.outputs.link }}#step:${GITHUB_STEP_NUMBER}:1\", \"pr_number\": \"${{ github.event.pull_request.number }}\" }" > ./levitate/result.json
+
+      - name: Upload check output as artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: levitate
+          path: levitate/
+
+      - name: Exit
+        run: exit ${{ steps.breaking-changes.outputs.is_breaking }}
+        shell: bash
--- a/.github/workflows/detect-breaking-changes-levitate.yml
+++ b/.github/workflows/detect-breaking-changes-levitate.yml
@@ -1,340 +0,0 @@
-# Only runs if anything under the packages/ directory changes.
---
-name: Levitate / Detect breaking changes in PR
-
-on:
-  pull_request:
-    paths:
-      - 'packages/**'
-    branches:
-      - 'main'
-
-jobs:
-  buildPR:
-    name: Build PR
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: './pr'
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: './pr'
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20.9.0
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
-
-      - name: Restore yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: yarn-cache-folder-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
-          restore-keys: |
-            yarn-cache-folder-
-
-      - name: Install dependencies
-        run: yarn install --immutable
-
-      - name: Build packages
-        run: yarn packages:build
-
-      - name: Pack packages
-        run: yarn packages:pack --out ./%s.tgz
-
-      - name: Zip built tarballed packages
-        run: zip -r ./pr_built_packages.zip ./packages/**/*.tgz
-
-      - name: Upload build output as artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: buildPr
-          path: './pr/pr_built_packages.zip'
-
-  buildBase:
-    name: Build Base
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: './base'
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: './base'
-          ref: ${{ github.event.pull_request.base.ref }}
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20.9.0
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
-
-      - name: Restore yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: yarn-cache-folder-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
-          restore-keys: |
-            yarn-cache-folder-
-
-      - name: Install dependencies
-        run: yarn install --immutable
-
-      - name: Build packages
-        run: yarn packages:build
-
-      - name: Pack packages
-        run: yarn packages:pack --out ./%s.tgz
-
-      - name: Zip built tarballed packages
-        run: zip -r ./base_built_packages.zip ./packages/**/*.tgz
-
-      - name: Upload build output as artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: buildBase
-          path: './base/base_built_packages.zip'
-
-  Detect:
-    name: Detect breaking changes
-    runs-on: ubuntu-latest
-    needs: ['buildPR', 'buildBase']
-    env:
-      GITHUB_STEP_NUMBER: 8
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20.9.0
-
-      - name: Get built packages from pr
-        uses: actions/download-artifact@v4
-        with:
-          name: buildPr
-
-      - name: Get built packages from base
-        uses: actions/download-artifact@v4
-        with:
-          name: buildBase
-
-      - name: Unzip artifact from pr
-        run: unzip -j pr_built_packages.zip -d ./pr && rm pr_built_packages.zip
-
-      - name: Unzip artifact from base
-        run: unzip -j base_built_packages.zip -d ./base && rm base_built_packages.zip
-
-      - name: Get link for the Github Action job
-        id: job
-        uses: actions/github-script@v6
-        with:
-          script: |
-              const name = 'Detect breaking changes';
-              const script = require('./.github/workflows/scripts/pr-get-job-link.js')
-              await script({name, github, context, core})
-
-      - name: Detect breaking changes
-        id: breaking-changes
-        run: ./scripts/check-breaking-changes.sh
-        env:
-          FORCE_COLOR: 3
-          GITHUB_JOB_LINK: ${{ steps.job.outputs.link }}
-
-      - name: Persisting the check output
-        run: |
-            mkdir -p ./levitate
-            echo "{ \"exit_code\": ${{ steps.breaking-changes.outputs.is_breaking }}, \"message\": \"${{ steps.breaking-changes.outputs.message }}\", \"job_link\": \"${{ steps.job.outputs.link }}#step:${GITHUB_STEP_NUMBER}:1\", \"pr_number\": \"${{ github.event.pull_request.number }}\" }" > ./levitate/result.json
-
-      - name: Upload check output as artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: levitate
-          path: levitate/
-
-
-  Report:
-    name: Report breaking changes in PR
-    runs-on: ubuntu-latest
-    needs: ['Detect']
-
-    steps:
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.GRAFANA_PR_AUTOMATION_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_PR_AUTOMATION_APP_PEM }}
-
-      - uses: actions/checkout@v4
-
-      - name: 'Download artifact'
-        uses: actions/download-artifact@v4
-        with:
-          name: levitate
-
-      - name: Parsing levitate result
-        uses: actions/github-script@v6
-        id: levitate-run
-        with:
-          script: |
-            const filePath = 'result.json';
-            const script = require('./.github/workflows/scripts/json-file-to-job-output.js');
-            await script({ core, filePath });
-
-      # Check if label exists
-      - name: Check if "levitate breaking change" label exists
-        id: does-label-exist
-        uses: actions/github-script@v6
-        env:
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-        with:
-          script: |
-            const { data } = await github.rest.issues.listLabelsOnIssue({
-              issue_number: process.env.PR_NUMBER,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-            });
-            const labels = data.map(({ name }) => name);
-            const doesExist = labels.includes('levitate breaking change');
-
-            return doesExist ? 1 : 0;
-
-      # put the markdown into a variable
-      - name: Levitate Markdown
-        id: levitate-markdown
-        run: |
-            if [ -f "levitate.md" ]; then
-            {
-              echo 'levitate_markdown<<EOF'
-              cat levitate.md
-              echo EOF
-            } >> $GITHUB_OUTPUT
-            else
-              echo "levitate_markdown=No breaking changes detected" >> $GITHUB_OUTPUT
-            fi
-
-
-      # Comment on the PR
-      - name: Comment on PR
-        if: steps.levitate-run.outputs.exit_code == 1
-        uses: marocchino/sticky-pull-request-comment@v2
-        with:
-          header: levitate-breaking-change-comment
-          number: ${{ github.event.pull_request.number }}
-          message: |
-            ⚠️ &nbsp;&nbsp;**Possible breaking changes (md version)**&nbsp;&nbsp; ⚠️
-
-            ${{ steps.levitate-markdown.outputs.levitate_markdown }}
-
-            [Read our guideline](https://github.com/grafana/grafana/blob/main/contribute/breaking-changes-guide/breaking-changes-guide.md)
-            [Console output](${{ steps.levitate-run.outputs.job_link }})
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
-
-      # Remove comment from the PR (no more breaking changes)
-      - name: Remove comment from PR
-        if: steps.levitate-run.outputs.exit_code == 0
-        uses: marocchino/sticky-pull-request-comment@v2
-        with:
-          header: levitate-breaking-change-comment
-          number: ${{ github.event.pull_request.number }}
-          delete: true
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
-
-      # Posts a notification to Slack if a PR has a breaking change and it did not have a breaking change before
-      - name: Post to Slack
-        id: slack
-        if: steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 && env.HAS_SECRETS
-        uses: slackapi/slack-github-action@v1.24.0
-        with:
-          payload: |
-            {
-              "pr_link": "https://github.com/grafana/grafana/pull/${{ steps.levitate-run.outputs.pr_number }}",
-              "pr_number": "${{ steps.levitate-run.outputs.pr_number }}",
-              "job_link": "${{ steps.levitate-run.outputs.job_link }}",
-              "reporting_job_link": "${{ github.event.workflow_run.html_url }}",
-              "message": "${{ steps.levitate-run.outputs.message }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_LEVITATE_WEBHOOK_URL }}
-          HAS_SECRETS: ${{ (github.repository == 'grafana/grafana' || secrets.SLACK_LEVITATE_WEBHOOK_URL != '') || '' }}
-
-      # Add the label
-      - name: Add "levitate breaking change" label
-        if: steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0
-        uses: actions/github-script@v6
-        env:
-          PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
-        with:
-          github-token: ${{ steps.generate_token.outputs.token }}
-          script: |
-            await github.rest.issues.addLabels({
-              issue_number: process.env.PR_NUMBER,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              labels: ['levitate breaking change']
-            })
-
-      # Remove label (no more breaking changes)
-      - name: Remove "levitate breaking change" label
-        if: steps.levitate-run.outputs.exit_code == 0 && steps.does-label-exist.outputs.result == 1
-        uses: actions/github-script@v6
-        env:
-          PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
-        with:
-          github-token: ${{ steps.generate_token.outputs.token }}
-          script: |
-            await github.rest.issues.removeLabel({
-              issue_number: process.env.PR_NUMBER,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              name: 'levitate breaking change'
-            })
-
-      # Add reviewers
-      # This is very weird, the actual request goes through (comes back with a 201), but does not assign the team.
-      # Related issue: https://github.com/renovatebot/renovate/issues/1908
-      - name: Add "grafana/plugins-platform-frontend" as a reviewer
-        if: steps.levitate-run.outputs.exit_code == 1
-        uses: actions/github-script@v6
-        env:
-          PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
-        with:
-          github-token: ${{ steps.generate_token.outputs.token }}
-          script: |
-            await github.rest.pulls.requestReviewers({
-              pull_number: process.env.PR_NUMBER,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              reviewers: [],
-              team_reviewers: ['plugins-platform-frontend']
-            });
-
-      # Remove reviewers (no more breaking changes)
-      - name: Remove "grafana/plugins-platform-frontend" from the list of reviewers
-        if: steps.levitate-run.outputs.exit_code == 0
-        uses: actions/github-script@v6
-        env:
-          PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
-        with:
-          github-token: ${{ steps.generate_token.outputs.token }}
-          script: |
-            await github.rest.pulls.removeRequestedReviewers({
-              pull_number: process.env.PR_NUMBER,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              reviewers: [],
-              team_reviewers: ['plugins-platform-frontend']
-            });
-
-      - name: Exit
-        run: exit ${{ steps.levitate-run.outputs.exit_code }}
-        shell: bash
--- a/.github/workflows/detect-breaking-changes-report.yml
+++ b/.github/workflows/detect-breaking-changes-report.yml
@@ -0,0 +1,209 @@
+name: Levitate / Report breaking changes
+
+on:
+  workflow_run:
+    workflows: ["Levitate / Detect breaking changes"]
+    types: [completed]
+
+permissions:
+  pull-requests: write
+
+jobs:
+  notify:
+    name: Report
+    runs-on: ubuntu-latest
+    env:
+      ARTIFACT_NAME: 'levitate' # The name of the artifact that we would like to download
+      ARTIFACT_FOLDER: '${{ github.workspace }}/tmp' # The name of the folder where we will download the artifact to
+    permissions:
+      contents: read
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/checkout@v4
+
+    # Download artifact (as a .zip archive)
+    - name: 'Download artifact'
+      uses: actions/github-script@v6
+      env:
+        RUN_ID: ${{ github.event.workflow_run.id }}
+      with:
+        script: |
+          const fs = require('fs');
+
+          const { owner, repo } = context.repo;
+          const runId = process.env.RUN_ID;
+          const artifactName = process.env.ARTIFACT_NAME;
+          const artifactFolder = process.env.ARTIFACT_FOLDER;
+          const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
+              owner,
+              repo,
+              run_id: runId,
+          });
+          const artifact = artifacts.data.artifacts.find(a => a.name === artifactName);
+
+          if (!artifact) {
+              throw new Error(`Could not find artifact ${ artifactName } in workflow (${ runId })`);
+          }
+
+          const download = await github.rest.actions.downloadArtifact({
+              owner,
+              repo,
+              artifact_id: artifact.id,
+              archive_format: 'zip',
+          });
+
+          fs.mkdirSync(artifactFolder, { recursive: true });
+          fs.writeFileSync(`${ artifactFolder }/${ artifactName }.zip`, Buffer.from(download.data));
+
+    # Unzip artifact
+    - name: Unzip artifact
+      run: unzip "${ARTIFACT_FOLDER}/${ARTIFACT_NAME}.zip" -d "${ARTIFACT_FOLDER}"
+
+     # Parse the artifact and register fields as step output variables
+      # (All fields in the JSON will be available as ${{ steps.levitate-run.outputs.<field-name> }}
+    - name: Parsing levitate result
+      uses: actions/github-script@v6
+      id: levitate-run
+      with:
+        script: |
+          const filePath = `${ process.env.ARTIFACT_FOLDER }/result.json`;
+          const script = require('./.github/workflows/scripts/json-file-to-job-output.js');
+          await script({ core, filePath });
+
+    # Skip - print a message if the "Detect" workflow was skipped
+    - name: Check if the workflow should be skipped
+      if: steps.levitate-run.outputs.shouldSkip == 'true'
+      run: echo "Skipping."
+
+    # Check if label exists
+    - name: Check if "levitate breaking change" label exists
+      id: does-label-exist
+      if: steps.levitate-run.outputs.shouldSkip != 'true'
+      uses: actions/github-script@v6
+      env:
+        PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }}
+      with:
+        script: |
+          const { data } = await github.rest.issues.listLabelsOnIssue({
+            issue_number: process.env.PR_NUMBER,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+          });
+          const labels = data.map(({ name }) => name);
+          const doesExist = labels.includes('levitate breaking change');
+
+          return doesExist ? 1 : 0;
+
+    # Comment on the PR
+    - name: Comment on PR
+      if: steps.levitate-run.outputs.exit_code == 1 && steps.levitate-run.outputs.shouldSkip != 'true'
+      uses: marocchino/sticky-pull-request-comment@v2
+      with:
+        number: ${{ steps.levitate-run.outputs.pr_number }}
+        message: |
+          ⚠️ &nbsp;&nbsp;**Possible breaking changes**
+
+          _(Open the links below in a new tab to go to the correct steps)_
+
+          ${{ steps.levitate-run.outputs.message }}
+
+          [Console output](${{ steps.levitate-run.outputs.job_link }})
+          [Read our guideline](https://github.com/grafana/grafana/blob/main/contribute/breaking-changes-guide/breaking-changes-guide.md)
+
+    # Remove comment from the PR (no more breaking changes)
+    - name: Remove comment from PR
+      if: steps.levitate-run.outputs.exit_code == 0 && steps.levitate-run.outputs.shouldSkip != 'true'
+      uses: marocchino/sticky-pull-request-comment@v2
+      with:
+        number: ${{ steps.levitate-run.outputs.pr_number }}
+        delete: true
+
+    # Posts a notification to Slack if a PR has a breaking change and it did not have a breaking change before
+    - name: Post to Slack
+      id: slack
+      if: steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 && steps.levitate-run.outputs.shouldSkip != 'true' && env.HAS_SECRETS
+      uses: slackapi/slack-github-action@v1.24.0
+      with:
+        payload: |
+          {
+            "pr_link": "https://github.com/grafana/grafana/pull/${{ steps.levitate-run.outputs.pr_number }}",
+            "pr_number": "${{ steps.levitate-run.outputs.pr_number }}",
+            "job_link": "${{ steps.levitate-run.outputs.job_link }}",
+            "reporting_job_link": "${{ github.event.workflow_run.html_url }}",
+            "message": "${{ steps.levitate-run.outputs.message }}"
+          }
+      env:
+        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_LEVITATE_WEBHOOK_URL }}
+        HAS_SECRETS: ${{ (github.repository == 'grafana/grafana' || secrets.SLACK_LEVITATE_WEBHOOK_URL != '') || '' }}
+
+    # Add the label
+    - name: Add "levitate breaking change" label
+      if: steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 && steps.levitate-run.outputs.shouldSkip != 'true'
+      uses: actions/github-script@v6
+      env:
+        PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        script: |
+          await github.rest.issues.addLabels({
+            issue_number: process.env.PR_NUMBER,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            labels: ['levitate breaking change']
+          })
+
+    # Remove label (no more breaking changes)
+    - name: Remove "levitate breaking change" label
+      if: steps.levitate-run.outputs.exit_code == 0 && steps.does-label-exist.outputs.result == 1 && steps.levitate-run.outputs.shouldSkip != 'true'
+      uses: actions/github-script@v6
+      env:
+        PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        script: |
+          await github.rest.issues.removeLabel({
+            issue_number: process.env.PR_NUMBER,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            name: 'levitate breaking change'
+          })
+
+    # Add reviewers
+    # This is very weird, the actual request goes through (comes back with a 201), but does not assign the team.
+    # Related issue: https://github.com/renovatebot/renovate/issues/1908
+    - name: Add "grafana/plugins-platform-frontend" as a reviewer
+      if: steps.levitate-run.outputs.exit_code && steps.levitate-run.outputs.shouldSkip != 'true'
+      uses: actions/github-script@v6
+      env:
+        PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        script: |
+          await github.rest.pulls.requestReviewers({
+            pull_number: process.env.PR_NUMBER,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            reviewers: [],
+            team_reviewers: ['grafana/plugins-platform-frontend']
+          });
+
+    # Remove reviewers (no more breaking changes)
+    - name: Remove "grafana/plugins-platform-frontend" from the list of reviewers
+      if: steps.levitate-run.outputs.exit_code == 0 && steps.levitate-run.outputs.shouldSkip != 'true'
+      uses: actions/github-script@v6
+      env:
+        PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        script: |
+          await github.rest.pulls.removeRequestedReviewers({
+            pull_number: process.env.PR_NUMBER,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            reviewers: [],
+            team_reviewers: ['grafana/plugins-platform-frontend']
+          });
+
+
--- a/.github/workflows/doc-validator.yml
+++ b/.github/workflows/doc-validator.yml
@@ -7,7 +7,7 @@ jobs:
  doc-validator:
    runs-on: "ubuntu-latest"
    container:
-      image: "grafana/doc-validator:v5.0.0"
+      image: "grafana/doc-validator:v4.0.0"
    steps:
      - name: "Checkout code"
        uses: "actions/checkout@v4"
--- a/.github/workflows/feature-toggle-cleanup.yml
+++ b/.github/workflows/feature-toggle-cleanup.yml
@@ -1,28 +0,0 @@
-name: Feature Toggle Cleanup
-
-on:
-  workflow_dispatch:
-  schedule:
-      # * is a special character in YAML so you have to quote this string
-      - cron:  '30 10 * * *'
-jobs:
-    feature-toggle-cleanup:
-        runs-on: ubuntu-latest
-        # This check is here to prevent this workflow from running on forks.    
-        if: github.repository == 'grafana/grafana'
-        steps:
-            - name: Check out the code
-              uses: actions/checkout@v3
-            - uses: actions/setup-node@v4
-              with:
-                node-version: "20.x"
-            - run: npm install csv-parse
-            - name: Parse CVS file to see which Feature Toggles should be notified about
-              id: parse-csv-file
-              uses: actions/github-script@v7
-              env:
-                    FEATURE_TOGGLES_CSV_FILE_PATH: "pkg/services/featuremgmt/toggles_gen.csv"
-              with:
-                    script: |
-                        const { default: cleanupFeatureFlags } = await import('${{ github.workspace }}/.github/workflows/scripts/feature-toggle-cleanup/feature-toggle-cleanup.mjs')                        
-                        await cleanupFeatureFlags({github, context, core})
--- a/.github/workflows/i18n-crowdin-download.yml
+++ b/.github/workflows/i18n-crowdin-download.yml
@@ -1,115 +0,0 @@
-name: Crowdin Download Action
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 * * * *"
-
-jobs:
-  download-sources-from-crowdin:
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: write # needed to commit changes into the PR
-      pull-requests: write # needed to update PR description, labels, etc
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.head_ref }}
-
-      - name: Download sources
-        id: crowdin-download
-        uses: crowdin/github-action@v1
-        with:
-          upload_sources: false
-          upload_translations: false
-          download_sources: false
-          download_translations: true
-          export_only_approved: true
-          localization_branch_name: i18n_crowdin_translations
-          create_pull_request: true
-          pull_request_title: 'I18n: Download translations from Crowdin'
-          pull_request_body:  |
-            :robot: Automatic download of translations from Crowdin.
-
-            Steps for merging:
-              1. A quick sanity check of the changes and approve. Things to look out for:
-                - No changes in the English file. The source of truth is in the main branch, NOT in Crowdin.
-                - Translations maybe be removed if the English phrase was removed, but there should not be many of these
-                - Anything else that looks 'funky'. Ask if you're not sure.
-              2. Approve & (Auto-)merge. :tada:
-
-            If there's a conflict, close the pull request and **delete the branch**. A GH action will recreate the pull request.
-            Remember, the longer this pull request is open, the more likely it is that it'll get conflicts.
-          pull_request_labels: 'area/frontend, area/internationalization, no-changelog, no-backport'
-          pull_request_reviewers: 'grafana-frontend-platform'
-          pull_request_base_branch_name: 'main'
-          base_url: 'https://grafana.api.crowdin.com'
-          config: 'crowdin.yml'
-          source: 'public/locales/en-US/grafana.json'
-          translation: 'public/locales/%locale%/%original_file_name%'
-          # Magic details of the github-actions bot user, to pass CLA checks
-          github_user_name: "github-actions[bot]"
-          github_user_email: "41898282+github-actions[bot]@users.noreply.github.com"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-
-      - name: Generate token
-        if: steps.crowdin-download.outputs.pull_request_url
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.GRAFANA_PR_AUTOMATION_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_PR_AUTOMATION_APP_PEM }}
-
-      - name: Get pull request ID
-        if: steps.crowdin-download.outputs.pull_request_url
-        shell: bash
-        # Crowdin action returns us the URL of the pull request, but we need an ID for the GraphQL API
-        # that looks like 'PR_kwDOAOaWjc5mP_GU'
-        run: |
-          pr_id=$(gh pr view ${{ steps.crowdin-download.outputs.pull_request_url }} --json id -q .id)
-          echo "PULL_REQUEST_ID=$pr_id" >> "$GITHUB_ENV"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get project board ID
-        uses: octokit/graphql-action@v2.x
-        id: get-project-id
-        if: steps.crowdin-download.outputs.pull_request_url
-        with:
-          # Frontend Platform project - https://github.com/orgs/grafana/projects/78
-          org: grafana
-          project_number: 78
-          query: |
-            query getProjectId($org: String!, $project_number: Int!){
-              organization(login: $org) {
-                projectV2(number: $project_number) {
-                  title
-                  id
-                }
-              }
-            }
-        env:
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
-
-      - name: Add to project board
-        uses: octokit/graphql-action@v2.x
-        if: steps.crowdin-download.outputs.pull_request_url
-        with:
-          projectid: ${{ fromJson(steps.get-project-id.outputs.data).organization.projectV2.id }}
-          prid: ${{ env.PULL_REQUEST_ID }}
-          query: |
-            mutation addPullRequestToProject($projectid: ID!, $prid: ID!){
-              addProjectV2ItemById(input: {projectId: $projectid, contentId: $prid}) {
-                item {
-                  id
-                }
-              }
-            }
-
-        env:
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
--- a/.github/workflows/i18n-crowdin-upload.yml
+++ b/.github/workflows/i18n-crowdin-upload.yml
@@ -1,33 +0,0 @@
-name: Crowdin Upload Action
-
-on:
-  workflow_dispatch:
-  push:
-    paths:
-      - 'public/locales/en-US/grafana.json'
-    branches:
-      - main
-
-jobs:
-  upload-sources-to-crowdin:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Upload sources
-        uses: crowdin/github-action@v1
-        with:
-          upload_sources: true
-          upload_sources_args: '--dest=public/locales/en-US/grafana.json'
-          upload_translations: false
-          download_translations: false
-          create_pull_request: false
-          base_url: 'https://grafana.api.crowdin.com'
-          config: 'crowdin.yml'
-          source: 'public/locales/en-US/grafana.json'
-          translation: 'public/locales/%locale%/%original_file_name%'
-        env:
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
--- a/.github/workflows/metrics-collector.yml
+++ b/.github/workflows/metrics-collector.yml
@@ -25,7 +25,7 @@ jobs:
        id: check
        shell: bash
        run: |
-          if [ -n "${{ (secrets.GRAFANA_MISC_STATS_API_KEY != '') || '' }}" ]; then
+          if [ -n "${{ (secrets.GRAFANA_MISC_STATS_API_KEY != '' && secrets.GH_BOT_ACCESS_TOKEN != '') || '' }}" ]; then
            echo "has-secrets=1" >> "$GITHUB_OUTPUT"
          fi

@@ -46,5 +46,5 @@ jobs:
        uses: ./actions/metrics-collector
        with:
          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
-          token: ${{secrets.GITHUB_TOKEN}}
+          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
          configPath: "metrics-collector"
--- a/.github/workflows/ox-code-coverage.yml
+++ b/.github/workflows/ox-code-coverage.yml
@@ -0,0 +1,21 @@
+name: Observability Experience test code coverage
+on:
+  pull_request:
+    paths:
+      - 'pkg/services/queryhistory/**'
+      - 'pkg/tsdb/loki/**'
+      - 'pkg/tsdb/elasticsearch/**'
+      - 'public/app/features/explore/**'
+      - 'public/app/features/correlations/**'
+      - 'public/app/plugins/datasource/loki/**'
+      - 'public/app/plugins/datasource/elasticsearch/**'
+    branches-ignore:
+      - dependabot/**
+      - backport-*
+
+jobs:
+  workflow-call:
+    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.20
+    with:
+      frontend-path-regexp: public\/app\/features\/(explore|correlations)|public\/app\/plugins\/datasource\/(loki|elasticsearch)
+      backend-path-regexp: pkg\/services\/(queryhistory)|pkg\/tsdb\/(loki|elasticsearch)
--- a/.github/workflows/pr-codeql-analysis-go.yml
+++ b/.github/workflows/pr-codeql-analysis-go.yml
@@ -16,26 +16,17 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - name: "Generate token"
-      id: generate_token
-      continue-on-error: true
-      uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
-      with:
-        app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-        private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-
    - name: Checkout repository
      uses: actions/checkout@v4
      with:
        # We must fetch at least the immediate parents so that if this is
        # a pull request then we can checkout the head.
        fetch-depth: 2
-        token: ${{ steps.generate_token.outputs.token }}

    - name: Set go version
      uses: actions/setup-go@v4
      with:
-        go-version: '1.21.10'
+        go-version: '1.20.10'

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
--- a/.github/workflows/pr-patch-check.yml
+++ b/.github/workflows/pr-patch-check.yml
@@ -1,4 +1,4 @@
-# Owned by grafana-release-guild
+# 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 }}
--- a/.github/workflows/publish-kinds-next.yml
+++ b/.github/workflows/publish-kinds-next.yml
@@ -36,7 +36,7 @@ jobs:
      - name: "Setup Go"
        uses: "actions/setup-go@v4"
        with:
-          go-version: '1.21.10'
+          go-version: '1.20.10'

      - name: "Verify kinds"
        run: go run .github/workflows/scripts/kinds/verify-kinds.go
--- a/.github/workflows/publish-kinds-release.yml
+++ b/.github/workflows/publish-kinds-release.yml
@@ -39,7 +39,7 @@ jobs:
      - name: "Setup Go"
        uses: "actions/setup-go@v4"
        with:
-          go-version: '1.21.10'
+          go-version: '1.20.10'

      - name: "Verify kinds"
        run: go run .github/workflows/scripts/kinds/verify-kinds.go
--- a/.github/workflows/publish-technical-documentation-release.yml
+++ b/.github/workflows/publish-technical-documentation-release.yml
@@ -55,7 +55,7 @@ jobs:
        # Tags aren't necessarily made to the HEAD of the version branch.
        # The documentation to be published is always on the HEAD of the version branch.
        if: "steps.has-matching-release-tag.outputs.bool == 'true' && github.ref_type == 'tag'"
-        run: "git switch --detach origin/${{ steps.target.outputs.target }}.x"
+        run: "git switch --detach origin/${{ steps.target.output.target }}.x"

      - name: "Publish to website repository (release)"
        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
--- a/.github/workflows/scripts/feature-toggle-cleanup/feature-toggle-cleanup.js
+++ b/.github/workflows/scripts/feature-toggle-cleanup/feature-toggle-cleanup.js
@@ -1,38 +0,0 @@
-import { parse } from 'csv-parse/sync';
-import fs from 'fs';
-
-/***
- * Feauture Flag Structure example
- *  Name: 'disableEnvelopeEncryption',
-    Stage: 'GA',
-    Owner: '@grafana/grafana-as-code',
-    Created: '2022-05-24',
-    requiresDevMode: 'false',
-    RequiresLicense: 'false',
-    RequiresRestart: 'false',
-    FrontendOnly: 'false'
- * 
- */
-
-
-export default function cleanupFeatureFlags() {
-	const today = new Date();
-	const sixMonthAgo = today.setMonth(today.getMonth() - 6);
-	const inputFileContents = fs.readFileSync(process.env.FEATURE_TOGGLES_CSV_FILE_PATH);
-	const parsedFeatureFlags = parse(inputFileContents, {
-		columns: true,
-		skip_empty_lines: true,
-		cast: true,
-		cast_date: true,
-	  });
-
-	// Here we can have the custom logic of how to handle what type of feature flag - e.g. GA can be treated differently than experimental and so on.
-	for (const flag of parsedFeatureFlags) {
-		if (flag.Created < sixMonthAgo) {
-			console.log(`The flag ${flag.Name} was created more than 6 months ago. It should be checked.`);
-			console.log(flag);
-		}
-	}
-	
-
-}
--- a/.github/workflows/scripts/kinds/verify-kinds.go
+++ b/.github/workflows/scripts/kinds/verify-kinds.go
@@ -3,7 +3,6 @@ package main
 import (
 	"archive/zip"
 	"context"
-	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -117,58 +116,6 @@ func main() {
 	if err = jfs.Write(context.Background(), ""); err != nil {
 		die(fmt.Errorf("error while writing generated code to disk:\n%s", err))
 	}
-
-	if err := copyCueSchemas("packages/grafana-schema/src/common", filepath.Join(outputPath, "next")); err != nil {
-		die(fmt.Errorf("error while copying the grafana-schema/common package:\n%s", err))
-	}
-}
-
-func copyCueSchemas(fromDir string, toDir string) error {
-	baseTargetDir := filepath.Base(fromDir)
-
-	return filepath.Walk(fromDir, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		targetPath := filepath.Join(
-			toDir,
-			baseTargetDir,
-			strings.TrimPrefix(path, fromDir),
-		)
-
-		if info.IsDir() {
-			return ensureDirectoryExists(targetPath, info.Mode())
-		}
-
-		if !strings.HasSuffix(path, ".cue") {
-			return nil
-		}
-
-		return copyFile(path, targetPath, info.Mode())
-	})
-}
-
-func copyFile(from string, to string, mode os.FileMode) error {
-	input, err := os.ReadFile(from)
-	if err != nil {
-		return err
-	}
-
-	return os.WriteFile(to, input, mode)
-}
-
-func ensureDirectoryExists(directory string, mode os.FileMode) error {
-	_, err := os.Stat(directory)
-	if errors.Is(err, os.ErrNotExist) {
-		if err = os.Mkdir(directory, mode); err != nil {
-			return err
-		}
-	} else if err != nil {
-		return err
-	}
-
-	return os.Chmod(directory, mode)
 }

 func die(errs ...error) {
@@ -454,11 +401,11 @@ func (registry *kindRegistry) getPublishedKind(name string, category string, lat

 	var cueFilePath string
 	switch category {
-	case "core":
-		cueFilePath = fmt.Sprintf("%s/%s.cue", name, name)
-	case "composable":
-		cueFilePath = fmt.Sprintf("%s.cue", name)
-	default:
+		case "core":
+			cueFilePath = fmt.Sprintf("%s/%s.cue", name, name)
+		case "composable":
+			cueFilePath = fmt.Sprintf("%s.cue", name)
+		default:
 		return "", fmt.Errorf("kind can only be core or composable")
 	}

--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -4,39 +4,33 @@ on:
    - cron: '30 1 * * *'

 permissions:
-  issues: write
  pull-requests: write

 jobs:
  stale:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v8
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          operations-per-run: 750
-          # start from the oldest issues/PRs when performing stale operations
-          ascending: true
-          days-before-issue-stale: 365
-          days-before-issue-close: 30
-          stale-issue-label: stale
-          exempt-issue-labels: no stalebot,type/epic
-          stale-issue-message: >
-            This issue has been automatically marked as stale because it has not had
-            activity in the last year. It will be closed in 30 days if no further activity occurs. Please
-            feel free to leave a comment if you believe the issue is still relevant.
-            Thank you for your contributions!
-          close-issue-message: >
-            This issue has been automatically closed because it has not had any further
-            activity in the last 30 days. Thank you for your contributions!
-          days-before-pr-stale: 30
-          days-before-pr-close: 14
-          stale-pr-label: stale
+          # Number of days of inactivity before a stale Issue or Pull Request is closed.
+          # Set to -1 to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+          days-before-close: 14
+          # Number of days of inactivity before an Issue or Pull Request becomes stale
+          days-before-stale: 30
+          # We don't want any Issues to be marked as stale for now.
+          days-before-issue-stale: -1
+          exempt-issue-labels: no stalebot
          exempt-pr-labels: no stalebot
+          operations-per-run: 500
+          stale-issue-label: stale
+          stale-pr-label: stale
          stale-pr-message: >
            This pull request has been automatically marked as stale because it has not had
            activity in the last 30 days. It will be closed in 2 weeks if no further activity occurs. Please
-            feel free to give a status update or ping for review. Thank you for your contributions!
+            feel free to give a status update now, ping for review, or re-open when it's ready.
+            Thank you for your contributions!
          close-pr-message: >
-            This pull request has been automatically closed because it has not had any further
-            activity in the last 2 weeks. Thank you for your contributions!
+            This pull request has been automatically closed because it has not had
+            activity in the last 2 weeks. Please feel free to give a status update now, ping for review, or re-open when it's ready.
+            Thank you for your contributions!
--- a/.github/workflows/sync-mirror.yml
+++ b/.github/workflows/sync-mirror.yml
@@ -1,4 +1,4 @@
-# Owned by grafana-release-guild
+# 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 }}
--- a/.github/workflows/update-make-docs.yml
+++ b/.github/workflows/update-make-docs.yml
@@ -2,18 +2,26 @@ name: Update `make docs` procedure
 on:
  schedule:
    - cron: '0 7 * * 1-5'
-  workflow_dispatch:
 jobs:
  main:
    if: github.repository == 'grafana/grafana'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
-      - uses: grafana/writers-toolkit/update-make-docs@update-make-docs/v1
-        with:
-          pr_options: >
-            --label 'backport v10.1.x'
-            --label 'backport v10.2.x'
-            --label 'backport v10.3.x'
-            --label no-changelog
-            --label type/docs
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Update procedure
+        run: |
+          curl -s -Lo docs/docs.mk https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/docs.mk
+          curl -s -Lo docs/make-docs https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/make-docs
+          if git diff --exit-code; then exit 0; fi
+          BRANCH="$(date +%Y-%m-%d)/update-make-docs"
+          git checkout -b "${BRANCH}"
+          git add .
+          git config --local user.email "bot@grafana.com"
+          git config --local user.name "grafanabot"
+          git commit -m "Update \`make docs\` procedure"
+          git push -v origin "refs/heads/${BRANCH}"
+          gh pr create --fill --label no-changelog --label --no-backport --label type/docs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/verify-kinds.yml
+++ b/.github/workflows/verify-kinds.yml
@@ -18,7 +18,7 @@ jobs:
      - name: "Setup Go"
        uses: "actions/setup-go@v4"
        with:
-          go-version: '1.21.10'
+          go-version: '1.20.10'

      - name: "Verify kinds"
        run: go run .github/workflows/scripts/kinds/verify-kinds.go
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@ awsconfig
 /.awcache
 /dist
 /public/build
+/public/views/index.html
+/public/views/error.html
 /emails/dist
 /reports
 /e2e/tmp
@@ -76,13 +78,6 @@ public/css/*.min.css
 /data/*
 /bin/*

-# any certificates generated by grafana apiserver
-apiserver.local.config/
-default.etcd/
-
-# kubeconfig path used by example apiserver
-example-apiserver/
-
 # devenv
 /devenv/docker-compose.yaml
 /devenv/docker-compose.override.yaml
@@ -207,8 +202,4 @@ deployment_tools_config.json
 .pr-body.txt

 # Core plugin builds
-public/app/plugins/**/dist/
-
-# Ignore transpiled JavaScript resulting from the generate-transformations.ts script.
-/public/app/features/transformers/docs/*.js
-/scripts/docs/generate-transformations.js
+public/app/plugins/**/dist/
--- a/.golangci.toml
+++ b/.golangci.toml
@@ -52,21 +52,10 @@ deny = [
  { pkg = "github.com/grafana/grafana/pkg/server", desc = "Core plugins are not allowed to depend on Grafana core packages" },
  { pkg = "github.com/grafana/grafana/pkg/tests", desc = "Core plugins are not allowed to depend on Grafana core packages" },
  { pkg = "github.com/grafana/grafana/pkg/web", desc = "Core plugins are not allowed to depend on Grafana core packages" },
-  { pkg = "github.com/grafana/grafana/pkg/tsdb/intervalv2", desc = "Core plugins are not allowed to depend on Grafana core packages" },
 ]
 files = [
-  "**/pkg/tsdb/grafana-pyroscope-datasource/*",
-  "**/pkg/tsdb/grafana-pyroscope-datasource/**/*",
  "**/pkg/tsdb/grafana-testdata-datasource/*",
  "**/pkg/tsdb/grafana-testdata-datasource/**/*",
-  "**/pkg/tsdb/azuremonitor/*",
-  "**/pkg/tsdb/azuremonitor/**/*",
-  "**/pkg/tsdb/cloud-monitoring/*",
-  "**/pkg/tsdb/cloud-monitoring/**/*",
-  "**/pkg/tsdb/parca/*",
-  "**/pkg/tsdb/parca/**/*",
-  "**/pkg/tsdb/tempo/*",
-  "**/pkg/tsdb/tempo/**/*",
 ]

 [linters-settings.gocritic]
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v20.9.0
+v18.12.0
--- a/.pa11yci-pr.conf.js
+++ b/.pa11yci-pr.conf.js
@@ -51,7 +51,6 @@ var config = {
    useIncognitoBrowserContext: false,
    standard: 'WCAG2AA',
    chromeLaunchConfig: {
-      executablePath: '/usr/bin/google-chrome',
      args: ['--no-sandbox'],
    },
    // see https://github.com/grafana/grafana/pull/41693#issuecomment-979921463 for context
@@ -73,8 +72,8 @@ var config = {
        "wait for element input[name='user'] to be added",
        "set field input[name='user'] to admin",
        "set field input[name='password'] to admin",
-        "click element button[data-testid='data-testid Login button']",
-        "wait for element button[data-testid='data-testid Skip change password button'] to be visible",
+        "click element button[aria-label='Login button']",
+        "wait for element [aria-label='Skip change password button'] to be visible",
      ],
      threshold: 15,
      rootElement: '.main-view',
--- a/.pa11yci.conf.js
+++ b/.pa11yci.conf.js
@@ -61,8 +61,8 @@ var config = {
        "wait for element input[name='user'] to be added",
        "set field input[name='user'] to admin",
        "set field input[name='password'] to admin",
-        "click element button[data-testid='data-testid Login button']",
-        "wait for element button[data-testid='data-testid Skip change password button'] to be visible",
+        "click element button[aria-label='Login button']",
+        "wait for element [aria-label='Skip change password button'] to be visible",
      ],
      wait: 500,
      rootElement: '.main-view',
--- a/.prettierignore
+++ b/.prettierignore
@@ -12,7 +12,6 @@ node_modules
 pkg
 public/lib/monaco
 public/sass/*.generated.scss
-scripts/cli/bettererIssueTemplate.md
 scripts/grafana-server/tmp
 vendor

@@ -38,5 +37,4 @@ kinds/report.json
 # Generated schema docs
 docs/sources/developers/kinds/

-# Crowdin files
-public/locales/**/*.json
+scripts/cli/bettererIssueTemplate.md
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,18 +11,6 @@
      "cwd": "${workspaceFolder}",
      "args": ["server", "--homepath", "${workspaceFolder}", "--packaging", "dev"]
    },
-    {
-      "name": "Run API Server (testdata)",
-      "type": "go",
-      "request": "launch",
-      "mode": "auto",
-      "program": "${workspaceFolder}/pkg/cmd/grafana/",
-      "env": {},
-      "cwd": "${workspaceFolder}",
-      "args": ["apiserver", 
-          "--secure-port=8443", 
-          "--runtime-config=testdata.datasource.grafana.app/v0alpha1=true"]
-    },
    {
      "name": "Attach to Chrome",
      "port": 9222,
--- a/.yarn/cache/tether-drop-https-3382d2649f-178c3afb88.zip
+++ b/.yarn/cache/tether-drop-https-3382d2649f-178c3afb88.zip
--- a/.yarn/cache/tether-drop-https-3382d2649f-a10a7337d5.zip
+++ b/.yarn/cache/tether-drop-https-3382d2649f-a10a7337d5.zip
--- a/.yarn/patches/history-npm-4.10.1-ee217563ae.patch
+++ b/.yarn/patches/history-npm-4.10.1-ee217563ae.patch
@@ -1,63 +0,0 @@
-diff --git a/cjs/history.js b/cjs/history.js
-index fcd8ebab613c6d87b9ac824feb30ab1080cf0ef2..4df20d5cb2f9ba5fc8777899aada53f49399560b 100644
--- a/cjs/history.js
-+++ b/cjs/history.js
-@@ -103,16 +103,6 @@ function createLocation(path, state, key, currentLocation) {
-     if (state !== undefined && location.state === undefined) location.state = state;
-   }
- 
-  try {
-    location.pathname = decodeURI(location.pathname);
-  } catch (e) {
-    if (e instanceof URIError) {
-      throw new URIError('Pathname "' + location.pathname + '" could not be decoded. ' + 'This is likely caused by an invalid percent-encoding.');
-    } else {
-      throw e;
-    }
-  }
-
-   if (key) location.key = key;
- 
-   if (currentLocation) {
-diff --git a/esm/history.js b/esm/history.js
-index df67820fe3eed558c44fca07a82b0cd409d46720..e0e0d4f69a407e8de782b3fdf8297d42708e110a 100644
--- a/esm/history.js
-+++ b/esm/history.js
-@@ -80,16 +80,6 @@ function createLocation(path, state, key, currentLocation) {
-     if (state !== undefined && location.state === undefined) location.state = state;
-   }
- 
-  try {
-    location.pathname = decodeURI(location.pathname);
-  } catch (e) {
-    if (e instanceof URIError) {
-      throw new URIError('Pathname "' + location.pathname + '" could not be decoded. ' + 'This is likely caused by an invalid percent-encoding.');
-    } else {
-      throw e;
-    }
-  }
-
-   if (key) location.key = key;
- 
-   if (currentLocation) {
-diff --git a/umd/history.js b/umd/history.js
-index 80e4ff66c44a2a71d4f842cc05a252e48dd18e9a..f8f4901be95e48c66f5626fbf051747a2ffbe41d 100644
--- a/umd/history.js
-+++ b/umd/history.js
-@@ -207,16 +207,6 @@
-       if (state !== undefined && location.state === undefined) location.state = state;
-     }
- 
-    try {
-      location.pathname = decodeURI(location.pathname);
-    } catch (e) {
-      if (e instanceof URIError) {
-        throw new URIError('Pathname "' + location.pathname + '" could not be decoded. ' + 'This is likely caused by an invalid percent-encoding.');
-      } else {
-        throw e;
-      }
-    }
-
-     if (key) location.key = key;
- 
-     if (currentLocation) {
--- a/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+++ b/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
--- a/.yarn/plugins/@yarnpkg/plugin-typescript.cjs
+++ b/.yarn/plugins/@yarnpkg/plugin-typescript.cjs
--- a/.yarn/releases/yarn-3.6.1.cjs
+++ b/.yarn/releases/yarn-3.6.1.cjs
--- a/.yarn/releases/yarn-4.1.0.cjs
+++ b/.yarn/releases/yarn-4.1.0.cjs
--- a/.yarn/sdks/eslint/bin/eslint.js
+++ b/.yarn/sdks/eslint/bin/eslint.js
@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require eslint/bin/eslint.js
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real eslint/bin/eslint.js your application uses
+module.exports = absRequire(`eslint/bin/eslint.js`);
--- a/.yarn/sdks/eslint/lib/api.js
+++ b/.yarn/sdks/eslint/lib/api.js
@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require eslint
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real eslint your application uses
+module.exports = absRequire(`eslint`);
--- a/.yarn/sdks/eslint/package.json
+++ b/.yarn/sdks/eslint/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "eslint",
+  "version": "8.51.0-sdk",
+  "main": "./lib/api.js",
+  "type": "commonjs"
+}
--- a/.yarn/sdks/integrations.yml
+++ b/.yarn/sdks/integrations.yml
@@ -0,0 +1,6 @@
+# This file is automatically generated by @yarnpkg/sdks.
+# Manual changes might be lost!
+
+integrations:
+  - vscode
+  - vim
--- a/.yarn/sdks/prettier/index.js
+++ b/.yarn/sdks/prettier/index.js
@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require prettier
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real prettier your application uses
+module.exports = absRequire(`prettier`);
--- a/.yarn/sdks/prettier/package.json
+++ b/.yarn/sdks/prettier/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "prettier",
+  "version": "3.0.0-sdk",
+  "main": "./index.js",
+  "type": "commonjs"
+}
--- a/.yarn/sdks/typescript/bin/tsc
+++ b/.yarn/sdks/typescript/bin/tsc
@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/bin/tsc
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real typescript/bin/tsc your application uses
+module.exports = absRequire(`typescript/bin/tsc`);
--- a/.yarn/sdks/typescript/bin/tsserver
+++ b/.yarn/sdks/typescript/bin/tsserver
@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/bin/tsserver
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real typescript/bin/tsserver your application uses
+module.exports = absRequire(`typescript/bin/tsserver`);
--- a/.yarn/sdks/typescript/lib/tsc.js
+++ b/.yarn/sdks/typescript/lib/tsc.js
@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/lib/tsc.js
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real typescript/lib/tsc.js your application uses
+module.exports = absRequire(`typescript/lib/tsc.js`);
--- a/.yarn/sdks/typescript/lib/tsserver.js
+++ b/.yarn/sdks/typescript/lib/tsserver.js
@@ -0,0 +1,225 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+const moduleWrapper = tsserver => {
+  if (!process.versions.pnp) {
+    return tsserver;
+  }
+
+  const {isAbsolute} = require(`path`);
+  const pnpApi = require(`pnpapi`);
+
+  const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
+  const isPortal = str => str.startsWith("portal:/");
+  const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
+
+  const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
+    return `${locator.name}@${locator.reference}`;
+  }));
+
+  // VSCode sends the zip paths to TS using the "zip://" prefix, that TS
+  // doesn't understand. This layer makes sure to remove the protocol
+  // before forwarding it to TS, and to add it back on all returned paths.
+
+  function toEditorPath(str) {
+    // We add the `zip:` prefix to both `.zip/` paths and virtual paths
+    if (isAbsolute(str) && !str.match(/^\^?(zip:|\/zip\/)/) && (str.match(/\.zip\//) || isVirtual(str))) {
+      // We also take the opportunity to turn virtual paths into physical ones;
+      // this makes it much easier to work with workspaces that list peer
+      // dependencies, since otherwise Ctrl+Click would bring us to the virtual
+      // file instances instead of the real ones.
+      //
+      // We only do this to modules owned by the the dependency tree roots.
+      // This avoids breaking the resolution when jumping inside a vendor
+      // with peer dep (otherwise jumping into react-dom would show resolution
+      // errors on react).
+      //
+      const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
+      if (resolved) {
+        const locator = pnpApi.findPackageLocator(resolved);
+        if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) {
+          str = resolved;
+        }
+      }
+
+      str = normalize(str);
+
+      if (str.match(/\.zip\//)) {
+        switch (hostInfo) {
+          // Absolute VSCode `Uri.fsPath`s need to start with a slash.
+          // VSCode only adds it automatically for supported schemes,
+          // so we have to do it manually for the `zip` scheme.
+          // The path needs to start with a caret otherwise VSCode doesn't handle the protocol
+          //
+          // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
+          //
+          // 2021-10-08: VSCode changed the format in 1.61.
+          // Before | ^zip:/c:/foo/bar.zip/package.json
+          // After  | ^/zip//c:/foo/bar.zip/package.json
+          //
+          // 2022-04-06: VSCode changed the format in 1.66.
+          // Before | ^/zip//c:/foo/bar.zip/package.json
+          // After  | ^/zip/c:/foo/bar.zip/package.json
+          //
+          // 2022-05-06: VSCode changed the format in 1.68
+          // Before | ^/zip/c:/foo/bar.zip/package.json
+          // After  | ^/zip//c:/foo/bar.zip/package.json
+          //
+          case `vscode <1.61`: {
+            str = `^zip:${str}`;
+          } break;
+
+          case `vscode <1.66`: {
+            str = `^/zip/${str}`;
+          } break;
+
+          case `vscode <1.68`: {
+            str = `^/zip${str}`;
+          } break;
+
+          case `vscode`: {
+            str = `^/zip/${str}`;
+          } break;
+
+          // To make "go to definition" work,
+          // We have to resolve the actual file system path from virtual path
+          // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
+          case `coc-nvim`: {
+            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
+            str = resolve(`zipfile:${str}`);
+          } break;
+
+          // Support neovim native LSP and [typescript-language-server](https://github.com/theia-ide/typescript-language-server)
+          // We have to resolve the actual file system path from virtual path,
+          // everything else is up to neovim
+          case `neovim`: {
+            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
+            str = `zipfile://${str}`;
+          } break;
+
+          default: {
+            str = `zip:${str}`;
+          } break;
+        }
+      } else {
+        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
+      }
+    }
+
+    return str;
+  }
+
+  function fromEditorPath(str) {
+    switch (hostInfo) {
+      case `coc-nvim`: {
+        str = str.replace(/\.zip::/, `.zip/`);
+        // The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
+        // So in order to convert it back, we use .* to match all the thing
+        // before `zipfile:`
+        return process.platform === `win32`
+          ? str.replace(/^.*zipfile:\//, ``)
+          : str.replace(/^.*zipfile:/, ``);
+      } break;
+
+      case `neovim`: {
+        str = str.replace(/\.zip::/, `.zip/`);
+        // The path for neovim is in format of zipfile:///<pwd>/.yarn/...
+        return str.replace(/^zipfile:\/\//, ``);
+      } break;
+
+      case `vscode`:
+      default: {
+        return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`)
+      } break;
+    }
+  }
+
+  // Force enable 'allowLocalPluginLoads'
+  // TypeScript tries to resolve plugins using a path relative to itself
+  // which doesn't work when using the global cache
+  // https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238
+  // VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but
+  // TypeScript already does local loads and if this code is running the user trusts the workspace
+  // https://github.com/microsoft/vscode/issues/45856
+  const ConfiguredProject = tsserver.server.ConfiguredProject;
+  const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype;
+  ConfiguredProject.prototype.enablePluginsWithOptions = function() {
+    this.projectService.allowLocalPluginLoads = true;
+    return originalEnablePluginsWithOptions.apply(this, arguments);
+  };
+
+  // And here is the point where we hijack the VSCode <-> TS communications
+  // by adding ourselves in the middle. We locate everything that looks
+  // like an absolute path of ours and normalize it.
+
+  const Session = tsserver.server.Session;
+  const {onMessage: originalOnMessage, send: originalSend} = Session.prototype;
+  let hostInfo = `unknown`;
+
+  Object.assign(Session.prototype, {
+    onMessage(/** @type {string | object} */ message) {
+      const isStringMessage = typeof message === 'string';
+      const parsedMessage = isStringMessage ? JSON.parse(message) : message;
+
+      if (
+        parsedMessage != null &&
+        typeof parsedMessage === `object` &&
+        parsedMessage.arguments &&
+        typeof parsedMessage.arguments.hostInfo === `string`
+      ) {
+        hostInfo = parsedMessage.arguments.hostInfo;
+        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
+          const [, major, minor] = (process.env.VSCODE_IPC_HOOK.match(
+            // The RegExp from https://semver.org/ but without the caret at the start
+            /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
+          ) ?? []).map(Number)
+
+          if (major === 1) {
+            if (minor < 61) {
+              hostInfo += ` <1.61`;
+            } else if (minor < 66) {
+              hostInfo += ` <1.66`;
+            } else if (minor < 68) {
+              hostInfo += ` <1.68`;
+            }
+          }
+        }
+      }
+
+      const processedMessageJSON = JSON.stringify(parsedMessage, (key, value) => {
+        return typeof value === 'string' ? fromEditorPath(value) : value;
+      });
+
+      return originalOnMessage.call(
+        this,
+        isStringMessage ? processedMessageJSON : JSON.parse(processedMessageJSON)
+      );
+    },
+
+    send(/** @type {any} */ msg) {
+      return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => {
+        return typeof value === `string` ? toEditorPath(value) : value;
+      })));
+    }
+  });
+
+  return tsserver;
+};
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/lib/tsserver.js
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real typescript/lib/tsserver.js your application uses
+module.exports = moduleWrapper(absRequire(`typescript/lib/tsserver.js`));
--- a/.yarn/sdks/typescript/lib/tsserverlibrary.js
+++ b/.yarn/sdks/typescript/lib/tsserverlibrary.js
@@ -0,0 +1,225 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+const moduleWrapper = tsserver => {
+  if (!process.versions.pnp) {
+    return tsserver;
+  }
+
+  const {isAbsolute} = require(`path`);
+  const pnpApi = require(`pnpapi`);
+
+  const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
+  const isPortal = str => str.startsWith("portal:/");
+  const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
+
+  const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
+    return `${locator.name}@${locator.reference}`;
+  }));
+
+  // VSCode sends the zip paths to TS using the "zip://" prefix, that TS
+  // doesn't understand. This layer makes sure to remove the protocol
+  // before forwarding it to TS, and to add it back on all returned paths.
+
+  function toEditorPath(str) {
+    // We add the `zip:` prefix to both `.zip/` paths and virtual paths
+    if (isAbsolute(str) && !str.match(/^\^?(zip:|\/zip\/)/) && (str.match(/\.zip\//) || isVirtual(str))) {
+      // We also take the opportunity to turn virtual paths into physical ones;
+      // this makes it much easier to work with workspaces that list peer
+      // dependencies, since otherwise Ctrl+Click would bring us to the virtual
+      // file instances instead of the real ones.
+      //
+      // We only do this to modules owned by the the dependency tree roots.
+      // This avoids breaking the resolution when jumping inside a vendor
+      // with peer dep (otherwise jumping into react-dom would show resolution
+      // errors on react).
+      //
+      const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
+      if (resolved) {
+        const locator = pnpApi.findPackageLocator(resolved);
+        if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) {
+          str = resolved;
+        }
+      }
+
+      str = normalize(str);
+
+      if (str.match(/\.zip\//)) {
+        switch (hostInfo) {
+          // Absolute VSCode `Uri.fsPath`s need to start with a slash.
+          // VSCode only adds it automatically for supported schemes,
+          // so we have to do it manually for the `zip` scheme.
+          // The path needs to start with a caret otherwise VSCode doesn't handle the protocol
+          //
+          // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
+          //
+          // 2021-10-08: VSCode changed the format in 1.61.
+          // Before | ^zip:/c:/foo/bar.zip/package.json
+          // After  | ^/zip//c:/foo/bar.zip/package.json
+          //
+          // 2022-04-06: VSCode changed the format in 1.66.
+          // Before | ^/zip//c:/foo/bar.zip/package.json
+          // After  | ^/zip/c:/foo/bar.zip/package.json
+          //
+          // 2022-05-06: VSCode changed the format in 1.68
+          // Before | ^/zip/c:/foo/bar.zip/package.json
+          // After  | ^/zip//c:/foo/bar.zip/package.json
+          //
+          case `vscode <1.61`: {
+            str = `^zip:${str}`;
+          } break;
+
+          case `vscode <1.66`: {
+            str = `^/zip/${str}`;
+          } break;
+
+          case `vscode <1.68`: {
+            str = `^/zip${str}`;
+          } break;
+
+          case `vscode`: {
+            str = `^/zip/${str}`;
+          } break;
+
+          // To make "go to definition" work,
+          // We have to resolve the actual file system path from virtual path
+          // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
+          case `coc-nvim`: {
+            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
+            str = resolve(`zipfile:${str}`);
+          } break;
+
+          // Support neovim native LSP and [typescript-language-server](https://github.com/theia-ide/typescript-language-server)
+          // We have to resolve the actual file system path from virtual path,
+          // everything else is up to neovim
+          case `neovim`: {
+            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
+            str = `zipfile://${str}`;
+          } break;
+
+          default: {
+            str = `zip:${str}`;
+          } break;
+        }
+      } else {
+        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
+      }
+    }
+
+    return str;
+  }
+
+  function fromEditorPath(str) {
+    switch (hostInfo) {
+      case `coc-nvim`: {
+        str = str.replace(/\.zip::/, `.zip/`);
+        // The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
+        // So in order to convert it back, we use .* to match all the thing
+        // before `zipfile:`
+        return process.platform === `win32`
+          ? str.replace(/^.*zipfile:\//, ``)
+          : str.replace(/^.*zipfile:/, ``);
+      } break;
+
+      case `neovim`: {
+        str = str.replace(/\.zip::/, `.zip/`);
+        // The path for neovim is in format of zipfile:///<pwd>/.yarn/...
+        return str.replace(/^zipfile:\/\//, ``);
+      } break;
+
+      case `vscode`:
+      default: {
+        return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`)
+      } break;
+    }
+  }
+
+  // Force enable 'allowLocalPluginLoads'
+  // TypeScript tries to resolve plugins using a path relative to itself
+  // which doesn't work when using the global cache
+  // https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238
+  // VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but
+  // TypeScript already does local loads and if this code is running the user trusts the workspace
+  // https://github.com/microsoft/vscode/issues/45856
+  const ConfiguredProject = tsserver.server.ConfiguredProject;
+  const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype;
+  ConfiguredProject.prototype.enablePluginsWithOptions = function() {
+    this.projectService.allowLocalPluginLoads = true;
+    return originalEnablePluginsWithOptions.apply(this, arguments);
+  };
+
+  // And here is the point where we hijack the VSCode <-> TS communications
+  // by adding ourselves in the middle. We locate everything that looks
+  // like an absolute path of ours and normalize it.
+
+  const Session = tsserver.server.Session;
+  const {onMessage: originalOnMessage, send: originalSend} = Session.prototype;
+  let hostInfo = `unknown`;
+
+  Object.assign(Session.prototype, {
+    onMessage(/** @type {string | object} */ message) {
+      const isStringMessage = typeof message === 'string';
+      const parsedMessage = isStringMessage ? JSON.parse(message) : message;
+
+      if (
+        parsedMessage != null &&
+        typeof parsedMessage === `object` &&
+        parsedMessage.arguments &&
+        typeof parsedMessage.arguments.hostInfo === `string`
+      ) {
+        hostInfo = parsedMessage.arguments.hostInfo;
+        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
+          const [, major, minor] = (process.env.VSCODE_IPC_HOOK.match(
+            // The RegExp from https://semver.org/ but without the caret at the start
+            /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
+          ) ?? []).map(Number)
+
+          if (major === 1) {
+            if (minor < 61) {
+              hostInfo += ` <1.61`;
+            } else if (minor < 66) {
+              hostInfo += ` <1.66`;
+            } else if (minor < 68) {
+              hostInfo += ` <1.68`;
+            }
+          }
+        }
+      }
+
+      const processedMessageJSON = JSON.stringify(parsedMessage, (key, value) => {
+        return typeof value === 'string' ? fromEditorPath(value) : value;
+      });
+
+      return originalOnMessage.call(
+        this,
+        isStringMessage ? processedMessageJSON : JSON.parse(processedMessageJSON)
+      );
+    },
+
+    send(/** @type {any} */ msg) {
+      return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => {
+        return typeof value === `string` ? toEditorPath(value) : value;
+      })));
+    }
+  });
+
+  return tsserver;
+};
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/lib/tsserverlibrary.js
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real typescript/lib/tsserverlibrary.js your application uses
+module.exports = moduleWrapper(absRequire(`typescript/lib/tsserverlibrary.js`));
--- a/.yarn/sdks/typescript/lib/typescript.js
+++ b/.yarn/sdks/typescript/lib/typescript.js
@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/lib/typescript.js
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real typescript/lib/typescript.js your application uses
+module.exports = absRequire(`typescript/lib/typescript.js`);
--- a/.yarn/sdks/typescript/package.json
+++ b/.yarn/sdks/typescript/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "typescript",
+  "version": "4.8.4-sdk",
+  "main": "./lib/typescript.js",
+  "type": "commonjs"
+}
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1,18 +1,11 @@
-compressionLevel: mixed
-
-enableGlobalCache: false
-
 enableTelemetry: false

-nodeLinker: node-modules
+nodeLinker: pnp

 packageExtensions:
  '@storybook/core-common@7.4.5':
    dependencies:
-      '@storybook/react-webpack5': 7.4.5
-  'croact-css-styled@1.1.9':
-    dependencies:
-      croact: 1.0.4
+      '@storybook/react-webpack5': '7.4.5'
  doctrine@3.0.0:
    dependencies:
      assert: 2.0.0
@@ -33,16 +26,16 @@ packageExtensions:
  react-resizable@3.0.4:
    peerDependencies:
      react-dom: 17.0.1
-  '@msagl/drawing@*':
-    dependencies:
-      queue-typescript: "^1.0.1"
-      "@esfx/collections-sortedmap": "^1.0.0"

 plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
+    spec: '@yarnpkg/plugin-typescript'
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: '@yarnpkg/plugin-interactive-tools'
  - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
    spec: 'https://mskelton.dev/yarn-outdated/v2'

-yarnPath: .yarn/releases/yarn-4.1.0.cjs
+yarnPath: .yarn/releases/yarn-3.6.1.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
--- a/13
+++ b/13
@@ -1,9 +1,9 @@
 # syntax=docker/dockerfile:1

-ARG BASE_IMAGE=alpine:3.19.1
-ARG JS_IMAGE=node:20-alpine
+ARG BASE_IMAGE=alpine:3.18.3
+ARG JS_IMAGE=node:18-alpine3.18
 ARG JS_PLATFORM=linux/amd64
-ARG GO_IMAGE=golang:1.21.10-alpine
+ARG GO_IMAGE=golang:1.20.10-alpine3.18

 ARG GO_SRC=go-builder
 ARG JS_SRC=js-builder
@@ -20,11 +20,9 @@ COPY packages packages
 COPY plugins-bundled plugins-bundled
 COPY public public

-RUN apk add --no-cache make build-base python3
-
 RUN yarn install --immutable

-COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./
+COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js babel.config.json ./
 COPY public public
 COPY scripts scripts
 COPY emails emails
@@ -50,9 +48,6 @@ WORKDIR /tmp/grafana
 COPY go.* ./
 COPY .bingo .bingo

-# Include vendored dependencies
-COPY pkg/util/xorm/go.* pkg/util/xorm/
-
 RUN go mod download
 RUN if [[ "$BINGO" = "true" ]]; then \
      go install github.com/bwplotka/bingo@latest && \
--- a/21
+++ b/21
@@ -141,17 +141,6 @@ build-js: ## Build frontend assets.
 	yarn run build
 	yarn run plugins:build-bundled

-PLUGIN_ID ?=
-
-build-plugin-go: ## Build decoupled plugins
-	@echo "build plugin $(PLUGIN_ID)"
-	@cd pkg/tsdb; \
-	if [ -z "$(PLUGIN_ID)" ]; then \
-		echo "PLUGIN_ID is not set"; \
-		exit 1; \
-	fi; \
-	mage -v buildplugin $(PLUGIN_ID)
-
 build: build-go build-js ## Build backend and frontend.

 run: $(BRA) ## Build and run web server on filesystem changes.
@@ -175,13 +164,6 @@ test-go-integration: ## Run integration tests for backend with flags.
 	@echo "test backend integration tests"
 	$(GO) test -count=1 -run "^TestIntegration" -covermode=atomic -timeout=5m $(GO_INTEGRATION_TESTS)

-.PHONY: test-go-integration-alertmanager
-test-go-integration-alertmanager: ## Run integration tests for the remote alertmanager (config taken from the mimir_backend block).
-	@echo "test remote alertmanager integration tests"
-	$(GO) clean -testcache
-	AM_URL=http://localhost:8080 AM_TENANT_ID=test \
-	$(GO) test -count=1 -run "^TestIntegrationRemoteAlertmanager" -covermode=atomic -timeout=5m ./pkg/services/ngalert/...
-
 .PHONY: test-go-integration-postgres
 test-go-integration-postgres: devenv-postgres ## Run integration tests for postgres backend with flags.
 	@echo "test backend integration postgres tests"
@@ -256,7 +238,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
 	--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
 	--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
 	--build-arg BASE_IMAGE=ubuntu:22.04 \
-	--build-arg GO_IMAGE=golang:1.21.10 \
+	--build-arg GO_IMAGE=golang:1.20.10 \
 	--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
 	$(DOCKER_BUILD_ARGS)

@@ -303,6 +285,7 @@ protobuf: ## Compile protobuf definitions
 	bash pkg/plugins/backendplugin/pluginextensionv2/generate.sh
 	bash pkg/plugins/backendplugin/secretsmanagerplugin/generate.sh
 	bash pkg/services/store/entity/generate.sh
+	bash pkg/infra/grn/generate.sh

 clean: ## Clean up intermediate build artifacts.
 	@echo "cleaning"
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
-![Grafana Logo (Light)](docs/logo-horizontal.png#gh-light-mode-only)
-![Grafana Logo (Dark)](docs/logo-horizontal-dark.png#gh-dark-mode-only)
+![Grafana](docs/logo-horizontal.png)

 The open-source platform for monitoring and observability

--- a/babel.config.json
+++ b/babel.config.json
@@ -0,0 +1,62 @@
+{
+  "babelrc": false,
+  // Note: order is bottom-to-top and/or right-to-left
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "bugfixes": true,
+        "browserslistEnv": "dev",
+        "useBuiltIns": "entry",
+        "corejs": "3.10"
+      }
+    ],
+    [
+      "@babel/preset-typescript",
+      {
+        "allowNamespaces": true,
+        "allowDeclareFields": true
+      }
+    ],
+    [
+      "@babel/preset-react",
+      {
+        "runtime": "automatic"
+      }
+    ]
+  ],
+  "plugins": [
+    [
+      "@babel/plugin-transform-typescript",
+      {
+        "allowNamespaces": true,
+        "allowDeclareFields": true
+      }
+    ],
+    // added to mitigate https://github.com/babel/babel/issues/14289
+    // package (and following line) can be removed once the issue is fixed and released
+    "@babel/plugin-proposal-class-properties",
+    ["@babel/plugin-proposal-object-rest-spread", { "loose": true }],
+    "@babel/plugin-transform-react-constant-elements",
+    "@babel/plugin-proposal-nullish-coalescing-operator",
+    "@babel/plugin-proposal-optional-chaining",
+    "@babel/plugin-syntax-dynamic-import", // needed for `() => import()` in routes.ts
+    "angularjs-annotate",
+    "macros"
+  ],
+  "env": {
+    "production": {
+      "presets": [
+        [
+          "@babel/preset-env",
+          {
+            "browserslistEnv": "production"
+          }
+        ]
+      ]
+    },
+    "hot": {
+      "plugins": ["react-refresh/babel"]
+    }
+  }
+}
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -10,7 +10,6 @@ app_mode = production
 instance_name = ${HOSTNAME}

 # force migration will run migrations that might cause dataloss
-# Deprecated, use clean_upgrade option in [unified_alerting.upgrade] instead.
 force_migration = false

 #################################### Paths ###############################
@@ -134,9 +133,6 @@ log_queries =
 # For "mysql", use either "true", "false", or "skip-verify".
 ssl_mode = disable

-# For "postregs", use either "1" to enable or "0" to disable SNI
-ssl_sni =
-
 # Database drivers may support different transaction isolation levels.
 # Currently, only "mysql" driver supports isolation levels.
 # If the value is empty - driver's default isolation level is applied.
@@ -249,7 +245,7 @@ reporting_distributor = grafana-labs
 # for new versions of grafana. The check is used
 # in some UI views to notify that a grafana update exists.
 # This option does not cause any auto updates, nor send any information
-# only a GET request to https://grafana.com/api/grafana/versions/stable to get the latest version.
+# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
 check_for_updates = true

 # Set to false to disable all checks to https://grafana.com
@@ -283,9 +279,6 @@ rudderstack_sdk_url =
 # Rudderstack Config url, optional, used by Rudderstack SDK to fetch source config
 rudderstack_config_url =

-# Rudderstack Integrations URL, optional. Only valid if you pass the SDK version 1.1 or higher
-rudderstack_integrations_url =
-
 # Intercom secret, optional, used to hash user_id before passing to Intercom via Rudderstack
 intercom_secret =

@@ -386,7 +379,7 @@ angular_support_enabled = true
 csrf_always_check = false

 # Comma-separated list of plugins ids that won't be loaded inside the frontend sandbox
-disable_frontend_sandbox_for_plugins = grafana-incident-app
+disable_frontend_sandbox_for_plugins =

 [security.encryption]
 # Defines the time-to-live (TTL) for decrypted data encryption keys stored in memory (cache).
@@ -432,11 +425,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

-# Number of queries to be executed concurrently. Only for the datasource supports concurrency.
-# For now only Loki and InfluxDB (with influxql) are supporting concurrency behind the feature flags.
-# Check datasource documentations for enabling concurrency.
-concurrent_query_count = 10
-

 ################################### SQL Data Sources #####################
 [sql_datasources]
@@ -574,27 +562,6 @@ azure_auth_enabled = false
 # Use email lookup in addition to the unique ID provided by the IdP
 oauth_allow_insecure_email_lookup = false

-# Set to true to include id of identity as a response header
-id_response_header_enabled = false
-
-# Prefix used for the id response header, X-Grafana-Identity-Id
-id_response_header_prefix = X-Grafana
-
-# List of identity namespaces to add id response headers for, separated by space.
-# Available namespaces are user, api-key and service-account.
-# The header value will encode the namespace ("user:<id>", "api-key:<id>", "service-account:<id>")
-id_response_header_namespaces = user api-key service-account
-
-#################################### SSO Settings ###########################
-[sso_settings]
-# interval for reloading the SSO Settings from the database
-# useful in high availability setups running multiple Grafana instances
-# set to 0 to disable this feature
-reload_interval = 1m
-
-# List of providers that can be configured through the SSO Settings API and UI.
-configurable_providers = github gitlab google generic_oauth azuread okta
-
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -609,9 +576,6 @@ org_role = Viewer
 # mask the Grafana version number for unauthenticated users
 hide_version = false

-# number of devices in total
-device_limit =
-
 #################################### GitHub Auth #########################
 [auth.github]
 name = GitHub
@@ -625,7 +589,6 @@ scopes = user:email,read:org
 auth_url = https://github.com/login/oauth/authorize
 token_url = https://github.com/login/oauth/access_token
 api_url = https://api.github.com/user
-signout_redirect_url =
 allowed_domains =
 team_ids =
 allowed_organizations =
@@ -653,7 +616,6 @@ scopes = openid email profile
 auth_url = https://gitlab.com/oauth/authorize
 token_url = https://gitlab.com/oauth/token
 api_url = https://gitlab.com/api/v4
-signout_redirect_url =
 allowed_domains =
 allowed_groups =
 role_attribute_path =
@@ -680,9 +642,7 @@ scopes = openid email profile
 auth_url = https://accounts.google.com/o/oauth2/v2/auth
 token_url = https://oauth2.googleapis.com/token
 api_url = https://openidconnect.googleapis.com/v1/userinfo
-signout_redirect_url =
 allowed_domains =
-validate_hd = false
 hosted_domain =
 allowed_groups =
 role_attribute_path =
@@ -732,7 +692,6 @@ client_secret =
 scopes = openid email profile
 auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
 token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
-signout_redirect_url =
 allowed_domains =
 allowed_groups =
 allowed_organizations =
@@ -760,7 +719,6 @@ scopes = openid profile email groups
 auth_url = https://<tenant-id>.okta.com/oauth2/v1/authorize
 token_url = https://<tenant-id>.okta.com/oauth2/v1/token
 api_url = https://<tenant-id>.okta.com/oauth2/v1/userinfo
-signout_redirect_url =
 allowed_domains =
 allowed_groups =
 role_attribute_path =
@@ -797,7 +755,6 @@ team_ids_attribute_path =
 auth_url =
 token_url =
 api_url =
-signout_redirect_url =
 teams_url =
 allowed_domains =
 allowed_groups =
@@ -816,14 +773,6 @@ use_refresh_token = false
 #################################### Basic Auth ##########################
 [auth.basic]
 enabled = true
-# This setting will enable a stronger password policy for user's password under basic auth.
-# The password will need to comply with the following password policy
-# 1. Have a minimum of 12 characters
-# 2. Composed by at least 1 uppercase character
-# 3. Composed by at least 1 lowercase character
-# 4. Composed by at least 1 digit character
-# 5. Composed by at least 1 symbol character
-password_policy = false

 #################################### Auth Proxy ##########################
 [auth.proxy]
@@ -852,7 +801,6 @@ key_file =
 key_id =
 role_attribute_path =
 role_attribute_strict = false
-groups_attribute_path =
 auto_sign_up = false
 url_login = false
 allow_assign_grafana_admin = false
@@ -870,7 +818,7 @@ skip_org_role_sync = false
 sync_cron = "0 1 * * *"
 active_sync_enabled = true

-#################################### AWS #####################################
+#################################### AWS ###########################
 [aws]
 # Enter a comma-separated list of allowed AWS authentication providers.
 # Options are: default (AWS SDK Default), keys (Access && secret key), credentials (Credentials field), ec2_iam_role (EC2 IAM Role)
@@ -886,14 +834,6 @@ list_metrics_page_limit = 500
 # Experimental, for use in Grafana Cloud only. Please do not set.
 external_id =

-# Sets the expiry duration of an assumed role.
-# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
-session_duration = "15m"
-
-# Set the plugins that will receive AWS settings for each request (via plugin context)
-# By default this will include all Grafana Labs owned AWS plugins, or those that make use of AWS settings (ElasticSearch, Prometheus).
-forward_settings_to_plugins = cloudwatch, grafana-athena-datasource, grafana-redshift-datasource, grafana-x-ray-datasource, grafana-timestream-datasource, grafana-iot-sitewise-datasource, grafana-iot-twinmaker-app, grafana-opensearch-datasource, aws-datasource-provisioner, elasticsearch, prometheus
-
 #################################### Azure ###############################
 [azure]
 # Azure cloud environment where Grafana is hosted
@@ -945,10 +885,6 @@ user_identity_client_id =
 # By default is the same as used in AAD authentication or can be set to another application (for OBO flow)
 user_identity_client_secret =

-# Set the plugins that will receive Azure settings for each request (via plugin context)
-# By default this will include all Grafana Labs owned Azure plugins, or those that make use of Azure settings (Azure Monitor, Azure Data Explorer, Prometheus, MSSQL).
-forward_settings_to_plugins = grafana-azure-monitor-datasource, prometheus, grafana-azure-data-explorer-datasource, mssql
-
 #################################### Role-based Access Control ###########
 [rbac]
 # If enabled, cache permissions in a in memory cache
@@ -975,10 +911,6 @@ from_address = admin@grafana.localhost
 from_name = Grafana
 ehlo_identity =
 startTLS_policy =
-enable_tracing = false
-
-[smtp.static_headers]
-# Include custom static headers in all outgoing emails

 [emails]
 welcome_email_on_sign_up = false
@@ -1067,11 +999,6 @@ instrumentations_console_enabled = false
 # Should webvitals instrumentation be enabled, only affects Grafana Javascript Agent
 instrumentations_webvitals_enabled = false

-# level of internal logging for debugging Grafana Javascript Agent.
-# possible values are: 0 = OFF, 1 = ERROR, 2 = WARN, 3 = INFO, 4 = VERBOSE
-# more details: https://github.com/grafana/faro-web-sdk/blob/v1.3.7/docs/sources/tutorials/quick-start-browser.md#how-to-activate-debugging
-internal_logger_level = 0
-
 # Api Key, only applies to Grafana Javascript Agent provider
 api_key =

@@ -1122,10 +1049,6 @@ global_file = 1000
 # global limit of correlations
 global_correlations = -1

-# Limit of the number of alert rules per rule group.
-# This is not strictly enforced yet, but will be enforced over time.
-alerting_rule_group_rules = 100
-
 #################################### 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.
@@ -1202,8 +1125,8 @@ execute_alerts = true
 # The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 evaluation_timeout = 30s

-# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. The default value is 1.
-max_attempts = 1
+# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. This option has a legacy version in the `[alerting]` section that takes precedence.
+max_attempts = 3

 # Minimum interval to enforce between rule evaluations. Rules will be adjusted if they are less than this value or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time. This option has a legacy version in the `[alerting]` section that takes precedence.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
@@ -1214,14 +1137,6 @@ min_interval = 10s
 # (concurrent queries per rule disabled).
 max_state_save_concurrency = 1

-# If the feature flag 'alertingSaveStatePeriodic' is enabled, this is the interval that is used to persist the alerting instances to the database.
-# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
-state_periodic_save_interval = 5m
-
-# Disables the smoothing of alert evaluations across their evaluation window.
-# Rules will evaluate in sync.
-disable_jitter = false
-
 [unified_alerting.screenshots]
 # Enable screenshots in notifications. You must have either installed the Grafana image rendering
 # plugin, or set up Grafana to use a remote rendering service.
@@ -1295,10 +1210,6 @@ loki_basic_auth_username =
 # Optional password for basic authentication on requests sent to Loki. Can be left blank.
 loki_basic_auth_password =

-# For "loki" only.
-# Optional max query length for queries sent to Loki. Default is 721h which matches the default Loki value.
-loki_max_query_length = 721h
-
 [unified_alerting.state_history.external_labels]
 # Optional extra labels to attach to outbound state history records or log streams.
 # Any number of label key-value-pairs can be provided.
@@ -1306,13 +1217,6 @@ loki_max_query_length = 721h
 # ex.
 # mylabelkey = mylabelvalue

-[unified_alerting.upgrade]
-# If set to true when upgrading from legacy alerting to Unified Alerting, grafana will first delete all existing
-# Unified Alerting resources, thus re-upgrading all organizations from scratch. If false or unset, organizations that
-# have previously upgraded will not lose their existing Unified Alerting data when switching between legacy and
-# Unified Alerting. Should be kept false when not needed as it may cause unintended data-loss if left enabled.
-clean_upgrade = false
-
 # NOTE: this configuration options are not used yet.
 [remote.alertmanager]

@@ -1321,20 +1225,17 @@ clean_upgrade = false
 enabled = false

 # URL of the remote Alertmanager that will replace the internal one.
-# This URL should be the root path, Grafana will automatically append an "/alertmanager" suffix for certain HTTP calls.
 # Required if `enabled` is set to `true`.
 url =

 # Tenant ID to use in requests to the Alertmanager.
-# It will also be used for the basic auth username if a password is configured.
+# It will also be used for the basic auth username.
 tenant =

 # Optional password for basic authentication.
 # If not present, the tenant ID will be set in the X-Scope-OrgID header.
 password =

-sync_interval = 5m
-
 #################################### Alerting ############################
 [alerting]
 # Enable the legacy alerting sub-system and interface. If Unified Alerting is already enabled and you try to go back to legacy alerting, all data that is part of Unified Alerting will be deleted. When this configuration section and flag are not defined, the state is defined at runtime. See the documentation for more details.
@@ -1601,12 +1502,6 @@ public_key_retrieval_disabled = false
 public_key_retrieval_on_startup = false
 # Enter a comma-separated list of plugin identifiers to avoid loading (including core plugins). These plugins will be hidden in the catalog.
 disable_plugins =
-# Auth token for plugin installations and removal in managed instances
-install_token =
-# Comma separated list of plugin ids for which angular deprecation UI should be disabled
-hide_angular_deprecation =
-# Comma separated list of plugin ids for which environment variables should be forwarded. Used only when feature flag pluginsSkipHostEnvVars is enabled.
-forward_host_env_vars =

 #################################### Grafana Live ##########################################
 [live]
@@ -1662,10 +1557,6 @@ rendering_verbose_logging =
 # Default is false. This can be useful to enable (true) when troubleshooting.
 rendering_dumpio =

-# Instruct headless browser instance whether to register metrics for the duration of every rendering step. Default is false.
-# This can be useful to enable (true) when optimizing the rendering mode settings to improve the plugin performance or when troubleshooting.
-rendering_timing_metrics =
-
 # Additional arguments to pass to the headless browser instance. Default is --no-sandbox. The list of Chromium flags can be found
 # here (https://peter.sh/experiments/chromium-command-line-switches/). Multiple arguments is separated with comma-character.
 rendering_args =
@@ -1802,8 +1693,6 @@ server_name =
 proxy_address =
 # Determines if the secure socks proxy should be shown on the datasources page, defaults to true if the feature is enabled
 show_ui = true
-# Disables TLS in the secure socks proxy
-allow_insecure = false

 ################################## Feature Management ##############################################
 # Options to configure the experimental Feature Toggle Admin Page feature, which is behind the `featureToggleAdminPage` feature toggle. Use at your own risk.
@@ -1822,8 +1711,3 @@ hidden_toggles =

 # Disables updating specific feature toggles in the feature management page
 read_only_toggles =
-
-#################################### Public Dashboards #####################################
-[public_dashboards]
-# Set to false to disable public dashboards
-enabled = true
--- a/conf/provisioning/alerting/sample.yaml
+++ b/conf/provisioning/alerting/sample.yaml
@@ -67,45 +67,6 @@ apiVersion: 1
 #       labels:
 #         team: sre_team_1
 #       isPaused: false
-#       # optional settings that let configure notification settings applied to alerts created by this rule
-#       notification_settings:
-#          # <string> name of the receiver (contact-point) that should be used for this route
-#          receiver: grafana-default-email
-#          # <list<string>> The labels by which incoming alerts are grouped together. For example,
-#          #        multiple alerts coming in for cluster=A and alertname=LatencyHigh would
-#          #        be batched into a single group.
-#          #
-#          #        To aggregate by all possible labels, use the special value '...' as
-#          #        the sole label name, for example:
-#          #        group_by: ['...']
-#          #        This effectively disables aggregation entirely, passing through all
-#          #        alerts as-is. This is unlikely to be what you want, unless you have
-#          #        a very low alert volume or your upstream notification system performs
-#          #        its own grouping.
-#          # If defined, must contain the labels 'alertname' and 'grafana_folder', except when contains '...'
-#          group_by: ["alertname", "grafana_folder", "region"]
-#          # <list> Times when the route should be muted. These must match the name of a
-#          #        mute time interval.
-#          #        Additionally, the root node cannot have any mute times.
-#          #        When a route is muted it will not send any notifications, but
-#          #        otherwise acts normally (including ending the route-matching process
-#          #        if the `continue` option is not set)
-#          mute_time_intervals:
-#          - abc
-#          # <duration> How long to initially wait to send a notification for a group
-#          #            of alerts. Allows to collect more initial alerts for the same group.
-#          #            (Usually ~0s to few minutes).
-#          #            If not specified, the corresponding setting of the default policy is used.
-#          group_wait: 30s
-#          # <duration> How long to wait before sending a notification about new alerts that
-#          #            are added to a group of alerts for which an initial notification has
-#          #            already been sent. (Usually ~5m or more).
-#          #            If not specified, the corresponding setting of the default policy is used.
-#          group_interval: 5m
-#          # <duration>  How long to wait before sending a notification again if it has already
-#          #             been sent successfully for an alert. (Usually ~3h or more)
-#          #             If not specified, the corresponding setting of the default policy is used.
-#          repeat_interval: 4h

 # # List of alert rule UIDs that should be deleted
 # deleteRules:
--- a/conf/provisioning/datasources/sample.yaml
+++ b/conf/provisioning/datasources/sample.yaml
@@ -1,71 +1,50 @@
-# Configuration file version
+# # config file version
 apiVersion: 1

-# # List of data sources to delete from the database.
-# deleteDatasources:
+# # list of datasources that should be deleted from the database
+#deleteDatasources:
 #   - name: Graphite
 #     orgId: 1

-# # List of data sources to insert/update depending on what's
-# # available in the database.
-# datasources:
-#   # <string, required> Sets the name you use to refer to
-#   # the data source in panels and queries.
-#   - name: Graphite
-#     # <string, required> Sets the data source type.
-#     type: graphite
-#     # <string, required> Sets the access mode, either
-#     # proxy or direct (Server or Browser in the UI).
-#     # Some data sources are incompatible with any setting
-#     # but proxy (Server).
-#     access: proxy
-#     # <int> Sets the organization id. Defaults to orgId 1.
-#     orgId: 1
-#     # <string> Sets a custom UID to reference this
-#     # data source in other parts of the configuration.
-#     # If not specified, Grafana generates one.
-#     uid: my_unique_uid
-#     # <string> Sets the data source's URL, including the
-#     # port.
-#     url: http://localhost:8080
-#     # <string> Sets the database user, if necessary.
-#     user:
-#     # <string> Sets the database name, if necessary.
-#     database:
-#     # <bool> Enables basic authorization.
-#     basicAuth:
-#     # <string> Sets the basic authorization username.
-#     basicAuthUser:
-#     # <bool> Enables credential headers.
-#     withCredentials:
-#     # <bool> Toggles whether the data source is pre-selected
-#     # for new panels. You can set only one default
-#     # data source per organization.
-#     isDefault:
-#     # <map> Fields to convert to JSON and store in jsonData.
-#     jsonData:
-#       # <string> Defines the Graphite service's version.
-#       graphiteVersion: '1.1'
-#       # <bool> Enables TLS authentication using a client
-#       # certificate configured in secureJsonData.
-#       tlsAuth: true
-#       # <bool> Enables TLS authentication using a CA
-#       # certificate.
-#       tlsAuthWithCACert: true
-#     # <map> Fields to encrypt before storing in jsonData.
-#     secureJsonData:
-#       # <string> Defines the CA cert, client cert, and
-#       # client key for encrypted authentication.
-#       tlsCACert: '...'
-#       tlsClientCert: '...'
-#       tlsClientKey: '...'
-#       # <string> Sets the database password, if necessary.
-#       password:
-#       # <string> Sets the basic authorization password.
-#       basicAuthPassword:
-#     # <int> Sets the version. Used to compare versions when
-#     # updating. Ignored when creating a new data source.
-#     version: 1
-#     # <bool> Allows users to edit data sources from the
-#     # Grafana UI.
-#     editable: false
+# # list of datasources to insert/update depending
+# # on what's available in the database
+#datasources:
+#   # <string, required> name of the datasource. Required
+# - name: Graphite
+#   # <string, required> datasource type. Required
+#   type: graphite
+#   # <string, required> access mode. direct or proxy. Required
+#   access: proxy
+#   # <int> org id. will default to orgId 1 if not specified
+#   orgId: 1
+#   # <string> url
+#   url: http://localhost:8080
+#   # <string> database user, if used
+#   user:
+#   # <string> database name, if used
+#   database:
+#   # <bool> enable/disable basic auth
+#   basicAuth:
+#   # <string> basic auth username
+#   basicAuthUser:
+#   # <bool> enable/disable with credentials headers
+#   withCredentials:
+#   # <bool> mark as default datasource. Max one per org
+#   isDefault:
+#   # <map> fields that will be converted to json and stored in json_data
+#   jsonData:
+#      graphiteVersion: "1.1"
+#      tlsAuth: true
+#      tlsAuthWithCACert: true
+#      httpHeaderName1: "Authorization"
+#   # <string> json object of data that will be encrypted.
+#   secureJsonData:
+#     tlsCACert: "..."
+#     tlsClientCert: "..."
+#     tlsClientKey: "..."
+#     # <openshift\kubernetes token example>
+#     httpHeaderValue1: "Bearer xf5yhfkpsnmgo"
+#   version: 1
+#   # <bool> allow users to edit datasources from the UI.
+#   editable: false
+
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -10,7 +10,6 @@
 ;instance_name = ${HOSTNAME}

 # force migration will run migrations that might cause dataloss
-# Deprecated, use clean_upgrade option in [unified_alerting.upgrade] instead.
 ;force_migration = false

 #################################### Paths ####################################
@@ -124,9 +123,6 @@
 # For "mysql", use either "true", "false", or "skip-verify".
 ;ssl_mode = disable

-# For "postregs", use either "1" to enable or "0" to disable SNI
-;ssl_sni =
-
 # Database drivers may support different transaction isolation levels.
 # Currently, only "mysql" driver supports isolation levels.
 # If the value is empty - driver's default isolation level is applied.
@@ -256,7 +252,7 @@
 # for new versions of grafana. The check is used
 # in some UI views to notify that a grafana update exists.
 # This option does not cause any auto updates, nor send any information
-# only a GET request to https://grafana.com/api/grafana/versions/stable to get the latest version.
+# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
 ;check_for_updates = true

 # Set to false to disable all checks to https://grafana.com
@@ -290,9 +286,6 @@
 # Rudderstack Config url, optional, used by Rudderstack SDK to fetch source config
 ;rudderstack_config_url =

-# Rudderstack Integrations URL, optional. Only valid if you pass the SDK version 1.1 or higher
-;rudderstack_integrations_url =
-
 # Intercom secret, optional, used to hash user_id before passing to Intercom via Rudderstack
 ;intercom_secret =

@@ -558,17 +551,6 @@
 # Use email lookup in addition to the unique ID provided by the IdP
 ;oauth_allow_insecure_email_lookup = false

-# Set to true to include id of identity as a response header
-;id_response_header_enabled = false
-
-# Prefix used for the id response header, X-Grafana-Identity-Id
-;id_response_header_prefix = X-Grafana
-
-# List of identity namespaces to add id response headers for, separated by space.
-# Available namespaces are user, api-key and service-account.
-# The header value will encode the namespace ("user:<id>", "api-key:<id>", "service-account:<id>")
-;id_response_header_namespaces = user api-key service-account
-
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -596,7 +578,6 @@
 ;auth_url = https://github.com/login/oauth/authorize
 ;token_url = https://github.com/login/oauth/access_token
 ;api_url = https://api.github.com/user
-;signout_redirect_url =
 ;allowed_domains =
 ;team_ids =
 ;allowed_organizations =
@@ -618,7 +599,6 @@
 ;auth_url = https://gitlab.com/oauth/authorize
 ;token_url = https://gitlab.com/oauth/token
 ;api_url = https://gitlab.com/api/v4
-;signout_redirect_url =
 ;allowed_domains =
 ;allowed_groups =
 ;role_attribute_path =
@@ -644,9 +624,7 @@
 ;auth_url = https://accounts.google.com/o/oauth2/v2/auth
 ;token_url = https://oauth2.googleapis.com/token
 ;api_url = https://openidconnect.googleapis.com/v1/userinfo
-;signout_redirect_url =
 ;allowed_domains =
-;validate_hd =
 ;hosted_domain =
 ;allowed_groups =
 ;role_attribute_path =
@@ -680,7 +658,6 @@
 ;scopes = openid email profile
 ;auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
 ;token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
-;signout_redirect_url =
 ;allowed_domains =
 ;allowed_groups =
 ;allowed_organizations =
@@ -702,7 +679,6 @@
 ;auth_url = https://<tenant-id>.okta.com/oauth2/v1/authorize
 ;token_url = https://<tenant-id>.okta.com/oauth2/v1/token
 ;api_url = https://<tenant-id>.okta.com/oauth2/v1/userinfo
-;signout_redirect_url =
 ;allowed_domains =
 ;allowed_groups =
 ;role_attribute_path =
@@ -729,7 +705,6 @@
 ;auth_url = https://foo.bar/login/oauth/authorize
 ;token_url = https://foo.bar/login/oauth/access_token
 ;api_url = https://foo.bar/user
-;signout_redirect_url =
 ;teams_url =
 ;allowed_domains =
 ;team_ids =
@@ -749,7 +724,6 @@
 #################################### Basic Auth ##########################
 [auth.basic]
 ;enabled = true
-;password_policy = false

 #################################### Auth Proxy ##########################
 [auth.proxy]
@@ -779,7 +753,6 @@
 # Use in conjunction with key_file in case the JWT token's header specifies a key ID in "kid" field
 ;key_id = some-key-id
 ;role_attribute_path =
-;groups_attribute_path =
 ;role_attribute_strict = false
 ;auto_sign_up = false
 ;url_login = false
@@ -814,14 +787,6 @@
 # Experimental, for use in Grafana Cloud only. Please do not set.
 ; external_id =

-# Sets the expiry duration of an assumed role.
-# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
-; session_duration = "15m"
-
-# Set the plugins that will receive AWS settings for each request (via plugin context)
-# By default this will include all Grafana Labs owned AWS plugins, or those that make use of AWS settings (ElasticSearch, Prometheus).
-; forward_settings_to_plugins = cloudwatch, grafana-athena-datasource, grafana-redshift-datasource, grafana-x-ray-datasource, grafana-timestream-datasource, grafana-iot-sitewise-datasource, grafana-iot-twinmaker-app, grafana-opensearch-datasource, aws-datasource-provisioner, elasticsearch, prometheus
-
 #################################### Azure ###############################
 [azure]
 # Azure cloud environment where Grafana is hosted
@@ -873,10 +838,6 @@
 # By default is the same as used in AAD authentication or can be set to another application (for OBO flow)
 ;user_identity_client_secret =

-# Set the plugins that will receive Azure settings for each request (via plugin context)
-# By default this will include all Grafana Labs owned Azure plugins, or those that make use of Azure settings (Azure Monitor, Azure Data Explorer, Prometheus, MSSQL).
-;forward_settings_to_plugins = grafana-azure-monitor-datasource, prometheus, grafana-azure-data-explorer-datasource, mssql
-
 #################################### Role-based Access Control ###########
 [rbac]
 ;permission_cache = true
@@ -904,13 +865,6 @@
 ;ehlo_identity = dashboard.example.com
 # SMTP startTLS policy (defaults to 'OpportunisticStartTLS')
 ;startTLS_policy = NoStartTLS
-# Enable trace propagation in e-mail headers, using the 'traceparent', 'tracestate' and (optionally) 'baggage' fields (defaults to false)
-;enable_tracing = false
-
-[smtp.static_headers]
-# Include custom static headers in all outgoing emails
-;Foo-Header = bar
-;Foo = bar

 [emails]
 ;welcome_email_on_sign_up = false
@@ -1046,10 +1000,6 @@
 # global limit of correlations
 ; global_correlations = -1

-# Limit of the number of alert rules per rule group.
-# This is not strictly enforced yet, but will be enforced over time.
-;alerting_rule_group_rules = 100
-
 #################################### 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.```
@@ -1123,26 +1073,13 @@
 # The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ;evaluation_timeout = 30s

-# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. The default value is 1.
-;max_attempts = 1
+# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. This option has a legacy version in the `[alerting]` section that takes precedence.
+;max_attempts = 3

 # Minimum interval to enforce between rule evaluations. Rules will be adjusted if they are less than this value  or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time. This option has a legacy version in the `[alerting]` section that takes precedence.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ;min_interval = 10s

-# This is an experimental option to add parallelization to saving alert states in the database.
-# It configures the maximum number of concurrent queries per rule evaluated. The default value is 1
-# (concurrent queries per rule disabled).
-;max_state_save_concurrency = 1
-
-# If the feature flag 'alertingSaveStatePeriodic' is enabled, this is the interval that is used to persist the alerting instances to the database.
-# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
-;state_periodic_save_interval = 5m
-
-# Disables the smoothing of alert evaluations across their evaluation window.
-# Rules will evaluate in sync.
-;disable_jitter = false
-
 [unified_alerting.reserved_labels]
 # Comma-separated list of reserved labels added by the Grafana Alerting engine that should be disabled.
 # For example: `disabled_labels=grafana_folder`
@@ -1193,22 +1130,11 @@
 # Optional password for basic authentication on requests sent to Loki. Can be left blank.
 ; loki_basic_auth_password = "mypass"

-# For "loki" only.
-# Optional max query length for queries sent to Loki. Default is 721h which matches the default Loki value.
-; loki_max_query_length = 360h
-
 [unified_alerting.state_history.external_labels]
 # Optional extra labels to attach to outbound state history records or log streams.
 # Any number of label key-value-pairs can be provided.
 ; mylabelkey = mylabelvalue

-[unified_alerting.upgrade]
-# If set to true when upgrading from legacy alerting to Unified Alerting, grafana will first delete all existing
-# Unified Alerting resources, thus re-upgrading all organizations from scratch. If false or unset, organizations that
-# have previously upgraded will not lose their existing Unified Alerting data when switching between legacy and
-# Unified Alerting. Should be kept false when not needed as it may cause unintended data-loss if left enabled.
-;clean_upgrade = false
-
 #################################### Alerting ############################
 [alerting]
 # Disable legacy alerting engine & UI features
@@ -1637,7 +1563,6 @@
 # The address of the socks5 proxy datasources should connect to
 ; proxy_address =
 ; show_ui = true
-; allow_insecure = false

 ################################## Feature Management ##############################################
 [feature_management]
@@ -1652,8 +1577,3 @@
 ;hidden_toggles =
 # Disable updating specific feature toggles in the feature management page
 ;read_only_toggles =
-
-#################################### Public Dashboards #####################################
-[public_dashboards]
-# Set to false to disable public dashboards
-;enabled = true
--- a/contribute/backend/style-guide.md
+++ b/contribute/backend/style-guide.md
@@ -29,40 +29,13 @@ 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).

-### Test Suite and Database Tests
-
-We have a [testsuite](https://github.com/grafana/grafana/tree/main/pkg/tests/testsuite) package which provides utilities for package-level setup and teardown.
-
-Currently this is just used to ensure that test databases are correctly set up and torn down, but it also provides a place we can attach future tasks.
-
-Each package SHOULD include a [TestMain](https://pkg.go.dev/testing#hdr-Main) function that calls `testsuite.Run(m)`:
-
-```go
-package mypkg
-
-import (
-	"testing"
-
-	"github.com/grafana/grafana/pkg/tests/testsuite"
-)
-
-func TestMain(m *testing.M) {
-	testsuite.Run(m)
-}
-```
-
-You only need to define `TestMain` in one `_test.go` file within each package.
-
-> Warning
-> For tests that use the database, you MUST define `TestMain` so that the test databases can be cleaned up properly.
-
 ### Integration Tests

 We run unit and integration tests separately, to help keep our CI pipeline running smoothly and provide a better developer experience.

 To properly mark a test as being an integration test, you must format your test function definition as follows, with the function name starting with `TestIntegration` and the check for `testing.Short()`:

-```go
+```
 func TestIntegrationFoo(t *testing.T) {
    if testing.Short() {
        t.Skip("skipping integration test")
@@ -93,23 +66,25 @@ Use [`t.Cleanup`](https://golang.org/pkg/testing/#T.Cleanup) to clean up resourc

 ### Mock

-Optionally, we use [`mock.Mock`](https://github.com/stretchr/testify#mock-package) package to write mocks.
-This is useful when you expect different behaviors of the same function.
+Optionally, we use [`mock.Mock`](https://github.com/stretchr/testify#mock-package) package to generate mocks. This is
+useful when you expect different behaviours of the same function.

 #### Tips

- Use `Once()` or `Times(n)` to make a method call work `n` times.
- Use `mockedClass.AssertExpectations(t)` to guarantee that methods are called the times asked.
-  - If any method is not called the expected amount of times, the test fails.
+- Use `Once()` or `Times(n)` to make this mock only works `n` times.
+- Use `mockedClass.AssertExpectations(t)` to guarantee that the mock is called the times asked.
+  - If any mock set is not called or its expects more calls, the test fails.
 - You can pass `mock.Anything` as argument if you don't care about the argument passed.
- Use `mockedClass.AssertNotCalled(t, "MethodName")` to assert that a method was not called.
+- Use `mockedClass.AssertNotCalled(t, "FunctionName")` to assert that this test is not called.

 #### Example

+This is an example to easily create a mock of an interface.
+
 Given this interface:

 ```go
-type MyInterface interface {
+func MyInterface interface {
    Get(ctx context.Context, id string) (Object, error)
 }
 ```
@@ -117,43 +92,44 @@ type MyInterface interface {
 Mock implementation should be like this:

 ```go
-import "github.com/stretchr/testify/mock"
+import

-type MockImplementation struct {
+func MockImplementation struct {
    mock.Mock
 }

-func (m *MockImplementation) Get(ctx context.Context, id string) (Object, error) {
+func (m *MockImplementation) Get(ctx context.Context, id string) error {
    args := m.Called(ctx, id) // Pass all arguments in order here
    return args.Get(0).(Object), args.Error(1)
 }
 ```

-And use it in the following way:
+And use it as the following way:

 ```go
+
 objectToReturn := Object{Message: "abc"}
 errToReturn := errors.New("my error")

 myMock := &MockImplementation{}
 defer myMock.AssertExpectations(t)

-myMock.On("Get", mock.Anything, "id1").Return(Object{}, errToReturn).Once()
-myMock.On("Get", mock.Anything, "id2").Return(objectToReturn, nil).Once()
+myMock.On("Get", mock.Anything, "id1").Return(objectToReturn, errToReturn).Once()
+myMock.On("Get", mock.Anything, "id2").Return(Object{}, nil).Once()

 anyService := NewService(myMock)
-
 resp, err := anyService.Call("id1")
+
+assert.Equal(t, resp.Message, objectToReturn.Message)
 assert.Error(t, err, errToReturn)

 resp, err = anyService.Call("id2")
 assert.Nil(t, err)
-assert.Equal(t, resp.Message, objectToReturn.Message)
 ```

 #### Mockery

-When an interface to test is too big, it may be toilsome to mock each function manually. To avoid this, you can
+When an interface to test is too big, it's annoying to mock each function manually. To avoid this, you can
 use [`mockery`](https://github.com/vektra/mockery) library to generate the mocks.

 The command is like the following (there are more options documented if you need to use another one):
--- a/contribute/backend/upgrading-go-version.md
+++ b/contribute/backend/upgrading-go-version.md
@@ -1,22 +0,0 @@
-# Upgrading Go Version
-
-Notes on upgrading Go version.
-
-Example PR: https://github.com/grafana/grafana/pull/79329
-
-## The main areas that need to change during the upgrade are:
-
- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/scripts/drone/variables.star#L6
- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/Makefile#L264
- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/Dockerfile#L6
-
-Make sure to run `make drone` so that changes to `.star` files are reflected and `drone.yml` is generated.
-
-### Additional files to change
-
- Take a look in `.github/workflows` folder for what `go` version is being used there in various workflows.
- Make sure to create a PR with the corresponding changes in `grafana/grafana-enterprise` repository.
-
-## Updating the go.mod file
-
-Please avoid updating the `go.mod` to the newest version unless really necessary. This ensures backwards compatibility and introduces less breaking changes. Always upgrade Go version in the runtime files above first, let them run for a couple of weeks and only then consider updating the `go.mod` file if necessary.
--- a/contribute/deprecation-policy.md
+++ b/contribute/deprecation-policy.md
@@ -1,31 +0,0 @@
-# Deprecation policy
-
-We do our best to limit breaking changes and the deprecation of features to major releases. We always do our best **not** to introduce breaking changes in order to make upgrading Grafana as easy and reliable as possible. However, at times we have to introduce a breaking change by changing behavior or by removing a feature.
-
-To minimize the negative effects of removing a feature we require a deprecation plan that includes:
-
- Determine usage levels of the feature.
- Find alternative solutions and possible migration paths.
- Announce deprecation of the feature.
- Migrate users if possible
- Give users time to adjust to the deprecation.
- Disable the feature by default.
- Remove the feature from the code base.
-
-Depending on the size and importance of the feature this can be a design doc or an issue. We want this to be written communication for all parties so we know it's intentional and that did a reasonable attempt to avoid breaking changes unless needed. The size of the feature also means different notice times between Depreciation and disabling as well as disabling and removal. The actual duration will depend on releases of Grafana and the table below should be used as a guide.
-
-Grafana employees can find more details in our internal docs.
-
-## Grace period between announcement and disabling feature by default
-
-| Size   | Duration   | Example                                                          |
-| ------ | ---------- | ---------------------------------------------------------------- |
-| Large  | 1-2 years  | Classic alerting, scripted dashboards, AngularJS                 |
-| Medium | 6 months   | Supported Database for Grafana's backend                         |
-| Small  | 1-3 months | Refresh OAuth access_token automatically using the refresh_token |
-
-## Announced deprecations.
-
-| Name                                                                     | Announcement Date | Disabling date | Removal Date | Description                                                                                                             | Status  |
-| ------------------------------------------------------------------------ | ----------------- | -------------- | ------------ | ----------------------------------------------------------------------------------------------------------------------- | ------- |
-| [Support for Mysql 5.7](https://github.com/grafana/grafana/issues/68446) | 2023-05-15        | October 2023   |              | MySQL 5.7 is being deprecated in October 2023 and Grafana's policy is to test against the officially supported version. | Planned |
--- a/contribute/developer-guide.md
+++ b/contribute/developer-guide.md
@@ -8,8 +8,8 @@ Make sure you have the following dependencies installed before setting up your d

 - [Git](https://git-scm.com/)
 - [Go](https://golang.org/dl/) (see [go.mod](../go.mod#L3) for minimum required version)
- [Node.js (Long Term Support)](https://nodejs.org), with [corepack enabled](https://nodejs.org/api/corepack.html#enabling-the-feature)
- GCC (required for Cgo dependencies)
+- [Node.js (Long Term Support)](https://nodejs.org)
+- [Yarn](https://yarnpkg.com)

 ### macOS

@@ -18,8 +18,8 @@ We recommend using [Homebrew](https://brew.sh/) for installing any missing depen
 ```
 brew install git
 brew install go
-brew install node@20
-corepack enable
+brew install node@18
+npm install -g yarn
 ```

 ### Windows
@@ -37,6 +37,14 @@ For alternative ways of cloning the Grafana repository, please refer to [GitHub'

 **Warning:** Do not use `go get` to download Grafana. Recent versions of Go have added behavior which isn't compatible with the way the Grafana repository is structured.

+### Configure Editors
+
+For some IDEs, additional configuration may be needed for Typescript to work with [Yarn plug'n'play](https://yarnpkg.com/features/pnp).
+For [VSCode](https://yarnpkg.com/getting-started/editor-sdks#vscode) and [Vim](https://yarnpkg.com/getting-started/editor-sdks#vim),
+it's as easy as running `yarn dlx @yarnpkg/sdks vscode` or `yarn dlx @yarnpkg/sdks vim`, respectively.
+
+More information can be found [here](https://yarnpkg.com/getting-started/editor-sdks).
+
 ### Configure precommit hooks

 We use pre-commit hooks (via [lefthook](https://github.com/evilmartians/lefthook)) to lint, fix, and format code as you commit your changes. Previously the Grafana repository automatically installed these hook when you did `yarn install`, but they are now opt in for all contributors
@@ -53,7 +61,7 @@ To remove precommit hooks, run
 make lefthook-uninstall
 ```

-> [!NOTE]
+> [!NOTE]  
 > Contributors working on the frontend are highly encouraged to install the precommit hooks, even if your IDE formats on save, so the `.betterer.results` file is kept up to sync.

 ## Build Grafana
@@ -251,12 +259,6 @@ The resulting image will be tagged as grafana/grafana:dev.

 Are you having issues with setting up your environment? Here are some tips that might help.

-### IDE configuration
-
-Configure your IDE to use the Typescript version from the Grafana repository. The version should match the Typescript version in the package.json file, and is typically at the path `node_modules/.bin/tsc`.
-
-Previously Grafana used Yarn PnP to install frontend dependencies, which required additional special IDE configuration. This is no longer the case. If you have custom paths in your IDE for ESLint, Prettier, or Typescript, you can now remove them and use the defaults from node_modules.
-
 ### Too many open files when running `make run`

 Depending on your environment, you may have to increase the maximum number of open files allowed. For the rest of this section, we will assume you are on a Unix like OS (e.g. Linux/macOS), where you can control the maximum number of open files through the [ulimit](https://ss64.com/bash/ulimit.html) shell command.
--- a/contribute/drone-pipeline.md
+++ b/contribute/drone-pipeline.md
@@ -14,4 +14,4 @@ The Drone pipelines are built with [Starlark](https://github.com/bazelbuild/star
 - Open a PR where you can do test runs for your changes. If you need to experiment with secrets, create a PR in the [grafana-ci-sandbox repo](https://github.com/grafana/grafana-ci-sandbox), before opening a PR in the main repo.
 - Run `make drone` after making changes to the Starlark files. This builds the `.drone.yml` file.

-For further questions, reach out to the grafana-release-guild squad.
+For further questions, reach out to the grafana-delivery squad.
--- a/contribute/internationalization.md
+++ b/contribute/internationalization.md
@@ -9,8 +9,7 @@ Grafana uses the [i18next](https://www.i18next.com/) framework for managing tran
 - 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`
 - If a particular phrase is not available in the a language then it will fall back to English
- To update phrases in English, edit the default phrase in the component's source and then run `yarn i18n:extract`.
- The single source of truth for en-US (fallback language) is in grafana/grafana, the single source of truth for any translated language is Crowdin
+- To update phrases in English, edit the default phrase in both the component's source and the [English grafana.json message catalogue](../public/locales/en-US/grafana.json), then run `yarn i18n:extract`.
 - To update phrases in any translated language, edit the phrase in Crowdin. Do not edit the `{locale}/grafana.json`

 ## How to add a new translation phrase
@@ -41,8 +40,7 @@ const ErrorMessage = ({ id, message }) => <Trans i18nKey={`errors.${id}`}>There

 2. Upon reload, the default English phrase will appear on the page.

-3. Before submitting your PR, run the `yarn i18n:extract` command to extract the messages you added into the `public/locales/en-US/grafana.json` file and make them available for translation.
-   **Note:** All other languages will receive their translations when they are ready to be downloaded from Crowdin.
+3. Before submitting your PR, run the `yarn i18n:extract` command to extract the messages you added into the `grafana.json` file and make them available for translation.

 ### Plain JS usage

@@ -66,20 +64,20 @@ While the `t` function can technically be used outside of React functions (e.g,

 ## How to add a new language

-1. Add new locale in Crowdin and download files to repo
+1. Add new locale in Crowdin and sync files to repo
   1. Grafana OSS Crowdin project -> "dot dot dot" menu in top right -> Target languages
-   2. If Crowdin's locale code is different from our IETF language tag, add a custom mapping in Project Settings -> Language mapping
-   3. GH repo grafana/grafana -> Actions -> Choose `Crowdin Download Action` -> Run workflow -> Creates a PR automatically
-2. Review the PR `I18n: Download translations from Crowdin`
-3. Update `public/app/core/internationalization/constants.ts` (add new constant, and add to `LOCALES`) and add changes to the open PR
-4. Approve and merge the PR
+   2. Grafana OSS Crowdin project -> Integrations -> Github -> Sync Now
+   3. If Crowdin's locale code is different from our IETF language tag, add a custom mapping in Project Settings -> Language mapping
+2. Update `public/app/core/internationalization/constants.ts` (add new constant, and add to `LOCALES`)
+3. Update `public/locales/i18next-parser.config.js` to add the new locale to `locales`
+4. Run `yarn i18n:extract` and commit the result

 ## How translations work in Grafana

 Grafana uses the [i18next](https://www.i18next.com/) framework for managing translating phrases in the Grafana frontend. It:

 - Marks up phrases within our code for extraction
- Extracts phrases into the default messages catalogue for translating in external systems
+- Extracts phrases into messages catalogues for translating in external systems
 - Manages the user's locale and putting the translated phrases in the UI

 Grafana will load the message catalogue JSON before the initial render.
@@ -191,23 +189,6 @@ Once extracted with `yarn i18n:extract` you will need to manually edit the [Engl
 }
 ```

-## Feedback
-
-**Please note:** This is only for proofreaders with permissions to Grafana OSS project on Crowdin.
-
-To provide feedback on translations, sign into Crowdin and follow these steps:
-
-1. Open the Grafana OSS project in Crowdin.
-2. In the left-hand menu, click on the 'Dashboard' menu item.
-3. A list of available languages appears under the 'Translations' section. Click on the one you want to comment on.
-4. There is a table with the file structure in it:
-   <br>
-   `grafana/main > public > locales > 'language denomination' > grafana.json`
-   <br>
-   Click on the `grafana.json` file.
-5. In the left-hand section, click on the 'Search in file' input and search for the string that you want to comment on. You can search in English, as it is the default language, or in the language the string is translated to.
-6. Once you have found the string, on the right hand side there is a 'Comments' section where you can send the feedback about the translation. Tag @Translated to be sure the team of linguists gets notified.
-
 ## Documentation

 [Grafana's documentation](https://grafana.com/docs/grafana/latest/) is not yet open for translation and should be authored in American English only.
--- a/contribute/merge-pull-request.md
+++ b/contribute/merge-pull-request.md
@@ -115,12 +115,25 @@ In case the pull request introduces a breaking change you should document this.
 <Breaking change description>
 ```

-### Backporting
+### Should the pull request be backported?

 Backporting is the process of copying the pull request into the version branch of one or multiple previous releases.
-This is a rare exception, should only be done for _critical bug fixes_, and involves the intervention of a Grafana Labs employee.
+This should only be done for _critical bug fixes_ and involves the intervention of a Grafana Labs employee.
+To make this decision explicit, there is a **Backport Check** that is re-evaluated automatically by adding/removing labels on the pull request.

-If your pull request fixes a critical bug and needs to be backported, add it to the "Critical Bug Release" form so the team can approve the backport and know that a release needs to be made. Specify the correct `backport vx.x` labels for the releases the fix needs to be backported to. Once approved, the backporting process will continue from there.
+#### No backport
+
+If you don't want to backport you need to add a label named **no-backport** to the pull request.
+
+This should be the default!
+
+#### Backport
+
+If your pull request fixes a critical bug and needs to go into one or several existing release branches it should be backported.
+
+For a pull request to be backported, please add it to "Critical Bug Release" form so that the delivery team is aware that a release for a previous version needs to be made.
+Once approved, the backporting process will continue from there.
+In the meantime, set the `no-backport` label.

 #### Required labels

--- a/contribute/style-guides/frontend.md
+++ b/contribute/style-guides/frontend.md
@@ -180,7 +180,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
 });
 ```

-Use hook useStyles2(getStyles) to memoize the styles generation and try to avoid passing props to the getStyles function and instead compose classes using emotion cx function.
+Use hook useStyles2(getStyles) to memoize the styles generation and try to avoid passing props to the the getStyles function and instead compose classes using emotion cx function.

 #### Use `ALL_CAPS` for constants.

--- a/crowdin.yml
+++ b/crowdin.yml
@@ -1,5 +1,8 @@
 files:
-  - type: i18next_json
-# The following are pulled from env variables
-project_id_env: CROWDIN_PROJECT_ID
-api_token_env: CROWDIN_PERSONAL_TOKEN
+  - source: /public/locales/en-US/grafana.json
+    translation: /public/locales/%locale%/%original_file_name%
+pull_request_title: 'I18n: Crowdin sync'
+pull_request_labels:
+  - area/internationalization
+  - no-changelog
+  - no-backport
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -3,6 +3,7 @@ const fs = require('fs');
 const path = require('path');

 const benchmarkPlugin = require('./e2e/cypress/plugins/benchmark/index');
+const compareScreenshots = require('./e2e/cypress/plugins/compareScreenshots');
 const readProvisions = require('./e2e/cypress/plugins/readProvisions');
 const typescriptPreprocessor = require('./e2e/cypress/plugins/typescriptPreprocessor');

@@ -28,6 +29,7 @@ module.exports = defineConfig({
      }

      on('task', {
+        compareScreenshots,
        readProvisions: (filePaths) => readProvisions({ CWD: process.cwd(), filePaths }),
      });

--- a/devenv/README.md
+++ b/devenv/README.md
@@ -13,16 +13,10 @@ Grafana uses [Docker](https://docker.com) to make the task of setting up databas

 ## Developer dashboards and data sources

-To setup developer dashboards and data sources
 ```bash
 ./setup.sh
 ```

-To remove the setup developer dashboards and data sources
-```bash
-./setup.sh undev
-```
-
 After restarting the Grafana server, there should be a number of data sources named `gdev-<type>` provisioned as well as
 a dashboard folder named `gdev dashboards`. This folder contains dashboard and panel features tests dashboards. 

--- a/devenv/dev-dashboards-without-uid/panel_tests_polystat.json
+++ b/devenv/dev-dashboards-without-uid/panel_tests_polystat.json
@@ -452,10 +452,6 @@
            {
              "text": "CFP franc (XPF)",
              "value": "currencyXPF"
-            },
-            {
-              "text": "Bulgarian Lev (BGN)",
-              "value": "currencyBGN"
            }
          ],
          "text": "currency"
@@ -1615,10 +1611,6 @@
            {
              "text": "Malaysian Ringgit (RM)",
              "value": "currencyMYR"
-            },
-            {
-              "text": "Bulgarian Lev (BGN)",
-              "value": "currencyBGN"
            }
          ],
          "text": "currency"
@@ -2718,10 +2710,6 @@
            {
              "text": "Malaysian Ringgit (RM)",
              "value": "currencyMYR"
-            },
-            {
-              "text": "Bulgarian Lev (BGN)",
-              "value": "currencyBGN"
            }
          ],
          "text": "currency"
--- a/devenv/dev-dashboards/datasource-loki/loki_query_splitting.json
+++ b/devenv/dev-dashboards/datasource-loki/loki_query_splitting.json
--- a/devenv/dev-dashboards/migrations/migrations.json
+++ b/devenv/dev-dashboards/migrations/migrations.json
@@ -21,127 +21,7 @@
  "links": [
    {
      "asDropdown": false,
-      "icon": "external link",
-      "includeVars": false,
-      "keepTime": false,
-      "tags": [],
-      "targetBlank": true,
-      "title": "Auto migrate graph panel (TRUE)",
-      "tooltip": "",
-      "type": "link",
-      "url": " /d/cdd412c4/?__feature.autoMigrateGraphPanel=true"
-    },
-    {
-      "asDropdown": false,
-      "icon": "external link",
-      "includeVars": false,
-      "keepTime": false,
-      "tags": [],
-      "targetBlank": true,
-      "title": "Auto migrate graph panel (FALSE)",
-      "tooltip": "",
-      "type": "link",
-      "url": " /d/cdd412c4/?__feature.autoMigrateGraphPanel=false"
-    },
-    {
-      "asDropdown": false,
-      "icon": "external link",
-      "includeVars": false,
-      "keepTime": false,
-      "tags": [],
-      "targetBlank": true,
-      "title": "Auto migrate table (old) panel (TRUE)",
-      "tooltip": "",
-      "type": "link",
-      "url": " /d/cdd412c4/?__feature.autoMigrateTablePanel=true"
-    },
-    {
-      "asDropdown": false,
-      "icon": "external link",
-      "includeVars": false,
-      "keepTime": false,
-      "tags": [],
-      "targetBlank": true,
-      "title": "Auto migrate table (old) panel (FALSE)",
-      "tooltip": "",
-      "type": "link",
-      "url": " /d/cdd412c4/?__feature.autoMigrateTablePanel=false"
-    },
-    {
-      "asDropdown": false,
-      "icon": "external link",
-      "includeVars": false,
-      "keepTime": false,
-      "tags": [],
-      "targetBlank": true,
-      "title": "Auto migrate piechart panel (TRUE)",
-      "tooltip": "",
-      "type": "link",
-      "url": " /d/cdd412c4/?__feature.autoMigratePiechartPanel=true"
-    },
-    {
-      "asDropdown": false,
-      "icon": "external link",
-      "includeVars": false,
-      "keepTime": false,
-      "tags": [],
-      "targetBlank": true,
-      "title": "Auto migrate piechart panel (FALSE)",
-      "tooltip": "",
-      "type": "link",
-      "url": " /d/cdd412c4/?__feature.autoMigratePiechartPanel=false"
-    },
-    {
-      "asDropdown": false,
-      "icon": "external link",
-      "includeVars": false,
-      "keepTime": false,
-      "tags": [],
-      "targetBlank": true,
-      "title": "Auto migrate worldmap panel (TRUE)",
-      "tooltip": "",
-      "type": "link",
-      "url": " /d/cdd412c4/?__feature.autoMigrateWorldmapPanel=true"
-    },
-    {
-      "asDropdown": false,
-      "icon": "external link",
-      "includeVars": false,
-      "keepTime": false,
-      "tags": [],
-      "targetBlank": true,
-      "title": "Auto migrate worldmap panel (FALSE)",
-      "tooltip": "",
-      "type": "link",
-      "url": " /d/cdd412c4/?__feature.autoMigrateWorldmapPanel=false"
-    },
-    {
-      "asDropdown": false,
-      "icon": "external link",
-      "includeVars": false,
-      "keepTime": false,
-      "tags": [],
-      "targetBlank": true,
-      "title": "Auto migrate stat panel (TRUE)",
-      "tooltip": "",
-      "type": "link",
-      "url": " /d/cdd412c4/?__feature.autoMigrateStatPanel=true"
-    },
-    {
-      "asDropdown": false,
-      "icon": "external link",
-      "includeVars": false,
-      "keepTime": false,
-      "tags": [],
-      "targetBlank": true,
-      "title": "Auto migrate stat panel (FALSE)",
-      "tooltip": "",
-      "type": "link",
-      "url": " /d/cdd412c4/?__feature.autoMigrateStatPanel=false"
-    },
-    {
-      "asDropdown": false,
-      "icon": "external link",
+      "icon": "dashboard",
      "includeVars": false,
      "keepTime": false,
      "tags": [],
@@ -165,7 +45,7 @@
    },
    {
      "asDropdown": false,
-      "icon": "external link",
+      "icon": "dashboard",
      "includeVars": false,
      "keepTime": false,
      "tags": [],
@@ -201,6 +81,52 @@
      },
      "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"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
          "unit": "short"
        },
        "overrides": []
@@ -241,7 +167,7 @@
        }
      },
      "percentage": false,
-      "pluginVersion": "10.4.0-pre",
+      "pluginVersion": "9.5.0-pre",
      "pointradius": 2,
      "points": false,
      "renderer": "flot",
@@ -268,7 +194,7 @@
        "sort": 0,
        "value_type": "individual"
      },
-      "type": "graph",
+      "type": "timeseries",
      "xaxis": {
        "mode": "time",
        "show": true,
@@ -311,7 +237,7 @@
        "content": "# Graph panel >> Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
        "mode": "markdown"
      },
-      "pluginVersion": "10.4.0-pre",
+      "pluginVersion": "9.5.0-pre",
      "targets": [
        {
          "datasource": {
@@ -423,7 +349,7 @@
        "content": "# Table (old) >> Table\n\nKnown issues:\n* wrapping text\n* style changes",
        "mode": "markdown"
      },
-      "pluginVersion": "10.4.0-pre",
+      "pluginVersion": "9.5.0-pre",
      "targets": [
        {
          "datasource": {
@@ -463,6 +389,7 @@
        "y": 21
      },
      "id": 9,
+      "links": [],
      "mappingType": 1,
      "mappingTypes": [
        {
@@ -543,6 +470,7 @@
        "y": 21
      },
      "id": 23,
+      "links": [],
      "mappingType": 1,
      "mappingTypes": [
        {
@@ -618,271 +546,7 @@
        "content": "# Singlestat >> Stat\n\nKnown issues:\n* limited options",
        "mode": "markdown"
      },
-      "pluginVersion": "10.4.0-pre",
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A"
-        }
-      ],
-      "title": "Status + Notes",
-      "type": "text"
-    },
-    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 16,
-        "x": 0,
-        "y": 29
-      },
-      "id": 24,
-      "options": {
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "pieType": "pie",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
      "pluginVersion": "9.5.0-pre",
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A",
-          "scenarioId": "random_walk_table"
-        }
-      ],
-      "title": "grafana-piechart-panel",
-      "transformations": [
-        {
-          "id": "merge",
-          "options": {
-            "reducers": []
-          }
-        }
-      ],
-      "type": "grafana-piechart-panel"
-    },
-    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 29
-      },
-      "id": 25,
-      "options": {
-        "code": {
-          "language": "plaintext",
-          "showLineNumbers": false,
-          "showMiniMap": false
-        },
-        "content": "# grafana-piechart-panel >> piechart\n\nKnown issues:\n* TBD",
-        "mode": "markdown"
-      },
-      "pluginVersion": "10.4.0-pre",
-      "targets": [
-        {
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A"
-        }
-      ],
-      "title": "Status + Notes",
-      "type": "text"
-    },
-    {
-      "datasource": {
-        "type": "grafana-testdata-datasource",
-        "uid": "PD8C576611E62080A"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "rgba(245, 54, 54, 0.9)"
-              },
-              {
-                "color": "rgba(237, 129, 40, 0.89)",
-                "value": 0
-              },
-              {
-                "color": "rgba(50, 172, 45, 0.97)",
-                "value": 10
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 16,
-        "x": 0,
-        "y": 39
-      },
-      "id": 26,
-      "maxDataPoints": 1,
-      "options": {
-        "basemap": {
-          "name": "Basemap",
-          "type": "default"
-        },
-        "controls": {
-          "mouseWheelZoom": false,
-          "showAttribution": true,
-          "showDebug": false,
-          "showMeasure": false,
-          "showScale": false,
-          "showZoom": true
-        },
-        "layers": [
-          {
-            "config": {
-              "showLegend": true,
-              "style": {
-                "color": {
-                  "fixed": "dark-green"
-                },
-                "opacity": 0.4,
-                "rotation": {
-                  "fixed": 0,
-                  "max": 360,
-                  "min": -360,
-                  "mode": "mod"
-                },
-                "size": {
-                  "fixed": 5,
-                  "max": 30,
-                  "min": 2
-                },
-                "symbol": {
-                  "fixed": "img/icons/marker/circle.svg",
-                  "mode": "fixed"
-                },
-                "symbolAlign": {
-                  "horizontal": "center",
-                  "vertical": "center"
-                },
-                "textConfig": {
-                  "fontSize": 12,
-                  "offsetX": 0,
-                  "offsetY": 0,
-                  "textAlign": "center",
-                  "textBaseline": "middle"
-                }
-              }
-            },
-            "location": {
-              "gazetteer": "public/gazetteer/countries.json",
-              "mode": "lookup"
-            },
-            "name": "Layer 0",
-            "tooltip": true,
-            "type": "markers"
-          }
-        ],
-        "tooltip": {
-          "mode": "details"
-        },
-        "view": {
-          "allLayers": true,
-          "id": "zero",
-          "lat": 0,
-          "lon": 0,
-          "zoom": 1
-        }
-      },
-      "pluginVersion": "10.4.0-pre",
-      "targets": [
-        {
-          "csvFileName": "flight_info_by_state.csv",
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A",
-          "scenarioId": "csv_file"
-        }
-      ],
-      "title": "grafana-worldmap-panel",
-      "transformations": [
-        {
-          "id": "merge",
-          "options": {
-            "reducers": []
-          }
-        },
-        {
-          "id": "reduce",
-          "options": {
-            "reducers": [
-              "sum"
-            ]
-          }
-        }
-      ],
-      "type": "grafana-worldmap-panel"
-    },
-    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 39
-      },
-      "id": 27,
-      "options": {
-        "code": {
-          "language": "plaintext",
-          "showLineNumbers": false,
-          "showMiniMap": false
-        },
-        "content": "# grafana-worldmap-panel >> geomap\n\nKnown issues:\n* TBD",
-        "mode": "markdown"
-      },
-      "pluginVersion": "10.4.0-pre",
      "targets": [
        {
          "datasource": {
@@ -897,7 +561,7 @@
    }
  ],
  "refresh": "",
-  "schemaVersion": 39,
+  "schemaVersion": 34,
  "tags": [
    "gdev",
    "migrations",
@@ -914,6 +578,6 @@
  "timezone": "",
  "title": "Devenv - Panel migrations",
  "uid": "cdd412c4",
-  "version": 67,
+  "version": 6,
  "weekStart": ""
-}
+}
--- a/devenv/dev-dashboards/panel-barchart/barchart-tooltips-legends.json
+++ b/devenv/dev-dashboards/panel-barchart/barchart-tooltips-legends.json
--- a/devenv/dev-dashboards/panel-barchart/barchart-tooltips.json
+++ b/devenv/dev-dashboards/panel-barchart/barchart-tooltips.json
@@ -0,0 +1,593 @@
+{
+    "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": 301,
+    "links": [],
+    "liveNow": false,
+    "panels": [
+      {
+        "collapsed": false,
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 0
+        },
+        "id": 4,
+        "panels": [],
+        "title": "Field Override - Data Links",
+        "type": "row"
+      },
+      {
+        "datasource": {},
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "fillOpacity": 80,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "lineWidth": 1,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": [
+            {
+              "matcher": {
+                "id": "byName",
+                "options": "column1"
+              },
+              "properties": [
+                {
+                  "id": "links",
+                  "value": [
+                    {
+                      "title": "google",
+                      "url": "google.com"
+                    },
+                    {
+                      "targetBlank": true,
+                      "title": "youtube",
+                      "url": "youtube.com"
+                    }
+                  ]
+                },
+                {
+                  "id": "custom.fillOpacity",
+                  "value": 14
+                }
+              ]
+            },
+            {
+              "matcher": {
+                "id": "byName",
+                "options": "column2"
+              },
+              "properties": [
+                {
+                  "id": "links",
+                  "value": [
+                    {
+                      "title": "datalink column 2",
+                      "url": "grafana.com"
+                    }
+                  ]
+                },
+                {
+                  "id": "color",
+                  "value": {
+                    "fixedColor": "purple",
+                    "mode": "shades"
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        "gridPos": {
+          "h": 6,
+          "w": 9,
+          "x": 0,
+          "y": 1
+        },
+        "id": 1,
+        "options": {
+          "barRadius": 0,
+          "barWidth": 0.97,
+          "fullHighlight": false,
+          "groupWidth": 0.7,
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "orientation": "auto",
+          "showValue": "auto",
+          "stacking": "none",
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          },
+          "xTickLabelRotation": 0,
+          "xTickLabelSpacing": 0
+        },
+        "pluginVersion": "9.5.0-cloud.4.a016665c",
+        "targets": [
+          {
+            "csvContent": "id,column1,column2\r\nA,1,2",
+            "datasource": {
+              "type": "testdata",
+              "uid": "o63ntNT4z"
+            },
+            "refId": "A",
+            "scenarioId": "csv_content"
+          },
+          {
+            "csvContent": "id,column1,column2\r\nB,2,1",
+            "datasource": {
+              "type": "testdata",
+              "uid": "o63ntNT4z"
+            },
+            "hide": false,
+            "refId": "B",
+            "scenarioId": "csv_content"
+          }
+        ],
+        "title": "Tooltip mode: Single",
+        "transformations": [
+          {
+            "id": "merge",
+            "options": {}
+          }
+        ],
+        "type": "barchart"
+      },
+      {
+        "datasource": {},
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "fillOpacity": 80,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "lineWidth": 1,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": [
+            {
+              "matcher": {
+                "id": "byName",
+                "options": "column1"
+              },
+              "properties": [
+                {
+                  "id": "links",
+                  "value": [
+                    {
+                      "title": "google",
+                      "url": "google.com"
+                    },
+                    {
+                      "targetBlank": true,
+                      "title": "youtube",
+                      "url": "youtube.com"
+                    }
+                  ]
+                },
+                {
+                  "id": "custom.fillOpacity",
+                  "value": 14
+                }
+              ]
+            },
+            {
+              "matcher": {
+                "id": "byName",
+                "options": "column2"
+              },
+              "properties": [
+                {
+                  "id": "links",
+                  "value": [
+                    {
+                      "title": "datalink column 2",
+                      "url": "grafana.com"
+                    }
+                  ]
+                },
+                {
+                  "id": "color",
+                  "value": {
+                    "fixedColor": "purple",
+                    "mode": "shades"
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        "gridPos": {
+          "h": 6,
+          "w": 9,
+          "x": 9,
+          "y": 1
+        },
+        "id": 6,
+        "options": {
+          "barRadius": 0,
+          "barWidth": 0.97,
+          "fullHighlight": false,
+          "groupWidth": 0.7,
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "orientation": "auto",
+          "showValue": "auto",
+          "stacking": "none",
+          "tooltip": {
+            "mode": "multi",
+            "sort": "none"
+          },
+          "xTickLabelRotation": 0,
+          "xTickLabelSpacing": 0
+        },
+        "pluginVersion": "9.5.0-cloud.4.a016665c",
+        "targets": [
+          {
+            "csvContent": "id,column1,column2\r\nA,1,2",
+            "datasource": {
+              "type": "testdata",
+              "uid": "o63ntNT4z"
+            },
+            "refId": "A",
+            "scenarioId": "csv_content"
+          },
+          {
+            "csvContent": "id,column1,column2\r\nB,2,1",
+            "datasource": {
+              "type": "testdata",
+              "uid": "o63ntNT4z"
+            },
+            "hide": false,
+            "refId": "B",
+            "scenarioId": "csv_content"
+          }
+        ],
+        "title": "Tooltip mode: All",
+        "transformations": [
+          {
+            "id": "merge",
+            "options": {}
+          }
+        ],
+        "type": "barchart"
+      },
+      {
+        "collapsed": false,
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 7
+        },
+        "id": 3,
+        "panels": [],
+        "title": "Field Override - Hide Tooltip",
+        "type": "row"
+      },
+      {
+        "datasource": {
+          "type": "testdata",
+          "uid": "PD8C576611E62080A"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "fillOpacity": 80,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "lineWidth": 1,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": [
+            {
+              "matcher": {
+                "id": "byName",
+                "options": "field 3"
+              },
+              "properties": [
+                {
+                  "id": "custom.hideFrom",
+                  "value": {
+                    "legend": false,
+                    "tooltip": true,
+                    "viz": false
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        "gridPos": {
+          "h": 6,
+          "w": 9,
+          "x": 0,
+          "y": 8
+        },
+        "id": 5,
+        "options": {
+          "barRadius": 0,
+          "barWidth": 0.97,
+          "fullHighlight": false,
+          "groupWidth": 0.7,
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "orientation": "auto",
+          "showValue": "auto",
+          "stacking": "none",
+          "tooltip": {
+            "mode": "multi",
+            "sort": "none"
+          },
+          "xTickLabelRotation": 0,
+          "xTickLabelSpacing": 0
+        },
+        "targets": [
+          {
+            "csvContent": "id, field 1, field 2, field 3\na, 20, 30, 40\nb, 40, 50, 60",
+            "datasource": {
+              "type": "testdata",
+              "uid": "PD8C576611E62080A"
+            },
+            "refId": "A",
+            "scenarioId": "csv_content"
+          }
+        ],
+        "title": "Hide 'field 3'",
+        "type": "barchart"
+      },
+      {
+        "datasource": {
+          "type": "testdata",
+          "uid": "PD8C576611E62080A"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "fillOpacity": 80,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "lineWidth": 1,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": [
+            {
+              "matcher": {
+                "id": "byName",
+                "options": "id"
+              },
+              "properties": [
+                {
+                  "id": "custom.hideFrom",
+                  "value": {
+                    "legend": false,
+                    "tooltip": true,
+                    "viz": false
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        "gridPos": {
+          "h": 6,
+          "w": 9,
+          "x": 9,
+          "y": 8
+        },
+        "id": 7,
+        "options": {
+          "barRadius": 0,
+          "barWidth": 0.97,
+          "fullHighlight": false,
+          "groupWidth": 0.7,
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "orientation": "auto",
+          "showValue": "auto",
+          "stacking": "none",
+          "tooltip": {
+            "mode": "multi",
+            "sort": "none"
+          },
+          "xTickLabelRotation": 0,
+          "xTickLabelSpacing": 0
+        },
+        "targets": [
+          {
+            "csvContent": "id, field 1, field 2, field 3\na, 20, 30, 40\nb, 40, 50, 60",
+            "datasource": {
+              "type": "testdata",
+              "uid": "PD8C576611E62080A"
+            },
+            "refId": "A",
+            "scenarioId": "csv_content"
+          }
+        ],
+        "title": "Hide 'id'",
+        "type": "barchart"
+      }
+    ],
+    "refresh": "",
+    "schemaVersion": 38,
+      "tags": [
+        "gdev",
+        "panel-tests",
+        "barchart",
+        "graph-ng"
+      ],
+    "templating": {
+      "list": []
+    },
+    "time": {
+      "from": "now-6h",
+      "to": "now"
+    },
+    "timepicker": {},
+    "timezone": "",
+    "title": "Panel Tests - Bar Chart Tooltip",
+    "uid": "ea33320b-bd97-4fe1-a27c-24bc61a48b41",
+    "version": 12,
+    "weekStart": ""
+  }
--- a/devenv/dev-dashboards/panel-dashlist/dashlist.json
+++ b/devenv/dev-dashboards/panel-dashlist/dashlist.json
@@ -1,86 +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": null,
-  "links": [],
-  "liveNow": false,
-  "panels": [
-    {
-      "datasource": {
-        "type": "grafana-testdata-datasource",
-        "uid": "PD8C576611E62080A"
-      },
-      "gridPos": {
-        "h": 12,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "options": {
-        "folderUID": "",
-        "includeVars": true,
-        "keepTime": false,
-        "maxItems": 10,
-        "query": "",
-        "showHeadings": true,
-        "showRecentlyViewed": true,
-        "showSearch": false,
-        "showStarred": false,
-        "tags": []
-      },
-      "pluginVersion": "10.3.0-pre",
-      "title": "Include time range and variables enabled",
-      "type": "dashlist"
-    }
-  ],
-  "refresh": "",
-  "schemaVersion": 39,
-  "tags": ["gdev", "panel-tests"],
-  "templating": {
-    "list": [
-      {
-        "current": {
-          "selected": true,
-          "text": "A",
-          "value": "A"
-        },
-        "hide": 0,
-        "includeAll": false,
-        "multi": true,
-        "name": "server",
-        "query": "A,B,C,D",
-        "queryValue": "",
-        "skipUrlSync": false,
-        "type": "custom"
-      }
-    ]
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "Panel Tests - DashList",
-  "uid": "a6801696-cc53-4196-b1f9-2403e3909185",
-  "version": 1,
-  "weekStart": ""
-}
--- a/devenv/dev-dashboards/panel-histogram/histogram_tests.json
+++ b/devenv/dev-dashboards/panel-histogram/histogram_tests.json
--- a/devenv/dev-dashboards/panel-polystat/polystat_test.json
+++ b/devenv/dev-dashboards/panel-polystat/polystat_test.json
@@ -449,13 +449,9 @@
              "text": "Malaysian Ringgit (RM)",
              "value": "currencyMYR"
            },
-	          {
+	    {
              "text": "CFP franc (XPF)",
              "value": "currencyXPF"
-            },
-            {
-              "text": "Bulgarian Lev (BGN)",
-              "value": "currencyBGN"
            }
          ],
          "text": "currency"
@@ -1615,10 +1611,6 @@
            {
              "text": "Malaysian Ringgit (RM)",
              "value": "currencyMYR"
-            },
-            {
-              "text": "Bulgarian Lev (BGN)",
-              "value": "currencyBGN"
            }
          ],
          "text": "currency"
@@ -2714,10 +2706,6 @@
            {
              "text": "Malaysian Ringgit (RM)",
              "value": "currencyMYR"
-            },
-            {
-              "text": "Bulgarian Lev (BGN)",
-              "value": "currencyBGN"
            }
          ],
          "text": "currency"
--- a/devenv/dev-dashboards/panel-stat/panel-stat-tests.json
+++ b/devenv/dev-dashboards/panel-stat/panel-stat-tests.json
--- a/Show More
+++ b/Show More