Remove failing windows test backend step

* Prometheus: bug in creating autocomplete queries with labels (#68003)

Fix bug formatting multiple prometheus labels when doing metric query

(cherry picked from commit a1bc1bd368)

.betterer.ts

@@ -1,32 +1,24 @@
+import { regexp } from '@betterer/regexp';
 import { BettererFileTest } from '@betterer/betterer';
-import { promises as fs } from 'fs';
 import { ESLint, Linter } from 'eslint';
-import path from 'path';
-import glob from 'glob';
+import { existsSync } from 'fs';
 
 export default {
-  'better eslint': () =>
-    countEslintErrors()
-      .include('**/*.{ts,tsx}')
-      .exclude(/public\/app\/angular/),
-  'no undocumented stories': () => countUndocumentedStories().include('**/!(*.internal).story.tsx'),
+  'no enzyme tests': () => regexp(/from 'enzyme'/g).include('**/*.test.*'),
+  'better eslint': () => countEslintErrors().include('**/*.{ts,tsx}'),
+  'no undocumented stories': () => countUndocumentedStories().include('**/*.story.tsx'),
 };
 
 function countUndocumentedStories() {
   return new BettererFileTest(async (filePaths, fileTestResult) => {
-    await Promise.all(
-      filePaths.map(async (filePath) => {
-        // look for .mdx import in the story file
-        const regex = new RegExp("^import.*.mdx';$", 'gm');
-        const fileText = await fs.readFile(filePath, 'utf8');
-        if (!regex.test(fileText)) {
-          // In this case the file contents don't matter:
-          const file = fileTestResult.addFile(filePath, '');
-          // Add the issue to the first character of the file:
-          file.addIssue(0, 0, 'No undocumented stories are allowed, please add an .mdx file with some documentation');
-        }
-      })
-    );
+    filePaths.forEach((filePath) => {
+      if (!existsSync(filePath.replace(/\.story.tsx$/, '.mdx'))) {
+        // In this case the file contents don't matter:
+        const file = fileTestResult.addFile(filePath, '');
+        // Add the issue to the first character of the file:
+        file.addIssue(0, 0, 'No undocumented stories are allowed, please add an .mdx file with some documentation');
+      }
+    });
   });
 }
 
@@ -35,64 +27,46 @@ function countEslintErrors() {
     const { baseDirectory } = resolver;
     const cli = new ESLint({ cwd: baseDirectory });
 
-    const eslintConfigFiles = await glob('**/.eslintrc');
-    const eslintConfigMainPaths = eslintConfigFiles.map((file) => path.resolve(path.dirname(file)));
+    await Promise.all(
+      filePaths.map(async (filePath) => {
+        const linterOptions = (await cli.calculateConfigForFile(filePath)) as Linter.Config;
 
-    const baseRules: Partial<Linter.RulesRecord> = {
-      '@typescript-eslint/no-explicit-any': 'error',
-      '@grafana/no-aria-label-selectors': 'error',
-    };
+        const rules: Partial<Linter.RulesRecord> = {
+          '@typescript-eslint/no-explicit-any': 'error',
+        };
 
-    const nonTestFilesRules: Partial<Linter.RulesRecord> = {
-      ...baseRules,
-      '@typescript-eslint/consistent-type-assertions': ['error', { assertionStyle: 'never' }],
-    };
+        const isTestFile =
+          filePath.endsWith('.test.tsx') || filePath.endsWith('.test.ts') || filePath.includes('__mocks__');
 
-    // group files by eslint config file
-    // this will create two file groups for each eslint config file
-    // one for test files and one for non-test files
-    const fileGroups: Record<string, string[]> = {};
+        if (!isTestFile) {
+          rules['@typescript-eslint/consistent-type-assertions'] = [
+            'error',
+            {
+              assertionStyle: 'never',
+            },
+          ];
+        }
 
-    for (const filePath of filePaths) {
-      let configPath = eslintConfigMainPaths.find((configPath) => filePath.startsWith(configPath)) ?? '';
-      const isTestFile =
-        filePath.endsWith('.test.tsx') ||
-        filePath.endsWith('.test.ts') ||
-        filePath.includes('__mocks__') ||
-        filePath.includes('public/test/');
-
-      if (isTestFile) {
-        configPath += '-test';
-      }
-      if (!fileGroups[configPath]) {
-        fileGroups[configPath] = [];
-      }
-      fileGroups[configPath].push(filePath);
-    }
-
-    for (const configPath of Object.keys(fileGroups)) {
-      const rules = configPath.endsWith('-test') ? baseRules : nonTestFilesRules;
-      // this is by far the slowest part of this code. It takes eslint about 2 seconds just to find the config
-      const linterOptions = (await cli.calculateConfigForFile(fileGroups[configPath][0])) as Linter.Config;
-      const runner = new ESLint({
-        baseConfig: {
-          ...linterOptions,
-          rules: rules,
-        },
-        useEslintrc: false,
-        cwd: baseDirectory,
-      });
-      const lintResults = await runner.lintFiles(fileGroups[configPath]);
-      lintResults
-        .filter((lintResult) => lintResult.source)
-        .forEach((lintResult) => {
-          const { messages } = lintResult;
-          const filePath = lintResult.filePath;
-          const file = fileTestResult.addFile(filePath, '');
-          messages.forEach((message, index) => {
-            file.addIssue(0, 0, message.message, `${index}`);
-          });
+        const runner = new ESLint({
+          baseConfig: {
+            ...linterOptions,
+            rules,
+          },
+          useEslintrc: false,
+          cwd: baseDirectory,
         });
-    }
+
+        const lintResults = await runner.lintFiles([filePath]);
+        lintResults
+          .filter((lintResult) => lintResult.source)
+          .forEach((lintResult) => {
+            const { messages } = lintResult;
+            const file = fileTestResult.addFile(filePath, '');
+            messages.forEach((message, index) => {
+              file.addIssue(0, 0, message.message, `${index}`);
+            });
+          });
+      })
+    );
   });
 }

.bingo/.gitignore

@@ -5,7 +5,6 @@
 # But not these files:
 !.gitignore
 !*.mod
-!*.sum
 !README.md
 !Variables.mk
 !variables.env

.bingo/Variables.mk

@@ -21,26 +21,19 @@ BRA := $(GOBIN)/bra-v0.0.0-20200517080246-1e3013ecaff8
 $(BRA): $(BINGO_DIR)/bra.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)/bra-v0.0.0-20200517080246-1e3013ecaff8"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bra.mod -o=$(GOBIN)/bra-v0.0.0-20200517080246-1e3013ecaff8 "github.com/unknwon/bra"
-
-CUE := $(GOBIN)/cue-v0.5.0
-$(CUE): $(BINGO_DIR)/cue.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)/cue-v0.5.0"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=cue.mod -o=$(GOBIN)/cue-v0.5.0 "cuelang.org/go/cmd/cue"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=bra.mod -o=$(GOBIN)/bra-v0.0.0-20200517080246-1e3013ecaff8 "github.com/unknwon/bra"
 
 DRONE := $(GOBIN)/drone-v1.5.0
 $(DRONE): $(BINGO_DIR)/drone.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
 	@echo "(re)installing $(GOBIN)/drone-v1.5.0"
-	@# Manual modification: CGo is disabled to make the Drone CLI build successfully on Darwin/arm64 machines.
-	@cd $(BINGO_DIR) && CGO_ENABLED=0 GOWORK=off $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.5.0 "github.com/drone/drone-cli/drone"
+	@cd $(BINGO_DIR) && $(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.52.2
+GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.51.2
 $(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.52.2"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.52.2 "github.com/golangci/golangci-lint/cmd/golangci-lint"
+	@echo "(re)installing $(GOBIN)/golangci-lint-v1.51.2"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.51.2 "github.com/golangci/golangci-lint/cmd/golangci-lint"
 
 JB := $(GOBIN)/jb-v0.5.1
 $(JB): $(BINGO_DIR)/jb.mod
@@ -52,11 +45,11 @@ SWAGGER := $(GOBIN)/swagger-v0.30.2
 $(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.2"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=swagger.mod -o=$(GOBIN)/swagger-v0.30.2 "github.com/go-swagger/go-swagger/cmd/swagger"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=swagger.mod -o=$(GOBIN)/swagger-v0.30.2 "github.com/go-swagger/go-swagger/cmd/swagger"
 
 WIRE := $(GOBIN)/wire-v0.5.0
 $(WIRE): $(BINGO_DIR)/wire.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)/wire-v0.5.0"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=wire.mod -o=$(GOBIN)/wire-v0.5.0 "github.com/google/wire/cmd/wire"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=wire.mod -o=$(GOBIN)/wire-v0.5.0 "github.com/google/wire/cmd/wire"
 

.bingo/bra.mod

@@ -2,6 +2,6 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.17
 
-replace golang.org/x/sys => golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c
-
 require github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8
+
+replace golang.org/x/sys => golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c

.bingo/bra.sum

@@ -1,30 +0,0 @@
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
-github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 h1:aVGB3YnaS/JNfOW3tiHIlmNmTDg618va+eT0mVomgyI=
-github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8/go.mod h1:fVle4kNr08ydeohzYafr20oZzbAkhQT39gKK/pFQ5M4=
-github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs=
-github.com/unknwon/com v1.0.1/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM=
-github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 h1:4EYQaWAatQokdji3zqZloVIW/Ke1RQjYw2zHULyrHJg=
-github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3/go.mod h1:1xEUf2abjfP92w2GZTV+GgaRxXErwRXcClbUwrNJffU=
-github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY=
-github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-golang.org/x/sys v0.0.0-20191020152052-9984515f0562 h1:wOweSabW7qssfcg63CEDHHA4zyoqRlGU6eYV7IUMCq0=
-golang.org/x/sys v0.0.0-20191020152052-9984515f0562/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify/fsnotify.v1 v1.4.7 h1:XNNYLJHt73EyYiCZi6+xjupS9CpvmiDgjPTAjrBlQbo=
-gopkg.in/fsnotify/fsnotify.v1 v1.4.7/go.mod h1:Fyux9zXlo4rWoMSIzpn9fDAYjalPqJ/K1qJ27s+7ltE=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c h1:aFV+BgZ4svzjfabn8ERpuB4JI4N6/rdy1iusx77G3oU=
-golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

.bingo/cue.mod

@@ -1,5 +0,0 @@
-module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
-
-go 1.19
-
-require cuelang.org/go v0.5.0 // cmd/cue

.bingo/cue.sum

@@ -1,58 +0,0 @@
-cuelang.org/go v0.4.3 h1:W3oBBjDTm7+IZfCKZAmC8uDG0eYfJL4Pp/xbbCMKaVo=
-cuelang.org/go v0.4.3/go.mod h1:7805vR9H+VoBNdWFdI7jyDR3QLUPp4+naHfbcgp55HI=
-cuelang.org/go v0.5.0-beta.2 h1:am5M7jGvNTJ0rnjrFNyvE7fucL/wRqb0emK4XxdThQI=
-cuelang.org/go v0.5.0-beta.2/go.mod h1:okjJBHFQFer+a41sAe2SaGm1glWS8oEb6CmJvn5Zdws=
-cuelang.org/go v0.5.0 h1:D6N0UgTGJCOxFKU8RU+qYvavKNsVc/+ZobmifStVJzU=
-cuelang.org/go v0.5.0/go.mod h1:okjJBHFQFer+a41sAe2SaGm1glWS8oEb6CmJvn5Zdws=
-github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
-github.com/cockroachdb/apd/v2 v2.0.1 h1:y1Rh3tEU89D+7Tgbw+lp52T6p/GJLpDmNvr10UWqLTE=
-github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E=
-github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw=
-github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/emicklei/proto v1.6.15 h1:XbpwxmuOPrdES97FrSfpyy67SSCV/wBIKXqgJzh6hNw=
-github.com/emicklei/proto v1.10.0 h1:pDGyFRVV5RvV+nkBK9iy3q67FBy9Xa7vwrOTE+g5aGw=
-github.com/emicklei/proto v1.10.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
-github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
-github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
-github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de h1:D5x39vF5KCwKQaw+OC9ZPiLVHXz3UFw2+psEX+gYcto=
-github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de/go.mod h1:kJun4WP5gFuHZgRjZUWWuH1DTxCtxbHDOIJsudS8jzY=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/protocolbuffers/txtpbfmt v0.0.0-20201118171849-f6a6b3f636fc h1:gSVONBi2HWMFXCa9jFdYvYk7IwW/mTLxWOF7rXS4LO0=
-github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b h1:zd/2RNzIRkoGGMjE+YIsZ85CnDIz672JK2F3Zl4vux4=
-github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b/go.mod h1:KjY0wibdYKc4DYkerHSbguaf3JeIPGhNJBp2BNiFH78=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q=
-github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449 h1:xUIPaMhvROX9dhPvRCenIJtU78+lbEenGbgqB5hfHCQ=
-golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0=
-golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/tools v0.0.0-20200612220849-54c614fe050c h1:g6oFfz6Cmw68izP3xsdud3Oxu145IPkeFzyRg58AKHM=
-golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

.bingo/golangci-lint.mod

@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.20
+go 1.19
 
-require github.com/golangci/golangci-lint v1.52.2 // cmd/golangci-lint
+require github.com/golangci/golangci-lint v1.51.2 // cmd/golangci-lint

.bingo/jb.mod

@@ -1,5 +0,0 @@
-module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
-
-go 1.18
-
-require github.com/jsonnet-bundler/jsonnet-bundler v0.5.1 // cmd/jb

.bingo/jb.sum

@@ -1,50 +0,0 @@
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
-github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
-github.com/campoy/embedmd v1.0.0/go.mod h1:oxyr9RCiSXg0M3VJ3ks0UGfp98BpSSGr0kpiX3MzVl8=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/jsonnet-bundler/jsonnet-bundler v0.5.1 h1:eUd6EA1Qzz73Q4NLNLOrNkMb96+6NTTERbX9lqaxVwk=
-github.com/jsonnet-bundler/jsonnet-bundler v0.5.1/go.mod h1:Qrdw/7mOFS2SKCOALKFfEH8gdvXJi8XZjw9g5ilpf4I=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.4/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c h1:aFV+BgZ4svzjfabn8ERpuB4JI4N6/rdy1iusx77G3oU=
-golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

.bingo/swagger.sum

@@ -1,86 +0,0 @@
-github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
-github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
-github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8=
-github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
-github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
-github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ=
-github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o=
-github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
-github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
-github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
-github.com/go-openapi/analysis v0.21.2 h1:hXFrOYFHUAMQdu6zwAiKKJHJQ8kqZs1ux/ru1P1wLJU=
-github.com/go-openapi/analysis v0.21.4 h1:ZDFLvSNxpDaomuCueM0BlSXxpANBlFYiBvr+GXrvIHc=
-github.com/go-openapi/errors v0.20.2 h1:dxy7PGTqEh94zj2E3h1cUmQQWiM1+aeCROfAr02EmK8=
-github.com/go-openapi/errors v0.20.3 h1:rz6kiC84sqNQoqrtulzaL/VERgkoCyB6WdEkc2ujzUc=
-github.com/go-openapi/inflect v0.19.0 h1:9jCH9scKIbHeV9m12SmPilScz6krDxKRasNNSNPXu/4=
-github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
-github.com/go-openapi/jsonreference v0.19.6 h1:UBIxjkht+AWIgYzCDSv2GN+E/togfwXUJFRTWhl2Jjs=
-github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA=
-github.com/go-openapi/loads v0.21.0 h1:jYtUO4wwP7psAweisP/MDoOpdzsYEESdoPcsWjHDR68=
-github.com/go-openapi/loads v0.21.2 h1:r2a/xFIYeZ4Qd2TnGpWDIQNcP80dIaZgf704za8enro=
-github.com/go-openapi/runtime v0.21.1 h1:/KIG00BzA2x2HRStX2tnhbqbQdPcFlkgsYCiNY20FZs=
-github.com/go-openapi/runtime v0.24.1 h1:Sml5cgQKGYQHF+M7yYSHaH1eOjvTykrddTE/KtQVjqo=
-github.com/go-openapi/spec v0.20.4 h1:O8hJrt0UMnhHcluhIdUgCLRWyM2x7QkBXRvOs7m+O1M=
-github.com/go-openapi/spec v0.20.7 h1:1Rlu/ZrOCCob0n+JKKJAWhNWMPW8bOZRg8FJaY+0SKI=
-github.com/go-openapi/strfmt v0.21.1 h1:G6s2t5V5kGCHLVbSdZ/6lI8Wm4OzoPFkc3/cjAsKQrM=
-github.com/go-openapi/strfmt v0.21.3 h1:xwhj5X6CjXEZZHMWy1zKJxvW9AfHC9pkyUjLvHtKG7o=
-github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM=
-github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
-github.com/go-openapi/validate v0.20.3 h1:GZPPhhKSZrE8HjB4eEkoYAZmoWA4+tCemSgINH1/vKw=
-github.com/go-openapi/validate v0.22.0 h1:b0QecH6VslW/TxtpKgzpO1SNG7GU2FsaqKdP1E2T50Y=
-github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
-github.com/go-swagger/go-swagger v0.29.0 h1:z3YoZtLvS1Y8TE/PCat1VypcZxM0IgKLt0NvZxQyNl8=
-github.com/go-swagger/go-swagger v0.29.0/go.mod h1:Z4GJzI+bHKKkGB2Ji1rawpi3/ldXX8CkzGIa9HAC5EE=
-github.com/go-swagger/go-swagger v0.30.2 h1:23odPUyQZdkNFZZSBJ3mqYYcdh+LnuReEbdWN18OMRo=
-github.com/go-swagger/go-swagger v0.30.2/go.mod h1:neDPes8r8PCz2JPvHRDj8BTULLh4VJUt7n6MpQqxhHM=
-github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
-github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=
-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
-github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=
-github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
-github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls=
-github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
-github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
-github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
-github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
-github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
-github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
-github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
-github.com/spf13/afero v1.8.0 h1:5MmtuhAgYeU6qpa7w7bP0dv6MBYuup0vekhSpSkoq60=
-github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
-github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
-github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
-github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk=
-github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ=
-github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
-github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI=
-github.com/toqueteos/webbrowser v1.2.0 h1:tVP/gpK69Fx+qMJKsLE7TD8LuGWPnEV71wBN9rrstGQ=
-go.mongodb.org/mongo-driver v1.8.2 h1:8ssUXufb90ujcIvR6MyE1SchaNj0SFxsakiZgxIyrMk=
-go.mongodb.org/mongo-driver v1.10.1 h1:NujsPveKwHaWuKUer/ceo9DzEe7HIj1SlJ6uvXZG0S4=
-golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
-golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
-golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba h1:6u6sik+bn/y7vILcYkK3iwTBWN7WtBvB0+SZswQnbf8=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
-golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w=
-golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-gopkg.in/ini.v1 v1.66.3 h1:jRskFVxYaMGAMUbN0UZ7niA9gzL9B49DOqE78vg0k3w=
-gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

.bingo/variables.env

@@ -10,11 +10,9 @@ fi
 
 BRA="${GOBIN}/bra-v0.0.0-20200517080246-1e3013ecaff8"
 
-CUE="${GOBIN}/cue-v0.5.0"
-
 DRONE="${GOBIN}/drone-v1.5.0"
 
-GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.52.2"
+GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.51.2"
 
 JB="${GOBIN}/jb-v0.5.1"
 

.bingo/wire.sum

@@ -1,13 +0,0 @@
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/subcommands v1.0.1 h1:/eqq+otEXm5vhfBrbREPCSVQbvofip6kIz+mX5TUH7k=
-github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
-github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8=
-github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b h1:NVD8gBK33xpdqCaZVVtd6OFJp+3dxkXuz7+U7KaVN6s=
-golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=

.bra.toml

@@ -1,7 +1,7 @@
 [run]
 init_cmds = [
+  ["make", "gen-go"],
   ["GO_BUILD_DEV=1", "make", "build-go"],
-  ["make", "gen-jsonnet"],
   ["./bin/grafana", "server", "-packaging=dev", "cfg:app_mode=development"]
 ]
 watch_all = true
@@ -10,13 +10,12 @@ watch_dirs = [
   "$WORKDIR/pkg",
   "$WORKDIR/public/views",
   "$WORKDIR/conf",
-  "$WORKDIR/devenv/dev-dashboards",
 ]
 watch_exts = [".go", ".ini", ".toml", ".template.html"]
 ignore_files = [".*_gen.go"]
 build_delay = 1500
 cmds = [
+  ["make", "gen-go"],
   ["GO_BUILD_DEV=1", "make", "build-go"],
-  ["make", "gen-jsonnet"],
   ["./bin/grafana", "server", "-packaging=dev", "cfg:app_mode=development"]
 ]

.drone.star

@@ -19,11 +19,6 @@ load(
     "publish_artifacts_pipelines",
     "publish_npm_pipelines",
     "publish_packages_pipeline",
-    "verify_release_pipeline",
-)
-load(
-    "scripts/drone/rgm.star",
-    "rgm",
 )
 load(
     "scripts/drone/pipelines/publish_images.star",
@@ -36,10 +31,6 @@ load(
 )
 load("scripts/drone/pipelines/github.star", "publish_github_pipeline")
 load("scripts/drone/pipelines/aws_marketplace.star", "publish_aws_marketplace_pipeline")
-load(
-    "scripts/drone/pipelines/windows.star",
-    "windows_test_backend",
-)
 load("scripts/drone/version.star", "version_branch_pipelines")
 load("scripts/drone/events/cron.star", "cronjobs")
 load("scripts/drone/vault.star", "secrets")
@@ -51,6 +42,10 @@ def main(_ctx):
         oss_pipelines() +
         enterprise_pipelines() +
         enterprise2_pipelines() +
+        enterprise2_pipelines(
+            prefix = "custom-",
+            trigger = {"event": ["custom"]},
+        ) +
         publish_image_pipelines_public() +
         publish_image_pipelines_security() +
         publish_github_pipeline("public") +
@@ -60,12 +55,6 @@ def main(_ctx):
         publish_artifacts_pipelines("public") +
         publish_npm_pipelines() +
         publish_packages_pipeline() +
-        [verify_release_pipeline()] +
-        rgm() +
-        [windows_test_backend({
-            "event": ["promote"],
-            "target": ["test-windows"],
-        }, "oss", "testing")] +
         artifacts_page_pipeline() +
         version_branch_pipelines() +
         integration_test_pipelines() +

.eslintrc

@@ -1,15 +1,13 @@
 {
   "extends": ["@grafana/eslint-config"],
   "root": true,
-  "plugins": ["@emotion", "lodash", "jest", "import", "jsx-a11y", "@grafana"],
+  "plugins": ["@emotion", "lodash", "jest", "import", "jsx-a11y"],
   "settings": {
     "import/internal-regex": "^(app/)|(@grafana)",
     "import/external-module-folders": ["node_modules", ".yarn"]
   },
   "rules": {
     "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",
@@ -22,18 +20,13 @@
       }
     ],
     "no-restricted-imports": [
-      "error",
+      "warn",
       {
         "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"
           }
         ]
       }
@@ -41,15 +34,68 @@
 
     // Use typescript's no-redeclare for compatibility with overrides
     "no-redeclare": "off",
-    "@typescript-eslint/no-redeclare": ["error"]
+    "@typescript-eslint/no-redeclare": ["error"],
+
+
+    // these are all the rules listed in the strict preset
+    // we should fix them one by one and mark them as errors
+    // once they're all fixed, we can remove them all and instead extend the strict preset
+    // with "extends": ["plugin:jsx-a11y/strict"]
+    "jsx-a11y/alt-text": "off",
+    "jsx-a11y/anchor-has-content": "error",
+    "jsx-a11y/anchor-is-valid": "off",
+    "jsx-a11y/aria-activedescendant-has-tabindex": "error",
+    "jsx-a11y/aria-props": "error",
+    "jsx-a11y/aria-proptypes": "error",
+    "jsx-a11y/aria-role": "off",
+    "jsx-a11y/aria-unsupported-elements": "error",
+    "jsx-a11y/autocomplete-valid": "error",
+    "jsx-a11y/click-events-have-key-events": "off",
+    "jsx-a11y/heading-has-content": "error",
+    "jsx-a11y/html-has-lang": "error",
+    "jsx-a11y/iframe-has-title": "off",
+    "jsx-a11y/img-redundant-alt": "off",
+    "jsx-a11y/interactive-supports-focus": [
+      "off",
+      {
+        "tabbable": [
+          "button",
+          "checkbox",
+          "link",
+          "progressbar",
+          "searchbox",
+          "slider",
+          "spinbutton",
+          "switch",
+          "textbox"
+        ]
+      }
+    ],
+    "jsx-a11y/label-has-associated-control": "off",
+    "jsx-a11y/media-has-caption": "error",
+    "jsx-a11y/mouse-events-have-key-events": "off",
+    "jsx-a11y/no-access-key": "error",
+    "jsx-a11y/no-autofocus": "off",
+    "jsx-a11y/no-distracting-elements": "error",
+    "jsx-a11y/no-interactive-element-to-noninteractive-role": "error",
+    "jsx-a11y/no-noninteractive-element-interactions": [
+      "off",
+      {
+        "body": ["onError", "onLoad"],
+        "iframe": ["onError", "onLoad"],
+        "img": ["onError", "onLoad"]
+      }
+    ],
+    "jsx-a11y/no-noninteractive-element-to-interactive-role": "off",
+    "jsx-a11y/no-noninteractive-tabindex": "off",
+    "jsx-a11y/no-redundant-roles": "error",
+    "jsx-a11y/no-static-element-interactions": "off",
+    "jsx-a11y/role-has-required-aria-props": "off",
+    "jsx-a11y/role-supports-aria-props": "off",
+    "jsx-a11y/scope": "error",
+    "jsx-a11y/tabindex-no-positive": "off"
   },
   "overrides": [
-    {
-      "files": ["public/app/features/scenes/**/*.{ts,tsx}"],
-      "rules": {
-        "@typescript-eslint/explicit-member-accessibility": ["error", { "accessibility": "explicit" }]
-      }
-    },
     {
       "files": ["packages/grafana-ui/src/components/uPlot/**/*.{ts,tsx}"],
       "rules": {
@@ -71,31 +117,6 @@
         "no-redeclare": "error",
         "@typescript-eslint/no-redeclare": "off"
       }
-    },
-    {
-      "extends": ["plugin:jsx-a11y/recommended"],
-      "files": ["**/*"],
-      "excludedFiles": ["**/*.{spec,test}.{ts,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/click-events-have-key-events": "off",
-        "jsx-a11y/no-autofocus": [
-          "error",
-          {
-            "ignoreNonDOM": true
-          }
-        ],
-        "jsx-a11y/no-static-element-interactions": "off",
-        "jsx-a11y/label-has-associated-control": [
-          "error",
-          {
-            "controlComponents": ["NumberInput"],
-            "depth": 2
-          }
-        ]
-      }
     }
   ]
 }

.github/CODEOWNERS

@@ -12,45 +12,41 @@
 # This should make it easy to add new rules without breaking existing ones.
 
 # Documentation
