updated backend

.air.toml

@@ -7,7 +7,8 @@ exclude_unchanged = true
 follow_symlink = true
 include_dir = ["apps", "conf", "devenv/dev-dashboards", "pkg", "public/views"]
 include_ext = ["go", "ini", "toml", "html", "json"]
-stop_on_error = false
+pre_cmd = ["make gen-go"]
+stop_on_error = true
 send_interrupt = true
 kill_delay = 500
 

.betterer.eslint.config.js

@@ -0,0 +1,154 @@
+// @ts-check
+const emotionPlugin = require('@emotion/eslint-plugin');
+const importPlugin = require('eslint-plugin-import');
+const jestPlugin = require('eslint-plugin-jest');
+const jsxA11yPlugin = require('eslint-plugin-jsx-a11y');
+const lodashPlugin = require('eslint-plugin-lodash');
+const barrelPlugin = require('eslint-plugin-no-barrel-files');
+const reactPlugin = require('eslint-plugin-react');
+const testingLibraryPlugin = require('eslint-plugin-testing-library');
+
+const grafanaConfig = require('@grafana/eslint-config/flat');
+const grafanaPlugin = require('@grafana/eslint-plugin');
+const grafanaI18nPlugin = require('@grafana/i18n/eslint-plugin');
+
+// Include the Grafana config and remove the rules,
+// as we just want to pull in all of the necessary configuration but not run the rules
+// (this should only be concerned with checking rules that we want to improve,
+// so there's no need to try and run the rules that will be linted properly anyway)
+const { rules, ...baseConfig } = grafanaConfig;
+
+/**
+ * @type {Array<import('eslint').Linter.Config>}
+ */
+module.exports = [
+  {
+    name: 'grafana/betterer-ignores',
+    ignores: [
+      '.github',
+      '.yarn',
+      '**/.*',
+      '**/*.gen.ts',
+      '**/build/',
+      '**/compiled/',
+      '**/dist/',
+      'data/',
+      'deployment_tools_config.json',
+      'devenv',
+      'e2e/test-plugins',
+      'e2e/tmp',
+      'packages/grafana-ui/src/components/Icon/iconBundle.ts',
+      'pkg',
+      'playwright-report',
+      'public/lib/monaco/',
+      'public/locales/_build',
+      'public/locales/**/*.js',
+      'public/vendor/',
+      'scripts/grafana-server/tmp',
+      '!.betterer.eslint.config.js',
+    ],
+  },
+  {
+    name: 'react/jsx-runtime',
+    // @ts-ignore - not sure why but flat config is typed as a maybe?
+    ...reactPlugin.configs.flat['jsx-runtime'],
+  },
+  {
+    files: ['**/*.{ts,tsx,js}'],
+    ...baseConfig,
+    plugins: {
+      ...baseConfig.plugins,
+      '@emotion': emotionPlugin,
+      lodash: lodashPlugin,
+      jest: jestPlugin,
+      import: importPlugin,
+      'jsx-a11y': jsxA11yPlugin,
+      'no-barrel-files': barrelPlugin,
+      '@grafana': grafanaPlugin,
+      'testing-library': testingLibraryPlugin,
+      '@grafana/i18n': grafanaI18nPlugin,
+    },
+    linterOptions: {
+      // This reports unused disable directives that we can clean up but
+      // it also conflicts with the betterer eslint rules so disabled
+      reportUnusedDisableDirectives: false,
+    },
+  },
+  {
+    files: ['**/*.{js,jsx,ts,tsx}'],
+    rules: {
+      '@typescript-eslint/no-explicit-any': 'error',
+      '@grafana/no-aria-label-selectors': 'error',
+      'no-restricted-imports': [
+        'error',
+        {
+          patterns: [
+            {
+              group: ['@grafana/ui*', '*/Layout/*'],
+              importNames: ['Layout', 'HorizontalGroup', 'VerticalGroup'],
+              message: 'Use Stack component instead.',
+            },
+            {
+              group: ['@grafana/ui/src/*', '@grafana/runtime/src/*', '@grafana/data/src/*'],
+              message: 'Import from the public export instead.',
+            },
+          ],
+        },
+      ],
+    },
+  },
+  {
+    files: ['**/*.{js,jsx,ts,tsx}'],
+    ignores: [
+      '**/*.{test,spec}.{ts,tsx}',
+      '**/__mocks__/**',
+      '**/public/test/**',
+      '**/mocks.{ts,tsx}',
+      '**/spec/**/*.{ts,tsx}',
+    ],
+    rules: {
+      '@typescript-eslint/consistent-type-assertions': ['error', { assertionStyle: 'never' }],
+    },
+  },
+  {
+    files: ['**/*.{js,jsx,ts,tsx}'],
+    ignores: [
+      '**/*.{test,spec}.{ts,tsx}',
+      '**/__mocks__/**',
+      '**/public/test/**',
+      '**/mocks.{ts,tsx}',
+      '**/spec/**/*.{ts,tsx}',
+    ],
+    rules: {
+      'no-restricted-syntax': [
+        'error',
+        {
+          selector: 'Identifier[name=localStorage]',
+          message: 'Direct usage of localStorage is not allowed. import store from @grafana/data instead',
+        },
+        {
+          selector: 'MemberExpression[object.name=localStorage]',
+          message: 'Direct usage of localStorage is not allowed. import store from @grafana/data instead',
+        },
+        {
+          selector:
+            'Program:has(ImportDeclaration[source.value="@grafana/ui"] ImportSpecifier[imported.name="Card"]) JSXOpeningElement[name.name="Card"]:not(:has(JSXAttribute[name.name="noMargin"]))',
+          message:
+            'Add noMargin prop to Card components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.',
+        },
+        {
+          selector:
+            'Program:has(ImportDeclaration[source.value="@grafana/ui"] ImportSpecifier[imported.name="Field"]) JSXOpeningElement[name.name="Field"]:not(:has(JSXAttribute[name.name="noMargin"]))',
+          message:
+            'Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.',
+        },
+      ],
+    },
+  },
+  {
+    files: ['public/app/**/*.{ts,tsx}'],
+    rules: {
+      'no-barrel-files/no-barrel-files': 'error',
+    },
+  },
+];

.betterer.ts

@@ -0,0 +1,97 @@
+import { BettererFileTest } from '@betterer/betterer';
+import { ESLint } from 'eslint';
+import { promises as fs } from 'fs';
+
+// Why are we ignoring these?
+// They're all deprecated/being removed so doesn't make sense to fix types
+const eslintPathsToIgnore = [
+  'packages/grafana-ui/src/graveyard', // will be removed alongside angular in Grafana 12
+  'public/app/angular', // will be removed in Grafana 12
+  'public/app/plugins/panel/graph', // will be removed alongside angular in Grafana 12
+  'public/app/plugins/panel/table-old', // will be removed alongside angular in Grafana 12
+];
+
+// 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}')
+      .exclude(new RegExp('packages/grafana-ui/src/themes/GlobalStyles')),
+};
+
+function countUndocumentedStories() {
+  return new BettererFileTest(async (filePaths, fileTestResult) => {
+    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 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) {
+          // In this case the file contents don't matter:
+          const file = fileTestResult.addFile(filePath, '');
+          // Add the issue to the first character of the file:
+          file.addIssue(0, 0, 'No undocumented stories are allowed, please add an .mdx file with some documentation');
+        }
+      })
+    );
+  });
+}
+
+/**
+ *  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) => {
+    // Just bail early if there's no files to test. Prevents trying to get the base config from failing
+    if (filePaths.length === 0) {
+      return;
+    }
+
+    const runner = new ESLint({
+      overrideConfigFile: './.betterer.eslint.config.js',
+      warnIgnored: false,
+    });
+
+    const lintResults = await runner.lintFiles(Array.from(filePaths));
+
+    lintResults.forEach(({ messages, filePath }) => {
+      const file = fileTestResult.addFile(filePath, '');
+      messages
+        .sort((a, b) => (a.message > b.message ? 1 : -1))
+        .forEach((message, index) => {
+          file.addIssue(0, 0, message.message, `${index}`);
+        });
+    });
+  });
+}

.bingo/.gitignore

@@ -0,0 +1,13 @@
+
+# Ignore everything
+*
+
+# But not these files:
+!.gitignore
+!*.mod
+!*.sum
+!README.md
+!Variables.mk
+!variables.env
+
+*tmp.mod

.bingo/README.md

@@ -0,0 +1,14 @@
+# Project Development Dependencies.
+
+This is directory which stores Go modules with pinned buildable package that is used within this repository, managed by https://github.com/bwplotka/bingo.
+
+- Run `bingo get` to install all tools having each own module file in this directory.
+- Run `bingo get <tool>` to install <tool> that have own module file in this directory.
+- For Makefile: Make sure to put `include .bingo/Variables.mk` in your Makefile, then use $(<upper case tool name>) variable where <tool> is the .bingo/<tool>.mod.
+- For shell: Run `source .bingo/variables.env` to source all environment variable for each tool.
+- For go: Import `.bingo/variables.go` to for variable names.
+- See https://github.com/bwplotka/bingo or -h on how to add, remove or change binaries dependencies.
+
+## Requirements
+
+- Go 1.14+

.bingo/Variables.mk

@@ -0,0 +1,25 @@
+# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.9. DO NOT EDIT.
+# All tools are designed to be build inside $GOBIN.
+BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+GOPATH ?= $(shell go env GOPATH)
+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
+# will be used; reinstalling only if needed.
+# For example for drone variable:
+#
+# In your main Makefile (for non array binaries):
+#
+#include .bingo/Variables.mk # Assuming -dir was set to .bingo .
+#
+#command: $(DRONE)
+#	@echo "Running drone"
+#	@$(DRONE) <flags/args..>
+#
+DRONE := $(GOBIN)/drone-v1.5.0
+$(DRONE): $(BINGO_DIR)/drone.mod
+	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
+	@echo "(re)installing $(GOBIN)/drone-v1.5.0"
+	@cd $(BINGO_DIR) && GOWORK=off CGO_ENABLED=0 $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.5.0 "github.com/drone/drone-cli/drone"
+

.bingo/drone.mod

@@ -0,0 +1,7 @@
+module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
+
+go 1.17
+
+replace github.com/docker/docker => github.com/docker/engine v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible
+
+require github.com/drone/drone-cli v1.5.0 // drone CGO_ENABLED=0

.bingo/go.mod

@@ -0,0 +1 @@
+module _ // Fake go.mod auto-created by 'bingo' for go -moddir compatibility with non-Go projects. Commit this file, together with other .mod files.

.bingo/variables.env

@@ -0,0 +1,12 @@
+# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.9. DO NOT EDIT.
+# All tools are designed to be build inside $GOBIN.
+# Those variables will work only until 'bingo get' was invoked, or if tools were installed via Makefile's Variables.mk.
+GOBIN=${GOBIN:=$(go env GOBIN)}
+
+if [ -z "$GOBIN" ]; then
+	GOBIN="$(go env GOPATH)/bin"
+fi
+
+
+DRONE="${GOBIN}/drone-v1.5.0"
+

.changelog-archive/CHANGELOG.02.md

@@ -234,6 +234,7 @@ Grunt & Watch tasks:
 - binary to `/usr/sbin/grafana-server`
 - init.d script improvements, renamed to `/etc/init.d/grafana-server`
 - added default file with environment variables,
+
   - `/etc/default/grafana-server` (deb/ubuntu)
   - `/etc/sysconfig/grafana-server` (centos/redhat)
 

.citools/Variables.mk

@@ -12,9 +12,6 @@ $(shell \
 endef
 
 
-# Tool: "air"
-air = "$(call compile_tool,air,github.com/air-verse/air)"
-
 # Tool: "bra"
 bra = "$(call compile_tool,bra,github.com/unknwon/bra)"
 

.citools/src/air/go.mod

@@ -1,27 +0,0 @@
-module air
-
-go 1.24.4
-
-tool github.com/air-verse/air
-
-require (
-	dario.cat/mergo v1.0.2 // indirect
-	github.com/air-verse/air v1.62.0 // indirect
-	github.com/bep/godartsass/v2 v2.5.0 // indirect
-	github.com/bep/golibsass v1.2.0 // indirect
-	github.com/creack/pty v1.1.24 // indirect
-	github.com/fatih/color v1.18.0 // indirect
-	github.com/fsnotify/fsnotify v1.9.0 // indirect
-	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/gohugoio/hugo v0.147.6 // indirect
-	github.com/mattn/go-colorable v0.1.14 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
-	github.com/spf13/afero v1.14.0 // indirect
-	github.com/spf13/cast v1.8.0 // indirect
-	github.com/tdewolff/parse/v2 v2.8.1 // indirect
-	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/text v0.25.0 // indirect
-	google.golang.org/protobuf v1.36.6 // indirect
-)

.citools/src/air/go.sum

@@ -1,45 +0,0 @@
-dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
-dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
-github.com/air-verse/air v1.62.0 h1:6CoXL4MAX9dc4xAzLfjMcDfbBoGmW5VjuuTV/1+bI+M=
-github.com/air-verse/air v1.62.0/go.mod h1:EO+jWuetL10tS9raffwg8WEV0t0KUeucRRaf9ii86dA=
-github.com/bep/godartsass/v2 v2.5.0 h1:tKRvwVdyjCIr48qgtLa4gHEdtRkPF8H1OeEhJAEv7xg=
-github.com/bep/godartsass/v2 v2.5.0/go.mod h1:rjsi1YSXAl/UbsGL85RLDEjRKdIKUlMQHr6ChUNYOFU=
-github.com/bep/golibsass v1.2.0 h1:nyZUkKP/0psr8nT6GR2cnmt99xS93Ji82ZD9AgOK6VI=
-github.com/bep/golibsass v1.2.0/go.mod h1:DL87K8Un/+pWUS75ggYv41bliGiolxzDKWJAq3eJ1MA=
-github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
-github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
-github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
-github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
-github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
-github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
-github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
-github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/gohugoio/hugo v0.147.6 h1:rL4rnus/5qzj4+FoA+JMzsVvFJ2YZdVIH6pbuCB2P84=
-github.com/gohugoio/hugo v0.147.6/go.mod h1:Sb2COQPDPYG+tRSpePtzKytiuVDqkBivEhgIew1QbNo=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
-github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
-github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
-github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
-github.com/spf13/afero v1.14.0 h1:9tH6MapGnn/j0eb0yIXiLjERO8RB6xIVZRDCX7PtqWA=
-github.com/spf13/afero v1.14.0/go.mod h1:acJQ8t0ohCGuMN3O+Pv0V0hgMxNYDlvdk+VTfyZmbYo=
-github.com/spf13/cast v1.8.0 h1:gEN9K4b8Xws4EX0+a0reLmhq8moKn7ntRlQYgjPeCDk=
-github.com/spf13/cast v1.8.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
-github.com/tdewolff/parse/v2 v2.8.1 h1:J5GSHru6o3jF1uLlEKVXkDxxcVx6yzOlIVIotK4w2po=
-github.com/tdewolff/parse/v2 v2.8.1/go.mod h1:Hwlni2tiVNKyzR1o6nUs4FOF07URA+JLBLd6dlIXYqo=
-github.com/tdewolff/test v1.0.11/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
-golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
-google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
-google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=

.citools/src/bra/go.mod

@@ -1,6 +1,6 @@
 module bra
 
-go 1.24.5
+go 1.24.4
 
 tool github.com/unknwon/bra
 

.citools/src/cog/go.mod

@@ -1,6 +1,6 @@
 module cog
 
-go 1.24.5
+go 1.24.4
 
 tool github.com/grafana/cog/cmd/cli
 
@@ -42,7 +42,7 @@ require (
 	github.com/yalue/merged_fs v1.3.0 // indirect
 	golang.org/x/mod v0.24.0 // indirect
 	golang.org/x/net v0.40.0 // indirect
-	golang.org/x/oauth2 v0.30.0 // indirect
+	golang.org/x/oauth2 v0.26.0 // indirect
 	golang.org/x/sync v0.14.0 // indirect
 	golang.org/x/text v0.25.0 // indirect
 	golang.org/x/tools v0.33.0 // indirect

.citools/src/cog/go.sum

@@ -89,8 +89,8 @@ golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
 golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
 golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
-golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
-golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
+golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
+golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
 golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=

.citools/src/cue/go.mod

@@ -1,6 +1,6 @@
 module cue
 
-go 1.24.5
+go 1.24.4
 
 tool cuelang.org/go/cmd/cue
 
@@ -27,7 +27,7 @@ require (
 	github.com/tetratelabs/wazero v1.6.0 // indirect
 	golang.org/x/mod v0.24.0 // indirect
 	golang.org/x/net v0.40.0 // indirect
-	golang.org/x/oauth2 v0.30.0 // indirect
+	golang.org/x/oauth2 v0.26.0 // indirect
 	golang.org/x/sync v0.14.0 // indirect
 	golang.org/x/sys v0.33.0 // indirect
 	golang.org/x/text v0.25.0 // indirect

.citools/src/cue/go.sum

@@ -57,8 +57,8 @@ golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
 golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
 golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
-golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
-golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
+golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
+golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
 golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=

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

@@ -1,6 +1,6 @@
 module golangci-lint
 
-go 1.24.5
+go 1.24.4
 
 tool github.com/golangci/golangci-lint/v2/cmd/golangci-lint
 
@@ -65,7 +65,7 @@ require (
 	github.com/go-toolsmith/astp v1.1.0 // indirect
 	github.com/go-toolsmith/strparse v1.1.0 // indirect
 	github.com/go-toolsmith/typep v1.1.0 // indirect
-	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
 	github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gofrs/flock v0.12.1 // indirect

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

@@ -142,8 +142,8 @@ github.com/go-toolsmith/strparse v1.1.0 h1:GAioeZUK9TGxnLS+qfdqNbA4z0SSm5zVNtCQi
 github.com/go-toolsmith/strparse v1.1.0/go.mod h1:7ksGy58fsaQkGQlY8WVoBFNyEPMGuJin1rfoPS4lBSQ=
 github.com/go-toolsmith/typep v1.1.0 h1:fIRYDyF+JywLfqzyhdiHzRop/GQDxxNhLGQ6gFUNHus=
 github.com/go-toolsmith/typep v1.1.0/go.mod h1:fVIw+7zjdsMxDA3ITWnH1yOiw1rnTQKCsF/sk2H/qig=
-github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
-github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk=
+github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/go-xmlfmt/xmlfmt v1.1.3 h1:t8Ey3Uy7jDSEisW2K3somuMKIpzktkWptA0iFCnRUWY=
 github.com/go-xmlfmt/xmlfmt v1.1.3/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=

.citools/src/jb/go.mod

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

.citools/src/lefthook/go.mod

@@ -1,6 +1,6 @@
 module lefthook
 
-go 1.24.5
+go 1.24.4
 
 tool github.com/evilmartians/lefthook
 
@@ -18,7 +18,7 @@ require (
 	github.com/evilmartians/lefthook v1.4.8 // indirect
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
-	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect

.citools/src/lefthook/go.sum

@@ -29,8 +29,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
 github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
-github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk=
+github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=

.citools/src/swagger/go.mod

@@ -1,6 +1,6 @@
 module swagger
 
-go 1.24.5
+go 1.24.4
 
 tool github.com/go-swagger/go-swagger/cmd/swagger
 
@@ -24,7 +24,7 @@ require (
 	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/go-openapi/validate v0.24.0 // indirect
 	github.com/go-swagger/go-swagger v0.30.6-0.20240310114303-db51e79a0e37 // indirect
-	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/handlers v1.5.2 // indirect

.citools/src/swagger/go.sum

@@ -41,8 +41,8 @@ github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3Bum
 github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ=
 github.com/go-swagger/go-swagger v0.30.6-0.20240310114303-db51e79a0e37 h1:KFcZmKdZmapAog2+eL1buervAYrYolBZk7fMecPPDmo=
 github.com/go-swagger/go-swagger v0.30.6-0.20240310114303-db51e79a0e37/go.mod h1:i1/E+d8iPNReSE7y04FaVu5OPKB3il5cn+T1Egogg3I=
-github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
-github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk=
+github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=

.drone.star

@@ -0,0 +1,42 @@
+# To generate the .drone.yml file:
+# 1. Modify the *.star definitions
+# 2. Login to drone and export the env variables (token and server) shown here: https://drone.grafana.net/account
+# 3. Run `make drone`
+# More information about this process here: https://github.com/grafana/deployment_tools/blob/master/docs/infrastructure/drone/signing.md
+"""
+This module returns a Drone configuration including pipelines and secrets.
+"""
+
+load("scripts/drone/events/cron.star", "cronjobs")
+load("scripts/drone/events/main.star", "main_pipelines")
+load("scripts/drone/events/pr.star", "pr_pipelines")
+load(
+    "scripts/drone/events/release.star",
+    "publish_artifacts_pipelines",
+    "publish_npm_pipelines",
+    "publish_packages_pipeline",
+)
+load("scripts/drone/events/rrc-patch.star", "rrc_patch_pipelines")
+load(
+    "scripts/drone/pipelines/publish_images.star",
+    "publish_image_pipelines_public",
+)
+load(
+    "scripts/drone/rgm.star",
+    "rgm",
+)
+load("scripts/drone/vault.star", "secrets")
+
+def main(_ctx):
+    return (
+        pr_pipelines() +
+        main_pipelines() +
+        rrc_patch_pipelines() +
+        publish_image_pipelines_public() +
+        publish_artifacts_pipelines("public") +
+        publish_npm_pipelines() +
+        publish_packages_pipeline() +
+        rgm() +
+        cronjobs() +
+        secrets()
+    )

.github/CODEOWNERS

@@ -42,8 +42,9 @@
 /docs/sources/dashboards/                                                         @imatwawana
 /docs/sources/datasources/                                                        @lwandz13
 /docs/sources/panels-visualizations/                                              @imatwawana
-/docs/sources/upgrade-guide/                                                      @jtvdez
-/docs/sources/whatsnew/                                                           @jtvdez
+/docs/sources/release-notes/                                                      @irenerl24 @GrafanaWriter
+/docs/sources/upgrade-guide/                                                      @imatwawana
+/docs/sources/whatsnew/                                                           @imatwawana
 
 /docs/sources/developers/plugins/                                                 @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
 
@@ -58,6 +59,7 @@
 /go.sum @grafana/grafana-backend-group
 /go.work @grafana/grafana-app-platform-squad
 /go.work.sum @grafana/grafana-app-platform-squad
+/.bingo/ @grafana/grafana-backend-group
 /.citools @grafana/grafana-developer-enablement-squad
 /pkg/README.md @grafana/grafana-backend-group
 /pkg/ruleguard.rules.go @grafana/grafana-backend-group
@@ -70,32 +72,23 @@
 /hack/ @grafana/grafana-app-platform-squad
 /.air.toml @macabu
 
-# Git Sync / App Platform Provisioning
-/apps/provisioning/ @grafana/grafana-git-ui-sync-team
-/pkg/operators @grafana/grafana-git-ui-sync-team
+/pkg/apis/provisioning @grafana/grafana-git-ui-sync-team
 /public/app/features/provisioning @grafana/grafana-git-ui-sync-team
 /pkg/registry/apis/provisioning @grafana/grafana-git-ui-sync-team
-/pkg/tests/apis/provisioning @grafana/grafana-git-ui-sync-team
-# Git Sync frontend owned by frontend team as a whole.
 
 /apps/alerting/ @grafana/alerting-backend
 /apps/dashboard/ @grafana/grafana-app-platform-squad @grafana/dashboards-squad
 /apps/folder/ @grafana/grafana-app-platform-squad
 /apps/playlist/ @grafana/grafana-app-platform-squad
-/apps/plugins/ @grafana/plugins-platform-backend
-/apps/preferences/ @grafana/grafana-app-platform-squad @grafana/grafana-frontend-platform
-/apps/shorturl/ @grafana/sharing-squad
-/apps/secret/ @grafana/grafana-operator-experience-squad
 /apps/investigations/ @fcjack @matryer @svennergr
 /apps/advisor/ @grafana/plugins-platform-backend
 /apps/iam/ @grafana/access-squad
-/apps/sdk.mk @grafana/grafana-app-platform-squad
 /pkg/api/ @grafana/grafana-backend-group
 /pkg/apis/ @grafana/grafana-app-platform-squad
 /pkg/apis/query @grafana/grafana-datasources-core-services
 /pkg/apis/userstorage @grafana/grafana-app-platform-squad @grafana/plugins-platform-backend
+/pkg/apis/secret @grafana/grafana-operator-experience-squad
 /pkg/bus/ @grafana/grafana-search-and-storage
-/pkg/clientauth/ @grafana/grafana-app-platform-squad
 /pkg/cmd/ @grafana/grafana-backend-group
 /pkg/cmd/grafana-cli/commands/install_command.go @grafana/plugins-platform-backend
 /pkg/cmd/grafana-cli/commands/install_command_test.go @grafana/plugins-platform-backend
@@ -114,7 +107,6 @@
 /pkg/components/loki/ @grafana/grafana-backend-group
 /pkg/components/null/ @grafana/grafana-backend-group
 /pkg/components/simplejson/ @grafana/grafana-backend-group
-/pkg/configprovider/ @grafana/grafana-backend-services-squad
 /pkg/events/ @grafana/grafana-backend-group
 /pkg/extensions/ @grafana/grafana-backend-group
 /pkg/ifaces/ @grafana/grafana-backend-group
@@ -139,7 +131,6 @@
 /pkg/apimachinery @grafana/grafana-app-platform-squad
 /pkg/apimachinery/identity/ @grafana/identity-squad
 /pkg/apimachinery/errutil/ @grafana/grafana-backend-group
-/pkg/operators/iam @grafana/access-squad
 /pkg/promlib @grafana/oss-big-tent
 /pkg/storage/ @grafana/grafana-search-and-storage
 /pkg/storage/secret/ @grafana/grafana-operator-experience-squad
@@ -158,7 +149,6 @@
 /pkg/services/hooks/ @grafana/grafana-backend-group
 /pkg/services/kmsproviders/ @grafana/grafana-operator-experience-squad
 /pkg/services/licensing/ @grafana/grafana-operator-experience-squad
-/pkg/services/dsquerierclient/ @grafana/grafana-datasources-core-services
 /pkg/services/navtree/ @grafana/grafana-backend-group
 /pkg/services/notifications/ @grafana/grafana-backend-group
 /pkg/services/org/ @grafana/grafana-backend-group
@@ -166,7 +156,7 @@
 /pkg/services/preference/ @grafana/grafana-backend-group
 /pkg/services/provisioning/ @grafana/grafana-search-and-storage
 /pkg/services/provisioning/alerting/ @grafana/alerting-backend
-/pkg/services/query/ @grafana/grafana-datasources-core-services
+/pkg/services/query/ @grafana/grafana-app-platform-squad
 /pkg/services/queryhistory/ @grafana/observability-traces-and-profiling
 /pkg/services/quota/ @grafana/grafana-search-and-storage
 /pkg/services/screenshot/ @grafana/grafana-backend-group
@@ -187,10 +177,8 @@
 /pkg/setting/ @grafana/grafana-backend-services-squad
 /pkg/tests/ @grafana/grafana-backend-services-squad
 /pkg/tests/apis/ @grafana/grafana-app-platform-squad
+/pkg/tests/apis/query @grafana/grafana-datasources-core-services
 /pkg/tests/apis/alerting @grafana/grafana-app-platform-squad @grafana/alerting-backend
-/pkg/tests/apis/features @grafana/grafana-backend-services-squad
-/pkg/tests/apis/folder @grafana/grafana-search-and-storage
-/pkg/tests/apis/iam @grafana/identity-access-team
 /pkg/tests/api/correlations/ @grafana/datapro
 /pkg/tsdb/grafanads/ @grafana/grafana-backend-group
 /pkg/tsdb/opentsdb/ @grafana/partner-datasources
@@ -303,7 +291,7 @@
 /devenv/docker/blocks/sensugo/ @grafana/grafana-backend-group
 /devenv/docker/blocks/slow_proxy/ @bergquist
 /devenv/docker/blocks/smtp/ @bergquist
-/devenv/docker/blocks/tempo/ @grafana/oss-big-tent @grafana/observability-traces-and-profiling
+/devenv/docker/blocks/tempo/ @grafana/observability-traces-and-profiling
 /devenv/docker/blocks/traefik/ @mckn
 /devenv/docker/blocks/zipkin/ @grafana/oss-big-tent
 /devenv/docker/blocks/webdav/ @grafana/alerting-backend
@@ -317,7 +305,6 @@
 /devenv/jsonnet/ @grafana/dataviz-squad
 /devenv/local_cdn/ @grafana/frontend-ops
 /devenv/local-npm/ @grafana/frontend-ops
-/devenv/frontend-service/ @grafana/grafana-frontend-platform
 /devenv/setup.sh @grafana/grafana-backend-services-squad
 /devenv/plugins.yaml @grafana/plugins-platform-frontend
 
@@ -329,6 +316,9 @@
 
 
 # Continuous Integration
+.drone.yml @grafana/grafana-developer-enablement-squad
+.drone.star @grafana/grafana-developer-enablement-squad
+/scripts/drone/ @grafana/grafana-developer-enablement-squad
 /pkg/build/ @grafana/grafana-developer-enablement-squad
 /.dockerignore @grafana/grafana-developer-enablement-squad
 /Dockerfile @grafana/grafana-developer-enablement-squad
@@ -347,7 +337,7 @@
 /pkg/tsdb/prometheus/ @grafana/oss-big-tent
 /pkg/tsdb/elasticsearch/ @grafana/partner-datasources
 /pkg/tsdb/loki/ @grafana/oss-big-tent
-/pkg/tsdb/tempo/ @grafana/oss-big-tent @grafana/observability-traces-and-profiling
+/pkg/tsdb/tempo/ @grafana/observability-traces-and-profiling
 /pkg/tsdb/grafana-pyroscope-datasource/ @grafana/observability-traces-and-profiling
 /pkg/tsdb/parca/ @grafana/oss-big-tent
 
@@ -409,304 +399,34 @@
 /public/locales/i18next-parser-enterprise.config.cjs @grafana/grafana-frontend-platform
 /public/app/core/internationalization/ @grafana/grafana-frontend-platform
 /e2e/ @grafana/grafana-frontend-platform
-/e2e-playwright/cloud-plugins-suite/ @grafana/partner-datasources
-/e2e-playwright/dashboard-new-layouts/ @grafana/dashboards-squad
-/e2e-playwright/dashboard-cujs/ @grafana/dashboards-squad
-/e2e-playwright/dashboards-search-suite/ @grafana/dashboards-squad
-/e2e-playwright/dashboards/cujs/ @grafana/dashboards-squad
-/e2e-playwright/dashboards/DashboardForConditionalRendering.json @grafana/dashboards-squad
-/e2e-playwright/dashboards/DashboardWithAllConditionalRendering.json @grafana/dashboards-squad
-/e2e-playwright/dashboards/README.md @grafana/dashboards-squad
-/e2e-playwright/dashboards/AdHocFilterTest.json @grafana/datapro
-/e2e-playwright/dashboards/DashboardLiveTest.json @grafana/dashboards-squad
-/e2e-playwright/dashboards/DataLinkWithoutSlugTest.json @grafana/dashboards-squad
-/e2e-playwright/dashboards/PanelSandboxDashboard.json @grafana/plugins-platform-frontend
-/e2e-playwright/dashboards/TestDashboard.json @grafana/dashboards-squad @grafana/grafana-search-navigate-organise
-/e2e-playwright/dashboards/TestV2Dashboard.json @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/adhoc-filter-from-panel.spec.ts @grafana/datapro
-/e2e-playwright/dashboards-suite/dashboard-browse-nested.spec.ts @grafana/grafana-search-navigate-organise
-/e2e-playwright/dashboards-suite/dashboard-browse.spec.ts @grafana/grafana-search-navigate-organise
-/e2e-playwright/dashboards-suite/dashboard-export-image.spec.ts @grafana/sharing-squad
-/e2e-playwright/dashboards-suite/dashboard-export-json.spec.ts @grafana/sharing-squad
-/e2e-playwright/dashboards-suite/dashboard-keybindings.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/dashboard-links-without-slug.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/dashboard-live-streaming.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/dashboard-public-create.spec.ts @grafana/grafana-operator-experience-squad
-/e2e-playwright/dashboards-suite/dashboard-public-templating.spec.ts @grafana/grafana-operator-experience-squad
-/e2e-playwright/dashboards-suite/dashboard-share-externally-create.spec.ts @grafana/sharing-squad
-/e2e-playwright/dashboards-suite/dashboard-share-internally.spec.ts @grafana/sharing-squad
-/e2e-playwright/dashboards-suite/dashboard-share-snapshot-create.spec.ts @grafana/sharing-squad
-/e2e-playwright/dashboards-suite/dashboard-templating.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/dashboard-time-zone.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/dashboard-timepicker.spec.ts @grafana/grafana-frontend-platform
-/e2e-playwright/dashboards-suite/embedded-dashboard.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/general-dashboards.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/import-dashboard.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/load-options-from-url.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/new-constant-variable.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/new-custom-variable.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/new-datasource-variable.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/new-interval-variable.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/new-query-variable.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/new-text-box-variable.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/repeating-a-panel-horizontally.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/repeating-a-panel-vertically.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/repeating-an-empty-row.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/set-options-from-ui.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/snapshot-create.spec.ts @grafana/sharing-squad
-/e2e-playwright/dashboards-suite/templating-dashboard-links-and-variables.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/textbox-variables.spec.ts @grafana/dashboards-squad
-/e2e-playwright/dashboards-suite/utils/makeDashboard.ts @grafana/grafana-search-navigate-organise
-/e2e-playwright/fixtures/exemplars-query-response.json @grafana/observability-traces-and-profiling
-/e2e-playwright/fixtures/long-trace-response.json @grafana/observability-traces-and-profiling
-/e2e-playwright/fixtures/tempo-response.json @grafana/oss-big-tent
-/e2e-playwright/fixtures/prometheus-response.json @grafana/datapro
-/e2e-playwright/panels-suite/canvas-scene.spec.ts @grafana/dataviz-squad
-/e2e-playwright/panels-suite/dashlist.spec.ts @grafana/grafana-search-navigate-organise
-/e2e-playwright/panels-suite/datagrid-data-change.spec.ts @grafana/dataviz-squad
-/e2e-playwright/panels-suite/datagrid-editing-features.spec.ts @grafana/dataviz-squad
-/e2e-playwright/panels-suite/frontend-sandbox-panel.spec.ts @grafana/plugins-platform-frontend
-/e2e-playwright/panels-suite/geomap-layer-types.spec.ts @grafana/dataviz-squad
-/e2e-playwright/panels-suite/geomap-map-controls.spec.ts @grafana/dataviz-squad
-/e2e-playwright/panels-suite/geomap-spatial-operations-transform.spec.ts @grafana/dataviz-squad
-/e2e-playwright/panels-suite/panelEdit_base.spec.ts @grafana/dashboards-squad
-/e2e-playwright/panels-suite/panelEdit_queries.spec.ts @grafana/dashboards-squad
-/e2e-playwright/panels-suite/panelEdit_transforms.spec.ts @grafana/datapro
-/e2e-playwright/panels-suite/table-footer.spec.ts @grafana/dataviz-squad
-/e2e-playwright/panels-suite/table-kitchenSink.spec.ts @grafana/dataviz-squad
-/e2e-playwright/panels-suite/table-markdown.spec.ts @grafana/dataviz-squad
-/e2e-playwright/panels-suite/table-sparkline.spec.ts @grafana/dataviz-squad
-/e2e-playwright/panels-suite/table-utils.ts @grafana/dataviz-squad
-/e2e-playwright/plugin-e2e/ @grafana/oss-big-tent @grafana/partner-datasources
-/e2e-playwright/plugin-e2e/plugin-e2e-api-tests/ @grafana/plugins-platform-frontend
-/e2e-playwright/smoke-tests-suite/ @grafana/grafana-frontend-platform
-/e2e-playwright/start-server @grafana/grafana-frontend-platform
-/e2e-playwright/storybook/ @grafana/grafana-frontend-platform
-/e2e-playwright/test-plugins/ @grafana/plugins-platform-frontend
-/e2e-playwright/unauthenticated/login.spec.ts @grafana/grafana-frontend-platform
-/e2e-playwright/utils/ @grafana/grafana-frontend-platform
-/e2e-playwright/various-suite/bar-gauge.spec.ts @grafana/dataviz-squad
-/e2e-playwright/various-suite/bookmarks.spec.ts @grafana/grafana-search-navigate-organise
-/e2e-playwright/various-suite/exemplars.spec.ts @grafana/observability-traces-and-profiling
-/e2e-playwright/various-suite/explore.spec.ts @grafana/observability-traces-and-profiling
-/e2e-playwright/various-suite/filter-annotations.spec.ts @grafana/dashboards-squad
-/e2e-playwright/various-suite/frontend-sandbox-app.spec.ts @grafana/plugins-platform-frontend
-/e2e-playwright/various-suite/frontend-sandbox-datasource.spec.ts @grafana/plugins-platform-frontend
-/e2e-playwright/various-suite/gauge.spec.ts @grafana/dataviz-squad
-/e2e-playwright/various-suite/graph-auto-migrate.spec.ts @grafana/dataviz-squad
-/e2e-playwright/various-suite/inspect-drawer.spec.ts @grafana/dashboards-squad
-/e2e-playwright/various-suite/keybinds.spec.ts @grafana/grafana-frontend-platform
-/e2e-playwright/various-suite/loki-query-builder.spec.ts @grafana/oss-big-tent
-/e2e-playwright/various-suite/loki-table-explore-to-dash.spec.ts @grafana/oss-big-tent
-/e2e-playwright/various-suite/migrate-to-cloud.spec.ts @grafana/grafana-operator-experience-squad
-/e2e-playwright/various-suite/navigation.spec.ts @grafana/grafana-search-navigate-organise
-/e2e-playwright/various-suite/pie-chart.spec.ts @grafana/dataviz-squad
-/e2e-playwright/various-suite/prometheus-annotations.spec.ts @grafana/oss-big-tent
-/e2e-playwright/various-suite/prometheus-config.spec.ts @grafana/oss-big-tent
-/e2e-playwright/various-suite/prometheus-editor.spec.ts @grafana/oss-big-tent
-/e2e-playwright/various-suite/prometheus-variable-editor.spec.ts @grafana/oss-big-tent
-/e2e-playwright/various-suite/query-editor.spec.ts @grafana/observability-traces-and-profiling
-/e2e-playwright/various-suite/return-to-previous.spec.ts @grafana/grafana-search-navigate-organise
-/e2e-playwright/various-suite/solo-route.spec.ts @grafana/dashboards-squad
-/e2e-playwright/various-suite/trace-view-scrolling.spec.ts @grafana/observability-traces-and-profiling
-/e2e-playwright/various-suite/verify-i18n.spec.ts @grafana/grafana-frontend-platform
-/e2e-playwright/various-suite/visualization-suggestions.spec.ts @grafana/dashboards-squad
-/e2e-playwright/various-suite/perf-test.spec.ts @grafana/grafana-frontend-platform
+/e2e/cloud-plugins-suite/ @grafana/partner-datasources
+/e2e/plugin-e2e/plugin-e2e-api-tests/ @grafana/plugins-platform-frontend
+/e2e/test-plugins/grafana-extensionstest-app/ @grafana/plugins-platform-frontend
 
 # Packages
-/packages/README.md @grafana/grafana-frontend-platform
-/packages/rollup.config.parts.ts @grafana/frontend-ops
-
-# @grafana/alerting
-/packages/grafana-alerting/ @grafana/alerting-frontend
-
-# @grafana/data
-/packages/grafana-data/CHANGELOG.md @grafana/grafana-frontend-platform
-/packages/grafana-data/LICENSE_APACHE2 @grafana/grafana-frontend-platform
-/packages/grafana-data/README.md @grafana/grafana-frontend-platform
-/packages/grafana-data/package.json @grafana/grafana-frontend-platform
-/packages/grafana-data/project.json @grafana/grafana-frontend-platform
-/packages/grafana-data/rollup.config.ts @grafana/grafana-frontend-platform
-/packages/grafana-data/src/index.ts @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend
-/packages/grafana-data/src/internal/index.ts @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend
-/packages/grafana-data/src/unstable.ts @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend
-/packages/grafana-data/tsconfig.build.json @grafana/grafana-frontend-platform
-/packages/grafana-data/tsconfig.json @grafana/grafana-frontend-platform
-/packages/grafana-data/test/ @grafana/grafana-frontend-platform
-/packages/grafana-data/typings/ @grafana/grafana-frontend-platform
-
+/packages/ @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend
 /packages/grafana-data/src/**/*logs* @grafana/observability-logs
