apply security patch: v11.1.x/0001-Alerting-Fix-permission-on-external-rule-write-endpo.patch

commit 0c592dfe8f7ac36607dbe888178228ba226995ad
Author: Alex Weaver <weaver.alex.d@gmail.com>
Date:   Thu Aug 22 11:54:30 2024 -0500

    Alerting: Fix permission on external rule write endpoint

.betterer.eslint.config.js

@@ -1,114 +0,0 @@
-// @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');
-
-// 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,
-    },
-    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.',
-            },
-          ],
-        },
-      ],
-    },
-  },
-  {
-    files: ['**/*.{ts,tsx}'],
-    ignores: ['**/*.{test,spec}.{ts,tsx}', '**/__mocks__/**', '**/public/test/**'],
-    rules: {
-      '@typescript-eslint/consistent-type-assertions': ['error', { assertionStyle: 'never' }],
-    },
-  },
-  {
-    files: ['public/app/**/*.{ts,tsx}'],
-    rules: {
-      'no-barrel-files/no-barrel-files': 'error',
-    },
-  },
-  {
-    files: ['public/**/*.tsx', 'packages/grafana-ui/**/*.tsx'],
-    ignores: ['public/app/plugins/**', '**/*.story.tsx', '**/*.{test,spec}.{ts,tsx}', '**/__mocks__/', 'public/test'],
-    rules: {
-      '@grafana/no-untranslated-strings': 'error',
-    },
-  },
-];

.betterer.ts

@@ -1,14 +1,15 @@
 import { BettererFileTest } from '@betterer/betterer';
-import { ESLint } from 'eslint';
 import { promises as fs } from 'fs';
+import { ESLint, Linter } from 'eslint';
+import path from 'path';
+import { glob } from 'glob';
 
 // Why are we ignoring these?
 // They're all deprecated/being removed so doesn't make sense to fix types
 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
+  'public/app/angular', // will be removed in Grafana 11
+  'public/app/plugins/panel/graph', // will be removed alongside angular
+  'public/app/plugins/panel/table-old', // will be removed alongside angular
 ];
 
 // Avoid using functions that report the position of the issues, as this causes a lot of merge conflicts
@@ -19,9 +20,10 @@ export default {
       .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')),
+    regexp(
+      /gf-form/gm,
+      'gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.'
+    ).include('**/*.{ts,tsx,html}'),
 };
 
 function countUndocumentedStories() {
@@ -72,26 +74,88 @@ function regexp(pattern: RegExp, issueMessage: string) {
 }
 
 function countEslintErrors() {
-  return new BettererFileTest(async (filePaths, fileTestResult) => {
+  return new BettererFileTest(async (filePaths, fileTestResult, resolver) => {
     // 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 { baseDirectory } = resolver;
+    const cli = new ESLint({ cwd: baseDirectory });
+
+    // Get the base config to set up parsing etc correctly
+    // this is by far the slowest part of this code. It takes eslint about 2 seconds just to find the config
+    const baseConfig = await cli.calculateConfigForFile(filePaths[0]);
+
+    const baseRules: Partial<Linter.RulesRecord> = {
+      '@emotion/syntax-preference': [2, 'object'],
+      '@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.',
+            },
+          ],
+        },
+      ],
+    };
+
+    const config: Linter.Config = {
+      ...baseConfig,
+      rules: baseRules,
+
+      // Be careful when specifying overrides for the same rules as in baseRules - it will... override
+      // the same rule, not merge them with different configurations
+      overrides: [
+        {
+          files: ['**/*.{ts,tsx}'],
+          excludedFiles: ['*.{test,spec}.{ts,tsx}', '**/__mocks__/**', '**/public/test/**'],
+          rules: {
+            '@typescript-eslint/consistent-type-assertions': ['error', { assertionStyle: 'never' }],
+          },
+        },
+
+        {
+          files: ['public/app/**/*.{ts,tsx}'],
+          rules: {
+            'no-barrel-files/no-barrel-files': 'error',
+          },
+        },
+        {
+          files: ['public/**/*.tsx', 'packages/grafana-ui/**/*.tsx'],
+          excludedFiles: [
+            'public/app/plugins/**',
+            '*.story.tsx',
+            '*.{test,spec}.{ts,tsx}',
+            '**/__mocks__/**',
+            'public/test/**',
+          ],
+          rules: {
+            '@grafana/no-untranslated-strings': 'error',
+          },
+        },
+      ],
+    };
+
     const runner = new ESLint({
-      overrideConfigFile: './.betterer.eslint.config.js',
-      warnIgnored: false,
+      baseConfig: config,
+      useEslintrc: false,
+      cwd: baseDirectory,
     });
 
     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) => {
+    lintResults
+      .filter((lintResult) => lintResult.source)
+      .forEach(({ messages, filePath }) => {
+        const file = fileTestResult.addFile(filePath, '');
+        messages.forEach((message, index) => {
           file.addIssue(0, 0, message.message, `${index}`);
         });
-    });
+      });
   });
 }

.bingo/Variables.mk

@@ -35,11 +35,11 @@ $(DRONE): $(BINGO_DIR)/drone.mod
 	@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"
 
-GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.62.0
+GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.59.0
 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.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)/golangci-lint-v1.62.0"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.62.0 "github.com/golangci/golangci-lint/cmd/golangci-lint"
+	@echo "(re)installing $(GOBIN)/golangci-lint-v1.59.0"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.59.0 "github.com/golangci/golangci-lint/cmd/golangci-lint"
 
 JB := $(GOBIN)/jb-v0.5.1
 $(JB): $(BINGO_DIR)/jb.mod
@@ -53,9 +53,11 @@ $(LEFTHOOK): $(BINGO_DIR)/lefthook.mod
 	@echo "(re)installing $(GOBIN)/lefthook-v1.4.8"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=lefthook.mod -o=$(GOBIN)/lefthook-v1.4.8 "github.com/evilmartians/lefthook"
 
-SWAGGER := $(GOBIN)/swagger-v0.30.6-0.20240310114303-db51e79a0e37
+# swagger 0.30.5 isn't compatibile with go 1.22 yet so pinning to a specific commit until there's a new release
+# https://github.com/go-swagger/go-swagger/issues/3070
+SWAGGER := $(GOBIN)/swagger-db51e79a0e37c572d8b59ae0c58bf2bbbbe53285
 $(SWAGGER): $(BINGO_DIR)/swagger.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)/swagger-v0.30.6-0.20240310114303-db51e79a0e37"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=swagger.mod -o=$(GOBIN)/swagger-v0.30.6-0.20240310114303-db51e79a0e37 "github.com/go-swagger/go-swagger/cmd/swagger"
+	@echo "(re)installing $(GOBIN)/swagger-db51e79a0e37c572d8b59ae0c58bf2bbbbe53285"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=swagger.mod -o=$(GOBIN)/swagger-db51e79a0e37c572d8b59ae0c58bf2bbbbe53285 "github.com/go-swagger/go-swagger/cmd/swagger"
 

.bingo/drone.sum

@@ -46,7 +46,6 @@ github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod h1:XB
 github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
 github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
 github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
-github.com/Microsoft/go-winio v0.4.17 h1:iT12IBVClFevaf8PuVyi3UmZOVh4OqnaLxDTW2O6j3w=
 github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
 github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
 github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
@@ -879,7 +878,6 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=

.bingo/golangci-lint.mod

@@ -1,5 +1,7 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.23
+go 1.22
 
-require github.com/golangci/golangci-lint v1.62.0 // cmd/golangci-lint
+toolchain go1.22.4
+
+require github.com/golangci/golangci-lint v1.59.0 // cmd/golangci-lint

.bingo/variables.env

@@ -14,7 +14,7 @@ CUE="${GOBIN}/cue-v0.5.0"
 
 DRONE="${GOBIN}/drone-v1.5.0"
 
-GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.62.0"
+GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.59.0"
 
 JB="${GOBIN}/jb-v0.5.1"
 

.bra.toml