-/.changelog-archive @grafana/docs-grafana
-/CHANGELOG.md @grafana/docs-grafana
-/CODE_OF_CONDUCT.md @grafana/docs-grafana
-/CONTRIBUTING.md @grafana/docs-grafana
-/GOVERNANCE.md @RichiH
-/HALL_OF_FAME.md @grafana/docs-grafana
-/ISSUE_TRIAGE.md @grafana/grafana-community-support
-/LICENSE @torkelo
-/LICENSING.md @torkelo
-/MAINTAINERS.md @RichiH
-/NOTICE.md @torkelo
-/README.md @grafana/docs-grafana
-/ROADMAP.md @torkelo
-/SECURITY.md @grafana/security-team
-/SUPPORT.md @torkelo
-/UPGRADING_DEPENDENCIES.md @grafana/docs-grafana
-/WORKFLOW.md @torkelo
+/docs/ @grafana/docs-grafana
 /contribute/ @grafana/docs-grafana
-/devenv/README.md @grafana/docs-grafana
+/docs/sources/developers/plugins/ @grafana/docs-grafana @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
+/docs/sources/developers/plugins/backend/ @grafana/docs-grafana @grafana/plugins-platform-backend
+/.changelog-archive @grafana/docs-grafana
+CHANGELOG.md @grafana/docs-grafana
+CODE_OF_CONDUCT.md @grafana/docs-grafana
+CONTRIBUTING.md @grafana/docs-grafana
+GOVERNANCE.md @RichiH
+HALL_OF_FAME.md @grafana/docs-grafana
+ISSUE_TRIAGE.md @grafana/grafana-community-support
+LICENSE @torkelo
+LICENSING.md @torkelo
+MAINTAINERS.md @RichiH
+NOTICE.md @torkelo
+README.md @grafana/docs-grafana
+ROADMAP.md @torkelo
+SECURITY.md @grafana/security-team
+SUPPORT.md @torkelo
+UPGRADING_DEPENDENCIES.md @grafana/docs-grafana
+WORKFLOW.md @torkelo
 
-# Technical documentation
-/docs/                                    @Eve832 @jdbaldry
-/docs/sources/                            @Eve832
-/docs/sources/administration/             @Eve832 @GrafanaWriter
-/docs/sources/alerting/                   @brendamuir
-/docs/sources/dashboards/                 @imatwawana
-/docs/sources/datasources/                @lwandz13
-/docs/sources/explore/                    @Eve832 @GrafanaWriter
-/docs/sources/fundamentals                @chri2547
-/docs/sources/getting-started/            @chri2547
-/docs/sources/introduction/               @chri2547
-/docs/sources/old-alerting/               @brendamuir
-/docs/sources/panels-visualizations/      @imatwawana
-/docs/sources/release-notes/              @Eve832 @GrafanaWriter
-/docs/sources/setup-grafana/              @chri2547
-/docs/sources/upgrade-guide/              @chri2547 @imatwawana
-/docs/sources/whatsnew/                   @chri2547 @imatwawana
-/docs/sources/developers/plugins/         @Eve832 @josmperez @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
-/docs/sources/developers/plugins/backend/ @Eve832 @grafana/plugins-platform-backend
+
+# Set up, dashboards/visualization, best practices: Chris Moyer
+# Alerting: Brenda Muir
+/docs/sources/administration/ @Eve832 @GrafanaWriter
+/docs/sources/alerting/ @brendamuir
+/docs/sources/dashboards/ @chri2547
+/docs/sources/datasources/ @Eve832 @GrafanaWriter
+/docs/sources/explore/ @Eve832 @GrafanaWriter
+/docs/sources/getting-started/ @chri2547
+/docs/sources/old-alerting/ @brendamuir
+/docs/sources/release-notes/ @Eve832 @GrafanaWriter
+/docs/sources/setup-grafana/ @chri2547
+/docs/sources/whatsnew/ @Eve832 @GrafanaWriter
 
 # Backend code
 /go.mod @grafana/backend-platform
@@ -61,13 +57,12 @@
 /.bra.toml @grafana/backend-platform
 /.golangci.toml @grafana/backend-platform
 /build.go @grafana/backend-platform
-/scripts/modowners/ @grafana/backend-platform
 
 /pkg/api/ @grafana/backend-platform
 /pkg/bus/ @grafana/backend-platform
 /pkg/cmd/ @grafana/backend-platform
 /pkg/components/apikeygen/ @grafana/grafana-authnz-team
-/pkg/components/satokengen/ @grafana/grafana-authnz-team
+/pkg/components/apikeygenprefixed/ @grafana/grafana-authnz-team
 /pkg/components/dashdiffs/ @grafana/backend-platform
 /pkg/components/imguploader/ @grafana/backend-platform
 /pkg/components/loki/ @grafana/backend-platform
@@ -84,7 +79,6 @@
 /pkg/infra/metrics/ @grafana/backend-platform
 /pkg/infra/network/ @grafana/backend-platform
 /pkg/infra/process/ @grafana/backend-platform
-/pkg/infra/proxy/ @grafana/hosted-grafana-team
 /pkg/infra/remotecache/ @grafana/backend-platform
 /pkg/infra/serverlock/ @grafana/backend-platform
 /pkg/infra/slugify/ @grafana/backend-platform
@@ -95,8 +89,9 @@
 /pkg/models/ @grafana/backend-platform
 /pkg/server/ @grafana/backend-platform
 /pkg/services/annotations/ @grafana/backend-platform
-/pkg/services/apikey/ @grafana/grafana-authnz-team
+/pkg/services/apikey/ @grafana/backend-platform
 /pkg/services/cleanup/ @grafana/backend-platform
+/pkg/services/comments/ @grafana/backend-platform
 /pkg/services/contexthandler/ @grafana/backend-platform
 /pkg/services/correlations/ @grafana/backend-platform
 /pkg/services/dashboardimport/ @grafana/backend-platform
@@ -104,6 +99,7 @@
 /pkg/services/dashboardsnapshots/ @grafana/backend-platform
 /pkg/services/dashboardversion/ @grafana/backend-platform
 /pkg/services/encryption/ @grafana/backend-platform
+/pkg/services/featuremgmt/ @grafana/backend-platform
 /pkg/services/folder/ @grafana/backend-platform
 /pkg/services/hooks/ @grafana/backend-platform
 /pkg/services/kmsproviders/ @grafana/backend-platform
@@ -113,6 +109,7 @@
 /pkg/services/org/ @grafana/backend-platform
 /pkg/services/playlist/ @grafana/backend-platform
 /pkg/services/plugindashboards/ @grafana/backend-platform
+/pkg/services/pluginsettings/ @grafana/backend-platform
 /pkg/services/preference/ @grafana/backend-platform
 /pkg/services/provisioning/ @grafana/backend-platform
 /pkg/services/publicdashboards/ @grafana/dashboards-squad
@@ -136,7 +133,6 @@
 /pkg/services/validations/ @grafana/backend-platform
 /pkg/setting/ @grafana/backend-platform
 /pkg/tests/ @grafana/backend-platform
-/pkg/tests/api/correlations/ @grafana/explore-squad
 /pkg/tsdb/grafanads/ @grafana/backend-platform
 /pkg/tsdb/intervalv2/ @grafana/backend-platform
 /pkg/tsdb/legacydata/ @grafana/backend-platform
@@ -159,6 +155,9 @@
 /devenv/docker/blocks/loki* @grafana/observability-logs
 /devenv/docker/blocks/elastic* @grafana/observability-logs
 
+# Performance tests
+/devenv/docker/loadtest-ts/ @grafana/multitenancy-squad
+
 /devenv/bulk-dashboards/ @grafana/dashboards-squad
 /devenv/bulk_alerting_dashboards/ @grafana/alerting-squad-backend
 /devenv/create_docker_compose.sh @grafana/backend-platform
@@ -168,7 +167,7 @@
 /devenv/dev-dashboards-without-uid/ @grafana/dashboards-squad
 /devenv/dev-dashboards/ @grafana/dashboards-squad
 /devenv/docker/blocks/alert_webhook_listener/ @grafana/alerting-squad-backend
-/devenv/docker/blocks/clickhouse/ @grafana/partner-datasources
+/devenv/docker/blocks/clickhouse/ @grafana/partner-plugins
 /devenv/docker/blocks/collectd/ @grafana/observability-metrics
 /devenv/docker/blocks/grafana/ @grafana/grafana-as-code
 /devenv/docker/blocks/graphite/ @grafana/observability-metrics
@@ -178,7 +177,6 @@
 /devenv/docker/blocks/influxdb1/ @grafana/observability-metrics
 /devenv/docker/blocks/jaeger/ @grafana/observability-traces-and-profiling
 /devenv/docker/blocks/maildev/ @grafana/alerting-squad-frontend
-/devenv/docker/blocks/mariadb/ @grafana/grafana-bi-squad
 /devenv/docker/blocks/memcached/ @grafana/backend-platform
 /devenv/docker/blocks/mssql/ @grafana/grafana-bi-squad
 /devenv/docker/blocks/mssql_arm64/ @grafana/grafana-bi-squad
@@ -194,7 +192,6 @@
 /devenv/docker/blocks/postgres_tests/ @grafana/grafana-bi-squad
 /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/backend-platform
 /devenv/docker/blocks/slow_proxy/ @bergquist
@@ -209,7 +206,7 @@
 /devenv/docker/ha_test/ @grafana/backend-platform
 /devenv/docker/loadtest/ @grafana/backend-platform
 /devenv/docker/rpmtest/ @grafana/backend-platform
-/devenv/jsonnet/ @grafana/dataviz-squad
+/devenv/jsonnet/ @grafana/grafana-edge-squad
 /devenv/local-npm/ @grafana/frontend-ops
 /devenv/vscode/ @grafana/frontend-ops
 /devenv/setup.sh @grafana/backend-platform
@@ -230,12 +227,11 @@
 /Dockerfile @grafana/grafana-delivery
 /Makefile @grafana/grafana-delivery
 /scripts/build/ @grafana/grafana-delivery
-/scripts/list-release-artifacts.sh @grafana/grafana-delivery
 
 # OSS Plugin Partnerships backend code
-/pkg/tsdb/cloudwatch/ @grafana/aws-datasources
-/pkg/tsdb/azuremonitor/ @grafana/partner-datasources
-/pkg/tsdb/cloud-monitoring/ @grafana/partner-datasources
+/pkg/tsdb/cloudwatch/ @grafana/aws-plugins
+/pkg/tsdb/azuremonitor/ @grafana/partner-plugins
+/pkg/tsdb/cloudmonitoring/ @grafana/partner-plugins
 
 # Observability backend code
 /pkg/tsdb/prometheus/ @grafana/observability-metrics
@@ -244,7 +240,7 @@
 /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/phlare/ @grafana/observability-traces-and-profiling
 /pkg/tsdb/parca/ @grafana/observability-traces-and-profiling
 
 # BI backend code
@@ -256,14 +252,14 @@
 /pkg/services/sqlstore/migrations/ @grafana/backend-platform @grafana/hosted-grafana-team
 *_mig.go @grafana/backend-platform @grafana/hosted-grafana-team
 
-# Grafana app platform
-/pkg/services/live/ @grafana/grafana-app-platform-squad
-/pkg/services/searchV2/ @grafana/grafana-app-platform-squad
-/pkg/services/store/ @grafana/grafana-app-platform-squad
-/pkg/infra/filestorage/ @grafana/grafana-app-platform-squad
-/pkg/util/converter/ @grafana/grafana-app-platform-squad
-/pkg/modules/ @grafana/grafana-app-platform-squad
-/pkg/kindsysreport/ @grafana/grafana-app-platform-squad
+# Grafana multitenancy
+/pkg/services/live/ @grafana/multitenancy-squad
+/pkg/services/searchV2/ @grafana/multitenancy-squad
+/pkg/services/store/ @grafana/multitenancy-squad
+/pkg/services/querylibrary/ @grafana/multitenancy-squad
+/pkg/services/export/ @grafana/multitenancy-squad
+/pkg/infra/filestorage/ @grafana/multitenancy-squad
+/pkg/util/converter/ @grafana/multitenancy-squad
 
 # Alerting
 /pkg/services/ngalert/ @grafana/alerting-squad-backend
@@ -273,8 +269,8 @@
 /public/app/features/alerting/ @grafana/alerting-squad-frontend
 
 # Library Services
-/pkg/services/libraryelements/ @grafana/grafana-frontend-platform
-/pkg/services/librarypanels/ @grafana/grafana-frontend-platform
+/pkg/services/libraryelements/ @grafana/user-essentials
+/pkg/services/librarypanels/ @grafana/user-essentials
 
 # Plugins
 /pkg/api/pluginproxy/ @grafana/plugins-platform-backend
@@ -285,37 +281,30 @@
 /pkg/services/pluginsintegration/ @grafana/plugins-platform-backend
 /pkg/plugins/pfs/ @grafana/plugins-platform-backend @grafana/grafana-as-code
 /pkg/tsdb/testdatasource/ @grafana/plugins-platform-backend
-/pkg/services/pluginsintegration/pluginsettings/ @grafana/plugins-platform-backend
+
+# Dashboard previews / crawler (behind feature flag)
+/pkg/services/thumbs/ @grafana/multitenancy-squad
 
 # Backend code docs
 /contribute/backend/ @grafana/backend-platform
 
 
-/crowdin.yml @grafana/grafana-frontend-platform
-/public/locales/ @grafana/grafana-frontend-platform
-/public/app/core/internationalization/ @grafana/grafana-frontend-platform
-/e2e/ @grafana/grafana-frontend-platform
-/e2e/cloud-plugins-suite/ @grafana/partner-datasources
-/packages/ @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend
-/packages/grafana-e2e-selectors/ @grafana/grafana-frontend-platform
-/packages/grafana-e2e/ @grafana/grafana-frontend-platform
+/crowdin.yml @grafana/user-essentials
+/public/locales/ @grafana/user-essentials
+/public/app/core/internationalization/ @grafana/user-essentials
+/e2e/ @grafana/user-essentials
+/e2e/cloud-plugins-suite/ @grafana/partner-plugins
+/packages/ @grafana/user-essentials @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
+/packages/grafana-e2e-selectors/ @grafana/user-essentials
+/packages/grafana-e2e/ @grafana/user-essentials
 /packages/grafana-toolkit/ @grafana/plugins-platform-frontend
 /packages/grafana-ui/.storybook/ @grafana/plugins-platform-frontend
-/packages/grafana-ui/src/components/ @grafana/grafana-frontend-platform
-/packages/grafana-ui/src/components/DateTimePickers/ @grafana/grafana-frontend-platform
+/packages/grafana-ui/src/components/DateTimePickers/ @grafana/user-essentials
+/packages/grafana-ui/src/components/GraphNG/ @grafana/grafana-bi-squad
+/packages/grafana-ui/src/components/Logs/ @grafana/observability-logs
 /packages/grafana-ui/src/components/Table/ @grafana/grafana-bi-squad
-/packages/grafana-ui/src/components/Gauge/ @grafana/grafana-bi-squad
-/packages/grafana-ui/src/components/BarGauge/ @grafana/grafana-bi-squad
-/packages/grafana-ui/src/components/GraphNG/ @grafana/dataviz-squad
-/packages/grafana-ui/src/components/Graph/ @grafana/dataviz-squad
-/packages/grafana-ui/src/components/TimeSeries/ @grafana/dataviz-squad
-/packages/grafana-ui/src/components/uPlot/ @grafana/dataviz-squad
-/packages/grafana-ui/src/components/DataLinks/ @grafana/dataviz-squad
-/packages/grafana-ui/src/components/ValuePicker/ @grafana/dataviz-squad
-/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/TimeSeries/ @grafana/grafana-bi-squad
+/packages/grafana-ui/src/components/uPlot/ @grafana/grafana-bi-squad
 /packages/grafana-ui/src/utils/storybook/ @grafana/plugins-platform-frontend
 /packages/grafana-data/src/**/*logs* @grafana/observability-logs
 /plugins-bundled/ @grafana/plugins-platform-frontend
@@ -335,7 +324,7 @@ tsconfig.json @grafana/frontend-ops
 /.yarn @grafana/frontend-ops
 /.yarnrc.yml @grafana/frontend-ops
 /yarn.lock @grafana/frontend-ops
-/.linguirc @grafana/grafana-frontend-platform
+/.linguirc @grafana/user-essentials
 /babel.config.json @grafana/frontend-ops
 lerna.json @grafana/frontend-ops
 /.prettierrc.js @grafana/frontend-ops
@@ -349,120 +338,114 @@ lerna.json @grafana/frontend-ops
 
 
 # public folder
-/public/app/core/ @grafana/grafana-frontend-platform
-/public/app/core/components/TimePicker/ @grafana/grafana-frontend-platform
-/public/app/core/components/Layers/ @grafana/dataviz-squad
-/public/app/features/all.ts @grafana/grafana-frontend-platform
+/public/app/core/ @grafana/user-essentials
+/public/app/core/components/TimePicker/ @grafana/user-essentials
+/public/app/core/components/Layers/ @grafana/grafana-edge-squad
+/public/app/features/all.ts @grafana/user-essentials
 /public/app/features/admin/ @grafana/grafana-authnz-team
-/public/app/features/auth-config/ @grafana/grafana-authnz-team
-/public/app/features/annotations/ @grafana/grafana-frontend-platform
-/public/app/features/api-keys/ @grafana/grafana-authnz-team
-/public/app/features/canvas/ @grafana/dataviz-squad
-/public/app/features/geo/ @grafana/dataviz-squad
-/public/app/features/visualization/data-hover/ @grafana/dataviz-squad
-/public/app/features/commandPalette/ @grafana/grafana-frontend-platform
+/public/app/features/annotations/ @grafana/user-essentials
+/public/app/features/api-keys/ @grafana/user-essentials
+/public/app/features/canvas/ @grafana/grafana-edge-squad
+/public/app/features/commandPalette/ @grafana/user-essentials
+/public/app/features/comments/ @grafana/grafana-edge-squad
 /public/app/features/connections/ @grafana/plugins-platform-frontend
 /public/app/features/correlations/ @grafana/explore-squad
 /public/app/features/dashboard/ @grafana/dashboards-squad
-/public/app/features/datasources/ @grafana/plugins-platform-frontend
-/public/app/features/dimensions/ @grafana/dataviz-squad
-/public/app/features/dataframe-import/ @grafana/grafana-bi-squad
+/public/app/features/datasources/ @grafana/user-essentials
+/public/app/features/dimensions/ @grafana/grafana-edge-squad
 /public/app/features/explore/ @grafana/explore-squad
 /public/app/features/expressions/ @grafana/observability-metrics
-/public/app/features/folders/ @grafana/grafana-frontend-platform
-/public/app/features/inspector/ @grafana/dashboards-squad
-/public/app/features/invites/ @grafana/grafana-frontend-platform
-/public/app/features/library-panels/ @grafana/grafana-frontend-platform
+/public/app/features/folders/ @grafana/user-essentials
+/public/app/features/inspector/ @grafana/user-essentials
+/public/app/features/invites/ @grafana/user-essentials
+/public/app/features/geo/ @grafana/grafana-edge-squad
+/public/app/features/library-panels/ @grafana/user-essentials
 /public/app/features/logs/ @grafana/observability-logs
-/public/app/features/live/ @grafana/grafana-app-platform-squad
+/public/app/features/live/ @grafana/multitenancy-squad
 /public/app/features/manage-dashboards/ @grafana/dashboards-squad
-/public/app/features/notifications/ @grafana/grafana-frontend-platform
-/public/app/features/org/ @grafana/grafana-frontend-platform
-/public/app/features/panel/ @grafana/grafana-frontend-platform
+/public/app/features/notifications/ @grafana/user-essentials
+/public/app/features/org/ @grafana/user-essentials
+/public/app/features/panel/ @grafana/user-essentials
 /public/app/features/playlist/ @grafana/dashboards-squad
 /public/app/features/plugins/ @grafana/plugins-platform-frontend
-/public/app/features/profile/ @grafana/grafana-frontend-platform
+/public/app/features/profile/ @grafana/user-essentials
 /public/app/features/runtime/ @ryantxu
 /public/app/features/query/ @grafana/dashboards-squad
-/public/app/features/sandbox/ @grafana/grafana-frontend-platform
+/public/app/features/query-library/ @grafana/grafana-edge-squad
+/public/app/features/sandbox/ @grafana/user-essentials
 /public/app/features/scenes/ @grafana/dashboards-squad
-/public/app/features/browse-dashboards/ @grafana/grafana-frontend-platform
-/public/app/features/search/ @grafana/grafana-frontend-platform
+/public/app/features/search/ @grafana/user-essentials
 /public/app/features/serviceaccounts/ @grafana/grafana-authnz-team
-/public/app/features/storage/ @grafana/grafana-app-platform-squad
+/public/app/features/storage/ @grafana/multitenancy-squad
 /public/app/features/teams/ @grafana/grafana-authnz-team
 /public/app/features/templating/ @grafana/dashboards-squad
-/public/app/features/transformers/ @grafana/dataviz-squad
+/public/app/features/transformers/ @grafana/grafana-edge-squad
 /public/app/features/users/ @grafana/grafana-authnz-team
 /public/app/features/variables/ @grafana/dashboards-squad
 /public/app/plugins/panel/alertGroups/ @grafana/alerting-squad-frontend
 /public/app/plugins/panel/alertlist/ @grafana/alerting-squad-frontend
-/public/app/plugins/panel/annolist/ @grafana/grafana-frontend-platform
-/public/app/plugins/panel/barchart/ @grafana/dataviz-squad
-/public/app/plugins/panel/bargauge/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/dashlist/ @grafana/grafana-frontend-platform
+/public/app/plugins/panel/annolist/ @grafana/user-essentials
+/public/app/plugins/panel/barchart/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/bargauge/ @grafana/user-essentials
+/public/app/plugins/panel/dashlist/ @grafana/user-essentials
 /public/app/plugins/panel/debug/ @ryantxu
-/public/app/plugins/panel/datagrid/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/gauge/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/gettingstarted/ @grafana/grafana-frontend-platform
-/public/app/plugins/panel/graph/ @grafana/dataviz-squad
-/public/app/plugins/panel/heatmap/ @grafana/dataviz-squad
-/public/app/plugins/panel/histogram/ @grafana/dataviz-squad
+/public/app/plugins/panel/gauge/ @grafana/user-essentials
+/public/app/plugins/panel/gettingstarted/ @grafana/user-essentials
+/public/app/plugins/panel/graph/ @grafana/user-essentials
+/public/app/plugins/panel/heatmap/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/histogram/ @grafana/grafana-bi-squad
 /public/app/plugins/panel/logs/ @grafana/observability-logs
 /public/app/plugins/panel/nodeGraph/ @grafana/observability-traces-and-profiling
 /public/app/plugins/panel/traces/ @grafana/observability-traces-and-profiling
 /public/app/plugins/panel/flamegraph/ @grafana/observability-traces-and-profiling
 /public/app/plugins/panel/piechart/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/state-timeline/ @grafana/dataviz-squad
-/public/app/plugins/panel/status-history/ @grafana/dataviz-squad
+/public/app/plugins/panel/state-timeline/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/status-history/ @grafana/grafana-bi-squad
 /public/app/plugins/panel/table/ @grafana/grafana-bi-squad
 /public/app/plugins/panel/table-old/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/timeseries/ @grafana/dataviz-squad
-/public/app/plugins/panel/trend/ @grafana/dataviz-squad
-/public/app/plugins/panel/geomap/ @grafana/dataviz-squad
-/public/app/plugins/panel/canvas/ @grafana/dataviz-squad
-/public/app/plugins/panel/candlestick/ @grafana/dataviz-squad
-/public/app/plugins/panel/live/ @grafana/grafana-app-platform-squad
-/public/app/plugins/panel/news/ @grafana/grafana-frontend-platform
-/public/app/plugins/panel/stat/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/text/ @grafana/grafana-frontend-platform
-/public/app/plugins/panel/welcome/ @grafana/grafana-frontend-platform
-/public/app/plugins/panel/xychart/ @grafana/dataviz-squad
+/public/app/plugins/panel/timeseries/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/geomap/ @grafana/grafana-edge-squad
+/public/app/plugins/panel/canvas/ @grafana/grafana-edge-squad
+/public/app/plugins/panel/candlestick/ @grafana/grafana-edge-squad
+/public/app/plugins/panel/icon/ @grafana/grafana-edge-squad
+/public/app/plugins/panel/live/ @grafana/multitenancy-squad
+/public/app/plugins/panel/news/ @grafana/user-essentials
+/public/app/plugins/panel/stat/ @grafana/user-essentials
+/public/app/plugins/panel/text/ @grafana/user-essentials
+/public/app/plugins/panel/welcome/ @grafana/user-essentials
+/public/app/plugins/panel/xychart/ @grafana/grafana-bi-squad
 /public/app/plugins/sdk.ts @grafana/plugins-platform-frontend
-/public/app/polyfills/old-mediaquerylist.ts @grafana/grafana-frontend-platform
-/public/app/routes/ @grafana/grafana-frontend-platform
-/public/app/store/ @grafana/grafana-frontend-platform
-/public/app/types/ @grafana/grafana-frontend-platform
+/public/app/polyfills/old-mediaquerylist.ts @grafana/user-essentials
+/public/app/routes/ @grafana/user-essentials
+/public/app/store/ @grafana/user-essentials
+/public/app/types/ @grafana/user-essentials
 /public/dashboards/ @grafana/dashboards-squad
 /public/fonts/ @grafana/alerting-squad-frontend
+/public/emails/ @grafana/user-essentials
 /public/gazetteer/ @ryantxu
-/public/img/ @grafana/grafana-frontend-platform
-/public/lib/ @grafana/grafana-frontend-platform
-/public/lib/monaco-languages/kusto.ts @grafana/partner-datasources
+/public/img/ @grafana/user-essentials
+/public/lib/ @grafana/user-essentials
 /public/maps/ @ryantxu
 /public/robots.txt @grafana/frontend-ops
-/public/sass/ @grafana/grafana-frontend-platform
-/public/test/ @grafana/grafana-frontend-platform
-/public/testdata/ @grafana/grafana-frontend-platform
-/public/views/ @grafana/grafana-frontend-platform
+/public/sass/ @grafana/user-essentials
+/public/test/ @grafana/user-essentials
+/public/testdata/ @grafana/user-essentials
+/public/views/ @grafana/user-essentials
 
-/public/app/features/explore/Logs/ @grafana/observability-logs
+/public/app/features/explore/Logs.tsx @grafana/observability-logs
+/public/app/features/explore/LogsContainer.tsx @grafana/observability-logs
 
-/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
 /public/app/features/explore/TraceView/ @grafana/observability-traces-and-profiling
 
 /public/api-merged.json @grafana/backend-platform
+/public/api-spec.json @grafana/backend-platform
 /public/openapi3.json @grafana/backend-platform
 /public/app/angular/ @torkelo
 /public/app/app.ts @grafana/frontend-ops
 /public/app/dev.ts @grafana/frontend-ops
-/public/app/core/utils/metrics.ts @grafana/plugins-platform-frontend
 /public/app/index.ts @grafana/frontend-ops
 /public/app/AppWrapper.tsx @grafana/frontend-ops
-/public/app/partials/ @grafana/grafana-frontend-platform
+/public/app/partials/ @grafana/user-essentials
 
 
 
@@ -471,16 +454,14 @@ lerna.json @grafana/frontend-ops
 /scripts/check-breaking-changes.sh @grafana/plugins-platform-frontend
 /scripts/ci-* @grafana/grafana-delivery
 /scripts/circle-* @grafana/grafana-delivery