-/packages/grafana-data/src/context/plugins/ @grafana/plugins-platform-frontend
-/packages/grafana-data/src/dataframe/ @grafana/dataviz-squad
-/packages/grafana-data/src/datetime/ @grafana/grafana-frontend-platform
-/packages/grafana-data/src/events/ @grafana/grafana-frontend-platform
-/packages/grafana-data/src/field/ @grafana/dashboards-squad
-/packages/grafana-data/src/geo/ @grafana/dataviz-squad
-/packages/grafana-data/src/monaco/ @grafana/partner-datasources
-/packages/grafana-data/src/panel/ @grafana/dashboards-squad
-/packages/grafana-data/src/query/ @grafana/grafana-datasources-core-services
-/packages/grafana-data/src/rbac/ @grafana/access-squad
-/packages/grafana-data/src/table/ @grafana/dataviz-squad
-/packages/grafana-data/src/text/ @grafana/dataviz-squad
-/packages/grafana-data/src/themes/ @grafana/grafana-frontend-platform
 /packages/grafana-data/src/transformations/ @grafana/datapro
-/packages/grafana-data/src/types/ @grafana/grafana-frontend-platform
-/packages/grafana-data/src/utils/__snapshots__/ @grafanabot
-/packages/grafana-data/src/utils/anyToNumber.ts @grafana/grafana-frontend-platform
-/packages/grafana-data/src/utils/arrayUtils* @grafana/grafana-frontend-platform
-/packages/grafana-data/src/utils/binaryOperators.ts @grafana/datapro
-/packages/grafana-data/src/utils/csv* @grafana/dataviz-squad
-/packages/grafana-data/src/utils/dataLinks* @grafana/dashboards-squad
-/packages/grafana-data/src/utils/datasource* @grafana/grafana-datasources-core-services
-/packages/grafana-data/src/utils/docs.ts @grafana/grafana-frontend-platform
-/packages/grafana-data/src/utils/deprecationWarning* @grafana/grafana-frontend-platform
-/packages/grafana-data/src/utils/featureToggles.ts @grafana/grafana-frontend-platform
-/packages/grafana-data/src/utils/fieldParser.ts @grafana/dataviz-squad
-/packages/grafana-data/src/utils/flotPairs* @grafana/dataviz-squad
-/packages/grafana-data/src/utils/fuzzySearch* @grafana/grafana-search-navigate-organise
-/packages/grafana-data/src/utils/labels* @grafana/observability-logs
-/packages/grafana-data/src/utils/legend* @grafana/oss-big-tent
-/packages/grafana-data/src/utils/location* @grafana/grafana-search-navigate-organise
-/packages/grafana-data/src/utils/LocalStorageValueProvider.tsx @grafana/grafana-frontend-platform
-/packages/grafana-data/src/utils/makeClassES5Compatible.ts @grafana/plugins-platform-frontend
-/packages/grafana-data/src/utils/matchPluginId* @grafana/plugins-platform-frontend
-/packages/grafana-data/src/utils/namedColorsPalette* @grafana/grafana-frontend-platform
-/packages/grafana-data/src/utils/nodeGraph.ts @grafana/observability-traces-and-profiling
-/packages/grafana-data/src/utils/numbers.ts @grafana/dataviz-squad
-/packages/grafana-data/src/utils/object.ts @grafana/grafana-frontend-platform
-/packages/grafana-data/src/utils/OptionsUIBuilders.ts @grafana/dashboards-squad
-/packages/grafana-data/src/utils/Registry* @grafana/grafana-frontend-platform
-/packages/grafana-data/src/utils/selectUtils.ts @grafana/grafana-frontend-platform
-/packages/grafana-data/src/utils/series* @grafana/dataviz-squad
-/packages/grafana-data/src/utils/store* @grafana/grafana-frontend-platform
-/packages/grafana-data/src/utils/testdata/ @grafana/dataviz-squad
-/packages/grafana-data/src/utils/tests/ @grafana/grafana-frontend-platform
-/packages/grafana-data/src/utils/throwIfAngular* @grafana/plugins-platform-frontend
-/packages/grafana-data/src/utils/unaryOperators.ts @grafana/datapro
-/packages/grafana-data/src/utils/url* @grafana/grafana-search-navigate-organise
-/packages/grafana-data/src/utils/valueMappings* @grafana/dashboards-squad
-/packages/grafana-data/src/utils/variables.ts @grafana/plugins-platform-frontend
-/packages/grafana-data/src/utils/withLoadingIndicator.ts @grafana/access-squad @grafana/alerting-frontend
-/packages/grafana-data/src/valueFormats/ @grafana/dashboards-squad
-/packages/grafana-data/src/vector/ @grafana/dataviz-squad
-
-# @grafana/e2e-selectors
 /packages/grafana-e2e-selectors/ @grafana/grafana-frontend-platform
-
-# @grafana/eslint-plugin
-/packages/grafana-eslint-rules/ @grafana/grafana-frontend-platform
-
-# @grafana/flamegraph
 /packages/grafana-flamegraph/ @grafana/observability-traces-and-profiling
-
-# @grafana/o11y-ds-frontend
 /packages/grafana-o11y-ds-frontend/ @grafana/observability-logs
 /packages/grafana-o11y-ds-frontend/src/IntervalInput/ @grafana/observability-traces-and-profiling
 /packages/grafana-o11y-ds-frontend/src/NodeGraph/ @grafana/observability-traces-and-profiling
 /packages/grafana-o11y-ds-frontend/src/pyroscope/ @grafana/observability-traces-and-profiling
-/packages/grafana-o11y-ds-frontend/src/SpanBar/ @grafana/oss-big-tent @grafana/observability-traces-and-profiling
-/packages/grafana-o11y-ds-frontend/src/TraceToLogs/ @grafana/oss-big-tent @grafana/observability-traces-and-profiling
-/packages/grafana-o11y-ds-frontend/src/TraceToMetrics/ @grafana/oss-big-tent @grafana/observability-traces-and-profiling
-/packages/grafana-o11y-ds-frontend/src/TraceToProfiles/ @grafana/oss-big-tent @grafana/observability-traces-and-profiling
-
-# @grafana/plugin-configs
+/packages/grafana-o11y-ds-frontend/src/SpanBar/ @grafana/observability-traces-and-profiling
+/packages/grafana-o11y-ds-frontend/src/TraceToLogs/ @grafana/observability-traces-and-profiling
+/packages/grafana-o11y-ds-frontend/src/TraceToMetrics/ @grafana/observability-traces-and-profiling
+/packages/grafana-o11y-ds-frontend/src/TraceToProfiles/ @grafana/observability-traces-and-profiling
 /packages/grafana-plugin-configs/ @grafana/plugins-platform-frontend
-
-# @grafana/prometheus
 /packages/grafana-prometheus/ @grafana/oss-big-tent
-
-# @grafana/runtime
-/packages/grafana-runtime/CHANGELOG.md @grafana/grafana-frontend-platform
-/packages/grafana-runtime/LICENSE_APACHE2 @grafana/grafana-frontend-platform
-/packages/grafana-runtime/README.md @grafana/grafana-frontend-platform
-/packages/grafana-runtime/package.json @grafana/grafana-frontend-platform
-/packages/grafana-runtime/project.json @grafana/grafana-frontend-platform
-/packages/grafana-runtime/rollup.config.ts @grafana/grafana-frontend-platform
-/packages/grafana-runtime/src/index.ts @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend
-/packages/grafana-runtime/src/internal/index.ts @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend
-/packages/grafana-runtime/src/unstable.ts @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend
-/packages/grafana-runtime/tsconfig.build.json @grafana/grafana-frontend-platform
-/packages/grafana-runtime/tsconfig.json @grafana/grafana-frontend-platform
-
-/packages/grafana-runtime/src/analytics @grafana/grafana-frontend-platform
-/packages/grafana-runtime/src/analytics/plugins @grafana/plugins-platform-frontend
-/packages/grafana-runtime/src/components/DataSourcePicker* @grafana/grafana-frontend-platform
-/packages/grafana-runtime/src/components/EmbeddedDashboard.tsx @grafana/dashboards-squad
-/packages/grafana-runtime/src/components/FolderPicker.tsx @grafana/grafana-frontend-platform
-/packages/grafana-runtime/src/components/PanelRenderer.tsx @grafana/dashboards-squad
-/packages/grafana-runtime/src/components/PanelDataErrorView.tsx @grafana/dashboards-squad
-/packages/grafana-runtime/src/components/PluginPage.tsx @grafana/grafana-search-navigate-organise
-/packages/grafana-runtime/src/components/QueryEditorWithMigration* @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
-/packages/grafana-runtime/src/config.ts @grafana/grafana-frontend-platform
-/packages/grafana-runtime/src/services/ @grafana/grafana-frontend-platform
-/packages/grafana-runtime/src/services/pluginExtensions @grafana/plugins-platform-frontend
-/packages/grafana-runtime/src/services/CorrelationsService.ts @grafana/datapro
-/packages/grafana-runtime/src/services/LocationService.test.tsx @grafana/grafana-search-navigate-organise
-/packages/grafana-runtime/src/services/LocationService.tsx @grafana/grafana-search-navigate-organise
-/packages/grafana-runtime/src/services/LocationSrv.ts @grafana/grafana-search-navigate-organise
-/packages/grafana-runtime/src/services/live.ts @grafana/dashboards-squad
-/packages/grafana-runtime/src/utils/chromeHeaderHeight.ts @grafana/grafana-search-navigate-organise
-/packages/grafana-runtime/src/utils/DataSourceWithBackend* @grafana/grafana-datasources-core-services
-/packages/grafana-runtime/src/utils/licensing.ts @grafana/grafana-operator-experience-squad
-/packages/grafana-runtime/src/utils/logging.ts @grafana/grafana-frontend-platform
-/packages/grafana-runtime/src/utils/megaMenuOpen.ts @grafana/grafana-search-navigate-organise
-/packages/grafana-runtime/src/utils/migrationHandler* @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
-/packages/grafana-runtime/src/utils/plugin.ts @grafana/plugins-platform-frontend
-/packages/grafana-runtime/src/utils/publicDashboardQueryHandler.ts @grafana/grafana-operator-experience-squad
-/packages/grafana-runtime/src/utils/queryResponse* @grafana/grafana-datasources-core-services
-/packages/grafana-runtime/src/utils/rbac.ts @grafana/identity-access-team
-/packages/grafana-runtime/src/utils/returnToPrevious.ts @grafana/grafana-search-navigate-organise
-/packages/grafana-runtime/src/utils/toDataQueryError.ts @grafana/grafana-datasources-core-services
-/packages/grafana-runtime/src/utils/userStorage* @grafana/plugins-platform-frontend @grafana/grafana-frontend-platform
-/packages/grafana-runtime/src/utils/useFavoriteDatasources* @grafana/plugins-platform-frontend
-
-# @grafana/schema
-/packages/grafana-schema/ @grafana/grafana-app-platform-squad
-
-/packages/grafana-schema/src/**/annotationslist @grafana/dashboards-squad
-/packages/grafana-schema/src/**/azuremonitor @grafana/partner-datasources
-/packages/grafana-schema/src/**/barchart @grafana/dataviz-squad
-/packages/grafana-schema/src/**/bargauge @grafana/dataviz-squad
-/packages/grafana-schema/src/**/candlestick @grafana/dataviz-squad
-/packages/grafana-schema/src/**/canvas @grafana/dataviz-squad
-/packages/grafana-schema/src/**/cloudwatch @grafana/aws-datasources
-/packages/grafana-schema/src/**/dashboard @grafana/dashboards-squad
-/packages/grafana-schema/src/**/dashboardlist @grafana/grafana-search-navigate-organise
-/packages/grafana-schema/src/**/datagrid @grafana/dataviz-squad
-/packages/grafana-schema/src/**/debug @ryantxu
-/packages/grafana-schema/src/**/elasticsearch @grafana/partner-datasources
-/packages/grafana-schema/src/**/gauge @grafana/dataviz-squad
-/packages/grafana-schema/src/**/geomap @grafana/dataviz-squad
-/packages/grafana-schema/src/**/googlecloudmonitoring @grafana/partner-datasources
-/packages/grafana-schema/src/**/grafanapyroscope @grafana/observability-traces-and-profiling
-/packages/grafana-schema/src/**/heatmap @grafana/dataviz-squad
-/packages/grafana-schema/src/**/histogram @grafana/dataviz-squad
-/packages/grafana-schema/src/**/librarypanel @grafana/sharing-squad
-/packages/grafana-schema/src/**/logs @grafana/observability-logs
-/packages/grafana-schema/src/**/logsnew @grafana/observability-logs
-/packages/grafana-schema/src/**/loki @grafana/oss-big-tent @grafana/observability-logs
-/packages/grafana-schema/src/**/news @grafana/dataviz-squad
-/packages/grafana-schema/src/**/nodegraph @grafana/observability-traces-and-profiling @grafana/app-o11y-visualizations
-/packages/grafana-schema/src/**/parca @grafana/oss-big-tent
-/packages/grafana-schema/src/**/piechart @grafana/dataviz-squad
-/packages/grafana-schema/src/**/stat @grafana/dataviz-squad
-/packages/grafana-schema/src/**/statetimeline @grafana/dataviz-squad
-/packages/grafana-schema/src/**/statushistory @grafana/dataviz-squad
-/packages/grafana-schema/src/**/table @grafana/dataviz-squad
-/packages/grafana-schema/src/**/tempo @grafana/oss-big-tent @grafana/observability-traces-and-profiling
-/packages/grafana-schema/src/**/text @grafana/dataviz-squad
-/packages/grafana-schema/src/**/timeseries @grafana/dataviz-squad
-/packages/grafana-schema/src/**/trend @grafana/dataviz-squad
-/packages/grafana-schema/src/**/xychart @grafana/dataviz-squad
-/packages/grafana-schema/src/**/xychart2 @grafana/dataviz-squad
-
-# @grafana/sql
+/packages/grafana-schema/src/**/*canvas* @grafana/dataviz-squad
+/packages/grafana-schema/src/**/*tempo* @grafana/observability-traces-and-profiling
 /packages/grafana-sql/ @grafana/partner-datasources @grafana/oss-big-tent
-
-# @grafana/ui
-/packages/grafana-ui/ @grafana/grafana-frontend-platform
+/packages/grafana-ui/.storybook/ @grafana/grafana-frontend-platform
+/packages/grafana-ui/src/components/ @grafana/grafana-frontend-platform
 /packages/grafana-ui/src/components/BarGauge/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/DataLinks/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/DateTimePickers/ @grafana/grafana-frontend-platform
 /packages/grafana-ui/src/components/Gauge/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/PluginSignatureBadge/ @grafana/plugins-platform-frontend
 /packages/grafana-ui/src/components/Sparkline/ @grafana/grafana-frontend-platform @grafana/app-o11y-visualizations
@@ -721,13 +441,9 @@
 /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/tsconfig.build.json @grafana/frontend-ops
-/packages/grafana-ui/tsconfig.json @grafana/frontend-ops
-
-# @grafana/i18n
+/packages/grafana-ui/src/utils/storybook/ @grafana/grafana-frontend-platform
+/packages/grafana-alerting/ @grafana/alerting-frontend
 /packages/grafana-i18n/ @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend
-
-# @grafana/test-utils
 /packages/grafana-test-utils @grafana/grafana-frontend-platform
 
 # root files, mostly frontend
@@ -737,9 +453,9 @@
 /project.json @grafana/frontend-ops
 /.nxignore @grafana/frontend-ops
 /tsconfig.json @grafana/frontend-ops
-/scripts/tsconfig.base.json @grafana/frontend-ops
 /.editorconfig @grafana/frontend-ops
 /eslint.config.js @grafana/frontend-ops
+/.betterer.eslint.config.js @grafana/frontend-ops
 /.gitattributes @grafana/frontend-ops
 /.gitignore @grafana/frontend-ops
 /.ignore @grafana/frontend-ops
@@ -761,147 +477,26 @@
 /cypress.config.js @grafana/grafana-frontend-platform
 /.levignore.js @grafana/plugins-platform-frontend
 playwright.config.ts @grafana/plugins-platform-frontend
-playwright.storybook.config.ts @grafana/grafana-frontend-platform
 
 # public folder
 /public/app/api/ @grafana/grafana-frontend-platform
-/public/app/api/clients/folder/ @grafana/grafana-search-navigate-organise
-/public/app/core/actions/ @grafana/grafana-frontend-platform
-/public/app/core/app_events.ts @grafana/grafana-frontend-platform
-/public/app/core/components/AccessControl/ @grafana/identity-access-team
-/public/app/core/components/Animations/ @grafana/grafana-frontend-platform
-/public/app/core/components/AppNotifications/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/AppChrome/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/Branding/ @grafana/grafana-frontend-platform
-/public/app/core/components/Breadcrumbs/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/BouncingLoader/ @grafana/grafana-frontend-platform
-/public/app/core/components/CardButton.tsx @grafana/dashboards-squad
-/public/app/core/components/CloseButton/ @grafana/grafana-frontend-platform
-/public/app/core/components/ColorScale/ @grafana/dataviz-squad
-/public/app/core/components/DynamicImports/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/EmptyListCTA/ @grafana/grafana-frontend-platform
-/public/app/core/components/FolderFilter/ @grafana/sharing-squad
-/public/app/core/components/Footer/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/ForgottenPassword/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/Form/ @grafana/grafana-frontend-platform
-/public/app/core/components/FormPrompt/ @grafana/grafana-frontend-platform
-/public/app/core/components/GraphNG/ @grafana/dataviz-squad
-/public/app/core/components/help/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/Indent/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/Layers/ @grafana/dataviz-squad
-/public/app/core/components/Login/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/NativeScrollbar.tsx @grafana/grafana-search-navigate-organise
-/public/app/core/components/NavLandingPage/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/NestedFolderPicker/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/OptionsUI/ @grafana/dashboards-squad @grafana/dataviz-squad
-/public/app/core/components/Page/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/PageActionBar/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/PageInfo/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/PageLoader/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/PageNotFound/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/PanelTypeFilter/ @grafana/sharing-squad
-/public/app/core/components/PasswordField/ @grafana/grafana-frontend-platform
-/public/app/core/components/PluginHelp/ @grafana/plugins-platform-frontend
-/public/app/core/components/QueryOperationRow/ @grafana/dashboards-squad
-/public/app/core/components/RolePickerDrawer/ @grafana/identity-access-team
-/public/app/core/components/Select/ @grafana/grafana-frontend-platform
-/public/app/core/components/SharedPreferences/ @grafana/grafana-frontend-platform
-/public/app/core/components/Signup/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/SplitPaneWrapper/ @grafana/observability-traces-and-profiling
-/public/app/core/components/SVG/ @grafana/dataviz-squad
-/public/app/core/components/TagFilter/ @grafana/grafana-frontend-platform
-/public/app/core/components/Theme/ @grafana/grafana-frontend-platform
-/public/app/core/components/ThemeSelector/ @grafana/grafana-frontend-platform
-/public/app/core/components/TimelineChart/ @grafana/dataviz-squad
+/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/Upgrade/ @grafana/grafana-operator-experience-squad
-/public/app/core/components/ValidationLabels/ @grafana/grafana-search-navigate-organise
-/public/app/core/components/VersionHistory/ @grafana/dashboards-squad
-/public/app/core/config.ts @grafana/grafana-frontend-platform
-/public/app/core/constants.ts @grafana/grafana-frontend-platform
-/public/app/core/context/ @grafana/grafana-frontend-platform
-/public/app/core/copy/appNotification.ts @grafana/grafana-search-navigate-organise
-/public/app/core/core.ts @grafana/grafana-frontend-platform
-/public/app/core/crash/ @grafana/observability-traces-and-profiling
-/public/app/core/history/ @grafana/observability-traces-and-profiling
-/public/app/core/hooks/useBusEvent.ts @grafana/grafana-frontend-platform
-/public/app/core/hooks/useCleanup.ts @grafana/grafana-frontend-platform
-/public/app/core/hooks/useMediaQueryMinWidth.ts @grafana/grafana-frontend-platform
-/public/app/core/hooks/useNavModel.ts @grafana/grafana-search-navigate-organise
-/public/app/core/hooks/useQueryParams.ts @grafana/grafana-frontend-platform
-/public/app/core/icons/ @grafana/grafana-frontend-platform
-/public/app/core/lifecycle-hooks.ts @grafana/grafana-frontend-platform
-/public/app/core/log_events.ts @grafana/dashboards-squad
-/public/app/core/monacoEnv.ts @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend
-/public/app/core/navigation/ @grafana/grafana-search-navigate-organise
-/public/app/core/profiler.ts @grafana/dashboards-squad
-/public/app/core/reducers/ @grafana/grafana-frontend-platform
-/public/app/core/selectors/ @grafana/grafana-frontend-platform
-/public/app/core/services/__mocks__/backend_srv.ts @grafana/grafana-frontend-platform
-/public/app/core/services/backend_srv.ts @grafana/grafana-frontend-platform
-/public/app/core/services/context_srv.ts @grafana/grafana-frontend-platform
-/public/app/core/services/CorrelationsService.ts @grafana/datapro
-/public/app/core/services/echo/ @grafana/grafana-frontend-platform
-/public/app/core/services/FetchQueue* @grafana/grafana-frontend-platform
-/public/app/core/services/impression_srv.ts @grafana/grafana-frontend-platform
-/public/app/core/services/KeybindingSet* @grafana/grafana-frontend-platform
-/public/app/core/services/keybindingSrv.ts @grafana/grafana-frontend-platform
-/public/app/core/services/mocks/subscribeTester.ts @grafana/grafana-frontend-platform
-/public/app/core/services/mousetrap/ @grafana/grafana-frontend-platform
-/public/app/core/services/NewFrontendAssetsChecker* @grafana/grafana-frontend-platform
-/public/app/core/services/PreferencesService.ts @grafana/grafana-frontend-platform
-/public/app/core/services/ResponseQueue* @grafana/grafana-frontend-platform
-/public/app/core/services/StateManagerBase.ts @grafana/grafana-frontend-platform
-/public/app/core/services/theme.ts @grafana/grafana-frontend-platform
-/public/app/core/specs/backend_srv.test.ts @grafana/grafana-frontend-platform
-/public/app/core/specs/factors.test.ts @grafana/dashboards-squad
-/public/app/core/specs/flatten.test.ts @grafana/grafana-frontend-platform
-/public/app/core/specs/impression_srv.test.ts @grafana/grafana-frontend-platform
-/public/app/core/specs/rangeutil.test.ts @grafana/grafana-frontend-platform
-/public/app/core/specs/store.test.ts @grafana/grafana-frontend-platform
-/public/app/core/specs/TableModel.test.ts @grafana/partner-datasources
-/public/app/core/specs/ticks.test.ts @grafana/plugins-platform-frontend
-/public/app/core/specs/time_series.test.ts @grafana/dataviz-squad
-/public/app/core/store.ts @grafana/grafana-frontend-platform
-/public/app/core/TableModel.ts @grafana/partner-datasources
-/public/app/core/time_series2.ts @grafana/dataviz-squad
-/public/app/core/trustedTypePolicies.ts @grafana/grafana-frontend-platform
-/public/app/core/utils/accessControl.ts @grafana/identity-access-team
-/public/app/core/utils/applyStateChanges.ts @grafana/dashboards-squad
-/public/app/core/utils/arrayMove.ts @grafana/grafana-frontend-platform
-/public/app/core/utils/auth.ts @grafana/identity-access-team
-/public/app/core/utils/browser* @grafana/grafana-frontend-platform
-/public/app/core/utils/colors.ts @grafana/grafana-frontend-platform
-/public/app/core/utils/ConfigProvider.tsx @grafana/grafana-frontend-platform
-/public/app/core/utils/CorsSharedWorker.ts @grafana/grafana-frontend-platform
-/public/app/core/utils/CorsWorker.ts @grafana/grafana-frontend-platform
-/public/app/core/utils/connectWithReduxStore.tsx @grafana/grafana-frontend-platform
-/public/app/core/utils/dag* @grafana/grafana-frontend-platform
-/public/app/core/utils/deferred.ts @grafana/grafana-frontend-platform
-/public/app/core/utils/docsLinks.ts @grafana/grafana-frontend-platform
-/public/app/core/utils/errors* @grafana/grafana-frontend-platform
-/public/app/core/utils/explore* @grafana/observability-traces-and-profiling
-/public/app/core/utils/factors.ts @grafana/dashboards-squad
-/public/app/core/utils/fetch* @grafana/grafana-frontend-platform
-/public/app/core/utils/flatten.ts @grafana/grafana-frontend-platform
-/public/app/core/utils/isShallowEqual.ts @grafana/grafana-frontend-platform
-/public/app/core/utils/kbn* @grafana/grafana-frontend-platform
-/public/app/core/utils/navBarItem-translations.ts @grafana/grafana-search-navigate-organise
-/public/app/core/utils/object* @grafana/grafana-frontend-platform
-/public/app/core/utils/query* @grafana/grafana-datasources-core-services
-/public/app/core/utils/richHistory* @grafana/observability-traces-and-profiling
-/public/app/core/utils/set.ts @grafana/grafana-frontend-platform
-/public/app/core/utils/shortLinks* @grafana/sharing-squad
-/public/app/core/utils/ticks.ts @grafana/plugins-platform-frontend
-/public/app/core/utils/timePicker* @grafana/grafana-frontend-platform
-/public/app/core/utils/timeRegions* @grafana/dataviz-squad
-/public/app/core/utils/urlToken.ts @grafana/identity-access-team
-/public/app/core/utils/version.ts @grafana/partner-datasources
+/public/app/core/components/TimelineChart/ @grafana/dataviz-squad
+/public/app/core/components/Form/ @grafana/grafana-frontend-platform
+/public/app/core/components/OptionsUI/ @grafana/dashboards-squad @grafana/dataviz-squad
 /public/app/dev-utils.ts @grafana/grafana-frontend-platform
 