@@ -2,12 +2,11 @@
 init_cmds = [
   ["GO_BUILD_DEV=1", "make", "build-go"],
   ["make", "gen-jsonnet"],
-  ["./bin/grafana", "server", "-profile", "-profile-addr=127.0.0.1", "-profile-port=6000", "-profile-block-rate=1", "-profile-mutex-rate=5", "-packaging=dev", "cfg:app_mode=development"]
+  ["./bin/grafana", "server", "-packaging=dev", "cfg:app_mode=development"]
 ]
 watch_all = true
 follow_symlinks = true
 watch_dirs = [
-  "$WORKDIR/apps",
   "$WORKDIR/pkg",
   "$WORKDIR/public/views",
   "$WORKDIR/conf",
@@ -17,7 +16,7 @@ watch_exts = [".go", ".ini", ".toml", ".template.html"]
 ignore_files = [".*_gen.go"]
 build_delay = 1500
 cmds = [
-  ["GO_BUILD_DEV=1", "make", "build-go-fast"],
+  ["GO_BUILD_DEV=1", "make", "build-go"],
   ["make", "gen-jsonnet"],
-  ["./bin/grafana", "server", "-profile", "-profile-addr=127.0.0.1", "-profile-port=6000", "-profile-block-rate=1", "-profile-mutex-rate=5", "-packaging=dev", "cfg:app_mode=development"]
+  ["./bin/grafana", "server", "-packaging=dev", "cfg:app_mode=development"]
 ]

.drone.star

@@ -17,11 +17,18 @@ load(
     "publish_npm_pipelines",
     "publish_packages_pipeline",
 )
-load("scripts/drone/events/rrc-patch.star", "rrc_patch_pipelines")
+load(
+    "scripts/drone/pipelines/ci_images.star",
+    "publish_ci_windows_test_image_pipeline",
+)
 load(
     "scripts/drone/pipelines/publish_images.star",
     "publish_image_pipelines_public",
 )
+load(
+    "scripts/drone/pipelines/windows.star",
+    "windows_test_backend",
+)
 load(
     "scripts/drone/rgm.star",
     "rgm",
@@ -32,13 +39,17 @@ 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() +
+        [windows_test_backend({
+            "event": ["promote"],
+            "target": ["test-windows"],
+        }, "oss", "testing")] +
         integration_test_pipelines() +
+        publish_ci_windows_test_image_pipeline() +
         cronjobs() +
         secrets()
     )

.eslintignore

@@ -0,0 +1,25 @@
+.git
+.github
+.yarn
+build
+compiled
+/data
+deployment_tools_config.json
+/devenv
+dist
+/e2e/tmp
+node_modules
+/pkg
+/public/lib/monaco
+/scripts/grafana-server/tmp
+vendor
+
+# TS generate from cue by cuetsy
+**/*.gen.ts
+
+# Auto-generated internationalization files
+/public/locales/_build/
+/public/locales/**/*.js
+
+# Auto-generated icon file
+/packages/grafana-ui/src/components/Icon/iconBundle.ts

.eslintrc

@@ -0,0 +1,151 @@
+{
+  "extends": ["@grafana/eslint-config"],
+  "root": true,
+  "plugins": ["@emotion", "lodash", "jest", "import", "jsx-a11y", "@grafana", "no-barrel-files"],
+  "settings": {
+    "import/internal-regex": "^(app/)|(@grafana)",
+    "import/external-module-folders": ["node_modules", ".yarn"],
+  },
+  "rules": {
+    "@grafana/no-border-radius-literal": "error",
+    "@grafana/no-unreduced-motion": "error",
+    "react/prop-types": "off",
+    // need to ignore emotion's `css` prop, see https://github.com/jsx-eslint/eslint-plugin-react/blob/master/docs/rules/no-unknown-property.md#rule-options
+    "react/no-unknown-property": ["error", { "ignore": ["css"] }],
+    "@emotion/jsx-import": "error",
+    "lodash/import-scope": [2, "member"],
+    "jest/no-focused-tests": "error",
+    "import/order": [
+      "error",
+      {
+        "groups": [["builtin", "external"], "internal", "parent", "sibling", "index"],
+        "newlines-between": "always",
+        "alphabetize": { "order": "asc" },
+      },
+    ],
+    "no-restricted-imports": [
+      "error",
+      {
+        "paths": [
+          {
+            "name": "react-redux",
+            "importNames": ["useDispatch", "useSelector"],
+            "message": "Please import from app/types instead.",
+          },
+          {
+            "name": "react-i18next",
+            "importNames": ["Trans", "t"],
+            "message": "Please import from app/core/internationalization instead",
+          },
+        ],
+      },
+    ],
+
+    // Use typescript's no-redeclare for compatibility with overrides
+    "no-redeclare": "off",
+    "@typescript-eslint/no-redeclare": ["error"],
+  },
+  "overrides": [
+    {
+      "files": ["packages/grafana-ui/src/components/uPlot/**/*.{ts,tsx}"],
+      "rules": {
+        "react-hooks/rules-of-hooks": "off",
+        "react-hooks/exhaustive-deps": "off",
+      },
+    },
+    {
+      "files": ["packages/grafana-ui/src/components/ThemeDemos/**/*.{ts,tsx}"],
+      "rules": {
+        "@emotion/jsx-import": "off",
+        "react/jsx-uses-react": "off",
+        "react/react-in-jsx-scope": "off",
+      },
+    },
+    {
+      "files": ["public/dashboards/scripted*.js"],
+      "rules": {
+        "no-redeclare": "error",
+        "@typescript-eslint/no-redeclare": "off",
+      },
+    },
+    {
+      "extends": ["plugin:jsx-a11y/recommended"],
+      "files": ["**/*.tsx"],
+      "excludedFiles": ["**/*.{spec,test}.tsx"],
+      "rules": {
+        // rules marked "off" are those left in the recommended preset we need to fix
+        // we should remove the corresponding line and fix them one by one
+        // any marked "error" contain specific overrides we'll need to keep
+        "jsx-a11y/no-autofocus": [
+          "error",
+          {
+            "ignoreNonDOM": true,
+          },
+        ],
+        "jsx-a11y/label-has-associated-control": [
+          "error",
+          {
+            "controlComponents": ["NumberInput"],
+            "depth": 2,
+          },
+        ],
+      },
+    },
+    {
+      "files": [
+        "public/app/plugins/datasource/azuremonitor/*.{ts,tsx}",
+        "public/app/plugins/datasource/azuremonitor/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/cloud-monitoring/*.{ts,tsx}",
+        "public/app/plugins/datasource/cloud-monitoring/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/elasticsearch/*.{ts,tsx}",
+        "public/app/plugins/datasource/elasticsearch/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/grafana-postgresql-datasource/*.{ts,tsx}",
+        "public/app/plugins/datasource/grafana-postgresql-datasource/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/grafana-pyroscope-datasource/*.{ts,tsx}",
+        "public/app/plugins/datasource/grafana-pyroscope-datasource/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/grafana-testdata-datasource/*.{ts,tsx}",
+        "public/app/plugins/datasource/grafana-testdata-datasource/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/jaeger/*.{ts,tsx}",
+        "public/app/plugins/datasource/jaeger/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/loki/*.{ts,tsx}",
+        "public/app/plugins/datasource/loki/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/mysql/*.{ts,tsx}",
+        "public/app/plugins/datasource/mysql/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/parca/*.{ts,tsx}",
+        "public/app/plugins/datasource/parca/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/tempo/*.{ts,tsx}",
+        "public/app/plugins/datasource/tempo/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/loki/*.{ts,tsx}",
+        "public/app/plugins/datasource/loki/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/elasticsearch/*.{ts,tsx}",
+        "public/app/plugins/datasource/elasticsearch/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/cloudwatch/*.{ts,tsx}",
+        "public/app/plugins/datasource/cloudwatch/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/zipkin/*.{ts,tsx}",
+        "public/app/plugins/datasource/zipkin/**/*.{ts,tsx}",
+      ],
+      "settings": {
+        "import/resolver": {
+          "node": {
+            "extensions": [".ts", ".tsx"],
+          },
+        },
+      },
+      "rules": {
+        "import/no-restricted-paths": [
+          "error",
+          {
+            "zones": [
+              {
+                "target": "./public/app/plugins",
+                "from": "./public",
+                "except": ["./app/plugins"],
+                "message": "Core plugins are not allowed to depend on Grafana core packages",
+              },
+            ],
+          },
+        ],
+      },
+    },
+  ],
+}

.github/CODEOWNERS

@@ -12,8 +12,8 @@
 # This should make it easy to add new rules without breaking existing ones.
 
 # Documentation
-/.changelog-archive @grafana/grafana-developer-enablement-squad
-/CHANGELOG.md @grafana/grafana-developer-enablement-squad
+/.changelog-archive @grafana/grafana-release-guild
+/CHANGELOG.md @grafana/grafana-release-guild
 /CODE_OF_CONDUCT.md @grafana/grafana-community-support
 /CONTRIBUTING.md @grafana/grafana-community-support
 /GOVERNANCE.md @RichiH
@@ -36,17 +36,23 @@
 /docs/                                                                            @grafana/docs-tooling
 
 /docs/.codespellignore                                                            @grafana/docs-tooling
-/docs/sources/                                                                    @irenerl24
+/docs/sources/                                                                    @Eve832
 
+/docs/sources/administration/                                                     @jdbaldry
 /docs/sources/alerting/                                                           @brendamuir
 /docs/sources/dashboards/                                                         @imatwawana
-/docs/sources/datasources/                                                        @lwandz13
+/docs/sources/datasources/                                                        @jdbaldry
+/docs/sources/explore/                                                            @grafana/explore-squad @lwandz13
+/docs/sources/fundamentals                                                        @chri2547
+/docs/sources/getting-started/                                                    @chri2547
+/docs/sources/introduction/                                                       @chri2547
 /docs/sources/panels-visualizations/                                              @imatwawana
-/docs/sources/release-notes/                                                      @irenerl24 @GrafanaWriter
+/docs/sources/release-notes/                                                      @Eve832 @GrafanaWriter
+/docs/sources/setup-grafana/                                                      @chri2547
 /docs/sources/upgrade-guide/                                                      @imatwawana
 /docs/sources/whatsnew/                                                           @imatwawana
 
-/docs/sources/developers/plugins/                                                 @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
+/docs/sources/developers/plugins/                                                 @Eve832 @josmperez @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
 
 /docs/sources/panels-visualizations/query-transform-data/transform-data/index.md  @imatwawana @baldm0mma
 # END Technical documentation
@@ -60,41 +66,27 @@
 /pkg/README.md @grafana/grafana-backend-group
 /pkg/ruleguard.rules.go @grafana/grafana-backend-group
 /.bra.toml @grafana/grafana-backend-group
-/.golangci.yml @grafana/grafana-backend-group
+/.golangci.toml @grafana/grafana-backend-group
 /build.go @grafana/grafana-backend-services-squad
 /scripts/modowners/ @grafana/grafana-backend-services-squad
-/scripts/go-workspace @grafana/grafana-app-platform-squad
 /hack/ @grafana/grafana-app-platform-squad
 
-/apps/alerting/ @grafana/alerting-backend @grafana/alerting-frontend
-/apps/playlist/ @grafana/grafana-app-platform-squad
-/apps/investigation/ @fcjack @matryer
 /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/bus/ @grafana/grafana-search-and-storage
 /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
-/pkg/cmd/grafana-cli/commands/listremote_command.go @grafana/plugins-platform-backend
-/pkg/cmd/grafana-cli/commands/listversions_command.go @grafana/plugins-platform-backend
-/pkg/cmd/grafana-cli/commands/ls_command_test.go @grafana/plugins-platform-backend
-/pkg/cmd/grafana-cli/commands/ls_command.go @grafana/plugins-platform-backend
-/pkg/cmd/grafana-cli/commands/remove_command.go @grafana/plugins-platform-backend
-/pkg/cmd/grafana-cli/commands/upgrade_command.go @grafana/plugins-platform-backend
-/pkg/cmd/grafana-cli/commands/upgrade_all_command.go @grafana/plugins-platform-backend
-/pkg/cmd/grafana-cli/commands/upgrade_all_command_test.go @grafana/plugins-platform-backend
-/pkg/components/apikeygen/ @grafana/identity-squad
-/pkg/components/satokengen/ @grafana/identity-squad
+/pkg/cmd/grafana/apiserver @grafana/grafana-app-platform-squad
+/pkg/components/apikeygen/ @grafana/identity-access-team
+/pkg/components/satokengen/ @grafana/identity-access-team
 /pkg/components/dashdiffs/ @grafana/grafana-app-platform-squad
-/pkg/components/imguploader/ @grafana/alerting-backend
+/pkg/components/imguploader/ @grafana/grafana-backend-group
 /pkg/components/loki/ @grafana/grafana-backend-group
 /pkg/components/null/ @grafana/grafana-backend-group
 /pkg/components/simplejson/ @grafana/grafana-backend-group
 /pkg/events/ @grafana/grafana-backend-group
 /pkg/extensions/ @grafana/grafana-backend-group
 /pkg/ifaces/ @grafana/grafana-backend-group
+/pkg/infra/appcontext/ @grafana/grafana-backend-group
 /pkg/infra/db/ @grafana/grafana-backend-group
 /pkg/infra/localcache/ @grafana/grafana-backend-group
 /pkg/infra/log/ @grafana/grafana-backend-group
@@ -109,20 +101,15 @@
 /pkg/middleware/ @grafana/grafana-backend-group
 /pkg/mocks/ @grafana/grafana-backend-group
 /pkg/models/ @grafana/grafana-backend-group
-/pkg/semconv/ @grafana/grafana-backend-group
 /pkg/server/ @grafana/grafana-backend-group
 /pkg/apiserver @grafana/grafana-app-platform-squad
-/pkg/aggregator @grafana/grafana-app-platform-squad
 /pkg/apimachinery @grafana/grafana-app-platform-squad
-/pkg/apimachinery/identity/ @grafana/identity-squad
-/pkg/apimachinery/errutil/ @grafana/grafana-backend-group
-/pkg/promlib @grafana/oss-big-tent
-/pkg/storage/ @grafana/grafana-search-and-storage
+/pkg/promlib @grafana/observability-metrics
 /pkg/services/annotations/ @grafana/grafana-search-and-storage
-/pkg/services/apikey/ @grafana/identity-squad
+/pkg/services/apikey/ @grafana/identity-access-team
 /pkg/services/cleanup/ @grafana/grafana-backend-group
-/pkg/services/contexthandler/ @grafana/grafana-backend-group @grafana/grafana-app-platform-squad
-/pkg/services/correlations/ @grafana/dataviz-squad
+/pkg/services/contexthandler/ @grafana/grafana-backend-group
+/pkg/services/correlations/ @grafana/explore-squad
 /pkg/services/dashboardimport/ @grafana/grafana-backend-group
 /pkg/services/dashboards/ @grafana/grafana-app-platform-squad
 /pkg/services/dashboardversion/ @grafana/grafana-backend-group
@@ -138,9 +125,8 @@
 /pkg/services/playlist/ @grafana/grafana-app-platform-squad
 /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-app-platform-squad
-/pkg/services/queryhistory/ @grafana/observability-traces-and-profiling
+/pkg/services/queryhistory/ @grafana/grafana-app-platform-squad
 /pkg/services/quota/ @grafana/grafana-search-and-storage
 /pkg/services/screenshot/ @grafana/grafana-backend-group
 /pkg/services/search/ @grafana/grafana-search-and-storage
@@ -148,28 +134,28 @@
 /pkg/services/secrets/ @grafana/grafana-operator-experience-squad
 /pkg/services/shorturls/ @grafana/grafana-backend-group
 /pkg/services/sqlstore/ @grafana/grafana-search-and-storage
-/pkg/services/ssosettings/ @grafana/identity-squad
+/pkg/services/ssosettings/ @grafana/identity-access-team
 /pkg/services/star/ @grafana/grafana-search-and-storage
 /pkg/services/stats/ @grafana/grafana-backend-group
 /pkg/services/tag/ @grafana/grafana-search-and-storage
-/pkg/services/team/ @grafana/access-squad
+/pkg/services/team/ @grafana/identity-access-team
 /pkg/services/temp_user/ @grafana/grafana-backend-group
 /pkg/services/updatechecker/ @grafana/grafana-backend-group
-/pkg/services/user/ @grafana/access-squad
+/pkg/services/user/ @grafana/identity-access-team
 /pkg/services/validations/ @grafana/grafana-backend-group
 /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/api/correlations/ @grafana/dataviz-squad
+/pkg/tests/api/correlations/ @grafana/explore-squad
 /pkg/tsdb/grafanads/ @grafana/grafana-backend-group
-/pkg/tsdb/opentsdb/ @grafana/partner-datasources
+/pkg/tsdb/opentsdb/ @grafana/grafana-backend-group
 /pkg/util/ @grafana/grafana-backend-group
 /pkg/web/ @grafana/grafana-backend-group
 
 /pkg/infra/kvstore/ @grafana/grafana-backend-group
 /pkg/infra/fs/ @grafana/grafana-backend-group
+/pkg/infra/x/ @grafana/grafana-backend-group
+
 
 # devenv
 # Backend code, developers environment
@@ -177,8 +163,8 @@
 
 # Logs code, developers environment
 /devenv/docker/blocks/loki* @grafana/observability-logs
-/devenv/docker/blocks/elastic* @grafana/aws-datasources
-/devenv/docker/blocks/self-instrumentation* @grafana/oss-big-tent
+/devenv/docker/blocks/elastic* @grafana/observability-logs
+/devenv/docker/blocks/self-instrumentation* @grafana/observability-metrics
 
 /devenv/bulk-dashboards/ @grafana/dashboards-squad
 /devenv/bulk-folders/ @grafana/grafana-frontend-platform
@@ -188,71 +174,22 @@
 /devenv/datasources.yaml @grafana/grafana-backend-group
 /devenv/datasources_docker.yaml @grafana/grafana-backend-group
 /devenv/dev-dashboards-without-uid/ @grafana/dashboards-squad
-
-/devenv/dev-dashboards/annotations @grafana/dataviz-squad
-/devenv/dev-dashboards/migrations @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-barchart @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-bargauge @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-candlestick @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-canvas @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-datagrid @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-gauge @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-geomap @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-graph @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-heatmap @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-histogram @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-library @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-piechart @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-stat @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-table @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-timeline @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-timeseries @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-trend @grafana/dataviz-squad
-/devenv/dev-dashboards/panel-xychart @grafana/dataviz-squad
-/devenv/dev-dashboards/transforms @grafana/dataviz-squad
-/devenv/dev-dashboards/all-panels.json @grafana/dataviz-squad
-/devenv/dev-dashboards/dashboards.go @grafana/dataviz-squad
-/devenv/dev-dashboards/home.json @grafana/dataviz-squad
-
-/devenv/dev-dashboards/datasource-elasticsearch/ @grafana/aws-datasources
-/devenv/dev-dashboards/datasource-opentsdb/ @grafana/partner-datasources
-/devenv/dev-dashboards/datasource-influxdb/ @grafana/partner-datasources
-/devenv/dev-dashboards/datasource-mssql/ @grafana/partner-datasources
-/devenv/dev-dashboards/datasource-loki/ @grafana/plugins-platform-frontend
-/devenv/dev-dashboards/datasource-testdata/ @grafana/plugins-platform-frontend
-/devenv/dev-dashboards/datasource-mysql/ @grafana/oss-big-tent
-/devenv/dev-dashboards/datasource-postgres/ @grafana/oss-big-tent
-
-/devenv/dev-dashboards/e2e-repeats/ @grafana/grafana-frontend-platform
-/devenv/dev-dashboards/panel-text @grafana/grafana-frontend-platform
-/devenv/dev-dashboards/scenarios @grafana/grafana-frontend-platform
-
-/devenv/dev-dashboards/feature-templating/ @grafana/dashboards-squad
-/devenv/dev-dashboards/panel-common @grafana/dashboards-squad
-/devenv/dev-dashboards/panel-dashlist @grafana/dashboards-squad
-/devenv/dev-dashboards/live @grafana/dashboards-squad
-
-/devenv/dev-dashboards/panel-flamegraph/ @grafana/observability-traces-and-profiling
-/devenv/dev-dashboards/panel-polystat @grafana/plugins-platform-frontend
-/devenv/dev-dashboards/extensions/ @grafana/plugins-platform-frontend
-
+/devenv/dev-dashboards/ @grafana/dashboards-squad
 /devenv/docker/blocks/alert_webhook_listener/ @grafana/alerting-backend
-/devenv/docker/blocks/caddy_tls/ @grafana/alerting-backend
 /devenv/docker/blocks/clickhouse/ @grafana/partner-datasources
 /devenv/docker/blocks/collectd/ @grafana/observability-metrics
 /devenv/docker/blocks/etcd @grafana/grafana-app-platform-squad
 /devenv/docker/blocks/grafana/ @grafana/grafana-as-code
-/devenv/docker/blocks/graphite/ @grafana/partner-datasources
-/devenv/docker/blocks/graphite09/ @grafana/partner-datasources
-/devenv/docker/blocks/graphite1/ @grafana/partner-datasources
-/devenv/docker/blocks/influxdb/ @grafana/partner-datasources
-/devenv/docker/blocks/influxdb1/ @grafana/partner-datasources
-/devenv/docker/blocks/jaeger/ @grafana/oss-big-tent
+/devenv/docker/blocks/graphite/ @grafana/observability-metrics
+/devenv/docker/blocks/graphite09/ @grafana/observability-metrics
+/devenv/docker/blocks/graphite1/ @grafana/observability-metrics
+/devenv/docker/blocks/influxdb/ @grafana/observability-metrics
+/devenv/docker/blocks/influxdb1/ @grafana/observability-metrics
+/devenv/docker/blocks/jaeger/ @grafana/observability-traces-and-profiling
 /devenv/docker/blocks/maildev/ @grafana/alerting-frontend
 /devenv/docker/blocks/mariadb/ @grafana/oss-big-tent
 /devenv/docker/blocks/memcached/ @grafana/grafana-backend-group
 /devenv/docker/blocks/mimir_backend/ @grafana/alerting-backend
-/devenv/docker/blocks/mqtt/ @grafana/alerting-backend
 /devenv/docker/blocks/mssql/ @grafana/partner-datasources
 /devenv/docker/blocks/mssql_arm64/ @grafana/partner-datasources
 /devenv/docker/blocks/mssql_tests/ @grafana/partner-datasources
@@ -261,13 +198,11 @@
 /devenv/docker/blocks/mysql_exporter/ @grafana/oss-big-tent
 /devenv/docker/blocks/mysql_opendata/ @grafana/oss-big-tent
 /devenv/docker/blocks/mysql_tests/ @grafana/oss-big-tent
-/devenv/docker/blocks/opentsdb/ @grafana/partner-datasources
+/devenv/docker/blocks/opentsdb/ @grafana/observability-metrics
 /devenv/docker/blocks/postgres/ @grafana/oss-big-tent
 /devenv/docker/blocks/postgres_tests/ @grafana/oss-big-tent
-/devenv/docker/blocks/prometheus/ @grafana/oss-big-tent
-/devenv/docker/blocks/prometheus_random_data/ @grafana/oss-big-tent
-/devenv/docker/blocks/prometheus_high_card/ @grafana/oss-big-tent
-/devenv/docker/blocks/prometheus_utf8/ @grafana/oss-big-tent
+/devenv/docker/blocks/prometheus/ @grafana/observability-metrics
+/devenv/docker/blocks/prometheus_random_data/ @grafana/observability-metrics
 /devenv/docker/blocks/pyroscope/ @grafana/observability-traces-and-profiling
 /devenv/docker/blocks/redis/ @bergquist
 /devenv/docker/blocks/sensugo/ @grafana/grafana-backend-group
@@ -275,7 +210,7 @@
 /devenv/docker/blocks/smtp/ @bergquist
 /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/zipkin/ @grafana/observability-traces-and-profiling
 /devenv/docker/blocks/webdav/ @grafana/alerting-backend
 /devenv/docker/buildcontainer/ @bergquist
 /devenv/docker/compose_header.yml @grafana/grafana-backend-services-squad
@@ -285,10 +220,9 @@
 /devenv/docker/loadtest/ @grafana/grafana-backend-services-squad
 /devenv/docker/rpmtest/ @grafana/grafana-backend-services-squad
 /devenv/jsonnet/ @grafana/dataviz-squad
-/devenv/local_cdn/ @grafana/frontend-ops
 /devenv/local-npm/ @grafana/frontend-ops
+/devenv/vscode/ @grafana/frontend-ops
 /devenv/setup.sh @grafana/grafana-backend-services-squad
-/devenv/plugins.yaml @grafana/plugins-platform-frontend
 
 # Emails
 /emails/ @grafana/alerting-frontend
@@ -298,16 +232,15 @@
 
 
 # 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
-/Makefile @grafana/grafana-developer-enablement-squad
-/scripts/build/ @grafana/grafana-developer-enablement-squad
-/scripts/list-release-artifacts.sh @grafana/grafana-developer-enablement-squad
-/.trivyignore @grafana/grafana-backend-services-squad
+.drone.yml @grafana/grafana-release-guild
+.drone.star @grafana/grafana-release-guild
+/scripts/drone/ @grafana/grafana-release-guild
+/pkg/build/ @grafana/grafana-release-guild
+/.dockerignore @grafana/grafana-release-guild
+/Dockerfile @grafana/grafana-release-guild
+/Makefile @grafana/grafana-release-guild
+/scripts/build/ @grafana/grafana-release-guild
+/scripts/list-release-artifacts.sh @grafana/grafana-release-guild
 
 # OSS Plugin Partnerships backend code
 /pkg/tsdb/cloudwatch/ @grafana/aws-datasources
@@ -315,23 +248,21 @@
 /pkg/tsdb/cloud-monitoring/ @grafana/partner-datasources
 
 # Observability backend code
-/pkg/tsdb/prometheus/ @grafana/oss-big-tent
-/pkg/tsdb/elasticsearch/ @grafana/aws-datasources
+/pkg/tsdb/prometheus/ @grafana/observability-metrics
+/pkg/tsdb/influxdb/ @grafana/observability-metrics
+/pkg/tsdb/elasticsearch/ @grafana/observability-logs
+/pkg/tsdb/graphite/ @grafana/observability-metrics
 /pkg/tsdb/loki/ @grafana/observability-logs
 /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
+/pkg/tsdb/parca/ @grafana/observability-traces-and-profiling
 
 # OSS Big Tent backend code
 /pkg/tsdb/mysql/ @grafana/oss-big-tent
 /pkg/tsdb/grafana-postgresql-datasource/ @grafana/oss-big-tent
-/pkg/tsdb/zipkin/ @grafana/oss-big-tent
-/pkg/tsdb/jaeger/ @grafana/oss-big-tent
 
 # Partner Datasources backend code
 /pkg/tsdb/mssql/ @grafana/partner-datasources
-/pkg/tsdb/influxdb/ @grafana/partner-datasources
-/pkg/tsdb/graphite/ @grafana/partner-datasources
 
 # Database migrations
 /pkg/services/sqlstore/migrations/ @grafana/grafana-search-and-storage
@@ -364,7 +295,7 @@
 /pkg/services/datasourceproxy/ @grafana/plugins-platform-backend
 /pkg/services/datasources/ @grafana/plugins-platform-backend
 /pkg/services/pluginsintegration/ @grafana/plugins-platform-backend
-/pkg/plugins/codegen/pfs/ @grafana/plugins-platform-backend @grafana/grafana-as-code
+/pkg/plugins/pfs/ @grafana/plugins-platform-backend @grafana/grafana-as-code
 /pkg/tsdb/grafana-testdata-datasource/ @grafana/plugins-platform-backend
 /pkg/tsdb/Magefile.go @grafana/plugins-platform-backend
 /pkg/services/pluginsintegration/pluginsettings/ @grafana/plugins-platform-backend
@@ -380,60 +311,46 @@
 /e2e/ @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/ @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend
-/packages/grafana-data/src/**/*logs* @grafana/observability-logs
-/packages/grafana-data/src/transformations/ @grafana/dataviz-squad
 /packages/grafana-e2e-selectors/ @grafana/grafana-frontend-platform
-/packages/grafana-flamegraph/ @grafana/observability-traces-and-profiling
-/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/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
-/packages/grafana-prometheus/ @grafana/oss-big-tent
-/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
 /packages/grafana-ui/.storybook/ @grafana/plugins-platform-frontend
 /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
 /packages/grafana-ui/src/components/Table/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/Table/SparklineCell.tsx @grafana/dataviz-squad @grafana/app-o11y-visualizations
+/packages/grafana-ui/src/components/Gauge/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/BarGauge/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/uPlot/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/DataLinks/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/ValuePicker/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/VizLayout/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/VizLegend/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/VizRepeater/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/VizTooltip/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/Sparkline/ @grafana/grafana-frontend-platform @grafana/app-o11y-visualizations
 /packages/grafana-ui/src/graveyard/Graph/ @grafana/dataviz-squad
 /packages/grafana-ui/src/graveyard/GraphNG/ @grafana/dataviz-squad
 /packages/grafana-ui/src/graveyard/TimeSeries/ @grafana/dataviz-squad
 /packages/grafana-ui/src/utils/storybook/ @grafana/plugins-platform-frontend
-
+/packages/grafana-data/src/transformations/ @grafana/dataviz-squad
+/packages/grafana-data/src/**/*logs* @grafana/observability-logs
+/packages/grafana-schema/src/**/*tempo* @grafana/observability-traces-and-profiling
+/packages/grafana-schema/src/**/*canvas* @grafana/dataviz-squad
+/packages/grafana-flamegraph/ @grafana/observability-traces-and-profiling
 /plugins-bundled/ @grafana/plugins-platform-frontend
+/packages/grafana-plugin-configs/ @grafana/plugins-platform-frontend
+/packages/grafana-prometheus/ @grafana/observability-metrics
+/packages/grafana-o11y-ds-frontend/ @grafana/observability-logs @grafana/observability-traces-and-profiling
+/packages/grafana-sql/ @grafana/partner-datasources @grafana/oss-big-tent
 
 # root files, mostly frontend
 /.browserslistrc @grafana/frontend-ops
 /package.json @grafana/frontend-ops
 /nx.json @grafana/frontend-ops
 /project.json @grafana/frontend-ops
-/.nxignore @grafana/frontend-ops
 /tsconfig.json @grafana/frontend-ops
 /.editorconfig @grafana/frontend-ops
-/eslint.config.js @grafana/frontend-ops
-/.betterer.eslint.config.js @grafana/frontend-ops
+/.eslintignore @grafana/frontend-ops
 /.gitattributes @grafana/frontend-ops
 /.gitignore @grafana/frontend-ops
 /.nvmrc @grafana/frontend-ops
@@ -443,6 +360,7 @@
 /yarn.lock @grafana/frontend-ops
 /lerna.json @grafana/frontend-ops
 /.prettierrc.js @grafana/frontend-ops
+/.eslintrc @grafana/frontend-ops
 /.vim @zoltanbedi
 /jest.config.js @grafana/frontend-ops
 /latest.json @grafana/frontend-ops
@@ -463,64 +381,60 @@ playwright.config.ts @grafana/plugins-platform-frontend
 /public/app/core/components/TimeSeries/ @grafana/dataviz-squad
 /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/core/history/ @grafana/observability-traces-and-profiling
+/public/app/core/history/ @grafana/explore-squad
+/public/app/features/all.ts @grafana/grafana-frontend-platform
 /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/auth-config/ @grafana/identity-access-team
 /public/app/features/annotations/ @grafana/dashboards-squad
-/public/app/features/api-keys/ @grafana/identity-squad
+/public/app/features/api-keys/ @grafana/identity-access-team
 /public/app/features/canvas/ @grafana/dataviz-squad
 /public/app/features/geo/ @grafana/dataviz-squad
 /public/app/features/visualization/data-hover/ @grafana/dataviz-squad
 /public/app/features/commandPalette/ @grafana/grafana-frontend-platform
-/public/app/features/connections/ @grafana/plugins-platform-frontend
-/public/app/features/correlations/ @grafana/dataviz-squad
+/public/app/features/connections/ @grafana/plugins-platform-frontend @mikkancso
+/public/app/features/correlations/ @grafana/explore-squad
 /public/app/features/dashboard/ @grafana/dashboards-squad
 /public/app/features/dashboard/components/TransformationsEditor/ @grafana/dataviz-squad
 /public/app/features/dashboard-scene/ @grafana/dashboards-squad
-/public/app/features/scopes/ @grafana/dashboards-squad
-/public/app/features/datasources/ @grafana/plugins-platform-frontend
+/public/app/features/datasources/ @grafana/plugins-platform-frontend @mikkancso
 /public/app/features/dimensions/ @grafana/dataviz-squad
 /public/app/features/dataframe-import/ @grafana/dataviz-squad
-/public/app/features/explore/ @grafana/observability-traces-and-profiling
+/public/app/features/explore/ @grafana/explore-squad
 /public/app/features/expressions/ @grafana/observability-metrics
 /public/app/features/folders/ @grafana/grafana-frontend-platform
 /public/app/features/inspector/ @grafana/dashboards-squad
 /public/app/features/invites/ @grafana/grafana-frontend-platform
 /public/app/features/library-panels/ @grafana/dashboards-squad
 /public/app/features/logs/ @grafana/observability-logs
-/public/app/features/live/ @grafana/dashboards-squad
+/public/app/features/live/ @grafana/grafana-app-platform-squad
 /public/app/features/apiserver/ @grafana/grafana-app-platform-squad
 /public/app/features/manage-dashboards/ @grafana/dashboards-squad
+/public/app/features/manage-dashboards/RecentlyDeletedPage.tsx @grafana/grafana-frontend-platform
 /public/app/features/notifications/ @grafana/grafana-frontend-platform
 /public/app/features/org/ @grafana/grafana-frontend-platform
 /public/app/features/panel/ @grafana/dashboards-squad
 /public/app/features/playlist/ @grafana/dashboards-squad
 /public/app/features/plugins/ @grafana/plugins-platform-frontend
 /public/app/features/profile/ @grafana/grafana-frontend-platform
-/public/app/features/query-library/ @grafana/grafana-frontend-platform
+/public/app/features/query-library/ @grafana/explore-squad
 /public/app/features/runtime/ @ryantxu
 /public/app/features/query/ @grafana/dashboards-squad
 /public/app/features/sandbox/ @grafana/grafana-frontend-platform
 /public/app/features/browse-dashboards/ @grafana/grafana-frontend-platform
 /public/app/features/search/ @grafana/grafana-frontend-platform
-/public/app/features/serviceaccounts/ @grafana/identity-squad
-/public/app/features/teams/ @grafana/access-squad
+/public/app/features/serviceaccounts/ @grafana/identity-access-team
+/public/app/features/storage/ @grafana/grafana-app-platform-squad
+/public/app/features/teams/ @grafana/identity-access-team
 /public/app/features/templating/ @grafana/dashboards-squad
-/public/app/features/trails/ @grafana/observability-metrics
+/public/app/features/trails/ @torkelo
 /public/app/features/transformers/ @grafana/dataviz-squad
 /public/app/features/transformers/timeSeriesTable/ @grafana/dataviz-squad @grafana/app-o11y-visualizations
-/public/app/features/users/ @grafana/access-squad
+/public/app/features/users/ @grafana/identity-access-team
 /public/app/features/variables/ @grafana/dashboards-squad
-/public/app/features/preferences/ @grafana/grafana-frontend-platform
-/public/app/features/bookmarks/ @grafana/grafana-frontend-platform
 /public/app/plugins/panel/alertlist/ @grafana/alerting-frontend
 /public/app/plugins/panel/annolist/ @grafana/grafana-frontend-platform
 /public/app/plugins/panel/barchart/ @grafana/dataviz-squad
@@ -548,7 +462,7 @@ playwright.config.ts @grafana/plugins-platform-frontend
 /public/app/plugins/panel/geomap/ @grafana/dataviz-squad
 /public/app/plugins/panel/canvas/ @grafana/dataviz-squad
 /public/app/plugins/panel/candlestick/ @grafana/dataviz-squad
-/public/app/plugins/panel/live/ @grafana/dashboards-squad
+/public/app/plugins/panel/live/ @grafana/grafana-app-platform-squad
 /public/app/plugins/panel/news/ @grafana/grafana-frontend-platform
 /public/app/plugins/panel/stat/ @grafana/dataviz-squad
 /public/app/plugins/panel/text/ @grafana/grafana-frontend-platform
@@ -572,12 +486,11 @@ playwright.config.ts @grafana/plugins-platform-frontend
 /public/test/ @grafana/grafana-frontend-platform
 /public/test/helpers/alertingRuleEditor.tsx @grafana/alerting-frontend
 /public/views/ @grafana/grafana-frontend-platform
-/public/views/swagger.html @grafana/grafana-app-platform-squad
-/public/swagger/ @grafana/grafana-app-platform-squad
+/public/views/swagger.html @grafana/grafana-backend-group
 
 /public/app/features/explore/Logs/ @grafana/observability-logs
 
-/public/app/features/explore/RawPrometheus/ @grafana/oss-big-tent
+/public/app/features/explore/RawPrometheus/ @grafana/observability-metrics
 
 /public/app/features/explore/NodeGraph/ @grafana/observability-traces-and-profiling
 /public/app/features/explore/FlameGraph/ @grafana/observability-traces-and-profiling
@@ -597,33 +510,32 @@ playwright.config.ts @grafana/plugins-platform-frontend
 
 
 
-/scripts/benchmark-access-control.sh @grafana/access-squad
+/scripts/benchmark-access-control.sh @grafana/identity-access-team
 /scripts/check-breaking-changes.sh @grafana/plugins-platform-frontend
-/scripts/ci-* @grafana/grafana-developer-enablement-squad
-/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-* @grafana/grafana-release-guild
+/scripts/circle-* @grafana/grafana-release-guild
+/scripts/publish-npm-packages.sh @grafana/grafana-release-guild @grafana/plugins-platform-frontend
+/scripts/validate-npm-packages.sh @grafana/grafana-release-guild @grafana/plugins-platform-frontend
 /scripts/ci-frontend-metrics.sh @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend @grafana/dataviz-squad
 /scripts/cli/ @grafana/grafana-frontend-platform
 /scripts/clean-git-or-error.sh @grafana/grafana-as-code
 /scripts/grafana-server/ @grafana/grafana-frontend-platform
-/scripts/helpers/ @grafana/grafana-developer-enablement-squad
+/scripts/helpers/ @grafana/grafana-release-guild
 /scripts/import_many_dashboards.sh @torkelo
 /scripts/mixin-check.sh @bergquist
 /scripts/openapi3/ @grafana/grafana-operator-experience-squad
 /scripts/prepare-packagejson.js @grafana/frontend-ops
 /scripts/protobuf-check.sh @grafana/plugins-platform-backend
 /scripts/stripnulls.sh @grafana/grafana-as-code
-/scripts/tag_release.sh @grafana/grafana-developer-enablement-squad
-/scripts/trigger_docker_build.sh @grafana/grafana-developer-enablement-squad
-/scripts/trigger_grafana_packer.sh @grafana/grafana-developer-enablement-squad
-/scripts/trigger_windows_build.sh @grafana/grafana-developer-enablement-squad
+/scripts/tag_release.sh @grafana/grafana-release-guild
+/scripts/trigger_docker_build.sh @grafana/grafana-release-guild
+/scripts/trigger_grafana_packer.sh @grafana/grafana-release-guild
+/scripts/trigger_windows_build.sh @grafana/grafana-release-guild
 /scripts/cleanup-husky.sh @grafana/frontend-ops
-/scripts/verify-repo-update/ @grafana/grafana-developer-enablement-squad
+/scripts/verify-repo-update/ @grafana/grafana-release-guild
+/scripts/generate-icon-bundle.js @grafana/plugins-platform-frontend @grafana/grafana-frontend-platform
 /scripts/generate-rtk-apis.ts @grafana/grafana-frontend-platform
-/scripts/generate-alerting-rtk-apis.ts @grafana/alerting-frontend
 /scripts/levitate-parse-json-report.js @grafana/plugins-platform-frontend
-/scripts/levitate-show-affected-plugins.js @grafana/plugins-platform-frontend
 /scripts/codemods/explicit-barrel-imports.cjs @grafana/frontend-ops
 
 /scripts/**/generate-transformations* @grafana/dataviz-squad
@@ -632,6 +544,7 @@ playwright.config.ts @grafana/plugins-platform-frontend
 .pa11yci.conf.js @grafana/grafana-frontend-platform
 .pa11yci-pr.conf.js @grafana/grafana-frontend-platform
 .betterer.results @grafanabot
+.betterer.results.json @grafanabot
 .betterer.ts @grafana/grafana-frontend-platform
 
 # @grafana/ui component documentation
@@ -643,29 +556,28 @@ playwright.config.ts @grafana/plugins-platform-frontend
 # Core datasources
 /public/app/plugins/datasource/dashboard/ @grafana/dashboards-squad
 /public/app/plugins/datasource/cloudwatch/ @grafana/aws-datasources
-/public/app/plugins/datasource/elasticsearch/ @grafana/aws-datasources
+/public/app/plugins/datasource/elasticsearch/ @grafana/observability-logs
 /public/app/plugins/datasource/grafana/ @grafana/grafana-frontend-platform
 /public/app/plugins/datasource/grafana-testdata-datasource/ @grafana/plugins-platform-frontend
 /public/app/plugins/datasource/azuremonitor/ @grafana/partner-datasources
-/public/app/plugins/datasource/graphite/ @grafana/partner-datasources
-/public/app/plugins/datasource/influxdb/ @grafana/partner-datasources
-/public/app/plugins/datasource/jaeger/ @grafana/oss-big-tent
+/public/app/plugins/datasource/graphite/ @grafana/observability-metrics
+/public/app/plugins/datasource/influxdb/ @grafana/observability-metrics
+/public/app/plugins/datasource/jaeger/ @grafana/observability-traces-and-profiling
 /public/app/plugins/datasource/loki/ @grafana/observability-logs
 /public/app/plugins/datasource/mixed/ @grafana/dashboards-squad
 /public/app/plugins/datasource/mssql/ @grafana/partner-datasources
 /public/app/plugins/datasource/mysql/ @grafana/oss-big-tent
-/public/app/plugins/datasource/opentsdb/ @grafana/partner-datasources
+/public/app/plugins/datasource/opentsdb/ @grafana/observability-metrics
 /public/app/plugins/datasource/grafana-postgresql-datasource/ @grafana/oss-big-tent
-/public/app/plugins/datasource/prometheus/ @grafana/oss-big-tent
+/public/app/plugins/datasource/prometheus/ @grafana/observability-metrics
 /public/app/plugins/datasource/cloud-monitoring/ @grafana/partner-datasources
-/public/app/plugins/datasource/zipkin/ @grafana/oss-big-tent
+/public/app/plugins/datasource/zipkin/ @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/parca/ @grafana/observability-traces-and-profiling
 /public/app/plugins/datasource/alertmanager/ @grafana/alerting-squad
 
 # Grafana Sharing Squad
-/public/app/features/dashboard-scene/sharing/ @grafana/sharing-squad
 /public/app/features/dashboard/components/ShareModal/ @grafana/sharing-squad
 /public/app/features/manage-dashboards/components/PublicDashboardListTable/ @grafana/sharing-squad
 /public/app/features/dashboard/containers/PublicDashboardPage.tsx @grafana/sharing-squad
@@ -676,29 +588,28 @@ playwright.config.ts @grafana/plugins-platform-frontend
 /pkg/services/rendering/ @grafana/sharing-squad
 
 # SSE - Server Side Expressions
-/pkg/expr/ @grafana/grafana-datasources-core-services
+/pkg/expr/ @grafana/observability-metrics
 
 # Cloud middleware
 /grafana-mixin/ @grafana/grafana-backend-services-squad
 
 # Grafana authentication and authorization
-/pkg/login/ @grafana/identity-squad
-/pkg/services/accesscontrol/ @grafana/access-squad
+/pkg/login/ @grafana/identity-access-team
+/pkg/services/accesscontrol/ @grafana/identity-access-team
 /pkg/services/anonymous/ @grafana/identity-access-team
-/pkg/services/auth/ @grafana/identity-squad
-/pkg/services/authn/ @grafana/identity-squad
-/pkg/services/authz/ @grafana/access-squad
-/pkg/services/signingkeys/ @grafana/identity-squad
-/pkg/services/dashboards/accesscontrol.go @grafana/access-squad
-/pkg/services/datasources/guardian/ @grafana/access-squad
-/pkg/services/guardian/ @grafana/access-squad
-/pkg/services/ldap/ @grafana/identity-squad
-/pkg/services/login/ @grafana/identity-squad
-/pkg/services/loginattempt/ @grafana/identity-squad
+/pkg/services/auth/ @grafana/identity-access-team
+/pkg/services/authn/ @grafana/identity-access-team
+/pkg/services/signingkeys/ @grafana/identity-access-team
+/pkg/services/dashboards/accesscontrol.go @grafana/identity-access-team
+/pkg/services/datasources/guardian/ @grafana/identity-access-team
+/pkg/services/guardian/ @grafana/identity-access-team
+/pkg/services/ldap/ @grafana/identity-access-team
+/pkg/services/login/ @grafana/identity-access-team
+/pkg/services/loginattempt/ @grafana/identity-access-team
 /pkg/services/extsvcauth/ @grafana/identity-access-team
-/pkg/services/oauthtoken/ @grafana/identity-squad
-/pkg/services/serviceaccounts/ @grafana/identity-squad
-/public/app/core/components/RolePicker/ @grafana/access-squad
+/pkg/services/oauthtoken/ @grafana/identity-access-team
+/pkg/services/serviceaccounts/ @grafana/identity-access-team
+/public/app/core/components/RolePicker/ @grafana/identity-access-team
 
 # Support bundles
 /public/app/features/support-bundles/ @grafana/identity-access-team
@@ -708,7 +619,6 @@ playwright.config.ts @grafana/plugins-platform-frontend
 /pkg/services/caching/ @grafana/grafana-operator-experience-squad
 /pkg/services/cloudmigration/ @grafana/grafana-operator-experience-squad
 /pkg/services/gcom/ @grafana/grafana-operator-experience-squad
-/pkg/services/authapi/ @grafana/grafana-operator-experience-squad
 
 # Feature toggles
 /pkg/services/featuremgmt/ @grafana/grafana-backend-services-squad
@@ -717,16 +627,12 @@ playwright.config.ts @grafana/plugins-platform-frontend
 # Kind definitions
 /kinds/dashboard @grafana/dashboards-squad
 /kinds/ @grafana/grafana-as-code
-kindsv2/ @grafana/dashboards-squad
 
 # Kind system and code generation
 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/alerting @grafana/grafana-app-platform-squad @grafana/alerting-backend
-/pkg/registry/apis/query @grafana/grafana-datasources-core-services
-/pkg/registry/apis/userstorage @grafana/grafana-app-platform-squad @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
@@ -736,70 +642,67 @@ embed.go @grafana/grafana-as-code
 
 # GitHub Workflows and Templates
 /.github/CODEOWNERS @tolzhabayev
-/.github/ISSUE_TEMPLATE/ @torkelo @sympatheticmoose
+/.github/ISSUE_TEMPLATE/ @torkelo
 /.github/PULL_REQUEST_TEMPLATE.md @torkelo
 /.github/bot.md @torkelo
 /.github/commands.json @torkelo
 /.github/dependabot.yml @grafana/frontend-ops
 /.github/issue-opened.json @grafana/grafana-community-support
 /.github/metrics-collector.json @torkelo
-/.github/pr-checks.json @tolzhabayev
-/.github/pr-commands.json @tolzhabayev
+/.github/pr-checks.json @marefr
+/.github/pr-commands.json @marefr
 /.github/renovate.json5 @grafana/frontend-ops
-/.github/workflows/auto-triager/ @grafana/plugins-platform-frontend
+/.github/teams.yml @armandgrillet
 /.github/workflows/alerting-swagger-gen.yml @grafana/alerting-backend
-/.github/workflows/auto-milestone.yml @grafana/grafana-developer-enablement-squad
-/.github/workflows/backport.yml @grafana/grafana-developer-enablement-squad
-/.github/workflows/bump-version.yml @grafana/grafana-developer-enablement-squad
-/.github/workflows/close-milestone.yml @grafana/grafana-developer-enablement-squad
-/.github/workflows/release-pr.yml @grafana/grafana-developer-enablement-squad
-/.github/workflows/release-comms.yml @grafana/grafana-developer-enablement-squad
-/.github/workflows/migrate-prs.yml @grafana/grafana-developer-enablement-squad
-/.github/workflows/create-next-release-branch.yml @grafana/grafana-developer-enablement-squad
+/.github/workflows/auto-milestone.yml @grafana/grafana-release-guild
+/.github/workflows/backport.yml @grafana/grafana-release-guild
+/.github/workflows/bump-version.yml @grafana/grafana-release-guild
+/.github/workflows/close-milestone.yml @grafana/grafana-release-guild
+/.github/workflows/release-pr.yml @grafana/grafana-release-guild
+/.github/workflows/release-comms.yml @grafana/grafana-release-guild
 /.github/workflows/codeowners-validator.yml @tolzhabayev
 /.github/workflows/codeql-analysis.yml @DanCech
 /.github/workflows/commands.yml @torkelo
-/.github/workflows/community-release.yml @grafana/grafana-developer-enablement-squad
+/.github/workflows/community-release.yml @grafana/grafana-release-guild
 /.github/workflows/detect-breaking-changes-* @grafana/plugins-platform-frontend
 /.github/workflows/doc-validator.yml @grafana/docs-tooling
-/.github/workflows/deploy-pr-preview.yml @grafana/docs-tooling
 /.github/workflows/epic-add-to-platform-ux-parent-project.yml @meanmina
-/.github/workflows/github-release.yml @grafana/grafana-developer-enablement-squad
+/.github/workflows/github-release.yml @grafana/grafana-release-guild
+/.github/workflows/issue-labeled.yml @armandgrillet
 /.github/workflows/issue-opened.yml @grafana/grafana-community-support
 /.github/workflows/metrics-collector.yml @torkelo
-/.github/workflows/milestone.yml @tolzhabayev
-/.github/workflows/pr-checks.yml @tolzhabayev
+/.github/workflows/milestone.yml @marefr
+/.github/workflows/pr-checks.yml @marefr
 /.github/workflows/pr-codeql-analysis-go.yml @DanCech
 /.github/workflows/pr-codeql-analysis-javascript.yml @DanCech
 /.github/workflows/pr-codeql-analysis-python.yml @DanCech
-/.github/workflows/pr-commands.yml @tolzhabayev
-/.github/workflows/pr-patch-check.yml @grafana/grafana-developer-enablement-squad
-/.github/workflows/sync-mirror.yml @grafana/grafana-developer-enablement-squad
+/.github/workflows/pr-commands.yml @marefr
+/.github/workflows/pr-patch-check.yml @grafana/grafana-release-guild
+/.github/workflows/sync-mirror.yml @grafana/grafana-release-guild
 /.github/workflows/publish-technical-documentation-next.yml @grafana/docs-tooling
 /.github/workflows/publish-technical-documentation-release.yml @grafana/docs-tooling
-/.github/workflows/remove-milestone.yml @grafana/grafana-developer-enablement-squad
+/.github/workflows/remove-milestone.yml @grafana/grafana-release-guild
 /.github/workflows/sbom-report.yml @grafana/security-team
 /.github/workflows/scripts/json-file-to-job-output.js @grafana/plugins-platform-frontend
-/.github/workflows/stale.yml @grafana/grafana-developer-enablement-squad
-/.github/workflows/update-changelog.yml @grafana/grafana-developer-enablement-squad
+/.github/workflows/scripts/pr-get-job-link.js @grafana/plugins-platform-frontend
+/.github/workflows/stale.yml @grafana/grafana-release-guild
+/.github/workflows/update-changelog.yml @grafana/grafana-release-guild
 /.github/workflows/update-make-docs.yml @grafana/docs-tooling
+/.github/workflows/snyk.yml @grafana/security-team
 /.github/workflows/scripts/kinds/verify-kinds.go @grafana/platform-cat
 /.github/workflows/publish-kinds-next.yml @grafana/platform-cat
 /.github/workflows/publish-kinds-release.yml @grafana/platform-cat
 /.github/workflows/verify-kinds.yml @grafana/platform-cat
 /.github/workflows/dashboards-issue-add-label.yml @grafana/dashboards-squad
-/.github/workflows/ephemeral-instances-pr-comment.yml @grafana/grafana-backend-services-squad
-/.github/workflows/create-security-patch-from-security-mirror.yml @grafana/grafana-developer-enablement-squad
+/.github/workflows/ephemeral-instances-pr-comment.yml @grafana/grafana-operator-experience-squad
+/.github/workflows/ephemeral-instances-pr-opened-closed.yml @grafana/grafana-operator-experience-squad
+/.github/workflows/create-security-patch-from-security-mirror.yml @grafana/grafana-release-guild
 /.github/workflows/core-plugins-build-and-release.yml @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
 /.github/workflows/i18n-crowdin-upload.yml @grafana/grafana-frontend-platform
 /.github/workflows/i18n-crowdin-download.yml @grafana/grafana-frontend-platform
 /.github/workflows/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
-/.github/workflows/go-lint.yml @grafana/grafana-backend-services-squad
-/.github/workflows/trivy-scan.yml @grafana/grafana-backend-services-squad
-/.github/workflows/changelog.yml @zserge
-/.github/workflows/actions/changelog @zserge
+/.github/workflows/run-scenes-e2e.yml @grafana/dashboards-squad
+/.github/workflows/go_lint.yml @grafana/grafana-backend-services-squad
 
 # Generated files not requiring owner approval
 /packages/grafana-data/src/types/featureToggles.gen.ts @grafanabot
@@ -811,9 +714,9 @@ embed.go @grafana/grafana-as-code
 # Conf
 /conf/defaults.ini @torkelo
 /conf/sample.ini @torkelo
-/conf/ldap.toml @grafana/identity-squad
-/conf/ldap_multiple.toml @grafana/identity-squad
-/conf/provisioning/access-control/ @grafana/access-squad
+/conf/ldap.toml @grafana/identity-access-team
+/conf/ldap_multiple.toml @grafana/identity-access-team
+/conf/provisioning/access-control/ @grafana/identity-access-team
 /conf/provisioning/alerting/ @grafana/alerting-backend
 /conf/provisioning/dashboards/ @grafana/dashboards-squad
 /conf/provisioning/datasources/ @grafana/plugins-platform-backend

.github/ISSUE_TEMPLATE/3-data_source_request.yaml

@@ -1,45 +0,0 @@
----
-name: New data source request
-description: Raise a request for a new data source plugin
-title: "[New Data Source]: <name-of-service>"
-labels:
-  - area/datasource,type/new-plugin-request
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for requesting a new data source plugin!
-
-        We greatly appreciate feedback from our community about which new data sources would be beneficial. 
-        
-        Grafana Labs regularly reviews these requests and uses them to inform our prioritization. Note: we cannot offer any guarantees on whether we or our community will build a given data source.
-        
-        Please check our [roadmap](https://github.com/orgs/grafana/projects/619?pane=info) for existing requests and subscribe to stay informed of our plans. If no request exists, please fill out the following information.
-
-        Please do not request support or file bug reports and feature requests for existing plugins here.
-        - For support, please use the community support resources [here](https://grafana.com/help/).
-        - Please consider the `New Bug Report` or `Feature Requests` [issue templates](https://github.com/grafana/grafana/issues/new/choose) for other requests.
-  - type: textarea
-    id: background
-    attributes:
-      label: Background
-      description: Tell us about the service you would like to see integrated as a data source
-      placeholder: ACME_DB is an open source time-series database that is used by many organizations to store their metrics data. It is a popular choice for monitoring and observability.
-    validations:
-      required: true
-  - type: textarea
-    id: use_case
-    attributes:
-      label: Use case
-      description: Describe any key requirements or data you would need surfaced, ideally including why they are useful for you.
-      placeholder: My team uses ACME_DB as the application database to monitor our produciton workloads, so we'd like to alert on it and visualize ACME_DB data next to our logs and traces in Grafana.
-    validations:
-      required: true
-  - type: checkboxes
-    attributes:
-      label: Contribution
-      description: If you are interested in creating the data source yourself and contributing to the [plugin catalog](https://grafana.com/grafana/plugins/), please fill in the following
-      options:
-        - label: Are you looking to create the plugin?
-        - label: Are you affiliated with the project/product the data source integrates with?
-        - label: Does the plugin integrate with a commercial product?

.github/ISSUE_TEMPLATE/3-grafana_ui_component.md

@@ -0,0 +1,39 @@
+---
+name: '@grafana/ui component request'
+about: Suggest a component for the @grafana/ui package
+labels: 'area/grafana/ui'
+---
+
+<!-- 
+By using this template you will make it easier for us to make sure that documentation and implementation stays up to date for every component in @grafana/ui
+
+Thank you!
+-->
+
+**Why is this component needed**:
+<!-- Explain your use case -->
+___
+ - [ ] Is/could it be used in more than one place in Grafana?
+
+**Where is/could it be used?**:
+
+___
+- [ ] Post screenshots possible.
+- [ ] It has a single use case.
+- [ ] It is/could be used in multiple places.
+
+**Implementation** (Checklist meant for the person implementing the component)
+
+- [ ] Component has a story in Storybook.
+- [ ] Props and naming follows [our style guide](https://github.com/grafana/grafana/blob/main/contribute/style-guides/frontend.md).
+- [ ] It is extendable (rest props are spread, styles with className work, and so on).
+- [ ] Uses [theme for spacing, colors, and so on](https://github.com/grafana/grafana/blob/main/contribute/style-guides/themes.md).
+- [ ] Works with both light and dark theme.
+
+**Documentation**
+
+- [ ] Properties are documented.
+- [ ] Use cases are described.
+- [ ] Code examples for the different use cases.
+- [ ] Dos and don'ts.
+- [ ] Styling guidelines, specific color usage (if applicable).

.github/ISSUE_TEMPLATE/4-UX-design.yaml

@@ -0,0 +1,43 @@
+name: UX design issue
+description: Create an issue for delivering wireframes, mockups or other design solutions.
+title: "UX: "
+labels: ["type/ux"]
+body:
+  - type: textarea
+    id: background
+    attributes:
+      label: "Background / Why we're doing this"
+      description: Describe the problem and background of the issue. This could include research insights that inform the design changes, unmet user needs, or other usability issues.
+      placeholder: Add UI improvements to make Grafana Alerting alert creation easier based on usability test results.
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Is there existing research for this?
+      description: Please link research results or insights in the Background section if you have any. If no research was conducted, you might want to consider usability testing your design later.
+      options: [
+        "Yes, I have linked it", 
+        "No research yet"
+      ]
+    validations:
+      required: true
+  - type: textarea
+    id: problems-or-tasks
+    attributes:
+      label: Problems or tasks
+      description: Describe problems the new design should solve or tasks the user needs to complete.
+      placeholder: 
+      value: |
+        - A problem we're trying to solve
+        - A task the user needs to accomplish
+        - …
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Deliverables
+      description: Add a checklist of deliverables here. You can later add links to each deliverable.
+      value: |
+          - Figma mockup
+          - Miro board
+          - …

.github/ISSUE_TEMPLATE/5-chore.md

@@ -0,0 +1,17 @@
+---
+name: Chore
+about: Create an issue for a chore needing completion
+labels: 'type: chore'
+---
+
+<!--
+Please use this template to create your chore issue. You can use this template if you spot an out-of-date README, discover a misspelling, or happen upon a deeply nested 7-layer for-loop that could be better handled another way. Please use this template for your non-bug related fixes/updates/refactors.
+
+- Questions should be posted to: https://community.grafana.com
+- Use query inspector to troubleshoot issues: https://bit.ly/2XNF6YS
+- How to record and attach gif: https://bit.ly/2Mi8T6K
+-->
+
+**What is the chore?**:
+
+**Is there anything else we need to know?**:

.github/ISSUE_TEMPLATE/8-Saga_contribution.yaml

@@ -0,0 +1,65 @@
+---
+name: Saga contribution template
+description: Contribute to the design system.
+title: "Saga: "
+labels:
+  - area/grafana/ui, design-system 
+body:
+  - type: markdown
+    attributes:
+      value: |
+        By using this template, you help expand our component and pattern solutions within the design system and let others reuse your work! You can contribute bug or design defect fixes, component, and pattern enhancements, or even net-new components! This template brings visibility to the great work everyone already does and in turn helps reduce duplicate efforts.
+        Thank you!
+  - type: checkboxes
+    attributes:
+      label: What type of contribution is this?
+      description: null
+      options:
+        - label: Fix - bug, design defect, typo, documentation conciseness
+        - label: Unification - combining similar components/patterns into a single
+            solution
+        - label: Proposal - net-new component, additions, variants
+    validations:
+      required: true
+  - type: textarea
+    id: background
+    attributes:
+      label: Why is this needed?
+      description: Explain the use case and where it can be used.
+      placeholder: null
+    validations:
+      required: true
+  - type: textarea
+    id: use_case
+    attributes:
+      label: Where is this or where can it be used?
+      description: Explain the current/future use case, be sure to include areas of impact
+      placeholder: null
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Deliverables
+      description: Add a checklist of deliverables here. You can later add links to
+        each deliverable.
+      value: |
+        - Figma mockup
+        - Storybook story
+        - …
+  - type: checkboxes
+    attributes:
+      label: Contribution guiding principles
+      description: Use this checklist of guiding principles to ensure your
+        contribution makes Grafana a better product
+      options:
+        - label: Universal - not specific to a single product feature; able to be used
+            product-wide
+        - label: Accessible - inclusive to all types of users and assistive tools
+        - label: Flexible - thoughtfully built and designed to solve various
+            configurations and situations
+        - label: Coherent - follows existing visual styling and patterns
+        - label: Defined - documented clearly and concisely for ease of understanding
+        - label: Distinct - solves a unique gap or problem that cannot be solved with
+            current solutions
+    validations:
+        required: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -47,4 +47,4 @@ Fixes #
 Please check that:
 - [ ] It works as expected from a user's perspective.
 - [ ] If this is a pre-GA feature, it is behind a feature toggle.
-- [ ] The docs are updated, and if this is a [notable improvement](https://grafana.com/docs/writers-toolkit/contribute/release-notes/#how-to-determine-if-content-belongs-in-whats-new), it's added to our [What's New](https://grafana.com/docs/writers-toolkit/contribute/release-notes/) doc.
+- [ ] The docs are updated, and if this is a [notable improvement](https://grafana.com/docs/writers-toolkit/writing-guide/contribute-release-notes/#how-to-determine-if-content-belongs-in-a-whats-new-document), it's added to our [What's New](https://grafana.com/docs/writers-toolkit/writing-guide/contribute-release-notes/) doc.

.github/bot.md

@@ -28,83 +28,3 @@ try to cherry-pick the PR merge commit into that branch and open a PR. You must
 If there are merge conflicts the bot will write a comment on the source PR saying the cherry-pick failed. In this case you have to do the cherry pick and backport PR manually. 
 
 The backport logic is written [here](https://github.com/grafana/grafana-github-actions/blob/main/backport/backport.ts)
-
-## Auto triager bot
-
-The auto triager bot is a github action that **assigns** labels to issues based on the issue contents. The logic to assign
-labels is its own program and lives [here](https://github.com/grafana/auto-triager). It uses an LLM to do this.
-
-The bot runs **every time** a new issue is opened in the grafana/grafana repository. You can find the bot definition [here](https://github.com/grafana/grafana/blob/main/.github/workflows/issue-opened.yml#L61)
-
-The job only assign labels when the issue author is not a member of the Grafana organization in **GitHub**. The bot concurrency is 1.
-
-This bot is not responsible for assigning teams, the [commands](https://github.com/grafana/grafana/blob/main/.github/workflows/commands.yml) workflow is responsible for doing that
-
-### General diagram
-
-```mermaid
-sequenceDiagram
-    actor User
-    participant GH as GitHub
-    participant AT as Auto Triager Job
-    participant ATP as Auto Triager Program
-    participant LLM as LLM Service
-    participant CJ as Commands Job
-
-    User->>GH: Opens Issue
-    GH->>GH: Check if user in Grafana org
-    alt User not in Grafana org
-        GH->>AT: Trigger Auto Triager Job
-        AT->>ATP: Execute program
-        ATP->>LLM: Send issue content & categories
-        LLM-->>ATP: Return matching categories
-        ATP-->>GH: Assign labels to issue
-        GH->>CJ: Trigger Commands Job
-        CJ->>CJ: Read commands.json
-        CJ-->>GH: Assign teams based on labels
-    end
-```
-
-### Team definitions
-
-The team associated with labels are defined [here](https://github.com/grafana/grafana/blob/main/.github/commands.json). 
-This bot is not responsible for assigning teams, the [commands](https://github.com/grafana/grafana/blob/main/.github/workflows/commands.yml) workflow is responsible for doing that.
-
-The commands workflow code can be found [here](https://github.com/grafana/grafana-github-actions/tree/main/commands)
-
-### Categories/Labels definitions
-
-The categories (or labels) and the types used to categorize issues are defined in this same repository [here](https://github.com/grafana/grafana/tree/main/.github/workflows/auto-triager) the [prompt](https://github.com/grafana/grafana/blob/main/.github/workflows/auto-triager/prompt.txt) that is passed to the LLM is also defined there.
-
-If you are adding a new category in the auto-triager repository you must define a team that owns the label in the
-[commands.json](https://github.com/grafana/grafana/blob/main/.github/commands.json).
-
-If you remove a label from the [commands.json](https://github.com/grafana/grafana/blob/main/.github/commands.json) and it doesn't have any other 
-team associated with it you must remove it from the [labels file](https://github.com/grafana/grafana/blob/main/.github/workflows/auto-triager/labels.txt)
-
-### Secrets
-
-The bot secrets live in the vault. It uses a [shared workflow](https://github.com/grafana/shared-workflows/tree/main/actions/get-vault-secrets) to get the vault secrets, the
-workflow requires a token with `contents:read` and `id-token:write` scopes for it to work.
-
-### How to detect the bot is working?
-
-The list of [unlabeled issues](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+no%3Alabel) should remain empty as long as the bot is running.
-There might be issues in the list if some team member removed all labels, but if the list grows to more
-than 5 it is likely the bot is not working correctly.
-
-### What to do if this bot is not working?
-
-You can contact the plugins platform team in slack `#grafana-plugins-platform` and inform about the issue.
-
-### Troubleshooting
-
-Possible reasons why the bot is not working:
-
-* The OpenAI API key is not valid anymore. The action output will show this in its error log. A new key needs to be
-generated via the OpenAI UI and its value updated in vault. See [the action](https://github.com/grafana/grafana/blob/main/.github/workflows/issue-opened.yml#L72) to find the correct path to
-update the key.
-* The Slack webhook URL is not valid anymore. The action output will show this in its error log or the
-#triage-automation-ci channel will stop showing messages about issue triaging. A new slack webhook url needs to be
-generated for the auto triager app and its value updated in vault. 
-* This bot is not responsible for assigning teams, the [commands](https://github.com/grafana/grafana/blob/main/.github/workflows/commands.yml) workflow is responsible for doing that

.github/dependabot.yml

@@ -5,37 +5,6 @@ updates:
     schedule:
       interval: "daily"
   - package-ecosystem: "gomod"
-    directories:
-      - "/"
-      - "/apps/playlist"
-      - "/apps/investigation"
-      - "/pkg/aggregator"
-      - "/pkg/apimachinery"
-      - "/pkg/apiserver"
-      - "/pkg/build"
-      - "/pkg/build/wire"
-      - "/pkg/promlib"
-      - "/pkg/semconv"
-      - "/pkg/storage/unified/apistore"
-      - "/pkg/storage/unified/resource"
-      - "/pkg/util/xorm"
+    directory: "/"
     schedule:
-      interval: "daily"
-      time: "02:00"
-      timezone: Etc/UTC
-    open-pull-requests-limit: 10
-  - package-ecosystem: "docker"
-    directories:
-      - "/"
-      - "/packaging/docker/custom"
-      - "/scripts/verify-repo-update"
-      - "/scripts/build/ci-deploy"
-      - "/scripts/build/ci-windows-test"
-      - "/scripts/build/ci-e2e"
-      - "/scripts/build/ci-wix"
-      - "/scripts/build/ci-msi-build"
-    schedule:
-      interval: "daily"
-      time: "02:00"
-      timezone: Etc/UTC
-    open-pull-requests-limit: 10
+      interval: "weekly"

.github/issue-opened.json

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

.github/metrics-collector.json

@@ -29,4 +29,4 @@
       "query": "is:open is:pull-request"
     }
   ]
-}
+}

.github/pr-checks.json

@@ -1,4 +1,11 @@
 [
+  {
+    "type": "check-milestone",
+    "title": "Milestone Check",
+    "targetUrl": "https://github.com/grafana/grafana/blob/main/contribute/merge-pull-request.md#assign-a-milestone",
+    "success": "Milestone set",
+    "failure": "Milestone not set"
+  },
   {
     "type": "check-changelog",
     "title": "Changelog Check",
@@ -20,4 +27,4 @@
     },
     "targetUrl": "https://github.com/grafana/grafana/blob/main/contribute/merge-pull-request.md#include-in-changelog-and-release-notes"
   }
-]
+]

.github/pr-commands.json

@@ -2,8 +2,8 @@
   {
     "type": "changedfiles",
     "matches": [
-      "docs/**/*",
-      "contribute/**/*"
+        "docs/**/*",
+        "contribute/**/*"
     ],
     "action": "updateLabel",
     "addLabel": "type/docs"
@@ -11,21 +11,21 @@
   {
     "type": "changedfiles",
     "matches": [
-      "public/**/*",
-      "packages/**/*",
-      "e2e/**/*",
-      "plugins-bundled/**/*",
-      "scripts/build/release-packages.sh",
-      "scripts/circle-release-next-packages.sh",
-      "scripts/ci-frontend-metrics.sh",
-      "scripts/grunt/**/*",
-      "scripts/webpack/**/*",
-      "package.json",
-      "tsconfig.json",
-      "lerna.json",
-      ".prettierrc.js",
-      ".eslintrc",
-      "**/*.mdx"
+        "public/**/*",
+        "packages/**/*",
+        "e2e/**/*",
+        "plugins-bundled/**/*",
+        "scripts/build/release-packages.sh",
+        "scripts/circle-release-next-packages.sh",
+        "scripts/ci-frontend-metrics.sh",
+        "scripts/grunt/**/*",
+        "scripts/webpack/**/*",
+        "package.json",
+        "tsconfig.json",
+        "lerna.json",
+        ".prettierrc.js",
+        ".eslintrc",
+        "**/*.mdx"
     ],
     "action": "updateLabel",
     "addLabel": "area/frontend"
@@ -33,11 +33,11 @@
   {
     "type": "changedfiles",
     "matches": [
-      "**/*.go",
-      "go.mod",
-      "go.sum",
-      "contribute/style-guides/backend.md",
-      "contribute/architecture/backend/**/*"
+        "**/*.go",
+        "go.mod",
+        "go.sum",
+        "contribute/style-guides/backend.md",
+        "contribute/architecture/backend/**/*"
     ],
     "action": "updateLabel",
     "addLabel": "area/backend"
@@ -45,17 +45,15 @@
   {
     "type": "changedfiles",
     "matches": [
-      "pkg/services/sqlstore/migrations/**/*",
-      "**/*_mig.go"
+        "pkg/services/sqlstore/migrations/**/*",
+        "**/*_mig.go"
     ],
     "action": "updateLabel",
     "addLabel": "area/backend/db/migration"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/features/explore/**/*"
-    ],
+    "matches": [ "public/app/features/explore/**/*"],
     "action": "updateLabel",
     "addLabel": "area/explore"
   },
@@ -84,357 +82,384 @@
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/datasource/azuremonitor/**/*",
-      "pkg/tsdb/azuremonitor/**/*"
-    ],
+    "matches": [ "public/app/plugins/datasource/azuremonitor/**/*", "pkg/tsdb/azuremonitor/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/Azure"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/datasource/cloud-monitoring/**/*",
-      "pkg/tsdb/cloud-monitoring/**/*"
-    ],
+    "matches": [ "public/app/plugins/datasource/cloud-monitoring/**/*", "pkg/tsdb/cloud-monitoring/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/GoogleCloudMonitoring"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/datasource/cloudwatch/**/*",
-      "pkg/tsdb/cloudwatch/**/*"
-    ],
+    "matches": [ "public/app/plugins/datasource/cloudwatch/**/*", "pkg/tsdb/cloudwatch/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/CloudWatch"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/datasource/elasticsearch/**/*",
-      "pkg/tsdb/elasticsearch/**/*"
-    ],
+    "matches": [ "public/app/plugins/datasource/elasticsearch/**/*", "pkg/tsdb/elasticsearch/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/Elasticsearch"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/datasource/graphite/**/*",
-      "pkg/tsdb/graphite/**/*"
-    ],
+    "matches": [ "public/app/plugins/datasource/graphite/**/*", "pkg/tsdb/graphite/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/Graphite"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/datasource/influxdb/**/*",
-      "pkg/tsdb/influx/**/*"
-    ],
+    "matches": [ "public/app/plugins/datasource/influxdb/**/*", "pkg/tsdb/influx/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/InfluxDB"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/datasource/jaeger/**/*"
-    ],
+    "matches": [ "public/app/plugins/datasource/jaeger/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/Jaeger"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/datasource/loki/**/*",
-      "pkg/tsdb/loki/**/*"
-    ],
+    "matches": [ "public/app/plugins/datasource/loki/**/*", "pkg/tsdb/loki/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/Loki"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/datasource/mssql/**/*",
-      "pkg/tsdb/mssql/**/*"
-    ],
+    "matches": [ "public/app/plugins/datasource/mssql/**/*", "pkg/tsdb/mssql/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/MSSQL"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/datasource/mysql/**/*",
-      "pkg/tsdb/mysql/**/*"
-    ],
+    "matches": [ "public/app/plugins/datasource/mysql/**/*", "pkg/tsdb/mysql/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/MySQL"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/datasource/opentsdb/**/*",
-      "pkg/tsdb/opentsdb/**/*"
-    ],
+    "matches": [ "public/app/plugins/datasource/opentsdb/**/*", "pkg/tsdb/opentsdb/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/OpenTSDB"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/datasource/parca/**/*"
-    ],
+    "matches": [ "public/app/plugins/datasource/parca/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/Parca"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/datasource/grafana-pyroscope-datasource/**/*",
-      "pkg/tsdb/grafana-pyroscope-datasource/**/*"
-    ],
+    "matches": [ "public/app/plugins/datasource/grafana-pyroscope-datasource/**/*", "pkg/tsdb/grafana-pyroscope-datasource/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/grafana-pyroscope"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/datasource/grafana-postgresql-datasource/**/*",
-      "pkg/tsdb/grafana-postgresql-datasource/**/*"
-    ],
+    "matches": [ "public/app/plugins/datasource/grafana-postgresql-datasource/**/*", "pkg/tsdb/grafana-postgresql-datasource/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/Postgres"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/datasource/prometheus/**/*",
-      "pkg/tsdb/prometheus/**/*"
-    ],
+    "matches": [ "public/app/plugins/datasource/prometheus/**/*", "pkg/tsdb/prometheus/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/Prometheus"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/datasource/tempo/**/*",
-      "pkg/tsdb/tempo/**/*"
-    ],
+    "matches": [ "public/app/plugins/datasource/tempo/**/*", "pkg/tsdb/tempo/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/Tempo"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/datasource/zipkin/**/*"
-    ],
+    "matches": [ "public/app/plugins/datasource/zipkin/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/Zipkin"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/features/variables/**/*",
-      "public/app/features/templating/**/*"
-    ],
+    "matches": ["public/app/features/variables/**/*", "public/app/features/templating/**/*"],
     "action": "updateLabel",
     "addLabel": "area/dashboard/templating"
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "/pkg/services/ngalert/**/*",
-      "/pkg/services/sqlstore/migrations/ualert/**/*",
-      "/pkg/services/alerting/**/*",
-      "/public/app/features/alerting/**/*",
-      "/pkg/tests/api/alerting/**/*"
-    ],
+    "matches": ["/pkg/services/ngalert/**/*", "/pkg/services/sqlstore/migrations/ualert/**/*", "/pkg/services/alerting/**/*", "/public/app/features/alerting/**/*", "/pkg/tests/api/alerting/**/*"],
     "action": "updateLabel",
     "addLabel": "area/alerting"
   },
   {
     "type": "author",
     "name": "pr/external",
-    "notMemberOf": {
-      "org": "grafana"
-    },
-    "ignoreList": [
-      "renovate[bot]",
-      "dependabot[bot]",
-      "grafana-delivery-bot[bot]",
-      "grafanabot"
-    ],
+    "notMemberOf": { "org": "grafana" },
+    "ignoreList": ["renovate[bot]","dependabot[bot]","grafana-delivery-bot[bot]","grafanabot"],
     "action": "updateLabel",
     "addLabel": "pr/external"
   },
   {
-    "type": "label",
-    "name": "type/docs",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/69"
+    "type":"label",
+    "name":"type/docs",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/69"
     }
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/panel/candlestick/**/*"
-    ],
+    "matches": ["public/app/plugins/panel/candlestick/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/candlestick"
   },
+  {
+    "type": "label",
+    "name": "area/panel/candlestick",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/panel/canvas/**/*",
-      "/public/app/features/canvas/**/*"
-    ],
+    "matches": ["public/app/plugins/panel/canvas/**/*", "/public/app/features/canvas/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/canvas"
   },
+  {
+    "type": "label",
+    "name": "area/panel/canvas",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/panel/barchart/**/*"
-    ],
+    "matches": ["public/app/plugins/panel/barchart/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/barchart"
   },
+  {
+    "type": "label",
+    "name": "area/panel/barchart",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/panel/geomap/**/*",
-      "/public/app/features/geo/**/*"
-    ],
+    "matches": ["public/app/plugins/panel/geomap/**/*", "/public/app/features/geo/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/geomap"
   },
+  {
+    "type": "label",
+    "name": "area/panel/geomap",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/panel/graph/**/*",
-      "/packages/grafana-ui/src/components/Graph/**/*",
-      "/packages/grafana-ui/src/components/GraphNG/**/*"
-    ],
+    "matches": ["public/app/plugins/panel/graph/**/*", "/packages/grafana-ui/src/components/Graph/**/*", "/packages/grafana-ui/src/components/GraphNG/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/graph"
   },
+  {
+    "type": "label",
+    "name": "area/panel/graph",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/panel/heatmap/**/*"
-    ],
+    "matches": ["public/app/plugins/panel/heatmap/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/heatmap"
   },
+  {
+    "type": "label",
+    "name": "area/panel/heatmap",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/panel/histogram/**/*"
-    ],
+    "matches": ["public/app/plugins/panel/histogram/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/histogram"
   },
+  {
+    "type": "label",
+    "name": "area/panel/histogram",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/panel/state-timeline/**/*"
-    ],
+    "matches": ["public/app/plugins/panel/state-timeline/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/state-timeline"
   },
+  {
+    "type": "label",
+    "name": "area/panel/state-timeline",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/panel/status-history/**/*"
-    ],
+    "matches": ["public/app/plugins/panel/status-history/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/status-history"
   },
+  {
+    "type": "label",
+    "name": "area/panel/status-history",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/panel/timeseries/**/*",
-      "/packages/grafana-ui/src/components/TimeSeries/**/*"
-    ],
+    "matches": ["public/app/plugins/panel/timeseries/**/*", "/packages/grafana-ui/src/components/TimeSeries/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/timeseries"
   },
+  {
+    "type": "label",
+    "name": "area/panel/timeseries",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/panel/xychart/**/*"
-    ],
+    "matches": ["public/app/plugins/panel/xychart/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/xychart"
   },
+  {
+    "type": "label",
+    "name": "area/panel/xychart",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/panel/trend/**/*"
-    ],
+    "matches": ["public/app/plugins/panel/trend/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/trend"
   },
+  {
+    "type": "label",
+    "name": "area/panel/trend",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
   {
     "type": "changedfiles",
-    "matches": [
-      "/packages/grafana-ui/src/components/VizLegend/**/*"
-    ],
+    "matches": ["/packages/grafana-ui/src/components/VizLegend/**/*"],
     "action": "updateLabel",
     "addLabel": "area/legend"
   },
+  {
+    "type": "label",
+    "name": "area/legend",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
   {
     "type": "changedfiles",
-    "matches": [
-      "/packages/grafana-ui/src/components/VizTooltip/**/*",
-      "public/app/feature/visualization/data-hover/**/*"
-    ],
+    "matches": ["/packages/grafana-ui/src/components/VizTooltip/**/*", "public/app/feature/visualization/data-hover/**/*" ],
     "action": "updateLabel",
     "addLabel": "area/tooltip"
   },
+  {
+    "type": "label",
+    "name": "area/tooltip",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/panel/gauge/**/*",
-      "/packages/grafana-ui/src/components/Gauge/**/*"
-    ],
+    "matches": ["public/app/plugins/panel/gauge/**/*", "/packages/grafana-ui/src/components/Gauge/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/gauge"
   },
   {
-    "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/panel/bargauge/**/*",
-      "/packages/grafana-ui/src/components/BarGauge/**/*"
-    ],
-    "action": "updateLabel",
-    "addLabel": "area/panel/bargauge"
+    "type": "label",
+    "name": "area/panel/gauge",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
   },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/panel/stat/**/*"
-    ],
+    "matches": ["public/app/plugins/panel/bargauge/**/*", "/packages/grafana-ui/src/components/BarGauge/**/*"],
+    "action": "updateLabel",
+    "addLabel": "area/panel/gauge"
+  },
+  {
+    "type": "label",
+    "name": "area/panel/bargauge",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
+  {
+    "type": "changedfiles",
+    "matches": ["public/app/plugins/panel/stat/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/stat"
   },
+  {
+    "type": "label",
+    "name": "area/panel/stat",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
   {
     "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/panel/piechart/**/*"
-    ],
+    "matches": ["public/app/plugins/panel/piechart/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/piechart"
   },
   {
-    "type": "changedfiles",
-    "matches": [
-      "public/app/plugins/panel/table/**/*",
-      "/packages/grafana-ui/src/components/Table/**/*"
-    ],
-    "action": "updateLabel",
-    "addLabel": "area/panel/table"
+    "type": "label",
+    "name": "area/panel/piechart",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
   }
-]
+]

.github/renovate.json5

@@ -1,87 +1,97 @@
 {
-  extends: ["config:recommended"],
-  enabledManagers: ["npm"],
-  ignoreDeps: [
+  "extends": [
+    "config:base"
+  ],
+  "enabledManagers": ["npm"],
+  "ignoreDeps": [
     "@types/history", // this can be removed entirely when we upgrade history since v5 exposes types directly
     "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)
     "loader-utils", // v3 requires upstream changes in ngtemplate-loader. ignore, and remove when we remove angular.
     "monaco-editor", // due to us exposing this via @grafana/ui/CodeEditor's props bumping can break plugins
     "@fingerprintjs/fingerprintjs", // we don't want to bump to v4 due to licensing changes
+    "@swc/core", // versions ~1.4.5 contain multiple bugs related to baseUrl resolution breaking builds.
     "slate", // we don't want to continue using this on the long run, use Monaco editor instead of Slate
     "slate-react", // we don't want to continue using this on the long run, use Monaco editor instead of Slate
     "@types/slate-react", // we don't want to continue using this on the long run, use Monaco editor instead of Slate
-    "@types/slate", // we don't want to continue using this on the long run, use Monaco editor instead of Slate
-    "storybook-dark-mode", // 4.0.2 causes storybook 8.4 to break with react hooks errors
-    // Temporarily pause updating lerna and nx until we resolve build issues
-    "lerna",
-    "nx"
+    "@types/slate" // we don't want to continue using this on the long run, use Monaco editor instead of Slate
   ],
-  includePaths: ["package.json", "packages/**", "public/app/plugins/**"],
-  ignorePaths: ["emails/**", "plugins-bundled/**", "**/mocks/**"],
-  labels: ["area/frontend", "dependencies", "no-changelog"],
-  postUpdateOptions: ["yarnDedupeHighest"],
-  packageRules: [
+  "includePaths": ["package.json", "packages/**", "public/app/plugins/**"],
+  "ignorePaths": ["emails/**", "plugins-bundled/**", "**/mocks/**"],
+  "labels": ["area/frontend", "dependencies", "no-changelog"],
+  "postUpdateOptions": ["yarnDedupeHighest"],
+  "packageRules": [
     {
-      automerge: true,
-      matchCurrentVersion: "!/^0/",
-      matchUpdateTypes: ["patch"],
-      matchPackageNames: ["!/^@?storybook/", "!/^@locker/"],
+      "automerge": true,
+      "matchCurrentVersion": "!/^0/",
+      "matchUpdateTypes": ["patch"],
+      "excludePackagePatterns": ["^@?storybook", "^@locker"]
     },
     {
-      extends: ["schedule:monthly"],
-      groupName: "Storybook updates",
-      matchPackageNames: ["/^@?storybook/"],
+      "matchPackagePatterns": ["^@?storybook"],
+      "extends": ["schedule:monthly"],
+      "groupName": "Storybook updates"
     },
     {
-      groupName: "React Aria",
-      matchPackageNames: ["@react-aria/{/,}**", "@react-stately/{/,}**"],
+      "groupName": "React Aria",
+      "matchPackagePrefixes": [
+        "@react-aria/",
+        "@react-stately/"
+      ]
     },
     {
-      groupName: "Moveable",
-      matchPackageNames: ["moveable", "react-moveable"],
+      "groupName": "Moveable",
+      "matchPackageNames": [
+        "moveable",
+        "react-moveable"
+      ]
     },
     {
-      groupName: "Slate",
-      matchPackageNames: ["@types/slate", "@types/slate-react", "slate", "slate-react"],
+      "groupName": "Slate",
+      "matchPackageNames": [
+        "@types/slate",
+        "@types/slate-react",
+        "slate",
+        "slate-react"
+      ]
     },
     {
-      groupName: "d3",
-      matchPackageNames: ["d3{/,}**", "@types/d3{/,}**"],
+      "groupName": "d3",
+      "matchPackagePrefixes": [
+        "d3",
+        "@types/d3"
+      ]
     },
     {
-      groupName: "scenes",
-      matchPackageNames: ["@grafana/scenes", "@grafana/scenes-react"],
+      "groupName": "visx",
+      "matchPackagePrefixes": [
+        "@visx/"
+      ]
     },
     {
-      groupName: "visx",
-      matchPackageNames: ["@visx/{/,}**"],
+      "groupName": "uLibraries",
+      "matchPackageNames": [
+        "@leeoniya/ufuzzy",
+        "uplot"
+      ],
+      "reviewers": ["leeoniya"],
     },
     {
-      groupName: "uLibraries",
-      matchPackageNames: ["@leeoniya/ufuzzy", "uplot"],
-      reviewers: ["leeoniya"],
-    },
-    {
-      groupName: "locker",
-      reviewers: ["team:grafana/plugins-platform-frontend"],
-      matchPackageNames: ["@locker/{/,}**"],
-    },
-    {
-      groupName: "augurs",
-      matchPackageNames: ["@bsull/augurs"],
-      reviewers: ["sd2k"],
+      "groupName": "locker",
+      "matchPackagePrefixes": [
+        "@locker/"
+      ],
+      "reviewers": ["team:grafana/plugins-platform-frontend"],
     },
   ],
-  pin: {
-    enabled: false,
-  },
-  prConcurrentLimit: 10,
-  rebaseWhen: "conflicted",
-  reviewers: ["team:grafana/frontend-ops"],
-  separateMajorMinor: false,
-  vulnerabilityAlerts: {
-    addLabels: ["area/security"],
+  "pin": {
+    "enabled": false
   },
+  "prConcurrentLimit": 10,
+  "rebaseWhen": "conflicted",
+  "reviewers": ["team:grafana/frontend-ops"],
+  "separateMajorMinor": false,
+  "vulnerabilityAlerts": {
+    "addLabels": ["area/security"]
+  }
 }

.github/teams.yml

@@ -0,0 +1,104 @@
+# The first keys are labels used on issues. All fields are optional.
+# Example
+test:
+  # channel-label is used to send a message to a specific channel
+  # when the label "test" is added to an issue.
+  channel-label: CXXXXXXXXXX
+
+# Alerting team
+area/alerting:
+  channel-label: C028MCV4R7C
+  exclude-github-team: alerting-squad
+
+# DataViz squad
+area/dataviz:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/legend:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/panel/barchart:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/panel/bargauge:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/panel/candlestick:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/panel/canvas:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/panel/common:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/panel/gauge:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/panel/geomap:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/panel/graph:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/panel/heatmap:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/panel/histogram:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/panel/piechart:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/panel/stat:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/panel/state-timeline:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/panel/status-history:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/panel/timeseries:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/panel/trend:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/panel/xychart:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/tooltip:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/transformations:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/value-mapping:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad
+
+area/units:
+  channel-label: C04J73AAQ87 # grafana-dataviz
+  exclude-github-team: dataviz-squad

.github/workflows/actions/changelog/index.js

@@ -199,7 +199,7 @@ const getChangeLogItems = async (name, owner, sinceDate, to) => {
       hasLabel({ labels }, 'area/grafana/ui') ||
       hasLabel({ labels }, 'area/grafana/toolkit') ||
       hasLabel({ labels }, 'area/grafana/runtime');
-    const author = item.commits.nodes[0].commit.author.user?.login;
+    const author = item.commits.nodes[0].commit.author.user.login;
     return {
       repo: name,
       number,
@@ -285,7 +285,7 @@ ${items
       `- ${item.title.replace(/^([^:]*:)/gm, '**$1**')} ${
         item.repo === 'grafana-enterprise'
           ? '(Enterprise)'
-          : `${pullRequestLink(item.number)}${item.author ? ', ' + userLink(item.author) : ''}`
+          : `${pullRequestLink(item.number)}, ${userLink(item.author)}`
       }`
   )
   .join('\n')}

.github/workflows/actions/changelog/package.json

@@ -1,6 +0,0 @@
-{
-  "name": "changelog",
-  "main": "index.js",
-  "type": "module",
-  "description": "changelog generator"
-}

.github/workflows/auto-milestone.yml

@@ -1,27 +1,39 @@
 name: Auto-milestone
 on:
-  pull_request_target:
+  pull_request:
     types:
       - opened
       - reopened
       - closed
-      - ready_for_review
 
-permissions:
-  pull-requests: write
-  contents: write
-
-# Note: this action runs with write permissions on GITHUB_TOKEN even from forks
-# so it must not run untrusted code (such as checking out the pull request)
 jobs:
-  main:
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.draft == false
+  config:
+    runs-on: "ubuntu-latest"
+    outputs:
+      has-secrets: ${{ steps.check.outputs.has-secrets }}
     steps:
-      # Note: Github will not trigger other actions from this because it uses
-      # the GITHUB_TOKEN token
+      - name: "Check for secrets"
+        id: check
+        shell: bash
+        run: |
+          if [ -n "${{ (secrets.GRAFANA_DELIVERY_BOT_APP_ID != '' && secrets.GRAFANA_DELIVERY_BOT_APP_PEM != '') || '' }}" ]; then
+            echo "has-secrets=1" >> "$GITHUB_OUTPUT"
+          fi
+
+  main:
+    needs: config
+    if: needs.config.outputs.has-secrets
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Generate token"
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        with:
+          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
+          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
+
       - name: Run auto-milestone
         uses: grafana/grafana-github-actions-go/auto-milestone@main
         with:
           pr: ${{ github.event.pull_request.number }}
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ steps.generate_token.outputs.token }}

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

@@ -1,125 +0,0 @@
-area/admin/user
-area/alerting
-area/annotations
-area/auth
-area/auth/ldap
-area/auth/oauth
-area/auth/rbac
-area/auth/serviceaccount
-area/backend
-area/backend/api
-area/backend/db
-area/backend/db/migration
-area/backend/db/mysql
-area/backend/db/postgres
-area/backend/db/sql
-area/backend/db/sqlite
-area/configuration
-area/dashboard/annotations
-area/dashboard/data-links
-area/dashboard/edit
-area/dashboard/folders
-area/dashboard/import
-area/dashboard/kiosk
-area/dashboard/links
-area/dashboard/rows
-area/dashboard/scenes
-area/dashboard/settings
-area/dashboard/snapshot
-area/dashboard/templating
-area/dashboard/timerange
-area/dashboard/tv
-area/dashboard/variable
-area/dashboards/panel
-area/data/export
-area/editor
-area/explore
-area/exploremetrics
-area/expressions
-area/field/overrides
-area/frontend/library-panels
-area/frontend/login
-area/image-rendering
-area/internationalization
-area/legend
-area/library-panel
-area/navigation
-area/panel/annotation-list
-area/panel/barchart
-area/panel/bargauge
-area/panel/candlestick
-area/panel/canvas
-area/panel/dashboard-list
-area/panel/edit
-area/panel/edit
-area/panel/field-override
-area/panel/flame-graph
-area/panel/gauge
-area/panel/geomap
-area/panel/heatmap
-area/panel/histogram
-area/panel/logs
-area/panel/node-graph
-area/panel/node-graph
-area/panel/piechart
-area/panel/repeat
-area/panel/singlestat
-area/panel/stat
-area/panel/state-timeline
-area/panel/status-history
-area/panel/table
-area/panel/timeseries
-area/panel/traceview
-area/panel/trend
-area/panel/xychart
-area/permissions
-area/playlist
-area/plugins
-area/plugins-catalog
-area/provisioning
-area/provisioning/datasources
-area/public-dashboards
-area/query-library
-area/recorded-queries
-area/scenes
-area/search
-area/security
-area/streaming
-area/templating/repeating
-area/tooltip
-area/transformations
-datagrid
-datasource/Alertmanager
-datasource/Azure
-datasource/azure-cosmosdb
-datasource/BigQuery
-datasource/CloudWatch
-datasource/CloudWatch Logs
-datasource/CSV
-datasource/Elasticsearch
-datasource/GitHub
-datasource/GoogleCloudMonitoring
-datasource/GoogleSheets
-datasource/grafana-pyroscope
-datasource/Graphite
-datasource/InfluxDB
-datasource/Jaeger
-datasource/JSON
-datasource/Loki
-datasource/MSSQL
-datasource/MySQL
-datasource/OpenSearch
-datasource/OpenTSDB
-datasource/Parca
-datasource/Phlare
-datasource/Postgres
-datasource/Prometheus
-datasource/SiteWIse
-datasource/Splunk
-datasource/Tempo
-datasource/TestDataDB
-datasource/Timestream
-datasource/X-Ray
-datasource/Zabbix
-datasource/Zipkin
-team/grafana-aws-datasources

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

@@ -1,25 +0,0 @@
-You are an expert Grafana issues categorizer.
-
-You are provided with a Grafana issue. Your task is to categorize the issue by analyzing the issue title and description to determine the most relevant category and type from the provided lists. Focus on precision and clarity, selecting only the most pertinent labels based on the issue details. Ensure that your selections reflect the core problem or functionality affected.
-
-The output should be a valid JSON object with the following fields:
-* id (string): The ID of the current issue.
-* categoryLabel (array of strings): The category labels for the current issue, emphasizing key terms and context.
-* typeLabel (array of strings): The type of the current issue, emphasizing clarity and relevance.
-
-**Instructions**:
-1. **Contextual Analysis**: Understand the context and intent behind the issue description. Analyze the overall narrative and relationships between different components within Grafana. Consider dependencies and related components to inform your decision.
-2. **Category and Type Differentiation**: Use language cues and patterns to differentiate between similar categories and types. Provide examples and counterexamples to clarify distinctions. Prioritize primary components over secondary ones unless they are critical to the issue.
-3. **Historical Data Utilization**: Compare current issues with past resolved issues by analyzing similarities in problem descriptions, leveraging patterns to inform categorization. Use historical data to recognize patterns and inform your decision-making.
-4. **Confidence Scoring**: Implement a confidence scoring mechanism to flag issues for review if the confidence is below a predefined threshold. Clearly indicate thresholds for high and low confidence predictions. Provide clarifying questions if data is ambiguous.
-5. **Feedback Loop Integration**: Integrate feedback from incorrect predictions to refine understanding and improve future predictions. Conduct error analysis to identify patterns in misclassifications and adapt your approach accordingly.
-6. **Semantic Analysis**: Evaluate the underlying intent of the issue using semantic analysis, considering broader implications and context. Leverage metadata or historical patterns to improve accuracy.
-7. **Avoid Over-Specification**: Maintain precision and conciseness, avoiding unnecessary details. Prioritize clarity and flag for further review if uncertain.
-8. **Consistent JSON Formatting**: Ensure the output maintains a consistent JSON structure with uniform formatting for readability and scalability.
-
-**Next Steps and Insights**:
-- Suggest potential next steps or resources that could help address the issue, providing actionable insights to enhance user engagement.
-- Regularly test responses against edge cases to ensure robustness and adaptability.
-- Stay updated with changes in category and type lists to remain current.
-
-Provide a brief explanation of the categorization decision, highlighting key terms or context that influenced the choice. Use user-centric language and technical details to ensure the explanation is comprehensive and insightful.

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

@@ -1,30 +0,0 @@
-type/accessibility
-type/angular-2-react
-type/browser-compatibility
-type/bug
-type/build-packaging
-type/chore
-type/ci
-type/cleanup
-type/codegen
-type/community
-type/debt
-type/design
-type/discussion
-type/docs
-type/duplicate
-type/e2e
-type/epic
-type/feature-request
-type/feature-toggle-enable
-type/feature-toggle-removal
-type/performance
-type/poc
-type/project
-type/proposal
-type/question
-type/refactor
-type/regression
-type/roadmap
-type/tech
-type/ux

.github/workflows/backport.yml

@@ -10,19 +10,24 @@ jobs:
     if: github.repository == 'grafana/grafana'
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - name: Checkout Actions
         uses: actions/checkout@v4
+        with:
+          repository: "grafana/grafana-github-actions"
+          path: ./actions
           ref: main
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
       - name: "Generate token"
         id: generate_token
         uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
         with:
           app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
           private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-      - run: git config --global user.email '132647405+grafana-delivery-bot[bot]@users.noreply.github.com'
-      - run: git config --global user.name 'grafana-delivery-bot[bot]'
-      - run: git remote set-url origin "https://grafana-delivery-bot:${{ steps.generate_token.outputs.token }}@github.com/grafana/grafana.git"
       - name: Run backport
-        uses: grafana/grafana-github-actions-go/backport@main
+        uses: ./actions/backport
         with:
+          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
           token: ${{ steps.generate_token.outputs.token }}
+          labelsToAdd: "backport"
+          title: "[{{base}}] {{originalTitle}}"

.github/workflows/changelog.yml

@@ -2,10 +2,6 @@ name: Generate changelog
 on:
   workflow_call:
     inputs:
-      previous_version:
-        type: string
-        required: false
-        description: 'The release version (semver, git tag, branch or commit) to use for comparison'
       version:
         type: string
         required: true
@@ -30,10 +26,6 @@ on:
 
   workflow_dispatch:
     inputs:
-      previous_version:
-        type: string
-        required: false
-        description: 'The release version (semver, git tag, branch or commit) to use for comparison'
       version:
         type: string
         required: true
@@ -94,7 +86,6 @@ jobs:
         id: changelog
         uses: ./.github/workflows/actions/changelog
         with:
-          previous: ${{ inputs.previous_version }}
           github_token: ${{ steps.generate_token.outputs.token }}
           target: v${{ inputs.version }}
           output_file: changelog_items.md

.github/workflows/commands.yml

@@ -1,21 +1,11 @@
 name: Run commands when issues are labeled or comments added
-
-# important: this workflow uses a github app that is strictly limited
-# to issues. If you want to change the triggers for this workflow,
-# please review if the permissions are still sufficient.
 on:
   issues:
     types: [labeled, unlabeled]
   issue_comment:
     types: [created]
-
 concurrency:
   group: issue-commands-${{ github.event.issue.number }}
-
-permissions:
-  contents: read
-  id-token: write
-
 jobs:
   config:
     runs-on: "ubuntu-latest"
@@ -26,7 +16,7 @@ jobs:
         id: check
         shell: bash
         run: |
-          if [ "${{ github.repository }}" == "grafana/grafana" ] && [ -n "${{ secrets.GRAFANA_MISC_STATS_API_KEY }}" ]; then
+          if [ -n "${{ (secrets.GRAFANA_MISC_STATS_API_KEY != '' && secrets.ISSUE_COMMANDS_TOKEN != '') || '' }}" ]; then
             echo "has-secrets=1" >> "$GITHUB_OUTPUT"
           fi
 
@@ -35,34 +25,17 @@ jobs:
     if: needs.config.outputs.has-secrets
     runs-on: ubuntu-latest
     steps:
-      - name: "Get vault secrets"
-        id: vault-secrets
-        uses: grafana/shared-workflows/actions/get-vault-secrets@main
-        with:
-          # Secrets placed in the ci/repo/grafana/grafana/plugins_platform_issue_commands_github_bot path in Vault
-          repo_secrets: |
-            GH_APP_ID=plugins_platform_issue_commands_github_bot:app_id
-            GH_APP_PEM=plugins_platform_issue_commands_github_bot:app_pem
-
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ env.GH_APP_ID }}
-          private_key: ${{ env.GH_APP_PEM }}
-
       - name: Checkout Actions
         uses: actions/checkout@v4
         with:
           repository: "grafana/grafana-github-actions"
           path: ./actions
           ref: main
-
       - name: Install Actions
         run: npm install --production --prefix ./actions
       - name: Run Commands
         uses: ./actions/commands
         with:
           metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
-          token: ${{ steps.generate_token.outputs.token }}
+          token: ${{secrets.ISSUE_COMMANDS_TOKEN}}
           configPath: commands

.github/workflows/create-next-release-branch.yml

@@ -1,53 +0,0 @@
-name: Create next release branch
-on:
-  workflow_call:
-    inputs:
-      ownerRepo:
-        type: string
-        description: Owner/repo of the repository where the branch is created (e.g. 'grafana/grafana')
-        required: true
-      source:
-        description: The release branch to increment (eg providing `release-11.2.3` will result in `release-11.2.4` being created)
-        type: string
-        required: true
-    secrets:
-      GRAFANA_DELIVERY_BOT_APP_ID:
-        required: true
-      GRAFANA_DELIVERY_BOT_APP_PEM:
-        required: true
-    outputs:
-      branch:
-        description: The new branch that was created
-        value: ${{ jobs.main.outputs.branch }}
-  workflow_dispatch:
-    inputs:
-      ownerRepo:
-        description: Owner/repo of the repository where the branch is created (e.g. 'grafana/grafana')
-      source:
-        description: The release branch to increment (eg providing `release-11.2.3` will result in `release-11.2.4` being created)
-        type: string
-        required: true
-    secrets:
-      GRAFANA_DELIVERY_BOT_APP_ID:
-        required: true
-      GRAFANA_DELIVERY_BOT_APP_PEM:
-        required: true
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    outputs:
-      branch: ${{ steps.branch.outputs.branch }}
-    steps:
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-      - name: Create release branch
-        id: branch
-        uses: grafana/grafana-github-actions-go/bump-release@main
-        with:
-          ownerRepo: ${{ inputs.ownerRepo }}
-          source: ${{ inputs.source }}
-          token: ${{ steps.generate_token.outputs.token }}

.github/workflows/create-security-patch-from-security-mirror.yml

@@ -11,7 +11,6 @@ on:
     branches:
       - "main"
       - "v*.*.*"
-      - "release-*.*.*"
 
 # This is run before the pull request has been merged, so we'll run against the src branch
 jobs:

.github/workflows/dashboards-issue-add-label.yml

@@ -3,11 +3,8 @@ on:
   issues:
     types: [opened, closed, edited, reopened, assigned, unassigned, labeled, unlabeled]
 
-permissions:
-  contents: read
-  id-token: write
-
 env:
+  GITHUB_TOKEN: ${{ secrets.ISSUE_COMMANDS_TOKEN }}
   ORGANIZATION: ${{ github.repository_owner }}
   REPO: ${{ github.event.repository.name }}
   TARGET_PROJECT: 202
@@ -16,28 +13,27 @@ env:
 concurrency:
   group: issue-label-when-in-project-${{ github.event.number }}
 jobs:
+  config:
+    runs-on: "ubuntu-latest"
+    outputs:
+      has-secrets: ${{ steps.check.outputs.has-secrets }}
+    steps:
+      - name: "Check for secrets"
+        id: check
+        shell: bash
+        run: |
+          if [ -n "${{ (secrets.ISSUE_COMMANDS_TOKEN != '') || '' }}" ]; then
+            echo "has-secrets=1" >> "$GITHUB_OUTPUT"
+          fi
+
   main:
-    if: github.repository == 'grafana/grafana'
+    needs: config
+    if: needs.config.outputs.has-secrets
     runs-on: ubuntu-latest
     steps:
-      - name: "Get vault secrets"
-        id: vault-secrets
-        uses: grafana/shared-workflows/actions/get-vault-secrets@main
-        with:
-          # Secrets placed in the ci/repo/grafana/grafana/plugins_platform_issue_commands_github_bot path in Vault
-          repo_secrets: |
-            GH_APP_ID=plugins_platform_issue_commands_github_bot:app_id
-            GH_APP_PEM=plugins_platform_issue_commands_github_bot:app_pem
-
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ env.GH_APP_ID }}
-          private_key: ${{ env.GH_APP_PEM }}
+      - name: log in
+        run: gh api user -q .login
       - name: Check if issue is in target project
-        env:
-          GH_TOKEN: ${{ steps.generate_token.outputs.token }}
         run: |
           gh api graphql -f query='
             query($org: String!, $repo: String!) {
@@ -66,8 +62,6 @@ jobs:
           done
       - name: Add label to issue
         if: env.IN_TARGET_PROJ
-        env:
-          GH_TOKEN: ${{ steps.generate_token.outputs.token }}
         run: |
           gh api graphql -f query='
             mutation ($labelableId: ID!, $labelIds: [ID!]!) {

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

@@ -1,24 +0,0 @@
-name: Deploy pr preview
-
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - closed
-    paths:
-      - "docs/sources/**"
-
-jobs:
-  deploy-pr-preview:
-    if: ${{ ! github.event.pull_request.head.repo.fork }}
-    uses: grafana/writers-toolkit/.github/workflows/deploy-preview.yml@main
-    with:
-      sha: ${{ github.event.pull_request.head.sha }}
-      branch: ${{ github.head_ref }}
-      event_number: ${{ github.event.number }}
-      title: ${{ github.event.pull_request.title }}
-      repo: grafana
-      website_directory: content/docs/grafana/latest
-      relative_prefix: /docs/grafana/latest/
-      index_file: true

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

@@ -2,14 +2,6 @@
 ---
 name: Levitate / Detect breaking changes in PR
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-  id-token: write
-
 on:
   pull_request:
     paths:
@@ -19,7 +11,7 @@ on:
 
 jobs:
   buildPR:
-    name: Build PR packages artifacts
+    name: Build PR
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -31,11 +23,11 @@ jobs:
           path: './pr'
       - uses: actions/setup-node@v4
         with:
-          node-version: 22.11.0
+          node-version: 20.9.0
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "dir=$(yarn config get cacheFolder)" >> "$GITHUB_OUTPUT"
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
 
       - name: Restore yarn cache
         uses: actions/cache@v4
@@ -65,7 +57,7 @@ jobs:
           path: './pr/pr_built_packages.zip'
 
   buildBase:
-    name: Build Base packages artifacts
+    name: Build Base
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -79,11 +71,11 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 22.11.0
+          node-version: 20.9.0
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "dir=$(yarn config get cacheFolder)" >> "$GITHUB_OUTPUT"
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
 
       - name: Restore yarn cache
         uses: actions/cache@v4
@@ -113,20 +105,17 @@ jobs:
           path: './base/base_built_packages.zip'
 
   Detect:
-    name: Detect breaking changes between PR and base
+    name: Detect breaking changes
     runs-on: ubuntu-latest
     needs: ['buildPR', 'buildBase']
     env:
       GITHUB_STEP_NUMBER: 8
-    permissions:
-      contents: 'read'
-      id-token: 'write'
 
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 22.11.0
+          node-version: 20.9.0
 
       - name: Get built packages from pr
         uses: actions/download-artifact@v4
@@ -144,30 +133,26 @@ jobs:
       - name: Unzip artifact from base
         run: unzip -j base_built_packages.zip -d ./base && rm base_built_packages.zip
 
-      - id: 'auth'
-        uses: 'google-github-actions/auth@v2'
+      - name: Get link for the Github Action job
+        id: job
+        uses: actions/github-script@v6
         with:
-          workload_identity_provider: ${{ secrets.WIF_PROVIDER }}
-          service_account: ${{ secrets.LEVITATE_SA }}
-          project_id: 'grafanalabs-global'
-
-      - name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@v2'
-        with:
-          version: '>= 363.0.0'
-          project_id: 'grafanalabs-global'
-          install_components: 'bq'
+          script: |
+              const name = 'Detect breaking changes';
+              const script = require('./.github/workflows/scripts/pr-get-job-link.js')
+              await script({name, github, context, core})
 
       - name: Detect breaking changes
         id: breaking-changes
         run: ./scripts/check-breaking-changes.sh
         env:
           FORCE_COLOR: 3
+          GITHUB_JOB_LINK: ${{ steps.job.outputs.link }}
 
       - name: Persisting the check output
         run: |
             mkdir -p ./levitate
-            echo "{ \"exit_code\": ${{ steps.breaking-changes.outputs.is_breaking }}, \"message\": \"${{ steps.breaking-changes.outputs.message }}\", \"pr_number\": \"${{ github.event.pull_request.number }}\" }" > ./levitate/result.json
+            echo "{ \"exit_code\": ${{ steps.breaking-changes.outputs.is_breaking }}, \"message\": \"${{ steps.breaking-changes.outputs.message }}\", \"job_link\": \"${{ steps.job.outputs.link }}#step:${GITHUB_STEP_NUMBER}:1\", \"pr_number\": \"${{ github.event.pull_request.number }}\" }" > ./levitate/result.json
 
       - name: Upload check output as artifact
         uses: actions/upload-artifact@v4
@@ -177,7 +162,7 @@ jobs:
 
 
   Report:
-    name: Report breaking changes in PR comment
+    name: Report breaking changes in PR
     runs-on: ubuntu-latest
     needs: ['Detect']
 
@@ -213,12 +198,15 @@ jobs:
           PR_NUMBER: ${{ github.event.pull_request.number }}
         with:
           script: |
-            const { data: labels } = await github.rest.issues.listLabelsOnIssue({
-              issue_number: context.issue.number,
+            const { data } = await github.rest.issues.listLabelsOnIssue({
+              issue_number: process.env.PR_NUMBER,
               owner: context.repo.owner,
               repo: context.repo.repo,
             });
-            return labels.some(label => label.name === 'levitate breaking change') ? 1 : 0
+            const labels = data.map(({ name }) => name);
+            const doesExist = labels.includes('levitate breaking change');
+
+            return doesExist ? 1 : 0;
 
       # put the markdown into a variable
       - name: Levitate Markdown
@@ -229,9 +217,9 @@ jobs:
               echo 'levitate_markdown<<EOF'
               cat levitate.md
               echo EOF
-            } >> "$GITHUB_OUTPUT"
+            } >> $GITHUB_OUTPUT
             else
-              echo "levitate_markdown=No breaking changes detected" >> "$GITHUB_OUTPUT"
+              echo "levitate_markdown=No breaking changes detected" >> $GITHUB_OUTPUT
             fi
 
 
@@ -248,8 +236,7 @@ jobs:
             ${{ steps.levitate-markdown.outputs.levitate_markdown }}
 
             [Read our guideline](https://github.com/grafana/grafana/blob/main/contribute/breaking-changes-guide/breaking-changes-guide.md)
-
-            * Your pull request merge won't be blocked.
+            [Console output](${{ steps.levitate-run.outputs.job_link }})
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
 
       # Remove comment from the PR (no more breaking changes)
@@ -262,41 +249,23 @@ jobs:
           delete: true
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
 
-      - name: Send Slack Message via Payload
+      # Posts a notification to Slack if a PR has a breaking change and it did not have a breaking change before
+      - name: Post to Slack
         id: slack
-        if: steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 && github.repository == 'grafana/grafana'
-        uses: grafana/shared-workflows/actions/send-slack-message@7b628e7352c2dea057c565cc4fcd5564d5f396c0 #v1.0.0
+        if: steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 && env.HAS_SECRETS
+        uses: slackapi/slack-github-action@v1.26.0
         with:
-          channel-id: "C031SLFH6G0"
-          payload:  |
+          payload: |
             {
-              "channel": "C031SLFH6G0",
-              "text": ":warning: Possible breaking changes detected in *PR:* <${{ github.event.pull_request.html_url }}|#${{ github.event.pull_request.number }} :warning:",
-              "icon_emoji": ":grot:",
-              "username": "Levitate Bot",
-              "blocks": [
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": "*grafana/grafana* repository has possible breaking changes"
-                  }
-                },
-                {
-                  "type": "section",
-                  "fields": [
-                    {
-                      "type": "mrkdwn",
-                      "text": "*PR:* <${{ github.event.pull_request.html_url }}|#${{ github.event.pull_request.number }}>"
-                    },
-                    {
-                      "type": "mrkdwn",
-                      "text": "*Job:* <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|View Job>"
-                    }
-                  ]
-                }
-              ]
+              "pr_link": "https://github.com/grafana/grafana/pull/${{ steps.levitate-run.outputs.pr_number }}",
+              "pr_number": "${{ steps.levitate-run.outputs.pr_number }}",
+              "job_link": "${{ steps.levitate-run.outputs.job_link }}",
+              "reporting_job_link": "${{ github.event.workflow_run.html_url }}",
+              "message": "${{ steps.levitate-run.outputs.message }}"
             }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_LEVITATE_WEBHOOK_URL }}
+          HAS_SECRETS: ${{ (github.repository == 'grafana/grafana' || secrets.SLACK_LEVITATE_WEBHOOK_URL != '') || '' }}
 
       # Add the label
       - name: Add "levitate breaking change" label
@@ -367,10 +336,5 @@ jobs:
             });
 
       - name: Exit
-        run: |
-          if [ "${{ steps.levitate-run.outputs.exit_code }}" -ne 0 ]; then
-            echo "Breaking changes detected. Please check the levitate report in your pull request. This workflow won't block merging."
-          fi
-
-          exit ${{ steps.levitate-run.outputs.exit_code }}
+        run: exit ${{ steps.levitate-run.outputs.exit_code }}
         shell: bash

.github/workflows/doc-validator.yml

@@ -1,18 +1,13 @@
 name: "doc-validator"
 on:
+  pull_request:
+    paths: ["docs/sources/**"]
   workflow_dispatch:
-    inputs:
-      include:
-        description: |
-          Regular expression that matches paths to include in linting.
-
-          For example: docs/sources/(?:alerting|fundamentals)/.+\.md
-        required: true
 jobs:
   doc-validator:
     runs-on: "ubuntu-latest"
     container:
-      image: "grafana/doc-validator:v5.2.0"
+      image: "grafana/doc-validator:v5.0.0"
     steps:
       - name: "Checkout code"
         uses: "actions/checkout@v4"
@@ -20,7 +15,15 @@ jobs:
         # Only run doc-validator on specific directories.
         run: >
           doc-validator
-          '--include=${{ inputs.include }}'
+          '--include=^docs/sources/(?:alerting|fundamentals|getting-started|introduction|setup-grafana|upgrade-guide|whatsnew/whats-new-in-v(?:9|10))/.+\.md$'
           '--skip-checks=^(?:image.+|canonical-does-not-match-pretty-URL)$'
           ./docs/sources
           /docs/grafana/latest
+          | reviewdog
+          -f=rdjsonl
+          --fail-on-error
+          --filter-mode=nofilter
+          --name=doc-validator
+          --reporter=github-pr-review
+        env:
+          REVIEWDOG_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

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

@@ -1,12 +1,14 @@
-name: 'Ephemeral instances'
+name: 'Ephemeral instances: PR comment'
 on:
   issue_comment:
     types: [created]
-  pull_request:
-    types: [closed]
 jobs:
   config:
-    runs-on: "ubuntu-latest"
+    if: github.event.sender.type == 'User' &&
+        github.event.issue.pull_request &&
+        startsWith(github.event.comment.body, '/deploy-to-hg')
+    runs-on:
+      labels: ubuntu-latest-8-cores
     outputs:
       has-secrets: ${{ steps.check.outputs.has-secrets }}
     steps:
@@ -28,7 +30,9 @@ jobs:
   handle-pull-request-event:
     needs: config
     if: needs.config.outputs.has-secrets &&
-        ${{ github.event.issue.pull_request && (startsWith(github.event.comment.body, '/deploy-to-hg') || github.event.action == 'closed') }}
+        github.event.sender.type == 'User' &&
+        github.event.issue.pull_request &&
+        startsWith(github.event.comment.body, '/deploy-to-hg')
     runs-on:
       labels: ubuntu-latest-8-cores
     continue-on-error: true
@@ -48,14 +52,34 @@ jobs:
           ref: main
           path: ephemeral
 
-      - name: build and deploy ephemeral instance
-        uses: ./ephemeral
+      - name: Setup Go
+        uses: actions/setup-go@v4
         with:
-          github-token:  ${{ steps.generate_token.outputs.token }}
-          gcom-host: ${{ secrets.EI_GCOM_HOST }}
-          gcom-token: ${{ secrets.EI_GCOM_TOKEN }}
-          registry: "${{ secrets.EI_EPHEMERAL_INSTANCES_REGISTRY }}"
-          gcp-service-account-key: "${{ secrets.EI_GCP_SERVICE_ACCOUNT_KEY_BASE64 }}"
-          ephemeral-org-id: "${{ secrets.EI_EPHEMERAL_ORG_ID }}"
-          oss-or-enterprise: oss
-          verbose: true
+          go-version-file: ephemeral/go.mod
+
+      - name: Get latest grafana version number
+        run: |
+          # if package.json contains e.g. 11.0.0-pre, this writes 11.0.0 to version.txt
+          curl https://raw.githubusercontent.com/grafana/grafana/main/package.json | jq -r .version | grep -o  '^[0-9\.]*' > version.txt
+
+      - name: Run action
+        env:
+          GITHUB_EVENT: ${{ toJson(github.event)}}
+        run: |
+          # Create a prerelease version number using the latest version from the package.json in the grafana repo.
+          export GRAFANA_VERSION="$(cat version.txt)"
+          echo "${GRAFANA_VERSION}"
+
+          cd $GITHUB_WORKSPACE/ephemeral/src
+          go run . \
+            -GITHUB_TOKEN="${{ steps.generate_token.outputs.token }}" \
+            -GITHUB_WORKFLOW_RUN_ID="${{ github.run_id }}" \
+            -GITHUB_EVENT="$GITHUB_EVENT" \
+            -GITHUB_TRIGGERING_ACTOR="${{ github.triggering_actor }}" \
+            -GCOM_HOST="${{ secrets.EI_GCOM_HOST }}" \
+            -GCOM_TOKEN="${{ secrets.EI_GCOM_TOKEN }}" \
+            -HOSTED_GRAFANA_IMAGE_TAG="$GRAFANA_VERSION-ephemeral-oss-${{ github.event.issue.number}}-${{ github.run_number }}-${{ github.run_attempt }}" \
+            -REGISTRY="${{ secrets.EI_EPHEMERAL_INSTANCES_REGISTRY }}" \
+            -GRAFANA_VERSION="$GRAFANA_VERSION" \
+            -GCP_SERVICE_ACCOUNT_KEY_BASE64="${{ secrets.EI_GCP_SERVICE_ACCOUNT_KEY_BASE64 }}" \
+            -EPHEMERAL_ORG_ID="${{ secrets.EI_EPHEMERAL_ORG_ID }}" || true

.github/workflows/ephemeral-instances-pr-opened-closed.yml

@@ -0,0 +1,77 @@
+name: 'Ephemeral instances: PR opened/closed'
+on:
+  pull_request:
+      types: [opened, reopened, closed]
+jobs:
+  config:
+    runs-on: "ubuntu-latest"
+    outputs:
+      has-secrets: ${{ steps.check.outputs.has-secrets }}
+    steps:
+      - name: "Check for secrets"
+        id: check
+        shell: bash
+        run: |
+          if [ -n "${{ (secrets.EI_APP_ID != '' &&
+                        secrets.EI_APP_PRIVATE_KEY != '' &&
+                        secrets.EI_GCOM_HOST != '' &&
+                        secrets.EI_GCOM_TOKEN != '' &&
+                        secrets.EI_EPHEMERAL_INSTANCES_REGISTRY != '' &&
+                        secrets.EI_GCP_SERVICE_ACCOUNT_KEY_BASE64 != '' &&
+                        secrets.EI_EPHEMERAL_ORG_ID != ''
+                        ) || '' }}" ]; then
+            echo "has-secrets=1" >> "$GITHUB_OUTPUT"
+          fi
+
+  handle-pull-request-event:
+    needs: config
+    if: needs.config.outputs.has-secrets
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Generate a GitHub app installation token
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        with:
+          app_id: ${{ secrets.EI_APP_ID }}
+          private_key: ${{ secrets.EI_APP_PRIVATE_KEY }}
+
+      - name: Checkout ephemeral instances repository
+        uses: actions/checkout@v4
+        with:
+          repository: grafana/ephemeral-grafana-instances-github-action
+          token: ${{ steps.generate_token.outputs.token }}
+          ref: main
+          path: ephemeral
+
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: ephemeral/go.mod
+
+      - name: Get latest grafana version number
+        run: |
+          # if package.json contains e.g. 11.0.0-pre, this writes 11.0.0 to version.txt
+          curl https://raw.githubusercontent.com/grafana/grafana/main/package.json | jq -r .version | grep -o  '^[0-9\.]*' > version.txt
+
+      - name: Run action
+        env:
+          GITHUB_EVENT: ${{ toJson(github.event)}}
+        run: |
+          # Create a prerelease version number using the latest version from the package.json in the grafana repo.
+          export GRAFANA_VERSION="$(cat version.txt)"
+          echo "${GRAFANA_VERSION}"
+
+          cd $GITHUB_WORKSPACE/ephemeral/src
+          go run . \
+            -GITHUB_TOKEN="${{ steps.generate_token.outputs.token }}" \
+            -GITHUB_WORKFLOW_RUN_ID="${{ github.run_id }}" \
+            -GITHUB_EVENT="$GITHUB_EVENT" \
+            -GITHUB_TRIGGERING_ACTOR="${{ github.triggering_actor }}" \
+            -GCOM_HOST="${{ secrets.EI_GCOM_HOST }}" \
+            -GCOM_TOKEN="${{ secrets.EI_GCOM_TOKEN }}" \
+            -HOSTED_GRAFANA_IMAGE_TAG="unused" \
+            -REGISTRY="${{ secrets.EI_EPHEMERAL_INSTANCES_REGISTRY }}" \
+            -GRAFANA_VERSION="$GRAFANA_VERSION" \
+            -GCP_SERVICE_ACCOUNT_KEY_BASE64="${{ secrets.EI_GCP_SERVICE_ACCOUNT_KEY_BASE64 }}" \
+            -EPHEMERAL_ORG_ID="${{ secrets.EI_EPHEMERAL_ORG_ID }}" || true

.github/workflows/github-release.yml

@@ -8,7 +8,7 @@ on:
         type: string
       latest:
         required: false
-        default: "0"
+        default: false
         description: Mark this release as latest (`1`) or not (`0`, default)
         type: string
       dry_run:
@@ -23,7 +23,6 @@ on:
         type: string
       latest:
         required: false
-        default: "0"
         description: Mark this release as latest (`1`) or not (`0`, default)
         type: string
       dry_run:

.github/workflows/go-lint.yml

@@ -1,30 +0,0 @@
-name: golangci-lint
-on:
-  push:
-    paths:
-      - pkg/**
-      - .github/workflows/go-lint.yml
-      - go.*
-    branches:
-      - main
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  lint-go:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: ./go.mod
-      - run: make gen-go
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
-        with:
-          version: v1.62.0
-          args: |
-            --verbose $(go list -m -f '{{.Dir}}' | xargs -I{} sh -c 'test ! -f {}/.nolint && echo {}/...')
-          install-mode: binary

.github/workflows/go_lint.yml

@@ -0,0 +1,33 @@
+name: golangci-lint
+on:
+  push:
+    paths:
+      - pkg/**
+      - .github/workflows/go_lint.yml
+      - go.*
+    branches:
+      - main
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  lint-go:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: ./go.mod
+      - run: CODEGEN_VERIFY=1 make gen-cue
+      - run: make gen-go
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v5
+        with:
+          version: v1.59.0
+          args: |
+            --config .golangci.toml --max-same-issues=0 --max-issues-per-linter=0 --verbose ./pkg/... ./pkg/apimachinery/... ./pkg/apiserver/... ./pkg/build/wire/... ./pkg/promlib/... ./pkg/util/xorm/...
+          only-new-issues: true
+          skip-cache: true
+          install-mode: binary

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

@@ -14,21 +14,13 @@ jobs:
       pull-requests: write # needed to update PR description, labels, etc
 
     steps:
-      - name: Generate token
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.GRAFANA_PR_AUTOMATION_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_PR_AUTOMATION_APP_PEM }}
-
       - uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
-          token: ${{ steps.generate_token.outputs.token }}
 
       - name: Download sources
         id: crowdin-download
-        uses: crowdin/github-action@v2
+        uses: crowdin/github-action@v1
         with:
           upload_sources: false
           upload_translations: false
@@ -61,10 +53,18 @@ jobs:
           github_user_name: "github-actions[bot]"
           github_user_email: "41898282+github-actions[bot]@users.noreply.github.com"
         env:
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
           CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
 
+      - name: Generate token
+        if: steps.crowdin-download.outputs.pull_request_url
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        with:
+          app_id: ${{ secrets.GRAFANA_PR_AUTOMATION_APP_ID }}
+          private_key: ${{ secrets.GRAFANA_PR_AUTOMATION_APP_PEM }}
+
       - name: Get pull request ID
         if: steps.crowdin-download.outputs.pull_request_url
         shell: bash
@@ -74,7 +74,7 @@ jobs:
           pr_id=$(gh pr view ${{ steps.crowdin-download.outputs.pull_request_url }} --json id -q .id)
           echo "PULL_REQUEST_ID=$pr_id" >> "$GITHUB_ENV"
         env:
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get project board ID
         uses: octokit/graphql-action@v2.x
@@ -110,6 +110,7 @@ jobs:
                 }
               }
             }
+
         env:
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
 
@@ -118,4 +119,4 @@ jobs:
         if: steps.crowdin-download.outputs.pull_request_url
         with:
           pr: ${{ steps.crowdin-download.outputs.pull_request_number }}
-          token: ${{ steps.generate_token.outputs.token }}
+          token: ${{ secrets.GITHUB_TOKEN }}

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

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Upload sources
-        uses: crowdin/github-action@v2
+        uses: crowdin/github-action@v1
         with:
           upload_sources: true
           upload_sources_args: '--dest=public/locales/en-US/grafana.json'

.github/workflows/issue-labeled.yml

@@ -0,0 +1,99 @@
+name: Notify Slack channel based on new issue label
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  config:
+    runs-on: "ubuntu-latest"
+    outputs:
+      has-secrets: ${{ steps.check.outputs.has-secrets }}
+    steps:
+      - name: "Check for secrets"
+        id: check
+        shell: bash
+        run: |
+          if [ -n "${{ (secrets.SLACK_WEBHOOK_URL != '') || '' }}" ]; then
+            echo "has-secrets=1" >> "$GITHUB_OUTPUT"
+          fi
+
+  notify:
+    needs: config
+    if: needs.config.outputs.has-secrets
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Download teams.yml to know which label is for which team"
+        run: wget https://raw.githubusercontent.com/grafana/grafana/main/.github/teams.yml
+
+      - name: "Determine which team to notify"
+        run: |
+          # Default to null values.
+          CHANNEL="null"
+          TEAM="null"
+
+          echo "${{ github.event.label.name }} label added"
+          export CURRENT_LABEL="${{ github.event.label.name }}" # Enable the use of the label in yq evaluations
+          # yq is installed by default in ubuntu-latest
+          if [[ $(yq e 'keys | .[] | select(. == env(CURRENT_LABEL))' teams.yml ) ]]; then
+            # Check if we have a channel set to notify on comments.
+            if [[ $(yq '.[env(CURRENT_LABEL)] | has("channel-label")' teams.yml ) == true ]]; then
+              CHANNEL=$(yq '.[env(CURRENT_LABEL)].channel-label' teams.yml)
+              echo "Ready to send issue to channel ID ${CHANNEL}"
+            fi
+
+            if [[ $(yq '.[env(CURRENT_LABEL)] | has("exclude-github-team")' teams.yml ) == true ]]; then
+              TEAM=$(yq '.[env(CURRENT_LABEL)].exclude-github-team' teams.yml)
+              echo "Will not send issue to channel if issue author is part of the team ${TEAM}"
+            fi
+          fi
+
+          # set environment for next steps
+          echo "CHANNEL=${CHANNEL}" >> $GITHUB_ENV
+          echo "TEAM=${TEAM}" >> $GITHUB_ENV
+
+      - name: "Prepare payload"
+        uses: frabert/replace-string-action@v2.5
+        id: preparePayload
+        with:
+          # replace double quotes with single quotes to avoid breaking the JSON payload sent to Slack
+          string: ${{ github.event.issue.title }}
+          pattern: '"'
+          replace-with: "'"
+          flags: 'g'
+
+      - name: Get Token
+        id: get_workflow_token
+        uses: peter-murray/workflow-application-token-action@v3
+        with:
+          application_id: ${{ secrets.APP_GRAFANA_TEAM_CHECKER_ID }}
+          application_private_key: ${{ secrets.APP_GRAFANA_TEAM_CHECKER_KEY }}
+
+      - name: "Check that issue author is not part of the team"
+        if: ${{ env.TEAM != 'null' }}
+        run: |
+          response=$(gh api /orgs/grafana/teams/${{ env.TEAM }}/memberships/${{ github.event.issue.user.login }} -i -H "Accept: application/vnd.github.v3+json")
+          STATUS_CODE=$(echo "$response" | head -n 1 | cut -d' ' -f2)
+          if [ "$status_code" -eq 404 ]; then
+            echo "The user was not found in the team."
+            echo "USER_FOUND=false" >> $GITHUB_ENV
+          else
+            echo "The user was potentially found in the team"
+            echo "USER_FOUND=maybe" >> $GITHUB_ENV
+          fi
+        env:
+          GITHUB_TOKEN: ${{ steps.get_workflow_token.outputs.token }}
+
+      - name: "Send Slack notification"
+        if: ${{ (env.CHANNEL != 'null') && ((env.USER_FOUND == 'false') || (env.TEAM != 'null')) }}
+        uses: slackapi/slack-github-action@v1.26.0
+        with:
+          payload: >
+            {
+              "icon_emoji": ":grafana:",
+              "username": "Grafana issue labeled",
+              "text": "Issue \"${{ steps.preparePayload.outputs.replaced }}\" labeled \"${{ github.event.label.name }}\": ${{ github.event.issue.html_url }}, please triage.",
+              "channel": "${{ env.CHANNEL }}"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/issue-opened.yml

@@ -1,113 +1,28 @@
 name: Run commands when issues are opened
-
-# important: this workflow uses a github app that is strictly limited
-# to issues. If you want to change the triggers for this workflow,
-# please review if the permissions are still sufficient.
 on:
   issues:
     types: [opened]
-
 concurrency:
   group: issue-opened-${{ github.event.issue.number }}
-
-permissions:
-  contents: read
-  id-token: write
-
 jobs:
   main:
     runs-on: ubuntu-latest
-    if: github.repository == 'grafana/grafana'
     steps:
-
       - name: Checkout Actions
         uses: actions/checkout@v4
         with:
           repository: "grafana/grafana-github-actions"
           path: ./actions
           ref: main
-
       - name: Install Actions
         run: npm install --production --prefix ./actions
-
       # give issue-openers a chance to add labels after submit
       - name: Sleep for 2 minutes
         run: sleep 2m
         shell: bash
-
-      - name: "Get vault secrets"
-        id: vault-secrets
-        uses: grafana/shared-workflows/actions/get-vault-secrets@main
-        with:
-          # Secrets placed in the ci/repo/grafana/grafana/plugins_platform_issue_commands_github_bot path in Vault
-          repo_secrets: |
-            GH_APP_ID=plugins_platform_issue_commands_github_bot:app_id
-            GH_APP_PEM=plugins_platform_issue_commands_github_bot:app_pem
-
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ env.GH_APP_ID }}
-          private_key: ${{ env.GH_APP_PEM }}
-
       - name: Run Commands
         uses: ./actions/commands
         with:
           metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
-          token: ${{ steps.generate_token.outputs.token }}
+          token: ${{secrets.ISSUE_COMMANDS_TOKEN}}
           configPath: "issue-opened"
-
-  auto-triage:
-    needs: [main]
-    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@main
-        with:
-          # Secrets placed in the ci/repo/grafana/grafana/plugins_platform_issue_triager path in Vault
-          repo_secrets: |
-            AUTOTRIAGER_OPENAI_API_KEY=plugins_platform_issue_triager:AUTOTRIAGER_OPENAI_API_KEY
-            AUTOTRIAGER_SLACK_WEBHOOK_URL=plugins_platform_issue_triager:AUTOTRIAGER_SLACK_WEBHOOK_URL
-            GH_APP_ID=plugins_platform_issue_commands_github_bot:app_id
-            GH_APP_PEM=plugins_platform_issue_commands_github_bot:app_pem
-
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ env.GH_APP_ID }}
-          private_key: ${{ env.GH_APP_PEM }}
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Send issue to the auto triager action
-        id: auto_triage
-        uses: grafana/auto-triager@main
-        with:
-          token: ${{ steps.generate_token.outputs.token }}
-          issue_number: ${{ github.event.issue.number }}
-          openai_api_key: ${{ env.AUTOTRIAGER_OPENAI_API_KEY }}
-          add_labels: true
-          labels_file: ${{ github.workspace }}/.github/workflows/auto-triager/labels.txt
-          types_file: ${{ github.workspace }}/.github/workflows/auto-triager/types.txt
-          prompt_file: ${{ github.workspace }}/.github/workflows/auto-triager/prompt.txt
-
-      - name: "Send Slack notification"
-        if: ${{ steps.auto_triage.outputs.triage_labels != '' }}
-        uses: slackapi/slack-github-action@v1.27.0
-        with:
-          payload: >
-            {
-              "icon_emoji": ":robocto:",
-              "username": "Auto Triager",
-              "type": "mrkdwn",
-              "text": "Auto triager found the following labels: ${{ steps.auto_triage.outputs.triage_labels }} for issue ${{ github.event.issue.html_url }}",
-              "channel": "#triage-automation-ci"
-            }
-        env:
-          SLACK_WEBHOOK_URL:  ${{ env.AUTOTRIAGER_SLACK_WEBHOOK_URL }}

.github/workflows/migrate-prs.yml

@@ -1,60 +0,0 @@
-name: Migrate open PRs
-# Migrate open PRs from a superseded release branch to the current release branch and notify authors
-on: 
-  workflow_call:
-    inputs:
-      from:
-        description: 'The base branch to check for open PRs'
-        required: true
-        type: string
-      to:
-        description: 'The base branch to migrate open PRs to'
-        required: true
-        type: string
-      ownerRepo:
-        description: Owner/repo of the repository where the branch is created (e.g. 'grafana/grafana')
-        required: true
-        type: string
-    secrets:
-      GRAFANA_DELIVERY_BOT_APP_ID:
-        required: true
-      GRAFANA_DELIVERY_BOT_APP_PEM:
-        required: true
-  workflow_dispatch:
-    inputs:
-      from:
-        description: 'The base branch to check for open PRs'
-        required: true
-        type: string
-      to:
-        description: 'The base branch to migrate open PRs to'
-        required: true
-        type: string
-      ownerRepo:
-        description: Owner/repo of the repository where the branch is created (e.g. 'grafana/grafana')
-        required: true
-        type: string
-    secrets:
-      GRAFANA_DELIVERY_BOT_APP_ID:
-        required: true
-      GRAFANA_DELIVERY_BOT_APP_PEM:
-        required: true
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-      - name: Migrate PRs
-        uses: grafana/grafana-github-actions-go/migrate-open-prs@main
-        with:
-          token: ${{ steps.generate_token.outputs.token }}
-          ownerRepo: ${{ inputs.ownerRepo }}
-          from: ${{ inputs.from }}
-          to: ${{ inputs.to }}
-          binary_release_tag: 'dev'

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

@@ -1,68 +0,0 @@
-name: "Update Go Workspace for Dependabot PRs"
-on:
-  pull_request:
-    branches: [main]
-    paths:
-      - .github/workflows/pr-dependabot-update-go-workspace.yml
-      - go.mod
-      - go.sum
-      - go.work
-      - go.work.sum
-      - '**/go.mod'
-      - '**/go.sum'
-      - '**.go'
-permissions:
-  contents: write
-  id-token: write
-jobs:
-  update:
-    runs-on: "ubuntu-latest"
-    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
-      id: get-secrets
-      uses: grafana/shared-workflows/actions/get-vault-secrets@get-vault-secrets-v1.0.1
-      with:
-        repo_secrets: |
-          APP_ID=grafana-go-workspace-bot:app-id
-          APP_INSTALLATION_ID=grafana-go-workspace-bot:app-installation-id
-          PRIVATE_KEY=grafana-go-workspace-bot:private-key
-
-    - name: Generate GitHub App token
-      id: generate_token
-      uses: actions/create-github-app-token@v1
-      with:
-        app-id: ${{ env.APP_ID }}
-        private-key: ${{ env.PRIVATE_KEY }}
-
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        repository: ${{ github.event.pull_request.head.repo.full_name }}
-        ref: ${{ github.event.pull_request.head.ref }}
-        token: ${{ steps.generate_token.outputs.token }}
-
-    - name: Set go version
-      uses: actions/setup-go@v4
-      with:
-        go-version-file: go.mod
-
-    - name: Configure Git
-      run: |
-          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-          git config --local --add --bool push.autoSetupRemote true
-
-    - name: Update workspace
-      run: make update-workspace
-
-    - name: Commit and push workspace changes
-      env:
-        BRANCH_NAME: ${{ github.head_ref || github.ref_name }} 
-      run: |
-        if ! git diff --exit-code --quiet; then
-          echo "Committing and pushing workspace changes"
-          git commit -a -m "update workspace"
-          git push origin $BRANCH_NAME
-        fi

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

@@ -5,14 +5,10 @@ on:
   pull_request:
     branches: [main]
     paths:
-      - .github/workflows/pr-go-workspace-check.yml
-      - go.mod
-      - go.sum
-      - go.work
-      - go.work.sum
+      - '**/go.work'
+      - '**/go.work.sum'
       - '**/go.mod'
       - '**/go.sum'
-      - '**.go'
 
 jobs:
   check:
@@ -28,17 +24,28 @@ jobs:
       with:
         go-version-file: go.mod
 
-    - name: Update workspace
-      run: make update-workspace
+    - name: Workspace Sync
+      run: go work sync
 
     - name: Check for go mod & workspace changes 
       run: |
         if ! git diff --exit-code --quiet; then
           echo "Changes detected:"
           git diff
-          echo "Please run 'make update-workspace' and commit the changes."
+          echo "Please run 'go work sync' and commit the changes."
+          echo "If there is a change in enterprise dependencies, please update pkg/extensions/main.go."
+          exit 1
+        fi
+
+    - name: Build
+      run: make build-go
+
+    - name: Check for go workspace changes 
+      run: |
+        if ! git diff --exit-code --quiet; then
+          echo "Changes detected:"
+          git diff
+          echo "Please run 'make build-go' and commit the changes."
           echo "If there is a change in enterprise dependencies, please update pkg/extensions/main.go."
           exit 1
         fi
-    - name: Ensure Dockerfile contains submodule COPY commands
-      run: ./scripts/go-workspace/validate-dockerfile.sh

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

@@ -1,38 +0,0 @@
-name: "K8s Codegen Check"
-
-on:
-  workflow_dispatch:
-  pull_request:
-    branches: [main]
-    paths:
-      - "pkg/apis/**"
-      - "pkg/aggregator/apis/**"
-      - "pkg/apimachinery/apis/**"
-      - "hack/**"
-      - "*.sum"
-
-jobs:
-  check:
-    name: K8s Codegen Check
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
-    - name: Set go version
-      uses: actions/setup-go@v4
-      with:
-        go-version-file: go.mod
-
-    - name: Update k8s codegen
-      run: ./hack/update-codegen.sh
-
-    - name: Check for k8s codegen changes
-      run: |
-        if ! git diff --exit-code --quiet; then
-          echo "Changes detected:"
-          git diff
-          echo "Please run './hack/update-codegen.sh' and commit the changes."
-          exit 1
-        fi

.github/workflows/publish-technical-documentation-release.yml

@@ -3,7 +3,7 @@ name: publish-technical-documentation-release
 on:
   push:
     branches:
-      - release-[0-9]+.[0-9]+.[0-9]+
+      - v[0-9]+.[0-9]+.x
     tags:
       - v[0-9]+.[0-9]+.[0-9]+
     paths:
@@ -20,10 +20,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: grafana/writers-toolkit/publish-technical-documentation-release@publish-technical-documentation-release/v2
+      - uses: grafana/writers-toolkit/publish-technical-documentation-release@publish-technical-documentation-release/v1
         with:
-          release_tag_regexp: "^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)$"
-          release_branch_regexp: "^release-(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)$"
-          release_branch_with_patch_regexp: "^release-(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)$"
+          release_tag_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)$"
+          release_branch_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.x$"
+          release_branch_with_patch_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)$"
           website_directory: content/docs/grafana
           version_suffix: ""

.github/workflows/release-comms.yml

@@ -8,18 +8,17 @@ on:
       dry_run:
         required: false
         default: true
-        type: boolean
       version:
         required: true
       latest:
-        type: boolean
+        type: bool
         default: false
   pull_request:
     types:
     - closed
     branches:
     - 'main'
-    - 'release-*.*.*'
+    - 'v*.*.*'
 
 jobs:
   setup:
@@ -27,77 +26,30 @@ jobs:
     name: Setup and establish latest
     outputs:
       version: ${{ steps.output.outputs.version }}
-      release_branch: ${{ steps.output.outputs.release_branch }}
       dry_run: ${{ steps.output.outputs.dry_run }}
       latest: ${{ steps.output.outputs.latest }}
     runs-on: ubuntu-latest
     steps:
-      # The github-release action expects a `LATEST` value of a string of either '1' or '0'
     - if: ${{ github.event_name == 'workflow_dispatch' }}
       run: |
         echo setting up GITHUB_ENV for ${{ github.event_name }}
         echo "VERSION=${{ inputs.version }}" >> $GITHUB_ENV
         echo "DRY_RUN=${{ inputs.dry_run }}" >> $GITHUB_ENV
-        echo "LATEST=${{ inputs.latest && '1' || '0' }}" >> $GITHUB_ENV
+        echo "LATEST=${{ inputs.latest }}" >> $GITHUB_ENV
     - if: ${{ github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/') }}
       run: |
         echo "VERSION=$(echo ${{ github.head_ref }} | sed -e 's/release\/.*\///g')" >> $GITHUB_ENV
         echo "DRY_RUN=${{ contains(github.event.pull_request.labels.*.name, 'release/dry-run') }}" >> $GITHUB_ENV
-        echo "LATEST=${{ contains(github.event.pull_request.labels.*.name, 'release/latest') && '1' || '0' }}" >> $GITHUB_ENV
+        echo "LATEST=${{ contains(github.event.pull_request.labels.*.name, 'release/latest') }}" >> $GITHUB_ENV
     - id: output
       run: |
         echo "dry_run: $DRY_RUN"
         echo "latest: $LATEST"
         echo "version: $VERSION"
 
-        echo "release_branch=$(echo $VERSION | sed -s 's/^v/release-/g')" >> "$GITHUB_OUTPUT"
         echo "dry_run=$DRY_RUN" >> "$GITHUB_OUTPUT"
         echo "latest=$LATEST" >> "$GITHUB_OUTPUT"
         echo "version=$VERSION" >> "$GITHUB_OUTPUT"
-  create_next_release_branch_grafana:
-    name: Create next release branch (Grafana)
-    needs: setup
-    uses: ./.github/workflows/create-next-release-branch.yml
-    secrets:
-      GRAFANA_DELIVERY_BOT_APP_ID: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-      GRAFANA_DELIVERY_BOT_APP_PEM: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-    with:
-      ownerRepo: 'grafana/grafana'
-      source: ${{ needs.setup.outputs.release_branch }}
-  create_next_release_branch_enterprise:
-    name: Create next release branch (Grafana Enterprise)
-    needs: setup
-    uses: ./.github/workflows/create-next-release-branch.yml
-    secrets:
-      GRAFANA_DELIVERY_BOT_APP_ID: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-      GRAFANA_DELIVERY_BOT_APP_PEM: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-    with:
-      ownerRepo: 'grafana/grafana-enterprise'
-      source: ${{ needs.setup.outputs.release_branch }}
-  migrate_prs_grafana:
-    needs:
-      - setup
-      - create_next_release_branch_grafana
-    uses: ./.github/workflows/migrate-prs.yml
-    secrets:
-      GRAFANA_DELIVERY_BOT_APP_ID: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-      GRAFANA_DELIVERY_BOT_APP_PEM: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-    with:
-      ownerRepo: 'grafana/grafana'
-      from: ${{ needs.setup.outputs.release_branch }}
-      to: ${{ needs.create_next_release_branch_grafana.outputs.branch }}
-  migrate_prs_enterprise:
-    needs:
-      - setup
-      - create_next_release_branch_enterprise
-    uses: ./.github/workflows/migrate-prs.yml
-    secrets:
-      GRAFANA_DELIVERY_BOT_APP_ID: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-      GRAFANA_DELIVERY_BOT_APP_PEM: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-    with:
-      ownerRepo: 'grafana/grafana-enterprise'
-      from: ${{ needs.setup.outputs.release_branch }}
-      to: ${{ needs.create_next_release_branch_enterprise.outputs.branch }}
   post_changelog_on_forum:
     needs: setup
     uses: ./.github/workflows/community-release.yml

.github/workflows/release-pr.yml

@@ -4,14 +4,10 @@
 # Please refrain from including any processes that do not result in code changes in this workflow. Instead, they should
 # either be triggered in the release promotion process or in the release comms process (that is triggered by merging
 # this PR).
-name: Grafana Release PR
+name: Complete a Grafana release
 on:
   workflow_dispatch:
     inputs:
-      previous_version:
-        type: string
-        required: false
-        description: 'The release version (semver, git tag, branch or commit) to use for comparison'
       version:
         required: true
         type: string
@@ -19,7 +15,7 @@ on:
       target:
         required: true
         type: string
-        description: The release branch pattern (eg v9.5.x) that these changes are being merged into
+        description: The base branch that these changes are being merged into
       backport:
         required: false
         type: string
@@ -42,7 +38,6 @@ jobs:
     name: Create PR to main to update the changelog
     uses: ./.github/workflows/changelog.yml
     with:
-      previous_version: ${{inputs.previous_version}}
       version: ${{ inputs.version }}
       latest: ${{ inputs.latest }}
       dry_run: ${{ inputs.dry_run }}
@@ -61,17 +56,10 @@ jobs:
         with:
           app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
           private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-      - name: Get release branch
-        id: branch
-        uses: grafana/grafana-github-actions-go/latest-release-branch@main
-        with:
-          token: ${{ steps.generate_token.outputs.token }}
-          ownerRepo: 'grafana/grafana'
-          pattern: ${{ inputs.target }}
       - name: Checkout Grafana
         uses: actions/checkout@v4
         with:
-          ref: ${{ steps.branch.outputs.branch }}
+          ref: ${{ inputs.target }}
           fetch-depth: 0
           fetch-tags: true
       - name: Checkout Grafana (main)
@@ -131,6 +119,7 @@ jobs:
           rm -f CHANGELOG.part changelog_items.md
 
           git diff CHANGELOG.md
+          
       - name: "Prettify CHANGELOG.md"
         run: npx prettier --write CHANGELOG.md
       - name: Commit CHANGELOG.md changes
@@ -157,7 +146,7 @@ jobs:
             $( [ "x${{ inputs.latest }}" == "xtrue" ] && printf %s '-l "release/latest"') \
             -l "no-changelog" \
             --dry-run=${{ inputs.dry_run }} \
-            -B "${{ steps.branch.outputs.branch }}" \
+            -B "${{ inputs.target }}" \
             --title "Release: ${{ inputs.version }}" \
             --body "These code changes must be merged after a release is complete"
         env:
@@ -171,7 +160,7 @@ jobs:
             -l "product-approved" \
             -l "no-changelog" \
             --dry-run=${{ inputs.dry_run }} \
-            -B "${{ steps.branch.outputs.branch }}" \
+            -B "${{ inputs.target }}" \
             --title "Release: ${{ inputs.version }}" \
             --body "These code changes must be merged after a release is complete"
         env:

.github/workflows/run-scenes-e2e.yml

@@ -0,0 +1,47 @@
+name: Run dashboard scenes e2e
+
+on:
+  schedule:
+    - cron: "0 8 * * 1-5" # every day at 08:00UTC on weekdays
+  # push # uncomment for test run during PR
+
+env:
+  ARCH: linux-amd64
+
+jobs:
+  dashboard-scenes-e2e:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - 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: 20
+      - name: Install dependencies
+        run: yarn install --immutable
+      - name: Build grafana
+        run: make build
+      - name: Install Cypress dependencies
+        uses: cypress-io/github-action@v6
+        with: 
+          runTests: false
+      - name: Run dashboard scenes e2e
+        run: yarn e2e:scenes
+      - name: "Send Slack notification"
+        if: ${{ failure() }}
+        uses: slackapi/slack-github-action@v1.26.0
+        with:
+          payload: >
+            {
+              "icon_emoji": ":this-is-fine-fire:",
+              "username": "Dashboard scenes e2e tests failed",
+              "text": "Link to run: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}",
+              "channel": "#grafana-dashboards-squad"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/sbom-report.yml

@@ -1,15 +1,20 @@
 name: syft-sbom-ci
+
 on:
   release:
-    types: [ published ]
-  workflow_dispatch:
+    types: [created]
+
 jobs:
   syft-sbom:
+
     runs-on: ubuntu-latest
+
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+        
     - name: Anchore SBOM Action
-      uses: grafana/shared-workflows/actions@syft-sbom-v0.0.1
+      uses: anchore/sbom-action@v0.14.2
       with:
-        artifact-name: ${{ github.event.repository.name }}-spdx.json
+         artifact-name: ${{ github.event.repository.name }}-spdx.json
+

.github/workflows/scripts/pr-get-job-link.js

@@ -0,0 +1,9 @@
+
+module.exports = async ({ name, github, context, core }) => {
+    const { owner, repo } = context.repo;
+    const url = `https://api.github.com/repos/${owner}/${repo}/actions/runs/${context.runId}/jobs`
+    const result = await github.request(url);
+    const job = result.data.jobs.find(j => j.name === name);
+    
+    core.setOutput('link', `${job.html_url}?check_suite_focus=true`);
+}

.github/workflows/snyk.yml

@@ -0,0 +1,14 @@
+name: Snyk Monitor Scanning
+on:
+ release:
+   types: [published] 
+ push:
+    branches:
+      - 'main' 
+ workflow_dispatch:
+
+jobs:
+  snyk-scan-ci:
+    uses: 'grafana/security-github-actions/.github/workflows/snyk_monitor.yml@main'
+    secrets:
+      SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

.github/workflows/trivy-scan.yml

@@ -1,65 +0,0 @@
-name: Trivy Scan
-on:
-  pull_request:
-    # only run on PRs where go.mod/go.sum/etc have been updated
-    paths:
-      - go.*
-      - .github/workflows/trivy-scan.yml
-  push:
-    branches:
-      - main
-    paths:
-      - go.*
-      - .github/workflows/trivy-scan.yml
-
-jobs:
-  trivy-scan:
-    runs-on: ubuntu-22.04
-    steps:
-    - uses: actions/checkout@v4
-    - name: Install Trivy
-      uses: aquasecurity/setup-trivy@v0.2.2
-      with:
-        version: v0.56.2
-        cache: true
-    - name: Download Trivy DB
-      run: |
-        trivy fs --no-progress --download-db-only --db-repository public.ecr.aws/aquasecurity/trivy-db
-    - name: Run Trivy vulnerability scanner (table output)
-      # Use the trivy binary rather than the aquasecurity/trivy-action action
-      # to avoid a few bugs
-      # scan the filesystem, rather than building a Docker image prior - the
-      # downside is we won't catch dependencies that are only installed in the
-      # image, but the upside is we'll only catch vulnerabilities that are
-      # explicitly in the our dependencies
-      run: |
-        trivy fs \
-          --scanners vuln \
-          --format table \
-          --exit-code 1 \
-          --ignore-unfixed \
-          --pkg-types os,library \
-          --severity CRITICAL,HIGH \
-          --ignorefile .trivyignore \
-          --skip-files yarn.lock,package.json \
-          --skip-db-update \
-          .
-    - name: Run Trivy vulnerability scanner (SARIF)
-      # Use the trivy binary rather than the aquasecurity/trivy-action action
-      # to avoid a few bugs
-      run: |
-        trivy fs \
-          --scanners vuln \
-          --format sarif \
-          --output trivy-results.sarif \
-          --ignore-unfixed \
-          --pkg-types os,library \
-          --ignorefile .trivyignore \
-          --skip-db-update \
-          .
-      if: always() && github.repository == 'grafana/grafana'
-    - name: Upload Trivy scan results to GitHub Security tab
-      uses: github/codeql-action/upload-sarif@v3
-      with:
-        sarif_file: 'trivy-results.sarif'
-      if: always() && github.repository == 'grafana/grafana'

.gitignore

@@ -17,11 +17,13 @@ vendor/
 tsconfig.tsbuildinfo
 __debug_bin*
 
-# yarn
-.yarn/cache
-.yarn/unplugged
-.yarn/build-state.yml
-.yarn/install-state.gz
+# Yarn
+.yarn/
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
 .pnp.*
 
 # Enterprise emails
@@ -39,7 +41,6 @@ __debug_bin*
 /devenv/docker/blocks/saml-enterprise
 # This is the new place of the block, but I leave the previous here for a while
 /devenv/docker/blocks/auth/saml-enterprise
-/devenv/docker/blocks/auth/signer
 
 /tmp
 tools/phantomjs/phantomjs
@@ -86,7 +87,6 @@ example-apiserver/
 /devenv/docker/blocks/tempo/tempo-data/
 /devenv/docker/ha-test-unified-alerting/logs/webhook/dumps/
 /devenv/docker/ha-test-unified-alerting/logs/webhook/webhook-listener.log
-/devenv/docker/blocks/auth/openldap/certs/
 
 conf/custom.ini
 
@@ -106,7 +106,6 @@ profile.cov
 /pkg/extensions/*
 /pkg/build/cmd/artifactspage.go
 /pkg/build/cmd/artifactspage.tmpl.html
-/pkg/build/cmd/exportversion.go
 /pkg/server/wireexts_enterprise.go
 /pkg/cmd/grafana-cli/runner/wireexts_enterprise.go
 !/pkg/extensions/main.go
@@ -140,7 +139,6 @@ pkg/services/quota/quotaimpl/storage/storage.json
 
 # Ignoring frontend packages specifics
 /packages/grafana-ui/.yarn/.cache
-/packages/grafana-ui/.storybook/static
 /packages/**/dist
 /packages/**/compiled
 /packages/**/.rpt2_cache
@@ -221,8 +219,3 @@ public/app/plugins/**/dist/
 
 # Locally enabling the Go race detector until we can globally do so
 .go-race-enabled-locally
-
-# Mock service worker used for fake API responses in frontend development
-public/mockServiceWorker.js
-
-/e2e/test-plugins/*/dist

.golangci.toml

@@ -0,0 +1,266 @@
+[run]
+timeout = "10m"
+concurrency = 10
+
+[linters-settings.exhaustive]
+default-signifies-exhaustive = true
+
+[linters-settings.revive]
+ignore-generated-header = false
+severity = "warning"
+confidence = 3
+
+[linters-settings.depguard.rules.main]
+allow = [] # allow all
+deny = [
+  { pkg = "io/ioutil", desc = "Deprecated: As of Go 1.16, the same functionality is now provided by package io or package os, and those implementations should be preferred in new code. See the specific function documentation for details." },
+  { pkg = "gopkg.in/yaml.v2", desc = "Grafana packages are not allowed to depend on gopkg.in/yaml.v2 as gopkg.in/yaml.v3 is now available" },
+  { pkg = "github.com/pkg/errors", desc = "Deprecated: Go 1.13 supports the functionality provided by pkg/errors in the standard library." },
+  { pkg = "github.com/xorcare/pointer", desc = "Use pkg/util.Pointer instead, which is a generic one-liner alternative" },
+  { pkg = "github.com/gofrs/uuid", desc = "Use github.com/google/uuid instead, which we already depend on." },
+  { pkg = "github.com/bmizerany/assert", desc = "Use github.com/stretchr/testify/assert instead, which we already depend on." },
+]
+
+[linters-settings.depguard.rules.coreplugins]
+deny = [
+  { pkg = "github.com/grafana/grafana/pkg/api", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/cmd", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/cuectx", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/extensions", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/kinds", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/middleware", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/modules", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/registry", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/services", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/build", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/codegen", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/events", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/ifaces", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/kindsysreport", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/mocks", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/plugins", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/setting", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/util", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/bus", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/components", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/expr", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/infra", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/login", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/models", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/server", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/tests", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/web", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/tsdb/intervalv2", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+]
+files = [
+  "**/pkg/tsdb/grafana-pyroscope-datasource/*",
+  "**/pkg/tsdb/grafana-pyroscope-datasource/**/*",
+  "**/pkg/tsdb/grafana-testdata-datasource/*",
+  "**/pkg/tsdb/grafana-testdata-datasource/**/*",
+  "**/pkg/tsdb/azuremonitor/*",
+  "**/pkg/tsdb/azuremonitor/**/*",
+  "**/pkg/tsdb/cloud-monitoring/*",
+  "**/pkg/tsdb/cloud-monitoring/**/*",
+  "**/pkg/tsdb/mysql/*",
+  "**/pkg/tsdb/mysql/**/*",
+  "**/pkg/tsdb/parca/*",
+  "**/pkg/tsdb/parca/**/*",
+  "**/pkg/tsdb/tempo/*",
+  "**/pkg/tsdb/tempo/**/*",
+  "**/pkg/tsdb/cloudwatch/*",
+  "**/pkg/tsdb/cloudwatch/**/*",
+]
+
+[linters-settings.depguard.rules.apiserver]
+list-mode = "lax"
+allow = [
+  "github.com/grafana/grafana/pkg/apimachinery",
+  "github.com/grafana/grafana/pkg/apiserver",
+  "github.com/grafana/grafana/pkg/services/apiserver/utils",
+  "github.com/grafana/grafana/pkg/services/featuremgmt",
+  "github.com/grafana/grafana/pkg/infra/kvstore",
+  "github.com/grafana/grafana/pkg/services/apiserver/options",
+  "github.com/grafana/grafana/pkg/apis/playlist/v0alpha1",
+]
+deny = [
+  { pkg = "github.com/grafana/grafana/pkg", desc = "apiserver is not allowed to import grafana core" }
+]
+files = [
+  "**/pkg/apiserver/*",
+  "**/pkg/apiserver/**/*"
+]
+
+[linters-settings.depguard.rules.apimachinery]
+list-mode = "lax"
+allow = [
+  "github.com/grafana/grafana/pkg/apimachinery",
+]
+deny = [
+  { pkg = "github.com/grafana/grafana/pkg", desc = "apimachinery is not allowed to import grafana core" }
+]
+files = [
+  "**/pkg/apimachinery/*",
+  "**/pkg/apimachinery/**/*"
+]
+
+[linters-settings.depguard.rules.promlib]
+list-mode = "lax" # allow unless explicitely denied
+deny = [
+  { pkg = "github.com/grafana/grafana/pkg", desc = "promlib is not allowed to import grafana core" }
+]
+allow = [
+  "github.com/grafana/grafana/pkg/promlib"
+]
+files = [
+  "**/pkg/promlib/*",
+  "**/pkg/promlib/**/*"
+]
+
+[linters-settings.gocritic]
+enabled-checks = ["ruleguard"]
+[linters-settings.gocritic.settings.ruleguard]
+rules = "pkg/ruleguard.rules.go"
+
+[linters-settings.misspell]
+ignore-words = ["Unknwon", "Creater"]
+
+[linters-settings.nakedret]
+max-func-lines = 60
+
+[linters]
+disable-all = true
+enable = [
+  "bodyclose",
+  "depguard",
+  "dogsled",
+  "errcheck",
+  # "gochecknoinits",
+  # "goconst",
+  # "gocritic", # Temporarily disabled on 2022-09-09, running into weird bug "ruleguard: execution error: used Run() with an empty rule set; forgot to call Load() first?"
+  "goimports",
+  "goprintffuncname",
+  "gosec",
+  "gosimple",
+  "govet",
+  "ineffassign",
+  "misspell",
+  "nakedret",
+  "exportloopref",
+  "staticcheck",
+  "stylecheck",
+  "typecheck",
+  "unconvert",
+  "unused",
+  "whitespace",
+  "gocyclo",
+  "exhaustive",
+  "typecheck",
+  "asciicheck",
+  "errorlint",
+  "revive",
+]
+
+# Disabled linters (might want them later)
+# "unparam"
+# "rowserrcheck" # The linter doesn't detect that both Scan and Close also returns the error message returned by Err.
+
+[issues]
+exclude-use-default = false
+max-same-issues = 0
+
+# Enable when appropriate
+# Poorly chosen identifier
+[[issues.exclude-rules]]
+linters = ["stylecheck"]
+text = "ST1003"
+
+# Enable when appropriate
+# Dot imports that aren't in external test packages are discouraged.
+[[issues.exclude-rules]]
+linters = ["stylecheck"]
+text = "ST1001"
+
+# Enable when appropriate
+# http.CloseNotifier has been deprecated since Go 1.11 and an alternative has been available since Go 1.7: We currently need it in pkg/web/response_writer.go.
+[[issues.exclude-rules]]
+linters = ["staticcheck"]
+text = "SA1019: http.CloseNotifier"
+
+# strings.Title has been deprecated since Go 1.18 and an alternative has been available since Go 1.0: The rule Title uses for word boundaries does not handle Unicode punctuation properly.
+# Use golang.org/x/text/cases instead.
+[[issues.exclude-rules]]
+linters = ["staticcheck"]
+text = "SA1019: strings.Title"
+
+# go.opentelemetry.io/otel/exporters/jaeger" is deprecated: This module is no longer supported. OpenTelemetry dropped support for Jaeger exporter in July 2023.
+# Jaeger officially accepts and recommends using OTLP.
+# Use [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp] or [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc] instead.
+[[issues.exclude-rules]]
+linters = ["staticcheck"]
+text = "SA1019: \"go.opentelemetry.io/otel/exporters/jaeger\""
+
+[[issues.exclude-rules]]
+linters = ["staticcheck"]
+text = "use fake service and real access control evaluator instead"
+
+[[issues.exclude-rules]]
+linters = ["gosec"]
+text = "G108"
+
+[[issues.exclude-rules]]
+linters = ["gosec"]
+text = "G110"
+
+[[issues.exclude-rules]]
+linters = ["gosec"]
+text = "G201"
+
+[[issues.exclude-rules]]
+linters = ["gosec"]
+text = "G202"
+
+[[issues.exclude-rules]]
+linters = ["gosec"]
+text = "G306"
+
+[[issues.exclude-rules]]
+linters = ["gosec"]
+text = "401"
+
+[[issues.exclude-rules]]
+linters = ["gosec"]
+text = "402"
+
+[[issues.exclude-rules]]
+linters = ["gosec"]
+text = "501"
+
+[[issues.exclude-rules]]
+linters = ["gosec"]
+text = "404"
+
+[[issues.exclude-rules]]
+linters = ["errorlint"]
+text = "non-wrapping format verb for fmt.Errorf"
+
+# TODO: Enable
+[[issues.exclude-rules]]
+linters = ["stylecheck"]
+text = "ST1000"
+
+# TODO: Enable
+[[issues.exclude-rules]]
+linters = ["stylecheck"]
+text = "ST1020"
+
+# TODO: Enable
+[[issues.exclude-rules]]
+linters = ["stylecheck"]
+text = "ST1021"
+
+# Remove this when we have go v1.22 in place
+# https://stackoverflow.com/a/68247837/767660
+[[issues.exclude-rules]]
+linters = ["gosec"]
+path = '(.+)_test\.go'
+text = "G601"

.golangci.yml

@@ -1,306 +0,0 @@
-run:
-  timeout: 10m
-  concurrency: 10
-  allow-parallel-runners: true
-linters-settings:
-  exhaustive:
-    default-signifies-exhaustive: true
-  revive:
-    ignore-generated-header: false
-    severity: warning
-    confidence: 3
-  depguard:
-    rules:
-      main:
-        allow: []
-        deny:
-          - pkg: io/ioutil
-            desc: >-
-              Deprecated: As of Go 1.16, the same functionality is now provided
-              by package io or package os, and those implementations should be
-              preferred in new code. See the specific function documentation for
-              details.
-          - pkg: gopkg.in/yaml.v2
-            desc: >-
-              Grafana packages are not allowed to depend on gopkg.in/yaml.v2 as
-              gopkg.in/yaml.v3 is now available
-          - pkg: github.com/pkg/errors
-            desc: >-
-              Deprecated: Go 1.13 supports the functionality provided by
-              pkg/errors in the standard library.
-          - pkg: github.com/xorcare/pointer
-            desc: >-
-              Use pkg/util.Pointer instead, which is a generic one-liner
-              alternative
-          - pkg: github.com/gofrs/uuid
-            desc: 'Use github.com/google/uuid instead, which we already depend on.'
-          - pkg: github.com/bmizerany/assert
-            desc: >-
-              Use github.com/stretchr/testify/assert instead, which we already
-              depend on.
-      coreplugins:
-        deny:
-          - pkg: github.com/grafana/grafana/pkg/api
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/cmd
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/cuectx
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/extensions
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/kinds
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/middleware
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/modules
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/registry
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/services
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/build
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/codegen
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/events
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/ifaces
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/kindsysreport
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/mocks
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/plugins
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/setting
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/util
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/bus
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/components
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/expr
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/infra
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/login
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/models
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/server
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/tests
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/web
-            desc: Core plugins are not allowed to depend on Grafana core packages
-          - pkg: github.com/grafana/grafana/pkg/tsdb/intervalv2
-            desc: Core plugins are not allowed to depend on Grafana core packages
-        files:
-          - '**/pkg/tsdb/grafana-pyroscope-datasource/*'
-          - '**/pkg/tsdb/grafana-pyroscope-datasource/**/*'
-          - '**/pkg/tsdb/grafana-testdata-datasource/*'
-          - '**/pkg/tsdb/grafana-testdata-datasource/**/*'
-          - '**/pkg/tsdb/azuremonitor/*'
-          - '**/pkg/tsdb/azuremonitor/**/*'
-          - '**/pkg/tsdb/cloud-monitoring/*'
-          - '**/pkg/tsdb/cloud-monitoring/**/*'
-          - '**/pkg/tsdb/mysql/*'
-          - '**/pkg/tsdb/mysql/**/*'
-          - '**/pkg/tsdb/parca/*'
-          - '**/pkg/tsdb/parca/**/*'
-          - '**/pkg/tsdb/tempo/*'
-          - '**/pkg/tsdb/tempo/**/*'
-          - '**/pkg/tsdb/cloudwatch/*'
-          - '**/pkg/tsdb/cloudwatch/**/*'
-      apiserver:
-        list-mode: lax
-        allow:
-          - github.com/grafana/grafana/pkg/apimachinery
-          - github.com/grafana/grafana/pkg/apiserver
-        deny:
-          - pkg: github.com/grafana/grafana/pkg
-            desc: apiserver is not allowed to import grafana core
-        files:
-          - '**/pkg/apiserver/*'
-          - '**/pkg/apiserver/**/*'
-      apimachinery:
-        list-mode: lax
-        allow:
-          - github.com/grafana/grafana/pkg/apimachinery
-        deny:
-          - pkg: github.com/grafana/grafana/pkg
-            desc: apimachinery is not allowed to import grafana core
-        files:
-          - '**/pkg/apimachinery/*'
-          - '**/pkg/apimachinery/**/*'
-      aggregator:
-        list-mode: lax
-        allow:
-          - github.com/grafana/grafana/pkg/aggregator
-          - github.com/grafana/grafana/pkg/semconv
-          - github.com/grafana/grafana/pkg/apimachinery
-        deny:
-          - pkg: github.com/grafana/grafana/pkg
-            desc: apimachinery is not allowed to import grafana core
-        files:
-          - ./pkg/aggregator/*
-          - ./pkg/aggregator/**/*
-      promlib:
-        list-mode: lax
-        deny:
-          - pkg: github.com/grafana/grafana/pkg
-            desc: promlib is not allowed to import grafana core
-        allow:
-          - github.com/grafana/grafana/pkg/promlib
-        files:
-          - '**/pkg/promlib/**/*'
-      storage-unified-resource:
-        list-mode: lax
-        allow:
-          - github.com/grafana/grafana/pkg/apimachinery
-        deny:
-          - pkg: github.com/grafana/grafana/pkg
-            desc: pkg/storage/unified/resource is not allowed to import grafana core
-        files:
-          - ./pkg/storage/unified/resource/*
-          - ./pkg/storage/unified/resource/**/*
-      storage-unified-apistore:
-        list-mode: lax
-        allow:
-          - github.com/grafana/grafana/pkg/apimachinery
-          - github.com/grafana/grafana/pkg/apiserver
-          - github.com/grafana/grafana/pkg/unified/resource
-        deny:
-          - pkg: github.com/grafana/grafana/pkg
-            desc: pkg/storage/unified/apistore is not allowed to import grafana core
-        files:
-          - ./pkg/storage/unified/apistore/*
-          - ./pkg/storage/unified/apistore/**/*
-      apps-playlist:
-        list-mode: lax
-        allow: []
-        deny:
-          - pkg: github.com/grafana/grafana/pkg
-            desc: apps/playlist is not allowed to import grafana core
-        files:
-          - ./apps/playlist/*
-          - ./apps/playlist/**/*
-      apps-investigation:
-        list-mode: lax
-        allow: []
-        deny:
-          - pkg: github.com/grafana/grafana/pkg
-            desc: apps/investigation is not allowed to import grafana core
-        files:
-          - ./apps/investigation/*
-          - ./apps/investigation/**/*
-  gocritic:
-    enabled-checks:
-      - ruleguard
-    settings:
-      ruleguard:
-        rules: pkg/ruleguard.rules.go
-  misspell:
-    ignore-words:
-      - Unknwon
-      - Creater
-  nakedret:
-    max-func-lines: 60
-linters:
-  disable-all: true
-  enable:
-    - asciicheck
-    - bodyclose
-    - depguard
-    - dogsled
-    - errcheck
-    - errorlint
-    - exhaustive
-    - gocyclo
-    - goimports
-    - goprintffuncname
-    - gosec
-    - gosimple
-    - govet
-    - ineffassign
-    - misspell
-    - nakedret
-    - prealloc
-    - revive
-    - staticcheck
-    - stylecheck
-    - unconvert
-    - unused
-    - whitespace
-issues:
-  exclude-use-default: false
-  max-same-issues: 0
-  exclude-dirs:
-    - devenv
-    - scripts
-  exclude-rules:
-    - linters:
-        - stylecheck
-      text: ST1003
-    - linters:
-        - stylecheck
-      text: ST1001
-    - linters:
-        - staticcheck
-      text: 'SA1019: http.CloseNotifier'
-    - linters:
-        - staticcheck
-      text: 'SA1019: strings.Title'
-    - linters:
-        - staticcheck
-      text: 'SA1019: "go.opentelemetry.io/otel/exporters/jaeger"'
-    - linters:
-        - staticcheck
-      text: use fake service and real access control evaluator instead
-    - linters:
-        - gosec
-      text: G108
-    - linters:
-        - gosec
-      text: G110
-    - linters:
-        - gosec
-      text: G115
-    - linters:
-        - gosec
-      text: G201
-    - linters:
-        - gosec
-      text: G202
-    - linters:
-        - gosec
-      text: G306
-    - linters:
-        - gosec
-      text: '401'
-    - linters:
-        - gosec
-      text: '402'
-    - linters:
-        - gosec
-      text: '501'
-    - linters:
-        - gosec
-      text: '404'
-    - linters:
-        - errorlint
-      text: non-wrapping format verb for fmt.Errorf
-    - linters:
-        - stylecheck
-      text: ST1000
-    - linters:
-        - stylecheck
-      text: ST1020
-    - linters:
-        - stylecheck
-      text: ST1021
-    - linters:
-        - gosec
-      path: (.+)_test\.go
-      text: G601

.nvmrc

@@ -1 +1 @@
-v22.11.0
+v20.9.0

.nxignore

@@ -1 +0,0 @@
-!conf/custom.ini

.prettierignore

@@ -28,8 +28,5 @@ public/api-merged.json
 public/api-enterprise-spec.json
 public/openapi3.json
 
-# Generated mock service worker
-public/mockServiceWorker.js
-
 # Crowdin files
 public/locales/**/*.json

.trivyignore

@@ -1 +0,0 @@
-# See https://aquasecurity.github.io/trivy/v0.48/docs/configuration/filtering/#trivyignore

.vscode/launch.json

@@ -9,21 +9,7 @@
       "program": "${workspaceFolder}/pkg/cmd/grafana/",
       "env": {},
       "cwd": "${workspaceFolder}",
-      "args": [
-        "server", 
-        "--homepath", "${workspaceFolder}", 
-        "--packaging", "dev", 
-        "cfg:app_mode=development",
-      ]
-    },
-    {
-      "name": "Attach to Test Process",
-      "type": "go",
-      "request": "attach",
-      "mode": "remote",
-      "host": "127.0.0.1",
-      "port": 50480,
-      "apiVersion": 2,
+      "args": ["server", "--homepath", "${workspaceFolder}", "--packaging", "dev"]
     },
     {
       "name": "Run API Server (testdata)",
@@ -58,7 +44,7 @@
       "request": "launch",
       "mode": "auto",
       "program": "${workspaceFolder}/pkg/cmd/grafana/",
-      "env": { "GF_GRAFANA_APISERVER_STORAGE_TYPE": "unified-grpc" },
+      "env": {"GF_GRAFANA_APISERVER_STORAGE_TYPE": "unified-grpc"},
       "cwd": "${workspaceFolder}",
       "args": ["server", "--homepath", "${workspaceFolder}", "--packaging", "dev"]
     },
@@ -68,7 +54,7 @@
       "request": "launch",
       "mode": "auto",
       "program": "${workspaceFolder}/pkg/cmd/grafana/",
-      "env": { "GF_DEFAULT_TARGET": "storage-server", "GF_SERVER_HTTP_PORT": "3001" },
+      "env": {"GF_DEFAULT_TARGET": "storage-server","GF_SERVER_HTTP_PORT": "3001"},
       "cwd": "${workspaceFolder}",
       "args": ["server", "target", "--homepath", "${workspaceFolder}", "--packaging", "dev"]
     },

.yarnrc.yml

@@ -26,7 +26,7 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
     spec: 'https://mskelton.dev/yarn-outdated/v2'
 
-yarnPath: .yarn/releases/yarn-4.6.0.cjs
+yarnPath: .yarn/releases/yarn-4.2.2.cjs
 # Uncomment the following lines if you want to use Verdaccio local npm registry. Read more at packages/README.md
 #npmScopes:
 # grafana:

Dockerfile

@@ -1,19 +1,14 @@
 # syntax=docker/dockerfile:1
 
-# to maintain formatting of multiline commands in vscode, add the following to settings.json:
-# "docker.languageserver.formatter.ignoreMultilineInstructions": true
-
-ARG BASE_IMAGE=alpine:3.21
-ARG JS_IMAGE=node:22-alpine
+ARG BASE_IMAGE=alpine:3.19.1
+ARG JS_IMAGE=node:20-alpine
 ARG JS_PLATFORM=linux/amd64
-ARG GO_IMAGE=golang:1.23.7-alpine
+ARG GO_IMAGE=golang:1.22.7-alpine
 
-# Default to building locally
 ARG GO_SRC=go-builder
 ARG JS_SRC=js-builder
 
-# Javascript build stage
-FROM --platform=${JS_PLATFORM} ${JS_IMAGE} AS js-builder
+FROM --platform=${JS_PLATFORM} ${JS_IMAGE} as js-builder
 
 ENV NODE_OPTIONS=--max_old_space_size=8000
 
@@ -25,22 +20,19 @@ COPY packages packages
 COPY plugins-bundled plugins-bundled
 COPY public public
 COPY LICENSE ./
-COPY conf/defaults.ini ./conf/defaults.ini
-COPY e2e e2e
 
 RUN apk add --no-cache make build-base python3
 
 RUN yarn install --immutable
 
-COPY tsconfig.json eslint.config.js .editorconfig .browserslistrc .prettierrc.js ./
+COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./
 COPY scripts scripts
 COPY emails emails
 
-ENV NODE_ENV=production
+ENV NODE_ENV production
 RUN yarn build
 
-# Golang build stage
-FROM ${GO_IMAGE} AS go-builder
+FROM ${GO_IMAGE} as go-builder
 
 ARG COMMIT_SHA=""
 ARG BUILD_BRANCH=""
@@ -52,7 +44,6 @@ RUN if grep -i -q alpine /etc/issue; then \
       apk add --no-cache \
           # This is required to allow building on arm64 due to https://github.com/golang/go/issues/22040
           binutils-gold \
-          bash \
           # Install build dependencies
           gcc g++ make git; \
     fi
@@ -66,20 +57,8 @@ COPY .bingo .bingo
 COPY pkg/util/xorm/go.* pkg/util/xorm/
 COPY pkg/apiserver/go.* pkg/apiserver/
 COPY pkg/apimachinery/go.* pkg/apimachinery/
-COPY pkg/build/go.* pkg/build/
 COPY pkg/build/wire/go.* pkg/build/wire/
 COPY pkg/promlib/go.* pkg/promlib/
-COPY pkg/storage/unified/resource/go.* pkg/storage/unified/resource/
-COPY pkg/storage/unified/apistore/go.* pkg/storage/unified/apistore/
-COPY pkg/semconv/go.* pkg/semconv/
-COPY pkg/aggregator/go.* pkg/aggregator/
-COPY apps/playlist/go.* apps/playlist/
-COPY apps/investigation/go.* apps/investigation/
-COPY apps apps
-COPY kindsv2 kindsv2
-COPY apps/alerting/notifications/go.* apps/alerting/notifications/
-COPY pkg/codegen/go.* pkg/codegen/
-COPY pkg/plugins/codegen/go.* pkg/plugins/codegen/
 
 RUN go mod download
 RUN if [[ "$BINGO" = "true" ]]; then \
@@ -104,8 +83,7 @@ ENV BUILD_BRANCH=${BUILD_BRANCH}
 
 RUN make build-go GO_BUILD_TAGS=${GO_BUILD_TAGS} WIRE_TAGS=${WIRE_TAGS}
 
-# From-tarball build stage
-FROM ${BASE_IMAGE} AS tgz-builder
+FROM ${BASE_IMAGE} as tgz-builder
 
 WORKDIR /tmp/grafana
 
@@ -117,8 +95,8 @@ COPY ${GRAFANA_TGZ} /tmp/grafana.tar.gz
 RUN tar x -z -f /tmp/grafana.tar.gz --strip-components=1
 
 # helpers for COPY --from
-FROM ${GO_SRC} AS go-src
-FROM ${JS_SRC} AS js-src
+FROM ${GO_SRC} as go-src
+FROM ${JS_SRC} as js-src
 
 # Final stage
 FROM ${BASE_IMAGE}
@@ -153,20 +131,19 @@ RUN if grep -i -q alpine /etc/issue; then \
     fi
 
 # glibc support for alpine x86_64 only
-# docker run --rm --env STDOUT=1 sgerrand/glibc-builder 2.40 /usr/glibc-compat > glibc-bin-2.40.tar.gz
-ARG GLIBC_VERSION=2.40
-
 RUN if grep -i -q alpine /etc/issue && [ `arch` = "x86_64" ]; then \
-      wget -qO- "https://dl.grafana.com/glibc/glibc-bin-$GLIBC_VERSION.tar.gz" | tar zxf - -C / \
-        usr/glibc-compat/lib/ld-linux-x86-64.so.2 \
-        usr/glibc-compat/lib/libc.so.6 \
-        usr/glibc-compat/lib/libdl.so.2 \
-        usr/glibc-compat/lib/libm.so.6 \
-        usr/glibc-compat/lib/libpthread.so.0 \
-        usr/glibc-compat/lib/librt.so.1 \
-        usr/glibc-compat/lib/libresolv.so.2 && \
-      mkdir /lib64 && \
-      ln -s /usr/glibc-compat/lib/ld-linux-x86-64.so.2 /lib64; \
+      wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-2.35-r0.apk \
+        -O /tmp/glibc-2.35-r0.apk && \
+      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-bin-2.35-r0.apk \
+        -O /tmp/glibc-bin-2.35-r0.apk && \
+      apk add --force-overwrite --no-cache /tmp/glibc-2.35-r0.apk /tmp/glibc-bin-2.35-r0.apk && \
+      rm -f /lib64/ld-linux-x86-64.so.2 && \
+      ln -s /usr/glibc-compat/lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2 && \
+      rm -f /tmp/glibc-2.35-r0.apk && \
+      rm -f /tmp/glibc-bin-2.35-r0.apk && \
+      rm -f /lib/ld-linux-x86-64.so.2 && \
+      rm -f /etc/ld.so.cache; \
     fi
 
 COPY --from=go-src /tmp/grafana/conf ./conf

HALL_OF_FAME.md

@@ -3,5 +3,3 @@
 List of previous team members that have had a big impact on the company or the product and contributed during a long period of time.
 
 - Hugo Häggmark ([Björn Lundén](https://www.bjornlunden.se/))
-- [Marcus Efraimsson](https://github.com/marefr)
-- [Giordano Ricci](https://github.com/elfo404)

Makefile

@@ -7,20 +7,16 @@ WIRE_TAGS = "oss"
 -include local/Makefile
 include .bingo/Variables.mk
 
+
 GO = go
-GO_VERSION = 1.23.7
-GO_LINT_FILES ?= $(shell ./scripts/go-workspace/golangci-lint-includes.sh)
-GO_TEST_FILES ?= $(shell ./scripts/go-workspace/test-includes.sh)
+GO_VERSION = 1.22.7
+GO_FILES ?= ./pkg/... ./pkg/apiserver/... ./pkg/apimachinery/... ./pkg/promlib/...
 SH_FILES ?= $(shell find ./scripts -name *.sh)
 GO_RACE  := $(shell [ -n "$(GO_RACE)" -o -e ".go-race-enabled-locally" ] && echo 1 )
 GO_RACE_FLAG := $(if $(GO_RACE),-race)
 GO_BUILD_FLAGS += $(if $(GO_BUILD_DEV),-dev)
 GO_BUILD_FLAGS += $(if $(GO_BUILD_TAGS),-build-tags=$(GO_BUILD_TAGS))
 GO_BUILD_FLAGS += $(GO_RACE_FLAG)
-GIT_BASE = remotes/origin/main
-
-# GNU xargs has flag -r, and BSD xargs (e.g. MacOS) has that behaviour by default
-XARGSR = $(shell xargs --version 2>&1 | grep -q GNU && echo xargs -r || echo xargs)
 
 targets := $(shell echo '$(sources)' | tr "," " ")
 
@@ -65,7 +61,6 @@ swagger-oss-gen: $(SWAGGER) ## Generate API Swagger specification
 	rm -f $(SPEC_TARGET)
 	SWAGGER_GENERATE_EXTENSION=false $(SWAGGER) generate spec -q -m -w pkg/server -o $(SPEC_TARGET) \
 	-x "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" \
-	-x "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" \
 	-x "github.com/prometheus/alertmanager" \
 	-i pkg/api/swagger_tags.json \
 	--exclude-tag=alpha \
@@ -83,7 +78,6 @@ swagger-enterprise-gen: $(SWAGGER) ## Generate API Swagger specification
 	rm -f $(ENTERPRISE_SPEC_TARGET)
 	SWAGGER_GENERATE_EXTENSION=false $(SWAGGER) generate spec -q -m -w pkg/server -o $(ENTERPRISE_SPEC_TARGET) \
 	-x "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" \
-	-x "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" \
 	-x "github.com/prometheus/alertmanager" \
 	-i pkg/api/swagger_tags.json \
 	--exclude-tag=alpha \
@@ -146,11 +140,6 @@ gen-cue: ## Do all CUE/Thema code generation
 	go generate ./kinds/gen.go
 	go generate ./public/app/plugins/gen.go
 
-.PHONY: gen-cuev2
-gen-cuev2: ## Do all CUE code generation
-	@echo "generate code from .cue files (v2)"
-	go generate ./kindsv2/gen.go
-
 .PHONY: gen-feature-toggles
 gen-feature-toggles:
 ## First go test run fails because it will re-generate the feature toggles.
@@ -178,17 +167,8 @@ fix-cue: $(CUE)
 gen-jsonnet:
 	go generate ./devenv/jsonnet
 
-.PHONY: update-workspace
-update-workspace: gen-go
-	@echo "updating workspace"
-	bash scripts/go-workspace/update-workspace.sh
-
 .PHONY: build-go
-build-go: gen-go update-workspace ## Build all Go binaries.
-	@echo "build go files with updated workspace"
-	$(GO) run build.go $(GO_BUILD_FLAGS) build
-
-build-go-fast: gen-go ## Build all Go binaries.
+build-go: gen-go ## Build all Go binaries.
 	@echo "build go files"
 	$(GO) run build.go $(GO_BUILD_FLAGS) build
 
@@ -229,13 +209,13 @@ build-plugin-go: ## Build decoupled plugins
 build: build-go build-js ## Build backend and frontend.
 
 .PHONY: run
-run: $(BRA) ## Build and run web server on filesystem changes. See /.bra.toml for configuration.
+run: $(BRA) ## Build and run web server on filesystem changes.
 	$(BRA) run
 
 .PHONY: run-go
 run-go: ## Build and run web server immediately.
 	$(GO) run -race $(if $(GO_BUILD_TAGS),-build-tags=$(GO_BUILD_TAGS)) \
-		./pkg/cmd/grafana -- server -profile -profile-addr=127.0.0.1 -profile-port=6000 -packaging=dev cfg:app_mode=development
+		./pkg/cmd/grafana -- server -packaging=dev cfg:app_mode=development
 
 .PHONY: run-frontend
 run-frontend: deps-js ## Fetch js dependencies and watch frontend for rebuild
@@ -249,17 +229,9 @@ test-go: test-go-unit test-go-integration
 .PHONY: test-go-unit
 test-go-unit: ## Run unit tests for backend with flags.
 	@echo "test backend unit tests"
-	printf '$(GO_TEST_FILES)' | xargs \
+	go list -f '{{.Dir}}/...' -m | xargs \
 	$(GO) test $(GO_RACE_FLAG) -short -covermode=atomic -timeout=30m
 
-.PHONY: test-go-unit-pretty
-test-go-unit-pretty: check-tparse
-	@if [ -z "$(FILES)" ]; then \
-		echo "Notice: FILES variable is not set. Try \"make test-go-unit-pretty FILES=./pkg/services/mysvc\""; \
-		exit 1; \
-	fi
-	$(GO) test $(GO_RACE_FLAG) -timeout=10s $(FILES) -json | tparse -all
-
 .PHONY: test-go-integration
 test-go-integration: ## Run integration tests for backend with flags.
 	@echo "test backend integration tests"
@@ -310,20 +282,11 @@ test: test-go test-js ## Run all tests.
 golangci-lint: $(GOLANGCI_LINT)
 	@echo "lint via golangci-lint"
 	$(GOLANGCI_LINT) run \
-		--config .golangci.yml \
-		$(GO_LINT_FILES)
+		--config .golangci.toml \
+		$(GO_FILES)
 
 .PHONY: lint-go
-lint-go: golangci-lint ## Run all code checks for backend. You can use GO_LINT_FILES to specify exact files to check
-
-.PHONY: lint-go-diff
-lint-go-diff: $(GOLANGCI_LINT)
-	git diff --name-only $(GIT_BASE) | \
-		grep '\.go$$' | \
-		$(XARGSR) dirname | \
-		sort -u | \
-		sed 's,^,./,' | \
-		$(XARGSR) $(GOLANGCI_LINT) run --config .golangci.toml
+lint-go: golangci-lint ## Run all code checks for backend. You can use GO_FILES to specify exact files to check
 
 # with disabled SC1071 we are ignored some TCL,Expect `/usr/bin/env expect` scripts
 .PHONY: shellcheck
@@ -368,32 +331,27 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
 
 ##@ Services
 
-COMPOSE := $(shell if docker compose --help >/dev/null 2>&1; then echo docker compose; else echo docker-compose; fi)
-ifeq ($(COMPOSE),docker-compose)
-$(warning From July 2023 Compose V1 (docker-compose) stopped receiving updates. Migrate to Compose V2 (docker compose). https://docs.docker.com/compose/migrate/)
-endif
-
-# Create a Docker Compose file with provided sources and start them.
-# For example, `make devenv sources=postgres,auth/openldap`
+# create docker-compose file with provided sources and start them
+# example: make devenv sources=postgres,auth/openldap
 .PHONY: devenv
 ifeq ($(sources),)
 devenv:
-	@printf 'You have to define sources for this command \nexample: make devenv sources=postgres,auth/openldap\n'
+	@printf 'You have to define sources for this command \nexample: make devenv sources=postgres,openldap\n'
 else
-devenv: devenv-down ## Start optional services like Postgresql, Prometheus, or Elasticsearch.
+devenv: devenv-down ## Start optional services, e.g. postgres, prometheus, and elasticsearch.
 	@cd devenv; \
 	./create_docker_compose.sh $(targets) || \
 	(rm -rf {docker-compose.yaml,conf.tmp,.env}; exit 1)
 
 	@cd devenv; \
-	$(COMPOSE) up -d --build
+	docker-compose up -d --build
 endif
 
 .PHONY: devenv-down
 devenv-down: ## Stop optional services.
 	@cd devenv; \
 	test -f docker-compose.yaml && \
-	$(COMPOSE) down || exit 0;
+	docker-compose down || exit 0;
 
 .PHONY: devenv-postgres
 devenv-postgres:
@@ -417,11 +375,10 @@ devenv-mysql:
 protobuf: ## Compile protobuf definitions
 	bash scripts/protobuf-check.sh
 	go install google.golang.org/protobuf/cmd/protoc-gen-go
-	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.4.0
+	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
 	buf generate pkg/plugins/backendplugin/pluginextensionv2 --template pkg/plugins/backendplugin/pluginextensionv2/buf.gen.yaml
 	buf generate pkg/plugins/backendplugin/secretsmanagerplugin --template pkg/plugins/backendplugin/secretsmanagerplugin/buf.gen.yaml
-	buf generate pkg/storage/unified/resource --template pkg/storage/unified/resource/buf.gen.yaml
-	buf generate pkg/services/authz/proto/v1 --template pkg/services/authz/proto/v1/buf.gen.yaml
+	buf generate pkg/services/store/entity --template pkg/services/store/entity/buf.gen.yaml
 
 .PHONY: clean
 clean: ## Clean up intermediate build artifacts.
@@ -467,12 +424,6 @@ go-race-is-enabled:
 enable-go-race:
 	@touch .go-race-enabled-locally
 
-check-tparse:
-	@command -v tparse >/dev/null 2>&1 || { \
-		echo >&2 "Error: tparse is not installed. Refer to https://github.com/mfridman/tparse"; \
-		exit 1; \
-	}
-
 .PHONY: help
 help: ## Display this help.
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)

README.md

@@ -38,7 +38,7 @@ If you're interested in contributing to the Grafana project:
 
 ## Get involved
 
-- Follow [@grafana on X (formerly Twitter)](https://x.com/grafana/).
+- Follow [@grafana on Twitter](https://twitter.com/grafana/).
 - Read and subscribe to the [Grafana blog](https://grafana.com/blog/).
 - If you have a specific question, check out our [discussion forums](https://community.grafana.com/).
 - For general discussions, join us on the [official Slack](https://slack.grafana.com) team.

apps/.gitkeep

@@ -0,0 +1 @@
+# workaround for grafana-build quirk

apps/alerting/common/constants.go

@@ -1,5 +0,0 @@
-package common
-
-const InternalPrefix = "grafana.com/"
-const ProvenanceStatusAnnotationKey = InternalPrefix + "provenance"
-const ProvenanceStatusNone = "none"

apps/alerting/notifications/Makefile

@@ -1,4 +0,0 @@
-.PHONY: generate
-generate:
-	## --crdencoding none is needed to avoid infinite loop while generating recursive models (see routingtree.cue)
-	grafana-app-sdk generate -g ./pkg/apis --crdencoding none --nomanifest --postprocess

apps/alerting/notifications/go.mod

@@ -1,99 +0,0 @@
-module github.com/grafana/grafana/apps/alerting/notifications
-
-go 1.23.7
-
-replace github.com/grafana/grafana => ../../..
-
-require (
-	github.com/grafana/grafana v0.0.0-00010101000000-000000000000
-	github.com/grafana/grafana-app-sdk v0.23.1
-	k8s.io/apimachinery v0.32.0
-	k8s.io/apiserver v0.32.0
-	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
-)
-
-require (
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/blang/semver/v4 v4.0.0 // indirect
-	github.com/bwmarrin/snowflake v0.3.0 // indirect
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/coreos/go-semver v0.3.1 // indirect
-	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
-	github.com/go-openapi/jsonreference v0.21.0 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/grafana/grafana/pkg/apimachinery v0.0.0-20240821155123-6891eb1d35da // indirect
-	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.0 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/jmespath-community/go-jmespath v1.1.1 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
-	github.com/kylelemons/godebug v1.1.0 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.20.5 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.61.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/spf13/cobra v1.8.1 // indirect
-	github.com/spf13/pflag v1.0.6 // indirect
-	github.com/x448/float16 v0.8.4 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.16 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.16 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
-	go.opentelemetry.io/otel v1.34.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
-	go.opentelemetry.io/otel/metric v1.34.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
-	go.opentelemetry.io/otel/trace v1.34.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/crypto v0.35.0 // indirect
-	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
-	golang.org/x/net v0.36.0 // indirect
-	golang.org/x/oauth2 v0.27.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/term v0.29.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
-	golang.org/x/time v0.9.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
-	google.golang.org/grpc v1.70.0 // indirect
-	google.golang.org/protobuf v1.36.4 // indirect
-	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.32.0 // indirect
-	k8s.io/client-go v0.32.0 // indirect
-	k8s.io/component-base v0.32.0 // indirect
-	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
-	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
-)