-/scripts/publish-npm-packages.sh @grafana/grafana-delivery @grafana/plugins-platform-frontend
-/scripts/validate-npm-packages.sh @grafana/grafana-delivery @grafana/plugins-platform-frontend
-/scripts/ci-frontend-metrics.sh @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
-/scripts/cli/ @grafana/grafana-frontend-platform
+/scripts/ci-frontend-metrics.sh @grafana/user-essentials @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
+/scripts/cli/ @grafana/user-essentials
 /scripts/clean-git-or-error.sh @grafana/grafana-as-code
-/scripts/grafana-server/ @grafana/grafana-frontend-platform
+/scripts/grafana-server/ @grafana/user-essentials
 /scripts/helpers/ @grafana/grafana-delivery
 /scripts/import_many_dashboards.sh @torkelo
 /scripts/mixin-check.sh @bergquist
-/scripts/openapi3/ @grafana/grafana-operator-experience-squad
+/scripts/openapi3/ @grafana/grafana-partnerships-team
 /scripts/prepare-packagejson.js @grafana/frontend-ops
 /scripts/protobuf-check.sh @grafana/plugins-platform-backend
 /scripts/stripnulls.sh @grafana/grafana-as-code
@@ -488,14 +469,15 @@ lerna.json @grafana/frontend-ops
 /scripts/trigger_docker_build.sh @grafana/grafana-delivery
 /scripts/trigger_grafana_packer.sh @grafana/grafana-delivery
 /scripts/trigger_windows_build.sh @grafana/grafana-delivery
+/scripts/validate-devenv-dashboards.sh @grafana/grafana-delivery
 /scripts/verify-repo-update/ @grafana/grafana-delivery
 
 /scripts/webpack/ @grafana/frontend-ops
-/scripts/generate-a11y-report.sh @grafana/grafana-frontend-platform
-.pa11yci.conf.js @grafana/grafana-frontend-platform
-.pa11yci-pr.conf.js @grafana/grafana-frontend-platform
-.betterer.results @grafanabot
-.betterer.ts @grafana/grafana-frontend-platform
+/scripts/generate-a11y-report.sh @grafana/user-essentials
+.pa11yci.conf.js @grafana/user-essentials
+.pa11yci-pr.conf.js @grafana/user-essentials
+.betterer.results @joshhunt
+.betterer.ts @joshhunt
 
 # @grafana/ui component documentation
 *.mdx @grafana/plugins-platform-frontend
@@ -505,11 +487,11 @@ lerna.json @grafana/frontend-ops
 
 # Core datasources
 /public/app/plugins/datasource/dashboard/ @grafana/dashboards-squad
-/public/app/plugins/datasource/cloudwatch/ @grafana/aws-datasources
+/public/app/plugins/datasource/cloudwatch/ @grafana/aws-plugins
 /public/app/plugins/datasource/elasticsearch/ @grafana/observability-logs
-/public/app/plugins/datasource/grafana/ @grafana/grafana-frontend-platform
+/public/app/plugins/datasource/grafana/ @grafana/user-essentials
 /public/app/plugins/datasource/testdata/ @grafana/plugins-platform-frontend
-/public/app/plugins/datasource/azuremonitor/ @grafana/partner-datasources
+/public/app/plugins/datasource/grafana-azure-monitor-datasource/ @grafana/partner-plugins
 /public/app/plugins/datasource/graphite/ @grafana/observability-metrics
 /public/app/plugins/datasource/influxdb/ @grafana/observability-metrics
 /public/app/plugins/datasource/jaeger/ @grafana/observability-traces-and-profiling
@@ -517,13 +499,13 @@ lerna.json @grafana/frontend-ops
 /public/app/plugins/datasource/mixed/ @grafana/dashboards-squad
 /public/app/plugins/datasource/mssql/ @grafana/grafana-bi-squad
 /public/app/plugins/datasource/mysql/ @grafana/grafana-bi-squad
-/public/app/plugins/datasource/opentsdb/ @grafana/observability-metrics
+/public/app/plugins/datasource/opentsdb/ @grafana/backend-platform
 /public/app/plugins/datasource/postgres/ @grafana/grafana-bi-squad
 /public/app/plugins/datasource/prometheus/ @grafana/observability-metrics
-/public/app/plugins/datasource/cloud-monitoring/ @grafana/partner-datasources
+/public/app/plugins/datasource/cloud-monitoring/ @grafana/partner-plugins
 /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/phlare/ @grafana/observability-traces-and-profiling
 /public/app/plugins/datasource/parca/ @grafana/observability-traces-and-profiling
 /public/app/plugins/datasource/alertmanager/ @grafana/alerting-squad
 
@@ -536,29 +518,26 @@ lerna.json @grafana/frontend-ops
 # Grafana authentication and authorization
 /pkg/login/ @grafana/grafana-authnz-team
 /pkg/services/accesscontrol/ @grafana/grafana-authnz-team
-/pkg/services/anonymous/ @grafana/grafana-authnz-team
 /pkg/services/auth/ @grafana/grafana-authnz-team
-/pkg/services/authn/ @grafana/grafana-authnz-team
-/pkg/services/signingkeys/ @grafana/grafana-authnz-team
 /pkg/services/dashboards/accesscontrol.go @grafana/grafana-authnz-team
 /pkg/services/datasources/permissions/ @grafana/grafana-authnz-team
 /pkg/services/guardian/ @grafana/grafana-authnz-team
 /pkg/services/ldap/ @grafana/grafana-authnz-team
 /pkg/services/login/ @grafana/grafana-authnz-team
-/pkg/services/loginattempt/ @grafana/grafana-authnz-team
-/pkg/services/oauthserver/ @grafana/grafana-authnz-team
+/pkg/services/multildap/ @grafana/grafana-authnz-team
 /pkg/services/oauthtoken/ @grafana/grafana-authnz-team
+/pkg/services/teamguardian/ @grafana/grafana-authnz-team
 /pkg/services/serviceaccounts/ @grafana/grafana-authnz-team
+/pkg/services/loginattempt/ @grafana/grafana-authnz-team
+/pkg/services/authn/ @grafana/grafana-authnz-team
 
 # Support bundles
 /public/app/features/support-bundles/ @grafana/grafana-authnz-team
 /pkg/services/supportbundles/ @grafana/grafana-authnz-team
 
-# Grafana Operator Experience Team
-/pkg/infra/httpclient/httpclientprovider/sigv4_middleware.go @grafana/grafana-operator-experience-squad
-/pkg/infra/httpclient/httpclientprovider/sigv4_middleware_test.go @grafana/grafana-operator-experience-squad
-/pkg/services/caching/ @grafana/grafana-operator-experience-squad
-/pkg/services/featuremgmt/ @grafana/grafana-operator-experience-squad
+# Grafana Partnerships Team
+/pkg/infra/httpclient/httpclientprovider/sigv4_middleware.go @grafana/grafana-partnerships-team
+/pkg/infra/httpclient/httpclientprovider/sigv4_middleware_test.go @grafana/grafana-partnerships-team
 
 # Kind definitions
 /kinds/dashboard @grafana/dashboards-squad
@@ -570,6 +549,8 @@ embed.go @grafana/grafana-as-code
 /pkg/cuectx/ @grafana/grafana-as-code
 /pkg/registry/ @grafana/grafana-as-code
 /pkg/codegen/ @grafana/grafana-as-code
+/pkg/kindsys/ @grafana/grafana-as-code
+/pkg/kindsys/kindcat_custom.cue @grafana/cloud-app-platform-squad
 /pkg/kinds/*/*_gen.go @grafana/grafana-as-code
 /pkg/registry/corekind/ @grafana/grafana-as-code
 /public/app/plugins/*gen.go @grafana/grafana-as-code
@@ -582,7 +563,6 @@ embed.go @grafana/grafana-as-code
 /.github/bot.md @torkelo
 /.github/commands.json @torkelo
 /.github/dependabot.yml @grafana/frontend-ops
-/.github/issue-opened.json @grafana/grafana-community-support
 /.github/metrics-collector.json @torkelo
 /.github/pr-checks.json @marefr
 /.github/pr-commands.json @marefr
@@ -591,7 +571,7 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/backport.yml @grafana/grafana-delivery
 /.github/workflows/bump-version.yml @grafana/grafana-delivery
 /.github/workflows/close-milestone.yml @grafana/grafana-delivery
-/.github/workflows/cloud-data-sources-code-coverage.yml @grafana/partner-datasources @grafana/aws-datasources
+/.github/workflows/cloud-data-sources-code-coverage.yml @grafana/partner-plugins @grafana/aws-plugins
 /.github/workflows/codeowners-validator.yml @tolzhabayev
 /.github/workflows/codeql-analysis.yml @DanCech
 /.github/workflows/commands.yml @torkelo
@@ -600,7 +580,6 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/epic-add-to-platform-ux-parent-project.yml @meanmina
 /.github/workflows/github-release.yml @torkelo
 /.github/workflows/issue-labeled.yml @armandgrillet
-/.github/workflows/issue-opened.yml @grafana/grafana-community-support
 /.github/workflows/metrics-collector.yml @torkelo
 /.github/workflows/milestone.yml @marefr
 /.github/workflows/ox-code-coverage.yml @grafana/explore-squad
@@ -612,21 +591,14 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/pr-commands.yml @marefr
 /.github/workflows/publish-technical-documentation-next.yml @grafana/docs-grafana
 /.github/workflows/publish-technical-documentation-release.yml @grafana/docs-grafana
-/.github/workflows/remove-milestone.yml @grafana/grafana-frontend-platform
+/.github/workflows/remove-milestone.yml @grafana/user-essentials
 /.github/workflows/sbom-report.yml @grafana/security-team
 /.github/workflows/scripts/json-file-to-job-output.js @grafana/plugins-platform-frontend
 /.github/workflows/scripts/pr-get-job-link.js @grafana/plugins-platform-frontend
-/.github/workflows/stale.yml @grafana/grafana-frontend-platform
+/.github/workflows/stale.yml @grafana/user-essentials
 /.github/workflows/update-changelog.yml @grafana/grafana-delivery
 /.github/workflows/snyk.yml @grafana/security-team
 
-# Generated files not requiring owner approval
-/packages/grafana-data/src/types/featureToggles.gen.ts @grafanabot
-/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @grafanabot
-/pkg/services/featuremgmt/toggles_gen.csv @grafanabot
-/pkg/services/featuremgmt/toggles_gen.go @grafanabot
-/public/emails/ @grafanabot
-
 # Conf
 /conf/defaults.ini @torkelo
 /conf/sample.ini @torkelo

.github/ISSUE_TEMPLATE/0-bug-report.yaml

@@ -1,177 +0,0 @@
-name: New Bug Report
-description: File a bug report
-title: "Product-Area-Here: short description of bug here"
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-
-        Please try to give your issue a good title. Try using the product-area where you are having an issue and a brief description of the problem. Like this: 
-        - `Dashboards: Template Variables break when I do X` or 
-        - `Alerting: message templating plus Slack channel breaks when I do X`
-  - type: markdown
-    attributes:
-      value: |
-        **HINT:** Have you tried [searching](https://github.com/grafana/grafana/issues) for similar issues? Duplicate issues are common.
-
-        **Are you reporting a security vulnerability?** [Submit it here instead](https://github.com/grafana/grafana/security/policy).
-  - type: markdown
-    attributes:
-      value: |
-       #
-  - type: textarea
-    id: bug-describe
-    attributes:
-      label: |
-        
-        # What went wrong?
-        
-      description: |
-        #
-        Describe your bug. What happened? What did you expect to happen?
-
-        **Hot Tip:** Record your screen and add it here as a gif. 
-      placeholder: Tell us what you see!
-      value: |
-        **What happened**:
-
-          - 
-
-        **What did you expect to happen**:
-
-          - 
-
-    validations:
-      required: true
-  - type: markdown
-    attributes:
-      value: |
-       #
-  - type: textarea
-    id: bug-repro
-    attributes:
-      label: |
-        
-        # How do we reproduce it?
-        
-      description: |
-        #
-
-        Whenever possible, please provide **detailed** steps for reproducing your bug.
-
-        **This is very helpful info** 
-      placeholder: "Step 1:..."
-      value: |
-        **Step 1**:
-        
-        - Open Grafana and do X 
-
-        **Step 2**:
-
-        - Now click button Y
-
-        **Step 3**:
-
-        - Wait for the browser to crash. Error message says: "Error..."
-    validations:
-      required: true
-  - type: markdown
-    attributes:
-      value: |
-       #
-  - type: input
-    id: gf-version
-    attributes:
-      label: |
-        
-        # What Grafana version are you using?
-        
-      description: |
-        #
-        - [How do I find my Grafana version info?](https://community.grafana.com/t/how-to-find-your-grafana-version-info-3-different-ways/86857)
-      placeholder: "ex: v9.5.0, or v9.5.0-cloud.5.a016665c (b2a5d45589)"
-    validations:
-      required: true  
-  - type: markdown
-    attributes:
-      value: |
-        #
-        #
-        # Optional Questions:
-        #
-  - type: textarea
-    id: get-help
-    attributes:
-      label: |
-        
-        ## Optional Questions:
-        
-        ### Is the bug inside a Dashboard Panel?
-
-      description: |
-        If the bug appears inside a [dashboard panel](https://grafana.com/docs/grafana/latest/panels-visualizations/#panels-and-visualizations), please use the ["Get-Help" feature](https://grafana.com/docs/grafana/latest/troubleshooting/send-panel-to-grafana-support/). Select **copy to clipboard** and paste the data below.
-        No need for backticks--this text will get formatted as a code-block.
-
-        What's a [dashboard panel](https://grafana.com/docs/grafana/latest/panels-visualizations/#panels-and-visualizations)?
-      placeholder: Copy "get-help" data here
-      value: Copy the panel's ["get-help" data](https://grafana.com/docs/grafana/latest/troubleshooting/send-panel-to-grafana-support/) here  
-  - type: dropdown
-    id: gf-deployment
-    attributes:
-      label: Grafana Platform?
-      description: |
-        **How** are you running/deploying Grafana?
-      options:
-        - I use Grafana Cloud
-        - Docker
-        - Kubernetes
-        - A package manager (APT, YUM, BREW, etc.)
-        - A downloaded binary
-        - Other
-        - I don't know
-    validations:
-      required: false
-  - type: input
-    id: user-os
-    attributes:
-      label: User's OS?
-      description: What operating system are you running locally?
-      placeholder: "ex. MacOS Big Sur 11.7, or Ubuntu 20.04..."
-  - type: input
-    id: user-browser
-    attributes:
-      label: User's Browser?
-      description: Is the bug occuring in Grafana's user-interface? If so, what browsers are you seeing the problem on? You may choose more than one.
-      placeholder: "ex. Google Chrome Version 112.0.5615.137 (Official Build) (arm64)..."
-  - type: dropdown
-    id: regression
-    attributes:
-      label: Is this a Regression?
-      description: |
-        A regression means that the feature was working, then you upgraded, and now it's broken.
-      options:
-        - 'No'
-        - 'Yes'
-    validations:
-      required: false
-  - type: input
-    id: gf-datasource
-    attributes:
-      label: Are Datasources involved?
-      description: |
-        Is this issue specific to a datasource plugin / plugins? Please list all that apply:
-      placeholder: "ex. Elasticsearch 5.0.0 or Infinity 1.4.1 ..."
-  - type: markdown
-    attributes:
-      value: |
-        #
-        #
-        ## Anything else to add?
-        #
-  - type: textarea
-    id: extra
-    attributes:
-      label: |
-              Anything else to add?
-      description: Add any extra information here

.github/ISSUE_TEMPLATE/1-bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Report a bug you found when using Grafana
+labels: 'type: bug'
+---
+
+<!--
+Please use this template to create your bug report. By providing as much info as possible you help us understand the issue, reproduce it and resolve it for you quicker. Therefore take a couple of extra minutes to make sure you have provided all info needed.
+
+PROTIP: record your screen and attach it as a gif to showcase the issue.
+
+- 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 happened**:
+
+**What you expected to happen**:
+
+**How to reproduce it (as minimally and precisely as possible)**:
+
+**Anything else we need to know?**:
+
+**Environment**:
+- Grafana version:
+- Data source type & version:
+- OS Grafana is installed on:
+- User OS & Browser:
+- Grafana plugins:
+- Others:

.github/ISSUE_TEMPLATE/1-staff_issues.md

@@ -1,5 +0,0 @@
----
-name: Staff Issues
-about: Blank issue for Grafana staff members
-labels: 'internal'
----

.github/ISSUE_TEMPLATE/5-chore.md

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

.github/ISSUE_TEMPLATE/8-Saga_contribution.yaml

@@ -1,65 +0,0 @@
----
-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/ISSUE_TEMPLATE/config.yml

@@ -2,7 +2,7 @@ blank_issues_enabled: false
 contact_links:
   - name: Feature Request
     url: https://github.com/grafana/grafana/discussions/new
-    about: Discuss ideas for new features or enhancements
+    about: Discuss ideas for new features of changes
   - name: Questions & Help
     url: https://community.grafana.com
     about: Please ask and answer questions here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,23 +14,11 @@ Thank you for sending a pull request! Here are some tips:
 
 6. Name your PR as "<FeatureArea>: Describe your change", e.g. Alerting: Prevent race condition. If it's a fix or feature relevant for the changelog describe the user impact in the title. The PR title is used to auto-generate the changelog for issues marked with the "add to changelog" label.
 
-7. If your PR content should be added to the What's New document for the next major or minor release, add the **add to what's new** label to your PR. Note that you should add this label to the main PR that introduces the feature; do not add this label to smaller PRs for the feature.
-
 -->
 
-**What is this feature?**
+**What this PR does / why we need it**:
 
-[Add a brief description of what the feature or update does.]
-
-**Why do we need this feature?**
-
-[Add a description of the problem the feature is trying to solve.]
-
-**Who is this feature for?**
-
-[Add information on what kind of user the feature is for.]
-
-**Which issue(s) does this PR fix?**:
+**Which issue(s) this PR fixes**:
 
 <!--
 
@@ -42,9 +30,5 @@ Usage: "Fixes #<issue number>", or "Fixes (paste link of issue)"
 
 Fixes #
 
-**Special notes for your reviewer:**
+**Special notes for your reviewer**:
 
-Please check that:
-- [ ] It works as expected from a user's perspective.
-- [ ] If this is a pre-GA feature, it is behind a feature toggle.
-- [ ] The docs are updated, and if this is a [notable improvement](https://grafana.com/docs/writers-toolkit/writing-guide/contribute-release-notes/#how-to-determine-if-content-belongs-in-a-whats-new-document), it's added to our [What's New](https://grafana.com/docs/writers-toolkit/writing-guide/contribute-release-notes/) doc.

.github/bot.md

@@ -23,7 +23,7 @@ Metrics are configured in [metrics-collector.json](https://github.com/grafana/gr
 ## Backport PR
 
 To automatically backport a PR to a release branch like v7.3.x add a label named `backport v7.3.x`. The label name should follow the pattern `backport <branch-name>`. Once merged grafanabot will automatically 
-try to cherry-pick the PR merge commit into that branch and open a PR. You must then add the milestone to your backport PR.
+try to cherry-pick the PR merge commit into that branch and open a PR. It will sync the milestone with the source PR so make sure the source PR also is assigned the milestone for the patch release. If the PR is already merged you can still add this label and trigger the backport automation. 
 
 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. 
 

.github/commands.json

@@ -11,7 +11,7 @@
     "type":"comment",
     "name":"duplicate",
     "allowUsers":[],
-    "action":"close",
+    "action":"updateLabels",
     "addLabel":"type/duplicate"
   },
   {
@@ -51,6 +51,14 @@
     "addLabel":"not implemented",
     "comment":"This feature request has been open for a long time with few received upvotes or comments, so we are closing it. We're trying to limit open GitHub issues in order to better track planned work and features.  \r\n\r\nThis doesn't mean that we'll never ever implement it or that we will never accept a PR for it. A closed issue can still attract upvotes and act as a ticket to track feature demand\/interest. \r\n\r\nThank You to you for taking the time to create this issue!"
   },
+  {
+    "type":"label",
+    "name":"oss-user-essentials",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/78"
+    }
+  },
   {
     "type":"label",
     "name":"area/plugins-catalog",
@@ -147,22 +155,6 @@
       "url":"https://github.com/orgs/grafana/projects/221"
     }
   },
-  {
-    "type":"label",
-    "name":"datasource/Phlare",
-    "action":"addToProject",
-    "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/221"
-    }
-  },
-  {
-    "type":"label",
-    "name":"datasource/Parca",
-    "action":"addToProject",
-    "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/221"
-    }
-  },
   {
     "type":"label",
     "name":"datasource/Elasticsearch",
@@ -195,12 +187,28 @@
       "url":"https://github.com/orgs/grafana/projects/111"
     }
   },
+  {
+    "type":"label",
+    "name":"oss-user-essentials",
+    "action":"removeFromProject",
+    "removeFromProject":{
+      "url":"https://github.com/orgs/grafana/projects/78"
+    }
+  },
+  {
+    "type":"label",
+    "name":"oss-user-essentials",
+    "action":"removeFromProject",
+    "removeFromProject":{
+      "url":"https://github.com/grafana/grafana/projects/33"
+    }
+  },
   {
     "type": "label",
-    "name": "team/operator-experience",
+    "name": "team/grafana-partners",
     "action": "addToProject",
     "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/336"
+      "url": "https://github.com/orgs/grafana/projects/87"
     }
   },
   {
@@ -290,157 +298,5 @@
     "addToProject": {
       "url": "https://github.com/orgs/grafana/projects/86"
     }
-  },
-  {
-    "type": "label",
-    "name": "area/internationalization",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/78"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/candlestick",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/canvas",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/barchart",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/bargauge",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/72"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/gauge",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/72"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/geomap",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/graph",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/heatmap",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/histogram",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/icon",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/piechart",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/72"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/stat",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/72"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/state-timeline",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/status-history",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/timeseries",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/xychart",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/trend",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/panel/table",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/72"
-    }
   }
 ]

.github/issue-opened.json

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

.github/metrics-collector.json

@@ -2,23 +2,23 @@
   "queries": [
     {
       "name": "type_bug",
-      "query": "label:\"type/bug\" is:issue is:open"
+      "query": "label:\"type/bug\" is:open"
     },
     {
       "name": "type_docs",
-      "query": "label:\"type/docs\" is:issue is:open"
+      "query": "label:\"type/docs\" is:open"
     },
     {
       "name": "needs_investigation",
-      "query": "label:\"needs investigation\" is:issue is:open"
+      "query": "label:\"needs investigation\" is:open"
     },
     {
       "name": "needs_more_info",
-      "query": "label:\"needs more info\" is:issue is:open"
+      "query": "label:\"needs more info\" is:open"
     },
     {
       "name": "triage_needs_confirmation",
-      "query": "label:\"triage/needs-confirmation\" is:issue is:open"
+      "query": "label:\"triage/needs-confirmation\" is:open"
     },
     {
       "name": "unlabeled",
@@ -26,7 +26,7 @@
     },
     {
       "name": "open_prs",
-      "query": "is:open is:pull-request"
+      "query": "is:open is:pr"
     }
   ]
 }

.github/pr-commands.json

@@ -83,13 +83,13 @@
   },
   {
     "type": "changedfiles",
-    "matches": [ "public/app/plugins/datasource/azuremonitor/**/*", "pkg/tsdb/azuremonitor/**/*"],
+    "matches": [ "public/app/plugins/datasource/grafana-azure-monitor-datasource/**/*", "pkg/tsdb/azuremonitor/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/Azure"
   },
   {
     "type": "changedfiles",
-    "matches": [ "public/app/plugins/datasource/cloud-monitoring/**/*", "pkg/tsdb/cloud-monitoring/**/*"],
+    "matches": [ "public/app/plugins/datasource/cloud-monitoring/**/*", "pkg/tsdb/cloudmonitoring/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/GoogleCloudMonitoring"
   },
@@ -190,209 +190,5 @@
     "ignoreList": ["renovate[bot]","dependabot[bot]"],
     "action": "updateLabel",
     "addLabel": "pr/external"
-  },
-  {
-    "type":"label",
-    "name":"type/docs",
-    "action":"addToProject",
-    "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/69"
-    }
-  },
-  {
-    "type": "changedfiles",
-    "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/**/*"],
-    "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/**/*"],
-    "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/**/*"],
-    "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/**/*"],
-    "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/**/*"],
-    "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/**/*"],
-    "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/**/*"],
-    "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/**/*"],
-    "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/**/*"],
-    "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/**/*"],
-    "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/**/*"],
-    "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/**/*"],
-    "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/**/*" ],
-    "action": "updateLabel",
-    "addLabel": "area/tooltip"
-  },
-  {
-    "type": "label",
-    "name": "area/tooltip",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
   }
 ]

.github/renovate.json5

@@ -5,19 +5,38 @@
   "enabledManagers": ["npm"],
   "ignoreDeps": [
     "@types/systemjs",
+    "@types/d3-force", // we should bump this once we move to esm modules
+    "@types/d3-interpolate", // we should bump this once we move to esm modules
+    "@types/d3-scale-chromatic", // we should bump this once we move to esm modules
+    "@types/react-icons", // jaeger-ui-components is being refactored to use @grafana/ui icons instead
     "commander", // we are planning to remove this, so no need to update it
+    "d3",
+    "d3-force", // we should bump this once we move to esm modules
+    "d3-interpolate", // we should bump this once we move to esm modules
+    "d3-scale-chromatic", // we should bump this once we move to esm modules
     "execa", // we should bump this once we move to esm modules
     "history", // we should bump this together with react-router-dom
     "@mdx-js/react", // storybook peer-depends on its 1.x version, we should upgrade this when we upgrade storybook
     "monaco-editor", // due to us exposing this via @grafana/ui/CodeEditor's props bumping can break plugins
+    "node-fetch", // we should bump this once we move to esm modules
     "react-hook-form", // due to us exposing these hooks via @grafana/ui form components bumping can break plugins
+    "react-icons", // jaeger-ui-components is being refactored to use @grafana/ui icons instead
     "react-redux", // react-beautiful-dnd depends on react-redux 7.x, we need to update that one first
     "react-router-dom", // we should bump this together with history
     "systemjs",
+    "copy-webpack-plugin", // try to upgrade with newer yarn release. Not working with 3.1.1
     "ts-loader", // we should remove ts-loader and use babel-loader instead
     "ora", // we should bump this once we move to esm modules
+
+    // dep updates blocked by React 18
+    "@testing-library/react",
+    "@types/react",
+    "@types/react-dom",
+    "@types/react-test-renderer",
+    "react",
+    "react-dom",
+    "react-test-renderer"
   ],
-  "includePaths": ["package.json", "packages/**"],
   "ignorePaths": ["packages/grafana-toolkit/package.json", "emails/**", "plugins-bundled/**", "**/mocks/**"],
   "labels": ["area/frontend", "dependencies", "no-backport", "no-changelog"],
   "packageRules": [
@@ -31,57 +50,12 @@
       "matchPackagePatterns": ["@storybook"],
       "extends": ["schedule:monthly"],
       "groupName": "Storybook updates"
-    },
-    {
-      "groupName": "React Aria",
-      "matchPackagePrefixes": [
-        "@react-aria/",
-        "@react-stately/"
-      ]
-    },
-    {
-      "groupName": "Moveable",
-      "matchPackageNames": [
-        "moveable",
-        "react-moveable"
-      ]
-    },
-    {
-      "groupName": "Slate",
-      "matchPackageNames": [
-        "@types/slate",
-        "@types/slate-react",
-        "slate",
-        "slate-react"
-      ]
-    },
-    {
-      "groupName": "d3",
-      "matchPackagePrefixes": [
-        "d3",
-        "@types/d3"
-      ]
-    },
-    {
-      "groupName": "visx",
-      "matchPackagePrefixes": [
-        "@visx/"
-      ]
-    },
-    {
-      "groupName": "uLibraries",
-      "matchPackageNames": [
-        "@leeoniya/ufuzzy",
-        "uplot"
-      ],
-      "reviewers": ["leeoniya"],
-    },
+    }
   ],
   "pin": {
     "enabled": false
   },
   "prConcurrentLimit": 10,