-/public/app/features/actions/ @grafana/dataviz-squad
+/public/app/core/history/ @grafana/observability-traces-and-profiling
 /public/app/features/admin/ @grafana/identity-access-team
+
+# Temp owners until Enterprise team takes over
+/public/app/features/migrate-to-cloud @grafana/grafana-frontend-platform
+
+/public/app/features/actions/ @grafana/dataviz-squad
 /public/app/features/auth-config/ @grafana/identity-squad
 /public/app/features/annotations/ @grafana/dashboards-squad
 /public/app/features/canvas/ @grafana/dataviz-squad
@@ -925,7 +520,6 @@ playwright.storybook.config.ts @grafana/grafana-frontend-platform
 /public/app/features/live/ @grafana/dashboards-squad
 /public/app/features/apiserver/ @grafana/grafana-app-platform-squad
 /public/app/features/manage-dashboards/ @grafana/dashboards-squad
-/public/app/features/migrate-to-cloud @grafana/grafana-operator-experience-squad
 /public/app/features/notifications/ @grafana/grafana-search-navigate-organise
 /public/app/features/org/ @grafana/grafana-search-navigate-organise
 /public/app/features/panel/ @grafana/dashboards-squad
@@ -959,6 +553,7 @@ playwright.storybook.config.ts @grafana/grafana-frontend-platform
 /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/logs-new/ @grafana/observability-logs
 /public/app/plugins/panel/nodeGraph/ @grafana/observability-traces-and-profiling @grafana/app-o11y-visualizations
 /public/app/plugins/panel/traces/ @grafana/observability-traces-and-profiling
 /public/app/plugins/panel/flamegraph/ @grafana/observability-traces-and-profiling
@@ -981,6 +576,7 @@ playwright.storybook.config.ts @grafana/grafana-frontend-platform
 /public/app/routes/ @grafana/grafana-search-navigate-organise
 /public/app/store/ @grafana/grafana-frontend-platform
 /public/app/types/ @grafana/grafana-frontend-platform
+/public/app/types/alerting.ts @grafana/alerting-frontend
 /public/app/types/unified-alerting-dto.ts @grafana/alerting-frontend
 /public/app/types/unified-alerting.ts @grafana/alerting-frontend
 /public/dashboards/ @grafana/dashboards-squad
@@ -1015,6 +611,7 @@ playwright.storybook.config.ts @grafana/grafana-frontend-platform
 /public/app/index.ts @grafana/frontend-ops
 /public/app/initApp.ts @grafana/frontend-ops
 /public/app/AppWrapper.tsx @grafana/frontend-ops
+/public/app/partials/ @grafana/grafana-frontend-platform
 
 /scripts/benchmark-access-control.sh @grafana/access-squad
 /scripts/check-breaking-changes.sh @grafana/plugins-platform-frontend
@@ -1022,11 +619,10 @@ playwright.storybook.config.ts @grafana/grafana-frontend-platform
 /scripts/circle-* @grafana/grafana-developer-enablement-squad
 /scripts/publish-npm-packages.sh @grafana/grafana-developer-enablement-squad @grafana/plugins-platform-frontend
 /scripts/validate-npm-packages.sh @grafana/grafana-developer-enablement-squad @grafana/plugins-platform-frontend
-/scripts/ci-frontend-metrics.sh @grafana/grafana-frontend-platform @grafana/frontend-ops
+/scripts/ci-frontend-metrics.sh @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend @grafana/dataviz-squad @grafana/datapro
 /scripts/cli/ @grafana/grafana-frontend-platform
 /scripts/clean-git-or-error.sh @grafana/grafana-as-code
 /scripts/grafana-server/ @grafana/grafana-frontend-platform
-/scripts/check-frontend-dev.sh @grafana/grafana-frontend-platform
 /scripts/helpers/ @grafana/grafana-developer-enablement-squad
 /scripts/import_many_dashboards.sh @torkelo
 /scripts/mixin-check.sh @bergquist
@@ -1051,7 +647,8 @@ playwright.storybook.config.ts @grafana/grafana-frontend-platform
 /scripts/**/generate-transformations* @grafana/datapro
 /scripts/webpack/ @grafana/frontend-ops
 /scripts/generate-a11y-report.sh @grafana/grafana-frontend-platform
-eslint-suppressions.json @grafanabot
+.betterer.results @grafanabot
+.betterer.ts @grafana/grafana-frontend-platform
 
 # Design system
 /public/img/icons/unicons/ @grafana/design-system
@@ -1075,7 +672,7 @@ eslint-suppressions.json @grafanabot
 /public/app/plugins/datasource/prometheus/ @grafana/oss-big-tent
 /public/app/plugins/datasource/cloud-monitoring/ @grafana/partner-datasources
 /public/app/plugins/datasource/zipkin/ @grafana/oss-big-tent
-/public/app/plugins/datasource/tempo/ @grafana/oss-big-tent @grafana/observability-traces-and-profiling
+/public/app/plugins/datasource/tempo/ @grafana/observability-traces-and-profiling
 /public/app/plugins/datasource/grafana-pyroscope-datasource/ @grafana/observability-traces-and-profiling
 /public/app/plugins/datasource/parca/ @grafana/oss-big-tent
 /public/app/plugins/datasource/alertmanager/ @grafana/alerting-squad
@@ -1139,8 +736,6 @@ eslint-suppressions.json @grafanabot
 # Feature toggles
 /pkg/services/featuremgmt/ @grafana/grafana-backend-services-squad
 
-# Data source migrations
-/pkg/services/promtypemigration/ @grafana/partner-datasources @grafana/aws-datasources
 
 # Kind definitions
 /kinds/dashboard @grafana/dashboards-squad
@@ -1152,13 +747,11 @@ embed.go @grafana/grafana-as-code
 /pkg/kinds/ @grafana/grafana-as-code
 /pkg/registry/ @grafana/grafana-as-code
 /pkg/registry/apis/ @grafana/grafana-app-platform-squad
-/pkg/registry/apis/folders @grafana/grafana-search-and-storage
 /pkg/registry/apis/query @grafana/grafana-datasources-core-services
 /pkg/registry/apis/secret @grafana/grafana-operator-experience-squad
 /pkg/registry/apis/userstorage @grafana/grafana-app-platform-squad @grafana/plugins-platform-backend
 /pkg/registry/apps/advisor @grafana/plugins-platform-backend
 /pkg/registry/apps/alerting @grafana/alerting-backend
-/pkg/registry/apps/plugins @grafana/plugins-platform-backend
 /pkg/codegen/ @grafana/grafana-as-code
 /pkg/codegen/generators @grafana/grafana-as-code
 /pkg/kinds/*/*_gen.go @grafana/grafana-as-code
@@ -1177,12 +770,10 @@ embed.go @grafana/grafana-as-code
 /.github/pr-checks.json @tolzhabayev
 /.github/pr-commands.json @tolzhabayev
 /.github/renovate.json5 @grafana/frontend-ops
-/.github/actions/check-jobs/action.yml @grafana/grafana-frontend-platform
 /.github/actions/setup-enterprise/action.yml @grafana/grafana-backend-group
 /.github/actions/setup-grafana-bench/ @Proximyst
 /.github/actions/build-package @grafana/grafana-developer-enablement-squad
 /.github/actions/change-detection @grafana/grafana-developer-enablement-squad
-/.github/actions/setup-node @grafana/grafana-frontend-platform
 /.github/workflows/actionlint-format.txt @grafana/grafana-developer-enablement-squad
 /.github/workflows/actionlint.yml @grafana/grafana-developer-enablement-squad
 /.github/workflows/add-to-whats-new.yml @grafana/docs-tooling
@@ -1205,7 +796,6 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/commands.yml @torkelo
 /.github/workflows/community-release.yml @grafana/grafana-developer-enablement-squad
 /.github/workflows/detect-breaking-changes-* @grafana/plugins-platform-frontend
-/.github/workflows/detect-plugin-extension-changes.yml @grafana/plugins-platform-frontend
 /.github/workflows/documentation-ci.yml @grafana/docs-tooling
 /.github/workflows/deploy-pr-preview.yml @grafana/docs-tooling
 /.github/workflows/feature-toggles-ci.yml @grafana/docs-tooling
@@ -1226,7 +816,7 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/publish-technical-documentation-release.yml @grafana/docs-tooling
 /.github/workflows/scripts/json-file-to-job-output.js @grafana/plugins-platform-frontend
 /.github/workflows/stale.yml @grafana/grafana-developer-enablement-squad
-/.github/workflows/storybook-a11y.yml @grafana/grafana-frontend-platform
+/.github/workflows/storybook-verification.yml @grafana/grafana-frontend-platform
 /.github/workflows/update-make-docs.yml @grafana/docs-tooling
 /.github/workflows/scripts/kinds/verify-kinds.go @grafana/platform-monitoring
 /.github/workflows/scripts/create-security-branch/create-security-branch.sh @grafana/grafana-developer-enablement-squad
@@ -1235,6 +825,7 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/verify-kinds.yml @grafana/platform-monitoring
 /.github/workflows/dashboards-issue-add-label.yml @grafana/dashboards-squad
 /.github/workflows/run-schema-v2-e2e.yml  @grafana/dashboards-squad
+/.github/workflows/e2e-dashboard-new-layouts.yml  @grafana/dashboards-squad
 /.github/workflows/run-dashboard-search-e2e.yml  @grafana/grafana-search-and-storage
 /.github/workflows/trigger-dashboard-search-e2e.yml  @grafana/grafana-search-and-storage
 /.github/workflows/ephemeral-instances-pr-comment.yml @grafana/grafana-operator-experience-squad
@@ -1246,7 +837,6 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/i18n-verify.yml @grafana/grafana-frontend-platform
 /.github/workflows/deploy-storybook-preview.yml @grafana/grafana-frontend-platform
 /.github/workflows/scripts/crowdin/create-tasks.ts @grafana/grafana-frontend-platform
-/.github/workflows/scripts/publish-frontend-metrics.mts @grafana/grafana-frontend-platform
 /.github/workflows/pr-go-workspace-check.yml @grafana/grafana-app-platform-squad
 /.github/workflows/pr-dependabot-update-go-workspace.yml @grafana/grafana-app-platform-squad
 /.github/workflows/pr-k8s-codegen-check.yml @grafana/grafana-app-platform-squad
@@ -1264,11 +854,9 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/analytics-events-report.yml @grafana/grafana-frontend-platform
 /.github/workflows/pr-e2e-tests.yml @grafana/grafana-developer-enablement-squad
 /.github/workflows/skye-add-to-project.yml @grafana/grafana-frontend-platform
-/.github/workflows/frontend-perf-tests.yaml @grafana/grafana-frontend-platform
 /.github/zizmor.yml @grafana/grafana-developer-enablement-squad
 /.github/license_finder.yaml @bergquist
 /.github/actionlint.yaml @grafana/grafana-developer-enablement-squad
-/.github/workflows/pr-test-docker.yml @grafana/grafana-developer-enablement-squad
 
 # Generated files not requiring owner approval
 /packages/grafana-data/src/types/featureToggles.gen.ts @grafanabot
@@ -1288,7 +876,3 @@ embed.go @grafana/grafana-as-code
 /conf/provisioning/datasources/ @grafana/plugins-platform-backend
 /conf/provisioning/plugins/ @grafana/plugins-platform-backend
 /conf/provisioning/sample/ @grafana/grafana-git-ui-sync-team
-
-# Security
-/relyance.yaml @grafana/security-team
-/.github/workflows/relyance-scan.yml @grafana/security-team

.github/actionlint.yaml

@@ -6,23 +6,3 @@ self-hosted-runner:
     - github-hosted-ubuntu-x64-small
     - github-hosted-ubuntu-x64-large
     - github-hosted-windows-x64-large
-    - ubuntu-x64
-    - ubuntu-x64-io
-    - ubuntu-x64-small
-    - ubuntu-x64-small-io
-    - ubuntu-x64-large
-    - ubuntu-x64-large-io
-    - ubuntu-x64-xlarge
-    - ubuntu-x64-xlarge-io
-    - ubuntu-x64-2xlarge
-    - ubuntu-x64-2xlarge-io
-    - ubuntu-arm64
-    - ubuntu-arm64-io
-    - ubuntu-arm64-small
-    - ubuntu-arm64-small-io
-    - ubuntu-arm64-large
-    - ubuntu-arm64-large-io
-    - ubuntu-arm64-xlarge
-    - ubuntu-arm64-xlarge-io
-    - ubuntu-arm64-2xlarge
-    - ubuntu-arm64-2xlarge-io

.github/actions/build-package/action.yml

@@ -139,7 +139,6 @@ runs:
       with:
         verb: run
         dagger-flags: --verbose=0
-        version: 0.18.8
         args: go run -C ${GRAFANA_PATH} ./pkg/build/cmd artifacts --artifacts ${ARTIFACTS} --grafana-dir=${GRAFANA_PATH} --alpine-base=${ALPINE_BASE} --ubuntu-base=${UBUNTU_BASE} --enterprise-dir=${ENTERPRISE_PATH} --version=${VERSION} --patches-repo=${PATCHES_REPO} --patches-ref=${PATCHES_REF} --patches-path=${PATCHES_PATH} --build-id=${BUILD_ID} --tag-format="${TAG_FORMAT}" --ubuntu-tag-format="${UBUNTU_TAG_FORMAT}" --org=${DOCKER_ORG} --registry=${DOCKER_REGISTRY} --checksum=${CHECKSUM} --verify=${VERIFY} > $OUTFILE
     - id: output
       shell: bash

.github/actions/change-detection/action.yml

@@ -19,18 +19,12 @@ outputs:
     value: ${{ steps.changed-files.outputs.e2e_any_changed == 'true' ||
       steps.changed-files.outputs.backend_any_changed == 'true' ||
       steps.changed-files.outputs.frontend_any_changed == 'true' || 'true' }}
-  e2e-cloud-plugins:
-    description: Whether the cloud plugins code or tests have changed in any way
-    value: ${{ steps.changed-files.outputs.e2e_cloud_plugins_any_changed || 'true' }}
   dev-tooling:
     description: Whether the dev tooling or self have changed in any way
     value: ${{ steps.changed-files.outputs.dev_tooling_any_changed || 'true' }}
   docs:
     description: Whether the docs or self have changed in any way
     value: ${{ steps.changed-files.outputs.docs_any_changed || 'true' }}
-  dockerfile:
-    description: Whether the dockerfile or self have changed in any way
-    value: ${{ steps.changed-files.outputs.dockerfile_any_changed || 'true' }}
 runs:
   using: composite
   steps:
@@ -45,8 +39,6 @@ runs:
           self:
             - '.github/actions/change-detection/**'
             - '${{ inputs.self }}'
-          dockerfile:
-            - 'Dockerfile'
           backend:
             - '!*.md'
             - '!docs/**'
@@ -55,10 +47,6 @@ runs:
             - '.github/actions/checkout/**'
             - '**/go.mod'
             - '**/go.sum'
-            - 'go.mod'
-            - 'go.sum'
-            - 'go.work'
-            - 'go.work.sum'
             - '**.go'
             - 'pkg/**'
             - '!pkg/**.md'
@@ -86,6 +74,7 @@ runs:
             - '.github/actions/change-detection/**'
             - '**.cue'
             - '.prettier*'
+            - '.betterer*'
             - '.yarnrc.yml'
             - 'eslint.config.js'
             - 'jest.config.js'
@@ -102,17 +91,13 @@ runs:
             - 'proto/**'
             - '**/Makefile'
             - 'scripts/**'
+            - '!scripts/drone/**'
             - '!**.md'
             - '.github/actions/change-detection/**'
             - '**.cue'
             - 'conf/**'
             - 'cypress.config.js'
             - '${{ inputs.self }}'
-          e2e_cloud_plugins:
-            - 'pkg/tsdb/azuremonitor/**'
-            - 'public/app/plugins/datasource/azuremonitor/**'
-            - 'e2e-playwright/cloud-plugins-suite/azure-monitor.spec.ts'
-            - '${{ inputs.self }}'
           dev_tooling:
             - '.github/actions/setup-enterprise/**'
             - '.github/actions/checkout/**'
@@ -126,6 +111,7 @@ runs:
             - 'scripts/**'
             - '!**.md'
             - '.citools/**'
+            - '.bingo/**'
             - '.github/actions/change-detection/**'
             - '${{ inputs.self }}'
           docs:
@@ -149,11 +135,7 @@ runs:
         echo " --> ${{ steps.changed-files.outputs.e2e_all_changed_files }}"
         echo " --> ${{ steps.changed-files.outputs.backend_all_changed_files }}"
         echo " --> ${{ steps.changed-files.outputs.frontend_all_changed_files }}"
-        echo "E2E cloud plugins: ${{ steps.changed-files.outputs.e2e_cloud_plugins_any_changed || 'true' }}"
-        echo " --> ${{ steps.changed-files.outputs.e2e_cloud_plugins_all_changed_files }}"
         echo "Dev Tooling: ${{ steps.changed-files.outputs.dev_tooling_any_changed || 'true' }}"
         echo " --> ${{ steps.changed-files.outputs.dev_tooling_all_changed_files }}"
         echo "Docs: ${{ steps.changed-files.outputs.docs_any_changed || 'true' }}"
         echo " --> ${{ steps.changed-files.outputs.docs_all_changed_files }}"
-        echo "Dockerfile: ${{ steps.changed-files.outputs.dockerfile_any_changed || 'true' }}"
-        echo " --> ${{ steps.changed-files.outputs.dockerfile_all_changed_files }}"

.github/actions/check-jobs/action.yml

@@ -1,48 +0,0 @@
-name: Check jobs results
-description: Checks if any jobs have failed and exits with error if failures are found. Use to check the results of matrix test runs.
-inputs:
-  needs:
-    description: JSON string containing the needs context from the workflow
-    required: true
-  failure-message:
-    description: Custom message to display when failures are found
-    required: false
-    default: "One or more jobs have failed"
-  success-message:
-    description: Custom message to display when all jobs pass
-    required: false
-    default: "All jobs passed successfully"
-outputs:
-  any-failed:
-    description: Whether any jobs failed
-    value: ${{ steps.check-jobs.outputs.any-failed }}
-
-runs:
-  using: "composite"
-  steps:
-    - name: Check test suites
-      id: check-jobs
-      shell: bash
-      env:
-        NEEDS: ${{ inputs.needs }}
-        FAILURE_MSG: ${{ inputs.failure-message }}
-        SUCCESS_MSG: ${{ inputs.success-message }}
-      run: |
-        set -euo pipefail
-
-        # Print the needs context, debugging
-        echo "$NEEDS" | jq
-
-        # Extract failures
-        FAILURES="$(echo "$NEEDS" | jq 'with_entries(select(.value.result == "failure")) | map_values(.result)')"
-
-        # Check if there are any failures
-        if [ "$(echo "$FAILURES" | jq '. | length')" != "0" ]; then
-          echo "❌ $FAILURE_MSG"
-          echo "Failed suites:"
-          echo "$FAILURES" | jq -r 'to_entries[] | "- \(.key): \(.value)"'
-          echo "any-failed=true" >> "$GITHUB_OUTPUT"
-          exit 1
-        fi
-
-        echo "✅ $SUCCESS_MSG"

.github/actions/setup-node/action.yml

@@ -1,11 +0,0 @@
-name: Setup Node.js
-description: Sets up a node.js environment with presets for the Grafana repository.
-
-runs:
-  using: "composite"
-  steps:
-    - uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-        cache: 'yarn'
-        cache-dependency-path: 'yarn.lock'

.github/commands.json

@@ -136,7 +136,7 @@
     "name": "datasource/Tempo",
     "action": "addToProject",
     "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/457"
+      "url": "https://github.com/orgs/grafana/projects/221"
     }
   },
   {
@@ -152,7 +152,7 @@
     "name": "datasource/Parca",
     "action": "addToProject",
     "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/457"
+      "url": "https://github.com/orgs/grafana/projects/221"
     }
   },
   {
@@ -168,7 +168,7 @@
     "name": "datasource/Jaeger",
     "action": "addToProject",
     "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/457"
+      "url": "https://github.com/orgs/grafana/projects/221"
     }
   },
   {
@@ -176,7 +176,7 @@
     "name": "datasource/Zipkin",
     "action": "addToProject",
     "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/457"
+      "url": "https://github.com/orgs/grafana/projects/221"
     }
   },
   {
@@ -584,7 +584,7 @@
     "name": "area/public-dashboards",
     "action": "addToProject",
     "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/467"
+      "url": "https://github.com/orgs/grafana/projects/482"
     }
   },
   {
@@ -696,7 +696,7 @@
     "name": "area/navigation",
     "action": "addToProject",
     "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/911"
+      "url": "https://github.com/orgs/grafana/projects/78"
     }
   },
   {
@@ -704,7 +704,7 @@
     "name": "area/search",
     "action": "addToProject",
     "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/911"
+      "url": "https://github.com/orgs/grafana/projects/78"
     }
   },
   {
@@ -752,7 +752,7 @@
     "name": "area/image-rendering",
     "action": "addToProject",
     "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/467"
+      "url": "https://github.com/orgs/grafana/projects/482"
     }
   },
   {
@@ -947,14 +947,6 @@
       "url": "https://github.com/orgs/grafana/projects/202"
     }
   },
-  {
-    "type": "label",
-    "name": "area/gitsync",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/792"
-    }
-  },
   {
     "type": "label",
     "name": "area/backend/db/sqlite",
@@ -1008,7 +1000,7 @@
     "name": "area/frontend/login",
     "action": "addToProject",
     "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/911"
+      "url": "https://github.com/orgs/grafana/projects/78"
     }
   },
   {
@@ -1040,7 +1032,7 @@
     "name": "area/panel/dashboard-list",
     "action": "addToProject",
     "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/911"
+      "url": "https://github.com/orgs/grafana/projects/202"
     }
   },
   {

.github/dependabot.yml

@@ -8,11 +8,11 @@ updates:
     directories:
       - "/"
       - "/apps/playlist"
-      - "/apps/secret"
       - "/apps/investigations"
       - "/pkg/aggregator"
       - "/pkg/apimachinery"
       - "/pkg/apis/folder"
+      - "/pkg/apis/secret"
       - "/pkg/apiserver"
       - "/pkg/build"
       - "/pkg/build/wire"

.github/issue-opened.json

@@ -4,7 +4,8 @@
     "memberOf": {
       "org": "grafana"
     },
-    "noLabels": true,    
+    "noLabels": true,
+    "addLabel": "internal",
     "comment": " please add one or more appropriate labels. Here are some tips:\r\n\r\n- if you are making an issue, TODO, or reminder for yourself or your team, please add one label that best describes the product or feature area. Please also add the issue to your project board. :rocket:\r\n\r\n- if you are making an issue for any other reason (docs typo, you found a bug, etc), please add at least one label that best describes the product or feature that you are discussing (e.g. `area/alerting`, `datasource/loki`, `type/docs`, `type/bug`, etc). [Our issue triage](https://github.com/grafana/grafana/blob/main/contribute/ISSUE_TRIAGE.md#3-categorize-an-issue) doc also provides additional guidance on labeling. :rocket:\r\n\r\n Thank you! :heart:"
   }
 ]

.github/license_finder.yaml

@@ -99,7 +99,7 @@
     :versions: []
     :when: 2025-05-03 13:10:00.000000000 Z
 - - :license
-  - github.com/grafana/grafana/apps/secret
+  - github.com/grafana/grafana/pkg/apis/secret
   - unknown
   - :who: Carl Bergquist
     :why: repository is owned by Grafana Labs

.github/pr-commands.json

@@ -71,6 +71,16 @@
     "action": "updateLabel",
     "addLabel": "type/build-packaging"
   },