-  "rebaseWhen": "conflicted",
   "reviewers": ["team:grafana/frontend-ops"],
   "separateMajorMinor": false,
   "vulnerabilityAlerts": {

.github/teams.yml

@@ -7,5 +7,5 @@ test:
 
 # Alerting team
 area/alerting:
-  channel-label: C028MCV4R7C
-  exclude-github-team: alerting-squad
+  github-board: 52
+  channel-label: C02B9MXQE0J

.github/workflows/bump-version.yml

@@ -3,8 +3,19 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch, major.minor.patch-preview or major.minor.patch-preview<number> format. example: 7.4.3, 7.4.3-preview or 7.4.3-preview1'
+        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
         required: true
+  workflow_call:
+    inputs:
+      version_call:
+        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
+        required: true
+        type: string
+    secrets:
+        token:
+          required: true
+        metricsWriteAPIKey:
+          required: true
 env:
     YARN_ENABLE_IMMUTABLE_INSTALLS: false
 jobs:
@@ -17,26 +28,26 @@ jobs:
         id: regex-match
         with:
           text: ${{ github.event.inputs.version }}
-          regex: '^(\d+.\d+).\d+(?:-(?:(preview\d?)|(pre)))?$'
+          regex: '^(\d+.\d+).\d+(?:-beta.\d+)?$'
       - uses: actions-ecosystem/action-regex-match@v2.0.2
         if: ${{ inputs.version_call != '' }}
         id: regex-match-version-call
         with:
           text: ${{ inputs.version_call }}
-          regex: '^(\d+.\d+).\d+(?:-(?:(preview\d?)|(pre)))?$'
+          regex: '^(\d+.\d+).\d+(?:-beta\d+)?$'
       - name: Validate input version
         if: ${{ steps.regex-match.outputs.match == '' && github.event.inputs.version != '' }}
         run: |
           echo "The input version format is not correct, please respect:\
-          major.minor.patch, major.minor.patch-preview or major.minor.patch-preview<number> format. \
-          example: 7.4.3, 7.4.3-preview or 7.4.3-preview1"
+          major.minor.patch or major.minor.patch-beta.number format. \
+          example: 7.4.3 or 7.4.3-beta.1"
           exit 1
       - name: Validate input version call
         if: ${{ inputs.version_call != '' && steps.regex-match-version-call.outputs.match == '' }}
         run: |
           echo "The input version format is not correct, please respect:\
-          major.minor.patch, major.minor.patch-preview or major.minor.patch-preview<number> format. \
-          example: 7.4.3, 7.4.3-preview or 7.4.3-preview1"
+          major.minor.patch or major.minor.patch-beta<number> format. \
+          example: 7.4.3 or 7.4.3-beta1"
           exit 1
 
       - uses: actions/checkout@v3
@@ -44,13 +55,13 @@ jobs:
       - name: Set intermedia variables
         id: intermedia
         run: |
-          echo "short_ref=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
-          echo "check_passed=false" >> $GITHUB_OUTPUT
-          echo "branch_name=v${{steps.regex-match.outputs.group1}}" >> $GITHUB_OUTPUT
-          echo "branch_exist=$(git ls-remote --heads https://github.com/grafana/grafana.git v${{ steps.regex-match.outputs.group1 }}.x | wc -l)" >> $GITHUB_OUTPUT
+          echo "::set-output name=short_ref::${GITHUB_REF#refs/*/}"
+          echo "::set-output name=check_passed::false"
+          echo "::set-output name=branch_name::v${{steps.regex-match.outputs.group1}}"
+          echo "::set-output name=branch_exist::$(git ls-remote --heads https://github.com/grafana/grafana.git v${{ steps.regex-match.outputs.group1 }}.x | wc -l)"
 
       - name: Check input version is aligned with branch(main)
-        if: ${{ github.event.inputs.version != '' && steps.intermedia.outputs.branch_exist == '0' && !contains(github.event.inputs.version, 'pre') && !contains(steps.intermedia.outputs.short_ref, 'main') }}
+        if: ${{ github.event.inputs.version != '' && steps.intermedia.outputs.branch_exist == '0' && !contains(steps.intermedia.outputs.short_ref, 'main') }}
         run: |
           echo "When you want to deliver a new new minor version, you might want to create a new branch first \
           with naming convention v[major].[minor].x, and just run the workflow on that branch. \
@@ -63,13 +74,21 @@ jobs:
           repository: "grafana/grafana-github-actions"
           path: ./actions
           ref: main
-      - uses: actions/setup-node@v3.5.1
+      - uses: actions/setup-node@v3.4.0
         with:
           node-version: '16'
       - name: Install Actions
         run: npm install --production --prefix ./actions
       - name: Run bump version (manually invoked)
+        if: ${{ github.event.inputs.version != '' }}
         uses: ./actions/bump-version
         with:
           token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
           metricsWriteAPIKey: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
+      - name: Run bump version (workflow invoked)
+        if: ${{ inputs.version_call != '' }}
+        uses: ./actions/bump-version
+        with:
+          version_call: ${{ inputs.version_call }}
+          token: ${{ secrets.token }}
+          metricsWriteAPIKey: ${{ secrets.metricsWriteAPIKey }}

.github/workflows/cloud-data-sources-code-coverage.yml

@@ -3,8 +3,10 @@ on:
   pull_request:
     paths:
       - 'pkg/tsdb/azuremonitor/**'
-      - 'pkg/tsdb/cloud-monitoring/**'
-      - 'public/app/plugins/datasource/azuremonitor/**'
+      - 'pkg/tsdb/cloudwatch/**'
+      - 'pkg/tsdb/cloudmonitoring/**'
+      - 'public/app/plugins/datasource/grafana-azure-monitor-datasource/**'
+      - 'public/app/plugins/datasource/cloudwatch/**'
       - 'public/app/plugins/datasource/cloud-monitoring/**'
     branches-ignore:
       - dependabot/**
@@ -12,7 +14,7 @@ on:
 
 jobs:
   workflow-call:
-    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.19
+    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.12
     with:
-      frontend-path-regexp: public\/app\/plugins\/datasource\/(azuremonitor|cloud-monitoring)
-      backend-path-regexp: pkg\/tsdb\/(azuremonitor|cloud-monitoring)
+      frontend-path-regexp: public\/app\/plugins\/datasource\/(grafana-azure-monitor-datasource|cloud-monitoring|cloudwatch)
+      backend-path-regexp: pkg\/tsdb\/(azuremonitor|cloudmonitoring|cloudwatch)

.github/workflows/codeowners-validator.yml

@@ -1,38 +0,0 @@
-name: "Codeowners Validator"
-
-on:
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  codeowners-validator:
-    runs-on: ubuntu-latest
-    steps:
-      # Checks-out your repository, which is validated in the next step
-      - uses: actions/checkout@v2
-      - name: GitHub CODEOWNERS Validator
-        uses: mszostok/codeowners-validator@v0.7.4
-        # input parameters
-        with:
-          # ==== GitHub Auth ====
-
-          # "The list of checks that will be executed. By default, all checks are executed. Possible values: files,owners,duppatterns,syntax"
-          checks: "files,duppatterns,syntax"
-
-          # "The comma-separated list of experimental checks that should be executed. By default, all experimental checks are turned off. Possible values: notowned,avoid-shadowing"
-          experimental_checks: "notowned,avoid-shadowing"
-          
-          # The repository path in which CODEOWNERS file should be validated."
-          repository_path: "."
-
-          # Defines the level on which the application should treat check issues as failures. Defaults to warning, which treats both errors and warnings as failures, and exits with error code 3. Possible values are error and warning. Default: warning"
-          check_failure_level: "error"
-
-          # The comma-separated list of patterns that should be ignored by not-owned-checker. For example, you can specify * and as a result, the * pattern from the CODEOWNERS file will be ignored and files owned by this pattern will be reported as unowned unless a later specific pattern will match that path. It's useful because often we have default owners entry at the begging of the CODOEWNERS file, e.g. * @global-owner1 @global-owner2"
-          not_owned_checker_skip_patterns: ""
-
-          # Specifies whether CODEOWNERS may have unowned files. For example, `/infra/oncall-rotator/oncall-config.yml` doesn't have owner and this is not reported.
-          owner_checker_allow_unowned_patterns: "false"
-
-          # Specifies whether only teams are allowed as owners of files.
-          owner_checker_owners_must_be_teams: "false"          

.github/workflows/codeql-analysis.yml

@@ -42,9 +42,9 @@ jobs:
 
     - if: matrix.language == 'go'
       name: Set go version
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v3
       with:
-        go-version: '1.20.4'
+        go-version: '1.19.2'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/commands.yml

@@ -22,5 +22,5 @@ jobs:
         uses: ./actions/commands
         with:
           metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
-          token: ${{secrets.ISSUE_COMMANDS_TOKEN}}
+          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
           configPath: commands

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

@@ -1,6 +1,3 @@
-# Only runs if anything under the packages/ directory changes. 
-# (Otherwise detect-breaking-changes-build-skip.yml takes over)
-
 name: Levitate / Detect breaking changes
 
 on: 
@@ -22,16 +19,16 @@ jobs:
     - uses: actions/checkout@v3
       with:
         path: './pr'
-    - uses: actions/setup-node@v3.5.1
+    - uses: actions/setup-node@v3
       with:
         node-version: 16.16.0
 
     - name: Get yarn cache directory path
       id: yarn-cache-dir-path
-      run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+      run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
 
     - name: Restore yarn cache
-      uses: actions/cache@v3.3.1
+      uses: actions/cache@v2
       id: yarn-cache
       with:
         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -70,16 +67,16 @@ jobs:
         path: './base'
         ref: ${{ github.event.pull_request.base.ref }}
 
-    - uses: actions/setup-node@v3.5.1
+    - uses: actions/setup-node@v3
       with:
         node-version: 16.16.0
 
     - name: Get yarn cache directory path
       id: yarn-cache-dir-path
-      run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+      run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
 
     - name: Restore yarn cache
-      uses: actions/cache@v3.3.1
+      uses: actions/cache@v2
       id: yarn-cache
       with:
         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -110,7 +107,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: ['buildPR', 'buildBase']
     env:
-      GITHUB_STEP_NUMBER: 8
+      GITHUB_STEP_NUMBER: 7
 
     steps:
       - uses: actions/checkout@v3
@@ -136,9 +133,8 @@ jobs:
         uses: actions/github-script@v6
         with:
           script: |
-              const name = 'Detect breaking changes';
               const script = require('./.github/workflows/scripts/pr-get-job-link.js')
-              await script({name, github, context, core})
+              await script({github, context, core})
 
       - name: Detect breaking changes
         id: breaking-changes

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

@@ -10,13 +10,12 @@ jobs:
     name: Report
     runs-on: ubuntu-latest
     env:
-      ARTIFACT_NAME: 'levitate' # The name of the artifact that we would like to download
-      ARTIFACT_FOLDER: '${{ github.workspace }}/tmp' # The name of the folder where we will download the artifact to
+      ARTIFACT_FOLDER: '${{ github.workspace }}/tmp'
+      ARTIFACT_NAME: 'levitate'
 
     steps:
     - uses: actions/checkout@v3
-
-    # Download artifact (as a .zip archive)
+    
     - name: 'Download artifact'
       uses: actions/github-script@v6
       env:
@@ -50,12 +49,9 @@ jobs:
           fs.mkdirSync(artifactFolder, { recursive: true });
           fs.writeFileSync(`${ artifactFolder }/${ artifactName }.zip`, Buffer.from(download.data));
         
-    # Unzip artifact
     - name: Unzip artifact
       run: unzip "${ARTIFACT_FOLDER}/${ARTIFACT_NAME}.zip" -d "${ARTIFACT_FOLDER}"
     
-     # Parse the artifact and register fields as step output variables
-      # (All fields in the JSON will be available as ${{ steps.levitate-run.outputs.<field-name> }}
     - name: Parsing levitate result
       uses: actions/github-script@v6
       id: levitate-run
@@ -65,15 +61,8 @@ jobs:
           const script = require('./.github/workflows/scripts/json-file-to-job-output.js');
           await script({ core, filePath });
 
-    # Skip - print a message if the "Detect" workflow was skipped
-    - name: Check if the workflow should be skipped
-      if: steps.levitate-run.outputs.shouldSkip == 'true'
-      run: echo "Skipping."
-
-    # Check if label exists
     - name: Check if "levitate breaking change" label exists
       id: does-label-exist
-      if: steps.levitate-run.outputs.shouldSkip != 'true'
       uses: actions/github-script@v6
       env:
         PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }}
@@ -89,9 +78,8 @@ jobs:
 
           return doesExist ? 1 : 0;
 
-    # Comment on the PR
     - name: Comment on PR
-      if: steps.levitate-run.outputs.exit_code == 1 && steps.levitate-run.outputs.shouldSkip != 'true'
+      if: ${{ steps.levitate-run.outputs.exit_code == 1 }}
       uses: marocchino/sticky-pull-request-comment@v2
       with:
         number: ${{ steps.levitate-run.outputs.pr_number }}
@@ -105,9 +93,8 @@ jobs:
           [Console output](${{ steps.levitate-run.outputs.job_link }})
           [Read our guideline](https://github.com/grafana/grafana/blob/main/contribute/breaking-changes-guide.md)
 
-    # Remove comment from the PR (no more breaking changes)
-    - name: Remove comment from PR
-      if: steps.levitate-run.outputs.exit_code == 0 && steps.levitate-run.outputs.shouldSkip != 'true'
+    - name: Remove comment on PR
+      if: ${{ steps.levitate-run.outputs.exit_code == 0 }}
       uses: marocchino/sticky-pull-request-comment@v2
       with:
         number: ${{ steps.levitate-run.outputs.pr_number }}
@@ -116,8 +103,8 @@ jobs:
     # Posts a notification to Slack if a PR has a breaking change and it did not have a breaking change before
     - name: Post to Slack
       id: slack
-      if: steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 && steps.levitate-run.outputs.shouldSkip != 'true'
-      uses: slackapi/slack-github-action@v1.24.0
+      if: ${{ steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 }}
+      uses: slackapi/slack-github-action@v1.19.0
       with:
         payload: |
           {
@@ -130,9 +117,8 @@ jobs:
       env:
         SLACK_WEBHOOK_URL: ${{ secrets.SLACK_LEVITATE_WEBHOOK_URL }}
 
-    # Add the label
     - name: Add "levitate breaking change" label
-      if: steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 && steps.levitate-run.outputs.shouldSkip != 'true'
+      if: ${{ steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 }}
       uses: actions/github-script@v6
       env:
         PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
@@ -146,9 +132,8 @@ jobs:
             labels: ['levitate breaking change']
           })
 
-    # Remove label (no more breaking changes)
     - name: Remove "levitate breaking change" label
-      if: steps.levitate-run.outputs.exit_code == 0 && steps.does-label-exist.outputs.result == 1 && steps.levitate-run.outputs.shouldSkip != 'true'
+      if: ${{ steps.levitate-run.outputs.exit_code == 0 && steps.does-label-exist.outputs.result == 1 }}
       uses: actions/github-script@v6
       env:
         PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
@@ -162,11 +147,10 @@ jobs:
             name: 'levitate breaking change'
           })
 
-    # Add reviewers
     # This is very weird, the actual request goes through (comes back with a 201), but does not assign the team.
     # Related issue: https://github.com/renovatebot/renovate/issues/1908
     - name: Add "grafana/plugins-platform-frontend" as a reviewer
-      if: steps.levitate-run.outputs.exit_code && steps.levitate-run.outputs.shouldSkip != 'true'
+      if: ${{ steps.levitate-run.outputs.exit_code == 1 }}
       uses: actions/github-script@v6
       env:
         PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
@@ -181,9 +165,8 @@ jobs:
             team_reviewers: ['grafana/plugins-platform-frontend']
           });
 
-    # Remove reviewers (no more breaking changes)
     - name: Remove "grafana/plugins-platform-frontend" from the list of reviewers
-      if: steps.levitate-run.outputs.exit_code == 0 && steps.levitate-run.outputs.shouldSkip != 'true'
+      if: ${{ steps.levitate-run.outputs.exit_code == 0 }}
       uses: actions/github-script@v6
       env:
         PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}

.github/workflows/doc-validator.yml

@@ -7,23 +7,10 @@ jobs:
   doc-validator:
     runs-on: "ubuntu-latest"
     container:
-      image: "grafana/doc-validator:v3.0.0"
+      image: "grafana/doc-validator:v1.5.0"
     steps:
       - name: "Checkout code"
         uses: "actions/checkout@v3"
       - name: "Run doc-validator tool"
-        # Only run doc-validator on specific directories.
-        run: >
-          doc-validator
-          '--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 }}"
+        # Ensure that the CI always passes until all errors are resolved.
+        run: "doc-validator ./docs/sources || true"

.github/workflows/epic-add-to-platform-ux-parent-project.yml

@@ -1,135 +0,0 @@
-name: When epic issues changed in Platform UX squad projects, check if epic is part of specified child projects and update on Platform UX parent project
-
-on:
-  issues:
-    types: [opened, closed, edited, reopened, assigned, unassigned, labeled, unlabeled]
-    labels:
-      - 'type/epic'
-      
-env:
-  GITHUB_TOKEN: ${{ secrets.GH_BOT_PROJECTS_ACCESS_TOKEN }}
-  ORGANIZATION: ${{ github.repository_owner }}
-  REPO: ${{ github.event.repository.name }}
-  PARENT_PROJECT: 304
-  CHILD_PROJECT_1: 78
-  CHILD_PROJECT_2: 111
-  CHILD_PROJECT_3: 202
-    
-concurrency:
-  group: issue-add-to-parent-project-${{ github.event.number }}
-jobs:
-  main:
-    if: contains(github.event.issue.labels.*.name, 'type/epic')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check if issue is in child or parent projects
-        run: |
-          gh api graphql -f query='
-            query($org: String!, $repo: String!) {
-              repository(name: $repo, owner: $org) {
-                issue (number: ${{ github.event.issue.number }}) {
-                  projectItems(first:20) {
-                    nodes {
-                      id,
-                      project {
-                        number,
-                        title
-                      },
-                      fieldValueByName(name:"Status") {
-                        ... on ProjectV2ItemFieldSingleSelectValue {
-                          optionId
-                          name
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }' -f org=$ORGANIZATION -f repo=$REPO > projects_data.json
-            
-            echo 'IN_PARENT_PROJ='$(jq '.data.repository.issue.projectItems.nodes[] | select(.project.number==${{ env.PARENT_PROJECT }}) | .project != null' projects_data.json) >> $GITHUB_ENV
-            echo 'PARENT_PROJ_STATUS_ID='$(jq '.data.repository.issue.projectItems.nodes[] | select(.project.number==${{ env.PARENT_PROJECT }}) | select(.fieldValueByName != null) | .fieldValueByName.optionId' projects_data.json) >> $GITHUB_ENV
-            echo 'ITEM_ID='$(jq '.data.repository.issue.projectItems.nodes[] | select(.project.number==${{ env.PARENT_PROJECT }}) | .id' projects_data.json) >> $GITHUB_ENV
-            echo 'IN_CHILD_PROJ='$(jq 'first(.data.repository.issue.projectItems.nodes[] | select(.project.number==${{ env.CHILD_PROJECT_1 }} or .project.number==${{ env.CHILD_PROJECT_2 }} or .project.number==${{ env.CHILD_PROJECT_3 }}) | .project != null)' projects_data.json) >> $GITHUB_ENV
-            echo 'CHILD_PROJ_STATUS='$(jq -r '.data.repository.issue.projectItems.nodes[] | select(.project.number==${{ env.CHILD_PROJECT_1 }} or .project.number==${{ env.CHILD_PROJECT_2 }} or .project.number==${{ env.CHILD_PROJECT_3 }}) | select(.fieldValueByName != null) | .fieldValueByName.name' projects_data.json) >> $GITHUB_ENV
-      - name: Get parent project project data
-        if: env.IN_CHILD_PROJ
-        run: |
-          gh api graphql -f query='
-            query($org: String!, $number: Int!) {
-              organization(login: $org){
-                projectV2(number: $number) {
-                  id
-                  fields(first:20) {
-                    nodes {
-                      ... on ProjectV2Field {
-                        id
-                        name
-                      }
-                      ... on ProjectV2SingleSelectField {
-                        id
-                        name
-                        options {
-                          id
-                          name
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }' -f org=$ORGANIZATION -F number=$PARENT_PROJECT > project_data.json
-
-          echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
-          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
-          echo 'TODO_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .options[] | select(.name=="Todo") |.id' project_data.json) >> $GITHUB_ENV
-          echo 'PROGRESS_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .options[] | select(.name=="In Progress") |.id' project_data.json) >> $GITHUB_ENV
-          echo 'DONE_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .options[] | select(.name=="Done") |.id' project_data.json) >> $GITHUB_ENV
-      - name: Add issue to parent project
-        if: env.IN_CHILD_PROJ && !env.IN_PARENT_PROJ
-        run: |
-          item_id="$( gh api graphql -f query='
-            mutation($project:ID!, $issue:ID!) {
-              addProjectV2ItemById(input: {projectId: $project, contentId: $issue}) {
-                item {
-                  id
-                }
-              }
-            }' -f project=$PROJECT_ID -f issue=${{ github.event.issue.node_id }} --jq '.data.addProjectV2ItemById.item.id')"
- 
-            echo 'ITEM_ID='$item_id >> $GITHUB_ENV
-      - name: Set parent project status Done
-        if: contains(env.CHILD_PROJ_STATUS, 'Done')
-        run: |
-          echo 'OPTION_ID='$DONE_OPTION_ID >> $GITHUB_ENV
-      - name: Set parent project status In Progress
-        if: contains(env.CHILD_PROJ_STATUS, 'In ') || contains(env.CHILD_PROJ_STATUS, 'Blocked')
-        run: |
-          echo 'OPTION_ID='$PROGRESS_OPTION_ID >> $GITHUB_ENV
-      - name: Set parent project status To do
-        if: env.CHILD_PROJ_STATUS && !contains(env.CHILD_PROJ_STATUS, 'In ') && !contains(env.CHILD_PROJ_STATUS, 'Blocked') && ! contains(env.CHILD_PROJ_STATUS, 'Done')
-        run: |
-          echo 'OPTION_ID='$TODO_OPTION_ID >> $GITHUB_ENV
-      - name: Set issue status in parent project
-        if: env.OPTION_ID && (env.OPTION_ID != env.PARENT_PROJ_STATUS_ID)
-        run: |
-          gh api graphql -f query='
-            mutation (
-              $project: ID!
-              $item: ID!
-              $status_field: ID!
-              $status_value: String!
-            ) {
-              set_status: updateProjectV2ItemFieldValue(input: {
-                projectId: $project
-                itemId: $item
-                fieldId: $status_field
-                value: { 
-                  singleSelectOptionId: $status_value
-                  }
-              }) {
-                projectV2Item {
-                  id
-                  }
-              }
-            }' -f project=$PROJECT_ID -f item=$ITEM_ID -f status_field=$STATUS_FIELD_ID -f status_value=${{ env.OPTION_ID }} --silent

.github/workflows/issue-labeled.yml

@@ -1,4 +1,4 @@
-name: Notify Slack channel based on new issue label
+name: Notify Slack channel based on issue label
 
 on:
   issues:
@@ -14,28 +14,37 @@ jobs:
       - name: "Determine which team to notify"
         run: |
           # Default to null values.
+          BOARD="null"
           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 board set to use.
+            if [[ $(yq '.[env(CURRENT_LABEL)] | has("github-board")' teams.yml ) == true ]]; then
+              BOARD=$(yq '.[env(CURRENT_LABEL)].github-board' teams.yml)
+              echo "Ready to add issue to Grafana board ${BOARD}"
+            fi
             # 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
+          # set environment for next step
+          echo "BOARD=${BOARD}" >> $GITHUB_ENV
           echo "CHANNEL=${CHANNEL}" >> $GITHUB_ENV
-          echo "TEAM=${TEAM}" >> $GITHUB_ENV
+
+      - name: "Add to GitHub board"
+        if: ${{ env.BOARD != 'null' }}
+        uses: leonsteinhaeuser/project-beta-automations@v1.3.0
+        with:
+          project_id: ${{ env.BOARD }}
+          organization: grafana
+          resource_node_id: ${{ github.event.issue.node_id }}
+          gh_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Prepare payload"
         uses: frabert/replace-string-action@v2.0
@@ -47,24 +56,15 @@ jobs:
           replace-with: "'"
           flags: 'g'
 
-      - name: "Check that issue author is not part of the team"
-        if: ${{ env.TEAM != 'null' }}
-        uses: tspascoal/get-user-teams-membership@v2
-        id: checkUserMember
-        with:
-          username: ${{ github.event.issue.user.login }}
-          team: "${{ env.TEAM }}"
-          GITHUB_TOKEN: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
-
       - name: "Send Slack notification"
-        if: ${{ (env.CHANNEL != 'null') && ((steps.checkUserMember.outputs.isTeamMember == 'false') || (env.TEAM != 'null')) }}
-        uses: slackapi/slack-github-action@v1.24.0
+        if: ${{ env.CHANNEL != 'null' }}
+        uses: slackapi/slack-github-action@v1.14.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.",
+              "text": "Issue \"${{ steps.preparePayload.outputs.replaced }}\" labeled \"${{ github.event.label.name }}\": ${{ github.event.issue.html_url }}",
               "channel": "${{ env.CHANNEL }}"
             }
         env:

.github/workflows/issue-opened.yml

@@ -1,28 +0,0 @@
-name: Run commands when issues are opened
-on:
-  issues:
-    types: [opened]
-concurrency:
-  group: issue-opened-${{ github.event.issue.number }}
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v3
-        with:
-          repository: "grafana/grafana-github-actions"
-          path: ./actions
-          ref: main
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      # give issue-openers a chance to add labels after submit
-      - name: Sleep for 2 minutes
-        run: sleep 2m
-        shell: bash
-      - name: Run Commands
-        uses: ./actions/commands
-        with:
-          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
-          token: ${{secrets.ISSUE_COMMANDS_TOKEN}}
-          configPath: "issue-opened"

.github/workflows/milestone.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
     inputs:
       version_input:
-        description: 'The version to be released please respect: major.minor.patch, major.minor.patch-preview or major.minor.patch-preview<number> format. example: 7.4.3, 7.4.3-preview or 7.4.3-preview1'
+        description: 'The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
         required: true
 jobs:
   call-remove-milestone:
@@ -18,4 +18,4 @@ jobs:
       version_call: ${{ github.event.inputs.version_input }}
     secrets:
       token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
-    needs: call-remove-milestone
+    needs: call-remove-milestone

.github/workflows/ox-code-coverage.yml

@@ -3,19 +3,15 @@ on:
   pull_request:
     paths:
       - 'pkg/services/queryhistory/**'
-      - 'pkg/tsdb/loki/**'
-      - 'pkg/tsdb/elasticsearch/**'
       - 'public/app/features/explore/**'
       - 'public/app/features/correlations/**'
-      - 'public/app/plugins/datasource/loki/**'
-      - 'public/app/plugins/datasource/elasticsearch/**'
     branches-ignore:
       - dependabot/**
       - backport-*
 
 jobs:
   workflow-call:
-    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.19
+    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.12
     with:
-      frontend-path-regexp: public\/app\/features\/(explore|correlations)|public\/app\/plugins\/datasource\/(loki|elasticsearch)
-      backend-path-regexp: pkg\/services\/(queryhistory)|pkg\/tsdb\/(loki|elasticsearch)
+      frontend-path-regexp: public\/app\/features\/(explore|correlations)
+      backend-path-regexp: pkg\/services\/(queryhistory)

.github/workflows/pr-codeql-analysis-go.yml

@@ -21,9 +21,9 @@ jobs:
         fetch-depth: 2
 
     - name: Set go version
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v3
       with:
-        go-version: '1.20.4'
+        go-version: '1.19.2'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/pr-commands.yml

@@ -2,7 +2,6 @@ name: PR automation
 on:
   pull_request_target:
     types:
-      - labeled
       - opened
       - synchronize
 concurrency:

.github/workflows/sbom-report.yml

@@ -14,7 +14,7 @@ jobs:
       uses: actions/checkout@v2
         
     - name: Anchore SBOM Action
-      uses: anchore/sbom-action@v0.13.4
+      uses: anchore/sbom-action@v0.12.0
       with:
          artifact-name: ${{ github.event.repository.name }}-spdx.json
 

.github/workflows/scripts/json-file-to-job-output.js

@@ -1,7 +1,7 @@
 module.exports = async ({ core, filePath }) => {
     try {
-        const fs = require('fs').promises;
-        const content = await fs.readFile(filepath)
+        const fs = require('fs');
+        const content = await readFile(fs, filePath);
         const result = JSON.parse(content);
     
         core.startGroup('Parsing json file...');
@@ -15,4 +15,13 @@ module.exports = async ({ core, filePath }) => {
     } catch (error) {
         core.restFailed(error.message);
     }
+}
+
+async function readFile(fs, path) {
+    return new Promise((resolve, reject) => {
+        fs.readFile(path, (error, data) => {
+            if (error) return reject(error);
+            return resolve(data);
+        });
+    });
 }

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

@@ -1,9 +1,9 @@
 
-module.exports = async ({ name, github, context, core }) => {
+module.exports = async ({ 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`);
-}
+    const result = await github.request(url)
+    const link = `https://github.com/grafana/grafana/runs/${result.data.jobs[0].id}?check_suite_focus=true`;
+
+    core.setOutput('link', link);
+}

.github/workflows/snyk.yml

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

.github/workflows/stale.yml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v5
         with:
           repo-token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
           # Number of days of inactivity before a stale Issue or Pull Request is closed.

.github/workflows/update-changelog.yml

@@ -4,24 +4,40 @@ on:
     inputs:
       version:
         required: true
-        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch, major.minor.patch-preview or major.minor.patch-preview<number> format. example: 7.4.3, 7.4.3-preview or 7.4.3-preview1'
-      skip_pr:
-        required: false
-        default: "0"
-      skip_community_post:
-        required: false
-        default: "0"
+        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
+  workflow_call:
+    inputs:
+      version_call:
+        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
+        required: true
+        type: string
+    secrets:
+        token:
+          required: true
+        metricsWriteAPIKey:
+          required: true
 jobs:
   main:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout Actions
+        uses: actions/checkout@v3
+        with:
+          repository: "grafana/grafana-github-actions"
+          path: ./actions
+          ref: main
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
       - name: Run update changelog (manually invoked)
-        uses: grafana/grafana-github-actions-go/update-changelog@main
+        if: ${{ github.event.inputs.version != '' }}
+        uses: ./actions/update-changelog
         with:
           token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
-          version: ${{ inputs.version }}
-          metrics_api_key: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
-          community_api_key: ${{ secrets.GRAFANABOT_FORUM_KEY }}
-          community_api_username: grafanabot
-          skip_pr: ${{ inputs.skip_pr }}
-          skip_community_post: ${{ inputs.skip_community_post }}
+          metricsWriteAPIKey: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
+      - name: Run update changelog (workflow invoked)
+        if: ${{ inputs.version != '' }}
+        uses: ./actions/update-changelog
+        with:
+          version_call: ${{ inputs.version }}
+          token: ${{ secrets.token }}
+          metricsWriteAPIKey: ${{ secrets.metricsWriteAPIKey }}

.gitignore

@@ -79,8 +79,6 @@ public/css/*.min.css
 /devenv/docker-compose.override.yaml
 /devenv/.env
 /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
 
 conf/custom.ini
 /conf/provisioning/**/custom.yaml
@@ -96,8 +94,6 @@ profile.cov
 /pkg/cmd/grafana-server/grafana-server
 /pkg/cmd/grafana-server/debug
 /pkg/extensions/*
-/pkg/build/cmd/artifactspage.go
-/pkg/build/cmd/artifactspage.tmpl.html
 /pkg/server/wireexts_enterprise.go
 /pkg/cmd/grafana-cli/runner/wireexts_enterprise.go
 !/pkg/extensions/main.go
@@ -109,7 +105,6 @@ debug.test
 /packaging/**/*.tar.gz
 /packaging/**/*.tar.gz.sha256
 pkg/cmd/grafana-server/__debug_bin
-pkg/services/quota/quotaimpl/storage/storage.json
 
 # Ignore OSX indexing
 .DS_Store
@@ -131,7 +126,6 @@ pkg/services/quota/quotaimpl/storage/storage.json
 !.yarn/patches/*.patch
 
 # Ignoring frontend packages specifics
-/packages/grafana-ui/.yarn/.cache
 /packages/**/dist
 /packages/**/compiled
 /packages/**/.rpt2_cache
@@ -139,7 +133,7 @@ pkg/services/quota/quotaimpl/storage/storage.json
 /packages/**/package.tgz
 /packages/grafana-toolkit/sass
 ## CI places the packages in a different location
-/npm-artifacts
+/npm-artifacts/*.tgz
 
 # Ignore frontend build manifest
 manifest.json
@@ -161,8 +155,6 @@ compilation-stats.json
 /e2e/benchmarks/**/results/*
 /e2e/benchmarks/**/results
 /e2e/build_results.zip
-/e2e/extensions
-/e2e/extensions-suite
 
 # grafana server
 /scripts/grafana-server/server.log
@@ -177,16 +169,17 @@ compilation-stats.json
 # auto generated frontend docs
 /docs/sources/packages_api
 
-# wire generated files
-**/wire_gen.go
+# auto generated Go files
+*_gen.go
+!pkg/services/featuremgmt/toggles_gen.go
+!pkg/coremodel/**/*_gen.go
+!pkg/framework/**/*_gen.go
+!pkg/plugins/pfs/**/*_gen.go
+!public/app/plugins/**/*_gen.go
 
 # Auto-generated internationalization files
 public/locales/_build/
-public/locales/*/*.js
-public/locales/*/grafana_old.json
-
-# Auto-generated swagger intermediate file
-public/api-spec.json
+public/locales/**/*.js
 
 deployment_tools_config.json
 

.golangci.toml

@@ -19,10 +19,6 @@ include-go-root = true
 packages = ["io/ioutil"]
 [[linters-settings.depguard.packages-with-error-message]]
 "io/ioutil" = "Deprecated: As of Go 1.16, the same functionality is now provided by package io or package os, and those implementations should be preferred in new code. See the specific function documentation for details."
-"gopkg.in/yaml.v2" = "Grafana packages are not allowed to depend on gopkg.in/yaml.v2 as gopkg.in/yaml.v3 is now available"
-"github.com/pkg/errors" = "Deprecated: Go 1.13 supports the functionality provided by pkg/errors in the standard library."
-"github.com/xorcare/pointer" = "Use pkg/util.Pointer instead, which is a generic one-liner alternative"
-"github.com/gofrs/uuid" = "Use github.com/google/uuid instead, which we already depend on."
 
 [linters-settings.gocritic]
 enabled-checks = ["ruleguard"]
@@ -47,6 +43,7 @@ enable = [
   "ineffassign",
   "misspell",
   "nakedret",
+  "rowserrcheck",
   "exportloopref",
   "staticcheck",
   "stylecheck",
@@ -64,7 +61,6 @@ enable = [
 
 # 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
@@ -86,11 +82,7 @@ text = "ST1001"
 # Use golang.org/x/text/cases instead.
 [[issues.exclude-rules]]
 linters = ["staticcheck"]
-text = "SA1019: strings.Title"
-
-[[issues.exclude-rules]]
-linters = ["staticcheck"]
-text = "use fake service and real access control evaluator instead"
+text = "SA1019"
 
 [[issues.exclude-rules]]
 linters = ["gosec"]

.nvmrc

@@ -1 +1 @@
-v18.12.0
+v16.14.0

.pa11yci-pr.conf.js

@@ -74,7 +74,7 @@ var config = {
         "click element button[aria-label='Login button']",
         "wait for element [aria-label='Skip change password button'] to be visible",
       ],
-      threshold: 15,
+      threshold: 14,
       rootElement: '.main-view',
     },
     {
@@ -107,7 +107,7 @@ var config = {
       url: '${HOST}/datasources',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 3,
+      threshold: 1,
     },
     {
       url: '${HOST}/org/users',
@@ -125,7 +125,7 @@ var config = {
       url: '${HOST}/plugins',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 3,
+      threshold: 1,
     },
     {
       url: '${HOST}/org',

.prettierignore

@@ -27,13 +27,6 @@ theme.light.generated.json
 theme.dark.generated.json
 
 # Generated Swagger API specs
+public/api-spec.json
 public/api-merged.json
 public/openapi3.json
-
-# Generated Kinds report
-kinds/report.json
-
-# Generated schema docs
-docs/sources/developers/kinds/
-
-scripts/cli/bettererIssueTemplate.md

.prettierrc.js

@@ -1,5 +1,3 @@
 module.exports = {
-  trailingComma: 'es5',
-  singleQuote: true,
-  printWidth: 120,
+  ...require('@grafana/toolkit/src/config/prettier.plugin.config.json'),
 };

.vscode/launch.json

@@ -6,17 +6,10 @@
       "type": "go",
       "request": "launch",
       "mode": "auto",
-      "program": "${workspaceFolder}/pkg/cmd/grafana/",
+      "program": "${workspaceFolder}/pkg/cmd/grafana-server/",
       "env": {},
       "cwd": "${workspaceFolder}",
-      "args": ["server", "--homepath", "${workspaceFolder}", "--packaging", "dev"]
-    },
-    {
-      "name": "Attach to Chrome",
-      "port": 9222,
-      "request": "attach",
-      "type": "chrome",
-      "webRoot": "${workspaceFolder}"
+      "args": ["--homepath", "${workspaceFolder}", "--packaging", "dev"]
     },
     {
       "name": "Debug Jest test",
@@ -27,14 +20,6 @@
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen",
       "port": 9229
-    },
-    {
-      "name": "Debug Go test",
-      "type": "go",
-      "request": "launch",
-      "mode": "test",
-      "program": "${workspaceFolder}/${relativeFileDirname}",
-      "showLog": true
     }
   ]
 }

.yarn/patches/react-split-pane-npm-0.1.92-93dbf51dff.patch

@@ -1,12 +0,0 @@
-diff --git a/index.d.ts b/index.d.ts
-index d116f54d6da12d24b48e24ff3636c9066059aa58..93290945d8b1818cab893d6466179b33869a47b9 100644
---- a/index.d.ts
-+++ b/index.d.ts
-@@ -25,6 +25,7 @@ export type SplitPaneProps = {
-   pane2Style?: React.CSSProperties;
-   resizerClassName?: string;
-   step?: number;
-+  children?: React.ReactNode;
- };
- 
- export type SplitPaneState = {

.yarn/sdks/eslint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "8.34.0-sdk",
+  "version": "8.23.0-sdk",
   "main": "./lib/api.js",
   "type": "commonjs"
 }

.yarn/sdks/integrations.yml

@@ -2,5 +2,5 @@
 # Manual changes might be lost!
 
 integrations:
-  - vscode
   - vim
+  - vscode

.yarn/sdks/prettier/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "2.8.4-sdk",
+  "version": "2.7.1-sdk",
   "main": "./index.js",
   "type": "commonjs"
 }

.yarn/sdks/typescript/lib/tsserver.js

@@ -109,8 +109,6 @@ const moduleWrapper = tsserver => {
             str = `zip:${str}`;
           } break;
         }
-      } else {
-        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
       }
     }
 

.yarn/sdks/typescript/lib/tsserverlibrary.js

@@ -109,8 +109,6 @@ const moduleWrapper = tsserver => {
             str = `zip:${str}`;
           } break;
         }
-      } else {
-        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
       }
     }
 

.yarn/sdks/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "4.8.4-sdk",
+  "version": "4.8.2-sdk",
   "main": "./lib/typescript.js",
   "type": "commonjs"
 }

.yarnrc.yml

@@ -3,12 +3,41 @@ enableTelemetry: false
 nodeLinker: pnp
 
 packageExtensions:
-  '@storybook/core-common@*':
+  "@mdx-js/loader@1.6.22":
+    peerDependencies:
+      react: 17.0.1
+  "@npmcli/run-script@4.1.3":
     dependencies:
-      '@storybook/react-webpack5': '*'
+      which: ^2.0.2
+  "@storybook/addon-docs@6.4.21":
+    peerDependencies:
+      "@storybook/manager-webpack5": 6.4.21
+  "@storybook/addon-essentials@6.4.21":
+    peerDependencies:
+      "@storybook/components": 6.4.21
+      "@storybook/core-events": 6.4.21
+      "@storybook/manager-webpack5": 6.4.21
+      "@storybook/theming": 6.4.21
+  "@storybook/core-server@6.4.21":
+    peerDependencies:
+      "@babel/core": ^7.0.0
+  "@storybook/core@6.4.21":
+    peerDependencies:
+      "@babel/core": ^7.0.0
+      "@storybook/manager-webpack5": 6.4.21
+  "@storybook/csf-tools@6.4.21":
+    peerDependencies:
+      "@babel/core": ^7.0.0
+  "@storybook/react@6.4.21":
+    peerDependencies:
+      "@storybook/manager-webpack5": 6.4.21
   doctrine@3.0.0:
     dependencies:
       assert: 2.0.0
+  moveable@0.30.0:
+    dependencies:
+      "@daybrush/utils": 1.7.0
+      framework-utils: ^1.1.0
   rc-time-picker@3.7.3:
     peerDependencies:
       react: 17.0.1
@@ -20,26 +49,30 @@ packageExtensions:
   react-compat-css-styled@1.0.8:
     dependencies:
       react-simple-compat: 1.2.2
+  react-compat-moveable@0.18.0:
+    dependencies:
+      "@egjs/agent": ^2.2.1
+      "@egjs/children-differ": ^1.0.1
+      "@scena/matrix": 1.1.1
+      css-to-mat: ^1.0.3
+      gesto: ^1.9.0
+      overlap-area: ^1.0.0
+      react-simple-compat: 1.2.2
+    peerDependencies:
+      framework-utils: ^1.1.0
   react-icons@2.2.7:
     peerDependencies:
-      prop-types: '*'
+      prop-types: "*"
   react-resizable@3.0.4:
     peerDependencies:
       react-dom: 17.0.1
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
-    spec: '@yarnpkg/plugin-typescript'
+    spec: "@yarnpkg/plugin-typescript"
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: '@yarnpkg/plugin-interactive-tools'
+    spec: "@yarnpkg/plugin-interactive-tools"
   - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
-    spec: 'https://mskelton.dev/yarn-outdated/v2'
+    spec: "https://mskelton.dev/yarn-outdated/v2"
 
-yarnPath: .yarn/releases/yarn-3.6.0.cjs
-# Uncomment the following lines if you want to use Verdaccio local npm registry. Read more at packages/README.md
-# npmScopes:
-#   grafana:
-#     npmRegistryServer: http://localhost:4873
-
-# unsafeHttpWhitelist:
-#   - 'localhost'
+yarnPath: .yarn/releases/yarn-3.2.3.cjs

CONTRIBUTING.md

@@ -15,8 +15,6 @@ You can contribute to Grafana in several ways. Here are some examples:
 - Organize meetups and user groups in your local area.
 - Help others by answering questions about Grafana.
 