+  {
+    "type": "changedfiles",
+    "matches": [
+      "scripts/*.star",
+      ".drone.star",
+      ".drone.yml"
+    ],
+    "action": "updateLabel",
+    "addLabel": "type/ci"
+  },
   {
     "type": "changedfiles",
     "matches": [

.github/renovate.json5

@@ -12,7 +12,6 @@
     'react-refresh',
 
     "@types/history", // this can be removed entirely when we upgrade history since v5 exposes types directly
-    "cypress", // cypress use is deprecated, we should not bump it anymore
     "history", // we should bump this together with react-router-dom (see https://github.com/grafana/grafana/issues/76744)
     "react-router", // we should bump this together with history and react-router-dom
     "react-router-dom", // we should bump this together with history (see https://github.com/grafana/grafana/issues/76744)
@@ -32,41 +31,29 @@
       automerge: true,
       matchCurrentVersion: "!/^0/",
       matchUpdateTypes: ["patch"],
-      matchPackageNames: ["!/^@?storybook/", "!/^@locker/", "!/^@grafana/"],
-      minimumReleaseAge: "7 days",
-    },
-    {
-      automerge: true,
-      matchCurrentVersion: "!/^0/",
-      matchUpdateTypes: ["patch"],
-      matchPackageNames: ["/^@grafana/"],
+      matchPackageNames: ["!/^@?storybook/", "!/^@locker/"],
     },
     {
       extends: ["schedule:monthly"],
       groupName: "Storybook updates",
       matchPackageNames: ["/^@?storybook/"],
       rangeStrategy: "bump",
-      minimumReleaseAge: "7 days",
     },
     {
       groupName: "React Aria",
       matchPackageNames: ["@react-aria/{/,}**", "@react-stately/{/,}**"],
-      minimumReleaseAge: "7 days",
     },
     {
       groupName: "Moveable",
       matchPackageNames: ["moveable", "react-moveable"],
-      minimumReleaseAge: "7 days",
     },
     {
       groupName: "Slate",
       matchPackageNames: ["@types/slate", "@types/slate-react", "slate", "slate-react"],
-      minimumReleaseAge: "7 days",
     },
     {
       groupName: "d3",
       matchPackageNames: ["d3{/,}**", "@types/d3{/,}**"],
-      minimumReleaseAge: "7 days",
     },
     {
       groupName: "scenes",
@@ -79,25 +66,21 @@
     {
       groupName: "visx",
       matchPackageNames: ["@visx/{/,}**"],
-      minimumReleaseAge: "7 days",
     },
     {
       groupName: "uLibraries",
       matchPackageNames: ["@leeoniya/**", "uplot"],
       reviewers: ["leeoniya"],
-      minimumReleaseAge: "7 days",
     },
     {
       groupName: "locker",
       reviewers: ["team:grafana/plugins-platform-frontend"],
       matchPackageNames: ["@locker/{/,}**"],
-      minimumReleaseAge: "7 days",
     },
     {
       groupName: "augurs",
       matchPackageNames: ["@bsull/augurs"],
       reviewers: ["sd2k"],
-      minimumReleaseAge: "7 days",
     },
     {
       "matchDepTypes": ["devDependencies"],

.github/workflows/add-to-whats-new.yml

@@ -10,7 +10,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: marocchino/sticky-pull-request-comment@773744901bac0e8cbb5a0dc842800d45e9b2b405 # v2.9.4
+      - uses: marocchino/sticky-pull-request-comment@52423e01640425a022ef5fd42c6fb5f633a02728 # v2.9.1
         with:
           message: |
             Since you've added the `Add to what's new` label, consider drafting a [What's new note](https://admin.grafana.com/content-admin/#/collections/whats-new/new) for this feature.

.github/workflows/alerting-swagger-gen.yml

@@ -15,7 +15,7 @@ jobs:
           fetch-depth: 2
           persist-credentials: false
       - name: Set go version
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
+        uses: actions/setup-go@19bb51245e9c80abacb2e91cc42b33fa478b8639
         with:
           go-version-file: go.mod
       - name: Build swagger

.github/workflows/alerting-update-module.yml

@@ -29,7 +29,7 @@ jobs:
           fi
 
       - name: Setup Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # 5.5.0
+        uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # 5.3.0
         with:
           "go-version-file": "go.mod"
 
@@ -51,7 +51,7 @@ jobs:
         run: |
           TO_COMMIT="$(gh api repos/grafana/alerting/commits/"$BRANCH" --jq '.sha')"
            if [ -z "$TO_COMMIT" ]; then
-            echo "Branch $BRANCH not found in alerting repo"
+            echo "Branch $BRANCH not found in alerting repo, falling back to main branch"
             exit 1
           fi
           echo "to_commit=$TO_COMMIT" >> "$GITHUB_OUTPUT"
@@ -85,7 +85,7 @@ jobs:
           printf "%s\n" "$ALERTING_COMMITS"
 
           # make the list for markdown and replace PR numbers with links
-          ALERTING_COMMITS_FORMATTED="$(echo "$ALERTING_COMMITS" | while read -r line; do echo "- $line" | sed -E 's/\(#([0-9]+)\)/[#\1](https:\/\/github.com\/grafana\/alerting\/pull\/\1)/g'; done)"
+          ALERTING_COMMITS_FORMATTED="$(echo "$ALERTING_COMMITS" | while read -r line; do echo "- $line" | sed -E 's/\(#([0-9]+)\)/[#\1](https:\/\/github.com\/grafana\/grafana\/pull\/\1)/g'; done)"
 
           {
             echo "alerting_commits<<EOF"
@@ -123,9 +123,6 @@ jobs:
           title:  'Alerting: Update alerting module to ${{ steps.latest-commit.outputs.to_commit }}'
           branch: alerting/update-alerting-module
           delete-branch: true
-          labels: |
-            no-changelog
-            no-backport
           body: |
             Updates Grafana Alerting module to latest version.
 
@@ -147,14 +144,3 @@ jobs:
             echo "## Pull Request Created"
             echo "🔗 [View Pull Request]($PR_URL)"
           } >> "$GITHUB_STEP_SUMMARY"
-      - name: Send Slack Message
-        uses: grafana/shared-workflows/actions/send-slack-message@send-slack-message/v2.0.3
-        with:
-          method: 'chat.postMessage'
-          # send to alerting-reviews channel
-          payload-templated: true
-          payload:  |
-            {
-              "channel": "C076RNRRZ2N",
-              "text": "Update alerting module in Grafana ${{ steps.create-pr.outputs.pull-request-url }}"
-            }

.github/workflows/auto-triager/labels.txt

@@ -14,7 +14,6 @@ area/backend/db/mysql
 area/backend/db/postgres
 area/backend/db/sql
 area/backend/db/sqlite
-area/gitsync
 area/configuration
 area/dashboard/annotations
 area/dashboard/data-links

.github/workflows/backend-code-checks.yml

@@ -14,31 +14,12 @@ on:
       - 'docs/**'
       - 'latest.json'
 
-jobs:
-  detect-changes:
-    name: Detect whether code changed
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    outputs:
-      changed: ${{ steps.detect-changes.outputs.backend }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: true # required to get more history in the changed-files action
-          fetch-depth: 2
-      - name: Detect changes
-        id: detect-changes
-        uses: ./.github/actions/change-detection
-        with:
-          self: .github/workflows/backend-code-checks.yml
+permissions:
+  contents: read
+  id-token: write
 
+jobs:
   validate-configs:
-    permissions:
-      contents: read
-      id-token: write
-    needs: detect-changes
-    if: needs.detect-changes.outputs.changed == 'true'
     name: Validate Backend Configs
     runs-on: ubuntu-latest
     steps:
@@ -46,7 +27,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Setup Go
-        uses: actions/setup-go@v5.5.0
+        uses: actions/setup-go@v5
         with:
           # Explicitly set Go version to 1.24.1 to ensure consistent OpenAPI spec generation
           # The crypto/x509 package has additional fields in Go 1.24.1 that affect the generated specs
@@ -58,7 +39,7 @@ jobs:
         run: |
           CODEGEN_VERIFY=1 make gen-cue
           CODEGEN_VERIFY=1 make gen-jsonnet
-
+      
       - name: Validate go.mod
         run: go run scripts/modowners/modowners.go check go.mod
 
@@ -67,7 +48,7 @@ jobs:
       - name: Setup Grafana Enterprise
         if: github.event.pull_request.head.repo.fork == false
         uses: ./.github/actions/setup-enterprise
-
+        
       - name: Generate and Validate OpenAPI Specs
         run: |
           # For PRs from forks, we'll just run the basic swagger-gen without validation
@@ -76,10 +57,10 @@ jobs:
             make swagger-gen
             exit 0
           fi
-
+          
           # Clean and regenerate OpenAPI specs
           make swagger-clean && make openapi3-gen
-
+          
           # Check if the generated specs differ from what's in the repository
           for f in public/api-merged.json public/openapi3.json; do git add $f; done
           if [ -z "$(git diff --name-only --cached)" ]; then

.github/workflows/backend-unit-tests.yml

@@ -16,8 +16,6 @@ permissions: {}
 jobs:
   detect-changes:
     name: Detect whether code changed
-    # Run on `grafana/grafana` main branch, or on pull requests to prevent double-running on mirrors
-    if: (github.event_name == 'pull_request' || (github.event_name == 'push' && github.repository == 'grafana/grafana'))
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -48,7 +46,7 @@ jobs:
       fail-fast: false
 
     name: Grafana (${{ matrix.shard }})
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-8-cores
     continue-on-error: true
     permissions:
       contents: read
@@ -59,7 +57,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Setup Go
-        uses: actions/setup-go@v5.5.0
+        uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
       - name: Run unit tests
@@ -68,7 +66,7 @@ jobs:
         run: |
           set -euo pipefail
           readarray -t PACKAGES <<< "$(./scripts/ci/backend-tests/shard.sh -N"$SHARD")"
-          CGO_ENABLED=0 go test -short -timeout=30m "${PACKAGES[@]}"
+          go test -short -timeout=30m "${PACKAGES[@]}"
 
   grafana-enterprise:
     # Run this workflow for non-PR events (like pushes to `main` or `release-*`) OR for internal PRs (PRs not from forks)
@@ -83,7 +81,7 @@ jobs:
       fail-fast: false
 
     name: Grafana Enterprise (${{ matrix.shard }})
-    runs-on: ubuntu-x64-large
+    runs-on: ubuntu-latest-8-cores
     permissions:
       contents: read
       id-token: write
@@ -94,7 +92,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Setup Go
-        uses: actions/setup-go@v5.5.0
+        uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
       - name: Setup Enterprise
@@ -118,7 +116,7 @@ jobs:
           readarray -t PACKAGES <<< "$(./scripts/ci/backend-tests/shard.sh -N"$SHARD")"
           # This tee requires pipefail to be set, otherwise `go test`'s exit code is thrown away.
           # That means having no `-o pipefail` => failing tests => exit code 0, which is wrong.
-          CGO_ENABLED=0 go test -short -timeout=30m "${PACKAGES[@]}"
+          go test -short -timeout=30m "${PACKAGES[@]}"
 
   # This is the job that is actually required by rulesets.
   # We need to require EITHER the OSS or the Enterprise job to pass.

.github/workflows/backport-workflow.yml

@@ -13,7 +13,7 @@ permissions: {}
 jobs:
   backport:
     # Only run this job if the triggering workflow was not skipped (and on grafana repo)
-    if: github.event.workflow_run.head_repository.fork == false && github.repository == 'grafana/grafana' && github.event.workflow_run.conclusion == 'success'
+    if: github.repository == 'grafana/grafana' && github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-latest
     permissions:
       id-token: write

.github/workflows/bump-version.yml

@@ -13,29 +13,17 @@ on:
         required: false
 
 permissions:
-  id-token: write
-  contents: read
+  contents: write
+  pull-requests: write
 
 jobs:
   bump-version:
     runs-on: ubuntu-latest
     steps:
-      - uses: grafana/shared-workflows/actions/get-vault-secrets@main
-        with:
-          repo_secrets: |
-            GRAFANA_DELIVERY_BOT_APP_PEM=delivery-bot-app:PRIVATE_KEY
-      - name: Generate token
-        id: generate_token
-        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
-        with:
-          app_id: ${{ vars.DELIVERY_BOT_APP_ID }}
-          private_key: ${{ env.GRAFANA_DELIVERY_BOT_APP_PEM }}
-          repositories: '["grafana"]'
-          permissions: '{"contents": "write", "pull_requests": "write", "workflows": "write"}'
       - name: Checkout Grafana
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
-          token: ${{ steps.generate_token.outputs.token }}
+          persist-credentials: false
       - name: Update package.json versions
         uses: ./pkg/build/actions/bump-version
         with:
@@ -47,10 +35,10 @@ jobs:
           DRY_RUN: ${{ inputs.dry_run }}
           REF_NAME: ${{ github.ref_name }}
           RUN_ID: ${{ github.run_id }}
-          GH_TOKEN: ${{ steps.generate_token.outputs.token }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          git config --local user.name "grafana-delivery-bot[bot]"
-          git config --local user.email "grafana-delivery-bot[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
           git config --local --add --bool push.autoSetupRemote true
           git checkout -b "bump-version/${RUN_ID}/${VERSION}"
           git add .

.github/workflows/codeql-analysis.yml

@@ -23,28 +23,7 @@ permissions:
   security-events: write
 
 jobs:
-  detect-changes:
-    name: Detect whether code changed
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    outputs:
-      javascript: ${{ steps.detect-changes.outputs.frontend }}
-      go: ${{ steps.detect-changes.outputs.backend }}
-      actions: 'true'
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: true # required to get more history in the changed-files action
-          fetch-depth: 2
-      - name: Detect changes
-        id: detect-changes
-        uses: ./.github/actions/change-detection
-        with:
-          self: .github/workflows/codeql-analysis.yml
-
   analyze:
-    needs: detect-changes
     name: Analyze
     runs-on: ubuntu-latest
     continue-on-error: true # doesn't block PRs from being merged if this fails
@@ -62,7 +41,6 @@ jobs:
 
     steps:
     - name: Checkout repository
-      if: needs.detect-changes.outputs[matrix.language] == 'true'
       uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
@@ -70,15 +48,14 @@ jobs:
         fetch-depth: 2
         persist-credentials: false
 
-    - if: matrix.language == 'go' && needs.detect-changes.outputs.go == 'true'
+    - if: matrix.language == 'go'
       name: Set go version
-      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
+      uses: actions/setup-go@19bb51245e9c80abacb2e91cc42b33fa478b8639
       with:
         go-version-file: go.mod
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      if: needs.detect-changes.outputs[matrix.language] == 'true'
       uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
@@ -87,7 +64,7 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    - if: matrix.language == 'go' && needs.detect-changes.outputs.go == 'true'
+    - if: matrix.language == 'go'
       name: Build go files
       run: |
         go mod verify

.github/workflows/core-plugins-build-and-release.yml

@@ -62,7 +62,7 @@ jobs:
         with:
           credentials_json: '${{ env.PLUGINS_GOOGLE_CREDENTIALS }}'
       - name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db'
+        uses: 'google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a'
       - name: Setup nodejs environment
         uses: actions/setup-node@v4
         with:
@@ -101,7 +101,7 @@ jobs:
             echo "has_backend=false" >> "$GITHUB_OUTPUT"
           fi
       - name: Setup golang environment
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
+        uses: actions/setup-go@19bb51245e9c80abacb2e91cc42b33fa478b8639
         if: steps.check_backend.outputs.has_backend == 'true'
         with:
           go-version-file: go.mod

.github/workflows/deploy-storybook-preview.yml

@@ -32,7 +32,19 @@ jobs:
           persist-credentials: false
 
       - name: Setup Node.js
-        uses: ./.github/actions/setup-node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+
+      - name: Cache node_modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            node_modules
+          key: node_modules-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            node_modules-
 
       - name: Install dependencies
         env:

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

@@ -158,15 +158,13 @@ jobs:
 
       - id: 'auth'
         uses: 'google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f'
-        if: github.event.pull_request.head.repo.full_name == github.repository
         with:
           workload_identity_provider: projects/304398677251/locations/global/workloadIdentityPools/github/providers/github-provider
           service_account: github-plugins-data-levitate@grafanalabs-workload-identity.iam.gserviceaccount.com
           project_id: 'grafanalabs-global'
 
       - name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db'
-        if: github.event.pull_request.head.repo.full_name == github.repository
+        uses: 'google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a'
         with:
           version: '>= 363.0.0'
           project_id: 'grafanalabs-global'
@@ -177,7 +175,6 @@ jobs:
         run: ./scripts/check-breaking-changes.sh
         env:
           FORCE_COLOR: 3
-          IS_FORK: ${{ github.event.pull_request.head.repo.full_name != github.repository }} # used in check-breaking-changes.sh and levitate-parse-json-report.js
 
       - name: Persisting the check output
         run: |
@@ -202,7 +199,6 @@ jobs:
     permissions:
       contents: read
       id-token: write
-    if: github.event.pull_request.head.repo.full_name == github.repository
 
     steps:
       - id: get-secrets
@@ -271,7 +267,7 @@ jobs:
       # Comment on the PR
       - name: Comment on PR
         if: steps.levitate-run.outputs.exit_code == 1
-        uses: marocchino/sticky-pull-request-comment@773744901bac0e8cbb5a0dc842800d45e9b2b405
+        uses: marocchino/sticky-pull-request-comment@52423e01640425a022ef5fd42c6fb5f633a02728
         with:
           header: levitate-breaking-change-comment
           number: ${{ github.event.pull_request.number }}
@@ -288,7 +284,7 @@ jobs:
       # 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@773744901bac0e8cbb5a0dc842800d45e9b2b405
+        uses: marocchino/sticky-pull-request-comment@52423e01640425a022ef5fd42c6fb5f633a02728
         with:
           header: levitate-breaking-change-comment
           number: ${{ github.event.pull_request.number }}

.github/workflows/detect-plugin-extension-changes.yml

@@ -1,156 +0,0 @@
----
-name: Detect Plugin Extension Changes
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-permissions: {}
-
-on:
-  pull_request:
-    branches:
-      - 'main'
-    paths:
-      - 'packages/**'
-      - 'public/**'
-
-env:
-  # Space-separated list of keywords referring to plugin extensions
-  PLUGIN_EXTENSION_KEYWORDS: "usePluginLinks, usePluginComponent, usePluginComponents, usePluginFunctions, PluginExtensionPoints"
-
-jobs:
-  detect-plugin-extension-changes:
-    name: Detect Plugin Extension Changes
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
-    if: github.event.pull_request.head.repo.full_name == github.repository
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Check for plugin extension changes
-        id: check-changes
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const { execSync } = require('child_process');
-            const fs = require('fs');
-            
-            // Plugin extension keywords from environment
-            const keywords = process.env.PLUGIN_EXTENSION_KEYWORDS.split(',');
-            const baseSha = '${{ github.event.pull_request.base.sha }}';
-            const headSha = '${{ github.event.pull_request.head.sha }}';
-            
-            console.log('Checking for plugin extension changes...');
-            console.log('Keywords:', keywords);
-            
-            // Get changed files in packages/ and public/ directories
-            let changedFiles = [];
-            const diffOutput = execSync(
-              `git diff --name-only ${baseSha}...${headSha} -- packages/ public/`,
-              { encoding: 'utf8' }
-            ).trim();
-            
-            if (diffOutput) {
-              changedFiles = diffOutput.split('\n').filter(file => {
-                // Validate file path and ensure it's in target directories
-                return file.match(/^(packages\/|public\/)/) && 
-                        file.match(/^[a-zA-Z0-9._/-]+$/) && 
-                        fs.existsSync(file);
-              });
-            }
-            
-            console.log('Changed files to check:', changedFiles);
-            
-            // Check each file for plugin extension keywords
-            const filesWithChanges = new Set();
-            let hasPluginExtensionChanges = false;
-            
-            for (const file of changedFiles) {
-              try {
-                // Get the diff for this specific file
-                const fileDiff = execSync(
-                  `git diff ${baseSha}...${headSha} -- "${file}"`,
-                  { encoding: 'utf8' }
-                );
-                
-                // Check if any keywords are in the diff
-                for (const keyword of keywords) {
-                  if (fileDiff.includes(keyword)) {
-                    console.log(`Found ${keyword} in ${file}`);
-                    filesWithChanges.add(file);
-                    hasPluginExtensionChanges = true;
-                    break; // Found at least one keyword, move to next file
-                  }
-                }
-              } catch (error) {
-                console.log(`Error checking file ${file}:`, error.message);
-              }
-            }
-            
-            // Set outputs
-            const filesArray = Array.from(filesWithChanges);
-            const formattedFiles = filesArray.length > 0 
-              ? '`' + filesArray.join('`\\n- `') + '`'
-              : '';
-            
-            core.setOutput('plugin_extension_changes', hasPluginExtensionChanges.toString());
-            core.setOutput('formatted_changed_files', formattedFiles);
-
-            if (hasPluginExtensionChanges) {
-              console.log('The following files have changes that may affect plugin extensions:');
-              console.log(filesArray);
-            } else {
-              console.log('No changes detected in core Grafana extensions or extension points.');
-            }
-
-      - name: Send Slack Message via Payload
-        id: slack
-        if: steps.check-changes.outputs.plugin_extension_changes == 'true'
-        uses: grafana/shared-workflows/actions/send-slack-message@0941e3408fa4789fec9062c44a2a9e1832146ba6 #v2.0.1
-        with:
-          method: chat.postMessage
-          payload-templated: true
-          payload: |
-            {
-              "channel": "C031SLFH6G0",
-              "text": "Plugin Extension changes in core Grafana *PR:* <${{ github.event.pull_request.html_url }}|#${{ github.event.pull_request.number }} :information_source:",
-              "icon_emoji": ":grot:",
-              "username": "Plugin Extension Bot",
-              "blocks": [
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": "*Plugin Extensions:* possible changes to extension points in core Grafana."
-                  }
-                },
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": "*PR:* <${{ github.event.pull_request.html_url }}|#${{ github.event.pull_request.number }}>\n*Job:* <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|View Job>\n*Author:* ${{ github.event.pull_request.user.login }}"
-                  }
-                },
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": "*File(s) with changes:*\n- ${{ steps.check-changes.outputs.formatted_changed_files }}"
-                  }
-                },
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": "*What to do?*\nMake sure that:\n- All extension point ids start with `grafana/`\n- All extension point ids are exposed via <https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/pluginExtensions.ts#L183|the `PluginExtensionPoints` enum in grafana-data>\n- Core Grafana is not registering extensions to extension points offered by plugins"
-                  }
-                }
-              ]
-            } 

.github/workflows/e2e-dashboard-new-layouts.yml

@@ -0,0 +1,42 @@
+name: Run e2e for dashboardNewLayouts
+
+on:
+  pull_request:
+    branches:
+      - '**'
+    paths:
+      - 'e2e/dashboard-new-layouts/**'
+      - 'public/app/features/dashboard-scene/**'
+
+env:
+  ARCH: linux-amd64
+
+jobs:
+  dashboard-new-layouts-e2e:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    if: github.event.pull_request.draft == false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - name: Pin Go version to mod file
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+      - run: go version
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+      - name: Install dependencies
+        run: yarn install --immutable
+      - name: Build grafana
+        run: make build
+      - name: Install Cypress dependencies
+        uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f
+        with:
+          runTests: false
+      - name: Run dashboardNewLayouts e2e
+        run: yarn e2e:dashboard-new-layouts

.github/workflows/ephemeral-instances-pr-comment.yml

@@ -10,9 +10,9 @@ permissions: {}
 
 jobs:
   handle-ephemeral-instances:
-    if: ${{ github.repository_owner == 'grafana' && ((github.event.issue.pull_request && startsWith(github.event.comment.body, '/deploy-to-hg')) || github.event.action == 'closed') }}
+    if: ${{ github.event.issue.pull_request && (startsWith(github.event.comment.body, '/deploy-to-hg') || github.event.action == 'closed') && github.repository_owner == 'grafana' }}
     runs-on:
-      labels: ubuntu-x64-xlarge
+      labels: ubuntu-latest-16-cores
     continue-on-error: true
     permissions:
       # For commenting.

.github/workflows/feature-toggles-ci.yml

@@ -22,7 +22,7 @@ jobs:
           persist-credentials: false
 
       - name: Set up Go
-        uses: actions/setup-go@v5.5.0
+        uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
           cache: true

.github/workflows/frontend-lint.yml

@@ -16,7 +16,6 @@ jobs:
       contents: read
     outputs:
       changed: ${{ steps.detect-changes.outputs.frontend }}
-      prettier: ${{ steps.detect-changes.outputs.frontend == 'true' || steps.detect-changes.outputs.docs == 'true' }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -35,7 +34,7 @@ jobs:
       id-token: write
     # Run this workflow only for PRs from forks; if it gets merged into `main` or `release-*`,
     # the `lint-frontend-prettier-enterprise` workflow will run instead
-    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true && needs.detect-changes.outputs.prettier == 'true'
+    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true && needs.detect-changes.outputs.changed == 'true'
     name: Lint
     runs-on: ubuntu-latest
     steps:
@@ -56,7 +55,7 @@ jobs:
       contents: read
       id-token: write
     # Run this workflow for non-PR events (like pushes to `main` or `release-*`) OR for internal PRs (PRs not from forks)
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false && needs.detect-changes.outputs.prettier == 'true'
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false && needs.detect-changes.outputs.changed == 'true'
     name: Lint
     runs-on: ubuntu-latest
     steps:
@@ -120,14 +119,13 @@ jobs:
         github-app-name: 'grafana-ci-bot'
     - run: yarn install --immutable --check-cache
     - run: yarn run typecheck
-  lint-frontend-api-clients:
+  lint-frontend-betterer:
+    needs: detect-changes
     permissions:
       contents: read
       id-token: write
-    # Run this workflow only for PRs from forks; if it gets merged into `main` or `release-*`,
-    # the `lint-frontend-api-clients-enterprise` workflow will run instead
-    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true
-    name: Verify API clients
+    if: needs.detect-changes.outputs.changed == 'true'
+    name: Betterer
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -139,51 +137,4 @@ jobs:
         cache: 'yarn'
         cache-dependency-path: 'yarn.lock'
     - run: yarn install --immutable --check-cache
-    - name: Generate API clients
-      run: |
-        extract_error_message='ERROR! API client generation failed!'
-        yarn generate-apis || (echo "${extract_error_message}" && false)
-    - name: Verify generated clients
-      run: |
-        uncommited_error_message="ERROR! API client generation has not been committed. Please run 'yarn generate-apis', commit the changes and push again."
-        file_diff="$(git diff ':!conf')"
-        if [ -n "$file_diff" ]; then
-            echo "$file_diff"
-            echo "${uncommited_error_message}"
-            exit 1
-        fi
-  lint-frontend-api-clients-enterprise:
-    permissions:
-      contents: read
-      id-token: write
-    # Run this workflow for non-PR events (like pushes to `main` or `release-*`) OR for internal PRs (PRs not from forks)
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false
-    name: Verify API clients (enterprise)
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-    - uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-        cache: 'yarn'
-        cache-dependency-path: 'yarn.lock'
-    - name: Setup Enterprise
-      uses: ./.github/actions/setup-enterprise
-      with:
-        github-app-name: 'grafana-ci-bot'
-    - run: yarn install --immutable --check-cache
-    - name: Generate API clients
-      run: |
-        extract_error_message='ERROR! API client generation failed!'
-        yarn generate-apis || (echo "${extract_error_message}" && false)
-    - name: Verify generated clients
-      run: |
-        uncommited_error_message="ERROR! API client generation has not been committed. Please run 'yarn generate-apis', commit the changes and push again."
-        file_diff="$(git diff ':!conf')"
-        if [ -n "$file_diff" ]; then
-            echo "$file_diff"
-            echo "${uncommited_error_message}"
-            exit 1
-        fi
+    - run: yarn run betterer:ci

.github/workflows/frontend-perf-tests.yaml

@@ -1,133 +0,0 @@
-name: Frontend performance tests
-
-on:
-  schedule:
-    - cron: "0 * * * *" # Run hourly
-  workflow_dispatch: # Allow manual triggering
-
-jobs:
-  performance-tests:
-    permissions:
-      contents: read
-      id-token: write
-    runs-on: ubuntu-x64-large
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - id: get-secrets
-        uses: grafana/shared-workflows/actions/get-vault-secrets@62722333225a1fae03ae27a63d638f9bc2176edb #get-vault-secrets-v1.2.0
-        with:
-          repo_secrets: |
-            PROMETHEUS_URL=frontend_perf_tests:prometheus_push_url
-            PROMETHEUS_USER=frontend_perf_tests:prometheus_user
-            PROMETHEUS_TOKEN=frontend_perf_tests:prometheus_token
-            FSPERFBASELINE_USERNAME=frontend_perf_tests:fsperfbaseline_username
-            FSPERFBASELINE_PASSWORD=frontend_perf_tests:fsperfbaseline_password
-            FSPERF_USERNAME=frontend_perf_tests:fsperf_username
-            FSPERF_PASSWORD=frontend_perf_tests:fsperf_password
-
-      - name: Authenticate Docker
-        uses: grafana/shared-workflows/actions/login-to-gar@main
-        id: login-to-gar
-        with:
-          registry: 'us-docker.pkg.dev'
-
-      - name: Setup Node.js
-        uses: ./.github/actions/setup-node
-
-      - name: Yarn install
-        run: yarn install --immutable
-        env:
-          PUPPETEER_SKIP_DOWNLOAD: true
-          CYPRESS_INSTALL_BINARY: 0
-
-      - name: Install Playwright browsers
-        run: yarn playwright install chromium --with-deps
-
-      - name: Run Playwright tests (fsperfbaseline)
-        id: pw-fsperfbaseline
-        continue-on-error: true
-        env:
-          PLAYWRIGHT_JSON_OUTPUT_NAME: ./fsperfbaseline-pw-results.json
-          METRICS_OUTPUT_PATH: ./fsperfbaseline-metrics.txt
-          GRAFANA_URL: https://fsperfbaseline.grafana-dev.net
-          GRAFANA_ADMIN_USER: ${{ env.FSPERFBASELINE_USERNAME }}
-          GRAFANA_ADMIN_PASSWORD: ${{ env.FSPERFBASELINE_PASSWORD }}
-        run: yarn e2e:playwright --grep @performance --reporter json
-
-      - name: Run Playwright tests (fsperf)
-        id: pw-fsperf
-        continue-on-error: true
-        env:
-          PLAYWRIGHT_JSON_OUTPUT_NAME: ./fsperf-pw-results.json
-          METRICS_OUTPUT_PATH: ./fsperf-metrics.txt
-          GRAFANA_URL: https://fsperf.grafana-dev.net
-          GRAFANA_ADMIN_USER: ${{ env.FSPERF_USERNAME }}
-          GRAFANA_ADMIN_PASSWORD: ${{ env.FSPERF_PASSWORD }}
-        run: yarn e2e:playwright --grep @performance --reporter json
-
-      - name: Bench report (fsperfbaseline)
-        id: bench-fsperfbaseline
-        if: always()
-        continue-on-error: true
-        run: |
-          docker run \
-            --rm \
-            --volume="./fsperfbaseline-pw-results.json:/pw-results.json" \
-            --volume="./fsperfbaseline-metrics.txt:/metrics.txt" \
-            -e PROMETHEUS_URL="$PROMETHEUS_URL" \
-            -e PROMETHEUS_USER="$PROMETHEUS_USER" \
-            -e PROMETHEUS_PASSWORD="$PROMETHEUS_TOKEN" \
-            us-docker.pkg.dev/grafanalabs-global/docker-grafana-bench-prod/grafana-bench:v0.6.1 report \
-              --grafana-url "http://fsperfbaseline.grafana-dev.net" \
-              --test-suite-name "FrontendPerfTests" \
-              --report-input playwright \
-              --report-output log \
-              --prometheus-metrics \
-              --run-metrics-file "/metrics.txt" \
-              --log-level DEBUG \
-              /pw-results.json
-
-      - name: Bench report (fsperf)
-        id: bench-fsperf
-        if: always()
-        continue-on-error: true
-        run: |
-          docker run \
-            --rm \
-            --volume="./fsperf-pw-results.json:/pw-results.json" \
-            --volume="./fsperf-metrics.txt:/metrics.txt" \
-            -e PROMETHEUS_URL="$PROMETHEUS_URL" \
-            -e PROMETHEUS_USER="$PROMETHEUS_USER" \
-            -e PROMETHEUS_PASSWORD="$PROMETHEUS_TOKEN" \
-            us-docker.pkg.dev/grafanalabs-global/docker-grafana-bench-prod/grafana-bench:v0.6.1 report \
-              --grafana-url "http://fsperf.grafana-dev.net" \
-              --test-suite-name "FrontendPerfTests" \
-              --report-input playwright \
-              --report-output log \
-              --prometheus-metrics \
-              --run-metrics-file "/metrics.txt" \
-              --log-level DEBUG \
-              /pw-results.json
-
-      - name: Check status
-        env:
-          FSPERF_PW_OUTCOME: ${{ steps.pw-fsperf.outcome }}
-          FSPERF_PW_BASELINE_OUTCOME: ${{ steps.pw-fsperfbaseline.outcome }}
-          FSPERF_BENCH_OUTCOME: ${{ steps.bench-fsperf.outcome }}
-          FSPERF_BENCH_BASELINE_OUTCOME: ${{ steps.bench-fsperfbaseline.outcome }}
-
-        run: |
-          echo "FSPERF_PW_OUTCOME: $FSPERF_PW_OUTCOME"
-          echo "FSPERF_PW_BASELINE_OUTCOME: $FSPERF_PW_BASELINE_OUTCOME"
-          echo "FSPERF_BENCH_OUTCOME: $FSPERF_BENCH_OUTCOME"
-          echo "FSPERF_BENCH_BASELINE_OUTCOME: $FSPERF_BENCH_BASELINE_OUTCOME"
-
-          if [[ "$FSPERF_PW_OUTCOME" != "success" || "$FSPERF_PW_BASELINE_OUTCOME" != "success" || "$FSPERF_BENCH_OUTCOME" != "success" || "$FSPERF_BENCH_BASELINE_OUTCOME" != "success" ]]; then
-            echo "One or more test steps failed."
-            exit 1
-          fi

.github/workflows/go-lint.yml

@@ -13,56 +13,13 @@ permissions:
   contents: read
 
 jobs:
-  detect-changes:
-    # Run on `grafana/grafana` main branch, or on pull requests to prevent double-running on mirrors
-    if: (github.event_name == 'pull_request' || (github.event_name == 'push' && github.repository == 'grafana/grafana'))
-    name: Detect whether code changed
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    outputs:
-      changed: ${{ steps.detect-changes.outputs.backend }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: true # required to get more history in the changed-files action
-          fetch-depth: 2
-      - name: Detect changes
-        id: detect-changes
-        uses: ./.github/actions/change-detection
-        with:
-          self: .github/workflows/go-lint.yml
-
-  go-fmt:
-    needs: detect-changes
-    if: needs.detect-changes.outputs.changed == 'true'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - uses: actions/setup-go@v5.5.0
-        with:
-          go-version-file: ./go.mod
-      - name: Run gofmt
-        run: |
-          GOFMT="$(go list -m -f '{{.Dir}}' | xargs -I{} sh -c 'test ! -f {}/.nolint && echo {}' | xargs gofmt -s -e -l 2>&1 | grep -v '/pkg/build/' || true)"
-          if [ -n "$GOFMT" ]; then
-            echo "Found files that are not gofmt'ed"
-            echo "Run 'gofmt -s -w .' or 'make gofmt' or install the pre-commit hook with 'make lefthook-install'"
-            echo "${GOFMT}"
-            exit 1
-          fi
-
   lint-go:
-    needs: detect-changes
-    if: needs.detect-changes.outputs.changed == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: actions/setup-go@v5.5.0
+      - uses: actions/setup-go@v5
         with:
           go-version-file: ./go.mod
       - name: golangci-lint

.github/workflows/i18n-crowdin-download.yml

@@ -7,7 +7,6 @@ on:
 
 jobs:
   download-sources-from-crowdin:
-    if: github.repository == 'grafana/grafana'
     uses: grafana/grafana-github-actions/.github/workflows/crowdin-download.yml@main
     with:
       crowdin_project_id: 5

.github/workflows/i18n-crowdin-upload.yml

@@ -14,7 +14,6 @@ on:
 
 jobs:
   upload-sources-to-crowdin:
-    if: github.repository == 'grafana/grafana'
     uses: grafana/grafana-github-actions/.github/workflows/crowdin-upload.yml@main
     with:
       crowdin_project_id: 5

.github/workflows/i18n-verify.yml

@@ -12,6 +12,4 @@ on:
 
 jobs:
   verify-i18n:
-    # Run on `grafana/grafana` main branch, or on pull requests to prevent double-running on mirrors
-    if: (github.event_name == 'pull_request' || (github.event_name == 'push' && github.repository == 'grafana/grafana'))
     uses: grafana/grafana-github-actions/.github/workflows/verify-i18n.yml@main

.github/workflows/issue-opened.yml

@@ -39,7 +39,7 @@ jobs:
 
       - name: "Get vault secrets"
         id: vault-secrets
-        uses: grafana/shared-workflows/actions/get-vault-secrets@get-vault-secrets/v1.2.1 # zizmor: ignore[unpinned-uses]
+        uses: grafana/shared-workflows/actions/get-vault-secrets@main # zizmor: ignore[unpinned-uses]
         with:
           # Secrets placed in the ci/repo/grafana/grafana/plugins_platform_issue_commands_github_bot path in Vault
           repo_secrets: |
@@ -48,11 +48,10 @@ jobs:
 
       - name: Generate token
         id: generate_token
-        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+        uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
         with:
           app-id: ${{ env.GITHUB_APP_ID }}
           private-key: ${{ env.GITHUB_APP_PRIVATE_KEY }}
-          permission-issues: write
 
       - name: Run Commands
         uses: ./actions/commands
@@ -65,13 +64,13 @@ jobs:
     permissions:
       contents: read
       id-token: write
-    if: github.repository == 'grafana/grafana'
+    if: github.repository == 'grafana/grafana' && github.event.issue.author_association != 'MEMBER' && github.event.issue.author_association != 'OWNER'
     runs-on: ubuntu-latest
     steps:
 
       - name: "Get vault secrets"
         id: vault-secrets
-        uses: grafana/shared-workflows/actions/get-vault-secrets@get-vault-secrets/v1.2.1 # zizmor: ignore[unpinned-uses]
+        uses: grafana/shared-workflows/actions/get-vault-secrets@main # zizmor: ignore[unpinned-uses]
         with:
           # Secrets placed in the ci/repo/grafana/grafana/plugins_platform_issue_triager path in Vault
           repo_secrets: |
@@ -82,29 +81,18 @@ jobs:
 
       - name: Generate token
         id: generate_token
-        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+        uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
         with:
           app-id: ${{ env.GITHUB_APP_ID }}
           private-key: ${{ env.GITHUB_APP_PRIVATE_KEY }}
-          permission-members: read
-          permission-issues: write
-      - name: Check if member of grafana org
-        id: check-if-grafana-org-member
-        continue-on-error: true
-        run: gh api https://api.github.com/orgs/grafana/members/${{ env.ACTOR }} >/dev/null 2>&1 && echo "is_grafana_org_member=true" >> "$GITHUB_OUTPUT"
-        env:
-            GH_TOKEN: ${{ steps.generate_token.outputs.token }}
-            ACTOR: ${{ github.actor }}
+
       - name: Checkout
-        if: steps.check-if-grafana-org-member.outputs.is_grafana_org_member != 'true' && github.event.issue.author_association != 'MEMBER' && github.event.issue.author_association != 'OWNER'
         uses: actions/checkout@v4 # v4.2.2
         with:
           persist-credentials: false
-          sparse-checkout: |
-            .github/workflows/auto-triager
+
       - name: Send issue to the auto triager action
         id: auto_triage
-        if: steps.check-if-grafana-org-member.outputs.is_grafana_org_member != 'true' && github.event.issue.author_association != 'MEMBER' && github.event.issue.author_association != 'OWNER'
         uses: grafana/auto-triager@main # zizmor: ignore[unpinned-uses]
         with:
           token: ${{ steps.generate_token.outputs.token }}
@@ -129,41 +117,3 @@ jobs:
             }
         env:
           SLACK_WEBHOOK_URL:  ${{ env.AUTOTRIAGER_SLACK_WEBHOOK_URL }}
-  auto-label-internal-issues:
-    needs: [main]
-    if: github.repository == 'grafana/grafana'
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      id-token: write
-    steps:
-        - name: "Get vault secrets"
-          id: vault-secrets
-          uses: grafana/shared-workflows/actions/get-vault-secrets@get-vault-secrets/v1.2.1 # zizmor: ignore[unpinned-uses]
-          with:
-            # Secrets placed in the ci/repo/grafana/grafana/plugins_platform_issue_triager path in Vault
-            repo_secrets: |
-              GITHUB_APP_ID=plugins_platform_issue_triager_github_bot:app_id
-              GITHUB_APP_PRIVATE_KEY=plugins_platform_issue_triager_github_bot:app_pem  
-        - name: Generate token
-          id: generate_token
-          uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
-          with:
-            app-id: ${{ env.GITHUB_APP_ID }}
-            private-key: ${{ env.GITHUB_APP_PRIVATE_KEY }}
-            permission-members: read
-        - name: Check if member of grafana org
-          id: check-if-grafana-org-member
-          continue-on-error: true
-          run: gh api https://api.github.com/orgs/grafana/members/${{ env.ACTOR }} >/dev/null 2>&1 && echo "is_grafana_org_member=true" >> "$GITHUB_OUTPUT"
-          env:
-              GH_TOKEN: ${{ steps.generate_token.outputs.token }}
-              ACTOR: ${{ github.actor }}
-        - name: "Auto label internal issues"
-          if:  steps.check-if-grafana-org-member.outputs.is_grafana_org_member == 'true' || github.event.issue.author_association == 'MEMBER' || github.event.issue.author_association == 'OWNER'
-          run: gh issue edit "$NUMBER" --add-label "$LABELS"
-          env:
-            GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            GH_REPO: ${{ github.repository }}
-            NUMBER: ${{ github.event.issue.number }}
-            LABELS: internal

.github/workflows/lint-build-docs.yml

@@ -20,8 +20,6 @@ permissions: {}
 
 jobs:
   docs:
-    # Run on `grafana/grafana` main branch, or on pull requests to prevent double-running on mirrors
-    if: (github.event_name == 'pull_request' || (github.event_name == 'push' && github.repository == 'grafana/grafana'))
     name: Build & Verify Docs
     runs-on: ubuntu-latest
 

.github/workflows/pr-dependabot-update-go-workspace.yml

@@ -17,7 +17,7 @@ permissions:
 jobs:
   update:
     runs-on: "ubuntu-latest"
-    if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' && github.event.pull_request.head.repo.full_name == github.repository }}
+    if: ${{ github.actor == 'dependabot[bot]' && github.event.pull_request.head.repo.full_name == github.repository }}
     continue-on-error: true
     steps:
     - name: Retrieve GitHub App secrets
@@ -45,7 +45,7 @@ jobs:
         persist-credentials: false
 
     - name: Set go version
-      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
+      uses: actions/setup-go@19bb51245e9c80abacb2e91cc42b33fa478b8639
       with:
         go-version-file: go.mod
 

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

@@ -7,28 +7,20 @@ on:
       - main
       - release-*.*.*
 
-# TODO: re-enable this before merging
-# concurrency:
-#   group: ${{ github.workflow }}-${{ github.ref }}
-#   cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
 
 permissions: {}
 
-env:
-  ACTIONS_STEP_DEBUG: true
-  RUNNER_DEBUG: 1
-
 jobs:
   detect-changes:
-    # Run on `grafana/grafana` main branch, or on pull requests to prevent double-running on mirrors
-    if: (github.event_name == 'pull_request' || (github.event_name == 'push' && github.repository == 'grafana/grafana'))
     name: Detect whether code changed
     runs-on: ubuntu-latest
     permissions:
       contents: read
     outputs:
       changed: ${{ steps.detect-changes.outputs.e2e }}
-      cloud_plugins_changed: ${{ steps.detect-changes.outputs.e2e-cloud-plugins }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -47,67 +39,27 @@ jobs:
     runs-on: ubuntu-latest-16-cores
     permissions:
       contents: read
+    outputs:
+      artifact: ${{ steps.artifact.outputs.artifact }}
     steps:
       - uses: actions/checkout@v4
         with:
+          path: ./grafana
           persist-credentials: false
-
-      # TODO: add a cleanup workflow to remove the cache when the PR is closed
-      # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#force-deletion-of-caches-overriding-default-cache-eviction-policy
-      # TODO: maybe we could just use the cache to store the build, instead of uploading as an artifact?
-      - uses: actions/cache@v4
-        id: cache
+      - uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
         with:
-          key: "build-grafana-${{ runner.os }}-${{ hashFiles('yarn.lock', 'public/*',  'packages/*', 'conf/*', 'pkg/**/*.go', '**/go.mod', '**/go.sum', '!**_test.go', '!**.test.ts', '!**.test.tsx', 'Dockerfile') }}"
-          path: |
-            build-dir
-
-      # If no cache hit, build Grafana
-      - name: Build Grafana
-        if: steps.cache.outputs.cache-hit != 'true'
-        uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
-        with:
-          version: 0.18.8
           verb: run
-          args: go run ./pkg/build/cmd artifacts -a targz:grafana:linux/amd64 -a docker:grafana:linux/amd64 --grafana-dir="${PWD}" > out.txt
-      - name: Cat built artifact
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: cat out.txt
-      - name: Move built artifacts
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          mkdir -p build-dir
-          mv "$(grep 'grafana_.*tar.gz$' out.txt | grep -Fv -m1 'docker')" build-dir/grafana.tar.gz
-          mv "$(grep 'grafana_.*docker.tar.gz$' out.txt)" build-dir/grafana.docker.tar.gz
-
-      # If cache hit, validate the artifact is present
-      - name: Validate artifact
-        if: steps.cache.outputs.cache-hit == 'true'
-        run: |
-          if [ ! -f build-dir/grafana.tar.gz ]; then
-            echo "Error: build-dir/grafana.tar.gz not found in cache"
-            exit 1
-          fi
-
-      - name: Set artifact name
-        run: echo "artifact=grafana-server-${{github.run_number}}" >> "$GITHUB_OUTPUT"
+          args: go -C grafana run ./pkg/build/cmd artifacts -a targz:grafana:linux/amd64 --grafana-dir="${PWD}/grafana" > out.txt
+      - run: mv "$(cat out.txt)" grafana.tar.gz
+      - run: echo "artifact=grafana-e2e-${{github.run_number}}" >> "$GITHUB_OUTPUT"
         id: artifact
-
-      - name: Upload grafana.tar.gz
-        uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4
+        id: upload
         with:
           retention-days: 1
-          name: grafana-tar-gz
-          path: build-dir/grafana.tar.gz
+          name: ${{ steps.artifact.outputs.artifact }}
+          path: grafana.tar.gz
 
-      - name: Upload grafana docker tarball
-        uses: actions/upload-artifact@v4
-        with:
-          retention-days: 1
-          name: grafana-docker-tar-gz
-          path: build-dir/grafana.docker.tar.gz
-
-  # TODO: we won't need this when we only have playwright
   build-e2e-runner:
     needs: detect-changes
     if: needs.detect-changes.outputs.changed == 'true'
@@ -122,7 +74,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Setup Go
-        uses: actions/setup-go@v5.5.0
+        uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
           cache: ${{ !github.event.pull_request.head.repo.fork }}
@@ -140,66 +92,6 @@ jobs:
           name: ${{ steps.artifact.outputs.artifact }}
           path: e2e-runner
 
-  push-docker-image:
-    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
-    permissions:
-      contents: read
-      id-token: write
-    runs-on: ubuntu-latest
-    needs:
-      - build-grafana
-    steps:
-      - id: vault-secrets
-        uses: grafana/shared-workflows/actions/get-vault-secrets@main
-        with:
-          repo_secrets: |
-            GRAFANA_DELIVERY_BOT_APP_PEM=delivery-bot-app:PRIVATE_KEY
-      - name: Generate token
-        id: generate_token
-        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
-        with:
-          app_id: ${{ vars.DELIVERY_BOT_APP_ID }}
-          private_key: ${{ env.GRAFANA_DELIVERY_BOT_APP_PEM }}
-          repositories: '["grafana"]'
-          permissions: '{"checks": "write"}'
-      - uses: grafana/shared-workflows/actions/login-to-gar@main
-        id: login-to-gar
-        with:
-          registry: 'us-docker.pkg.dev'
-          environment: 'dev'
-      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
-        with:
-          name: grafana-docker-tar-gz
-          path: .
-      - name: Load & Push Docker image
-        env:
-          BUILD_ID: ${{ github.run_id }}
-        run: |
-          set -euo pipefail
-          LOADED_IMAGE_NAME=$(docker load -i grafana.docker.tar.gz | sed 's/Loaded image: //g')
-          VERSION=$(echo "${LOADED_IMAGE_NAME}" | cut -d ':' -f 2 | cut -d '-' -f 1)
-          DOCKER_IMAGE="us-docker.pkg.dev/grafanalabs-dev/docker-grafana-dev/grafana:${VERSION}-${BUILD_ID}"
-          docker tag "${LOADED_IMAGE_NAME}" "${DOCKER_IMAGE}"
-          docker push "${DOCKER_IMAGE}"
-          echo "IMAGE=${DOCKER_IMAGE}" >> "$GITHUB_ENV"
-      - name: Add PR status check
-        env:
-          GH_TOKEN: ${{ steps.generate_token.outputs.token }}
-          SHA: ${{ github.event.pull_request.head.sha }}
-        run: |
-          gh api \
-            --method POST \
-            -H "Accept: application/vnd.github+json" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            /repos/grafana/grafana/check-runs \
-           -f "name=${IMAGE}" \
-           -f "head_sha=${SHA}" \
-           -f 'status=completed' \
-           -f 'conclusion=neutral' \
-           -f 'output[title]=Docker image' \
-           -f "output[summary]=${IMAGE}" \
-           -f "output[text]=${IMAGE}"
-
   run-e2e-tests:
     needs:
       - build-grafana
@@ -210,6 +102,12 @@ jobs:
         include:
           - suite: various-suite
             path: e2e/various-suite
+          - suite: dashboards-suite
+            path: e2e/dashboards-suite
+          - suite: smoke-tests-suite
+            path: e2e/smoke-tests-suite
+          - suite: panels-suite
+            path: e2e/panels-suite
           - suite: various-suite (old arch)
             path: e2e/old-arch/various-suite
             flags: --flags="--env dashboardScene=false"
@@ -233,7 +131,7 @@ jobs:
           persist-credentials: false
       - uses: actions/download-artifact@v4
         with:
-          name: grafana-tar-gz
+          name: ${{ needs.build-grafana.outputs.artifact }}
       - uses: actions/download-artifact@v4
         with:
           name: ${{ needs.build-e2e-runner.outputs.artifact }}
@@ -242,7 +140,6 @@ jobs:
       - name: Run E2E tests
         uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
         with:
-          version: 0.18.8
           verb: run
           args: go run ./pkg/build/e2e --package=grafana.tar.gz
             --suite=${{ matrix.path }}
@@ -262,221 +159,6 @@ jobs:
           path: videos
           retention-days: 1
 
-  run-storybook-test:
-    name: Verify Storybook (Playwright)
-    runs-on: ubuntu-latest
-    needs: detect-changes
-    if: needs.detect-changes.outputs.changed == 'true'
-    permissions:
-      contents: read
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-
-      - name: Install dependencies
-        run: yarn install --immutable
-
-      - name: Install Playwright browsers
-        run: npx playwright install --with-deps
-
-      - name: Run Storybook and E2E tests
-        run: yarn e2e:playwright:storybook
-
-  run-playwright-tests:
-    needs:
-      - build-grafana
-    name: Playwright E2E tests (${{ matrix.shard }}/${{ matrix.shardTotal }})
-    runs-on: ubuntu-latest-8-cores
-    permissions:
-      contents: read
-
-    strategy:
-      fail-fast: false
-      matrix:
-        shard: [1, 2, 3, 4, 5, 6, 7, 8]
-        shardTotal: [8]
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - uses: actions/download-artifact@v4
-        with:
-          name: grafana-tar-gz
-      - name: Run E2E tests
-        uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
-        with:
-          version: 0.18.8
-          verb: run
-          args: go run ./pkg/build/e2e-playwright --package=grafana.tar.gz --shard=${{ matrix.shard }}/${{ matrix.shardTotal }} --blob-dir=./blob-report
-      - uses: actions/upload-artifact@v4
-        if: success() || failure()
-        with:
-          name: playwright-blob-${{ github.run_number }}-${{ matrix.shard }}
-          path: ./blob-report
-          retention-days: 1
-
-  run-azure-monitor-e2e:
-    if: needs.detect-changes.outputs.cloud_plugins_changed == 'true' && github.event.pull_request.head.repo.fork == false
-    runs-on: ubuntu-x64-large
-    needs:
-      - build-grafana
-      - detect-changes
-    permissions:
-      contents: read
-      id-token: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - uses: grafana/shared-workflows/actions/login-to-gar@login-to-gar-v0.4.0
-        id: login-to-gar
-        with:
-          registry: "us-docker.pkg.dev"
-          environment: "dev"
-
-      - id: pull-docker-image
-        run: |
-          docker pull us-docker.pkg.dev/grafanalabs-dev/docker-oss-plugin-partnerships-dev/e2e-playwright:latest
-
-      - id: vault-secrets
-        uses: grafana/shared-workflows/actions/get-vault-secrets@main
-        with:
-          repo_secrets: |
-            AZURE_SP_APP_ID=cpp-azure-resourcemanager-credentials:application_id
-            AZURE_SP_PASSWORD=cpp-azure-resourcemanager-credentials:application_secret
-            AZURE_TENANT=cpp-azure-resourcemanager-credentials:tenant_id
-
-      - id: deploy-resources
-        env:
-          AZURE_SP_APP_ID: ${{ env.AZURE_SP_APP_ID}}
-          AZURE_SP_PASSWORD: ${{ env.AZURE_SP_PASSWORD}}
-          AZURE_TENANT: ${{ env.AZURE_TENANT }}
-          NAME: ${{ github.ref_name }}
-        run: |
-          docker container run --name cpp-e2e-deploy -e AZURE_SP_APP_ID -e AZURE_SP_PASSWORD -e AZURE_TENANT -e PLAYWRIGHT_CI=true us-docker.pkg.dev/grafanalabs-dev/docker-oss-plugin-partnerships-dev/e2e-playwright:latest ./cpp-e2e/scripts/ci-run-playwright.sh azure "${NAME}" deploy
-
-      - id: extract-creds
-        # see https://github.com/grafana/oss-plugin-partnerships/blob/a77040d0456003cd258668b61d542dc7c75db5b5/e2e/scripts/deploy.sh#L25 for path
-        run: |
-          docker cp cpp-e2e-deploy:/outputs.json /tmp/outputs.json
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: grafana-tar-gz
-
-      - name: Run E2E tests
-        uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
-        with:
-          version: 0.18.8
-          verb: run
-          args: go run ./pkg/build/e2e-playwright --package=grafana.tar.gz --playwright-command="yarn e2e:playwright:cloud-plugins" --cloud-plugin-creds=/tmp/outputs.json
-
-      - name: Destroy resources
-        if: always() && steps.deploy-resources.outcome == 'success'
-        env:
-          AZURE_SP_APP_ID: ${{ env.AZURE_SP_APP_ID }}
-          AZURE_SP_PASSWORD: ${{ env.AZURE_SP_PASSWORD }}
-          AZURE_TENANT: ${{ env.AZURE_TENANT }}
-          NAME: ${{ github.ref_name }}
-        run: |
-          docker container run --name cpp-e2e-destroy -e AZURE_SP_APP_ID -e AZURE_SP_PASSWORD -e AZURE_TENANT us-docker.pkg.dev/grafanalabs-dev/docker-oss-plugin-partnerships-dev/e2e-playwright:latest ./cpp-e2e/scripts/ci-run-playwright.sh azure "${NAME}" destroy
-
-  required-playwright-tests:
-    needs:
-      - run-playwright-tests
-      - run-azure-monitor-e2e
-      - run-storybook-test
-      - build-grafana
-    if: ${{ !cancelled() }}
-    name: All Playwright tests complete
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-
-      - name: Download blob reports from GitHub Actions Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: blobs
-          pattern: playwright-blob-*
-          merge-multiple: true
-
-      - name: Check blob reports
-        run: |
-          if [ ! "$(ls -A ./blobs)" ]; then
-            echo "Error: No blob reports found in ./blobs directory"
-            echo "Did the Playwright tests run at all?"
-            exit 1
-          fi
-          echo "Found blob reports in ./blobs:"
-          ls -lah ./blobs
-
-      - name: Merge into HTML Report
-        run: npx playwright merge-reports --reporter html ./blobs
-
-      - name: Merge into JSON Report
-        env:
-          PLAYWRIGHT_JSON_OUTPUT_NAME: /tmp/playwright-results.json
-        run: npx playwright merge-reports --reporter=json ./blobs
-
-      - name: Bench report
-        run: |
-          docker run --rm \
-            --volume="/tmp/playwright-results.json:/home/bench/tests/playwright-results.json" \
-            us-docker.pkg.dev/grafanalabs-global/docker-grafana-bench-prod/grafana-bench:v0.5.1 report \
-              --grafana-url "http://localhost:3000" \
-              --grafana-version "CI- ${{ github.sha }}" \
-              --test-suite-name "FrontendCore" \
-              --report-input playwright \
-              --report-output log \
-              --log-level DEBUG \
-              /home/bench/tests/playwright-results.json
-
-      - name: Upload HTML report
-        id: upload-html
-        uses: actions/upload-artifact@v4
-        with:
-          name: playwright-html-${{ github.run_number }}
-          path: playwright-report
-          retention-days: 7
-
-      - name: Check test suites
-        id: check-jobs
-        uses: ./.github/actions/check-jobs
-        continue-on-error: true # Failure will be reported on Show test results step
-        with:
-          needs: ${{ toJson(needs) }}
-          failure-message: "One or more E2E test suites have failed"
-          success-message: "All E2E test suites completed successfully"
-
-      - name: Show test results
-        env:
-          FAILED: ${{ steps.check-jobs.outputs.any-failed }}
-          REPORT_URL: ${{ steps.upload-html.outputs.artifact-url }}
-        # sed removes the leading `../../src/` from the paths
-        run: |
-          npx playwright merge-reports --reporter list ./blobs | sed 's|\(\.\./\)\{1,\}src/|/|g'
-          if [ "$FAILED" = "true" ]; then
-            echo ""
-            echo "Download the test report from $REPORT_URL"
-            exit 1
-          fi
-
   run-a11y-test:
     needs:
       - build-grafana
@@ -491,63 +173,19 @@ jobs:
           persist-credentials: false
       - uses: actions/download-artifact@v4
         with:
-          name: grafana-tar-gz
+          name: ${{ needs.build-grafana.outputs.artifact }}
       - name: Run PR a11y test
         if: github.event_name == 'pull_request'
         uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
         with:
-          version: 0.18.8
           verb: run
           args: go run ./pkg/build/a11y --package=grafana.tar.gz
       - name: Run non-PR a11y test
         if: github.event_name != 'pull_request'
         uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
         with:
-          version: 0.18.8
           verb: run
-          args: go run ./pkg/build/a11y --package=grafana.tar.gz --no-threshold-fail --results=./pa11y-ci-results.json
-      - name: Upload pa11y results
-        if: github.event_name != 'pull_request'
-        uses: actions/upload-artifact@v4
-        with:
-          retention-days: 1
-          name: pa11y-ci-results
-          path: pa11y-ci-results.json
-
-  publish-metrics:
-    needs:
-      - run-a11y-test
-    name: Publish metrics
-    # Run on `grafana/grafana` main branch only
-    if: github.event_name == 'push' && github.repository == 'grafana/grafana' && github.ref_name == 'main'
-    permissions:
-      contents: read
-      id-token: write
-    runs-on: ubuntu-latest
-    steps:
-      - id: vault-secrets
-        uses: grafana/shared-workflows/actions/get-vault-secrets@main
-        with:
-          repo_secrets: |
-            GRAFANA_MISC_STATS_API_KEY=grafana-misc-stats:api_key
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-      - name: Install dependencies
-        run: yarn install --immutable
-      - name: Get pa11y results
-        uses: actions/download-artifact@v4
-        with:
-          name: pa11y-ci-results
-      - name: Extract and publish metrics
-        run: ./scripts/ci-frontend-metrics.sh | node --experimental-strip-types .github/workflows/scripts/publish-frontend-metrics.mts
-        env:
-          GRAFANA_MISC_STATS_API_KEY: ${{ env.GRAFANA_MISC_STATS_API_KEY}}
+          args: go run ./pkg/build/a11y --package=grafana.tar.gz --no-threshold-fail
 
   # This is the job that is actually required by rulesets.
   # We want to only require one job instead of all the individual tests.
@@ -555,7 +193,6 @@ jobs:
   required-e2e-tests:
     needs:
       - run-e2e-tests
-      - build-grafana
       # a11y test is not listed on purpose: it is not an important E2E test.
       # It is also totally fine to fail right now.
     # always() is the best function here.
@@ -566,13 +203,13 @@ jobs:
     name: All E2E tests complete
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
       - name: Check test suites
-        uses: ./.github/actions/check-jobs
-        with:
-          needs: ${{ toJson(needs) }}
-          failure-message: "One or more E2E test suites have failed"
-          success-message: "All E2E test suites completed successfully"
+        env:
+          NEEDS: ${{ toJson(needs) }}
+        run: |
+          FAILURES="$(echo "$NEEDS" | jq 'with_entries(select(.value.result == "failure")) | map_values(.result)')"
+          echo "$FAILURES"
+          if [ "$(echo "$FAILURES" | jq '. | length')" != "0" ]; then
+            exit 1
+          fi
+          echo "All OK!"

.github/workflows/pr-frontend-unit-tests.yml

@@ -10,10 +10,8 @@ permissions: {}
 
 jobs:
   detect-changes:
-    # Run on `grafana/grafana` main branch, or on pull requests to prevent double-running on mirrors
-    if: (github.event_name == 'pull_request' || (github.event_name == 'push' && github.repository == 'grafana/grafana'))
     name: Detect whether code changed
-    runs-on: ubuntu-x64-small
+    runs-on: ubuntu-latest
     permissions:
       contents: read
     outputs:
@@ -33,114 +31,64 @@ jobs:
     permissions:
       contents: read
       id-token: write
-    needs:
-      - detect-changes
     # Run this workflow only for PRs from forks; if it gets merged into `main` or `release-*`,
     # the `frontend-unit-tests-enterprise` workflow will run instead
+    needs: detect-changes
     if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true && needs.detect-changes.outputs.changed == 'true'
-    runs-on: ubuntu-x64-large
-    name: "Unit tests (${{ matrix.shard }} / ${{ matrix.total }})"
+    runs-on: ubuntu-latest-8-cores
+    name: "Unit tests (${{ matrix.chunk }} / 8)"
     strategy:
       fail-fast: false
       matrix:
-        shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
-        total: [16]
+        chunk: [1, 2, 3, 4, 5, 6, 7, 8]
     steps:
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
-    - name: Setup Node.js
-      uses: ./.github/actions/setup-node
-    - name: Yarn install
-      run: yarn install --immutable
-      env:
-        PUPPETEER_SKIP_DOWNLOAD: true
-        CYPRESS_INSTALL_BINARY: 0
+    - uses: actions/setup-node@v4
+      with:
+        node-version-file: '.nvmrc'
+        cache: 'yarn'
+        cache-dependency-path: 'yarn.lock'
+    - run: yarn install --immutable --check-cache
     - run: yarn run test:ci
       env:
-        TEST_MAX_WORKERS: 4
-        TEST_SHARD: ${{ matrix.shard }}
-        TEST_SHARD_TOTAL: ${{ matrix.total }}
+        TEST_MAX_WORKERS: 2
+        TEST_SHARD: ${{ matrix.chunk }}
+        TEST_SHARD_TOTAL: 8
 
   frontend-unit-tests-enterprise:
     permissions:
       contents: read
       id-token: write
-    needs:
-      - detect-changes
     # Run this workflow for non-PR events (like pushes to `main` or `release-*`) OR for internal PRs (PRs not from forks)
+    needs: detect-changes
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false && needs.detect-changes.outputs.changed == 'true'
-    runs-on: ubuntu-x64-large
-    name: "Unit tests (${{ matrix.shard }} / ${{ matrix.total }})"
+    runs-on: ubuntu-latest-8-cores
+    name: "Unit tests (${{ matrix.chunk }} / 8)"
     strategy:
       fail-fast: false
       matrix:
-        shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
-        total: [16]
+        chunk: [1, 2, 3, 4, 5, 6, 7, 8]
     steps:
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
+    - uses: actions/setup-node@v4
+      with:
+        node-version-file: '.nvmrc'
+        cache: 'yarn'
+        cache-dependency-path: 'yarn.lock'
     - name: Setup Enterprise
       uses: ./.github/actions/setup-enterprise
       with:
         github-app-name: 'grafana-ci-bot'
-    - name: Setup Node.js
-      uses: ./.github/actions/setup-node
-    - name: Yarn install
-      run: yarn install --immutable
-      env:
-        # Switch from default hardened mode to faster mode for internal PRs
-        YARN_ENABLE_HARDENED_MODE: ${{ github.event.pull_request.head.repo.fork == false && '1' || '0' }}
-        PUPPETEER_SKIP_DOWNLOAD: true
-        CYPRESS_INSTALL_BINARY: 0
+    - run: yarn install --immutable --check-cache
     - run: yarn run test:ci
       env:
-        TEST_MAX_WORKERS: 4
-        TEST_SHARD: ${{ matrix.shard }}
-        TEST_SHARD_TOTAL: ${{ matrix.total }}
-
-  frontend-decoupled-plugin-tests:
-    needs:
-      - detect-changes
-    if: needs.detect-changes.outputs.changed == 'true'
-    runs-on: ubuntu-x64-large
-    name: "Decoupled plugin tests"
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-    - name: Setup Node.js
-      uses: ./.github/actions/setup-node
-    - name: Yarn install
-      run: yarn install --immutable
-      env:
-        # Switch from default hardened mode to faster mode for internal PRs
-        YARN_ENABLE_HARDENED_MODE: ${{ github.event.pull_request.head.repo.fork == false && '1' || '0' }}
-        PUPPETEER_SKIP_DOWNLOAD: true
-        CYPRESS_INSTALL_BINARY: 0
-    - run: yarn run plugin:test:ci
-
-  frontend-packages-unit-tests:
-    needs:
-      - detect-changes
-    if: needs.detect-changes.outputs.changed == 'true'
-    runs-on: ubuntu-x64-large
-    name: "Packages unit tests"
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-    - name: Setup Node.js
-      uses: ./.github/actions/setup-node
-    - name: Yarn install
-      run: yarn install --immutable
-      env:
-        # Switch from default hardened mode to faster mode for internal PRs
-        YARN_ENABLE_HARDENED_MODE: ${{ github.event.pull_request.head.repo.fork == false && '1' || '0' }}
-        PUPPETEER_SKIP_DOWNLOAD: true
-        CYPRESS_INSTALL_BINARY: 0
-    - run: yarn run packages:test:ci
+        TEST_MAX_WORKERS: 2
+        TEST_SHARD: ${{ matrix.chunk }}
+        TEST_SHARD_TOTAL: 8
 
   # This is the job that is actually required by rulesets.
   # We need to require EITHER the OSS or the Enterprise job to pass.
@@ -150,22 +98,21 @@ jobs:
     needs:
       - frontend-unit-tests
       - frontend-unit-tests-enterprise
-      - frontend-decoupled-plugin-tests
-      - frontend-packages-unit-tests
     # always() is the best function here.
     # success() || failure() will skip this function if any need is also skipped.
     # That means conditional test suites will fail the entire requirement check.
     if: always()
 
     name: All frontend unit tests complete
-    runs-on: ubuntu-x64-small
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - name: Check test suites
-        uses: ./.github/actions/check-jobs
-        with:
-          needs: ${{ toJson(needs) }}
-          failure-message: "One or more unit test jobs have failed"
-          success-message: "All unit tests completed successfully"
+        env:
+          NEEDS: ${{ toJson(needs) }}
+        run: |
+          FAILURES="$(echo "$NEEDS" | jq 'with_entries(select(.value.result == "failure")) | map_values(.result)')"
+          echo "$FAILURES"
+          if [ "$(echo "$FAILURES" | jq '. | length')" != "0" ]; then
+            exit 1
+          fi
+          echo "All OK!"

.github/workflows/pr-go-workspace-check.yml

@@ -4,31 +4,18 @@ on:
   workflow_dispatch:
   pull_request:
     branches: [main]
-
-permissions: {}
+    paths:
+      - .github/workflows/pr-go-workspace-check.yml
+      - go.mod
+      - go.sum
+      - go.work
+      - go.work.sum
+      - '**/go.mod'
+      - '**/go.sum'
+      - '**.go'
 
 jobs:
-  detect-changes:
-    name: Detect whether code changed
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    outputs:
-      changed: ${{ steps.detect-changes.outputs.backend }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: true # required to get more history in the changed-files action
-          fetch-depth: 2
-      - name: Detect changes
-        id: detect-changes
-        uses: ./.github/actions/change-detection
-        with:
-          self: .github/workflows/pr-go-workspace-check.yml
-
-  check-workspace:
-    needs: detect-changes
-    if: needs.detect-changes.outputs.changed == 'true'
+  check:
     name: Go Workspace Check
     runs-on: ubuntu-latest
 
@@ -39,7 +26,7 @@ jobs:
         persist-credentials: false
 
     - name: Set go version
-      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
+      uses: actions/setup-go@19bb51245e9c80abacb2e91cc42b33fa478b8639
       with:
         cache: false
         go-version-file: go.mod
@@ -58,100 +45,3 @@ jobs:
         fi
     - name: Ensure Dockerfile contains submodule COPY commands
       run: ./scripts/go-workspace/validate-dockerfile.sh
-
-  check-wire:
-    needs: detect-changes
-    if: needs.detect-changes.outputs.changed == 'true'
-    name: Check Wire Changes
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-      id-token: write
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-
-    - name: Set go version
-      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
-      with:
-        cache: false
-        go-version-file: go.mod
-
-    - name: Setup Enterprise
-      if: github.event.pull_request.head.repo.fork == false
-      uses: ./.github/actions/setup-enterprise
-
-    - name: Calculate generated wire checksums
-      id: pre_gen_oss
-      run: |
-        OSS_WIRE_CHECKSUM="$(sha256sum pkg/server/wire_gen.go | cut -d' ' -f1)"
-        echo "wire_checksum=$OSS_WIRE_CHECKSUM" >> "$GITHUB_OUTPUT"
-
-    - name: Calculate generated enterprise wire checksums
-      id: pre_gen_enterprise
-      if: github.event.pull_request.head.repo.fork == false
-      run: |
-        ENTERPRISE_WIRE_CHECKSUM="$(sha256sum pkg/server/enterprise_wire_gen.go | cut -d' ' -f1)"
-        echo "wire_checksum=$ENTERPRISE_WIRE_CHECKSUM" >> "$GITHUB_OUTPUT"
-
-    - name: Generate Go files
-      run: make gen-go
-
-    - name: Check for generated file changes
-      run: |
-        OSS_WIRE_CHANGED=false
-        CURRENT_OSS_WIRE_CHECKSUM=$(sha256sum pkg/server/wire_gen.go | cut -d' ' -f1)
-        if [ "$CURRENT_OSS_WIRE_CHECKSUM" != "${{ steps.pre_gen_oss.outputs.wire_checksum }}" ]; then
-          OSS_WIRE_CHANGED=true
-          echo "Uncomitted changes detected in pkg/server/wire_gen.go"
-        fi
-
-        ENTERPRISE_WIRE_CHANGED=false
-        if [ -f "pkg/server/enterprise_wire_gen.go" ]; then
-          CURRENT_ENTERPRISE_WIRE_CHECKSUM=$(sha256sum pkg/server/enterprise_wire_gen.go | cut -d' ' -f1)
-          if [ "$CURRENT_ENTERPRISE_WIRE_CHECKSUM" != "${{ steps.pre_gen_enterprise.outputs.wire_checksum }}" ]; then
-            ENTERPRISE_WIRE_CHANGED=true
-            echo "Uncomitted changes detected in pkg/server/enterprise_wire_gen.go"
-          fi
-        fi
-        
-        if [ "$OSS_WIRE_CHANGED" = "false" ] && [ "$ENTERPRISE_WIRE_CHANGED" = "false" ]; then
-          echo "No changes in generated Go files"
-        else
-          if [[ "${{ github.event.pull_request.head.repo.fork }}" == "false" ]]; then
-            echo "> !!! Please link Enterprise and run 'make gen-go', then commit the changes to both repositories."
-          else
-            echo "> !!! Please run 'make gen-go' and commit the changes."
-          fi
-          exit 1
-        fi
-
-  # This is the job that is actually required by rulesets.
-  # We want to only require one job instead of all the individual tests.
-  # Future work also allows us to start skipping some tests based on changed files.
-  required-go-workspace-check:
-    needs:
-      - check-workspace
-      - check-wire
-    # always() is the best function here.
-    # success() || failure() will skip this function if any need is also skipped.
-    # That means conditional jobs will fail the entire requirement check.
-    if: always()
-
-    name: All Go Workspace Checks complete
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check the checks
-        env:
-          NEEDS: ${{ toJson(needs) }}
-        run: |
-          FAILURES="$(echo "$NEEDS" | jq 'with_entries(select(.value.result == "failure")) | map_values(.result)')"
-          echo "$FAILURES"
-          if [ "$(echo "$FAILURES" | jq '. | length')" != "0" ]; then
-            exit 1
-          fi
-          echo "All OK!"

.github/workflows/pr-k8s-codegen-check.yml

@@ -24,7 +24,7 @@ jobs:
         persist-credentials: false
 
     - name: Set go version
-      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
+      uses: actions/setup-go@19bb51245e9c80abacb2e91cc42b33fa478b8639
       with:
         go-version-file: go.mod
 

.github/workflows/pr-test-docker.yml

@@ -1,39 +0,0 @@
-name: Test Dockerfile
-
-on:
-  pull_request:
-
-jobs:
-  detect-changes:
-    # Run on `grafana/grafana` main branch, or on pull requests to prevent double-running on mirrors
-    name: Detect whether code changed
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    outputs:
-      changed: ${{ steps.detect-changes.outputs.backend || steps.detect-changes.outputs.frontend || steps.detect-changes.outputs.dockerfile }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: true # required to get more history in the changed-files action
-          fetch-depth: 2
-      - name: Detect changes
-        id: detect-changes
-        uses: ./.github/actions/change-detection
-        with:
-          self: .github/workflows/pr-test-integration.yml
-
-  build-dockerfile:
-    needs: detect-changes
-    if: needs.detect-changes.outputs.changed == 'true'
-    runs-on: ubuntu-x64-large-io
-    permissions:
-      contents: read
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - uses: docker/setup-docker-action@b60f85385d03ac8acfca6d9996982511d8620a19 # v4
-      - name: Build Dockerfile
-        run: make build-docker-full

.github/workflows/pr-test-integration.yml

@@ -18,38 +18,17 @@ concurrency:
 permissions: {}
 
 jobs:
-  detect-changes:
-    # Run on `grafana/grafana` main branch, or on pull requests to prevent double-running on mirrors
-    if: (github.event_name == 'pull_request' || (github.event_name == 'push' && github.repository == 'grafana/grafana'))
-    name: Detect whether code changed
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    outputs:
-      changed: ${{ steps.detect-changes.outputs.backend }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: true # required to get more history in the changed-files action
-          fetch-depth: 2
-      - name: Detect changes
-        id: detect-changes
-        uses: ./.github/actions/change-detection
-        with:
-          self: .github/workflows/pr-test-integration.yml
   sqlite:
-    needs: detect-changes
-    if: needs.detect-changes.outputs.changed == 'true'
     strategy:
       matrix:
-        # We don't need more than this since it has to wait for the other tests.
         shard: [
-          1/4, 2/4, 3/4, 4/4,
+          1/8, 2/8, 3/8, 4/8,
+          5/8, 6/8, 7/8, 8/8,
         ]
       fail-fast: false
 
     name: Sqlite (${{ matrix.shard }})
-    runs-on: ubuntu-x64-large-io
+    runs-on: ubuntu-latest-8-cores
     permissions:
       contents: read
     steps:
@@ -58,7 +37,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Setup Go
-        uses: actions/setup-go@v5.5.0
+        uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
           cache: true
@@ -68,55 +47,18 @@ jobs:
         run: |
           set -euo pipefail
           readarray -t PACKAGES <<< "$(./scripts/ci/backend-tests/pkgs-with-tests-named.sh -b TestIntegration | ./scripts/ci/backend-tests/shard.sh -N"$SHARD" -d-)"
-          go test -tags=sqlite -timeout=8m -run '^TestIntegration' "${PACKAGES[@]}"
-
-  sqlite_nocgo:
-    needs: detect-changes
-    if: needs.detect-changes.outputs.changed == 'true'
-    strategy:
-      matrix:
-        # We don't need more than this since it has to wait for the other tests.
-        shard: [
-          1/4, 2/4, 3/4, 4/4,
-        ]
-      fail-fast: false
-
-    name: Sqlite Without CGo (${{ matrix.shard }})
-    runs-on: ubuntu-x64-large-io
-    permissions:
-      contents: read
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - name: Setup Go
-        uses: actions/setup-go@v5.5.0
-        with:
-          go-version-file: go.mod
-          cache: true
-      - name: Run tests
-        env:
-          SHARD: ${{ matrix.shard }}
-        run: |
-          set -euo pipefail
-          readarray -t PACKAGES <<< "$(./scripts/ci/backend-tests/pkgs-with-tests-named.sh -b TestIntegration | ./scripts/ci/backend-tests/shard.sh -N"$SHARD" -d-)"
-          CGO_ENABLED=0 go test -tags=sqlite -timeout=8m -run '^TestIntegration' "${PACKAGES[@]}"
+          go test -tags=sqlite -timeout=5m -run '^TestIntegration' "${PACKAGES[@]}"
   mysql:
-    needs: detect-changes
-    if: needs.detect-changes.outputs.changed == 'true'
     strategy:
       matrix:
         shard: [
-           1/16,  2/16,  3/16,  4/16,
-           5/16,  6/16,  7/16,  8/16,
-           9/16, 10/16, 11/16, 12/16,
-          13/16, 14/16, 15/16, 16/16,
+          1/8, 2/8, 3/8, 4/8,
+          5/8, 6/8, 7/8, 8/8,
         ]
       fail-fast: false
 
     name: MySQL (${{ matrix.shard }})
-    runs-on: ubuntu-x64-large-io
+    runs-on: ubuntu-latest-8-cores
     permissions:
       contents: read
     env:
@@ -124,7 +66,7 @@ jobs:
       MYSQL_HOST: 127.0.0.1
     services:
       mysql:
-        image: mysql:8.0.43
+        image: mysql:8.0.32
         env:
           MYSQL_ROOT_PASSWORD: rootpass
           MYSQL_DATABASE: grafana_tests
@@ -139,7 +81,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Setup Go
-        uses: actions/setup-go@v5.5.0
+        uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
           cache: true
@@ -151,22 +93,18 @@ jobs:
         run: |
           set -euo pipefail
           readarray -t PACKAGES <<< "$(./scripts/ci/backend-tests/pkgs-with-tests-named.sh -b TestIntegration | ./scripts/ci/backend-tests/shard.sh -N"$SHARD" -d-)"
-          CGO_ENABLED=0 go test -p=1 -tags=mysql -timeout=8m -run '^TestIntegration' "${PACKAGES[@]}"
+          go test -p=1 -tags=mysql -timeout=5m -run '^TestIntegration' "${PACKAGES[@]}"
   postgres:
-    needs: detect-changes
-    if: needs.detect-changes.outputs.changed == 'true'
     strategy:
       matrix:
         shard: [
-           1/16,  2/16,  3/16,  4/16,
-           5/16,  6/16,  7/16,  8/16,
-           9/16, 10/16, 11/16, 12/16,
-          13/16, 14/16, 15/16, 16/16,
+          1/8, 2/8, 3/8, 4/8,
+          5/8, 6/8, 7/8, 8/8,
         ]
       fail-fast: false
 
     name: Postgres (${{ matrix.shard }})
-    runs-on: ubuntu-x64-large-io
+    runs-on: ubuntu-latest-8-cores
     permissions:
       contents: read
     env:
@@ -175,7 +113,7 @@ jobs:
       POSTGRES_HOST: 127.0.0.1
     services:
       postgres:
-        image: postgres:17.6
+        image: postgres:12.3-alpine
         env:
           POSTGRES_USER: grafanatest
           POSTGRES_PASSWORD: grafanatest
@@ -188,7 +126,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Setup Go
-        uses: actions/setup-go@v5.5.0
+        uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
           cache: true
@@ -200,7 +138,7 @@ jobs:
         run: |
           set -euo pipefail
           readarray -t PACKAGES <<< "$(./scripts/ci/backend-tests/pkgs-with-tests-named.sh -b TestIntegration | ./scripts/ci/backend-tests/shard.sh -N"$SHARD" -d-)"
-          CGO_ENABLED=0 go test -p=1 -tags=postgres -timeout=8m -run '^TestIntegration' "${PACKAGES[@]}"
+          go test -p=1 -tags=postgres -timeout=5m -run '^TestIntegration' "${PACKAGES[@]}"
 
   # This is the job that is actually required by rulesets.
   # We want to only require one job instead of all the individual tests and shards.

.github/workflows/publish-artifact.yml

@@ -48,7 +48,7 @@ jobs:
           path: ./artifact
       - name: Log in to GCS
         id: login-to-gcs
-        uses: grafana/shared-workflows/actions/login-to-gcs@main
+        uses: grafana/shared-workflows/actions/login-to-gcs@login-to-gcs/v0.2.1
         with:
           environment: ${{ inputs.environment }}
           service_account: ${{ inputs.service-account }}
@@ -58,7 +58,7 @@ jobs:
           find ./artifact -mindepth 2 -maxdepth 2 -exec cp -r {} out/ \;
           ls -al out
       - name: Upload artifacts
-        uses: grafana/shared-workflows/actions/push-to-gcs@main
+        uses: grafana/shared-workflows/actions/push-to-gcs@push-to-gcs-v0.2.0
         with:
           bucket: ${{ inputs.bucket }}
           environment: ${{ inputs.environment }}
@@ -66,4 +66,3 @@ jobs:
           path: out
           bucket_path: ${{ inputs.bucket-path }}
           service_account: ${{ inputs.service-account }}
-          gzip: false

.github/workflows/publish-kinds-next.yml

@@ -27,7 +27,7 @@ jobs:
           persist-credentials: false
 
       - name: "Setup Go"
-        uses: "actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5"
+        uses: "actions/setup-go@19bb51245e9c80abacb2e91cc42b33fa478b8639"
         with:
           go-version-file: go.mod
 

.github/workflows/publish-kinds-release.yml

@@ -30,7 +30,7 @@ jobs:
           persist-credentials: false
 
       - name: "Setup Go"
-        uses: "actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5"
+        uses: "actions/setup-go@19bb51245e9c80abacb2e91cc42b33fa478b8639"
         with:
           go-version-file: go.mod
 

.github/workflows/reject-gh-secrets.yml

@@ -12,8 +12,6 @@ permissions: {}
 
 jobs:
   reject-gh-secrets:
-    # Run on `grafana/grafana` main branch, or on pull requests to prevent double-running on mirrors
-    if: (github.event_name == 'pull_request' || (github.event_name == 'push' && github.repository == 'grafana/grafana'))
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -30,4 +28,4 @@ jobs:
             echo "Found secrets access in the codebase. Please remove it in favour of Vault secrets."
             echo "If you are sure this is correct, add '# nolint:reject-gh-secrets' to the end of the line. Be VERY careful with this."
             exit 1
-          fi
+          fi

.github/workflows/release-build.yml

@@ -1,16 +1,6 @@
 name: Build Release Packages
 on:
   workflow_dispatch:
-    inputs:
-      source-event:
-        description: If this workflow was triggered by another workflow, this value should be set to the GITHUB_EVENT_NAME of that source workflow.
-        type: string
-        required: false
-        default: workflow_dispatch
-  schedule:
-    # Every weeknight at midnight
-    # "Scheduled workflows will only run on the default branch." (docs.github.com)
-    - cron: '0 0 * * 1-5'
   push:
     branches:
       - release-*.*.*
@@ -49,14 +39,14 @@ jobs:
   setup:
     name: setup
     runs-on: github-hosted-ubuntu-x64-small
-    if: (github.repository == 'grafana/grafana') || (github.repository == 'grafana/grafana-security-mirror' && contains(github.ref_name, '+security'))
+    if: github.repository == 'grafana/grafana'
     outputs:
       version: ${{ steps.output.outputs.version }}
       grafana-commit: ${{ steps.output.outputs.grafana_commit }}
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Set up version (Release Branches)
@@ -103,12 +93,10 @@ jobs:
           BUILD_ID: ${{ github.run_id }}
           BUCKET: grafana-prerelease
           GRAFANA_COMMIT: ${{ needs.setup.outputs.grafana-commit }}
-          SOURCE_EVENT: ${{ inputs.source-event || github.event_name }}
-          REPO: ${{ github.repository }}
         with:
           github-token: ${{ steps.generate_token.outputs.token }}
           script: |
-            const {REF, VERSION, BUILD_ID, BUCKET, GRAFANA_COMMIT, SOURCE_EVENT, REPO} = process.env;
+            const {REF, VERSION, BUILD_ID, BUCKET, GRAFANA_COMMIT} = process.env;
 
             await github.rest.actions.createWorkflowDispatch({
                 owner: 'grafana',
@@ -120,8 +108,6 @@ jobs:
                   "build-id": String(BUILD_ID),
                   "bucket": BUCKET,
                   "grafana-commit": GRAFANA_COMMIT,
-                  "source-event": SOURCE_EVENT,
-                  "upstream": REPO,
                 }
             })
 
@@ -140,36 +126,27 @@ jobs:
         # The downside to this is that the frontend will be built for each one when it could be reused for all of them.
         # This could be a future improvement.
         include:
-          - name: linux-amd64 # publish-npm relies on this step building npm packages
+          - name: linux-amd64
             artifacts: targz:grafana:linux/amd64,deb:grafana:linux/amd64,rpm:grafana:linux/amd64,docker:grafana:linux/amd64,docker:grafana:linux/amd64:ubuntu,npm:grafana,storybook
-            verify: true
           - name: linux-arm64
             artifacts: targz:grafana:linux/arm64,deb:grafana:linux/arm64,rpm:grafana:linux/arm64,docker:grafana:linux/arm64,docker:grafana:linux/arm64:ubuntu
-            verify: false
           - name: linux-s390x
             artifacts: targz:grafana:linux/s390x,deb:grafana:linux/s390x,rpm:grafana:linux/s390x,docker:grafana:linux/s390x,docker:grafana:linux/s390x:ubuntu
-            verify: true
           - name: linux-armv7
             artifacts: targz:grafana:linux/arm/v7,deb:grafana:linux/arm/v7,docker:grafana:linux/arm/v7,docker:grafana:linux/arm/v7:ubuntu
-            verify: true
           - name: linux-armv6
             artifacts: targz:grafana:linux/arm/v6,deb:grafana:linux/arm/v6
-            verify: true
           - name: windows-amd64
             artifacts: targz:grafana:windows/amd64,zip:grafana:windows/amd64,msi:grafana:windows/amd64
-            verify: true
           - name: windows-arm64
             artifacts: targz:grafana:windows/arm64,zip:grafana:windows/arm64
-            verify: true
           - name: darwin-amd64
             artifacts: targz:grafana:darwin/amd64
-            verify: true
           - name: darwin-arm64
             artifacts: targz:grafana:darwin/arm64
-            verify: true
     steps:
-      - uses: grafana/shared-workflows/actions/dockerhub-login@dockerhub-login/v1.0.2
-      - uses: actions/checkout@v5
+      - uses: grafana/shared-workflows/actions/dockerhub-login@main
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Set up QEMU
@@ -185,7 +162,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           version: ${{ needs.setup.outputs.version }}
           output: artifacts-${{ matrix.name }}.txt
-          verify: ${{ matrix.verify }}
+          verify: true
           build-id: ${{ github.run_id }}
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
@@ -197,7 +174,6 @@ jobs:
           name: artifacts-${{ matrix.name }}
           path: ${{ steps.build.outputs.dist-dir }}
           retention-days: 1
-
   publish-artifacts:
     name: Upload artifacts
     uses: grafana/grafana/.github/workflows/publish-artifact.yml@main
@@ -210,128 +186,5 @@ jobs:
       bucket: grafana-prerelease
       pattern: artifacts-*
       run-id: ${{ github.run_id }}
-      bucket-path: ${{ needs.setup.outputs.version }}_${{ github.run_id }}
+      bucket-path: ${{ needs.setup.outputs.version }}
       environment: prod
-
-  publish-dockerhub:
-    if: github.ref_name == 'main'
-    permissions:
-      contents: read
-      id-token: write
-    runs-on: ubuntu-x64-small
-    needs:
-      - setup
-      - build
-    steps:
-      - uses: grafana/shared-workflows/actions/dockerhub-login@dockerhub-login/v1.0.2
-      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
-        with:
-          name: artifacts-list-linux-amd64
-          path: .
-      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
-        with:
-          name: artifacts-list-linux-arm64
-          path: .
-      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
-        with:
-          name: artifacts-list-linux-armv7
-          path: .
-      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
-        with:
-          name: artifacts-linux-amd64
-          path: dist
-      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
-        with:
-          name: artifacts-linux-arm64
-          path: dist
-      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
-        with:
-          name: artifacts-linux-armv7
-          path: dist
-      - name: Push to Docker Hub
-        env:
-          VERSION: ${{ needs.setup.outputs.version }}
-        run: |
-          # grep can use a wildcard but then it includes the filename as part of the result and that gets complicated.
-          # It's easier to use cat to combine the artifact lists
-          cat artifacts-*.txt > artifacts.txt
-          grep 'grafana_.*docker.tar.gz$' artifacts.txt | xargs -I % docker load -i % | sed 's/Loaded image: //g' | tee docker_images
-          while read -r line; do
-            # This tag will be `grafana/grafana-image-tags:...`
-            docker push "$line"
-          done < docker_images
-
-          docker manifest create grafana/grafana:main "grafana/grafana-image-tags:${VERSION}-amd64" "grafana/grafana-image-tags:${VERSION}-arm64"  "grafana/grafana-image-tags:${VERSION}-armv7"
-          docker manifest create grafana/grafana:main-ubuntu "grafana/grafana-image-tags:${VERSION}-ubuntu-amd64" "grafana/grafana-image-tags:${VERSION}-ubuntu-arm64"  "grafana/grafana-image-tags:${VERSION}-ubuntu-armv7"
-          docker manifest create "grafana/grafana-dev:${VERSION}" "grafana/grafana-image-tags:${VERSION}-amd64" "grafana/grafana-image-tags:${VERSION}-arm64"  "grafana/grafana-image-tags:${VERSION}-armv7"
-          docker manifest create "grafana/grafana-dev:${VERSION}-ubuntu" "grafana/grafana-image-tags:${VERSION}-ubuntu-amd64" "grafana/grafana-image-tags:${VERSION}-ubuntu-arm64"  "grafana/grafana-image-tags:${VERSION}-ubuntu-armv7"
-
-          docker manifest push grafana/grafana:main
-          docker manifest push grafana/grafana:main-ubuntu
-          docker manifest push "grafana/grafana-dev:${VERSION}"
-          docker manifest push "grafana/grafana-dev:${VERSION}-ubuntu"
-
-  publish-npm-canaries:
-    if: github.ref_name == 'main'
-    name: Publish NPM canaries
-    uses: ./.github/workflows/release-npm.yml
-    permissions:
-      contents: read
-      id-token: write
-    needs:
-      - setup
-      - build
-    with:
-      grafana_commit: ${{ needs.setup.outputs.grafana-commit }}
-      version: ${{ needs.setup.outputs.version }}
-      build_id: ${{ github.run_id }}
-      version_type: "canary"
-
-  # notify-pr creates (or updates) a comment in a pull request to link to this workflow where the release artifacts are
-  # being built.
-  notify-pr:
-    runs-on: ubuntu-x64-small
-    permissions:
-      contents: read
-      id-token: write
-    needs:
-      - setup
-    steps:
-      - id: vault-secrets
-        uses: grafana/shared-workflows/actions/get-vault-secrets@main
-        with:
-          repo_secrets: |
-            GRAFANA_DELIVERY_BOT_APP_PEM=delivery-bot-app:PRIVATE_KEY
-      - name: Generate token
-        id: generate_token
-        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
-        with:
-          app_id: ${{ vars.DELIVERY_BOT_APP_ID }}
-          private_key: ${{ env.GRAFANA_DELIVERY_BOT_APP_PEM }}
-          repositories: '["grafana"]'
-          permissions: '{"issues": "write", "pull_requests": "write", "contents": "read"}'
-      - name: Find PR
-        env:
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
-          GRAFANA_COMMIT: ${{ needs.setup.outputs.grafana-commit }}
-        run: echo "ISSUE_NUMBER=$(gh api "/repos/grafana/grafana/commits/${GRAFANA_COMMIT}/pulls" | jq -r '.[0].number')" >> "$GITHUB_ENV"
-      - name: Find Comment
-        uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3
-        id: fc
-        with:
-          issue-number: ${{ env.ISSUE_NUMBER }}
-          comment-author: 'grafana-delivery-bot[bot]'
-          body-includes: GitHub Actions Build
-          token: ${{ steps.generate_token.outputs.token }}
-      - name: Create or update comment
-        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
-        with:
-          token: ${{ steps.generate_token.outputs.token }}
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          issue-number: ${{ env.ISSUE_NUMBER }}
-          body: |
-            :rocket: Your submission is now being built and packaged.
-
-            - [GitHub Actions Build](https://github.com/grafana/grafana/actions/runs/${{ github.run_id }})
-            - Version: ${{ needs.setup.outputs.version }}
-          edit-mode: replace

.github/workflows/release-comms.yml

@@ -80,7 +80,7 @@ jobs:
   create_security_branch_grafana:
     name: Create security branch (Grafana Security Mirror)
     needs: setup
-    uses: grafana/grafana/.github/workflows/create-security-branch.yml@main
+    uses: ./.github/workflows/create-security-branch.yml
     with:
       release_branch: ${{ needs.setup.outputs.release_branch }}
       security_branch_number: "01"
@@ -88,7 +88,7 @@ jobs:
   create_security_branch_enterprise:
     name: Create security branch (Enterprise)
     needs: setup
-    uses: grafana/grafana/.github/workflows/create-security-branch.yml@main
+    uses: ./.github/workflows/create-security-branch.yml
     with:
       release_branch: ${{ needs.setup.outputs.release_branch }}
       security_branch_number: "01"

.github/workflows/release-npm.yml

@@ -1,149 +0,0 @@
-name: Release NPM packages
-run-name: Publish NPM ${{ inputs.version_type }} ${{ inputs.version }}
-on:
-  workflow_call:
-    inputs:
-      grafana_commit:
-        description: 'Grafana commit SHA to build against'
-        required: true
-        type: string
-      version:
-        description: 'Version to publish as'
-        required: true
-        type: string
-      build_id:
-        description: 'Run ID from the original release-build workflow'
-        required: true
-        type: string
-      version_type:
-        description: 'Version type (canary, nightly, stable)'
-        required: true
-        type: string
-
-  workflow_dispatch:
-    inputs:
-      grafana_commit:
-        description: 'Grafana commit SHA to build against'
-        required: true
-      version:
-        description: 'Version to publish as'
-        required: true
-      build_id:
-        description: 'Run ID from the original release-build workflow'
-        required: true
-      version_type:
-        description: 'Version type (canary, nightly, stable)'
-        required: true
-
-permissions: {}
-
-jobs:
-  # If called with version_type 'canary' or 'stable', build + publish to NPM
-  # If called with version_type 'nightly', just tag the given version with nightly tag. It was already published by the canary build.
-
-  publish:
-    name: Publish NPM packages
-    runs-on: github-hosted-ubuntu-x64-small
-    if: inputs.version_type == 'canary' || inputs.version_type == 'stable'
-    permissions:
-      contents: read
-      id-token: write
-    steps:
-      - name: Info
-        env:
-          GITHUB_REF: ${{ github.ref }}
-          GRAFANA_COMMIT: ${{ inputs.grafana_commit }}
-        run: |
-          echo "GRAFANA_COMMIT: $GRAFANA_COMMIT"
-          echo "github.ref: $GITHUB_REF"
-
-      - name: Checkout workflow ref
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-          fetch-depth: 100
-          fetch-tags: false
-
-      # this will fail with "{commit} is not a valid commit" if the commit is valid but
-      # not in the last 100 commits.
-      - name: Verify commit is in workflow HEAD
-        env:
-          GIT_COMMIT: ${{ inputs.grafana_commit }}
-        run: ./.github/workflows/scripts/validate-commit-in-head.sh
-        shell: bash
-
-      - name: Map version type to NPM tag
-        id: npm-tag
-        env:
-          VERSION: ${{ inputs.version }}
-          VERSION_TYPE: ${{ inputs.version_type }}
-          REFERENCE_PKG: "@grafana/runtime"
-        run: |
-          TAG=$(./.github/workflows/scripts/determine-npm-tag.sh)
-          echo "NPM_TAG=$TAG" >> "$GITHUB_OUTPUT"
-        shell: bash
-
-      - name: Checkout build commit
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-          ref: ${{ inputs.grafana_commit }}
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node
-
-      # Trusted Publishing is only available in npm v11.5.1 and later
-      - name: Update npm
-        run: npm install -g npm@^11.5.1
-
-      - name: Install dependencies
-        run: yarn install --immutable
-
-      - name: Typecheck packages
-        run: yarn run packages:typecheck
-
-      - name: Version, build, and pack packages
-        env:
-          VERSION: ${{ inputs.version }}
-        run: |
-          yarn run packages:build
-          yarn lerna version "$VERSION" \
-            --exact \
-            --no-git-tag-version \
-            --no-push \
-            --force-publish \
-            --yes
-          yarn run packages:pack
-
-      - name: Debug packed files
-        run: tree -a ./npm-artifacts
-
-      - name: Validate packages
-        run: ./scripts/validate-npm-packages.sh
-
-      - name: Debug OIDC Claims
-        uses: github/actions-oidc-debugger@2e9ba5d3f4bebaad1f91a2cede055115738b7ae8
-        with:
-          audience: '${{ github.server_url }}/${{ github.repository_owner }}'
-
-      - name: Publish packages
-        env:
-          NPM_TAG: ${{ steps.npm-tag.outputs.NPM_TAG }}
-        run: ./scripts/publish-npm-packages.sh --dist-tag "$NPM_TAG" --registry 'https://registry.npmjs.org/'
-
-  # TODO: finish this step
-  tag-nightly:
-    name: Tag nightly release
-    runs-on: github-hosted-ubuntu-x64-small
-    needs: publish
-    if: inputs.version_type == 'nightly'
-
-    steps:
-      - name: Checkout workflow ref
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      # TODO: tag the given release with nightly
-
-

.github/workflows/release-pr.yml

@@ -136,7 +136,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
-      - uses: actions/setup-go@v5.5.0
+      - uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
       - name: Configure git user
@@ -198,7 +198,6 @@ jobs:
         if: ${{ inputs.bump == true || inputs.bump == 'true' }}
         uses: dagger/dagger-for-github@e47aba410ef9bb9ed81a4d2a97df31061e5e842e
         with:
-          version: 0.18.8
           verb: run
           args: go run -C .grafana-main ./pkg/build/actions/bump-version -version="patch"
 
@@ -209,7 +208,7 @@ jobs:
         if: ${{ inputs.bump == true || inputs.bump == 'true' }}
         run: |
           git add package.json lerna.json yarn.lock packages public
-          test -e e2e-playwright/test-plugins && git add e2e-playwright/test-plugins
+          test -e e2e/test-plugins && git add e2e/test-plugins
           git commit -m "Update version to $VERSION"
 
       - name: Git push

.github/workflows/relyance-scan.yml

@@ -1,33 +0,0 @@
-name: Relyance Compliance Inspection
-on:
-  schedule:
-    - cron: '0 0 * * *' # Run daily at 00:00 UTC
-  workflow_dispatch: # Allow for manual trigger
-
-jobs:
-  relyance-compliance-inspector:
-    permissions:
-      contents: read
-      id-token: write # Needed for Vault access
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: Get API key
-        id: vault-secrets
-        uses: grafana/shared-workflows/actions/get-vault-secrets@5d7e361bc7e0a183cde8afe9899fb7b596d2659b # get-vault-secrets-v1.2.0
-        with:
-          repo_secrets: |
-            API_KEY=relyance:API_KEY
-
-      - name: Run Relyance scan
-        env:
-          API_KEY: "${{ fromJSON(steps.vault-secrets.outputs.secrets).API_KEY }}"
-        run: |
-          docker pull gcr.io/relyance-ext/compliance_inspector:release && \
-          docker run --rm -v ${{ github.workspace }}:/repo --env "API_KEY=${{ env.API_KEY }}" gcr.io/relyance-ext/compliance_inspector:release

.github/workflows/run-dashboard-search-e2e.yml

@@ -29,7 +29,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Pin Go version to mod file
-        uses: actions/setup-go@v5.5.0
+        uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
           cache: true
@@ -51,7 +51,7 @@ jobs:
         run: yarn install --immutable
       - name: Install Cypress dependencies
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        uses: cypress-io/github-action@b8ba51a856ba5f4c15cf39007636d4ab04f23e3c
+        uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f
         with:
           runTests: false
       - name: Cache Grafana Build and Dependencies
@@ -64,7 +64,7 @@ jobs:
             tools/
             public/
             conf/
-            e2e-playwright/test-plugins/
+            e2e/test-plugins/
             devenv/
           key: ${{ runner.os }}-grafana-${{ hashFiles('go.mod', 'package-lock.json', 'Makefile', 'pkg/storage/**/*.go', 'public/app/features/search/**/*.ts', 'public/app/features/search/**/*.tsx') }}
       # only rebuild grafana if search files have changed ( or dependencies )
@@ -116,7 +116,7 @@ jobs:
               tools/
               public/
               conf/
-              e2e-playwright/test-plugins/
+              e2e/test-plugins/
               devenv/
             key: ${{ runner.os }}-grafana-${{ hashFiles('go.mod', 'package-lock.json', 'Makefile', 'pkg/storage/**/*.go', 'public/app/features/search/**/*.ts', 'public/app/features/search/**/*.tsx') }}
         - name: Set the step name

.github/workflows/run-schema-v2-e2e.yml

@@ -13,7 +13,7 @@ env:
 
 jobs:
   dashboard-schema-v2-e2e:
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
     continue-on-error: true
     if: github.event.pull_request.draft == false
     steps:
@@ -22,7 +22,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Pin Go version to mod file
-        uses: actions/setup-go@v5.5.0
+        uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
       - run: go version
@@ -32,10 +32,12 @@ jobs:
           cache: 'yarn'
       - name: Install dependencies
         run: yarn install --immutable
-      - name: Install Playwright browsers
-        run: yarn playwright install --with-deps chromium
       - name: Build grafana
         run: make build
+      - name: Install Cypress dependencies
+        uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f
+        with:
+          runTests: false
       - name: Run dashboard scenes e2e
         run: yarn e2e:schema-v2 || echo "Test failed but marking as success since schema V2 is behind a feature flag and should not block PRs"
 

.github/workflows/scripts/publish-frontend-metrics.mts

@@ -1,75 +0,0 @@
-import fs from 'node:fs'
-
-interface Payload {
-  name: string;
-  value: number;
-  interval: number;
-  mtype: string;
-  time: number;
-}
-
-console.log("Publishing metrics");
-
-// Get API key from environment variable
-const key = process.env.GRAFANA_MISC_STATS_API_KEY;
-if (!key) {
-  throw new Error("API key is required. Provide it via the GRAFANA_MISC_STATS_API_KEY environment variable");
-}
-
-const unixTimestamp = Math.floor(Date.now() / 1000);
-const data: Payload[] = [];
-
-const input = fs.readFileSync(0, "utf-8");
-// parse metrics from input
-const regexp = /^Metrics: (\{.+\})/ms;
-const matches = input.match(regexp);
-
-if (!matches) {
-  throw new Error("No metrics found");
-}
-
-console.log('matches[0]', matches[0])
-console.log('matches[1]', matches[1])
-
-const metrics: Record<string, string> = JSON.parse(matches[1]);
-
-// Convert metrics to payload format
-for (const [metricName, valueStr] of Object.entries(metrics)) {
-  const value = parseInt(valueStr, 10);
-  if (isNaN(value)) {
-    throw new Error(`Metric "${metricName}" has invalid value format: "${valueStr}"`);
-  }
-
-  data.push({
-    name: metricName,
-    value: value,
-    interval: 60,
-    mtype: "gauge",
-    time: unixTimestamp,
-  });
-}
-
-const jsonPayload = JSON.stringify(data);
-console.log(`Publishing metrics to https://graphite-us-central1.grafana.net/metrics, JSON: ${jsonPayload}`);
-
-const url = 'https://graphite-us-central1.grafana.net/metrics';
-const username = '6371';
-const headers = new Headers();
-headers.set("Content-Type", "application/json");
-headers.set('Authorization', 'Basic ' + Buffer.from(username + ":" + key).toString('base64'));
-
-try {
-  const response = await fetch(url, {
-    method: "POST",
-    headers,
-    body: jsonPayload,
-  });
-
-  if (!response.ok) {
-    throw new Error(`Metrics publishing failed with status code ${response.status}`);
-  }
-
-  console.log("Metrics successfully published");
-} catch (error) {
-  throw new Error(`Metrics publishing failed: ${error instanceof Error ? error.message : String(error)}`);
-}

.github/workflows/shellcheck.yml

@@ -15,8 +15,6 @@ permissions: {}
 
 jobs:
   shellcheck:
-    # Run on `grafana/grafana` main branch, or on pull requests to prevent double-running on mirrors
-    if: (github.event_name == 'pull_request' || (github.event_name == 'push' && github.repository == 'grafana/grafana'))
     name: Shellcheck scripts
     runs-on: ubuntu-latest
     permissions:

.github/workflows/storybook-a11y.yml

@@ -1,57 +0,0 @@
-name: Run Storybook a11y tests
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-      - release-*.*.*
-
-permissions: {}
-
-jobs:
-  detect-changes:
-    name: Detect whether code changed
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    outputs:
-      changed: ${{ steps.detect-changes.outputs.frontend }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: true # required to get more history in the changed-files action
-          fetch-depth: 2
-      - name: Detect changes
-        id: detect-changes
-        uses: ./.github/actions/change-detection
-        with:
-          self: .github/workflows/storybook-a11y.yml
-
-  test-storybook-a11y:
-    runs-on: ubuntu-latest-8-cores
-    permissions:
-      contents: read
-      id-token: write
-    needs: detect-changes
-    if: needs.detect-changes.outputs.changed == 'true'
-    name: "Run Storybook a11y tests"
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-    - uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-    - run: yarn install --immutable --check-cache
-    - name: Install Playwright browsers
-      run: npx playwright install --with-deps
-    - name: Start Storybook
-      run: yarn storybook &
-    - name: Run tests
-      # the chromium browser used by Playwright sets its locale to "en_US@posix" by default
-      # this is not a valid language code, and causes some stories to fail to load!
-      # instead, we set the LANG environment variable to en_US to override this
-      # see https://github.com/microsoft/playwright/issues/34046
-      env:
-        LANG: en_US
-      run: npx wait-on --timeout 120000 http://localhost:9001 && yarn test:storybook

.github/workflows/storybook-verification.yml

@@ -0,0 +1,52 @@
+name: Verify Storybook
+
+on:
+  pull_request:
+    paths:
+      - 'packages/grafana-ui/**'
+      - '!docs/**'
+      - '!*.md'
+  push:
+    branches:
+      - main
+    paths:
+      - 'packages/grafana-ui/**'
+      - '!docs/**'
+      - '!*.md'
+
+permissions: {}
+
+jobs:
+  verify-storybook:
+    name: Verify Storybook
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn install --immutable
+
+      - name: Run Storybook and E2E tests
+        uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f
+        with:
+          browser: chrome
+          start: yarn storybook --quiet
+          wait-on: 'http://localhost:9001'
+          wait-on-timeout: 60
+          command: yarn e2e:storybook
+          install: false
+        env:
+          HOST: localhost
+          PORT: 9001

.github/workflows/swagger-gen.yml

@@ -14,31 +14,10 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  detect-changes:
-    # Run on `grafana/grafana` main branch, or on pull requests to prevent double-running on mirrors
-    if: (github.event_name == 'pull_request' || (github.event_name == 'push' && github.repository == 'grafana/grafana'))
-    name: Detect whether code changed
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    outputs:
-      changed: ${{ steps.detect-changes.outputs.backend }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: true # required to get more history in the changed-files action
-          fetch-depth: 2
-      - name: Detect changes
-        id: detect-changes
-        uses: ./.github/actions/change-detection
-        with:
-          self: .github/workflows/swagger-gen.yml
-
   verify:
     name: Verify committed API specs match
     runs-on: ubuntu-latest
-    needs: detect-changes
-    if: github.repository == 'grafana/grafana' && needs.detect-changes.outputs.changed == 'true'
+    if: ${{ github.repository == 'grafana/grafana' }}
     permissions:
       contents: read # clone the repository
       id-token: write # required for Vault access
@@ -49,7 +28,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Setup Go
-        uses: actions/setup-go@v5.5.0
+        uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
       - name: Setup Enterprise

.github/workflows/trigger-dashboard-search-e2e.yml

@@ -22,8 +22,7 @@ env:
 jobs:
   trigger-search-e2e:
     runs-on: ubuntu-latest
-    # Run on `grafana/grafana` main branch, or on pull requests to prevent double-running on mirrors
-    if: (github.event_name == 'pull_request' && github.event.pull_request.draft == false) || (github.event_name == 'push' && github.repository == 'grafana/grafana')
+    if: github.event.pull_request.draft == false
     steps:
       - name: Trigger Dashboard Search E2E
-        run: echo "Triggered Dashboard Search e2e..."
+        run: echo "Triggered Dashboard Search e2e..."

.github/workflows/trufflehog.yml

@@ -21,16 +21,15 @@ jobs:
       contents: read # clone the repo
 
     steps:
-      - name: Calculate fetch depth
-        id: fetch_depth
-        shell: bash
-        run: echo "fetch_depth=$(( ${{ github.event.pull_request.commits }} + 2 ))" >> "$GITHUB_OUTPUT"
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           persist-credentials: false
-          fetch-depth: ${{ steps.fetch_depth.outputs.fetch_depth }}
+          fetch-depth: 0
+          ref: ${{ github.head_ref }}
       - name: Trufflehog
-        uses: trufflesecurity/trufflehog@eafb8c5f6a06175141c27f17bcc17941853d0047 # v3.90.0
+        uses: trufflesecurity/trufflehog@90190deac64289cb10bb694894be8db9ead8790b # v3.88.29
         with:
+          base: ${{ github.event.pull_request.base.sha }}
+          head: ${{ github.event.pull_request.head.sha }}
           extra_args: --results=verified

.github/workflows/verify-kinds.yml

@@ -17,7 +17,7 @@ jobs:
           persist-credentials: false
 
       - name: "Setup Go"
-        uses: "actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5"
+        uses: "actions/setup-go@19bb51245e9c80abacb2e91cc42b33fa478b8639"
         with:
           go-version-file: go.mod
 

.gitignore

@@ -94,8 +94,6 @@ example-apiserver/
 /devenv/docker/blocks/auth/openldap/certs/
 
 conf/custom.ini
-conf/operator.ini
-conf/storage.ini
 
 /conf/provisioning/**/*.yaml
 !/conf/provisioning/**/sample.yaml
@@ -119,9 +117,6 @@ profile.cov
 /pkg/server/wireexts_enterprise.go
 /pkg/server/enterprise_wire_gen.go
 /pkg/build/cmd/enterprise.go
-/pkg/build/cmd/artifactspage.go
-/pkg/build/cmd/artifactspage.tmpl.html
-/pkg/build/cmd/exportversion.go
 /pkg/extensions/*
 !/pkg/extensions/.keep
 !/pkg/extensions/main.go
@@ -191,8 +186,6 @@ compilation-stats.json
 /e2e/build_results.zip
 /e2e/extensions
 !/e2e/extensions/.keep
-/e2e-playwright/extensions
-!/e2e-playwright/extensions/.keep
 /e2e/extensions-suite
 /test-results/
 /playwright-report/
@@ -222,6 +215,7 @@ public/api-spec.json
 
 deployment_tools_config.json
 
+.betterer.cache
 .nx
 
 # Temporary file for backporting PRs
@@ -243,9 +237,4 @@ public/app/plugins/**/dist/
 # Mock service worker used for fake API responses in frontend development
 public/mockServiceWorker.js
 
-/e2e-playwright/test-plugins/*/dist
-/apps/provisioning/cmd/job-controller/bin/
-
-
-# Ignore unified storage kv store files
-/grafana-kv-data
+/e2e/test-plugins/*/dist

.golangci.yml

@@ -83,14 +83,6 @@ linters:
           deny:
             - pkg: github.com/grafana/grafana/pkg
               desc: apps/playlist is not allowed to import grafana core
-        apps-secret:  
-          list-mode: lax
-          files:
-            - ./apps/secret/*
-            - ./apps/secret/**/*
-          deny:
-            - pkg: github.com/grafana/grafana/pkg
-              desc: apps/secret is not allowed to import grafana core
         coreplugins:
           files:
             - '**/pkg/tsdb/grafana-pyroscope-datasource/*'

.prettierignore

@@ -5,12 +5,14 @@ build
 compiled
 data
 deployment_tools_config.json
+devenv
 dist
 e2e/tmp
 node_modules
 pkg
 public/lib/monaco
 public/sass/*.generated.scss
+scripts/cli/bettererIssueTemplate.md
 scripts/grafana-server/tmp
 vendor
 
@@ -38,9 +40,3 @@ public/mockServiceWorker.js
 
 /.nx/cache
 /.nx/workspace-data
-
-# Playwright results
-test-results
-playwright-report
-
-eslint-suppressions.json

.vscode/launch.json

@@ -120,15 +120,6 @@
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen"
     },
-    {
-      "name": "Debug ESLint with stats reporter",
-      "type": "node",
-      "request": "launch",
-      "runtimeExecutable": "yarn",
-      "runtimeArgs": ["run", "eslint", "${file}", "--format", "./scripts/cli/eslint-stats-reporter.mjs"],
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen"
-    },
     {
       "name": "Debug Go test",
       "type": "go",

CHANGELOG.md

@@ -1,379 +1,3 @@
-<!-- 12.1.1 START -->
-
-# 12.1.1 (2025-08-13)
-
-### Features and enhancements
-
-- **Alerting:** Add rule group name validation to the Prometheus conversion API [#108767](https://github.com/grafana/grafana/pull/108767), [@alexander-akhmetov](https://github.com/alexander-akhmetov)
-- **CloudWatch:** Update grafana/aws-sdk-go with STS endpo… [#109357](https://github.com/grafana/grafana/pull/109357), [@iwysiu](https://github.com/iwysiu)
-- **Go:** Update to 1.24.6 [#109318](https://github.com/grafana/grafana/pull/109318), [@Proximyst](https://github.com/Proximyst)
-
-### Bug fixes
-
-- **Alerting:** Fix active time intervals when time interval is renamed [#108547](https://github.com/grafana/grafana/pull/108547), [@yuri-tceretian](https://github.com/yuri-tceretian)
-- **Alerting:** Fix subpath handling in the alerting package [#109505](https://github.com/grafana/grafana/pull/109505), [@konrad147](https://github.com/konrad147)
-- **Config:** Fix date_formats options being moved to a different section [#109366](https://github.com/grafana/grafana/pull/109366), [@joshhunt](https://github.com/joshhunt)
-- **Pyroscope:** Fix flamegraph totals showing incorrect values after rate aggregation changes [#110470](https://github.com/grafana/grafana/pull/110470), [@marcsanmiquel](https://github.com/marcsanmiquel)
-
-<!-- 12.1.1 END -->
-<!-- 12.0.4 START -->
-
-# 12.0.4 (2025-08-13)
-
-### Features and enhancements
-
-- **Go:** Update to 1.24.6 [#109317](https://github.com/grafana/grafana/pull/109317), [@Proximyst](https://github.com/Proximyst)
-
-### Bug fixes
-
-- **Azure:** Fix time management field [#108481](https://github.com/grafana/grafana/pull/108481), [@aangelisc](https://github.com/aangelisc)
-- **Azure:** Fix time management field [#108481](https://github.com/grafana/grafana/pull/108481), [@aangelisc](https://github.com/aangelisc)
-- **Azure:** Fix time management field [#108481](https://github.com/grafana/grafana/pull/108481), [@aangelisc](https://github.com/aangelisc)
-- **Azure:** Fix time management field [#108481](https://github.com/grafana/grafana/pull/108481), [@aangelisc](https://github.com/aangelisc)
-
-<!-- 12.0.4 END -->
-<!-- 11.6.5 START -->
-
-# 11.6.5 (2025-08-13)
-
-### Features and enhancements
-
-- **Alerting:** Bump alerting package to include change to NewTLSClient [#108817](https://github.com/grafana/grafana/pull/108817), [@rwwiv](https://github.com/rwwiv)
-- **Go:** Update to 1.24.6 [#109314](https://github.com/grafana/grafana/pull/109314), [@Proximyst](https://github.com/Proximyst)
-
-<!-- 11.6.5 END -->
-<!-- 11.5.8 START -->
-
-# 11.5.8 (2025-08-12)
-
-### Features and enhancements
-
-- **Go:** Update to 1.24.6 [#109315](https://github.com/grafana/grafana/pull/109315), [@Proximyst](https://github.com/Proximyst)
-
-<!-- 11.5.8 END -->
-<!-- 11.4.8 START -->
-
-# 11.4.8 (2025-08-12)
-
-### Features and enhancements
-
-- **Go:** Update to 1.24.6 [#109316](https://github.com/grafana/grafana/pull/109316), [@Proximyst](https://github.com/Proximyst)
-
-### Bug fixes
-
-- **Dashboards:** Panel react for `timeFrom` and `timeShift` changes using variables [#98659](https://github.com/grafana/grafana/pull/98659), [@Sergej-Vlasov](https://github.com/Sergej-Vlasov)
-
-<!-- 11.4.8 END -->
-<!-- 12.1.0 START -->
-
-# 12.1.0 (2025-07-23)
-
-### Features and enhancements
-
-- **Access:** Disable role none option if advanced access control is not enabled [#107378](https://github.com/grafana/grafana/pull/107378), [@Jguer](https://github.com/Jguer)
-- **Alerting:** Add OAuth2 Support for Webhook Receiver [#106302](https://github.com/grafana/grafana/pull/106302), [@JacobsonMT](https://github.com/JacobsonMT)
-- **Alerting:** Add ability to import rules to GMA from Prometheus YAML [#105807](https://github.com/grafana/grafana/pull/105807), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
-- **Alerting:** Add details to the payload when tracking import to GMA [#106404](https://github.com/grafana/grafana/pull/106404), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
-- **Alerting:** Add export folder action to the new list view [#106256](https://github.com/grafana/grafana/pull/106256), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
-- **Alerting:** Add filters for health and contact point in Prometheus Rules api [#106580](https://github.com/grafana/grafana/pull/106580), [@moustafab](https://github.com/moustafab)
-- **Alerting:** Add loading spinner for loading groups state [#106289](https://github.com/grafana/grafana/pull/106289), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
-- **Alerting:** Add need more info for import ui datasource field [#106364](https://github.com/grafana/grafana/pull/106364), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
-- **Alerting:** Add provenance to Prometheus API [#106596](https://github.com/grafana/grafana/pull/106596), [@moustafab](https://github.com/moustafab)
-- **Alerting:** Add provenance to remote-ruler extension response (Enterprise)
-- **Alerting:** Add simplified routing metadata to the details tab [#106403](https://github.com/grafana/grafana/pull/106403), [@gillesdemey](https://github.com/gillesdemey)
-- **Alerting:** Add state history backend to write ALERTS metric [#104361](https://github.com/grafana/grafana/pull/104361), [@alexander-akhmetov](https://github.com/alexander-akhmetov)
-- **Alerting:** Add support for Redis Sentinel for Alerting HA [#106322](https://github.com/grafana/grafana/pull/106322), [@vstpme](https://github.com/vstpme)
-- **Alerting:** Allow disabling recording rules write for a data source in the UI [#106664](https://github.com/grafana/grafana/pull/106664), [@alexander-akhmetov](https://github.com/alexander-akhmetov)
-- **Alerting:** Correctly persist FiredAt in SyncRuleStatePersister [#106658](https://github.com/grafana/grafana/pull/106658), [@fayzal-g](https://github.com/fayzal-g)
-- **Alerting:** Ensure errors cleared when Alerting after error [#105246](https://github.com/grafana/grafana/pull/105246), [@moustafab](https://github.com/moustafab)
-- **Alerting:** Evaluate all imported from Prometheus rules sequentially [#106295](https://github.com/grafana/grafana/pull/106295), [@alexander-akhmetov](https://github.com/alexander-akhmetov)
-- **Alerting:** Extensible Settings module [#107831](https://github.com/grafana/grafana/pull/107831), [@konrad147](https://github.com/konrad147)
-- **Alerting:** Filter out rules managed by integrations and add an info alert [#106602](https://github.com/grafana/grafana/pull/106602), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
-- **Alerting:** Filter out synthetic datasource-managed rules when importing to GMA [#106358](https://github.com/grafana/grafana/pull/106358), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
-- **Alerting:** List V2 - Add labels popup [#107193](https://github.com/grafana/grafana/pull/107193), [@konrad147](https://github.com/konrad147)
-- **Alerting:** List V2 - Grouped view filters [#106400](https://github.com/grafana/grafana/pull/106400), [@konrad147](https://github.com/konrad147)
-- **Alerting:** List V2 - Use backend filters for GMA rules [#106897](https://github.com/grafana/grafana/pull/106897), [@konrad147](https://github.com/konrad147)
-- **Alerting:** Make paginated rules endpoint strongly consistent (Enterprise)
-- **Alerting:** Optimize out unnecessary permission check for rule groups (Enterprise)
-- **Alerting:** Optimize prometheus api permission checks [#106299](https://github.com/grafana/grafana/pull/106299), [@moustafab](https://github.com/moustafab)
-- **Alerting:** Optimize prometheus api permission checks (Enterprise)
-- **Alerting:** Persist alert instance FiredAt field [#105927](https://github.com/grafana/grafana/pull/105927), [@fayzal-g](https://github.com/fayzal-g)
-- **Alerting:** Remove ruler from alert list view2 [#106778](https://github.com/grafana/grafana/pull/106778), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
-- **Alerting:** Resend alerts for states that are missing in the eval results [#105965](https://github.com/grafana/grafana/pull/105965), [@alexander-akhmetov](https://github.com/alexander-akhmetov)
-- **Alerting:** Send notifications immediately on Error|NoData -> Normal transitions [#106421](https://github.com/grafana/grafana/pull/106421), [@alexander-akhmetov](https://github.com/alexander-akhmetov)
-- **Alerting:** Support PDC in Grafana-managed recording rules [#106677](https://github.com/grafana/grafana/pull/106677), [@alexander-akhmetov](https://github.com/alexander-akhmetov)
-- **Alerting:** Use default_datasource_uid as the default target for recording rules in UI [#106415](https://github.com/grafana/grafana/pull/106415), [@alexander-akhmetov](https://github.com/alexander-akhmetov)
-- **Annotations:** Use dashboard uids instead of dashboard ids [#106676](https://github.com/grafana/grafana/pull/106676), [@stephaniehingtgen](https://github.com/stephaniehingtgen)
-- **App Platform Provisioning:** Add experimental nanogit mode for Git Sync [#106763](https://github.com/grafana/grafana/pull/106763), [@MissingRoberto](https://github.com/MissingRoberto)
-- **Auth:** Add Azure/Entra workload identity support [#104807](https://github.com/grafana/grafana/pull/104807), [@mehighlow](https://github.com/mehighlow)
-- **Auth:** Enable improved session handling by default for OAuth and SAML [#107442](https://github.com/grafana/grafana/pull/107442), [@mgyongyosi](https://github.com/mgyongyosi)
-- **Auth:** Enable ssoSettingsLDAP by default [#106310](https://github.com/grafana/grafana/pull/106310), [@mgyongyosi](https://github.com/mgyongyosi)
-- **Auth:** Remove api key endpoints [#106019](https://github.com/grafana/grafana/pull/106019), [@dmihai](https://github.com/dmihai)
-- **Auth:** Remove code for authenticating API keys [#105998](https://github.com/grafana/grafana/pull/105998), [@dmihai](https://github.com/dmihai)
-- **Azure:** Support scope selection in Resource Graph queries [#105835](https://github.com/grafana/grafana/pull/105835), [@aangelisc](https://github.com/aangelisc)
-- **Betterer:** Only allow singleton Storage use [#105310](https://github.com/grafana/grafana/pull/105310), [@tskarhed](https://github.com/tskarhed)
-- **Caching:** Remove memcached reconnect_interval setting (Enterprise)
-- **Chore:** Update k8s.io to v0.33.1 [#105307](https://github.com/grafana/grafana/pull/105307), [@ryantxu](https://github.com/ryantxu)
-- **Cloud Monitoring:** Add support for service account impersonation [#107022](https://github.com/grafana/grafana/pull/107022), [@zoltanbedi](https://github.com/zoltanbedi)
-- **CloudMigrations:** Add Mute Timings as dependency for Notification Policies [#106751](https://github.com/grafana/grafana/pull/106751), [@macabu](https://github.com/macabu)
-- **CloudWatch:** Backport aws-sdk-go-v2 update from external plugin [#107136](https://github.com/grafana/grafana/pull/107136), [@njvrzm](https://github.com/njvrzm)
-- **CloudWatch:** Improve instance attribute variable query editor [#105206](https://github.com/grafana/grafana/pull/105206), [@iwysiu](https://github.com/iwysiu)
-- **Cloudwatch:** Add missing AWS regions [#106304](https://github.com/grafana/grafana/pull/106304), [@chriscerie](https://github.com/chriscerie)
-- **Dashboard Provisioning:** Reduce db load [#106114](https://github.com/grafana/grafana/pull/106114), [@stephaniehingtgen](https://github.com/stephaniehingtgen)
-- **Dashboard:** Add Alert icon in library panels [#107723](https://github.com/grafana/grafana/pull/107723), [@axelavargas](https://github.com/axelavargas)
-- **Dashboard:** Add server-configurable quick ranges for the time picker [#102254](https://github.com/grafana/grafana/pull/102254), [@chodges15](https://github.com/chodges15)
-- **Dashboard:** Formatting Currency - add new custom 'financial' currency format without abbreviations [#106604](https://github.com/grafana/grafana/pull/106604), [@axelavargas](https://github.com/axelavargas)
-- **Dashboard:** Library Panels - Add ability to search by folder name [#106997](https://github.com/grafana/grafana/pull/106997), [@axelavargas](https://github.com/axelavargas)
-- **Dashboard:** Schema V2 - Auto-transform V2 dashboards in V1Resource export mode [#105997](https://github.com/grafana/grafana/pull/105997), [@axelavargas](https://github.com/axelavargas)
-- **Datasources:** Migrate to new sigv4 middleware (Enterprise)
-- **Datasources:** Update grafana-aws-sdk for new sigv4 middleware and aws-sdk-go v1 removal [#107522](https://github.com/grafana/grafana/pull/107522), [@njvrzm](https://github.com/njvrzm)
-- **DatePicker:** Add cursor not-allowed style and hover background color [#106451](https://github.com/grafana/grafana/pull/106451), [@ywzheng1](https://github.com/ywzheng1)
-- **Dependencies:** Bump Go to v1.24.4 [#106533](https://github.com/grafana/grafana/pull/106533), [@macabu](https://github.com/macabu)
-- **Dependencies:** Bump github.com/go-viper/mapstructure/v2 from 2.2.1 to 2.3.0 [#107379](https://github.com/grafana/grafana/pull/107379), [@macabu](https://github.com/macabu)
-- **Dependencies:** Bump github.com/openfga/openfga to v1.8.13 to address CVE-2025-48371 [#106064](https://github.com/grafana/grafana/pull/106064), [@macabu](https://github.com/macabu)
-- **ElasticSearch:** Remove frontend response parsing [#104148](https://github.com/grafana/grafana/pull/104148), [@nojaf](https://github.com/nojaf)
-- **Geomap:** Add HiDPI support to CARTO basemap (#81195) [#106211](https://github.com/grafana/grafana/pull/106211), [@cledwynl](https://github.com/cledwynl)
-- **Git Sync UI:** Delete Provisioned Dashboard Flow [#106593](https://github.com/grafana/grafana/pull/106593), [@ywzheng1](https://github.com/ywzheng1)
-- **Grafana/data:** Extract fuzzy search core [#107110](https://github.com/grafana/grafana/pull/107110), [@Clarity-89](https://github.com/Clarity-89)
-- **I18n:** Update eslint rule to catch some untranslated object properties [#105072](https://github.com/grafana/grafana/pull/105072), [@tomratcliffe](https://github.com/tomratcliffe)
-- **InfluxDB:** Add an optional time range filter for tag queries in the query panel autocompleteInflux tag filter [#107195](https://github.com/grafana/grafana/pull/107195), [@NikolayTsvetkov](https://github.com/NikolayTsvetkov)
-- **LBAC for data sources:** Adds team filtering for lbac rules (Enterprise)
-- **Library Panels:** Mark library panel RBAC as GA & enable by default [#106833](https://github.com/grafana/grafana/pull/106833), [@kaydelaney](https://github.com/kaydelaney)
-- **Library Panels:** Modify connection api endpoint to be compatible with unified storage [#107088](https://github.com/grafana/grafana/pull/107088), [@stephaniehingtgen](https://github.com/stephaniehingtgen)
-- **Library elements:** Remove ability to set as "library variable" [#106594](https://github.com/grafana/grafana/pull/106594), [@stephaniehingtgen](https://github.com/stephaniehingtgen)
-- **Library panels:** Remove `libraryPanelRBAC` feature flag, and enable rbac by default [#107222](https://github.com/grafana/grafana/pull/107222), [@stephaniehingtgen](https://github.com/stephaniehingtgen)
-- **Loki:** Remove experimental lokiQuerySplittingConfig [#107298](https://github.com/grafana/grafana/pull/107298), [@ivanahuckova](https://github.com/ivanahuckova)
-- **Loki:** Remove experimental predefined operations [#107289](https://github.com/grafana/grafana/pull/107289), [@ivanahuckova](https://github.com/ivanahuckova)
-- **OAuth:** Add access token as third source for user info extraction [#107636](https://github.com/grafana/grafana/pull/107636), [@Jguer](https://github.com/Jguer)
-- **Plugin Extensions:** Expose PluginMeta generic in usePluginContext [#107577](https://github.com/grafana/grafana/pull/107577), [@MattIPv4](https://github.com/MattIPv4)
-- **Postgres:** Switch the datasource plugin from lib/pq to pgx [#103961](https://github.com/grafana/grafana/pull/103961), [@zoltanbedi](https://github.com/zoltanbedi)
-- **Preferences:** Use dashboard uid for the home dashboard [#106666](https://github.com/grafana/grafana/pull/106666), [@stephaniehingtgen](https://github.com/stephaniehingtgen)
-- **Profiles:** Stop passing response headers for Grafana-Pyroscope and parca datasources [#106577](https://github.com/grafana/grafana/pull/106577), [@simonswine](https://github.com/simonswine)
-- **Prometheus:** Deprecation message for Azure auth [#106490](https://github.com/grafana/grafana/pull/106490), [@bossinc](https://github.com/bossinc)
-- **Prometheus:** Facilitate tree shaking with exports and bundler mode [#105575](https://github.com/grafana/grafana/pull/105575), [@NWRichmond](https://github.com/NWRichmond)
-- **Prometheus:** Migrate remaining selectors to data-testid [#106564](https://github.com/grafana/grafana/pull/106564), [@idastambuk](https://github.com/idastambuk)
-- **ProvisionedFolder:** Delete folder drawer [#107089](https://github.com/grafana/grafana/pull/107089), [@ywzheng1](https://github.com/ywzheng1)
-- **Provisioning:** Add pure git repository type [#106815](https://github.com/grafana/grafana/pull/106815), [@MissingRoberto](https://github.com/MissingRoberto)
-- **Querying:** Pass dashboard and panel title as headers [#107032](https://github.com/grafana/grafana/pull/107032), [@ivanahuckova](https://github.com/ivanahuckova)
-- **Remote Alertmanager:** Send SMTP config [#106337](https://github.com/grafana/grafana/pull/106337), [@santihernandezc](https://github.com/santihernandezc)
-- **Restore dashboards:** Add filters and search [#106994](https://github.com/grafana/grafana/pull/106994), [@Clarity-89](https://github.com/Clarity-89)
-- **SCIM:** Ignore unsupported fields in user PATCH requests (Enterprise)
-- **SCIM:** Implement operation for adding an externalId value to a team (Enterprise)
-- **SCIM:** Implement the add members operation in group PATCH requests (Enterprise)
-- **SCIM:** Implement the remove members operation in group PATCH requests (Enterprise)
-- **SCIM:** Update externalId field in group PATCH request (Enterprise)
-- **SQL Expressions:** Always convert on type first [#106083](https://github.com/grafana/grafana/pull/106083), [@kylebrandt](https://github.com/kylebrandt)
-- **Select:** Set min width for the current selected item when width=auto [#106131](https://github.com/grafana/grafana/pull/106131), [@tskarhed](https://github.com/tskarhed)
-- **StateTimeline:** Display false and empty string values [#107059](https://github.com/grafana/grafana/pull/107059), [@jesdavpet](https://github.com/jesdavpet)
-- **StateTimeline:** Support `NaN` and `null` value mappings [#105638](https://github.com/grafana/grafana/pull/105638), [@fastfrwrd](https://github.com/fastfrwrd)
-- **Storage:** Take `migration_locking` setting into account [#105938](https://github.com/grafana/grafana/pull/105938), [@JohnnyQQQQ](https://github.com/JohnnyQQQQ)
-- **TableNG:** Refactor to better take advantage of react-data-grid [#103755](https://github.com/grafana/grafana/pull/103755), [@leeoniya](https://github.com/leeoniya)
-- **Tables:** Pills for Table Cells [#107485](https://github.com/grafana/grafana/pull/107485), [@timlevett](https://github.com/timlevett)
-- **Teams:** Add support for updating externalId field [#106406](https://github.com/grafana/grafana/pull/106406), [@dmihai](https://github.com/dmihai)
-- **Tempo:** Enable native histograms for Tempo service graph [#105989](https://github.com/grafana/grafana/pull/105989), [@bohandley](https://github.com/bohandley)
-- **TimeRangePicker:** Highlight range on hover [#106616](https://github.com/grafana/grafana/pull/106616), [@joshhunt](https://github.com/joshhunt)
-- **TraceView:** Resource attributes links extension point [#104680](https://github.com/grafana/grafana/pull/104680), [@edvard-falkskar](https://github.com/edvard-falkskar)
-- **Transformations:** Add "Auto" mode to Organize Fields [#103055](https://github.com/grafana/grafana/pull/103055), [@gelicia](https://github.com/gelicia)
-- **Transformations:** GA the Regression transformation [#106074](https://github.com/grafana/grafana/pull/106074), [@gelicia](https://github.com/gelicia)
-- **Unified storage:** Respect GF_DATABASE_URL override [#105331](https://github.com/grafana/grafana/pull/105331), [@pstibrany](https://github.com/pstibrany)
-- **VQB:** Add selected columns to GROUP BY dropdown (#106349) [#106391](https://github.com/grafana/grafana/pull/106391), [@Shubham19032004](https://github.com/Shubham19032004)
-- **VQB:** Allow custom table names in TableSelector [#106420](https://github.com/grafana/grafana/pull/106420), [@Victorthedev](https://github.com/Victorthedev)
-- **XYChart:** Add support for x=time [#106459](https://github.com/grafana/grafana/pull/106459), [@leeoniya](https://github.com/leeoniya)
-
-### Bug fixes
-
-- **Alerting:** Fix $value type when single data source is queried [#106080](https://github.com/grafana/grafana/pull/106080), [@alexander-akhmetov](https://github.com/alexander-akhmetov)
-- **Alerting:** Fix ImportToGMARules flaky test [#106495](https://github.com/grafana/grafana/pull/106495), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
-- **Alerting:** Fix RefIds not being shown when creating or editing Grafana-managed recording rule [#106840](https://github.com/grafana/grafana/pull/106840), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
-- **Alerting:** Fix contact points tab visibility when user can only create [#106735](https://github.com/grafana/grafana/pull/106735), [@JacobsonMT](https://github.com/JacobsonMT)
-- **Alerting:** Fix eval time unit in list view [#106488](https://github.com/grafana/grafana/pull/106488), [@ebuildy](https://github.com/ebuildy)
-- **Alerting:** Fix group interval override when adding new rules [#107324](https://github.com/grafana/grafana/pull/107324), [@konrad147](https://github.com/konrad147)
-- **Alerting:** Fix group-level labels and query_offset in the import API [#106379](https://github.com/grafana/grafana/pull/106379), [@alexander-akhmetov](https://github.com/alexander-akhmetov)
-- **Alerting:** Fix notification policy conflicts originating from provenance mismatch [#107343](https://github.com/grafana/grafana/pull/107343), [@moustafab](https://github.com/moustafab)
-- **Alerting:** Fix resolved notifications for same-label Error to Normal transitions [#106210](https://github.com/grafana/grafana/pull/106210), [@alexander-akhmetov](https://github.com/alexander-akhmetov)
-- **Alerting:** Hide labels section if we only have private labels [#105996](https://github.com/grafana/grafana/pull/105996), [@gillesdemey](https://github.com/gillesdemey)
-- **Annotations:** Remove prometheus from legacy runner [#106737](https://github.com/grafana/grafana/pull/106737), [@scottlepp](https://github.com/scottlepp)
-- **Azure:** Fix Application Insights metadata requests [#105614](https://github.com/grafana/grafana/pull/105614), [@aangelisc](https://github.com/aangelisc)
-- **Azure:** Fix duplicated trace links [#105698](https://github.com/grafana/grafana/pull/105698), [@aangelisc](https://github.com/aangelisc)
-- **Azure:** Fix legend formatting [#106504](https://github.com/grafana/grafana/pull/106504), [@aangelisc](https://github.com/aangelisc)
-- **Azure:** Fix resource name determination in template variable queries [#105705](https://github.com/grafana/grafana/pull/105705), [@aangelisc](https://github.com/aangelisc)
-- **BarChart/StateTimeline:** Use noValue setting for error message when data is empty [#107147](https://github.com/grafana/grafana/pull/107147), [@fastfrwrd](https://github.com/fastfrwrd)
-- **CloudWatch:** Fix http client handling + assume role bug [#107893](https://github.com/grafana/grafana/pull/107893), [@njvrzm](https://github.com/njvrzm)
-- **CloudWatch:** Fix proxy transport issue [#107807](https://github.com/grafana/grafana/pull/107807), [@njvrzm](https://github.com/njvrzm)
-- **Dashboard:** FF `dashboardNewLayouts` Fix library panels non-editable when multiple added [#107052](https://github.com/grafana/grafana/pull/107052), [@axelavargas](https://github.com/axelavargas)
-- **Dashboard:** Fix cache validation to prevent stale cache [#105918](https://github.com/grafana/grafana/pull/105918), [@yashschandra](https://github.com/yashschandra)
-- **Dashboard:** Fixes issue with dashboard links that include all variables [#106356](https://github.com/grafana/grafana/pull/106356), [@torkelo](https://github.com/torkelo)
-- **Dashboards:** Fix history list for dashboard uids that end in `-` [#107073](https://github.com/grafana/grafana/pull/107073), [@stephaniehingtgen](https://github.com/stephaniehingtgen)
-- **Drilldown:** Fix js crash when using http [#105646](https://github.com/grafana/grafana/pull/105646), [@chu121su12](https://github.com/chu121su12)
-- **Fix:** Increase login_attempt.ip_address column length for IPv6 support [#107035](https://github.com/grafana/grafana/pull/107035), [@Jguer](https://github.com/Jguer)
-- **FlameGraph:** Fix bug for function names that conflict with JavaScript object prototype properties [#106338](https://github.com/grafana/grafana/pull/106338), [@simonswine](https://github.com/simonswine)
-- **Folders:** Correctly resolve nested folder breadcrumbs [#106344](https://github.com/grafana/grafana/pull/106344), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
-- **GrafanaUI:** Fix Combobox ignoring loading prop [#105584](https://github.com/grafana/grafana/pull/105584), [@ValeraS](https://github.com/ValeraS)
-- **Graphite:** Fix annotation queries [#106553](https://github.com/grafana/grafana/pull/106553), [@aangelisc](https://github.com/aangelisc)
-- **Graphite:** Fix date mutation [#107414](https://github.com/grafana/grafana/pull/107414), [@aangelisc](https://github.com/aangelisc)
-- **Graphite:** Fix nested variable interpolation for repeated rows [#106976](https://github.com/grafana/grafana/pull/106976), [@aangelisc](https://github.com/aangelisc)
-- **K8s:** Dashboards /apis: Fix library element connections [#106734](https://github.com/grafana/grafana/pull/106734), [@stephaniehingtgen](https://github.com/stephaniehingtgen)
-- **Loki:** Fix health check message [#107170](https://github.com/grafana/grafana/pull/107170), [@wooffie](https://github.com/wooffie)
-- **Loki:** Fix issue where step parameter using a template variable was marked as invalid [#106541](https://github.com/grafana/grafana/pull/106541), [@ivanahuckova](https://github.com/ivanahuckova)
-- **Loki:** Fix label browser not sorted after selection of a label [#107394](https://github.com/grafana/grafana/pull/107394), [@paulojmdias](https://github.com/paulojmdias)
-- **Org:** Fix org deletion [#106193](https://github.com/grafana/grafana/pull/106193), [@stephaniehingtgen](https://github.com/stephaniehingtgen)
-- **Plugins:** Fix and encode invalid gRPC header values [#107339](https://github.com/grafana/grafana/pull/107339), [@ivanahuckova](https://github.com/ivanahuckova)
-- **PostgreSQL:** Fix error on panel when toggling sqlDatasourceDatabaseSelection feature [#106965](https://github.com/grafana/grafana/pull/106965), [@HasithDeAlwis](https://github.com/HasithDeAlwis)
-- **Profiles:** Fix for passing the response headers [#106293](https://github.com/grafana/grafana/pull/106293), [@simonswine](https://github.com/simonswine)
-- **Reporting:** Stop sending reports with Never schedule on creation (Enterprise)
-- **SCIM:** Fix PUT request for deactivating a user (Enterprise)
-- **SCIM:** Fix the removal of all members in group PUT requests (Enterprise)
-- **SCIM:** Fix user patch operation (Enterprise)
-- **Security:** Add fix for CVE-2025-3580 [#105976](https://github.com/grafana/grafana/pull/105976), [@baldm0mma](https://github.com/baldm0mma)
-- **Security:** Fixes for CVE-2025-6197 and CVE-2025-6023 [#108333](https://github.com/grafana/grafana/pull/108333), [@mgyongyosi](https://github.com/mgyongyosi)
-- **Settings:** Fix reencryption and rollback of encrypted values in setting table (Enterprise)
-- **Tempo:** Fix showing dangling edges in NodeGraph [#107245](https://github.com/grafana/grafana/pull/107245), [@ifrost](https://github.com/ifrost)
-- **ToolTip:** Fix flexbox bug with tooltip when `maxWidth` is set manually [#107145](https://github.com/grafana/grafana/pull/107145), [@jdmarshall](https://github.com/jdmarshall)
-- **URLParams:** Stringify true values as key=true always (fixes issues with variables with true value) [#106440](https://github.com/grafana/grafana/pull/106440), [@torkelo](https://github.com/torkelo)
-
-### Breaking changes
-
-- **Alerting:** Enable recording rules by default [#105603](https://github.com/grafana/grafana/pull/105603), [@alexander-akhmetov](https://github.com/alexander-akhmetov)
-
-### Plugin development fixes & changes
-
-- **Carousel:** Always center image [#106468](https://github.com/grafana/grafana/pull/106468), [@ashharrison90](https://github.com/ashharrison90)
-- **Drawer:** Include divider and close button when passing a custom title element [#106896](https://github.com/grafana/grafana/pull/106896), [@ashharrison90](https://github.com/ashharrison90)
-
-<!-- 12.1.0 END -->
-<!-- 12.0.3 START -->
-
-# 12.0.3 (2025-07-23)
-
-### Bug fixes
-
-- **Security:** Fixes for CVE-2025-6197 and CVE-2025-6023 [#108280](https://github.com/grafana/grafana/pull/108280), [@volcanonoodle](https://github.com/volcanonoodle)
-
-<!-- 12.0.3 END -->
-<!-- 11.6.4 START -->
-
-# 11.6.4 (2025-07-23)
-
-### Features and enhancements
-
-- **Dependencies:** Bump github.com/go-viper/mapstructure/v2 from 2.2.1 to 2.3.0 [#107555](https://github.com/grafana/grafana/pull/107555), [@macabu](https://github.com/macabu)
-- **StateTimeline:** Add endTime to tooltip [#107605](https://github.com/grafana/grafana/pull/107605), [@adela-almasan](https://github.com/adela-almasan)
-- **Unified storage:** Respect GF_DATABASE_URL override [#107573](https://github.com/grafana/grafana/pull/107573), [@pstibrany](https://github.com/pstibrany)
-
-### Bug fixes
-
-- **Alerting:** Fix group interval override when adding new rules [#107496](https://github.com/grafana/grafana/pull/107496), [@konrad147](https://github.com/konrad147)
-- **Azure:** Fix legend formatting [#106934](https://github.com/grafana/grafana/pull/106934), [@aangelisc](https://github.com/aangelisc)
-- **Azure:** Fix resource name determination in template variable queries [#106939](https://github.com/grafana/grafana/pull/106939), [@aangelisc](https://github.com/aangelisc)
-- **Graphite:** Fix annotation queries [#106940](https://github.com/grafana/grafana/pull/106940), [@aangelisc](https://github.com/aangelisc)
-- **Graphite:** Fix date mutation [#107523](https://github.com/grafana/grafana/pull/107523), [@aangelisc](https://github.com/aangelisc)
-- **Graphite:** Fix nested variable interpolation for repeated rows [#107564](https://github.com/grafana/grafana/pull/107564), [@aangelisc](https://github.com/aangelisc)
-- **Security:** Fixes for CVE-2025-6197 and CVE-2025-6023 [#108281](https://github.com/grafana/grafana/pull/108281), [@volcanonoodle](https://github.com/volcanonoodle)
-
-<!-- 11.6.4 END -->
-<!-- 11.5.7 START -->
-
-# 11.5.7 (2025-07-23)
-
-### Features and enhancements
-
-- **Dependencies:** Bump github.com/go-viper/mapstructure/v2 from 2.2.1 to 2.3.0 [#107556](https://github.com/grafana/grafana/pull/107556), [@macabu](https://github.com/macabu)
-
-### Bug fixes
-
-- **Azure:** Fix legend formatting [#106933](https://github.com/grafana/grafana/pull/106933), [@aangelisc](https://github.com/aangelisc)
-- **Azure:** Fix resource name determination in template variable queries [#106938](https://github.com/grafana/grafana/pull/106938), [@aangelisc](https://github.com/aangelisc)
-- **Security:** Fixes for CVE-2025-6197 and CVE-2025-6023 [#108280](https://github.com/grafana/grafana/pull/108280), [@volcanonoodle](https://github.com/volcanonoodle)
-
-<!-- 11.5.7 END -->
-<!-- 11.4.7 START -->
-
-# 11.4.7 (2025-07-23)
-
-### Features and enhancements
-
-- **Dependencies:** Bump github.com/go-viper/mapstructure/v2 from 2.2.1 to 2.3.0 [#107557](https://github.com/grafana/grafana/pull/107557), [@macabu](https://github.com/macabu)
-
-### Bug fixes
-
-- **Azure:** Fix legend formatting [#106932](https://github.com/grafana/grafana/pull/106932), [@aangelisc](https://github.com/aangelisc)
-- **Security:** Fixes for CVE-2025-6197 and CVE-2025-6023 [#108279](https://github.com/grafana/grafana/pull/108279), [@volcanonoodle](https://github.com/volcanonoodle)
-
-<!-- 11.4.7 END -->
-<!-- 11.3.9 START -->
-
-# 11.3.9 (2025-07-23)
-
-### Features and enhancements
-
-- **Dependencies:** Bump github.com/go-viper/mapstructure/v2 from 2.2.1 to 2.3.0 [#107558](https://github.com/grafana/grafana/pull/107558), [@macabu](https://github.com/macabu)
-
-### Bug fixes
-
-- **Azure:** Fix legend formatting [#106931](https://github.com/grafana/grafana/pull/106931), [@aangelisc](https://github.com/aangelisc)
-- **Security:** Fixes for CVE-2025-6197 and CVE-2025-6023 [#108278](https://github.com/grafana/grafana/pull/108278), [@volcanonoodle](https://github.com/volcanonoodle)
-
-<!-- 11.3.9 END -->
-<!-- 12.0.2+security-01 START -->
-
-# 12.0.2+security-01 (2025-07-17)
-
-### Features and enhancements
-
-- **Profiles:** Stop passing response headers for Grafana-Pyroscope and parca datasources [#106730](https://github.com/grafana/grafana/pull/106730), [@simonswine](https://github.com/simonswine)
-
-### Bug fixes
-
-- **FlameGraph:** Fix bug for function names that conflict with JavaScript object prototype properties [#106625](https://github.com/grafana/grafana/pull/106625), [@simonswine](https://github.com/simonswine)
-- **Security:** Fixed CVE-2025-6023
-- **Security:** Fixed CVE-2025-6197
-
-<!-- 12.0.2+security-01 END -->
-<!-- 11.6.3+security-01 START -->
-
-# 11.6.3+security-01 (2025-07-17)
-
-### Features and enhancements
-
-- **Profiles:** Stop passing response headers for Grafana-Pyroscope and parca datasources [#106729](https://github.com/grafana/grafana/pull/106729), [@simonswine](https://github.com/simonswine)
-
-### Bug fixes
-
-- **FlameGraph:** Fix bug for function names that conflict with JavaScript object prototype properties [#106624](https://github.com/grafana/grafana/pull/106624), [@simonswine](https://github.com/simonswine)
-- **Security:** Fixed CVE-2025-6023
-- **Security:** Fixed CVE-2025-6197
-
-<!-- 11.6.3+security-01 END -->
-<!-- 11.5.6+security-01 START -->
-
-# 11.5.6+security-01 (2025-07-17)
-
-### Bug fixes
-
-- **Security:** Fixed CVE-2025-6023
-- **Security:** Fixed CVE-2025-6197
-
-<!-- 11.5.6+security-01 END -->
-<!-- 11.4.6+security-01 START -->
-
-# 11.4.6+security-01 (2025-07-17)
-
-### Bug fixes
-
-- **Security:** Fixed CVE-2025-6023
-- **Security:** Fixed CVE-2025-6197
-
-<!-- 11.4.6+security-01 END -->
-<!-- 11.3.8+security-01 START -->
-
-# 11.3.8+security-01 (2025-07-17)
-
-### Bug fixes
-
-- **Security:** Fixed CVE-2025-6023
-- **Security:** Fixed CVE-2025-6197
-
-<!-- 11.3.8+security-01 END -->
 <!-- 12.0.2 START -->
 
 # 12.0.2 (2025-06-17)

CONTRIBUTING.md

@@ -1,56 +1,29 @@
-# Contribute to Grafana
+# Contributing to Grafana
 
 Thank you for your interest in contributing to Grafana! We welcome all people who want to contribute in a healthy and constructive manner within our community. To help us create a safe and positive community experience for all, we require all participants to adhere to the [Code of Conduct](CODE_OF_CONDUCT.md).
 
-This document is a guide to help you through the process of contributing to Grafana. Be sure to check out the [Grafana Champions program](https://grafana.com/community/champions/?src=github&camp=community-cross-platform-engagement) as you start to contribute- it’s designed to recognize and empower individuals who are actively contributing to the growth and success of the Grafana ecosystem.
+This document is a guide to help you through the process of contributing to Grafana.
 
-Whether you're a new contributer or a seasoned veteran we hope these resources help you connect with the community:
+## Become a contributor
 
-Interact and be heard:
+You can contribute to Grafana in several ways. Here are some examples:
 
-- Forums: Do you have a problem, question, or curiosity? Visit our [forums](https://gra.fan/fromgithubtoforums) for a reservoir of knowledge- submit your own questions and answers!
-- Meetups: Craving in-person connections without the long journeys? [Join your local Grafana & Friends meetup group](https://gra.fan/githubtomeetup)!
-- Community Slack: Eager for real-time connections with fellow users? Begin a conversation on [Slack](https://gra.fan/githubtoslack).
-  Learn:
-- YouTube: From getting started to exploring newer projects like Pyroscope and Beyla, the [Grafana YouTube channel](https://gra.fan/githubtoyoutube) has what you need to get started!
-- Meetups: Join a [group near you](https://gra.fan/githubtomeetup) to learn from local experts and ask questions in real time.
-  Share your story:
-- Meetups and blogs: We’d love to feature your OSS Grafana Labs use case or story at an upcoming Grafana & Friends meetup or on the Grafana blog! Submit your idea [here](https://gra.fan/githubtocca) and we’ll connect with you on next steps if accepted.
-
-## Make technical contributions
-
-We welcome your technical contributions! Here are some examples:
-
-- Contribute to the Grafana codebase- check out these [help-wanted issues](<(https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)>)
-- Develop community [plugins](https://grafana.com/developers/plugin-tools)
-- Report [bugs](https://github.com/grafana/grafana/issues/new?template=0-bug-report.yaml)
-- [Triage issues](https://github.com/grafana/grafana/blob/4414b92e93440cc9ed0f281989ee71dc16216a15/contribute/triage-issues.md)
-- Report [security vulnerabilities](https://github.com/grafana/grafana/security/policy)
-- Submit a [feature request](https://github.com/grafana/grafana/issues/new?template=1-feature_requests.md)
-- Write [technical documentation](https://github.com/grafana/grafana/blob/4414b92e93440cc9ed0f281989ee71dc16216a15/contribute/documentation/README.md)
+- Contribute to the Grafana codebase.
+- Report and triage bugs.
+- Develop community plugins and dashboards.
+- Write technical documentation and blog posts, for users and contributors.
+- Organize meetups and user groups in your local area.
+- Help others by answering questions about Grafana.
 
 **Please note:** We do not currently accept contributions for translations. Please do not submit pull requests translating grafana.json files - they will be rejected. We do accept contributions to mark up phrases for translation. See [Internationalization](contribute/internationalization.md).
 
-### Your first contribution
-
-Unsure where to begin contributing to Grafana? Start by browsing issues labeled `beginner friendly` or `help wanted`.
-
-- [Beginner-friendly](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) issues are generally straightforward to complete.
-- [Help wanted](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) issues are problems we would like the community to help us with regardless of complexity.
-
-If you're looking to make a code change, see how to set up your environment for [local development](contribute/developer-guide.md).
-
-When you're ready to contribute, it's time to [create a pull request](/contribute/create-pull-request.md).
-
-### Develop a plugin
-
-Developing a Grafana plugin is a fantastic way to share your unique ideas with the community, extend the platform’s capabilities, and make a real impact on how people visualize and understand their data. Check out our guide to creating [plugins](https://grafana.com/developers/plugin-tools)
+For more ways to contribute, check out the [Open Source Guides](https://opensource.guide/how-to-contribute/).
 
 ### Report bugs
 
 Before submitting a new issue, try to make sure someone hasn't already reported the problem. Look through the [existing issues](https://github.com/grafana/grafana/issues) for similar issues.
 
-Report a bug by submitting a [bug report](https://github.com/grafana/grafana/issues/new?template=0-bug-report.yaml). Make sure that you provide as much information as possible on how to reproduce the bug.
+Report a bug by submitting a [bug report](https://github.com/grafana/grafana/issues/new?labels=type%3A+bug&template=1-bug_report.md). Make sure that you provide as much information as possible on how to reproduce the bug.
 
 Follow the issue template and add additional information that will help us replicate the problem.
 
@@ -65,25 +38,42 @@ For a dashboard related issues:
 
 For authentication and alerting Grafana server logs are useful.
 
+#### Security issues
+
+If you believe you've found a security vulnerability, please read our [security policy](https://github.com/grafana/grafana/security/policy) for more details.
+
+### Suggest enhancements
+
+If you have an idea of how to improve Grafana, submit a [feature request](https://github.com/grafana/grafana/issues/new?assignees=&labels=type%2Ffeature-request&projects=&template=1-feature_requests.md).
+
+We want to make Grafana accessible to even more people. Submit an [accessibility issue](https://github.com/grafana/grafana/issues/new?labels=type%3A+accessibility&template=3-accessibility.md) to help us understand what we can improve.
+
+### Write documentation
+
+To edit or write technical content, refer to [Contribute to our documentation](/contribute/documentation/README.md). We welcome your expertise and input as our body of technical content grows.
+
 ### Triage issues
 
 If you don't have the knowledge or time to code, consider helping with _issue triage_. The community will thank you for saving them time by spending some of yours.
 
 Read more about the ways you can [Triage issues](/contribute/triage-issues.md).
 
-#### Security issues
+### Answering questions
 
-If you believe you've found a security vulnerability, please read our [security policy](https://github.com/grafana/grafana/security/policy) for more details on reporting.
+If you have a question and you can't find the answer in the [documentation](https://grafana.com/docs/), the next step is to ask it on the [community site](https://community.grafana.com/).
 
-### Suggest enhancements
+It's important to us to help these users, and we'd love your help. Sign up to our [community site](https://community.grafana.com/), and start helping other Grafana users by answering their questions.
 
-If you have an idea of how to improve Grafana, submit a [feature request](https://github.com/grafana/grafana/issues/new?template=1-feature_requests.md).
+### Your first contribution
 
-We want to make Grafana accessible to even more people. Submit an [accessibility issue](https://github.com/grafana/grafana/issues/new?template=2-accessibility.md) to help us understand what we can improve.
+Unsure where to begin contributing to Grafana? Start by browsing issues labeled `beginner friendly` or `help wanted`.
 
-### Write documentation
+- [Beginner-friendly](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) issues are generally straightforward to complete.
+- [Help wanted](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) issues are problems we would like the community to help us with regardless of complexity.
 
-To edit or write technical content, refer to [Contribute to our documentation](/contribute/documentation/README.md). We welcome your expertise and input as our body of technical content grows.
+If you're looking to make a code change, see how to set up your environment for [local development](contribute/developer-guide.md).
+
+When you're ready to contribute, it's time to [create a pull request](/contribute/create-pull-request.md).
 
 #### Contributor License Agreement (CLA)
 

Dockerfile

@@ -16,46 +16,34 @@ ARG JS_SRC=js-builder
 # By using FROM instructions we can delegate dependency updates to dependabot
 FROM alpine:3.21.3 AS alpine-base
 FROM ubuntu:22.04 AS ubuntu-base
-FROM golang:1.24.6-alpine AS go-builder-base
+FROM golang:1.24.4-alpine AS go-builder-base
 FROM --platform=${JS_PLATFORM} node:22-alpine AS js-builder-base
+
 # Javascript build stage
 FROM --platform=${JS_PLATFORM} ${JS_IMAGE} AS js-builder
-ARG JS_NODE_ENV=production
-ARG JS_YARN_INSTALL_FLAG=--immutable
-ARG JS_YARN_BUILD_FLAG=build
 
 ENV NODE_OPTIONS=--max_old_space_size=8000
 
 WORKDIR /tmp/grafana
 
-RUN apk add --no-cache make build-base python3
-
 COPY package.json project.json nx.json yarn.lock .yarnrc.yml ./
 COPY .yarn .yarn
 COPY packages packages
-COPY e2e-playwright e2e-playwright
 COPY public public
 COPY LICENSE ./
 COPY conf/defaults.ini ./conf/defaults.ini
 COPY e2e e2e
 
-#
-# Set the node env according to defaults or argument passed
-#
-ENV NODE_ENV=${JS_NODE_ENV}
-#
-RUN if [ "$JS_YARN_INSTALL_FLAG" = "" ]; then \
-    yarn install; \
-  else \
-    yarn install --immutable; \
-  fi
+RUN apk add --no-cache make build-base python3
+
+RUN yarn install --immutable
 
 COPY tsconfig.json eslint.config.js .editorconfig .browserslistrc .prettierrc.js ./
 COPY scripts scripts
 COPY emails emails
 
-# Set the build argument according to default or argument passed
-RUN yarn ${JS_YARN_BUILD_FLAG}
+ENV NODE_ENV=production
+RUN yarn build
 
 # Golang build stage
 FROM ${GO_IMAGE} AS go-builder
@@ -64,6 +52,7 @@ ARG COMMIT_SHA=""
 ARG BUILD_BRANCH=""
 ARG GO_BUILD_TAGS="oss"
 ARG WIRE_TAGS="oss"
+ARG BINGO="true"
 
 RUN if grep -i -q alpine /etc/issue; then \
   apk add --no-cache \
@@ -77,11 +66,12 @@ RUN if grep -i -q alpine /etc/issue; then \
 WORKDIR /tmp/grafana
 
 COPY go.* ./
+COPY .bingo .bingo
 COPY .citools .citools
 
-# Copy go dependencies first
-# If updating this, please also update devenv/frontend-service/backend.dockerfile
+# Include vendored dependencies
 COPY pkg/util/xorm pkg/util/xorm
+COPY pkg/apis/secret pkg/apis/secret
 COPY pkg/apiserver pkg/apiserver
 COPY pkg/apimachinery pkg/apimachinery
 COPY pkg/build pkg/build
@@ -93,25 +83,22 @@ COPY pkg/storage/unified/apistore pkg/storage/unified/apistore
 COPY pkg/semconv pkg/semconv
 COPY pkg/aggregator pkg/aggregator
 COPY apps/playlist apps/playlist
-COPY apps/plugins apps/plugins
-COPY apps/shorturl apps/shorturl
-COPY apps/preferences apps/preferences
-COPY apps/provisioning apps/provisioning
-COPY apps/secret apps/secret
 COPY apps/investigations apps/investigations
 COPY apps/advisor apps/advisor
 COPY apps/dashboard apps/dashboard
 COPY apps/folder apps/folder
-COPY apps/preferences apps/preferences
 COPY apps/iam apps/iam
 COPY apps apps
 COPY kindsv2 kindsv2
 COPY apps/alerting/notifications apps/alerting/notifications
-COPY apps/alerting/alertenrichment apps/alerting/alertenrichment
 COPY pkg/codegen pkg/codegen
 COPY pkg/plugins/codegen pkg/plugins/codegen
 
 RUN go mod download
+RUN if [[ "$BINGO" = "true" ]]; then \
+  go install github.com/bwplotka/bingo@latest && \
+  bingo get -v; \
+  fi
 
 COPY embed.go Makefile build.go package.json ./
 COPY cue.mod cue.mod

GOVERNANCE.md

@@ -7,6 +7,7 @@ This document describes the rules and governance of the project. It is meant to
 - **Maintainers**: Maintainers lead an individual project or parts thereof ([`MAINTAINERS.md`][maintainers]).
 
 - **Projects**: A single repository in the Grafana GitHub organization and listed below is referred to as a project:
+
   - clock-panel
   - devtools
   - gel-app

Makefile

@@ -5,10 +5,11 @@
 WIRE_TAGS = "oss"
 
 -include local/Makefile
+include .bingo/Variables.mk
 include .citools/Variables.mk
 
 GO = go
-GO_VERSION = 1.24.6
+GO_VERSION = 1.24.4
 GO_LINT_FILES ?= $(shell ./scripts/go-workspace/golangci-lint-includes.sh)
 GO_TEST_FILES ?= $(shell ./scripts/go-workspace/test-includes.sh)
 SH_FILES ?= $(shell find ./scripts -name *.sh)
@@ -167,7 +168,7 @@ gen-cuev2: ## Do all CUE code generation
 # TODO (@radiohead): uncomment once we want to start generating code for all apps.
 # For now, we want to use an explicit list of apps to generate code for.
 #
-#APPS_DIRS=$(shell find ./apps -type d -exec test -f "{}/Makefile" \; -print | sort)
+# APPS_DIRS=$(shell find ./apps -mindepth 1 -maxdepth 1 -type d | sort)
 APPS_DIRS := ./apps/dashboard ./apps/folder ./apps/alerting/notifications
 
 .PHONY: gen-apps
@@ -199,7 +200,7 @@ gen-enterprise-go: ## Generate Wire graph (Enterprise)
 	$(GO) run ./pkg/build/wire/cmd/wire/main.go gen -tags "enterprise" -gen_tags "(enterprise || pro)" -output_file_prefix="enterprise_" ./pkg/server
 endif
 gen-go: gen-enterprise-go ## Generate Wire graph
-	@echo "generating Wire graph"
+	@echo "generatng Wire graph"
 	$(GO) run ./pkg/build/wire/cmd/wire/main.go gen -tags "oss" -gen_tags "(!enterprise && !pro)" ./pkg/server
 
 .PHONY: fix-cue
@@ -262,8 +263,8 @@ build-plugin-go: ## Build decoupled plugins
 build: build-go build-js ## Build backend and frontend.
 
 .PHONY: run
-run: ## Build and run backend, and watch for changes. See .air.toml for configuration.
-	$(air) -c .air.toml
+run: ## Build and run web server on filesystem changes. See /.bra.toml for configuration.
+	$(bra) run
 
 .PHONY: run-go
 run-go: ## Build and run web server immediately.
@@ -274,17 +275,9 @@ run-go: ## Build and run web server immediately.
 run-frontend: deps-js ## Fetch js dependencies and watch frontend for rebuild
 	yarn start
 
-.PHONY: run-bra
-run-bra: ## [Deprecated] Build and run web server on filesystem changes. See /.bra.toml for configuration.
-	$(bra) run
-
-.PHONY: frontend-service-check
-frontend-service-check:
-	./devenv/frontend-service/local-init.sh
-
-.PHONY: frontend-service
-frontend-service: frontend-service-check
-	bash ./devenv/frontend-service/run.sh
+.PHONY: run-air
+run-air: ## [Experimental] Build and run backend, and watch for changes. See .air.toml for configuration. Check https://github.com/air-verse/air for installation instructions.
+	air -c .air.toml
 
 ##@ Testing
 
@@ -384,10 +377,6 @@ lint-go-diff:
 		sed 's,^,./,' | \
 		$(XARGSR) $(golangci-lint) run --config .golangci.yml
 
-.PHONY: gofmt
-gofmt: ## Run gofmt for all Go files.
-	gofmt -s -w .
-
 # with disabled SC1071 we are ignored some TCL,Expect `/usr/bin/env expect` scripts
 .PHONY: shellcheck
 shellcheck: $(SH_FILES) ## Run checks for shell scripts.
@@ -399,35 +388,13 @@ shellcheck: $(SH_FILES) ## Run checks for shell scripts.
 TAG_SUFFIX=$(if $(WIRE_TAGS)!=oss,-$(WIRE_TAGS))
 PLATFORM=linux/amd64
 
-# default to a production build for frontend
-#
-DOCKER_JS_NODE_ENV_FLAG = production
-DOCKER_JS_YARN_BUILD_FLAG = build
-DOCKER_JS_YARN_INSTALL_FLAG = --immutable
-#
-# if go is in dev mode, also build node in dev mode
-ifeq ($(GO_BUILD_DEV), dev)
-  DOCKER_JS_NODE_ENV_FLAG = dev
-  DOCKER_JS_YARN_BUILD_FLAG = dev
-	DOCKER_JS_YARN_INSTALL_FLAG =
-endif
-# if NODE_ENV is set in the environment to dev, build frontend in dev mode, and allow go builds to use their default
-ifeq (${NODE_ENV}, dev)
-  DOCKER_JS_NODE_ENV_FLAG = dev
-  DOCKER_JS_YARN_BUILD_FLAG = dev
-	DOCKER_JS_YARN_INSTALL_FLAG =
-endif
-
 .PHONY: build-docker-full
 build-docker-full: ## Build Docker image for development.
-	@echo "build docker container mode=($(DOCKER_JS_NODE_ENV_FLAG))"
+	@echo "build docker container"
 	tar -ch . | \
 	docker buildx build - \
 	--platform $(PLATFORM) \
-	--build-arg NODE_ENV=$(DOCKER_JS_NODE_ENV_FLAG) \
-	--build-arg JS_NODE_ENV=$(DOCKER_JS_NODE_ENV_FLAG) \
-	--build-arg JS_YARN_INSTALL_FLAG=$(DOCKER_JS_YARN_INSTALL_FLAG) \
-	--build-arg JS_YARN_BUILD_FLAG=$(DOCKER_JS_YARN_BUILD_FLAG) \
+	--build-arg BINGO=false \
 	--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
 	--build-arg WIRE_TAGS=$(WIRE_TAGS) \
 	--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
@@ -437,14 +404,11 @@ build-docker-full: ## Build Docker image for development.
 
 .PHONY: build-docker-full-ubuntu
 build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
-	@echo "build docker container mode=($(DOCKER_JS_NODE_ENV_FLAG))"
+	@echo "build docker container"
 	tar -ch . | \
 	docker buildx build - \
 	--platform $(PLATFORM) \
-	--build-arg NODE_ENV=$(DOCKER_JS_NODE_ENV_FLAG) \
-	--build-arg JS_NODE_ENV=$(DOCKER_JS_NODE_ENV_FLAG) \
-	--build-arg JS_YARN_INSTALL_FLAG=$(DOCKER_JS_YARN_INSTALL_FLAG) \
-	--build-arg JS_YARN_BUILD_FLAG=$(DOCKER_JS_YARN_BUILD_FLAG) \
+	--build-arg BINGO=false \
 	--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
 	--build-arg WIRE_TAGS=$(WIRE_TAGS) \
 	--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
@@ -507,7 +471,7 @@ protobuf: ## Compile protobuf definitions
 	go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.5
 	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.4.0
 	buf generate pkg/plugins/backendplugin/pluginextensionv2 --template pkg/plugins/backendplugin/pluginextensionv2/buf.gen.yaml
-	buf generate apps/secret --template apps/secret/buf.gen.yaml
+	buf generate pkg/apis/secret/v0alpha1/decrypt --template pkg/apis/secret/v0alpha1/decrypt/buf.gen.yaml
 	buf generate pkg/storage/unified/proto --template pkg/storage/unified/proto/buf.gen.yaml
 	buf generate pkg/services/authz/proto/v1 --template pkg/services/authz/proto/v1/buf.gen.yaml
 	buf generate pkg/services/ngalert/store/proto/v1 --template pkg/services/ngalert/store/proto/v1/buf.gen.yaml
@@ -525,6 +489,25 @@ gen-ts:
 	tscriptify -interface -package=github.com/grafana/grafana/pkg/services/live/pipeline -import="import { FieldConfig } from '@grafana/data'" -target=public/app/features/live/pipeline/models.gen.ts pkg/services/live/pipeline/config.go
 	go mod tidy
 
+# This repository's configuration is protected (https://readme.drone.io/signature/).
+# Use this make target to regenerate the configuration YAML files when
+# you modify starlark files.
+.PHONY: drone
+drone: $(DRONE)
+	bash scripts/drone/env-var-check.sh
+	$(DRONE) starlark --format
+	$(DRONE) lint .drone.yml --trusted
+	$(DRONE) --server https://drone.grafana.net sign --save grafana/grafana
+
+# Generate an Emacs tags table (https://www.gnu.org/software/emacs/manual/html_node/emacs/Tags-Tables.html) for Starlark files.
+.PHONY: scripts/drone/TAGS
+scripts/drone/TAGS: $(shell find scripts/drone -name '*.star')
+	etags --lang none --regex="/def \(\w+\)[^:]+:/\1/" --regex="/\s*\(\w+\) =/\1/" $^ -o $@
+
+.PHONY: format-drone
+format-drone:
+	buildifier --lint=fix -r scripts/drone
+
 .PHONY: go-race-is-enabled
 go-race-is-enabled:
 	@if [ -n "$(GO_RACE)" ]; then \
@@ -551,3 +534,4 @@ help: ## Display this help.
 # container/check-licenses target)
 check-licenses:
 	license_finder --decisions-file .github/license_finder.yaml
+