-**Please note:** We do not currently accept contributions for translations. Please do not submit pull requests translating grafana.json files - they will be rejected. We do accept contributions to mark up phrases for translation. See [Internationalization](contribute/internationalization.md).
-
 For more ways to contribute, check out the [Open Source Guides](https://opensource.guide/how-to-contribute/).
 
 ### Report bugs

Dockerfile

@@ -1,14 +1,13 @@
 # syntax=docker/dockerfile:1
 
 ARG BASE_IMAGE=alpine:3.17
-ARG JS_IMAGE=node:18-alpine3.17
-ARG JS_PLATFORM=linux/amd64
+ARG JS_IMAGE=node:16-alpine3.17
 ARG GO_IMAGE=golang:1.20.4-alpine3.17
 
 ARG GO_SRC=go-builder
 ARG JS_SRC=js-builder
 
-FROM --platform=${JS_PLATFORM} ${JS_IMAGE} as js-builder
+FROM ${JS_IMAGE} as js-builder
 
 ENV NODE_OPTIONS=--max_old_space_size=8000
 
@@ -19,7 +18,10 @@ COPY .yarn .yarn
 COPY packages packages
 COPY plugins-bundled plugins-bundled
 
-RUN yarn install --immutable
+RUN apk add --update python3 make g++\
+   && rm -rf /var/cache/apk/*
+
+RUN yarn install
 
 COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js babel.config.json .linguirc ./
 COPY public public
@@ -31,15 +33,9 @@ RUN yarn build
 
 FROM ${GO_IMAGE} as go-builder
 
-ARG COMMIT_SHA=""
-ARG BUILD_BRANCH=""
-ARG GO_BUILD_TAGS="oss"
-ARG WIRE_TAGS="oss"
-ARG BINGO="true"
-
 # Install build dependencies
 RUN if grep -i -q alpine /etc/issue; then \
-      apk add --no-cache gcc g++ make git; \
+      apk add --no-cache gcc g++ make binutils-gold; \
     fi
 
 WORKDIR /tmp/grafana
@@ -47,28 +43,22 @@ WORKDIR /tmp/grafana
 COPY go.* ./
 COPY .bingo .bingo
 
-RUN go mod download
-RUN if [[ "$BINGO" = "true" ]]; then \
-      go install github.com/bwplotka/bingo@latest && \
-      bingo get -v; \
-    fi
+RUN go mod download && \
+    go install github.com/bwplotka/bingo@latest && \
+    bingo get
 
 COPY embed.go Makefile build.go package.json ./
 COPY cue.mod cue.mod
-COPY kinds kinds
 COPY local local
 COPY packages/grafana-schema packages/grafana-schema
 COPY public/app/plugins public/app/plugins
-COPY public/api-merged.json public/api-merged.json
+COPY public/api-spec.json public/api-spec.json
 COPY pkg pkg
 COPY scripts scripts
 COPY conf conf
 COPY .github .github
 
-ENV COMMIT_SHA=${COMMIT_SHA}
-ENV BUILD_BRANCH=${BUILD_BRANCH}
-
-RUN make build-go GO_BUILD_TAGS=${GO_BUILD_TAGS} WIRE_TAGS=${WIRE_TAGS}
+RUN make build-go
 
 FROM ${BASE_IMAGE} as tgz-builder
 
@@ -105,7 +95,7 @@ WORKDIR $GF_PATHS_HOME
 
 # Install dependencies
 RUN if grep -i -q alpine /etc/issue; then \
-      apk add --no-cache ca-certificates bash curl tzdata musl-utils && \
+      apk add --no-cache ca-certificates bash tzdata musl-utils && \
       apk info -vv | sort; \
     elif grep -i -q ubuntu /etc/issue; then \
       DEBIAN_FRONTEND=noninteractive && \

Dockerfile.ubuntu

@@ -0,0 +1,87 @@
+FROM node:16-alpine3.15 as js-builder
+
+ENV NODE_OPTIONS=--max_old_space_size=8000
+
+WORKDIR /usr/src/app/
+
+COPY package.json yarn.lock ./
+COPY packages packages
+COPY .yarnrc.yml ./
+COPY .yarn .yarn
+COPY plugins-bundled plugins-bundled
+
+RUN yarn install
+
+COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js babel.config.json .linguirc ./
+COPY public public
+COPY tools tools
+COPY scripts scripts
+COPY emails emails
+
+ENV NODE_ENV production
+RUN yarn build
+
+FROM golang:1.19.4 AS go-builder
+
+WORKDIR /src/grafana
+
+COPY go.mod go.sum embed.go ./
+COPY Makefile build.go package.json ./
+COPY .bingo .bingo
+COPY pkg pkg/
+COPY cue.mod cue.mod/
+COPY packages/grafana-schema packages/grafana-schema/
+COPY public/app/plugins public/app/plugins/
+COPY public/api-spec.json public/api-spec.json
+
+RUN go mod verify
+RUN make build-go
+
+FROM ubuntu:20.04
+
+LABEL maintainer="Grafana team <hello@grafana.com>"
+EXPOSE 3000
+
+ARG GF_UID="472"
+ARG GF_GID="472"
+
+ENV PATH="/usr/share/grafana/bin:$PATH" \
+    GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
+    GF_PATHS_DATA="/var/lib/grafana" \
+    GF_PATHS_HOME="/usr/share/grafana" \
+    GF_PATHS_LOGS="/var/log/grafana" \
+    GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
+    GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
+
+WORKDIR $GF_PATHS_HOME
+
+COPY conf conf
+
+# curl should be part of the image
+RUN apt-get update && apt-get install -y ca-certificates curl
+
+RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
+  addgroup --system --gid $GF_GID grafana && \
+  adduser --uid $GF_UID --system --ingroup grafana grafana && \
+  mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
+             "$GF_PATHS_PROVISIONING/dashboards" \
+             "$GF_PATHS_PROVISIONING/notifiers" \
+             "$GF_PATHS_PROVISIONING/plugins" \
+             "$GF_PATHS_PROVISIONING/access-control" \
+             "$GF_PATHS_PROVISIONING/alerting" \
+             "$GF_PATHS_LOGS" \
+             "$GF_PATHS_PLUGINS" \
+             "$GF_PATHS_DATA" && \
+    cp conf/sample.ini "$GF_PATHS_CONFIG" && \
+    cp conf/ldap.toml /etc/grafana/ldap.toml && \
+    chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
+    chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
+
+COPY --from=go-builder /src/grafana/bin/*/grafana-server /src/grafana/bin/*/grafana-cli /grafana/bin/*/grafana bin/
+COPY --from=js-builder /usr/src/app/public public
+COPY --from=js-builder /usr/src/app/tools tools
+
+COPY packaging/docker/run.sh /
+
+USER grafana
+ENTRYPOINT [ "/run.sh" ]

GOVERNANCE.md

@@ -99,7 +99,7 @@ The current team members are:
 - Ryan McKinley ([Grafana Labs](https://grafana.com/))
 - Sofia Papagiannaki ([Grafana Labs](https://grafana.com/))
 - Stephanie Closson ([Grafana Labs](https://grafana.com/))
-- Tobias Skarhed ([Grafana Labs](https://grafana.com/))
+- Tobias Skarhed ([CERN](https://home.web.cern.ch/))
 - Torkel Ödegaard ([Grafana Labs](https://grafana.com/))
 - Utkarsh Bhatnagar ([Tinder](https://www.tinder.com/))
 - Will Browne ([Grafana Labs](https://grafana.com/))

ISSUE_TRIAGE.md

@@ -20,52 +20,43 @@ If you don't have the knowledge or time to code, consider helping with triage. T
 <!-- https://textik.com/#610afa78553def29 -->
 
 ```
-                         +-------------------+
-                        |                   |
-                        |  new issue/       |                                                                             +
-                        |  more info added  |
-                        |                   |
-                        +---------|---------+
-                                  |
-                    +-------------|-----------+
-                    |                         |
-        NO   +-------  all info needed to     ------+  YES
-             |      |  categorize the issue?  |     |
-             |      |                         |     |
-             |      +-------------------------+     |
-      +------|-----------+             +------------|----------+
-      |                  |             |                       |
-      | label:           |             |  label: type/*        |
-      | needs more info  |             |  label: area/*        |
-      |                  |             |  label: datasource/*  |
-      +------------------+             |            |          |
-                                       +------------|----------+
-                                                    |
-                                           +--------|-------+
-                                           |                |
-                             NO  +---------- is duplicate?  --------------------+ YES
-                                 |         |                |                   |
-                                 |         +----------------+                   |
-                                 |                             +----------------|---------------+
-                          +------|-----+                       |                                |
-                          |            |                       |  add comment:                  |
-          NO  +------------ can repro? ------------+  YES      |                                |
-              |           |            |           |           |  /duplicate of #<issue number> |
-              |           +------------+           |           |                                |
-              |                                    |           +--------------------------------+
-+-------------|-------------+                      |
-|                           |             +--------|---------+
-| label:                    |             |                  |
-| triage/needs-confirmation |  NO +-------- needs priority?  ------+ YES
-|                           |     |       |                  |     |
-+-------------|-------------+     |       +------------------+     |
-              |                   |                                |
-+-------------|------+    +-------|--------+            +----------|---------+
-|                    |    |                |            |                    |
-| Assign to project  ------     Done       -------------- label: priority/*  |
-|                    |    |                |            |                    |
-+--------------------+    +----------------+            +--------------------+
-
+                        +--------------------------+
+       +----------------+  New issue opened/       |
+       |                |  more information added  |
+       |                +-------------+------------+
+       |  Ask for more                |
+       |  information   +-------------+------------+
+       |                | All information needed   |
+       |       +--------+ to categorize the issue? +--------+
+       |       |        |                          |        |
+       |       |   NO   +--------------------------+  YES   |
+       |       |                                            |
++------+-------+-------------+                 +------------+---------+        +----------------------------+
+|                            |                 |                      |        |                            |
+| label: needs more info     |                 | Needs investigation? +--YES---+ label: needs investigation |
+|                            |                 |                      |        |                            |
++----------------------------+                 +----------------+-----+        +--------------+-------------+
+                                                             NO |                             |
+                                                                |               Investigate   |
+                                                    +-----------+----------+                  |
+                                                    | label: type/*        |                  |
+                                                    | label: area/*        +------------------+
+                                                    | label: datasource/*  |
+                                                    +-----|----------+-----+
+                                                          |          |
+                                                          |          |
+                                                          |       +--+--------------------+         +--------------------+
+                                                          |       |                       |         | label: priority/*  |
+                                                          |       |    Needs priority?    +--YES---+| milestone?         |
+                                                          |       |                       |         |                    |
+                                                          |       +--------------------+--+         +----+---------------+
+                                                          |                        NO  |                 |
+                                                          |                            |                 |
+                                                     +----+-------------+          +---+----------+      |
+                                                     |                  |          |              |      |
+                                                     |   Close issue    +----------+     Done     +------+
+                                                     |                  |          |              |
+                                                     +------------------+          +--------------+
 ```
 
 ## 1. Find uncategorized issues
@@ -96,29 +87,28 @@ Given a certain [issue template](https://github.com/grafana/grafana/issues/new/c
 
 Should explain what happened, what was expected and how to reproduce it together with any additional information that may help giving a complete picture of what happened such as screenshots, [query inspector](https://community.grafana.com/t/using-grafanas-query-inspector-to-troubleshoot-issues/2630) output and any environment related information that's applicable and/or maybe related to the reported problem:
 
-- Grafana version:
-- Data source type & version:
-- OS Grafana is installed on:
-- User OS & Browser:
-- Grafana plugins:
-- Others:
+- Grafana version
+- Data source type & version
+- Platform & OS Grafana is installed on
+- User OS & Browser + versions
+- Using docker + what environment
+- Which plugins
+- Configuration database in use (sqlite, mysql, postgres)
+- Reverse proxy in front of Grafana, what version and configuration
+- Non-default configuration settings
+- Development environment like Go and Node versions, if applicable
 
 #### Enhancement requests
 
-Enhancement requests (aka. feature requests) should be created as a [Github discussion](https://github.com/grafana/grafana/discussions). When submitting an enhancement request we ask that users focus on the problem they'd like to solve and why it’s a problem rather than focusing on the solution itself. To facilitate this we recommend using the following template:
-
-- What would you like to be added?:
-- Why is this needed (describe your use case and goals)\*\*?:
+Should explain what enhancement or feature that the author wants to be added and why that is needed.
 
 #### Accessibility issues
 
-This is a mix between a bug report and enhancement request but focused on accessibility issues to help make Grafana improve keyboard navigation, screen-reader support and being accessible to everyone. The report should include relevant [WCAG criteria](https://www.w3.org/WAI/WCAG21/quickref/?versions=2.0), if applicable.
-
-Grafana Labs is dedicated to improving our graphical user interfaces and overall experience so that our product becomes usable and accessible for people with disabilities as well as anyone else. Learn more about Grafana's commitment to [A11y](https://grafana.com/accessibility/) (accessibility).
+This is a mix between a bug report and enhancement request but focused on accessibility issues to help make Grafana improve keyboard navigation, screen-reader support and being accessible to everyone. The report should include relevant WCAG criteria, if applicable.
 
 #### Support requests
 
-In general, if the issue description and title is perceived as a question no more information is needed. See how to categorize these requests [here](#support-requests-1).
+In general, if the issue description and title is perceived as a question no more information is needed.
 
 ### Good practices
 
@@ -132,7 +122,7 @@ To make it easier for everyone to understand and find issues they're searching f
 
 ### Do you have all the information needed to categorize an issue?
 
-Depending on the issue, you might not feel all this information is needed. Use your best judgement. If you cannot triage an issue using what its author provided, explain kindly to the author that they must provide the above information to clarify the problem. Label issue with `needs more info` and add any related `area/*` or `datasource/*` labels. Alternatively, use `bot/needs more info` label and the Grafana bot will request it for you.
+Depending on the issue, you might not feel all this information is needed. Use your best judgement. If you cannot triage an issue using what its author provided, explain kindly to the author that they must provide the above information to clarify the problem. Label issue with `needs more detail` and add any related `area/*` or `datasource/*` labels.
 
 If the author provides the standard information but you are still unable to triage the issue, request additional information. Do this kindly and politely because you are asking for more of the author's time.
 
@@ -168,7 +158,7 @@ Make sure it's not a duplicate by searching existing issues using related terms
 
 1. Add a comment `/duplicate of #<issue number>`. GitHub will recognize this and add some additional context to the issue activity.
 2. The Grafana bot will do the rest, adding the correct label and closing comment
-3. Add `type/duplicate` label. Optionally add any related `area/*` or `datasource/*` labels.
+3. Optionally add any related `area/*` or `datasource/*` labels.
 
 ### Bug reports
 
@@ -193,8 +183,8 @@ If it's not perfectly clear that it's an actual bug, quickly try to reproduce it
 
 ### Enhancement/feature?
 
-1. Remind the contributor that enhancement/feature request should be created as a GitHub discussion. See [Enhancements requests.](https://github.com/grafana/grafana/blob/main/ISSUE_TRIAGE.md#enhancement-requests)
-2. Label the issue `type/feature-request` and at least one `area/*` or `datasource/*` label.
+1. Label the issue `type/feature-request` and at least one `area/*` or `datasource/*` label.
+2. Move on to [prioritizing the issue](#4-prioritization-of-issues).
 
 ### Documentation issue?
 
@@ -225,7 +215,7 @@ There's a minor typo/error/lack of information that adds a lot of confusion for
 ### Support requests
 
 1. Kindly and politely direct the issue author to the [community site](https://community.grafana.com/) and explain that GitHub is mainly used for tracking bugs and feature requests. If possible, it's usually a good idea to add some pointers to the issue author's question.
-2. Label the issue with `bot/question`. The Grafana bot will automatically close the issue, and it will add the type/question label for you.
+2. Close the issue and label it with `type/question`.
 
 ## 4. Prioritization of issues
 
@@ -306,7 +296,7 @@ In many cases the issue author or community as a whole is more suitable to contr
 
 ## Investigation of issues
 
-When an issue has all basic information provided, but the triage responsible haven't been able to reproduce the reported problem at a first glance, the issue is labeled [`triage/needs-confirmation`](https://github.com/grafana/grafana/labels/triage%2Fneeds-confirmation). Depending on the perceived severity and/or number of [upvotes](https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments), the investigation will either be delegated to another maintainer for further investigation or put on hold until someone else (maintainer or contributor) picks it up and eventually starts investigating it.
+When an issue has all basic information provided, but the triage responsible haven't been able to reproduce the reported problem at a first glance, the issue is labeled [Needs investigation](https://github.com/grafana/grafana/labels/needs%20investigation). Depending on the perceived severity and/or number of [upvotes](https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments), the investigation will either be delegated to another maintainer for further investigation or put on hold until someone else (maintainer or contributor) picks it up and eventually starts investigating it.
 
 Investigating issues can be a very time consuming task, especially for the maintainers, given the huge number of combinations of plugins, data sources, platforms, databases, browsers, tools, hardware, integrations, versions and cloud services, etc that are being used with Grafana. There is a certain number of combinations that are more common than others, and these are in general easier for maintainers to investigate.
 
@@ -318,16 +308,19 @@ Even if you don't have the time or knowledge to investigate an issue we highly r
 
 We have some automation that triggers on comments or labels being added to issues. Many of these automated behaviors are defined in [commands.json](https://github.com/grafana/grafana/blob/main/.github/commands.json). Or in other [GitHub Actions](https://github.com/grafana/grafana/tree/main/.github/workflows)
 
+- Add /duplicate `#<issue number>` to have Grafana label & close issue with an appropriate message.
+- Add `bot/question` and the bot will close it with an appropriate message.
+
 [Read more on bot actions](https://github.com/grafana/grafana/blob/main/.github/bot.md)
 
 ## External PRs
 
 Part of issue triage should also be triaging of external PRs. Main goal should be to make sure PRs from external contributors have an owner/reviewer and are not forgotten.
 
-1. Check new external PRs which do not have a reviewer. You can easily search for pull requests made by external contributors by using the label: `pr/external` in your [query search](https://github.com/grafana/grafana/pulls?q=is%3Aopen+is%3Apr+label%3Apr%2Fexternal) Note: external PRs are automatically labeled with `pr/external` upon creation.
-2. Check if there is a link to an existing issue. The link to a existing issue should be in the description section, underneath “Which issue(s) does this PR fix?:”.
-3. If not and you know which issue it is solving, add the link yourself, otherwise ask the author to link the issue or create one.
-4. Assign a reviewer based on who was handling the linked issue or what code or feature does the PR touches (look at who was the last to make changes there if all else fails).
+1. Check new external PRs which do not have a reviewer.
+1. Check if there is a link to an existing issue.
+1. If not and you know which issue it is solving, add the link yourself, otherwise ask the author to link the issue or create one.
+1. Assign a reviewer based on who was handling the linked issue or what code or feature does the PR touches (look at who was the last to make changes there if all else fails).
 
 ## Appendix
 

LICENSING.md

@@ -15,14 +15,12 @@ packages/grafana-e2e-selectors/
 packages/grafana-runtime/
 packages/grafana-toolkit/
 packages/grafana-ui/
+packages/jaeger-ui-components/
 packaging/
-kinds/
-pkg/kinds/
-pkg/kindsys/
-pkg/registry/corekind/
+pkg/coremodel/
+pkg/framework/coremodel/
 grafana-mixin/
-public/app/plugins/datasource/tempo
-public/app/features/explore/TraceView/components
+cue/
 public/img/icons/solid/
 public/img/icons/unicons/
 ```

Makefile

@@ -7,19 +7,14 @@ WIRE_TAGS = "oss"
 -include local/Makefile
 include .bingo/Variables.mk
 
-.PHONY: all deps-go deps-js deps build-go build-backend build-server build-cli build-js build build-docker-full build-docker-full-ubuntu lint-go golangci-lint test-go test-js gen-ts test run run-frontend clean devenv devenv-down protobuf drone help gen-go gen-cue fix-cue
+.PHONY: all deps-go deps-js deps build-go build-backend build-server build-cli build-js build build-docker-full build-docker-full-ubuntu lint-go golangci-lint test-go test-js gen-ts test run run-frontend clean devenv devenv-down protobuf drone help gen-go gen-cue
 
 GO = go
 GO_FILES ?= ./pkg/...
 SH_FILES ?= $(shell find ./scripts -name *.sh)
 GO_BUILD_FLAGS += $(if $(GO_BUILD_DEV),-dev)
-GO_BUILD_FLAGS += $(if $(GO_BUILD_DEV),-dev)
 GO_BUILD_FLAGS += $(if $(GO_BUILD_TAGS),-build-tags=$(GO_BUILD_TAGS))
 
-targets := $(shell echo '$(sources)' | tr "," " ")
-
-GO_INTEGRATION_TESTS := $(shell find ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+' | grep -o '\(.*\)/' | sort -u)
-
 all: deps build
 
 ##@ Dependencies
@@ -51,9 +46,7 @@ $(SPEC_TARGET): $(SWAGGER) ## Generate API Swagger specification
 	SWAGGER_GENERATE_EXTENSION=false $(SWAGGER) generate spec -m -w pkg/server -o $(SPEC_TARGET) \
 	-x "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" \
 	-x "github.com/prometheus/alertmanager" \
-	-i pkg/api/swagger_tags.json \
-	--exclude-tag=alpha
-	go run pkg/services/ngalert/api/tooling/cmd/clean-swagger/main.go -if $@ -of $@
+	-i pkg/api/swagger_tags.json
 
 swagger-api-spec: gen-go $(SPEC_TARGET) $(MERGED_SPEC_TARGET) validate-api-spec
 
@@ -61,7 +54,7 @@ validate-api-spec: $(MERGED_SPEC_TARGET) $(SWAGGER) ## Validate API spec
 	$(SWAGGER) validate $(<)
 
 clean-api-spec:
-	rm -f $(SPEC_TARGET) $(MERGED_SPEC_TARGET) $(OAPI_SPEC_TARGET)
+	rm $(SPEC_TARGET) $(MERGED_SPEC_TARGET) $(OAPI_SPEC_TARGET)
 
 ##@ OpenAPI 3
 OAPI_SPEC_TARGET = public/openapi3.json
@@ -72,24 +65,14 @@ openapi3-gen: swagger-api-spec ## Generates OpenApi 3 specs from the Swagger 2 a
 ##@ Building
 gen-cue: ## Do all CUE/Thema code generation
 	@echo "generate code from .cue files"
-	go generate ./pkg/plugins/plugindef
-	go generate ./kinds/gen.go
-	go generate ./public/app/plugins/gen.go
-	go generate ./pkg/kindsys/report.go
+	go generate ./pkg/framework/coremodel
+	go generate ./public/app/plugins
 
-gen-go: $(WIRE)
+gen-go: $(WIRE) gen-cue
 	@echo "generate go files"
-	$(WIRE) gen -tags $(WIRE_TAGS) ./pkg/server
+	$(WIRE) gen -tags $(WIRE_TAGS) ./pkg/server ./pkg/cmd/grafana-cli/runner
 
-fix-cue: $(CUE)
-	@echo "formatting cue files"
-	$(CUE) fix kinds/**/*.cue
-	$(CUE) fix public/app/plugins/**/**/*.cue
-
-gen-jsonnet:
-	go generate ./devenv/jsonnet
-
-build-go: gen-go ## Build all Go binaries.
+build-go: $(MERGED_SPEC_TARGET) gen-go ## Build all Go binaries.
 	@echo "build go files"
 	$(GO) run build.go $(GO_BUILD_FLAGS) build
 
@@ -131,32 +114,19 @@ test-go-unit: ## Run unit tests for backend with flags.
 .PHONY: test-go-integration
 test-go-integration: ## Run integration tests for backend with flags.
 	@echo "test backend integration tests"
-	$(GO) test -count=1 -run "^TestIntegration" -covermode=atomic -timeout=5m $(GO_INTEGRATION_TESTS)
+	$(GO) test -run Integration -covermode=atomic -timeout=30m ./pkg/...
 
 .PHONY: test-go-integration-postgres
 test-go-integration-postgres: devenv-postgres ## Run integration tests for postgres backend with flags.
 	@echo "test backend integration postgres tests"
 	$(GO) clean -testcache
-	GRAFANA_TEST_DB=postgres \
-	$(GO) test -p=1 -count=1 -run "^TestIntegration" -covermode=atomic -timeout=10m $(GO_INTEGRATION_TESTS)
+	$(GO) list './pkg/...' | xargs -I {} sh -c 'GRAFANA_TEST_DB=postgres go test -run Integration -covermode=atomic -timeout=30m {}'
 
 .PHONY: test-go-integration-mysql
 test-go-integration-mysql: devenv-mysql ## Run integration tests for mysql backend with flags.
 	@echo "test backend integration mysql tests"
-	GRAFANA_TEST_DB=mysql \
-	$(GO) test -p=1 -count=1 -run "^TestIntegration" -covermode=atomic -timeout=10m $(GO_INTEGRATION_TESTS)
-
-.PHONY: test-go-integration-redis
-test-go-integration-redis: ## Run integration tests for redis cache.
-	@echo "test backend integration redis tests"
 	$(GO) clean -testcache
-	REDIS_URL=localhost:6379 $(GO) test -run IntegrationRedis -covermode=atomic -timeout=2m $(GO_INTEGRATION_TESTS)
-
-.PHONY: test-go-integration-memcached
-test-go-integration-memcached: ## Run integration tests for memcached cache.
-	@echo "test backend integration memcached tests"
-	$(GO) clean -testcache
-	MEMCACHED_HOSTS=localhost:11211 $(GO) test -run IntegrationMemcached -covermode=atomic -timeout=2m $(GO_INTEGRATION_TESTS)
+	$(GO) list './pkg/...' | xargs -I {} sh -c 'GRAFANA_TEST_DB=mysql go test -run Integration -covermode=atomic -timeout=30m {}'
 
 test-js: ## Run tests for frontend.
 	@echo "test frontend"
@@ -180,36 +150,19 @@ shellcheck: $(SH_FILES) ## Run checks for shell scripts.
 
 ##@ Docker
 
-TAG_SUFFIX=$(if $(WIRE_TAGS)!=oss,-$(WIRE_TAGS))
-PLATFORM=linux/amd64
-
 build-docker-full: ## Build Docker image for development.
 	@echo "build docker container"
-	tar -ch . | \
-	docker buildx build - \
-	--platform $(PLATFORM) \
-	--build-arg BINGO=false \
-	--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
-	--build-arg WIRE_TAGS=$(WIRE_TAGS) \
-	--build-arg COMMIT_SHA=$$(git rev-parse --short HEAD) \
-	--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
-	--tag grafana/grafana$(TAG_SUFFIX):dev \
-	$(DOCKER_BUILD_ARGS)
+	DOCKER_BUILDKIT=1 \
+	docker build \
+	--tag grafana/grafana:dev .
 
 build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
 	@echo "build docker container"
-	tar -ch . | \
-	docker buildx build - \
-	--platform $(PLATFORM) \
-	--build-arg BINGO=false \
-	--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
-	--build-arg WIRE_TAGS=$(WIRE_TAGS) \
-	--build-arg COMMIT_SHA=$$(git rev-parse --short HEAD) \
-	--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
+	DOCKER_BUILDKIT=1 \
+	docker build \
 	--build-arg BASE_IMAGE=ubuntu:20.04 \
 	--build-arg GO_IMAGE=golang:1.20.4 \
-	--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
-	$(DOCKER_BUILD_ARGS)
+	--tag grafana/grafana:dev-ubuntu .
 
 ##@ Services
 
@@ -220,6 +173,8 @@ devenv:
 	@printf 'You have to define sources for this command \nexample: make devenv sources=postgres,openldap\n'
 else
 devenv: devenv-down ## Start optional services, e.g. postgres, prometheus, and elasticsearch.
+	$(eval targets := $(shell echo '$(sources)' | tr "," " "))
+
 	@cd devenv; \
 	./create_docker_compose.sh $(targets) || \
 	(rm -rf {docker-compose.yaml,conf.tmp,.env}; exit 1)
@@ -272,12 +227,5 @@ drone: $(DRONE)
 	$(DRONE) lint .drone.yml --trusted
 	$(DRONE) --server https://drone.grafana.net sign --save grafana/grafana
 
-# Generate an Emacs tags table (https://www.gnu.org/software/emacs/manual/html_node/emacs/Tags-Tables.html) for Starlark files.
-scripts/drone/TAGS: $(shell find scripts/drone -name '*.star')
-	etags --lang none --regex="/def \(\w+\)[^:]+:/\1/" --regex="/\s*\(\w+\) =/\1/" $^ -o $@
-
-format-drone:
-	buildifier -r scripts/drone
-
 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)

PLUGIN_DEV.md

@@ -0,0 +1,33 @@
+# Plugin development
+
+This document is not meant as a complete guide for developing plugins but more as a changelog for changes in
+Grafana that can impact plugin development. Whenever you as a plugin author encounter an issue with your plugin after
+upgrading Grafana please check here before creating an issue.
+
+## Plugin development resources
+
+- [Grafana plugin developer guide](https://grafana.com/docs/grafana/latest/developers/plugins/)
+- [Webpack Grafana plugin template project](https://github.com/CorpGlory/grafana-plugin-template-webpack)
+- [Simple JSON datasource plugin](https://github.com/grafana/simple-json-datasource)
+
+## Changes in Grafana v4.6
+
+This version of Grafana has big changes that will impact a limited set of plugins. We moved from systemjs to webpack
+for built-in plugins and everything internal. External plugins still use systemjs but now with a limited
+set of Grafana components they can import. Plugins can depend on libs like lodash & moment and internal components
+like before using the same import paths. However since everything in Grafana is no longer accessible, a few plugins could encounter issues when importing a Grafana dependency.
+
+[List of exposed components plugins can import/require](https://github.com/grafana/grafana/blob/main/public/app/features/plugins/plugin_loader.ts#L48)
+
+If you think we missed exposing a crucial lib or Grafana component let us know by opening an issue.
+
+### Deprecated components
+
+The angular directive `<spectrum-picker>` is now deprecated (will still work for a version more) but we recommend plugin authors
+upgrade to new `<color-picker color="ctrl.color" onChange="ctrl.onSparklineColorChange"></color-picker>`
+
+## Changes in Grafana v6.0
+
+### DashboardSrv.ts
+
+If you utilize [DashboardSrv](https://github.com/grafana/grafana/commit/8574dca081002f36e482b572517d8f05fd44453f#diff-1ab99561f9f6a10e1fafcddc39bc1d65) in your plugin code, `dash` was renamed to `dashboard`.

README.md

@@ -18,7 +18,7 @@ Grafana allows you to query, visualize, alert on and understand your metrics no
 ## Get started
 
 - [Get Grafana](https://grafana.com/get)
-- [Installation guides](https://grafana.com/docs/grafana/latest/setup-grafana/installation/)
+- [Installation guides](http://docs.grafana.org/installation/)
 
 Unsure if Grafana is for you? Watch Grafana in action on [play.grafana.org](https://play.grafana.org/)!
 

SECURITY.md

@@ -14,6 +14,7 @@ Grafana Labs will send you a response indicating the next steps in handling your
 
 ## Security announcements
 
-We will post a summary, remediation, and mitigation details for any patch containing security fixes on the Grafana blog. The security announcement blog posts will be tagged with the [security tag](https://grafana.com/tags/security/).
+We maintain a category on the community site called [Security Announcements](https://community.grafana.com/c/support/security-announcements),
+where we will post a summary, remediation, and mitigation details for any patch containing security fixes.
 
-You can also track security announcements via the [RSS feed](https://grafana.com/tags/security/index.xml).
+You can also subscribe to email updates to this category if you have a grafana.com account and sign on to the community site or track updates via an [RSS feed](https://community.grafana.com/c/support/security-announcements.rss).

conf/defaults.ini

@@ -34,9 +34,6 @@ provisioning = conf/provisioning
 # Protocol (http, https, h2, socket)
 protocol = http
 
-# Minimum TLS version allowed. By default, this value is empty. Accepted values are: TLS1.2, TLS1.3. If nothing is set TLS1.2 would be taken
-min_tls_version = ""
-
 # The ip address to bind to, empty will bind to all interfaces
 http_addr =
 
@@ -69,15 +66,6 @@ enable_gzip = false
 cert_file =
 cert_key =
 
-# Unix socket gid
-# Changing the gid of a file without privileges requires that the target group is in the group of the process and that the process is the file owner
-# It is recommended to set the gid as http server user gid
-# Not set when the value is -1
-socket_gid = -1
-
-# Unix socket mode
-socket_mode = 0660
-
 # Unix socket path
 socket = /tmp/grafana.sock
 
@@ -88,19 +76,6 @@ cdn_url =
 # `0` means there is no timeout for reading the request.
 read_timeout = 0
 
-# This setting enables you to specify additional headers that the server adds to HTTP(S) responses.
-[server.custom_response_headers]
-#exampleHeader1 = exampleValue1
-#exampleHeader2 = exampleValue2
-
-#################################### GRPC Server #########################
-[grpc_server]
-network = "tcp"
-address = "127.0.0.1:10000"
-use_tls = false
-cert_file =
-key_file =
-
 #################################### Database ############################
 [database]
 # You can configure the database connection by specifying type, host, name, user and password
@@ -150,21 +125,9 @@ path = grafana.db
 # For "sqlite3" only. cache mode setting used for connecting to the database
 cache_mode = private
 
-# For "sqlite3" only. Enable/disable Write-Ahead Logging, https://sqlite.org/wal.html. Default is false.
-wal = false
-
 # For "mysql" only if migrationLocking feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
 locking_attempt_timeout_sec = 0
 
-# For "sqlite" only. How many times to retry query in case of database is locked failures. Default is 0 (disabled).
-query_retries = 0
-
-# For "sqlite" only. How many times to retry transaction in case of database is locked failures. Default is 5.
-transaction_retries = 5
-
-# Set to true to add metrics and tracing for database queries.
-instrument_queries = false
-
 #################################### Cache server #############################
 [remote_cache]
 # Either "redis", "memcached" or "database" default is "database"
@@ -227,9 +190,6 @@ response_limit = 0
 # Limits the number of rows that Grafana will process from SQL data sources.
 row_limit = 1000000
 
-# Sets a custom value for the `User-Agent` header for outgoing data proxy requests. If empty, the default value is `Grafana/<BuildVersion>` (for example `Grafana/9.0.0`).
-user_agent =
-
 #################################### Analytics ###########################
 [analytics]
 # Server reporting, sends usage counters to stats.grafana.org every 24 hours.
@@ -261,9 +221,6 @@ google_analytics_ua_id =
 # Google Analytics 4 tracking code, only enabled if you specify an id here
 google_analytics_4_id =
 
-# When Google Analytics 4 Enhanced event measurement is enabled, we will try to avoid sending duplicate events and let Google Analytics 4 detect navigation changes, etc.
-google_analytics_4_send_manual_page_views = false
-
 # Google Tag Manager ID, only enabled if you specify an id here
 google_tag_manager_id =
 
@@ -279,9 +236,6 @@ rudderstack_sdk_url =
 # Rudderstack Config url, optional, used by Rudderstack SDK to fetch source config
 rudderstack_config_url =
 
-# Intercom secret, optional, used to hash user_id before passing to Intercom via Rudderstack
-intercom_secret =
-
 # Application Insights connection string. Specify an URL string to enable this feature.
 application_insights_connection_string =
 
@@ -363,21 +317,9 @@ content_security_policy = false
 # $ROOT_PATH is server.root_url without the protocol.
 content_security_policy_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
 
-# Enable adding the Content-Security-Policy-Report-Only header to your requests.
-# Allows you to monitor the effects of a policy without enforcing it.
-content_security_policy_report_only = false
-
-# Set Content Security Policy Report Only template used when adding the Content-Security-Policy-Report-Only header to your requests.
-# $NONCE in the template includes a random nonce.
-# $ROOT_PATH is server.root_url without the protocol.
-content_security_policy_report_only_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
-
 # Controls if old angular plugins are supported or not. This will be disabled by default in future release
 angular_support_enabled = true
 
-# The CSRF check will be executed even if the request has no login cookie.
-csrf_always_check = false
-
 [security.encryption]
 # Defines the time-to-live (TTL) for decrypted data encryption keys stored in memory (cache).
 # Please note that small values may cause performance issues due to a high frequency decryption operations.
@@ -389,9 +331,6 @@ data_keys_cache_cleanup_interval = 1m
 
 #################################### Snapshots ###########################
 [snapshots]
-# set to false to remove snapshot functionality
-enabled = true
-
 # snapshot sharing options
 external_enabled = true
 external_snapshot_url = https://snapshots.raintank.io
@@ -422,21 +361,6 @@ default_home_dashboard_path =
 # Upper limit of data sources that Grafana will return. This limit is a temporary configuration and it will be deprecated when pagination will be introduced on the list data sources API.
 datasource_limit = 5000
 
-
-################################### SQL Data Sources #####################
-[sql_datasources]
-# Default maximum number of open connections maintained in the connection pool
-# when connecting to SQL based data sources
-max_open_conns_default = 100
-
-# Default maximum number of idle connections maintained in the connection pool
-# when connecting to SQL based data sources
-max_idle_conns_default = 100
-
-# Default maximum connection lifetime used when connecting
-# to SQL based data sources.
-max_conn_lifetime_default = 14400
-
 #################################### Users ###############################
 [users]
 # disable user signup / registration
@@ -461,11 +385,11 @@ verify_email_enabled = false
 login_hint = email or username
 password_hint = password
 
-# Default UI theme ("dark" or "light" or "system")
+# Default UI theme ("dark" or "light")
 default_theme = dark
 
-# Default UI language (supported IETF language tag, such as en-US)
-default_language = en-US
+# Default locale (supported IETF language tag, such as en-US)
+default_locale = en-US
 
 # Path to a custom home page. Users are only redirected to this if the default home dashboard is used. It should match a frontend route and contain a leading slash.
 home_page =
@@ -487,33 +411,10 @@ user_invite_max_lifetime_duration = 24h
 # Enter a comma-separated list of usernames to hide them in the Grafana UI. These users are shown to Grafana admins and to themselves.
 hidden_users =
 
-[secretscan]
-# Enable secretscan feature
-enabled = false
-
-# Interval to check for token leaks
-interval = 5m
-
-# base URL of the grafana token leak check service
-base_url = https://secret-scanning.grafana.net
-
-# URL to send outgoing webhooks to in case of detection
-oncall_url =
-
-# Whether to revoke the token if a leak is detected or just send a notification
-revoke = true
-
-[service_accounts]
-# When set, Grafana will not allow the creation of tokens with expiry greater than this setting.
-token_expiration_day_limit =
-
 [auth]
 # Login cookie name
 login_cookie_name = grafana_session
 
-# Disable usage of Grafana build-in login solution.
-disable_login = false
-
 # The maximum lifetime (duration) an authenticated user can be inactive before being required to login at next visit. Default is 7 days (7d). This setting should be expressed as a duration, e.g. 5m (minutes), 6h (hours), 10d (days), 2w (weeks), 1M (month). The lifetime resets at each successful token rotation (token_rotation_interval_minutes).
 login_maximum_inactive_lifetime_duration =
 
@@ -534,14 +435,12 @@ signout_redirect_url =
 
 # Set to true to attempt login with OAuth automatically, skipping the login screen.
 # This setting is ignored if multiple OAuth providers are configured.
-# Deprecated, use auto_login option for specific provider instead.
 oauth_auto_login = false
 
 # OAuth state max age cookie duration in seconds. Defaults to 600 seconds.
 oauth_state_cookie_max_age = 600
 
 # Skip forced assignment of OrgID 1 or 'auto_assign_org_id' for social logins
-# Deprecated, use skip_org_role_sync option for specific provider instead.
 oauth_skip_org_role_update_sync = false
 
 # limit of api_key seconds to live before expiration
@@ -572,11 +471,8 @@ hide_version = false
 
 #################################### GitHub Auth #########################
 [auth.github]
-name = GitHub
-icon = github
 enabled = false
 allow_sign_up = true
-auto_login = false
 client_id = some_id
 client_secret =
 scopes = user:email,read:org
@@ -589,18 +485,11 @@ allowed_organizations =
 role_attribute_path =
 role_attribute_strict = false
 allow_assign_grafana_admin = false
-tls_skip_verify_insecure = false
-tls_client_cert =
-tls_client_key =
-tls_client_ca =
 
 #################################### GitLab Auth #########################
 [auth.gitlab]
-name = GitLab
-icon = gitlab
 enabled = false
 allow_sign_up = true
-auto_login = false
 client_id = some_id
 client_secret =
 scopes = api
@@ -612,20 +501,11 @@ allowed_groups =
 role_attribute_path =
 role_attribute_strict = false
 allow_assign_grafana_admin = false
-skip_org_role_sync = false
-tls_skip_verify_insecure = false
-tls_client_cert =
-tls_client_key =
-tls_client_ca =
-use_pkce = true
 
 #################################### Google Auth #########################
 [auth.google]
-name = Google
-icon = google
 enabled = false
 allow_sign_up = true
-auto_login = false
 client_id = some_client_id
 client_secret =
 scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
@@ -634,12 +514,6 @@ token_url = https://accounts.google.com/o/oauth2/token
 api_url = https://www.googleapis.com/oauth2/v1/userinfo
 allowed_domains =
 hosted_domain =
-skip_org_role_sync = false
-tls_skip_verify_insecure = false
-tls_client_cert =
-tls_client_key =
-tls_client_ca =
-use_pkce = true
 
 #################################### Grafana.com Auth ####################
 # legacy key names (so they work in env variables)
@@ -652,24 +526,18 @@ scopes = user:email
 allowed_organizations =
 
 [auth.grafana_com]
-name = Grafana.com
-icon = grafana
 enabled = false
 allow_sign_up = true
-auto_login = false
 client_id = some_id
 client_secret =
 scopes = user:email
 allowed_organizations =
-skip_org_role_sync = false
 
 #################################### Azure AD OAuth #######################
 [auth.azuread]
-name = Microsoft
-icon = microsoft
+name = Azure AD
 enabled = false
 allow_sign_up = true
-auto_login = false
 client_id = some_client_id
 client_secret =
 scopes = openid email profile
@@ -680,11 +548,6 @@ allowed_groups =
 role_attribute_strict = false
 allow_assign_grafana_admin = false
 force_use_graph_api = false
-tls_skip_verify_insecure = false
-tls_client_cert =
-tls_client_key =
-tls_client_ca =
-use_pkce = true
 
 #################################### Okta OAuth #######################
 [auth.okta]
@@ -692,7 +555,6 @@ name = Okta
 icon = okta
 enabled = false
 allow_sign_up = true
-auto_login = false
 client_id = some_id
 client_secret =
 scopes = openid profile email groups
@@ -704,12 +566,6 @@ allowed_groups =
 role_attribute_path =
 role_attribute_strict = false
 allow_assign_grafana_admin = false
-skip_org_role_sync = false
-tls_skip_verify_insecure = false
-tls_client_cert =
-tls_client_key =
-tls_client_ca =
-use_pkce = true
 
 #################################### Generic OAuth #######################
 [auth.generic_oauth]
@@ -717,7 +573,6 @@ name = OAuth
 icon = signin
 enabled = false
 allow_sign_up = true
-auto_login = false
 client_id = some_id
 client_secret =
 scopes = user:email
@@ -736,7 +591,6 @@ token_url =
 api_url =
 teams_url =
 allowed_domains =
-allowed_groups =
 team_ids =
 allowed_organizations =
 tls_skip_verify_insecure = false
@@ -746,7 +600,6 @@ tls_client_ca =
 use_pkce = false
 auth_style =
 allow_assign_grafana_admin = false
-skip_org_role_sync = false
 
 #################################### Basic Auth ##########################
 [auth.basic]
@@ -774,14 +627,13 @@ username_claim =
 jwk_set_url =
 jwk_set_file =
 cache_ttl = 60m
-expect_claims = {}
+expected_claims = {}
 key_file =
 role_attribute_path =
 role_attribute_strict = false
 auto_sign_up = false
 url_login = false
 allow_assign_grafana_admin = false
-skip_org_role_sync = false
 
 #################################### Auth LDAP ###########################
 [auth.ldap]
@@ -824,32 +676,11 @@ managed_identity_enabled = false
 # Should be set for user-assigned identity and should be empty for system-assigned identity
 managed_identity_client_id =
 
-# Specifies whether user identity authentication (on behalf of currently signed-in user) should be enabled in datasources
-# that support it (requires AAD authentication)
-# Disabled by default, needs to be explicitly enabled
-user_identity_enabled = false
-
-# Override token URL for Azure Active Directory
-# By default is the same as token URL configured for AAD authentication settings
-user_identity_token_url =
-
-# Override ADD application ID which would be used to exchange users token to an access token for the datasource
-# By default is the same as used in AAD authentication or can be set to another application (for OBO flow)
-user_identity_client_id =
-
-# Override the AAD application client secret
-# By default is the same as used in AAD authentication or can be set to another application (for OBO flow)
-user_identity_client_secret =
-
 #################################### Role-based Access Control ###########
 [rbac]
 # If enabled, cache permissions in a in memory cache
 permission_cache = true
 
-# Reset basic roles permissions on boot
-# Warning left to true, basic roles permissions will be reset on every boot
-reset_basic_roles = false
-
 #################################### SMTP / Emailing #####################
 [smtp]
 enabled = false
@@ -928,12 +759,21 @@ facility =
 tag =
 
 [log.frontend]
-# Should Faro javascript agent be initialized
+# Should Sentry javascript agent be initialized
 enabled = false
 
+# Defines which provider to use sentry or grafana
+provider = sentry
+
+# Sentry DSN if you want to send events to Sentry.
+sentry_dsn =
+
 # Custom HTTP endpoint to send events to. Default will log the events to stdout.
 custom_endpoint =
 
+# Rate of events to be reported to Sentry between 0 (none) and 1 (all), float
+sample_rate = 1.0
+
 # Requests per second limit enforced per an extended period, for Grafana backend log ingestion endpoint (/log).
 log_endpoint_requests_per_second_limit = 3
 
@@ -996,9 +836,6 @@ global_alert_rule = -1
 # global limit of files uploaded to the SQL DB
 global_file = 1000
 
-# global limit of correlations
-global_correlations = -1
-
 #################################### Unified Alerting ####################
 [unified_alerting]
 # Enable the Unified Alerting sub-system and interface. When enabled we'll migrate all of your alert rules and notification channels to the new system. New alert rules will be created and your notification channels will be converted into an Alertmanager configuration. Previous data is preserved to enable backwards compatibility but new data is removed when switching. When this configuration section and flag are not defined, the state is defined at runtime. See the documentation for more details.
@@ -1015,26 +852,6 @@ admin_config_poll_interval = 60s
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 alertmanager_config_poll_interval = 60s
 
-# The redis server address that should be connected to.
-ha_redis_address =
-
-# The username that should be used to authenticate with the redis server.
-ha_redis_username =
-
-# The password that should be used to authenticate with the redis server.
-ha_redis_password =
-
-# The redis database, by default it's 0.
-ha_redis_db =
-
-# A prefix that is used for every key or channel that is created on the redis server
-# as part of HA for alerting.
-ha_redis_prefix =
-
-# The name of the cluster peer that will be used as identifier. If none is
-# provided, a random one will be generated.
-ha_redis_peer_name =
-
 # Listen address/hostname and port to receive unified alerting messages for other Grafana instances. The port is used for both TCP and UDP. It is assumed other Grafana instances are also running on the same port.
 ha_listen_address = "0.0.0.0:9094"
 
@@ -1050,11 +867,6 @@ ha_peers = ""
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ha_peer_timeout = 15s
 
-# The label is an optional string to include on each packet and stream.
-# It uniquely identifies the cluster and prevents cross-communication
-# issues when sending gossip messages in an enviromenet with multiple clusters.
-ha_label =
-
 # The interval between sending gossip messages. By lowering this value (more frequent) gossip messages are propagated
 # across cluster more quickly at the expense of increased bandwidth usage.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
@@ -1080,17 +892,10 @@ max_attempts = 3
 min_interval = 10s
 
 [unified_alerting.screenshots]
-# Enable screenshots in notifications. You must have either installed the Grafana image rendering
-# plugin, or set up Grafana to use a remote rendering service.
+# Enable screenshots in notifications. This option requires the Grafana Image Renderer plugin.
 # For more information on configuration options, refer to [rendering].
 capture = false
 
-# The timeout for capturing screenshots. If a screenshot cannot be captured within the timeout then
-# the notification is sent without a screenshot. The maximum duration is 30 seconds. This timeout
-# should be less than the minimum Interval of all Evaluation Groups to avoid back pressure on alert
-# rule evaluation.
-capture_timeout = 10s
-
 # The maximum number of screenshots that can be taken at the same time. This option is different from
 # concurrent_render_request_limit as max_concurrent_screenshots sets the number of concurrent screenshots
 # that can be taken at the same time for all firing alerts where as concurrent_render_request_limit sets
@@ -1107,58 +912,6 @@ upload_external_image_storage = false
 # For example: `disabled_labels=grafana_folder`
 disabled_labels =
 
-[unified_alerting.state_history]
-# Enable the state history functionality in Unified Alerting. The previous states of alert rules will be visible in panels and in the UI.
-enabled = true
-
-# Select which pluggable state history backend to use. Either "annotations", "loki", or "multiple"
-# "loki" writes state history to an external Loki instance. "multiple" allows history to be written to multiple backends at once.
-# Defaults to "annotations".
-backend =
-
-# For "multiple" only.
-# Indicates the main backend used to serve state history queries.
-# Either "annotations" or "loki"
-primary =
-
-# For "multiple" only.
-# Comma-separated list of additional backends to write state history data to.
-secondaries =
-
-# For "loki" only.
-# URL of the external Loki instance.
-# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
-loki_remote_url =
-
-# For "loki" only.
-# URL of the external Loki's read path. To be used in configurations where Loki has separated read and write URLs.
-# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
-loki_remote_read_url =
-
-# For "loki" only.
-# URL of the external Loki's write path. To be used in configurations where Loki has separated read and write URLs.
-# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
-loki_remote_write_url =
-
-# For "loki" only.
-# Optional tenant ID to attach to requests sent to Loki.
-loki_tenant_id =
-
-# For "loki" only.
-# Optional username for basic authentication on requests sent to Loki. Can be left blank to disable basic auth.
-loki_basic_auth_username =
-
-# For "loki" only.
-# Optional password for basic authentication on requests sent to Loki. Can be left blank.
-loki_basic_auth_password =
-
-[unified_alerting.state_history.external_labels]
-# Optional extra labels to attach to outbound state history records or log streams.
-# Any number of label key-value-pairs can be provided.
-#
-# ex.
-# mylabelkey = mylabelvalue
-
 #################################### Alerting ############################
 [alerting]
 # Enable the legacy alerting sub-system and interface. If Unified Alerting is already enabled and you try to go back to legacy alerting, all data that is part of Unified Alerting will be deleted. When this configuration section and flag are not defined, the state is defined at runtime. See the documentation for more details.
@@ -1241,11 +994,6 @@ enabled = true
 # Enable the Profile section
 enabled = true
 
-#################################### News #############################
-[news]
-# Enable the news feed section
-news_feed_enabled = true
-
 #################################### Query History #############################
 [query_history]
 # Enable the Query history
@@ -1281,7 +1029,6 @@ url = https://grafana.com
 
 [grafana_com]
 url = https://grafana.com
-api_url = https://grafana.com/api
 
 #################################### Distributed tracing ############
 # Opentracing is deprecated use opentelemetry instead
@@ -1359,7 +1106,6 @@ signed_url_expiration =
 account_name =
 account_key =
 container_name =
-sas_token_expiration_days =
 
 [external_image_storage.local]
 # does not require any configuration
@@ -1375,11 +1121,6 @@ renderer_token = -
 # Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
 # which this setting can help protect against by only allowing a certain amount of concurrent requests.
 concurrent_render_request_limit = 30
-# Determines the lifetime of the render key used by the image renderer to access and render Grafana.
-# This setting should be expressed as a duration. Examples: 10s (seconds), 5m (minutes), 2h (hours).
-# Default is 5m. This should be more than enough for most deployments.
-# Change the value only if image rendering is failing and you see `Failed to get the render key from cache` in Grafana logs.
-render_key_lifetime = 5m
 
 [panels]
 # here for to support old env variables, can remove after a few months
@@ -1397,10 +1138,6 @@ plugin_admin_external_manage_enabled = false
 plugin_catalog_url = https://grafana.com/grafana/plugins/
 # Enter a comma-separated list of plugin identifiers to hide in the plugin catalog.
 plugin_catalog_hidden_plugins =
-# Log all backend requests for core and external plugins.
-log_backend_requests = false
-# Force download of public key for verifying plugin signature on startup.
-enforce_public_key_download = false
 
 #################################### Grafana Live ##########################################
 [live]
@@ -1498,10 +1235,20 @@ license_path =
 # enable = feature1,feature2
 enable =
 
-# Some features are enabled by default, see:
-# https://grafana.com/docs/grafana/next/setup-grafana/configure-grafana/feature-toggles/
-# To enable features by default, set `Expression:  "true"` in:
-# https://github.com/grafana/grafana/blob/main/pkg/services/featuremgmt/registry.go
+# The new prometheus visual query builder
+promQueryBuilder = true
+
+# The new loki visual query builder
+lokiQueryBuilder = true
+
+# Experimental Explore to Dashboard workflow
+explore2Dashboard = true
+
+# Command Palette
+commandPalette = true
+
+# Use dynamic labels in CloudWatch datasource
+cloudWatchDynamicLabels = true
 
 # feature1 = true
 # feature2 = false
@@ -1537,14 +1284,25 @@ default_baselayer_config =
 # Enable or disable loading other base map layers
 enable_custom_baselayers = true
 
-#################################### Support Bundles #####################################
-[support_bundles]
-# Enable support bundle creation (default: true)
-enabled = true
-# Only server admins can generate and view support bundles (default: true)
-server_admin_only = true
-# If set, bundles will be encrypted with the provided public keys separated by whitespace
-public_keys = ""
+#################################### Dashboard previews #####################################
+
+[dashboard_previews.crawler]
+# Number of dashboards rendered in parallel. Default is 6.
+thread_count =
+
+# Timeout passed down to the Image Renderer plugin. It is used in two separate places within a single rendering request:
+# First during the initial navigation to the dashboard and then when waiting for all the panels to load. Default is 20s.
+# This setting should be expressed as a duration. Examples: 10s (seconds), 1m (minutes).
+rendering_timeout =
+
+# Maximum duration of a single crawl. Default is 1h.
+# This setting should be expressed as a duration. Examples: 10s (seconds), 1m (minutes).
+max_crawl_duration =
+
+# Minimum interval between two subsequent scheduler runs. Default is 12h.
+# This setting should be expressed as a duration. Examples: 10s (seconds), 1m (minutes).
+scheduler_interval =
+
 
 #################################### Storage ################################################
 
@@ -1567,25 +1325,3 @@ full_reindex_interval = 5m
 # Defines the frequency of partial index updates based on recent changes such as dashboard updates.
 # This is a temporary settings that might be removed in the future.
 index_update_interval = 10s
-
-
-# Move an app plugin referenced by its id (including all its pages) to a specific navigation section
-# Format: <Plugin ID> = <Section ID> <Sort Weight>
-[navigation.app_sections]
-
-# Move a specific app plugin page (referenced by its `path` field) to a specific navigation section
-# Format: <Page URL> = <Section ID> <Sort Weight>
-[navigation.app_standalone_pages]
-
-
-#################################### Secure Socks5 Datasource Proxy #####################################
-[secure_socks_datasource_proxy]
-enabled = false
-root_ca_cert =
-client_key =
-client_cert =
-server_name =
-# The address of the socks5 proxy datasources should connect to
-proxy_address =
-# Determines if the secure socks proxy should be shown on the datasources page, defaults to true if the feature is enabled
-show_ui = true

conf/ldap.toml

@@ -11,11 +11,6 @@ port = 389
 use_ssl = false
 # If set to true, use LDAP with STARTTLS instead of LDAPS
 start_tls = false
-# The value of an accepted TLS cipher. By default, this value is empty. Example value: ["TLS_AES_256_GCM_SHA384"])
-# For a complete list of supported ciphers and TLS versions, refer to: https://go.dev/src/crypto/tls/cipher_suites.go
-tls_ciphers = []
-# This is the minimum TLS version allowed. By default, this value is empty. Accepted values are: TLS1.1, TLS1.2, TLS1.3.
-min_tls_version = ""
 # set to true if you want to skip ssl cert validation
 ssl_skip_verify = false
 # set to the path to your root CA certificate or leave unset to use system defaults
@@ -29,8 +24,6 @@ bind_dn = "cn=admin,dc=grafana,dc=org"
 # Search user bind password
 # If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
 bind_password = 'grafana'
-# We recommend using variable expansion for the bind_password, for more info https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#variable-expansion
-# bind_password = '$__env{LDAP_BIND_PASSWORD}'
 
 # Timeout in seconds (applies to each host specified in the 'host' entry (space separated))
 timeout = 10
@@ -65,7 +58,7 @@ org_role = "Admin"
 # org_id = 1
 
 [[servers.group_mappings]]
-group_dn = "cn=editors,ou=groups,dc=grafana,dc=org"
+group_dn = "cn=users,ou=groups,dc=grafana,dc=org"
 org_role = "Editor"
 
 [[servers.group_mappings]]

conf/provisioning/alerting/sample.yaml

@@ -11,7 +11,7 @@ apiVersion: 1
 #     folder: my_first_folder
 #     # <duration, required> interval of the rule group evaluation
 #     interval: 60s
-#     # <list, required> list of rules that are part of the rule group
+#     # <list, required> list of rules that are part of the rule group  
 #     rules:
 #       # <string, required> unique identifier for the rule
 #     - uid: my_id_1
@@ -53,7 +53,7 @@ apiVersion: 1
 #       # <string> state of the alert rule when no data is returned
 #       #          possible values: "NoData", "Alerting", "OK", default = NoData
 #       noDataState: Alerting
-#       # <string> state of the alert rule when the query execution
+#       # <string> state of the alert rule when the query execution 
 #       #          fails - possible values: "Error", "Alerting", "OK"
 #       #          default = Alerting
 #       executionErrorState: Alerting
@@ -62,11 +62,10 @@ apiVersion: 1
 #       # <map<string, string>> map of strings to attach arbitrary custom data
 #       annotations:
 #         some_key: some_value
-#       # <map<string, string> map of strings to filter and
+#       # <map<string, string> map of strings to filter and 
 #       #                      route alerts
 #       labels:
 #         team: sre_team_1
-#       isPaused: false
 
 # # List of alert rule UIDs that should be deleted
 # deleteRules:
@@ -104,7 +103,7 @@ apiVersion: 1
 #     # <list<string>> The labels by which incoming alerts are grouped together. For example,
 #     #        multiple alerts coming in for cluster=A and alertname=LatencyHigh would
 #     #        be batched into a single group.
-#     #
+#     # 
 #     #        To aggregate by all possible labels, use the special value '...' as
 #     #        the sole label name, for example:
 #     #        group_by: ['...']
@@ -128,18 +127,18 @@ apiVersion: 1
 #     mute_time_intervals:
 #     - abc
 #     # <duration> How long to initially wait to send a notification for a group
-#     #            of alerts. Allows to collect more initial alerts for the same group.
+#     #            of alerts. Allows to collect more initial alerts for the same group. 
 #     #            (Usually ~0s to few minutes), default = 30s
 #     group_wait: 30s
 #     # <duration> How long to wait before sending a notification about new alerts that
 #     #            are added to a group of alerts for which an initial notification has
 #     #            already been sent. (Usually ~5m or more), default = 5m
-#     group_interval: 5m
+#     group_internval: 5m
 #     # <duration>  How long to wait before sending a notification again if it has already
 #     #             been sent successfully for an alert. (Usually ~3h or more), default = 4h
 #     repeat_interval: 4h
 #     # <list> Zero or more child routes
-#     routes:
+#     routes: 
 #     ...
 
 # # List of orgIds that should be reset to the default policy

conf/sample.ini

@@ -34,9 +34,6 @@
 # Protocol (http, https, h2, socket)
 ;protocol = http
 
-# This is the minimum TLS version allowed. By default, this value is empty. Accepted values are: TLS1.2, TLS1.3. If nothing is set TLS1.2 would be taken
-;min_tls_version = ""
-
 # The ip address to bind to, empty will bind to all interfaces
 ;http_addr =
 
@@ -70,15 +67,6 @@
 ;cert_file =
 ;cert_key =
 
-# Unix socket gid
-# Changing the gid of a file without privileges requires that the target group is in the group of the process and that the process is the file owner
-# It is recommended to set the gid as http server user gid
-# Not set when the value is -1
-;socket_gid =
-
-# Unix socket mode
-;socket_mode =
-
 # Unix socket path
 ;socket =
 
@@ -89,19 +77,6 @@
 # `0` means there is no timeout for reading the request.
 ;read_timeout = 0
 
-# This setting enables you to specify additional headers that the server adds to HTTP(S) responses.
-[server.custom_response_headers]
-#exampleHeader1 = exampleValue1
-#exampleHeader2 = exampleValue2
-
-#################################### GRPC Server #########################
-;[grpc_server]
-;network = "tcp"
-;address = "127.0.0.1:10000"
-;use_tls = false
-;cert_file =
-;key_file =
-
 #################################### Database ####################################
 [database]
 # You can configure the database connection by specifying type, host, name, user and password
@@ -119,8 +94,7 @@
 # Example: mysql://user:secret@host:port/database
 ;url =
 
-# For "postgres", use either "disable", "require" or "verify-full"
-# For "mysql", use either "true", "false", or "skip-verify".
+# For "postgres" only, either "disable", "require" or "verify-full"
 ;ssl_mode = disable
 
 # Database drivers may support different transaction isolation levels.
@@ -152,21 +126,9 @@
 # For "sqlite3" only. cache mode setting used for connecting to the database. (private, shared)
 ;cache_mode = private
 
-# For "sqlite3" only. Enable/disable Write-Ahead Logging, https://sqlite.org/wal.html. Default is false.
-;wal = false
-
 # For "mysql" only if migrationLocking feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
 ;locking_attempt_timeout_sec = 0
 
-# For "sqlite" only. How many times to retry query in case of database is locked failures. Default is 0 (disabled).
-;query_retries = 0
-
-# For "sqlite" only. How many times to retry transaction in case of database is locked failures. Default is 5.
-;transaction_retries = 5
-
-# Set to true to add metrics and tracing for database queries.
-;instrument_queries = false
-
 ################################### Data sources #########################
 [datasources]
 # Upper limit of data sources that Grafana will return. This limit is a temporary configuration and it will be deprecated when pagination will be introduced on the list data sources API.
@@ -234,9 +196,6 @@
 # Limits the number of rows that Grafana will process from SQL data sources.
 ;row_limit = 1000000
 
-# Sets a custom value for the `User-Agent` header for outgoing data proxy requests. If empty, the default value is `Grafana/<BuildVersion>` (for example `Grafana/9.0.0`).
-;user_agent =
-
 #################################### Analytics ####################################
 [analytics]
 # Server reporting, sends usage counters to stats.grafana.org every 24 hours.
@@ -266,10 +225,7 @@
 ;google_analytics_ua_id =
 
 # Google Analytics 4 tracking code, only enabled if you specify an id here
-;google_analytics_4_id =
-
-# When Google Analytics 4 Enhanced event measurement is enabled, we will try to avoid sending duplicate events and let Google Analytics 4 detect navigation changes, etc.
-;google_analytics_4_send_manual_page_views = false
+;google_analytics_4_id = 
 
 # Google Tag Manager ID, only enabled if you specify an id here
 ;google_tag_manager_id =
@@ -286,9 +242,6 @@
 # Rudderstack Config url, optional, used by Rudderstack SDK to fetch source config
 ;rudderstack_config_url =
 
-# Intercom secret, optional, used to hash user_id before passing to Intercom via Rudderstack
-;intercom_secret =
-
 # Controls if the UI contains any links to user feedback forms
 ;feedback_links_enabled = true
 
@@ -364,14 +317,6 @@
 # $ROOT_PATH is server.root_url without the protocol.
 ;content_security_policy_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
 
-# Enable adding the Content-Security-Policy-Report-Only header to your requests.
-# Allows you to monitor the effects of a policy without enforcing it.
-;content_security_policy_report_only = false
-
-# Set Content Security Policy Report Only template used when adding the Content-Security-Policy-Report-Only header to your requests.
-# $NONCE in the template includes a random nonce.
-# $ROOT_PATH is server.root_url without the protocol.
-;content_security_policy_report_only_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
 # Controls if old angular plugins are supported or not. This will be disabled by default in future release
 ;angular_support_enabled = true
 
@@ -381,9 +326,6 @@
 # List of allowed headers to be set by the user, separated by spaces. Suggested to use for if authentication lives behind reverse proxies.
 ;csrf_additional_headers =
 
-# The CSRF check will be executed even if the request has no login cookie.
-;csrf_always_check = false
-
 [security.encryption]
 # Defines the time-to-live (TTL) for decrypted data encryption keys stored in memory (cache).
 # Please note that small values may cause performance issues due to a high frequency decryption operations.
@@ -395,9 +337,6 @@
 
 #################################### Snapshots ###########################
 [snapshots]
-# set to false to remove snapshot functionality
-;enabled = true
-
 # snapshot sharing options
 ;external_enabled = true
 ;external_snapshot_url = https://snapshots.raintank.io
@@ -436,7 +375,7 @@
 # Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true)
 ;auto_assign_org_id = 1
 
-# Default role new users will be automatically assigned (if auto_assign_org above is set to true)
+# Default role new users will be automatically assigned (if disabled above is set to true)
 ;auto_assign_org_role = Viewer
 
 # Require email validation before sign up completes
@@ -449,8 +388,8 @@
 # Default UI theme ("dark" or "light")
 ;default_theme = dark
 
-# Default UI language (supported IETF language tag, such as en-US)
-;default_language = en-US
+# Default locale (supported IETF language tag, such as en-US)
+;default_locale = en-US
 
 # Path to a custom home page. Users are only redirected to this if the default home dashboard is used. It should match a frontend route and contain a leading slash.
 ;home_page =
@@ -472,34 +411,10 @@
 # Enter a comma-separated list of users login to hide them in the Grafana UI. These users are shown to Grafana admins and themselves.
 ; hidden_users =
 
-[secretscan]
-# Enable secretscan feature
-;enabled = false
-
-# Interval to check for token leaks
-;interval = 5m
-
-# base URL of the grafana token leak check service
-;base_url = https://secret-scanning.grafana.net
-
-# URL to send outgoing webhooks to in case of detection
-;oncall_url =
-
-# Whether to revoke the token if a leak is detected or just send a notification
-;revoke = true
-
-[service_accounts]
-# Service account maximum expiration date in days.
-# When set, Grafana will not allow the creation of tokens with expiry greater than this setting.
-; token_expiration_day_limit =
-
 [auth]
 # Login cookie name
 ;login_cookie_name = grafana_session
 
-# Disable usage of Grafana build-in login solution.
-;disable_login = false
-
 # The maximum lifetime (duration) an authenticated user can be inactive before being required to login at next visit. Default is 7 days (7d). This setting should be expressed as a duration, e.g. 5m (minutes), 6h (hours), 10d (days), 2w (weeks), 1M (month). The lifetime resets at each successful token rotation.
 ;login_maximum_inactive_lifetime_duration =
 
@@ -520,14 +435,12 @@
 
 # Set to true to attempt login with OAuth automatically, skipping the login screen.
 # This setting is ignored if multiple OAuth providers are configured.
-# Deprecated, use auto_login option for specific provider instead.
 ;oauth_auto_login = false
 
 # OAuth state max age cookie duration in seconds. Defaults to 600 seconds.
 ;oauth_state_cookie_max_age = 600
 
 # Skip forced assignment of OrgID 1 or 'auto_assign_org_id' for social logins
-# Deprecated, use skip_org_role_sync option for specific provider instead.
 ;oauth_skip_org_role_update_sync = false
 
 # limit of api_key seconds to live before expiration
@@ -542,9 +455,6 @@
 # Set to true to enable Azure authentication option for HTTP-based datasources.
 ;azure_auth_enabled = false
 
-# Set to skip the organization role from JWT login and use system's role assignment instead.
-; skip_org_role_sync = false
-
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -561,11 +471,8 @@
 
 #################################### GitHub Auth ##########################
 [auth.github]
-;name = GitHub
-;icon = github
 ;enabled = false
 ;allow_sign_up = true
-;auto_login = false
 ;client_id = some_id
 ;client_secret = some_secret
 ;scopes = user:email,read:org
@@ -581,11 +488,8 @@
 
 #################################### GitLab Auth #########################
 [auth.gitlab]
-;name = GitLab
-;icon = gitlab
 ;enabled = false
 ;allow_sign_up = true
-;auto_login = false
 ;client_id = some_id
 ;client_secret = some_secret
 ;scopes = api
@@ -597,20 +501,11 @@
 ;role_attribute_path =
 ;role_attribute_strict = false
 ;allow_assign_grafana_admin = false
-;skip_org_role_sync = false
-;tls_skip_verify_insecure = false
-;tls_client_cert =
-;tls_client_key =
-;tls_client_ca =
-;use_pkce = true
 
 #################################### Google Auth ##########################
 [auth.google]
-;name = Google
-;icon = google
 ;enabled = false
 ;allow_sign_up = true
-;auto_login = false
 ;client_id = some_client_id
 ;client_secret = some_client_secret
 ;scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
@@ -619,29 +514,21 @@
 ;api_url = https://www.googleapis.com/oauth2/v1/userinfo
 ;allowed_domains =
 ;hosted_domain =
-;skip_org_role_sync = false
-;use_pkce = true
 
 #################################### Grafana.com Auth ####################
 [auth.grafana_com]
-;name = Grafana.com
-;icon = grafana
 ;enabled = false
 ;allow_sign_up = true
-;auto_login = false
 ;client_id = some_id
 ;client_secret = some_secret
 ;scopes = user:email
 ;allowed_organizations =
-;skip_org_role_sync = false
 
 #################################### Azure AD OAuth #######################
 [auth.azuread]
-;name = Microsoft
-;icon = microsoft
+;name = Azure AD
 ;enabled = false
 ;allow_sign_up = true
-;auto_login = false
 ;client_id = some_client_id
 ;client_secret = some_client_secret
 ;scopes = openid email profile
@@ -651,16 +538,12 @@
 ;allowed_groups =
 ;role_attribute_strict = false
 ;allow_assign_grafana_admin = false
-;use_pkce = true
-# prevent synchronizing users organization roles
-;skip_org_role_sync = false
 
 #################################### Okta OAuth #######################
 [auth.okta]
 ;name = Okta
 ;enabled = false
 ;allow_sign_up = true
-;auto_login = false
 ;client_id = some_id
 ;client_secret = some_secret
 ;scopes = openid profile email groups
@@ -672,15 +555,12 @@
 ;role_attribute_path =
 ;role_attribute_strict = false
 ;allow_assign_grafana_admin = false
-;skip_org_role_sync = false
-;use_pkce = true
 
 #################################### Generic OAuth ##########################
 [auth.generic_oauth]
 ;enabled = false
 ;name = OAuth
 ;allow_sign_up = true
-;auto_login = false
 ;client_id = some_id
 ;client_secret = some_secret
 ;scopes = user:email,read:org
@@ -736,7 +616,7 @@
 ;jwk_set_url = https://foo.bar/.well-known/jwks.json
 ;jwk_set_file = /path/to/jwks.json
 ;cache_ttl = 60m
-;expect_claims = {"aud": ["foo", "bar"]}
+;expected_claims = {"aud": ["foo", "bar"]}
 ;key_file = /path/to/key/file
 ;role_attribute_path =
 ;role_attribute_strict = false
@@ -783,31 +663,9 @@
 # Should be set for user-assigned identity and should be empty for system-assigned identity
 ;managed_identity_client_id =
 
-# Specifies whether user identity authentication (on behalf of currently signed-in user) should be enabled in datasources
-# that support it (requires AAD authentication)
-# Disabled by default, needs to be explicitly enabled
-;user_identity_enabled = false
-
-# Override token URL for Azure Active Directory
-# By default is the same as token URL configured for AAD authentication settings
-;user_identity_token_url =
-
-# Override ADD application ID which would be used to exchange users token to an access token for the datasource
-# By default is the same as used in AAD authentication or can be set to another application (for OBO flow)
-;user_identity_client_id =
-
-# Override the AAD application client secret
-# By default is the same as used in AAD authentication or can be set to another application (for OBO flow)
-;user_identity_client_secret =
-
 #################################### Role-based Access Control ###########
 [rbac]
 ;permission_cache = true
-
-# Reset basic roles permissions on boot
-# Warning left to true, basic roles permissions will be reset on every boot
-#reset_basic_roles = false
-
 #################################### SMTP / Emailing ##########################
 [smtp]
 ;enabled = false
@@ -888,11 +746,20 @@
 ;tag =
 
 [log.frontend]
-# Should Faro javascript agent be initialized
+# Should Sentry javascript agent be initialized
 ;enabled = false
 
-# Custom HTTP endpoint to send events to. Default will log the events to stdout.
-;custom_endpoint = /log-grafana-javascript-agent
+# Defines which provider to use, default is Sentry
+;provider = sentry
+
+# Sentry DSN if you want to send events to Sentry.
+;sentry_dsn =
+
+# Custom HTTP endpoint to send events captured by the Sentry agent to. Default will log the events to stdout.
+;custom_endpoint = /log
+
+# Rate of events to be reported between 0 (none) and 1 (all), float
+;sample_rate = 1.0
 
 # Requests per second limit enforced an extended period, for Grafana backend log ingestion endpoint (/log).
 ;log_endpoint_requests_per_second_limit = 3
@@ -953,9 +820,6 @@
 # global limit of alerts
 ;global_alert_rule = -1
 
-# global limit of correlations
-; global_correlations = -1
-
 #################################### Unified Alerting ####################
 [unified_alerting]
 #Enable the Unified Alerting sub-system and interface. When enabled we'll migrate all of your alert rules and notification channels to the new system. New alert rules will be created and your notification channels will be converted into an Alertmanager configuration. Previous data is preserved to enable backwards compatibility but new data is removed.```
@@ -972,26 +836,6 @@
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ;alertmanager_config_poll_interval = 60s
 
-# The redis server address that should be connected to.
-;ha_redis_address =
-
-# The username that should be used to authenticate with the redis server.
-;ha_redis_username =
-
-# The password that should be used to authenticate with the redis server.
-;ha_redis_password =
-
-# The redis database, by default it's 0.
-;ha_redis_db =
-
-# A prefix that is used for every key or channel that is created on the redis server
-# as part of HA for alerting.
-;ha_redis_prefix =
-
-# The name of the cluster peer that will be used as identifier. If none is
-# provided, a random one will be generated.
-;ha_redis_peer_name =
-
 # Listen address/hostname and port to receive unified alerting messages for other Grafana instances. The port is used for both TCP and UDP. It is assumed other Grafana instances are also running on the same port. The default value is `0.0.0.0:9094`.
 ;ha_listen_address = "0.0.0.0:9094"
 
@@ -1007,11 +851,6 @@
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ;ha_peer_timeout = "15s"
 
-# The label is an optional string to include on each packet and stream.
-# It uniquely identifies the cluster and prevents cross-communication
-# issues when sending gossip messages in an enviromenet with multiple clusters.
-;ha_label =
-
 # The interval between sending gossip messages. By lowering this value (more frequent) gossip messages are propagated
 # across cluster more quickly at the expense of increased bandwidth usage.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
@@ -1041,56 +880,6 @@
 # For example: `disabled_labels=grafana_folder`
 ;disabled_labels =
 
-[unified_alerting.state_history]
-# Enable the state history functionality in Unified Alerting. The previous states of alert rules will be visible in panels and in the UI.
-; enabled = true
-
-# Select which pluggable state history backend to use. Either "annotations", "loki", or "multiple"
-# "loki" writes state history to an external Loki instance. "multiple" allows history to be written to multiple backends at once.
-# Defaults to "annotations".
-; backend = "multiple"
-
-# For "multiple" only.
-# Indicates the main backend used to serve state history queries.
-# Either "annotations" or "loki"
-; primary = "loki"
-
-# For "multiple" only.
-# Comma-separated list of additional backends to write state history data to.
-; secondaries = "annotations"
-
-# For "loki" only.
-# URL of the external Loki instance.
-# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
-; loki_remote_url = "http://loki:3100"
-
-# For "loki" only.
-# URL of the external Loki's read path. To be used in configurations where Loki has separated read and write URLs.
-# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
-; loki_remote_read_url = "http://loki-querier:3100"
-
-# For "loki" only.
-# URL of the external Loki's write path. To be used in configurations where Loki has separated read and write URLs.
-# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
-; loki_remote_write_url = "http://loki-distributor:3100"
-
-# For "loki" only.
-# Optional tenant ID to attach to requests sent to Loki.
-; loki_tenant_id = 123
-
-# For "loki" only.
-# Optional username for basic authentication on requests sent to Loki. Can be left blank to disable basic auth.
-; loki_basic_auth_username = "myuser"
-
-# For "loki" only.
-# Optional password for basic authentication on requests sent to Loki. Can be left blank.
-; loki_basic_auth_password = "mypass"
-
-[unified_alerting.state_history.external_labels]
-# Optional extra labels to attach to outbound state history records or log streams.
-# Any number of label key-value-pairs can be provided.
-; mylabelkey = mylabelvalue
-
 #################################### Alerting ############################
 [alerting]
 # Disable legacy alerting engine & UI features
@@ -1173,11 +962,6 @@
 # Enable the Profile section
 ;enabled = true
 
-#################################### News #############################
-[news]
-# Enable the news feed section
-; news_feed_enabled = true
-
 #################################### Query History #############################
 [query_history]
 # Enable the Query history
@@ -1213,7 +997,6 @@
 # Url used to import dashboards directly from Grafana.com
 [grafana_com]
 ;url = https://grafana.com
-;api_url = https://grafana.com/api
 
 #################################### Distributed tracing ############
 # Opentracing is deprecated use opentelemetry instead
@@ -1287,7 +1070,6 @@
 ;account_name =
 ;account_key =
 ;container_name =
-;sas_token_expiration_days =
 
 [external_image_storage.local]
 # does not require any configuration
@@ -1303,11 +1085,6 @@
 # Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
 # which this setting can help protect against by only allowing a certain amount of concurrent requests.
 ;concurrent_render_request_limit = 30
-# Determines the lifetime of the render key used by the image renderer to access and render Grafana.
-# This setting should be expressed as a duration. Examples: 10s (seconds), 5m (minutes), 2h (hours).
-# Default is 5m. This should be more than enough for most deployments.
-# Change the value only if image rendering is failing and you see `Failed to get the render key from cache` in Grafana logs.
-;render_key_lifetime = 5m
 
 [panels]
 # If set to true Grafana will allow script tags in text panels. Not recommended as it enable XSS vulnerabilities.
@@ -1324,10 +1101,6 @@
 ;plugin_catalog_url = https://grafana.com/grafana/plugins/
 # Enter a comma-separated list of plugin identifiers to hide in the plugin catalog.
 ;plugin_catalog_hidden_plugins =
-# Log all backend requests for core and external plugins.
-;log_backend_requests = false
-# Force download of public key for verifying plugin signature on startup.
-;enforce_public_key_download = false
 
 #################################### Grafana Live ##########################################
 [live]
@@ -1412,14 +1185,6 @@
 ;grpc_host =
 ;grpc_port =
 
-[support_bundles]
-# Enable support bundle creation (default: true)
-#enabled = true
-# Only server admins can generate and view support bundles (default: true)
-#server_admin_only = true
-# If set, bundles will be encrypted with the provided public keys separated by whitespace
-#public_keys = ""
-
 [enterprise]
 # Path to a valid Grafana Enterprise license.jwt file
 ;license_path =
@@ -1471,24 +1236,3 @@
 
 # Enable or disable loading other base map layers
 ;enable_custom_baselayers = true
-
-# Move an app plugin referenced by its id (including all its pages) to a specific navigation section
-[navigation.app_sections]
-# The following will move an app plugin with the id of `my-app-id` under the `starred` section
-# my-app-id = admin
-
-# Move a specific app plugin page (referenced by its `path` field) to a specific navigation section
-[navigation.app_standalone_pages]
-# The following will move the page with the path "/a/my-app-id/starred-content" from `my-app-id` to the `starred` section
-# /a/my-app-id/starred-content = starred
-
-#################################### Secure Socks5 Datasource Proxy #####################################
-[secure_socks_datasource_proxy]
-; enabled = false
-; root_ca_cert =
-; client_key =
-; client_cert =
-; server_name =
-# The address of the socks5 proxy datasources should connect to
-; proxy_address =
-; show_ui = true

contribute/README.md

@@ -10,7 +10,8 @@ This directory contains guides for contributors to the Grafana project.
 
 The `style-guides` directory contains style guides for the Grafana software project and documentation.
 
-- [Backend style guide](backend/style-guide.md) for how to style and format backend functionality and code.
+- [Backend style guide](style-guides/backend.md) for how to style and format backend functionality and code.
+- [Documentation style guide](style-guides/documentation-style-guide.md) for how to style and format documentation.
 - [Frontend style guide](style-guides/frontend.md) for how to style and format the user-facing functionality and code.
 - [Redux framework](style-guides/redux.md) for designing the Grafana redux framework.
 - [Themes style guide](style-guides/themes.md) for designing and updating Grafana themes.

contribute/architecture/README.md

@@ -2,7 +2,11 @@
 
 Are you looking to take on contributions with bigger impact? These guides help you get a better understanding of the structure and design of the Grafana codebase.
 
-Learn more about the backend architecture in [contribute/backend](/contribute/backend/README.md).
+Learn more about the backend architecture:
+
+- Part 1: [Services](backend/services.md)
+- Part 2: [Communication](backend/communication.md)
+- Part 3: [Database](backend/database.md)
 
 Learn more about the frontend architecture:
 

contribute/architecture/backend/communication.md

@@ -1,7 +1,6 @@
 # Communication
 
-Grafana use dependency injection and method calls on Go interfaces to
-communicate between different parts of the backend.
+Grafana uses a _bus_ to pass messages between different parts of the application. All communication over the bus happens synchronously.
 
 ## Commands and queries
 

contribute/architecture/backend/database.md

@@ -62,7 +62,7 @@ You can now make SQL queries in any of your [command handlers](communication.md#
 
 ```go
 func (s *MyService) DeleteDashboard(ctx context.Context, cmd *models.DeleteDashboardCommand) error {
-    if err := s.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
+    if err := s.SQLStore.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
         _, err := sess.Exec("DELETE FROM dashboards WHERE dashboard_id=?", cmd.DashboardID)
         return err
     })

contribute/architecture/backend/errors.md

@@ -0,0 +1,81 @@
+# Errors
+
+Grafana introduced its own error type `github.com/grafana/grafana/pkg/util/errutil.Error`
+in June 2022. It's built on top of the Go `error` interface extended to
+contain all the information necessary by Grafana to handle errors in an
+informative and safe way.
+
+Previously, Grafana has passed around regular Go errors and have had to
+rely on bespoke solutions in API handlers to communicate informative
+messages to the end-user. With the new `errutil.Error`, the API handlers
+can be slimmed as information about public messaging, structured data
+related to the error, localization metadata, log level, HTTP status
+code, and so forth are carried by the error.
+
+## Basic use
+
+### Declaring errors
+
+For a service, declare the different categories of errors that may occur
+from your service (this corresponds to what you might want to have
+specific public error messages or their templates for) by globally
+constructing variables using the `errutil.NewBase(status, messageID, opts...)`
+function.
+
+The status code loosely corresponds to HTTP status codes and provides a
+default log level for errors to ensure that the request logging is
+properly informing administrators about various errors occurring in
+Grafana (e.g. `StatusBadRequest` is generally speaking not as relevant
+as `StatusInternal`). All available status codes live in the `errutil`
+package and have names starting with `Status`.
+
+The messageID is constructed as `<servicename>.<error-identifier>` where
+the `<servicename>` corresponds to the root service directory per
+[the package hierarchy](package-hierarchy.md) and `<error-identifier>`
+is a short identifier using dashes for word separation that identifies
+the specific category of errors within the service.
+
+To set a static message sent to the client when the error occurs, the
+`errutil.WithPublicMessage(message string)` option may be appended to
+the NewBase function call. For dynamic messages or more options, refer
+to the `errutil` package's GoDocs.
+
+Errors are then constructed using the `Base.Errorf` method, which
+functions like the [fmt.Errorf](https://pkg.go.dev/fmt#Errorf) method
+except that it creates an `errutil.Error`.
+
+```go
+package main
+
+import (
+  "errors"
+  "github.com/grafana/grafana/pkg/util/errutil"
+  "example.org/thing"
+)
+
+var ErrBaseNotFound = errutil.NewBase(errutil.StatusNotFound, "main.not-found", errutil.WithPublicMessage("Thing not found"))
+
+func Look(id int) (*Thing, error) {
+  t, err := thing.GetByID(id)
+  if errors.Is(err, thing.ErrNotFound) {
+    return nil, ErrBaseNotFound.Errorf("did not find thing with ID %d: %w", id, err)
+  }
+
+  return t, nil
+}
+```
+
+Check out [errutil's GoDocs](https://pkg.go.dev/github.com/grafana/grafana@v0.0.0-20220621133844-0f4fc1290421/pkg/util/errutil)
+for details on how to construct and use Grafana style errors.
+
+### Handling errors in the API
+
+API handlers use the `github.com/grafana/grafana/pkg/api/response.Err`
+function to create responses based on `errutil.Error`s.
+
+> **Note:** (@sakjur 2022-06) `response.Err` requires all errors to be
+> `errutil.Error` or it'll be considered an internal server error.
+> This is something that should be fixed in the near future to allow
+> fallback behavior to make it possible to correctly handle Grafana
+> style errors if they're present but allow fallback to a reasonable
+> default otherwise.

contribute/architecture/backend/services.md

@@ -19,11 +19,11 @@ package example
 type Service struct {
     logger   log.Logger
     cfg      *setting.Cfg
-    sqlStore db.DB
+    sqlStore *sqlstore.SQLStore
 }
 
 // ProvideService provides Service as dependency for other services.
-func ProvideService(cfg *setting.Cfg, sqlStore db.DB) (*Service, error) {
+func ProvideService(cfg *setting.Cfg, sqlStore *sqlstore.SQLStore) (*Service, error) {
     s := &Service{
         logger:     log.New("service"),
         cfg:        cfg,
@@ -76,7 +76,7 @@ package server
 import (
 	"github.com/google/wire"
 	"github.com/grafana/grafana/pkg/example"
-    "github.com/grafana/grafana/pkg/infra/db"
+    "github.com/grafana/grafana/pkg/services/sqlstore"
 )
 
 var wireBasicSet = wire.NewSet(
@@ -98,7 +98,7 @@ func Initialize(cla setting.CommandLineArgs, opts Options, apiOpts api.ServerOpt
 	return &Server{}, nil
 }
 
-func InitializeForTest(cla setting.CommandLineArgs, opts Options, apiOpts api.ServerOptions, sqlStore db.DB) (*Server, error) {
+func InitializeForTest(cla setting.CommandLineArgs, opts Options, apiOpts api.ServerOptions, sqlStore *sqlstore.SQLStore) (*Server, error) {
 	wire.Build(wireExtsTestSet)
 	return &Server{}, nil
 }

contribute/backend/README.md

@@ -1,27 +0,0 @@
-# Backend
-
-First read the [backend style guide](/contribute/backend/style-guide.md)
-to get a sense for how we work to ensure that the Grafana codebase is
-consistent and accessible. The rest of the backend contributor
-documentation is more relevant to reviewers and contributors looking to
-make larger changes.
-
-For anyone reviewing code for Grafana's backend, a basic understanding
-of content of the following files is expected:
-
-- [Currently recommended practices](/contribute/backend/recommended-practices.md)
-- [Services](/contribute/backend/services.md)
-- [Communication](/contribute/backend/communication.md)
-- [Database](/contribute/backend/database.md)
-- [HTTP API](/pkg/api/README.md)
-
-Reviewers who review large changes should additionally make a habit out
-of familiarizing themselves with the content of
-[/contribute/backend](/contribute/backend) from time to time.
-
-## Dependency management
-
-Refer to:
-
-- [UPGRADING_DEPENDENCIES.md](https://github.com/grafana/grafana/blob/main/UPGRADING_DEPENDENCIES.md)
-- [Upgrading dependencies](/contribute/backend/upgrading-dependencies.md)

contribute/backend/errors.md

@@ -1,103 +0,0 @@
-# Errors
-
-Grafana introduced its own error type [github.com/grafana/grafana/pkg/util/errutil.Error](../../pkg/util/errutil/errors.go)
-in June 2022. It's built on top of the Go `error` interface extended to
-contain all the information necessary by Grafana to handle errors in an
-informative and safe way.
-
-Previously, Grafana has passed around regular Go errors and have had to
-rely on bespoke solutions in API handlers to communicate informative
-messages to the end-user. With the new `errutil.Error`, the API handlers
-can be slimmed as information about public messaging, structured data
-related to the error, localization metadata, log level, HTTP status
-code, and so forth are carried by the error.
-
-## Basic use
-
-### Declaring errors
-
-For a service, declare the different categories of errors that may occur
-from your service (this corresponds to what you might want to have
-specific public error messages or their templates for) by globally
-constructing variables using the `errutil.NewBase(status, messageID, opts...)`
-function.
-
-The status code loosely corresponds to HTTP status codes and provides a
-default log level for errors to ensure that the request logging is
-properly informing administrators about various errors occurring in
-Grafana (e.g. `StatusBadRequest` is generally speaking not as relevant
-as `StatusInternal`). All available status codes live in the `errutil`
-package and have names starting with `Status`.
-
-The messageID is constructed as `<servicename>.<errorIdentifier>` where
-the `<servicename>` corresponds to the root service directory per
-[the package hierarchy](package-hierarchy.md) and `<errorIdentifier>`
-is a camelCased short identifier that identifies the specific category
-of errors within the service.
-
-Errors should be grouped together (i.e. share `errutil.Base`) based on
-their public facing properties, a single messageID should represent a
-translatable string and what metadata is carried with it.
-_service.MissingRequiredFields_ and _service.MessageTooLong_ are likely
-to be two different errors that are both validation failures, as their
-user-friendly expansions are likely different. This is the maximization
-rule of declaring as many `errutil.Error`s as you need public message
-structures.
-
-The other side of this is that even though a login service's
-"user is ratelimited", "user does not exist", "wrong username", and
-"wrong password" are reasonable errors to separate between internally,
-for security reasons the end-user should not be told which particular
-error they struck. This means that they should share the same base (such
-as _login.Failed_). This is the minimization rule of grouping together
-distinct logged errors that provide the same information via the API.
-
-To set a static message sent to the client when the error occurs, the
-`errutil.WithPublicMessage(message string)` option may be appended to
-the NewBase function call. For dynamic messages or more options, refer
-to the `errutil` package's GoDocs.
-
-Errors are then constructed using the `Base.Errorf` method, which
-functions like the [fmt.Errorf](https://pkg.go.dev/fmt#Errorf) method
-except that it creates an `errutil.Error`.
-
-```go
-package main
-
-import (
-  "errors"
-  "github.com/grafana/grafana/pkg/util/errutil"
-  "example.org/thing"
-)
-
-var ErrBaseNotFound = errutil.NewBase(errutil.StatusNotFound, "main.notFound", errutil.WithPublicMessage("Thing not found"))
-
-func Look(id int) (*Thing, error) {
-  t, err := thing.GetByID(id)
-  if errors.Is(err, thing.ErrNotFound) {
-    return nil, ErrBaseNotFound.Errorf("did not find thing with ID %d: %w", id, err)
-  }
-
-  return t, nil
-}
-```
-
-Errors consider themselves to be both its `errutil.Base` or
-`errutil.Template` and whatever errors it wraps for the purposes of the
-`errors.Is` function.
-
-Check out the package and method documentation for
-github.com/grafana/grafana/pkg/util/errutil for details on how to
-construct and use Grafana style errors. This documentation is
-unfortunately not readily available on pkg.go.dev because Grafana is not
-fully Go modules compatible, but can be viewed using
-[godoc](https://go.dev/cmd/godoc/) from the Grafana directory.
-
-### Handling errors in the API
-
-API handlers use the `github.com/grafana/grafana/pkg/api/response.Err`
-or `github.com/grafana/grafana/pkg/api/response.ErrWithFallback`
-(same signature as `response.Error`) function to create responses based
-on `errutil.Error`.
-
-Using `response.Err` requires all errors to be Grafana style errors.

contribute/backend/recommended-practices.md

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