Release: Bump version to 10.3.0 (#78)

Co-authored-by: grafana-delivery-bot[bot] <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>

.betterer.ts

@@ -12,12 +12,18 @@ const eslintPathsToIgnore = [
   'public/app/plugins/panel/graph', // will be removed alongside angular
 ];
 
+// Avoid using functions that report the position of the issues, as this causes a lot of merge conflicts
 export default {
   'better eslint': () =>
     countEslintErrors()
       .include('**/*.{ts,tsx}')
       .exclude(new RegExp(eslintPathsToIgnore.join('|'))),
   'no undocumented stories': () => countUndocumentedStories().include('**/!(*.internal).story.tsx'),
+  'no gf-form usage': () =>
+    regexp(
+      /gf-form/gm,
+      'gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.'
+    ).include('**/*.{ts,tsx,html}'),
 };
 
 function countUndocumentedStories() {
@@ -38,6 +44,28 @@ function countUndocumentedStories() {
   });
 }
 
+/**
+ *  Generic regexp pattern matcher, similar to @betterer/regexp.
+ *  The only difference is that the positions of the errors are not reported, as this may cause a lot of merge conflicts.
+ */
+function regexp(pattern: RegExp, issueMessage: string) {
+  return new BettererFileTest(async (filePaths, fileTestResult) => {
+    await Promise.all(
+      filePaths.map(async (filePath) => {
+        const fileText = await fs.readFile(filePath, 'utf8');
+        const matches = fileText.match(pattern);
+        if (matches) {
+          // File contents doesn't matter, since we're not reporting the position
+          const file = fileTestResult.addFile(filePath, '');
+          matches.forEach(() => {
+            file.addIssue(0, 0, issueMessage);
+          });
+        }
+      })
+    );
+  });
+}
+
 function countEslintErrors() {
   return new BettererFileTest(async (filePaths, fileTestResult, resolver) => {
     const { baseDirectory } = resolver;

.drone.star

@@ -19,7 +19,6 @@ load(
 )
 load(
     "scripts/drone/pipelines/ci_images.star",
-    "publish_ci_build_container_image_pipeline",
     "publish_ci_windows_test_image_pipeline",
 )
 load(
@@ -51,7 +50,6 @@ def main(_ctx):
         }, "oss", "testing")] +
         integration_test_pipelines() +
         publish_ci_windows_test_image_pipeline() +
-        publish_ci_build_container_image_pipeline() +
         cronjobs() +
         secrets()
     )

.drone.yml

@@ -24,7 +24,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: compile-build-cmd
 - commands:
   - ./bin/build verify-drone
@@ -74,14 +74,14 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: compile-build-cmd
 - commands:
   - go install github.com/bazelbuild/buildtools/buildifier@latest
   - buildifier --lint=warn -mode=check -r .
   depends_on:
   - compile-build-cmd
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: lint-starlark
 trigger:
   event:
@@ -316,7 +316,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -325,21 +325,21 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: wire-install
 - commands:
   - apk add --update build-base shared-mime-info shared-mime-info-lang
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: test-backend
 - commands:
   - apk add --update build-base
@@ -348,7 +348,7 @@ steps:
     | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: test-backend-integration
 trigger:
   event:
@@ -398,7 +398,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: compile-build-cmd
 - commands:
   - apk add --update curl jq bash
@@ -425,7 +425,7 @@ steps:
   - apk add --update make
   - make gen-go
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: wire-install
 - commands:
   - apk add --update make build-base
@@ -434,16 +434,16 @@ steps:
   - wire-install
   environment:
     CGO_ENABLED: "1"
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: lint-backend
 - commands:
   - go run scripts/modowners/modowners.go check go.mod
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: validate-modfile
 - commands:
   - apk add --update make
   - make swagger-validate
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: validate-openapi-spec
 trigger:
   event:
@@ -490,7 +490,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.47/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -499,7 +499,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -509,7 +509,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -518,14 +518,14 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: wire-install
 - commands:
   - yarn install --immutable
@@ -558,8 +558,8 @@ steps:
       from_secret: drone_token
 - commands:
   - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64
-    --go-version=1.21.3 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER
-    --grafana-dir=$$PWD > packages.txt
+    -a targz:grafana:linux/arm/v7 --go-version=1.21.5 --yarn-cache=$$YARN_CACHE_FOLDER
+    --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt
   depends_on:
   - yarn-install
   image: grafana/grafana-build:main
@@ -701,11 +701,11 @@ steps:
 - commands:
   - docker run --privileged --rm tonistiigi/binfmt --install all
   - /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu
-    -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER
-    --build-id=$$DRONE_BUILD_NUMBER --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.18.4
-    --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD
-    --ubuntu-tag-format='{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' >
-    docker.txt
+    -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7
+    -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER
+    --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.18.4 --tag-format='{{ .version_base
+    }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{ .version_base
+    }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt
   - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i
   depends_on:
   - yarn-install
@@ -834,7 +834,7 @@ steps:
   name: clone-enterprise
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.47/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -843,7 +843,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: compile-build-cmd
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -857,7 +857,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -866,14 +866,14 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: wire-install
 - commands:
   - dockerize -wait tcp://postgres:5432 -timeout 120s
@@ -894,7 +894,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: postgres-integration-tests
 - commands:
   - dockerize -wait tcp://mysql57:3306 -timeout 120s
@@ -915,7 +915,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql57
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: mysql-5.7-integration-tests
 - commands:
   - dockerize -wait tcp://mysql80:3306 -timeout 120s
@@ -936,7 +936,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql80
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: mysql-8.0-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379 -timeout 120s
@@ -951,7 +951,7 @@ steps:
   - wait-for-redis
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -966,7 +966,7 @@ steps:
   - wait-for-memcached
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: memcached-integration-tests
 - commands:
   - dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@@ -982,7 +982,7 @@ steps:
   environment:
     AM_TENANT_ID: test
     AM_URL: http://mimir_backend:8080
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: remote-alertmanager-integration-tests
 trigger:
   event:
@@ -1069,7 +1069,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-cue
 trigger:
   event:
@@ -1109,7 +1109,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: compile-build-cmd
 - commands:
   - apt-get update -yq && apt-get install shellcheck
@@ -1176,7 +1176,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: swagger-gen
 trigger:
   event:
@@ -1277,7 +1277,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1288,7 +1288,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - clone-enterprise
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1298,14 +1298,14 @@ steps:
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on:
   - clone-enterprise
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: wire-install
 - commands:
   - apk add --update build-base
@@ -1313,7 +1313,7 @@ steps:
   - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES}
   depends_on:
   - wire-install
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: sqlite-benchmark-integration-tests
 - commands:
   - apk add --update build-base
@@ -1325,7 +1325,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: postgres-benchmark-integration-tests
 - commands:
   - apk add --update build-base
@@ -1336,7 +1336,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql57
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: mysql-5.7-benchmark-integration-tests
 - commands:
   - apk add --update build-base
@@ -1347,7 +1347,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql80
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: mysql-8.0-benchmark-integration-tests
 trigger:
   event:
@@ -1424,7 +1424,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-cue
 trigger:
   branch: main
@@ -1596,7 +1596,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1605,21 +1605,21 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: wire-install
 - commands:
   - apk add --update build-base shared-mime-info shared-mime-info-lang
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: test-backend
 - commands:
   - apk add --update build-base
@@ -1628,7 +1628,7 @@ steps:
     | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: test-backend-integration
 trigger:
   branch: main
@@ -1672,13 +1672,13 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: compile-build-cmd
 - commands:
   - apk add --update make
   - make gen-go
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: wire-install
 - commands:
   - apk add --update make build-base
@@ -1687,16 +1687,16 @@ steps:
   - wire-install
   environment:
     CGO_ENABLED: "1"
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: lint-backend
 - commands:
   - go run scripts/modowners/modowners.go check go.mod
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: validate-modfile
 - commands:
   - apk add --update make
   - make swagger-validate
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: validate-openapi-spec
 - commands:
   - ./bin/build verify-drone
@@ -1743,7 +1743,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.47/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1752,7 +1752,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: compile-build-cmd
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1762,7 +1762,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1771,14 +1771,14 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: wire-install
 - commands:
   - yarn install --immutable
@@ -1810,8 +1810,8 @@ steps:
   name: build-frontend-packages
 - commands:
   - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64
-    --go-version=1.21.3 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER
-    --grafana-dir=$$PWD > packages.txt
+    -a targz:grafana:linux/arm/v7 --go-version=1.21.5 --yarn-cache=$$YARN_CACHE_FOLDER
+    --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt
   depends_on:
   - update-package-json-version
   image: grafana/grafana-build:main
@@ -1989,11 +1989,11 @@ steps:
 - commands:
   - docker run --privileged --rm tonistiigi/binfmt --install all
   - /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu
-    -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER
-    --build-id=$$DRONE_BUILD_NUMBER --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.18.4
-    --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD
-    --ubuntu-tag-format='{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' >
-    docker.txt
+    -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7
+    -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER
+    --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.18.4 --tag-format='{{ .version_base
+    }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{ .version_base
+    }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt
   - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i
   depends_on:
   - update-package-json-version
@@ -2184,7 +2184,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.47/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2193,7 +2193,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: compile-build-cmd
 - commands:
   - echo $DRONE_RUNNER_NAME
@@ -2207,7 +2207,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -2216,14 +2216,14 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: wire-install
 - commands:
   - dockerize -wait tcp://postgres:5432 -timeout 120s
@@ -2244,7 +2244,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: postgres-integration-tests
 - commands:
   - dockerize -wait tcp://mysql57:3306 -timeout 120s
@@ -2265,7 +2265,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql57
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: mysql-5.7-integration-tests
 - commands:
   - dockerize -wait tcp://mysql80:3306 -timeout 120s
@@ -2286,7 +2286,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql80
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: mysql-8.0-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379 -timeout 120s
@@ -2301,7 +2301,7 @@ steps:
   - wait-for-redis
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -2316,7 +2316,7 @@ steps:
   - wait-for-memcached
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: memcached-integration-tests
 - commands:
   - dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@@ -2332,7 +2332,7 @@ steps:
   environment:
     AM_TENANT_ID: test
     AM_URL: http://mimir_backend:8080
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: remote-alertmanager-integration-tests
 trigger:
   branch: main
@@ -2385,7 +2385,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.47/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: windows-init
@@ -2513,7 +2513,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.47/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2522,7 +2522,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts docker fetch --edition oss
@@ -2618,7 +2618,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: compile-build-cmd
 - commands:
   - ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
@@ -2687,7 +2687,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: compile-build-cmd
 - commands:
   - yarn install --immutable
@@ -2752,7 +2752,7 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: compile-build-cmd
 - depends_on:
   - compile-build-cmd
@@ -2858,7 +2858,7 @@ steps:
       from_secret: gcp_key_base64
     GITHUB_TOKEN:
       from_secret: github_token
-    GO_VERSION: 1.21.3
+    GO_VERSION: 1.21.5
     GPG_PASSPHRASE:
       from_secret: packages_gpg_passphrase
     GPG_PRIVATE_KEY:
@@ -2915,13 +2915,13 @@ steps:
   depends_on: []
   environment:
     CGO_ENABLED: 0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: compile-build-cmd
 - commands:
   - ./bin/build whatsnew-checker
   depends_on:
   - compile-build-cmd
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: whats-new-checker
 trigger:
   event:
@@ -3021,7 +3021,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -3030,21 +3030,21 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: wire-install
 - commands:
   - apk add --update build-base shared-mime-info shared-mime-info-lang
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: test-backend
 - commands:
   - apk add --update build-base
@@ -3053,7 +3053,7 @@ steps:
     | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: test-backend-integration
 trigger:
   event:
@@ -3109,7 +3109,7 @@ steps:
       from_secret: gcp_key_base64
     GITHUB_TOKEN:
       from_secret: github_token
-    GO_VERSION: 1.21.3
+    GO_VERSION: 1.21.5
     GPG_PASSPHRASE:
       from_secret: packages_gpg_passphrase
     GPG_PRIVATE_KEY:
@@ -3162,7 +3162,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.47/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: windows-init
@@ -3289,7 +3289,7 @@ steps:
       from_secret: gcp_key_base64
     GITHUB_TOKEN:
       from_secret: github_token
-    GO_VERSION: 1.21.3
+    GO_VERSION: 1.21.5
     GPG_PASSPHRASE:
       from_secret: packages_gpg_passphrase
     GPG_PRIVATE_KEY:
@@ -3435,7 +3435,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -3444,21 +3444,21 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: wire-install
 - commands:
   - apk add --update build-base shared-mime-info shared-mime-info-lang
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: test-backend
 - commands:
   - apk add --update build-base
@@ -3467,7 +3467,7 @@ steps:
     | grep -o '\(.*\)/' | sort -u)
   depends_on:
   - wire-install
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: test-backend-integration
 trigger:
   cron:
@@ -3521,7 +3521,7 @@ steps:
       from_secret: gcp_key_base64
     GITHUB_TOKEN:
       from_secret: github_token
-    GO_VERSION: 1.21.3
+    GO_VERSION: 1.21.5
     GPG_PASSPHRASE:
       from_secret: packages_gpg_passphrase
     GPG_PRIVATE_KEY:
@@ -3667,7 +3667,7 @@ steps:
       from_secret: gcp_key_base64
     GITHUB_TOKEN:
       from_secret: github_token
-    GO_VERSION: 1.21.3
+    GO_VERSION: 1.21.5
     GPG_PASSPHRASE:
       from_secret: packages_gpg_passphrase
     GPG_PRIVATE_KEY:
@@ -3764,20 +3764,20 @@ steps:
 - commands: []
   depends_on:
   - clone
-  image: golang:1.21.3-windowsservercore-1809
+  image: golang:1.21.5-windowsservercore-1809
   name: windows-init
 - commands:
   - go install github.com/google/wire/cmd/wire@v0.5.0
   - wire gen -tags oss ./pkg/server
   depends_on:
   - windows-init
-  image: golang:1.21.3-windowsservercore-1809
+  image: golang:1.21.5-windowsservercore-1809
   name: wire-install
 - commands:
   - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
   depends_on:
   - wire-install
-  image: golang:1.21.3-windowsservercore-1809
+  image: golang:1.21.5-windowsservercore-1809
   name: test-backend
 trigger:
   event:
@@ -3853,7 +3853,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.47/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3869,7 +3869,7 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-cue
 - commands:
   - '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -3878,14 +3878,14 @@ steps:
   - apk add --update make
   - CODEGEN_VERIFY=1 make gen-jsonnet
   depends_on: []
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: verify-gen-jsonnet
 - commands:
   - apk add --update make
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: wire-install
 - commands:
   - dockerize -wait tcp://postgres:5432 -timeout 120s
@@ -3906,7 +3906,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: postgres-integration-tests
 - commands:
   - dockerize -wait tcp://mysql57:3306 -timeout 120s
@@ -3927,7 +3927,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql57
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: mysql-5.7-integration-tests
 - commands:
   - dockerize -wait tcp://mysql80:3306 -timeout 120s
@@ -3948,7 +3948,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql80
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: mysql-8.0-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379 -timeout 120s
@@ -3963,7 +3963,7 @@ steps:
   - wait-for-redis
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -3978,7 +3978,7 @@ steps:
   - wait-for-memcached
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: memcached-integration-tests
 - commands:
   - dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@@ -3994,7 +3994,7 @@ steps:
   environment:
     AM_TENANT_ID: test
     AM_URL: http://mimir_backend:8080
-  image: golang:1.21.3-alpine
+  image: golang:1.21.5-alpine3.18
   name: remote-alertmanager-integration-tests
 trigger:
   event:
@@ -4063,59 +4063,6 @@ volumes:
     path: //./pipe/docker_engine/
   name: docker
 ---
-clone:
-  retries: 3
-depends_on: []
-image_pull_secrets:
-- dockerconfigjson
-kind: pipeline
-name: publish-ci-build-container-image
-node:
-  type: no-parallel
-platform:
-  arch: amd64
-  os: linux
-services: []
-steps:
-- commands:
-  - if [ -z "${BUILD_CONTAINER_VERSION}" ]; then echo Missing BUILD_CONTAINER_VERSION;
-    false; fi
-  image: alpine:3.18.4
-  name: validate-version
-- commands:
-  - printenv GCP_KEY > /tmp/key.json
-  - gcloud auth activate-service-account --key-file=/tmp/key.json
-  - gsutil cp gs://grafana-private-downloads/MacOSX10.15.sdk.tar.xz ./scripts/build/ci-build/MacOSX10.15.sdk.tar.xz
-  environment:
-    GCP_KEY:
-      from_secret: gcp_download_build_container_assets_key
-  image: google/cloud-sdk:431.0.0
-  name: download-macos-sdk
-- commands:
-  - printenv DOCKER_PASSWORD | docker login -u "$DOCKER_USERNAME" --password-stdin
-  - docker build -t "grafana/build-container:${BUILD_CONTAINER_VERSION}" ./scripts/build/ci-build
-  - docker push "grafana/build-container:${BUILD_CONTAINER_VERSION}"
-  environment:
-    DOCKER_PASSWORD:
-      from_secret: docker_password
-    DOCKER_USERNAME:
-      from_secret: docker_username
-  image: google/cloud-sdk:431.0.0
-  name: build-and-publish
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-trigger:
-  event:
-  - promote
-  target:
-  - ci-build-container-image
-type: docker
-volumes:
-- host:
-    path: /var/run/docker.sock
-  name: docker
----
 clone:
   retries: 3
 kind: pipeline
@@ -4400,7 +4347,7 @@ steps:
     path: /root/.docker/
 - commands:
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1
-  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.21.3-alpine
+  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.21.5-alpine3.18
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20.9.0-alpine
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0
   - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana-ci-deploy:1.3.3
@@ -4434,7 +4381,7 @@ steps:
     path: /root/.docker/
 - commands:
   - trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1
-  - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.21.3-alpine
+  - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.21.5-alpine3.18
   - trivy --exit-code 1 --severity HIGH,CRITICAL node:20.9.0-alpine
   - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0
   - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3
@@ -4682,6 +4629,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: 0e9f67184e414d3afbda81c86dfa58b3c2cf7c1a668be5313c851ff5f42de44d
+hmac: d7e383e4bf37190a97d695ef8f91755cb8cb70fb8088a5c1f63262adcf8e4f5e
 
 ...

.eslintrc

@@ -97,7 +97,11 @@
     {
       "files": [
         "public/app/plugins/datasource/grafana-testdata-datasource/*.{ts,tsx}",
-        "public/app/plugins/datasource/grafana-testdata-datasource/**/*.{ts,tsx}"
+        "public/app/plugins/datasource/grafana-testdata-datasource/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/azuremonitor/*.{ts,tsx}",
+        "public/app/plugins/datasource/azuremonitor/**/*.{ts,tsx}",
+        "public/app/plugins/datasource/parca/*.{ts,tsx}",
+        "public/app/plugins/datasource/parca/**/*.{ts,tsx}"
       ],
       "settings": {
         "import/resolver": {

.github/CODEOWNERS

@@ -84,7 +84,6 @@
 /pkg/ifaces/ @grafana/backend-platform
 /pkg/infra/appcontext/ @grafana/backend-platform
 /pkg/infra/db/ @grafana/backend-platform
-/pkg/infra/grn/ @grafana/backend-platform
 /pkg/infra/localcache/ @grafana/backend-platform
 /pkg/infra/log/ @grafana/backend-platform
 /pkg/infra/metrics/ @grafana/backend-platform
@@ -335,6 +334,7 @@
 /packages/grafana-data/src/transformations/ @grafana/grafana-bi-squad
 /packages/grafana-data/src/**/*logs* @grafana/observability-logs
 /packages/grafana-schema/src/**/*tempo* @grafana/observability-traces-and-profiling
+/packages/grafana-schema/src/**/*canvas* @grafana/dataviz-squad
 /packages/grafana-flamegraph/ @grafana/observability-traces-and-profiling
 /plugins-bundled/ @grafana/plugins-platform-frontend
 /packages/grafana-plugin-configs/ @grafana/plugins-platform-frontend
@@ -413,7 +413,6 @@ cypress.config.js @grafana/grafana-frontend-platform
 /public/app/features/runtime/ @ryantxu
 /public/app/features/query/ @grafana/dashboards-squad
 /public/app/features/sandbox/ @grafana/grafana-frontend-platform
-/public/app/features/scenes/ @grafana/dashboards-squad
 /public/app/features/browse-dashboards/ @grafana/grafana-frontend-platform
 /public/app/features/search/ @grafana/grafana-frontend-platform
 /public/app/features/serviceaccounts/ @grafana/identity-access-team
@@ -522,7 +521,8 @@ cypress.config.js @grafana/grafana-frontend-platform
 /scripts/trigger_windows_build.sh @grafana/grafana-release-guild
 /scripts/cleanup-husky.sh @grafana/frontend-ops
 /scripts/verify-repo-update/ @grafana/grafana-release-guild
-scripts/generate-icon-bundle.js @grafana/plugins-platform-frontend @grafana/grafana-frontend-platform
+/scripts/generate-icon-bundle.js @grafana/plugins-platform-frontend @grafana/grafana-frontend-platform
+/scripts/levitate-parse-json-report.js @grafana/plugins-platform-frontend
 
 /scripts/docs/generate-transformations.ts @grafana/grafana-bi-squad
 /scripts/webpack/ @grafana/frontend-ops
@@ -676,6 +676,8 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/create-security-patch-from-security-mirror.yml @grafana/grafana-release-guild
 /.github/workflows/core-plugins-build-and-release.yml @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
 /.github/workflows/i18n-crowdin-fix-files.yml @grafana/grafana-frontend-platform
+/.github/workflows/feature-toggle-cleanup.yml @tolzhabayev
+/.github/workflows/scripts/feature-toggle-cleanup/feature-toggle-cleanup.js @tolzhabayev
 
 # Generated files not requiring owner approval
 /packages/grafana-data/src/types/featureToggles.gen.ts @grafanabot

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

@@ -16,7 +16,7 @@ jobs:
       - name: Set go version
         uses: actions/setup-go@v4
         with:
-          go-version: '1.21.3'
+          go-version: '1.21.5'
       - name: Build swagger
         run: |
           make -C pkg/services/ngalert/api/tooling post.json api.json

.github/workflows/bump-version.yml

@@ -61,7 +61,7 @@ jobs:
           go-version: '1.20'
       - uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '18'
       - name: Install Actions
         run: npm install --production --prefix ./actions
       - name: "Generate token"

.github/workflows/codeql-analysis.yml

@@ -47,7 +47,7 @@ jobs:
       name: Set go version
       uses: actions/setup-go@v4
       with:
-        go-version: '1.21.3'
+        go-version: '1.21.5'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

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

@@ -49,7 +49,7 @@ jobs:
         with:
           credentials_json: '${{ env.PLUGINS_GOOGLE_CREDENTIALS }}'
       - name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@v1'
+        uses: 'google-github-actions/setup-gcloud@v2'
       - name: Setup nodejs environment
         uses: actions/setup-node@v4
         with:

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

@@ -1,34 +0,0 @@
-# Workflow for skipping the Levitate detection
-# (This is needed because workflows that are skipped due to path filtering will show up as pending in Github.
-# As this has the same name as the one in detect-breaking-changes-build.yml it will take over in these cases and succeed quickly.)
-
-name: Levitate / Detect breaking changes
-
-on:
-  pull_request:
-    paths-ignore:
-      - "packages/**"
-    branches:
-      - 'main'
-
-jobs:
-  detect:
-    name: Detect breaking changes
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Skipping
-        run: echo "No modifications in the public API (packages/), skipping."
-
-        # Build and persist output as a JSON (we need to tell the report workflow that the check has been skipped)
-      - name: Persisting the check output
-        run: |
-          mkdir -p ./levitate
-          echo "{ \"shouldSkip\": true }" > ./levitate/result.json
-
-      # Upload artifact (so it can be used in the more privileged "report" workflow)
-      - name: Upload check output as artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: levitate
-          path: levitate/

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

@@ -1,163 +0,0 @@
-# Only runs if anything under the packages/ directory changes.
-# (Otherwise detect-breaking-changes-build-skip.yml takes over)
-
-name: Levitate / Detect breaking changes
-
-on:
-  pull_request:
-    paths:
-      - 'packages/**'
-    branches:
-      - 'main'
-
-jobs:
-  buildPR:
-    name: Build PR
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: './pr'
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        path: './pr'
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 20.9.0
-
-    - name: Get yarn cache directory path
-      id: yarn-cache-dir-path
-      run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
-
-    - name: Restore yarn cache
-      uses: actions/cache@v3.3.1
-      id: yarn-cache
-      with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: yarn-cache-folder-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
-        restore-keys: |
-          yarn-cache-folder-
-
-    - name: Install dependencies
-      run: yarn install --immutable
-
-    - name: Build packages
-      run: yarn packages:build
-
-    - name: Pack packages
-      run: yarn packages:pack --out ./%s.tgz
-
-    - name: Zip built tarballed packages
-      run: zip -r ./pr_built_packages.zip ./packages/**/*.tgz
-
-    - name: Upload build output as artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: buildPr
-        path: './pr/pr_built_packages.zip'
-
-  buildBase:
-    name: Build Base
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: './base'
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        path: './base'
-        ref: ${{ github.event.pull_request.base.ref }}
-
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 20.9.0
-
-    - name: Get yarn cache directory path
-      id: yarn-cache-dir-path
-      run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
-
-    - name: Restore yarn cache
-      uses: actions/cache@v3.3.1
-      id: yarn-cache
-      with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: yarn-cache-folder-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
-        restore-keys: |
-          yarn-cache-folder-
-
-    - name: Install dependencies
-      run: yarn install --immutable
-
-    - name: Build packages
-      run: yarn packages:build
-
-    - name: Pack packages
-      run: yarn packages:pack --out ./%s.tgz
-
-    - name: Zip built tarballed packages
-      run: zip -r ./base_built_packages.zip ./packages/**/*.tgz
-
-    - name: Upload build output as artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: buildBase
-        path: './base/base_built_packages.zip'
-
-  Detect:
-    name: Detect breaking changes
-    runs-on: ubuntu-latest
-    needs: ['buildPR', 'buildBase']
-    env:
-      GITHUB_STEP_NUMBER: 8
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get built packages from pr
-        uses: actions/download-artifact@v3
-        with:
-          name: buildPr
-
-      - name: Get built packages from base
-        uses: actions/download-artifact@v3
-        with:
-          name: buildBase
-
-      - name: Unzip artifact from pr
-        run: unzip -j pr_built_packages.zip -d ./pr && rm pr_built_packages.zip
-
-      - name: Unzip artifact from base
-        run: unzip -j base_built_packages.zip -d ./base && rm base_built_packages.zip
-
-      - name: Get link for the Github Action job
-        id: job
-        uses: actions/github-script@v6
-        with:
-          script: |
-              const name = 'Detect breaking changes';
-              const script = require('./.github/workflows/scripts/pr-get-job-link.js')
-              await script({name, github, context, core})
-
-      - name: Detect breaking changes
-        id: breaking-changes
-        run: ./scripts/check-breaking-changes.sh
-        env:
-          FORCE_COLOR: 3
-          GITHUB_JOB_LINK: ${{ steps.job.outputs.link }}
-
-      - name: Persisting the check output
-        run: |
-            mkdir -p ./levitate
-            echo "{ \"exit_code\": ${{ steps.breaking-changes.outputs.is_breaking }}, \"message\": \"${{ steps.breaking-changes.outputs.message }}\", \"job_link\": \"${{ steps.job.outputs.link }}#step:${GITHUB_STEP_NUMBER}:1\", \"pr_number\": \"${{ github.event.pull_request.number }}\" }" > ./levitate/result.json
-
-      - name: Upload check output as artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: levitate
-          path: levitate/
-
-      - name: Exit
-        run: exit ${{ steps.breaking-changes.outputs.is_breaking }}
-        shell: bash

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

@@ -0,0 +1,337 @@
+# Only runs if anything under the packages/ directory changes.
+
+name: Levitate / Detect breaking changes in PR
+
+on:
+  pull_request:
+    paths:
+      - 'packages/**'
+    branches:
+      - 'main'
+
+jobs:
+  buildPR:
+    name: Build PR
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: './pr'
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        path: './pr'
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 20.9.0
+
+
+    - name: Get yarn cache directory path
+      id: yarn-cache-dir-path
+      run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+
+    - name: Restore yarn cache
+      uses: actions/cache@v3.3.1
+      id: yarn-cache
+      with:
+        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+        key: yarn-cache-folder-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
+        restore-keys: |
+          yarn-cache-folder-
+
+    - name: Install dependencies
+      run: yarn install --immutable
+
+    - name: Build packages
+      run: yarn packages:build
+
+    - name: Pack packages
+      run: yarn packages:pack --out ./%s.tgz
+
+    - name: Zip built tarballed packages
+      run: zip -r ./pr_built_packages.zip ./packages/**/*.tgz
+
+    - name: Upload build output as artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: buildPr
+        path: './pr/pr_built_packages.zip'
+
+  buildBase:
+    name: Build Base
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: './base'
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        path: './base'
+        ref: ${{ github.event.pull_request.base.ref }}
+
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 20.9.0
+
+    - name: Get yarn cache directory path
+      id: yarn-cache-dir-path
+      run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+
+    - name: Restore yarn cache
+      uses: actions/cache@v3.3.1
+      id: yarn-cache
+      with:
+        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+        key: yarn-cache-folder-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
+        restore-keys: |
+          yarn-cache-folder-
+
+    - name: Install dependencies
+      run: yarn install --immutable
+
+    - name: Build packages
+      run: yarn packages:build
+
+    - name: Pack packages
+      run: yarn packages:pack --out ./%s.tgz
+
+    - name: Zip built tarballed packages
+      run: zip -r ./base_built_packages.zip ./packages/**/*.tgz
+
+    - name: Upload build output as artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: buildBase
+        path: './base/base_built_packages.zip'
+
+  Detect:
+    name: Detect breaking changes
+    runs-on: ubuntu-latest
+    needs: ['buildPR', 'buildBase']
+    env:
+      GITHUB_STEP_NUMBER: 8
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get built packages from pr
+        uses: actions/download-artifact@v3
+        with:
+          name: buildPr
+
+      - name: Get built packages from base
+        uses: actions/download-artifact@v3
+        with:
+          name: buildBase
+
+      - name: Unzip artifact from pr
+        run: unzip -j pr_built_packages.zip -d ./pr && rm pr_built_packages.zip
+
+      - name: Unzip artifact from base
+        run: unzip -j base_built_packages.zip -d ./base && rm base_built_packages.zip
+
+      - name: Get link for the Github Action job
+        id: job
+        uses: actions/github-script@v6
+        with:
+          script: |
+              const name = 'Detect breaking changes';
+              const script = require('./.github/workflows/scripts/pr-get-job-link.js')
+              await script({name, github, context, core})
+
+      - name: Detect breaking changes
+        id: breaking-changes
+        run: ./scripts/check-breaking-changes.sh
+        env:
+          FORCE_COLOR: 3
+          GITHUB_JOB_LINK: ${{ steps.job.outputs.link }}
+
+      - name: Persisting the check output
+        run: |
+            mkdir -p ./levitate
+            echo "{ \"exit_code\": ${{ steps.breaking-changes.outputs.is_breaking }}, \"message\": \"${{ steps.breaking-changes.outputs.message }}\", \"job_link\": \"${{ steps.job.outputs.link }}#step:${GITHUB_STEP_NUMBER}:1\", \"pr_number\": \"${{ github.event.pull_request.number }}\" }" > ./levitate/result.json
+
+      - name: Upload check output as artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: levitate
+          path: levitate/
+
+
+  Report:
+    name: Report breaking changes in PR
+    runs-on: ubuntu-latest
+    needs: ['Detect']
+
+    steps:
+        - name: "Generate token"
+          id: generate_token
+          uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+          with:
+            app_id: ${{ secrets.GRAFANA_PR_AUTOMATION_APP_ID }}
+            private_key: ${{ secrets.GRAFANA_PR_AUTOMATION_APP_PEM }}
+
+        - uses: actions/checkout@v4
+
+        - name: 'Download artifact'
+          uses: actions/download-artifact@v3
+          with:
+            name: levitate
+
+        - name: Parsing levitate result
+          uses: actions/github-script@v6
+          id: levitate-run
+          with:
+            script: |
+              const filePath = 'result.json';
+              const script = require('./.github/workflows/scripts/json-file-to-job-output.js');
+              await script({ core, filePath });
+
+        # Check if label exists
+        - name: Check if "levitate breaking change" label exists
+          id: does-label-exist
+          uses: actions/github-script@v6
+          env:
+            PR_NUMBER: ${{ github.event.pull_request.number }}
+          with:
+            script: |
+              const { data } = await github.rest.issues.listLabelsOnIssue({
+                issue_number: process.env.PR_NUMBER,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+              });
+              const labels = data.map(({ name }) => name);
+              const doesExist = labels.includes('levitate breaking change');
+
+              return doesExist ? 1 : 0;
+
+        # put the markdown into a variable
+        - name: Levitate Markdown
+          id: levitate-markdown
+          run: |
+              if [ -f "levitate.md" ]; then
+              {
+                echo 'levitate_markdown<<EOF'
+                cat levitate.md
+                echo EOF
+              } >> $GITHUB_OUTPUT
+              else
+                echo "levitate_markdown=No breaking changes detected" >> $GITHUB_OUTPUT
+              fi
+
+
+        # Comment on the PR
+        - name: Comment on PR
+          uses: marocchino/sticky-pull-request-comment@v2
+          with:
+            header: levitate-breaking-change-comment
+            number: ${{ github.event.pull_request.number }}
+            message: |
+              ⚠️ &nbsp;&nbsp;**Possible breaking changes (md version)*** &nbsp;&nbsp ⚠️
+
+              ${{ steps.levitate-markdown.outputs.levitate_markdown }}
+
+              [Read our guideline](https://github.com/grafana/grafana/blob/main/contribute/breaking-changes-guide/breaking-changes-guide.md)
+              [Console output](${{ steps.levitate-run.outputs.job_link }})
+            GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+
+        # Remove comment from the PR (no more breaking changes)
+        - name: Remove comment from PR
+          if: steps.levitate-run.outputs.exit_code == 0
+          uses: marocchino/sticky-pull-request-comment@v2
+          with:
+            header: levitate-breaking-change-comment
+            number: ${{ github.event.pull_request.number }}
+            delete: true
+            GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+
+        # Posts a notification to Slack if a PR has a breaking change and it did not have a breaking change before
+        - name: Post to Slack
+          id: slack
+          if: steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 && env.HAS_SECRETS
+          uses: slackapi/slack-github-action@v1.24.0
+          with:
+            payload: |
+              {
+                "pr_link": "https://github.com/grafana/grafana/pull/${{ steps.levitate-run.outputs.pr_number }}",
+                "pr_number": "${{ steps.levitate-run.outputs.pr_number }}",
+                "job_link": "${{ steps.levitate-run.outputs.job_link }}",
+                "reporting_job_link": "${{ github.event.workflow_run.html_url }}",
+                "message": "${{ steps.levitate-run.outputs.message }}"
+              }
+          env:
+            SLACK_WEBHOOK_URL: ${{ secrets.SLACK_LEVITATE_WEBHOOK_URL }}
+            HAS_SECRETS: ${{ (github.repository == 'grafana/grafana' || secrets.SLACK_LEVITATE_WEBHOOK_URL != '') || '' }}
+
+        # Add the label
+        - name: Add "levitate breaking change" label
+          if: steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0
+          uses: actions/github-script@v6
+          env:
+            PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
+          with:
+            github-token: ${{ steps.generate_token.outputs.token }}
+            script: |
+              await github.rest.issues.addLabels({
+                issue_number: process.env.PR_NUMBER,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                labels: ['levitate breaking change']
+              })
+
+        # Remove label (no more breaking changes)
+        - name: Remove "levitate breaking change" label
+          if: steps.levitate-run.outputs.exit_code == 0 && steps.does-label-exist.outputs.result == 1
+          uses: actions/github-script@v6
+          env:
+            PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
+          with:
+            github-token: ${{ steps.generate_token.outputs.token }}
+            script: |
+              await github.rest.issues.removeLabel({
+                issue_number: process.env.PR_NUMBER,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: 'levitate breaking change'
+              })
+
+        # Add reviewers
+        # This is very weird, the actual request goes through (comes back with a 201), but does not assign the team.
+        # Related issue: https://github.com/renovatebot/renovate/issues/1908
+        - name: Add "grafana/plugins-platform-frontend" as a reviewer
+          if: steps.levitate-run.outputs.exit_code
+          uses: actions/github-script@v6
+          env:
+            PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
+          with:
+            github-token: ${{ steps.generate_token.outputs.token }}
+            script: |
+              await github.rest.pulls.requestReviewers({
+                pull_number: process.env.PR_NUMBER,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                reviewers: [],
+                team_reviewers: ['plugins-platform-frontend']
+              });
+
+        # Remove reviewers (no more breaking changes)
+        - name: Remove "grafana/plugins-platform-frontend" from the list of reviewers
+          if: steps.levitate-run.outputs.exit_code == 0
+          uses: actions/github-script@v6
+          env:
+            PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
+          with:
+            github-token: ${{ steps.generate_token.outputs.token }}
+            script: |
+              await github.rest.pulls.removeRequestedReviewers({
+                pull_number: process.env.PR_NUMBER,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                reviewers: [],
+                team_reviewers: ['plugins-platform-frontend']
+              });
+
+        - name: Exit
+          run: exit ${{ steps.levitate-run.outputs.exit_code }}
+          shell: bash

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

@@ -1,209 +0,0 @@
-name: Levitate / Report breaking changes
-
-on:
-  workflow_run:
-    workflows: ["Levitate / Detect breaking changes"]
-    types: [completed]
-
-permissions:
-  pull-requests: write
-
-jobs:
-  notify:
-    name: Report
-    runs-on: ubuntu-latest
-    env:
-      ARTIFACT_NAME: 'levitate' # The name of the artifact that we would like to download
-      ARTIFACT_FOLDER: '${{ github.workspace }}/tmp' # The name of the folder where we will download the artifact to
-    permissions:
-      contents: read
-      issues: write
-      pull-requests: write
-
-    steps:
-    - uses: actions/checkout@v4
-
-    # Download artifact (as a .zip archive)
-    - name: 'Download artifact'
-      uses: actions/github-script@v6
-      env:
-        RUN_ID: ${{ github.event.workflow_run.id }}
-      with:
-        script: |
-          const fs = require('fs');
-
-          const { owner, repo } = context.repo;
-          const runId = process.env.RUN_ID;
-          const artifactName = process.env.ARTIFACT_NAME;
-          const artifactFolder = process.env.ARTIFACT_FOLDER;
-          const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
-              owner,
-              repo,
-              run_id: runId,
-          });
-          const artifact = artifacts.data.artifacts.find(a => a.name === artifactName);
-
-          if (!artifact) {
-              throw new Error(`Could not find artifact ${ artifactName } in workflow (${ runId })`);
-          }
-
-          const download = await github.rest.actions.downloadArtifact({
-              owner,
-              repo,
-              artifact_id: artifact.id,
-              archive_format: 'zip',
-          });
-
-          fs.mkdirSync(artifactFolder, { recursive: true });
-          fs.writeFileSync(`${ artifactFolder }/${ artifactName }.zip`, Buffer.from(download.data));
-
-    # Unzip artifact
-    - name: Unzip artifact
-      run: unzip "${ARTIFACT_FOLDER}/${ARTIFACT_NAME}.zip" -d "${ARTIFACT_FOLDER}"
-
-     # Parse the artifact and register fields as step output variables
-      # (All fields in the JSON will be available as ${{ steps.levitate-run.outputs.<field-name> }}
-    - name: Parsing levitate result
-      uses: actions/github-script@v6
-      id: levitate-run
-      with:
-        script: |
-          const filePath = `${ process.env.ARTIFACT_FOLDER }/result.json`;
-          const script = require('./.github/workflows/scripts/json-file-to-job-output.js');
-          await script({ core, filePath });
-
-    # Skip - print a message if the "Detect" workflow was skipped
-    - name: Check if the workflow should be skipped
-      if: steps.levitate-run.outputs.shouldSkip == 'true'
-      run: echo "Skipping."
-
-    # Check if label exists
-    - name: Check if "levitate breaking change" label exists
-      id: does-label-exist
-      if: steps.levitate-run.outputs.shouldSkip != 'true'
-      uses: actions/github-script@v6
-      env:
-        PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }}
-      with:
-        script: |
-          const { data } = await github.rest.issues.listLabelsOnIssue({
-            issue_number: process.env.PR_NUMBER,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-          });
-          const labels = data.map(({ name }) => name);
-          const doesExist = labels.includes('levitate breaking change');
-
-          return doesExist ? 1 : 0;
-
-    # Comment on the PR
-    - name: Comment on PR
-      if: steps.levitate-run.outputs.exit_code == 1 && steps.levitate-run.outputs.shouldSkip != 'true'
-      uses: marocchino/sticky-pull-request-comment@v2
-      with:
-        number: ${{ steps.levitate-run.outputs.pr_number }}
-        message: |
-          ⚠️ &nbsp;&nbsp;**Possible breaking changes**
-
-          _(Open the links below in a new tab to go to the correct steps)_
-
-          ${{ steps.levitate-run.outputs.message }}
-
-          [Console output](${{ steps.levitate-run.outputs.job_link }})
-          [Read our guideline](https://github.com/grafana/grafana/blob/main/contribute/breaking-changes-guide/breaking-changes-guide.md)
-
-    # Remove comment from the PR (no more breaking changes)
-    - name: Remove comment from PR
-      if: steps.levitate-run.outputs.exit_code == 0 && steps.levitate-run.outputs.shouldSkip != 'true'
-      uses: marocchino/sticky-pull-request-comment@v2
-      with:
-        number: ${{ steps.levitate-run.outputs.pr_number }}
-        delete: true
-
-    # Posts a notification to Slack if a PR has a breaking change and it did not have a breaking change before
-    - name: Post to Slack
-      id: slack
-      if: steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 && steps.levitate-run.outputs.shouldSkip != 'true' && env.HAS_SECRETS
-      uses: slackapi/slack-github-action@v1.24.0
-      with:
-        payload: |
-          {
-            "pr_link": "https://github.com/grafana/grafana/pull/${{ steps.levitate-run.outputs.pr_number }}",
-            "pr_number": "${{ steps.levitate-run.outputs.pr_number }}",
-            "job_link": "${{ steps.levitate-run.outputs.job_link }}",
-            "reporting_job_link": "${{ github.event.workflow_run.html_url }}",
-            "message": "${{ steps.levitate-run.outputs.message }}"
-          }
-      env:
-        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_LEVITATE_WEBHOOK_URL }}
-        HAS_SECRETS: ${{ (github.repository == 'grafana/grafana' || secrets.SLACK_LEVITATE_WEBHOOK_URL != '') || '' }}
-
-    # Add the label
-    - name: Add "levitate breaking change" label
-      if: steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 && steps.levitate-run.outputs.shouldSkip != 'true'
-      uses: actions/github-script@v6
-      env:
-        PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        script: |
-          await github.rest.issues.addLabels({
-            issue_number: process.env.PR_NUMBER,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            labels: ['levitate breaking change']
-          })
-
-    # Remove label (no more breaking changes)
-    - name: Remove "levitate breaking change" label
-      if: steps.levitate-run.outputs.exit_code == 0 && steps.does-label-exist.outputs.result == 1 && steps.levitate-run.outputs.shouldSkip != 'true'
-      uses: actions/github-script@v6
-      env:
-        PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        script: |
-          await github.rest.issues.removeLabel({
-            issue_number: process.env.PR_NUMBER,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            name: 'levitate breaking change'
-          })
-
-    # Add reviewers
-    # This is very weird, the actual request goes through (comes back with a 201), but does not assign the team.
-    # Related issue: https://github.com/renovatebot/renovate/issues/1908
-    - name: Add "grafana/plugins-platform-frontend" as a reviewer
-      if: steps.levitate-run.outputs.exit_code && steps.levitate-run.outputs.shouldSkip != 'true'
-      uses: actions/github-script@v6
-      env:
-        PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        script: |
-          await github.rest.pulls.requestReviewers({
-            pull_number: process.env.PR_NUMBER,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            reviewers: [],
-            team_reviewers: ['grafana/plugins-platform-frontend']
-          });
-
-    # Remove reviewers (no more breaking changes)
-    - name: Remove "grafana/plugins-platform-frontend" from the list of reviewers
-      if: steps.levitate-run.outputs.exit_code == 0 && steps.levitate-run.outputs.shouldSkip != 'true'
-      uses: actions/github-script@v6
-      env:
-        PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        script: |
-          await github.rest.pulls.removeRequestedReviewers({
-            pull_number: process.env.PR_NUMBER,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            reviewers: [],
-            team_reviewers: ['grafana/plugins-platform-frontend']
-          });
-
-

.github/workflows/feature-toggle-cleanup.yml

@@ -0,0 +1,28 @@
+name: Feature Toggle Cleanup
+
+on:
+  workflow_dispatch:
+  schedule:
+      # * is a special character in YAML so you have to quote this string
+      - cron:  '30 10 * * *'
+jobs:
+    feature-toggle-cleanup:
+        runs-on: ubuntu-latest
+        # This check is here to prevent this workflow from running on forks.    
+        if: github.repository == 'grafana/grafana'
+        steps:
+            - name: Check out the code
+              uses: actions/checkout@v3
+            - uses: actions/setup-node@v4
+              with:
+                node-version: "20.x"
+            - run: npm install csv-parse
+            - name: Parse CVS file to see which Feature Toggles should be notified about
+              id: parse-csv-file
+              uses: actions/github-script@v7
+              env:
+                    FEATURE_TOGGLES_CSV_FILE_PATH: "pkg/services/featuremgmt/toggles_gen.csv"
+              with:
+                    script: |
+                        const { default: cleanupFeatureFlags } = await import('${{ github.workspace }}/.github/workflows/scripts/feature-toggle-cleanup/feature-toggle-cleanup.mjs')                        
+                        await cleanupFeatureFlags({github, context, core})

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

@@ -26,7 +26,7 @@ jobs:
     - name: Set go version
       uses: actions/setup-go@v4
       with:
-        go-version: '1.21.3'
+        go-version: '1.21.5'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

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

@@ -36,7 +36,7 @@ jobs:
       - name: "Setup Go"
         uses: "actions/setup-go@v4"
         with:
-          go-version: '1.21.3'
+          go-version: '1.21.5'
 
       - name: "Verify kinds"
         run: go run .github/workflows/scripts/kinds/verify-kinds.go

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

@@ -39,7 +39,7 @@ jobs:
       - name: "Setup Go"
         uses: "actions/setup-go@v4"
         with:
-          go-version: '1.21.3'
+          go-version: '1.21.5'
 
       - name: "Verify kinds"
         run: go run .github/workflows/scripts/kinds/verify-kinds.go

.github/workflows/scripts/feature-toggle-cleanup/feature-toggle-cleanup.js

@@ -0,0 +1,38 @@
+import { parse } from 'csv-parse/sync';
+import fs from 'fs';
+
+/***
+ * Feauture Flag Structure example
+ *  Name: 'disableEnvelopeEncryption',
+    Stage: 'GA',
+    Owner: '@grafana/grafana-as-code',
+    Created: '2022-05-24',
+    requiresDevMode: 'false',
+    RequiresLicense: 'false',
+    RequiresRestart: 'false',
+    FrontendOnly: 'false'
+ * 
+ */
+
+
+export default function cleanupFeatureFlags() {
+	const today = new Date();
+	const sixMonthAgo = today.setMonth(today.getMonth() - 6);
+	const inputFileContents = fs.readFileSync(process.env.FEATURE_TOGGLES_CSV_FILE_PATH);
+	const parsedFeatureFlags = parse(inputFileContents, {
+		columns: true,
+		skip_empty_lines: true,
+		cast: true,
+		cast_date: true,
+	  });
+
+	// Here we can have the custom logic of how to handle what type of feature flag - e.g. GA can be treated differently than experimental and so on.
+	for (const flag of parsedFeatureFlags) {
+		if (flag.Created < sixMonthAgo) {
+			console.log(`The flag ${flag.Name} was created more than 6 months ago. It should be checked.`);
+			console.log(flag);
+		}
+	}
+	
+
+}

.github/workflows/stale.yml

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

.github/workflows/verify-kinds.yml

@@ -18,7 +18,7 @@ jobs:
       - name: "Setup Go"
         uses: "actions/setup-go@v4"
         with:
-          go-version: '1.21.3'
+          go-version: '1.21.5'
 
       - name: "Verify kinds"
         run: go run .github/workflows/scripts/kinds/verify-kinds.go

.golangci.toml

@@ -52,10 +52,15 @@ deny = [
   { pkg = "github.com/grafana/grafana/pkg/server", desc = "Core plugins are not allowed to depend on Grafana core packages" },
   { pkg = "github.com/grafana/grafana/pkg/tests", desc = "Core plugins are not allowed to depend on Grafana core packages" },
   { pkg = "github.com/grafana/grafana/pkg/web", desc = "Core plugins are not allowed to depend on Grafana core packages" },
+  { pkg = "github.com/grafana/grafana/pkg/tsdb/intervalv2", desc = "Core plugins are not allowed to depend on Grafana core packages" },
 ]
 files = [
   "**/pkg/tsdb/grafana-testdata-datasource/*",
   "**/pkg/tsdb/grafana-testdata-datasource/**/*",
+  "**/pkg/tsdb/azuremonitor/*",
+  "**/pkg/tsdb/azuremonitor/**/*",
+  "**/pkg/tsdb/parca/*",
+  "**/pkg/tsdb/parca/**/*",
 ]
 
 [linters-settings.gocritic]

CHANGELOG.md

@@ -1,3 +1,285 @@
+<!-- 10.2.3 START -->
+
+# 10.2.3 (2023-12-18)
+
+### Features and enhancements
+
+- **Auth:** Improve groups claim setup docs for AzureAD. [#79227](https://github.com/grafana/grafana/issues/79227), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Alerting:** Attempt to retry retryable errors. [#79161](https://github.com/grafana/grafana/issues/79161), [@gotjosh](https://github.com/gotjosh)
+- **Unified Alerting:** Set `max_attempts` to 1 by default. [#79095](https://github.com/grafana/grafana/issues/79095), [@gotjosh](https://github.com/gotjosh)
+- **Auth:** Use SSO settings service to load social connectors + refactor. [#79005](https://github.com/grafana/grafana/issues/79005), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Cloudwatch:** Update error code metrics for ES/OpenSearch. [#78990](https://github.com/grafana/grafana/issues/78990), [@siddhikhapare](https://github.com/siddhikhapare)
+- **Auth:** Add anonymous users view and stats. [#78965](https://github.com/grafana/grafana/issues/78965), [@Jguer](https://github.com/Jguer)
+- **Flamegraph:** Add table filtering for Flamegraph panel. [#78962](https://github.com/grafana/grafana/issues/78962), [@Rperry2174](https://github.com/Rperry2174)
+- **Pyroscope:** Improve label suggestions in query editor. [#78861](https://github.com/grafana/grafana/issues/78861), [@aleks-p](https://github.com/aleks-p)
+- **InfluxDB:** Introduce influxqlStreamingParser feature toggle. [#78834](https://github.com/grafana/grafana/issues/78834), [@itsmylife](https://github.com/itsmylife)
+- **Usagestats:** Add stat group for alert rule groups. [#78825](https://github.com/grafana/grafana/issues/78825), [@alexweav](https://github.com/alexweav)
+- **Auth:** Improve groups claim setup docs for AzureAD. [#78791](https://github.com/grafana/grafana/issues/78791), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Loki:** Added support for "or" statements in line filters. [#78705](https://github.com/grafana/grafana/issues/78705), [@matyax](https://github.com/matyax)
+- **Cloudwatch:** Add missing metrics for AWS/IVSRealtime namespace. [#78688](https://github.com/grafana/grafana/issues/78688), [@idastambuk](https://github.com/idastambuk)
+- **Auth:** Add anonymous users view and stats. [#78685](https://github.com/grafana/grafana/issues/78685), [@eleijonmarck](https://github.com/eleijonmarck)
+- **Alerting:** Filter insights panels (grafanacloud-usage ds) by instance_id. [#78657](https://github.com/grafana/grafana/issues/78657), [@VikaCep](https://github.com/VikaCep)
+- **Login:** Improve accessibility of Login form. [#78652](https://github.com/grafana/grafana/issues/78652), [@joshhunt](https://github.com/joshhunt)
+- **Tracing:** Full text search. [#78628](https://github.com/grafana/grafana/issues/78628), [@joey-grafana](https://github.com/joey-grafana)
+- **Alerting:** In migration, fallback to '1s' for malformed min interval. [#78614](https://github.com/grafana/grafana/issues/78614), [@JacobsonMT](https://github.com/JacobsonMT)
+- **AuthProxy:** Do not allow sessions to be assigned with other methods. [#78602](https://github.com/grafana/grafana/issues/78602), [@Jguer](https://github.com/Jguer)
+- **Loki:** Filter by labels based on the type of label (structured, indexed, parsed). [#78595](https://github.com/grafana/grafana/issues/78595), [@svennergr](https://github.com/svennergr)
+- **Loki:** Add structured metadata keys to autocomplete. [#78584](https://github.com/grafana/grafana/issues/78584), [@svennergr](https://github.com/svennergr)
+- **Variables:** Remove alpha flag from variable support API. [#78573](https://github.com/grafana/grafana/issues/78573), [@sunker](https://github.com/sunker)
+- **Azure Monitor:** Add Azure Infrastructure Monitoring Dashboard. [#78498](https://github.com/grafana/grafana/issues/78498), [@JohnJMartins](https://github.com/JohnJMartins)
+- **Timeseries:** Remove cursor sync when x is not time. [#78496](https://github.com/grafana/grafana/issues/78496), [@adela-almasan](https://github.com/adela-almasan)
+- **Auth:** Load ini/env vars settings in the fallback strategy. [#78495](https://github.com/grafana/grafana/issues/78495), [@mgyongyosi](https://github.com/mgyongyosi)
+- **CloudWatch:** Add AWS Bedrock metrics definition. [#78478](https://github.com/grafana/grafana/issues/78478), [@thepalbi](https://github.com/thepalbi)
+- **SSO:** Display provider list. [#78472](https://github.com/grafana/grafana/issues/78472), [@Clarity-89](https://github.com/Clarity-89)
+- **Transformations:** Add regression analysis transformation. [#78457](https://github.com/grafana/grafana/issues/78457), [@oscarkilhed](https://github.com/oscarkilhed)
+- **Auth:** Make clientTokenRotation enabled by default. [#78384](https://github.com/grafana/grafana/issues/78384), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Alerting:** In migration improve deduplication of title and group. [#78351](https://github.com/grafana/grafana/issues/78351), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Alerting:** Add clean_upgrade config and deprecate force_migration. [#78324](https://github.com/grafana/grafana/issues/78324), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Tempo:** Allow `!~` in Search tab. [#78315](https://github.com/grafana/grafana/issues/78315), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Avatar:** Allow browser caching of /avatar/. [#78314](https://github.com/grafana/grafana/issues/78314), [@oscarkilhed](https://github.com/oscarkilhed)
+- **Transformations:** Move transformation addition into drawer. [#78299](https://github.com/grafana/grafana/issues/78299), [@codeincarnate](https://github.com/codeincarnate)
+- **Alerting:** Update rule access control to return errutil errors. [#78284](https://github.com/grafana/grafana/issues/78284), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Licensing:** Update enterprise documentation. [#78276](https://github.com/grafana/grafana/issues/78276), [@leandro-deveikis](https://github.com/leandro-deveikis)
+- **CloudWatch Logs:** Support fetching fields in monaco editor. [#78244](https://github.com/grafana/grafana/issues/78244), [@iwysiu](https://github.com/iwysiu)
+- **Server:** Automatically generate a self-signed TLS cert if needed. [#78243](https://github.com/grafana/grafana/issues/78243), [@DanCech](https://github.com/DanCech)
+- **Grafana/ui:** Move Grid out of unstable. [#78220](https://github.com/grafana/grafana/issues/78220), [@Clarity-89](https://github.com/Clarity-89)
+- **Plugins:** Add AWS/MediaLive metric for CloudWatch. [#78163](https://github.com/grafana/grafana/issues/78163), [@arabian9ts](https://github.com/arabian9ts)
+- **Transformations:** Move transformation variables to public preview. [#78148](https://github.com/grafana/grafana/issues/78148), [@oscarkilhed](https://github.com/oscarkilhed)
+- **Plugins:** Share plugin context with the component-type extensions. [#78111](https://github.com/grafana/grafana/issues/78111), [@leventebalogh](https://github.com/leventebalogh)
+- **Breadcrumbs:** Only dedupe breacrumb items for matching node names. [#78077](https://github.com/grafana/grafana/issues/78077), [@gillesdemey](https://github.com/gillesdemey)
+- **Dashboards:** Implement natural sort for query variables. [#78024](https://github.com/grafana/grafana/issues/78024), [@bobrik](https://github.com/bobrik)
+- **Alerting:** Adds the new alertingSimplifiedRouting feature toggle. [#77984](https://github.com/grafana/grafana/issues/77984), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Alerting:** Allow to clear datasource selection in panel list. [#77960](https://github.com/grafana/grafana/issues/77960), [@VikaCep](https://github.com/VikaCep)
+- **Plugins:** Share the plugin context with apps and ui-extensions. [#77933](https://github.com/grafana/grafana/issues/77933), [@leventebalogh](https://github.com/leventebalogh)
+- **InfluxDB:** Add new truthiness operators (`Is` and `Is Not`) to InfluxQL Query Builder. [#77923](https://github.com/grafana/grafana/issues/77923), [@btasker](https://github.com/btasker)
+- **Auth:** Refactor OAuth connectors' initialization. [#77919](https://github.com/grafana/grafana/issues/77919), [@mgyongyosi](https://github.com/mgyongyosi)
+- **InfluxDB:** Add support for `&gt;=` and `&lt;=` comparison operators to IQL Query Builder. [#77917](https://github.com/grafana/grafana/issues/77917), [@btasker](https://github.com/btasker)
+- **Alerting:** Add actions extension point to alert instances table view. [#77900](https://github.com/grafana/grafana/issues/77900), [@sd2k](https://github.com/sd2k)
+- **Dashboard:** Add ability to stop title/description generation. [#77896](https://github.com/grafana/grafana/issues/77896), [@adela-almasan](https://github.com/adela-almasan)
+- **Tempo:** Allow quotes in tag names and attributes. [#77864](https://github.com/grafana/grafana/issues/77864), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Plugins:** Add grafana/user/profile/tab plugin extension point. [#77863](https://github.com/grafana/grafana/issues/77863), [@joeyorlando](https://github.com/joeyorlando)
+- **DashList:** Update links with time range and variables change. [#77850](https://github.com/grafana/grafana/issues/77850), [@torkelo](https://github.com/torkelo)
+- **Cloudwatch:** Migrate Config editor and Variable editor to new form stying under feature toggle. [#77838](https://github.com/grafana/grafana/issues/77838), [@idastambuk](https://github.com/idastambuk)
+- **InfluxDB:** Template variable support for SQL language. [#77799](https://github.com/grafana/grafana/issues/77799), [@itsmylife](https://github.com/itsmylife)
+- **Grafana/ui:** Unify flex shorthand props. [#77768](https://github.com/grafana/grafana/issues/77768), [@Clarity-89](https://github.com/Clarity-89)
+- **Explore:** Default synced to true, only show synced status if panes are split. [#77759](https://github.com/grafana/grafana/issues/77759), [@gelicia](https://github.com/gelicia)
+- **Tooltips:** Support long labels. [#77735](https://github.com/grafana/grafana/issues/77735), [@Develer](https://github.com/Develer)
+- **Logs:** Update logic to process logs dataPlane frame with labels field. [#77708](https://github.com/grafana/grafana/issues/77708), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Snapshots:** Do not return internal database ids. [#77672](https://github.com/grafana/grafana/issues/77672), [@ryantxu](https://github.com/ryantxu)
+- **Tempo:** Support comments in TraceQL. [#77646](https://github.com/grafana/grafana/issues/77646), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Alerting:** Avoid alert list view component being unmounted every time we fetch new data. [#77631](https://github.com/grafana/grafana/issues/77631), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Swagger:** Rename annotations model. [#77605](https://github.com/grafana/grafana/issues/77605), [@julienduchesne](https://github.com/julienduchesne)
+- **Transformations:** Deduplicate names when using `extract fields` transformation. [#77569](https://github.com/grafana/grafana/issues/77569), [@oscarkilhed](https://github.com/oscarkilhed)
+- **BrowseDashboards:** Add `RadioButtonGroup` to be able to chose between 'Browse' or 'List' view. [#77561](https://github.com/grafana/grafana/issues/77561), [@eledobleefe](https://github.com/eledobleefe)
+- **Stack:** Use the component from grafana/ui. [#77543](https://github.com/grafana/grafana/issues/77543), [@Clarity-89](https://github.com/Clarity-89)
+- **Tempo:** Handle empty responses in ServiceGraph. [#77539](https://github.com/grafana/grafana/issues/77539), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Tempo:** Embed flame graph in span details. [#77537](https://github.com/grafana/grafana/issues/77537), [@joey-grafana](https://github.com/joey-grafana)
+- **CloudWatch:** Call query method from DataSourceWithBackend to support public dashboards. [#77532](https://github.com/grafana/grafana/issues/77532), [@kevinwcyu](https://github.com/kevinwcyu)
+- **Chore:** Prepare to remove &lt;Graph /&gt; from @grafana/ui. [#77522](https://github.com/grafana/grafana/issues/77522), [@ryantxu](https://github.com/ryantxu)
+- **Grafana/ui:** Move the Stack component out of unstable. [#77495](https://github.com/grafana/grafana/issues/77495), [@Clarity-89](https://github.com/Clarity-89)
+- **Flamegraph:** Add collapsing for similar items in the stack. [#77461](https://github.com/grafana/grafana/issues/77461), [@aocenas](https://github.com/aocenas)
+- **Tempo:** Added status to hard-coded fields. [#77393](https://github.com/grafana/grafana/issues/77393), [@adrapereira](https://github.com/adrapereira)
+- **Alerting:** Adds contact point sorting and searching. [#77390](https://github.com/grafana/grafana/issues/77390), [@gillesdemey](https://github.com/gillesdemey)
+- **Loki:** Add backend functionality to parse structured metadata from Loki. [#77361](https://github.com/grafana/grafana/issues/77361), [@svennergr](https://github.com/svennergr)
+- **ValueFormats:** Use plural for time units. [#77337](https://github.com/grafana/grafana/issues/77337), [@utkarshdeepak](https://github.com/utkarshdeepak)
+- **Calculations:** Update First _ and Last _ reducers to exclude NaNs. [#77323](https://github.com/grafana/grafana/issues/77323), [@nmarrs](https://github.com/nmarrs)
+- **Chore:** Upgrade Go to 1.21.3. [#77304](https://github.com/grafana/grafana/issues/77304), [@ryantxu](https://github.com/ryantxu)
+- **Tooltip:** Improved Trend tooltip. [#77251](https://github.com/grafana/grafana/issues/77251), [@adela-almasan](https://github.com/adela-almasan)
+- **Dashboards:** Remove dummy trim dashboard api. [#77249](https://github.com/grafana/grafana/issues/77249), [@ryantxu](https://github.com/ryantxu)
+- **Alerting:** Enable feature flag alertingNoDataErrorExecution by default. [#77242](https://github.com/grafana/grafana/issues/77242), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Cloudwatch:** Add DB_PERF_INSIGHTS to Metric Math. [#77241](https://github.com/grafana/grafana/issues/77241), [@iwysiu](https://github.com/iwysiu)
+- **PluginExtensions:** Returns a clone of moment objects in context. [#77238](https://github.com/grafana/grafana/issues/77238), [@mckn](https://github.com/mckn)
+- **Logs:** Deprecated `showContextToggle` in DataSourceWithLogsContextSupport. [#77232](https://github.com/grafana/grafana/issues/77232), [@matyax](https://github.com/matyax)
+- **AzureMonitor:** Add Container Insights Syslog Dashboard. [#77229](https://github.com/grafana/grafana/issues/77229), [@JohnJMartins](https://github.com/JohnJMartins)
+- **Loki:** Add optional stream selector to fetchLabelValues API. [#77207](https://github.com/grafana/grafana/issues/77207), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Alerting:** Add support for responders to Opsgenie integration. [#77159](https://github.com/grafana/grafana/issues/77159), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Chore:** Replace crewjam/saml with the latest grafana/saml lib. [#77153](https://github.com/grafana/grafana/issues/77153), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Tempo:** Add new intrinsics. [#77146](https://github.com/grafana/grafana/issues/77146), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **GrafanaUI:** Prevent code editors from 'trapping' scroll. [#77125](https://github.com/grafana/grafana/issues/77125), [@joshhunt](https://github.com/joshhunt)
+- **Plugins:** Change managed plugins installation call. [#77120](https://github.com/grafana/grafana/issues/77120), [@oshirohugo](https://github.com/oshirohugo)
+- **Alerting:** Show receiver in groups view to avoid duplication in the list. [#77109](https://github.com/grafana/grafana/issues/77109), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Alerting:** Allow more time before Alertmanager expire-resolves alerts. [#77094](https://github.com/grafana/grafana/issues/77094), [@alexweav](https://github.com/alexweav)
+- **Tempo:** Add new structural operators. [#77056](https://github.com/grafana/grafana/issues/77056), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **ServiceAccount:** Add pagination to service accout table. [#77044](https://github.com/grafana/grafana/issues/77044), [@kalleep](https://github.com/kalleep)
+- **Transformations:** Cumulative and window modes for `Add field from calculation`. [#77029](https://github.com/grafana/grafana/issues/77029), [@mdvictor](https://github.com/mdvictor)
+- **Plugins:** Allow disabling angular deprecation UI for specific plugins. [#77026](https://github.com/grafana/grafana/issues/77026), [@xnyo](https://github.com/xnyo)
+- **Stat:** Add panel option to control wide layout. [#77018](https://github.com/grafana/grafana/issues/77018), [@nmarrs](https://github.com/nmarrs)
+- **Logs Panel:** Column selection for experimental table visualization in explore. [#76983](https://github.com/grafana/grafana/issues/76983), [@gtk-grafana](https://github.com/gtk-grafana)
+- **Alerting:** Update 'Create alert' to 'New alert rule' in the panel and docs. [#76950](https://github.com/grafana/grafana/issues/76950), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **InfluxDB:** Implement InfluxQL json streaming parser. [#76934](https://github.com/grafana/grafana/issues/76934), [@itsmylife](https://github.com/itsmylife)
+- **Plugins:** Improvements to NodeGraph. [#76879](https://github.com/grafana/grafana/issues/76879), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Trace View:** Critical path highlighting. [#76857](https://github.com/grafana/grafana/issues/76857), [@adrapereira](https://github.com/adrapereira)
+- **Caching:** Enable `useCachingService` feature toggle by default. [#76845](https://github.com/grafana/grafana/issues/76845), [@mmandrus](https://github.com/mmandrus)
+- **Plugins:** Pass OTEL sampling config to plugins. [#76834](https://github.com/grafana/grafana/issues/76834), [@xnyo](https://github.com/xnyo)
+- **Transformations:** Allow Timeseries to table transformation to handle multiple time series. [#76801](https://github.com/grafana/grafana/issues/76801), [@codeincarnate](https://github.com/codeincarnate)
+- **Plugins:** Add managed instance installation resources. [#76767](https://github.com/grafana/grafana/issues/76767), [@oshirohugo](https://github.com/oshirohugo)
+- **Nav:** Design changes in MegaMenu. [#76735](https://github.com/grafana/grafana/issues/76735), [@L-M-K-B](https://github.com/L-M-K-B)
+- **Cloudwatch:** Add missing appsync metrics. [#76703](https://github.com/grafana/grafana/issues/76703), [@ctobolski](https://github.com/ctobolski)
+- **Plugins:** Add status_source label to plugin request logs. [#76676](https://github.com/grafana/grafana/issues/76676), [@xnyo](https://github.com/xnyo)
+- **Tracing:** Trace to profiles. [#76670](https://github.com/grafana/grafana/issues/76670), [@joey-grafana](https://github.com/joey-grafana)
+- **InfluxDB:** Enable InfluxDB backend mode by default. [#76641](https://github.com/grafana/grafana/issues/76641), [@itsmylife](https://github.com/itsmylife)
+- **Log Context:** Add Log Context support to mixed data sources. [#76623](https://github.com/grafana/grafana/issues/76623), [@matyax](https://github.com/matyax)
+- **Alerting:** Add Alerting menu in getPanelMenu. [#76618](https://github.com/grafana/grafana/issues/76618), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Azure monitor:** Support Logs visualization. [#76594](https://github.com/grafana/grafana/issues/76594), [@bossinc](https://github.com/bossinc)
+- **Transformations:** Support enum field conversion. [#76410](https://github.com/grafana/grafana/issues/76410), [@nmarrs](https://github.com/nmarrs)
+- **Select:** Overflow ellipsis and control over multi value wrapping . [#76405](https://github.com/grafana/grafana/issues/76405), [@torkelo](https://github.com/torkelo)
+- **Transformations:** Move debug to drawer. [#76281](https://github.com/grafana/grafana/issues/76281), [@codeincarnate](https://github.com/codeincarnate)
+- **Gauge:** Simplify gauge dimension panel options. [#76216](https://github.com/grafana/grafana/issues/76216), [@nmarrs](https://github.com/nmarrs)
+- **Loki:** Option to add derived fields based on labels. [#76162](https://github.com/grafana/grafana/issues/76162), [@5cat](https://github.com/5cat)
+- **CloudWatch:** Add missing GameLift metrics . [#76102](https://github.com/grafana/grafana/issues/76102), [@fridgepoet](https://github.com/fridgepoet)
+- **CloudWatch:** Update query batching logic. [#76075](https://github.com/grafana/grafana/issues/76075), [@iwysiu](https://github.com/iwysiu)
+- **Bar Gauge:** Add max height option. [#76042](https://github.com/grafana/grafana/issues/76042), [@Develer](https://github.com/Develer)
+- **Plugins:** Add feat toggle to install managed plugins. [#75973](https://github.com/grafana/grafana/issues/75973), [@oshirohugo](https://github.com/oshirohugo)
+- **Correlations:** Add transformations to Explore Editor. [#75930](https://github.com/grafana/grafana/issues/75930), [@gelicia](https://github.com/gelicia)
+- **Azure Monitor:** Add 5 curated dashboards for App insights troubleshooting experience. [#75916](https://github.com/grafana/grafana/issues/75916), [@yves-chan](https://github.com/yves-chan)
+- **Loki Queries:** Query Splitting enabled by default. [#75876](https://github.com/grafana/grafana/issues/75876), [@matyax](https://github.com/matyax)
+- **Alerting:** Fetch alerts from a remote Alertmanager. [#75844](https://github.com/grafana/grafana/issues/75844), [@santihernandezc](https://github.com/santihernandezc)
+- **Tooltip:** Improved Heatmap tooltip. [#75712](https://github.com/grafana/grafana/issues/75712), [@adela-almasan](https://github.com/adela-almasan)
+- **Dashboard:** DashboardGrid - don't animate if reduced-motion set. [#75540](https://github.com/grafana/grafana/issues/75540), [@dnwe](https://github.com/dnwe)
+- **SQL:** Update configuration pages. [#75525](https://github.com/grafana/grafana/issues/75525), [@gwdawson](https://github.com/gwdawson)
+- **Geomap:** Add more countries ISO 3166 Alpha-3-code to the gazetteer/countries.json. [#75311](https://github.com/grafana/grafana/issues/75311), [@alexsan92](https://github.com/alexsan92)
+- **Log Rows:** Added popover menu with filter options when a log line is selected. [#75306](https://github.com/grafana/grafana/issues/75306), [@matyax](https://github.com/matyax)
+- **Auth:** Split signout_redirect_url into per provider settings. [#75269](https://github.com/grafana/grafana/issues/75269), [@venkatbvc](https://github.com/venkatbvc)
+- **Analytics:** Add option to pass destSDKBaseURL to rudderstack load method. [#74926](https://github.com/grafana/grafana/issues/74926), [@gassiss](https://github.com/gassiss)
+- **SQL:** Add timeFilter macro to query builder. [#74575](https://github.com/grafana/grafana/issues/74575), [@zoltanbedi](https://github.com/zoltanbedi)
+- **Storage:** Unified Storage based on Entity API. [#71977](https://github.com/grafana/grafana/issues/71977), [@DanCech](https://github.com/DanCech)
+- **Policies:** Adds deprecation policy. [#68439](https://github.com/grafana/grafana/issues/68439), [@bergquist](https://github.com/bergquist)
+- **Reports:** Do not show the unsaved changes modal for URL params change. (Enterprise)
+- **Plugins:** Add endpoints to get instance plugins. (Enterprise)
+- **Swagger:** Clean up Report struct names. (Enterprise)
+- **Plugins:** Add managed installer. (Enterprise)
+- **DatasourceACL:** Remove deprecated datasource permissions endpoints. (Enterprise)
+- **RBAC:** Introduce a data source administrator role. (Enterprise)
+
+### Bug fixes
+
+- **Alerting:** Fix deleting rules in a folder with matching UID in another organization. [#79011](https://github.com/grafana/grafana/issues/79011), [@papagian](https://github.com/papagian)
+- **CloudWatch:** Correctly quote metric names with special characters. [#78958](https://github.com/grafana/grafana/issues/78958), [@iwysiu](https://github.com/iwysiu)
+- **Fix:** Use dashboard time range in prometheus variable editor. [#78950](https://github.com/grafana/grafana/issues/78950), [@itsmylife](https://github.com/itsmylife)
+- **DeleteDashboard:** Redirect to home after deleting a dashboard. [#78936](https://github.com/grafana/grafana/issues/78936), [@ivanortegaalba](https://github.com/ivanortegaalba)
+- **Alerting:** Change create/update permissions for silences. [#78920](https://github.com/grafana/grafana/issues/78920), [@VikaCep](https://github.com/VikaCep)
+- **DeleteDashboard:** Redirect to home after deleting a dashboard. [#78918](https://github.com/grafana/grafana/issues/78918), [@ivanortegaalba](https://github.com/ivanortegaalba)
+- **Alerting:** Fixes combination of multiple predicates for rule search. [#78910](https://github.com/grafana/grafana/issues/78910), [@gillesdemey](https://github.com/gillesdemey)
+- **Timeseries to table transformation:** Fix misaligned table field values if some frames are missing a label. [#78909](https://github.com/grafana/grafana/issues/78909), [@domasx2](https://github.com/domasx2)
+- **CloudWatch:** Fetch Dimension keys correctly from Dimension Picker. [#78831](https://github.com/grafana/grafana/issues/78831), [@iwysiu](https://github.com/iwysiu)
+- **Plugins:** Only preload plugins if user is authenticated. [#78805](https://github.com/grafana/grafana/issues/78805), [@marefr](https://github.com/marefr)
+- **Tempo:** Fix read-only access error. [#78801](https://github.com/grafana/grafana/issues/78801), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Stats:** Fix unregistered unified alerting metric. [#78777](https://github.com/grafana/grafana/issues/78777), [@alexweav](https://github.com/alexweav)
+- **RBAC:** Adjust filter for acl list to check for permissions on service accounts. [#78681](https://github.com/grafana/grafana/issues/78681), [@kalleep](https://github.com/kalleep)
+- **Bug:** Fix broken ui components when angular is disabled. [#78670](https://github.com/grafana/grafana/issues/78670), [@jackw](https://github.com/jackw)
+- **Plugins:** Only set non-existing headers for core plugin requests. [#78633](https://github.com/grafana/grafana/issues/78633), [@aangelisc](https://github.com/aangelisc)
+- **CloudWatch:** Fetch Dimension keys correctly from Dimension Picker. [#78556](https://github.com/grafana/grafana/issues/78556), [@iwysiu](https://github.com/iwysiu)
+- **InfluxDB:** Parse data for table view to have parity with frontend parser. [#78551](https://github.com/grafana/grafana/issues/78551), [@itsmylife](https://github.com/itsmylife)
+- **Elasticsearch:** Fix processing of raw_data with not-recognized time format. [#78380](https://github.com/grafana/grafana/issues/78380), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Command Palette:** Fix for chinese input and keystrokes being lost in slow environments. [#78373](https://github.com/grafana/grafana/issues/78373), [@ashharrison90](https://github.com/ashharrison90)
+- **InfluxDB:** Parse data for table view to have parity with frontend parser. [#78365](https://github.com/grafana/grafana/issues/78365), [@itsmylife](https://github.com/itsmylife)
+- **FeatureToggle:** Disable `dashgpt` by default and mark it as preview. [#78348](https://github.com/grafana/grafana/issues/78348), [@ivanortegaalba](https://github.com/ivanortegaalba)
+- **Explore:** Fixes issue with adhoc filters when coming from dashboards. [#78339](https://github.com/grafana/grafana/issues/78339), [@torkelo](https://github.com/torkelo)
+- **SaveDashboardPrompt:** Reduce time to open drawer when many changes applied. [#78283](https://github.com/grafana/grafana/issues/78283), [@ivanortegaalba](https://github.com/ivanortegaalba)
+- **Elasticsearch:** Fix processing of raw_data with not-recognized time format. [#78262](https://github.com/grafana/grafana/issues/78262), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Alerting:** Fix deleting rules in a folder with matching UID in another organization. [#78258](https://github.com/grafana/grafana/issues/78258), [@papagian](https://github.com/papagian)
+- **Bug:** Fix broken ui components when angular is disabled. [#78208](https://github.com/grafana/grafana/issues/78208), [@jackw](https://github.com/jackw)
+- **Flamegraph:** Update threshold for collapsing and fix flickering. [#78206](https://github.com/grafana/grafana/issues/78206), [@aocenas](https://github.com/aocenas)
+- **Prometheus:** Fix calculating rate interval when there is no interval specified. [#78193](https://github.com/grafana/grafana/issues/78193), [@itsmylife](https://github.com/itsmylife)
+- **Variables:** Add support for aliasIDs to datasource variables (Fixes issue with Postgres datasource variables). [#78170](https://github.com/grafana/grafana/issues/78170), [@torkelo](https://github.com/torkelo)
+- **Explore:** Fix queries (cached & non) count in usage insights. [#78097](https://github.com/grafana/grafana/issues/78097), [@Elfo404](https://github.com/Elfo404)
+- **Dashboards:** Allow updating a dashboard if the user doesn't have access to the parent folder. [#78075](https://github.com/grafana/grafana/issues/78075), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Loki:** Fix escaping in cheatsheet. [#78046](https://github.com/grafana/grafana/issues/78046), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Transformations:** Fix Timeseries to table transformation trend reduction when result is 0. [#78026](https://github.com/grafana/grafana/issues/78026), [@oserde](https://github.com/oserde)
+- **Alerting:** Fix export of notification policy to JSON. [#78021](https://github.com/grafana/grafana/issues/78021), [@rvillablanca](https://github.com/rvillablanca)
+- **Dashboards:** Fix dashboard listing when user can't list any folders. [#77983](https://github.com/grafana/grafana/issues/77983), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Plugins:** Keep working when there is no internet access. [#77978](https://github.com/grafana/grafana/issues/77978), [@leventebalogh](https://github.com/leventebalogh)
+- **DashList:** Update variables in links when they change. [#77787](https://github.com/grafana/grafana/issues/77787), [@joshhunt](https://github.com/joshhunt)
+- **Alerting:** Disable cache in rktq when fetching export data. [#77678](https://github.com/grafana/grafana/issues/77678), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Alerting:** Fix export with modifications URL when mounted on subpath. [#77622](https://github.com/grafana/grafana/issues/77622), [@gillesdemey](https://github.com/gillesdemey)
+- **Dashboards:** Fix issue causing crashes when saving new dashboard. [#77620](https://github.com/grafana/grafana/issues/77620), [@kaydelaney](https://github.com/kaydelaney)
+- **Search:** Modify query for better performance. [#77576](https://github.com/grafana/grafana/issues/77576), [@papagian](https://github.com/papagian)
+- **CloudWatch Logs:** Add labels to alert and expression queries. [#77529](https://github.com/grafana/grafana/issues/77529), [@iwysiu](https://github.com/iwysiu)
+- **Explore:** Fix support for angular based datasource editors. [#77486](https://github.com/grafana/grafana/issues/77486), [@Elfo404](https://github.com/Elfo404)
+- **Tempo:** Fix support for `statusMessage`. [#77438](https://github.com/grafana/grafana/issues/77438), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **Plugins:** Fix status_source always being "plugin" in plugin request logs. [#77433](https://github.com/grafana/grafana/issues/77433), [@xnyo](https://github.com/xnyo)
+- **Bug Fix:** Respect data source version when provisioning. [#77428](https://github.com/grafana/grafana/issues/77428), [@andresmgot](https://github.com/andresmgot)
+- **Tempo:** Fix TraceQL autocompletion with missing `}`. [#77365](https://github.com/grafana/grafana/issues/77365), [@fabrizio-grafana](https://github.com/fabrizio-grafana)
+- **InfluxDB:** Fix parsing multiple tags on backend mode. [#77340](https://github.com/grafana/grafana/issues/77340), [@itsmylife](https://github.com/itsmylife)
+- **Alerting:** Apply negative matchers for route matching. [#77292](https://github.com/grafana/grafana/issues/77292), [@gillesdemey](https://github.com/gillesdemey)
+- **Explore:** Fix panes vertical scrollbar not being draggable. [#77284](https://github.com/grafana/grafana/issues/77284), [@Elfo404](https://github.com/Elfo404)
+- **Explore:** Avoid reinitializing graph on every query run. [#77281](https://github.com/grafana/grafana/issues/77281), [@Elfo404](https://github.com/Elfo404)
+- **Prometheus:** Fix $\_\_rate_interval calculation. [#77234](https://github.com/grafana/grafana/issues/77234), [@itsmylife](https://github.com/itsmylife)
+- **Organize fields transformation:** Fix re-ordering of fields using drag and drop. [#77172](https://github.com/grafana/grafana/issues/77172), [@adela-almasan](https://github.com/adela-almasan)
+- **Bug fix:** Correctly set permissions on provisioned dashboards. [#77155](https://github.com/grafana/grafana/issues/77155), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **InfluxDB:** Fix adhoc filter calls by properly checking optional parameter in metricFindQuery. [#77113](https://github.com/grafana/grafana/issues/77113), [@itsmylife](https://github.com/itsmylife)
+- **Alerting:** Fix NoRulesSplash being rendered for some seconds, fater creating a rule. [#77048](https://github.com/grafana/grafana/issues/77048), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **RBAC:** Allow scoping access to root level dashboards. [#76987](https://github.com/grafana/grafana/issues/76987), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Alerting:** Dont show 1 firing series when no data in Expressions PreviewSummary. [#76981](https://github.com/grafana/grafana/issues/76981), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **InfluxDB:** Fix aliasing with $measurement or $m on backend mode. [#76917](https://github.com/grafana/grafana/issues/76917), [@itsmylife](https://github.com/itsmylife)
+- **InfluxDB:** Fix table parsing with backend mode. [#76899](https://github.com/grafana/grafana/issues/76899), [@itsmylife](https://github.com/itsmylife)
+- **NodeGraph:** Fix edges dataframe miscategorization. [#76842](https://github.com/grafana/grafana/issues/76842), [@lovasoa](https://github.com/lovasoa)
+- **Tooltip:** Ensure tooltip text is correctly announced by screenreaders. [#76683](https://github.com/grafana/grafana/issues/76683), [@ashharrison90](https://github.com/ashharrison90)
+- **Alerting:** Fix flaky SQLITE_BUSY when migrating with provisioned dashboards. [#76658](https://github.com/grafana/grafana/issues/76658), [@JacobsonMT](https://github.com/JacobsonMT)
+- **TraceView:** Fix cursor not matching visual guide in the timeline when resizing. [#76587](https://github.com/grafana/grafana/issues/76587), [@neel1996](https://github.com/neel1996)
+- **Search:** Fix empty folder details for nested folder items. [#76504](https://github.com/grafana/grafana/issues/76504), [@papagian](https://github.com/papagian)
+- **Alerting:** Alert rule constraint violations return as 400s in provisioning API. [#76396](https://github.com/grafana/grafana/issues/76396), [@alexweav](https://github.com/alexweav)
+- **A11y:** Fix no-static-element-interactions in xy chart editor. [#76170](https://github.com/grafana/grafana/issues/76170), [@chauchausoup](https://github.com/chauchausoup)
+- **Alerting:** Fix incorrect decoding for alert rules with % characters. [#76148](https://github.com/grafana/grafana/issues/76148), [@gillesdemey](https://github.com/gillesdemey)
+- **Chore:** Fix timeout issues when gathering prometheus datasource stats. [#74618](https://github.com/grafana/grafana/issues/74618), [@DanCech](https://github.com/DanCech)
+- **Recorded Queries:** Add org isolation (remote write target per org), and fix cross org Delete/List. (Enterprise)
+- **Auditing:** Fix missing action in alert manager routes. (Enterprise)
+- **Reporting:** Fix report not sent when creating / updating reports. (Enterprise)
+- **Recorded Queries:** Add org isolation (remote write target per org), and fix cross org Delete/List. (Enterprise)
+- **UsageInsights:** Disable frontend features when backend is disabled. (Enterprise)
+- **PresenceIndicators:** Do not retry failed views/recent API calls. (Enterprise)
+- **Analytics:** Use panel renderer rather than legacy flot graph. (Enterprise)
+- **Plugins:** Fix cloud plugins installer base url. (Enterprise)
+
+### Breaking changes
+
+In panels using the `extract fields` transformation, where one of the extracted names collides with one of the already existing fields, the extracted field will be renamed. Issue [#77569](https://github.com/grafana/grafana/issues/77569)
+
+For the existing backend mode users who have table visualization might see some inconsistencies on their panels. We have updated the table column naming. This will potentially affect field transformations and/or field overrides. To resolve this either:
+
+- Update transformation
+- Update field override Issue [#76899](https://github.com/grafana/grafana/issues/76899)
+
+For the existing backend mode users who have Transformations with the `time` field, **might** see their transformations are not working. Those panels that have broken transformations will fail to render. This is because we changed the field key. See related PR: https://github.com/grafana/grafana/pull/69865
+To resolve this either:
+
+- Remove the affected panel and re-create it
+- Select the `Time` field again
+- Edit the `time` field as `Time` for transformation in `panel.json` or `dashboard.json` Issue [#76641](https://github.com/grafana/grafana/issues/76641)
+
+The following data source permission endpoints have been removed:
+
+- `GET /datasources/:datasourceId/permissions`
+- `POST /api/datasources/:datasourceId/permissions`
+- `DELETE /datasources/:datasourceId/permissions`
+- `POST /datasources/:datasourceId/enable-permissions`
+- `POST /datasources/:datasourceId/disable-permissions`
+
+Please use the following endpoints instead:
+
+- `GET /api/access-control/datasources/:uid` for listing data source permissions
+- `POST /api/access-control/datasources/:uid/users/:id`, `POST /api/access-control/datasources/:uid/teams/:id` and `POST /api/access-control/datasources/:uid/buildInRoles/:id` for adding or removing data source permissions
+
+If you are using Terraform Grafana provider to manage data source permissions, you will need to upgrade your provider to [version 2.6.0](https://registry.terraform.io/providers/grafana/grafana/2.6.0/docs) or newer to ensure that data source permission provisioning keeps working.
+
+### Deprecations
+
+Since Grafana 10.2.3 we're deprecating the `showContextToggle` data source method. To signal support of Logs Context, it is enough to implement the `DataSourceWithLogsContextSupport` interface.
+
+**Which issue(s) does this PR fix?**:
+
+Fixes https://github.com/grafana/grafana/issues/66819
+Related with https://github.com/grafana/grafana/issues/73568 and https://github.com/grafana/grafana/issues/73565
+
+**Special notes for your reviewer:**
+
+There should be no function change with this deprecation. Issue [#77232](https://github.com/grafana/grafana/issues/77232)
+
+### Plugin development fixes & changes
+
+- **Grafana UI:** Add description to Menu component. [#77808](https://github.com/grafana/grafana/issues/77808), [@axelavargas](https://github.com/axelavargas)
+
+<!-- 10.2.3 END -->
 <!-- 10.2.2 START -->
 
 # 10.2.2 (2023-11-20)
@@ -369,6 +651,30 @@ Starting with 10.2, `parentRowIndex` is deprecated. It will be removed in a futu
 - **Drawer:** Make content scroll by default. [#75287](https://github.com/grafana/grafana/issues/75287), [@ashharrison90](https://github.com/ashharrison90)
 
 <!-- 10.2.0 END -->
+<!-- 10.1.6 START -->
+
+# 10.1.6 (2023-12-18)
+
+### Features and enhancements
+
+- **Alerting:** Attempt to retry retryable errors. [#79211](https://github.com/grafana/grafana/issues/79211), [@gotjosh](https://github.com/gotjosh)
+- **Unified Alerting:** Set `max_attempts` to 1 by default. [#79102](https://github.com/grafana/grafana/issues/79102), [@gotjosh](https://github.com/gotjosh)
+
+### Bug fixes
+
+- **Alerting:** Fix deleting rules in a folder with matching UID in another organization. [#79007](https://github.com/grafana/grafana/issues/79007), [@papagian](https://github.com/papagian)
+- **Chore:** Fix timeout issues when gathering prometheus datasource stats. [#78858](https://github.com/grafana/grafana/issues/78858), [@DanCech](https://github.com/DanCech)
+- **Provisioning:** Ensure that enterprise provisioning runs [10.1.x]. [#76686](https://github.com/grafana/grafana/issues/76686), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Alerting:** Make shareable alert rule link work if rule name contains forward slashes. [#75950](https://github.com/grafana/grafana/issues/75950), [@domasx2](https://github.com/domasx2)
+- **Loki:** Cache extracted labels. [#75905](https://github.com/grafana/grafana/issues/75905), [@gtk-grafana](https://github.com/gtk-grafana)
+- **DataSourcePicker:** Disable autocomplete for the search input . [#75900](https://github.com/grafana/grafana/issues/75900), [@ivanortegaalba](https://github.com/ivanortegaalba)
+- **Plugins:** Refresh plugin info after installation. [#75225](https://github.com/grafana/grafana/issues/75225), [@oshirohugo](https://github.com/oshirohugo)
+- **LDAP:** FIX Enable users on successfull login . [#75176](https://github.com/grafana/grafana/issues/75176), [@gamab](https://github.com/gamab)
+- **Loki:** Fix filters not being added with multiple expressions and parsers. [#75172](https://github.com/grafana/grafana/issues/75172), [@svennergr](https://github.com/svennergr)
+- **Recorded Queries:** Add org isolation (remote write target per org), and fix cross org Delete/List. (Enterprise)
+- **Auditing and UsageInsights:** FIX Loki configuration to use proxy env variables. (Enterprise)
+
+<!-- 10.1.6 END -->
 <!-- 10.1.5 START -->
 
 # 10.1.5 (2023-10-11)
@@ -487,7 +793,7 @@ Starting with 10.2, `parentRowIndex` is deprecated. It will be removed in a futu
 - **Plugin:** Remove error on invalid version. [#71951](https://github.com/grafana/grafana/issues/71951), [@oshirohugo](https://github.com/oshirohugo)
 - **Traces:** Enable showing trace ids. [#71950](https://github.com/grafana/grafana/issues/71950), [@gabor](https://github.com/gabor)
 - **RBAC:** Split non-empty scopes into `kind`, `attribute` and `identifier` fields for better search performance. [#71933](https://github.com/grafana/grafana/issues/71933), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
-- **Adminstration:** Feature toggle for feature toggle admin page. [#71887](https://github.com/grafana/grafana/issues/71887), [@IbrahimCSAE](https://github.com/IbrahimCSAE)
+- **Administration:** Feature toggle for feature toggle admin page. [#71887](https://github.com/grafana/grafana/issues/71887), [@IbrahimCSAE](https://github.com/IbrahimCSAE)
 - **Alerting:** Improve performance of matching captures. [#71828](https://github.com/grafana/grafana/issues/71828), [@grobinson-grafana](https://github.com/grobinson-grafana)
 - **CommandPalette:** Remove parent search and fuzzy search for pages. [#71825](https://github.com/grafana/grafana/issues/71825), [@tskarhed](https://github.com/tskarhed)
 - **Tracing:** Remove newTraceViewHeader feature toggle. [#71818](https://github.com/grafana/grafana/issues/71818), [@joey-grafana](https://github.com/joey-grafana)
@@ -846,6 +1152,20 @@ Starting with 10.0, changing the folder UID is deprecated. It will be removed in
 - **Grafana/ui:** Fix margin in RadioButtonGroup option when only icon is present. [#68899](https://github.com/grafana/grafana/issues/68899), [@aocenas](https://github.com/aocenas)
 
 <!-- 10.1.0 END -->
+<!-- 10.0.10 START -->
+
+# 10.0.10 (2023-12-18)
+
+### Features and enhancements
+
+- **Alerting:** Attempt to retry retryable errors. [#79210](https://github.com/grafana/grafana/issues/79210), [@gotjosh](https://github.com/gotjosh)
+- **Unified Alerting:** Set `max_attempts` to 1 by default. [#79101](https://github.com/grafana/grafana/issues/79101), [@gotjosh](https://github.com/gotjosh)
+
+### Bug fixes
+
+- **Recorded Queries:** Add org isolation (remote write target per org), and fix cross org Delete/List. (Enterprise)
+
+<!-- 10.0.10 END -->
 <!-- 10.0.9 START -->
 
 # 10.0.9 (2023-10-11)
@@ -1364,6 +1684,20 @@ The `database` field has been deprecated in the Elasticsearch datasource provisi
 - **InteractiveTable:** Updated design and minor tweak to Correlactions page. [#66443](https://github.com/grafana/grafana/issues/66443), [@torkelo](https://github.com/torkelo)
 
 <!-- 10.0.0-preview END -->
+<!-- 9.5.15 START -->
+
+# 9.5.15 (2023-12-18)
+
+### Features and enhancements
+
+- **Alerting:** Attempt to retry retryable errors. [#79209](https://github.com/grafana/grafana/issues/79209), [@gotjosh](https://github.com/gotjosh)
+- **Unified Alerting:** Set to 1 by default. [#79109](https://github.com/grafana/grafana/issues/79109), [@gotjosh](https://github.com/gotjosh)
+
+### Bug fixes
+
+- **Recorded Queries:** Add org isolation (remote write target per org), and fix cross org Delete/List. (Enterprise)
+
+<!-- 9.5.15 END -->
 <!-- 9.5.14 START -->
 
 # 9.5.14 (2023-11-13)

Dockerfile

@@ -3,7 +3,7 @@
 ARG BASE_IMAGE=alpine:3.18.3
 ARG JS_IMAGE=node:20-alpine3.18
 ARG JS_PLATFORM=linux/amd64
-ARG GO_IMAGE=golang:1.21.3-alpine3.18
+ARG GO_IMAGE=golang:1.21.5-alpine3.18
 
 ARG GO_SRC=go-builder
 ARG JS_SRC=js-builder

Makefile

@@ -261,7 +261,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
 	--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
 	--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
 	--build-arg BASE_IMAGE=ubuntu:22.04 \
-	--build-arg GO_IMAGE=golang:1.21.3 \
+	--build-arg GO_IMAGE=golang:1.21.5 \
 	--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
 	$(DOCKER_BUILD_ARGS)
 
@@ -308,7 +308,6 @@ protobuf: ## Compile protobuf definitions
 	bash pkg/plugins/backendplugin/pluginextensionv2/generate.sh
 	bash pkg/plugins/backendplugin/secretsmanagerplugin/generate.sh
 	bash pkg/services/store/entity/generate.sh
-	bash pkg/infra/grn/generate.sh
 
 clean: ## Clean up intermediate build artifacts.
 	@echo "cleaning"

conf/defaults.ini

@@ -591,6 +591,9 @@ org_role = Viewer
 # mask the Grafana version number for unauthenticated users
 hide_version = false
 
+# number of devices in total
+device_limit = 
+
 #################################### GitHub Auth #########################
 [auth.github]
 name = GitHub
@@ -907,6 +910,10 @@ user_identity_client_id =
 # By default is the same as used in AAD authentication or can be set to another application (for OBO flow)
 user_identity_client_secret =
 
+# Set the plugins that will receive Azure settings for each request (via plugin context)
+# By default this will include all Grafana Labs owned Azure plugins, or those that make use of Azure settings (Azure Monitor, Azure Data Explorer, Prometheus, MSSQL).
+forward_settings_to_plugins = grafana-azure-monitor-datasource, prometheus, grafana-azure-data-explorer-datasource, mssql
+
 #################################### Role-based Access Control ###########
 [rbac]
 # If enabled, cache permissions in a in memory cache
@@ -934,6 +941,9 @@ from_name = Grafana
 ehlo_identity =
 startTLS_policy =
 
+[smtp.static_headers]
+# Include custom static headers in all outgoing emails
+
 [emails]
 welcome_email_on_sign_up = false
 templates_pattern = emails/*.html, emails/*.txt
@@ -1254,17 +1264,20 @@ clean_upgrade = false
 enabled = false
 
 # URL of the remote Alertmanager that will replace the internal one.
+# This URL should be the root path, Grafana will automatically append an "/alertmanager" suffix for certain HTTP calls.
 # Required if `enabled` is set to `true`.
 url =
 
 # Tenant ID to use in requests to the Alertmanager.
-# It will also be used for the basic auth username.
+# It will also be used for the basic auth username if a password is configured.
 tenant =
 
 # Optional password for basic authentication.
 # If not present, the tenant ID will be set in the X-Scope-OrgID header.
 password =
 
+sync_interval = 5m
+
 #################################### Alerting ############################
 [alerting]
 # Enable the legacy alerting sub-system and interface. If Unified Alerting is already enabled and you try to go back to legacy alerting, all data that is part of Unified Alerting will be deleted. When this configuration section and flag are not defined, the state is defined at runtime. See the documentation for more details.
@@ -1533,6 +1546,10 @@ public_key_retrieval_on_startup = false
 disable_plugins =
 # Auth token for plugin installations and removal in managed instances
 install_token =
+# Comma separated list of plugin ids for which angular deprecation UI should be disabled
+hide_angular_deprecation =
+# Comma separated list of plugin ids for which environment variables should be forwarded. Used only when feature flag pluginsSkipHostEnvVars is enabled.
+forward_host_env_vars =
 
 #################################### Grafana Live ##########################################
 [live]
@@ -1728,6 +1745,8 @@ server_name =
 proxy_address =
 # Determines if the secure socks proxy should be shown on the datasources page, defaults to true if the feature is enabled
 show_ui = true
+# Disables TLS in the secure socks proxy
+allow_insecure = false
 
 ################################## Feature Management ##############################################
 # Options to configure the experimental Feature Toggle Admin Page feature, which is behind the `featureToggleAdminPage` feature toggle. Use at your own risk.
@@ -1746,3 +1765,8 @@ hidden_toggles =
 
 # Disables updating specific feature toggles in the feature management page
 read_only_toggles =
+
+#################################### Public Dashboards #####################################
+[public_dashboards]
+# Set to false to disable public dashboards
+enabled = true

conf/sample.ini

@@ -859,6 +859,10 @@
 # By default is the same as used in AAD authentication or can be set to another application (for OBO flow)
 ;user_identity_client_secret =
 
+# Set the plugins that will receive Azure settings for each request (via plugin context)
+# By default this will include all Grafana Labs owned Azure plugins, or those that make use of Azure settings (Azure Monitor, Azure Data Explorer, Prometheus, MSSQL).
+;forward_settings_to_plugins = grafana-azure-monitor-datasource, prometheus, grafana-azure-data-explorer-datasource, mssql
+
 #################################### Role-based Access Control ###########
 [rbac]
 ;permission_cache = true
@@ -887,6 +891,11 @@
 # SMTP startTLS policy (defaults to 'OpportunisticStartTLS')
 ;startTLS_policy = NoStartTLS
 
+[smtp.static_headers]
+# Include custom static headers in all outgoing emails
+;Foo-Header = bar
+;Foo = bar
+
 [emails]
 ;welcome_email_on_sign_up = false
 ;templates_pattern = emails/*.html, emails/*.txt
@@ -1591,6 +1600,7 @@
 # The address of the socks5 proxy datasources should connect to
 ; proxy_address =
 ; show_ui = true
+; allow_insecure = false
 
 ################################## Feature Management ##############################################
 [feature_management]
@@ -1605,3 +1615,9 @@
 ;hidden_toggles =
 # Disable updating specific feature toggles in the feature management page
 ;read_only_toggles =
+
+#################################### Public Dashboards #####################################
+[public_dashboards]
+# Set to false to disable public dashboards
+;enabled = true
+

contribute/backend/style-guide.md

@@ -66,8 +66,8 @@ Use [`t.Cleanup`](https://golang.org/pkg/testing/#T.Cleanup) to clean up resourc
 
 ### Mock
 
-Optionally, we use [`mock.Mock`](https://github.com/stretchr/testify#mock-package) package to write mocks. This is
-useful when you expect different behaviours of the same function.
+Optionally, we use [`mock.Mock`](https://github.com/stretchr/testify#mock-package) package to write mocks.
+This is useful when you expect different behaviors of the same function.
 
 #### Tips
 
@@ -126,7 +126,7 @@ assert.Equal(t, resp.Message, objectToReturn.Message)
 
 #### Mockery
 
-When an interface to test is too big, it's annoying to mock each function manually. To avoid this, you can
+When an interface to test is too big, it may be toilsome to mock each function manually. To avoid this, you can
 use [`mockery`](https://github.com/vektra/mockery) library to generate the mocks.
 
 The command is like the following (there are more options documented if you need to use another one):

contribute/backend/upgrading-go-version.md

@@ -0,0 +1,22 @@
+# Upgrading Go Version
+
+Notes on upgrading Go version.
+
+Example PR: https://github.com/grafana/grafana/pull/79329
+
+## The main areas that need to change during the upgrade are:
+
+- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/scripts/drone/variables.star#L6
+- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/Makefile#L264
+- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/Dockerfile#L6
+
+Make sure to run `make drone` so that changes to `.star` files are reflected and `drone.yml` is generated.
+
+### Additional files to change
+
+- Take a look in `.github/workflows` folder for what `go` version is being used there in various workflows.
+- Make sure to create a PR with the corresponding changes in `grafana/grafana-enterprise` repository.
+
+## Updating the go.mod file
+
+Please avoid updating the `go.mod` to the newest version unless really necessary. This ensures backwards compatibility and introduces less breaking changes. Always upgrade Go version in the runtime files above first, let them run for a couple of weeks and only then consider updating the `go.mod` file if necessary.

devenv/dev-dashboards/migrations/migrations.json

@@ -85,6 +85,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -98,6 +99,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -119,7 +121,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -127,7 +130,8 @@
               }
             ]
           },
-          "unit": "short"
+          "unit": "short",
+          "unitScale": true
         },
         "overrides": []
       },
@@ -237,7 +241,7 @@
         "content": "# Graph panel >> Timeseries panel\n\nKnown issues:\n* hiding null/empty series\n* time regions",
         "mode": "markdown"
       },
-      "pluginVersion": "9.5.0-pre",
+      "pluginVersion": "10.3.0-pre",
       "targets": [
         {
           "datasource": {
@@ -349,7 +353,7 @@
         "content": "# Table (old) >> Table\n\nKnown issues:\n* wrapping text\n* style changes",
         "mode": "markdown"
       },
-      "pluginVersion": "9.5.0-pre",
+      "pluginVersion": "10.3.0-pre",
       "targets": [
         {
           "datasource": {
@@ -546,7 +550,259 @@
         "content": "# Singlestat >> Stat\n\nKnown issues:\n* limited options",
         "mode": "markdown"
       },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Status + Notes",
+      "type": "text"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 16,
+        "x": 0,
+        "y": 29
+      },
+      "id": 24,
+      "options": {
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "pieType": "pie",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
       "pluginVersion": "9.5.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "random_walk_table"
+        }
+      ],
+      "title": "grafana-piechart-panel",
+      "transformations": [
+        {
+          "id": "merge",
+          "options": {
+            "reducers": []
+          }
+        }
+      ],
+      "type": "grafana-piechart-panel"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 8,
+        "x": 16,
+        "y": 29
+      },
+      "id": 25,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "# grafana-piechart-panel >> piechart\n\nKnown issues:\n* TBD",
+        "mode": "markdown"
+      },
+      "pluginVersion": "10.3.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Status + Notes",
+      "type": "text"
+    },
+    {
+      "circleMaxSize": 30,
+      "circleMinSize": 2,
+      "colors": [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+      ],
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "decimals": 0,
+      "esMetric": "Count",
+      "gridPos": {
+        "h": 10,
+        "w": 16,
+        "x": 0,
+        "y": 39
+      },
+      "hideEmpty": false,
+      "hideZero": false,
+      "id": 26,
+      "initialZoom": 1,
+      "locationData": "countries",
+      "mapCenter": "(0°, 0°)",
+      "mapCenterLatitude": 0,
+      "mapCenterLongitude": 0,
+      "maxDataPoints": 1,
+      "mouseWheelZoom": false,
+      "options": {
+        "controls": {
+          "mouseWheelZoom": true,
+          "showAttribution": true,
+          "showDebug": false,
+          "showMeasure": false,
+          "showScale": false,
+          "showZoom": true
+        },
+        "layers": [
+          {
+            "config": {
+              "showLegend": true,
+              "style": {
+                "color": {
+                  "fixed": "dark-green"
+                },
+                "opacity": 0.4,
+                "rotation": {
+                  "fixed": 0,
+                  "max": 360,
+                  "min": -360,
+                  "mode": "mod"
+                },
+                "size": {
+                  "fixed": 5,
+                  "max": 15,
+                  "min": 2
+                },
+                "symbol": {
+                  "fixed": "img/icons/marker/circle.svg",
+                  "mode": "fixed"
+                },
+                "symbolAlign": {
+                  "horizontal": "center",
+                  "vertical": "center"
+                },
+                "textConfig": {
+                  "fontSize": 12,
+                  "offsetX": 0,
+                  "offsetY": 0,
+                  "textAlign": "center",
+                  "textBaseline": "middle"
+                }
+              }
+            },
+            "location": {
+              "mode": "auto"
+            },
+            "name": "Layer 1",
+            "tooltip": true,
+            "type": "markers"
+          }
+        ],
+        "tooltip": {
+          "mode": "details"
+        },
+        "view": {
+          "allLayers": true,
+          "id": "zero",
+          "lat": 0,
+          "lon": 0,
+          "zoom": 1
+        }
+      },
+      "pluginVersion": "10.3.0-pre",
+      "showLegend": true,
+      "stickyLabels": false,
+      "tableQueryOptions": {
+        "geohashField": "geohash",
+        "latitudeField": "latitude",
+        "longitudeField": "longitude",
+        "metricField": "metric",
+        "queryType": "geohash"
+      },
+      "targets": [
+        {
+          "csvFileName": "flight_info_by_state.csv",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_file"
+        }
+      ],
+      "thresholds": "0,10",
+      "title": "grafana-worldmap-panel",
+      "transformations": [
+        {
+          "id": "merge",
+          "options": {
+            "reducers": []
+          }
+        }
+      ],
+      "type": "grafana-worldmap-panel",
+      "unitPlural": "",
+      "unitSingle": "",
+      "valueName": "total"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 8,
+        "x": 16,
+        "y": 39
+      },
+      "id": 27,
+      "options": {
+        "code": {
+          "language": "plaintext",
+          "showLineNumbers": false,
+          "showMiniMap": false
+        },
+        "content": "# grafana-worldmap-panel >> geomap\n\nKnown issues:\n* TBD",
+        "mode": "markdown"
+      },
+      "pluginVersion": "10.3.0-pre",
       "targets": [
         {
           "datasource": {
@@ -561,7 +817,7 @@
     }
   ],
   "refresh": "",
-  "schemaVersion": 34,
+  "schemaVersion": 39,
   "tags": [
     "gdev",
     "migrations",
@@ -578,6 +834,6 @@
   "timezone": "",
   "title": "Devenv - Panel migrations",
   "uid": "cdd412c4",
-  "version": 6,
+  "version": 34,
   "weekStart": ""
-}
+}

devenv/dev-dashboards/panel-barchart/barchart-tooltips.json

@@ -1,593 +0,0 @@
-{
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": {
-            "type": "grafana",
-            "uid": "-- Grafana --"
-          },
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations & Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "editable": true,
-    "fiscalYearStartMonth": 0,
-    "graphTooltip": 0,
-    "id": 301,
-    "links": [],
-    "liveNow": false,
-    "panels": [
-      {
-        "collapsed": false,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 0
-        },
-        "id": 4,
-        "panels": [],
-        "title": "Field Override - Data Links",
-        "type": "row"
-      },
-      {
-        "datasource": {},
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisCenteredZero": false,
-              "axisColorMode": "text",
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "fillOpacity": 80,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineWidth": 1,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "column1"
-              },
-              "properties": [
-                {
-                  "id": "links",
-                  "value": [
-                    {
-                      "title": "google",
-                      "url": "google.com"
-                    },
-                    {
-                      "targetBlank": true,
-                      "title": "youtube",
-                      "url": "youtube.com"
-                    }
-                  ]
-                },
-                {
-                  "id": "custom.fillOpacity",
-                  "value": 14
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "column2"
-              },
-              "properties": [
-                {
-                  "id": "links",
-                  "value": [
-                    {
-                      "title": "datalink column 2",
-                      "url": "grafana.com"
-                    }
-                  ]
-                },
-                {
-                  "id": "color",
-                  "value": {
-                    "fixedColor": "purple",
-                    "mode": "shades"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 6,
-          "w": 9,
-          "x": 0,
-          "y": 1
-        },
-        "id": 1,
-        "options": {
-          "barRadius": 0,
-          "barWidth": 0.97,
-          "fullHighlight": false,
-          "groupWidth": 0.7,
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          },
-          "orientation": "auto",
-          "showValue": "auto",
-          "stacking": "none",
-          "tooltip": {
-            "mode": "single",
-            "sort": "none"
-          },
-          "xTickLabelRotation": 0,
-          "xTickLabelSpacing": 0
-        },
-        "pluginVersion": "9.5.0-cloud.4.a016665c",
-        "targets": [
-          {
-            "csvContent": "id,column1,column2\r\nA,1,2",
-            "datasource": {
-              "type": "testdata",
-              "uid": "o63ntNT4z"
-            },
-            "refId": "A",
-            "scenarioId": "csv_content"
-          },
-          {
-            "csvContent": "id,column1,column2\r\nB,2,1",
-            "datasource": {
-              "type": "testdata",
-              "uid": "o63ntNT4z"
-            },
-            "hide": false,
-            "refId": "B",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Tooltip mode: Single",
-        "transformations": [
-          {
-            "id": "merge",
-            "options": {}
-          }
-        ],
-        "type": "barchart"
-      },
-      {
-        "datasource": {},
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisCenteredZero": false,
-              "axisColorMode": "text",
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "fillOpacity": 80,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineWidth": 1,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "column1"
-              },
-              "properties": [
-                {
-                  "id": "links",
-                  "value": [
-                    {
-                      "title": "google",
-                      "url": "google.com"
-                    },
-                    {
-                      "targetBlank": true,
-                      "title": "youtube",
-                      "url": "youtube.com"
-                    }
-                  ]
-                },
-                {
-                  "id": "custom.fillOpacity",
-                  "value": 14
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "column2"
-              },
-              "properties": [
-                {
-                  "id": "links",
-                  "value": [
-                    {
-                      "title": "datalink column 2",
-                      "url": "grafana.com"
-                    }
-                  ]
-                },
-                {
-                  "id": "color",
-                  "value": {
-                    "fixedColor": "purple",
-                    "mode": "shades"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 6,
-          "w": 9,
-          "x": 9,
-          "y": 1
-        },
-        "id": 6,
-        "options": {
-          "barRadius": 0,
-          "barWidth": 0.97,
-          "fullHighlight": false,
-          "groupWidth": 0.7,
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          },
-          "orientation": "auto",
-          "showValue": "auto",
-          "stacking": "none",
-          "tooltip": {
-            "mode": "multi",
-            "sort": "none"
-          },
-          "xTickLabelRotation": 0,
-          "xTickLabelSpacing": 0
-        },
-        "pluginVersion": "9.5.0-cloud.4.a016665c",
-        "targets": [
-          {
-            "csvContent": "id,column1,column2\r\nA,1,2",
-            "datasource": {
-              "type": "testdata",
-              "uid": "o63ntNT4z"
-            },
-            "refId": "A",
-            "scenarioId": "csv_content"
-          },
-          {
-            "csvContent": "id,column1,column2\r\nB,2,1",
-            "datasource": {
-              "type": "testdata",
-              "uid": "o63ntNT4z"
-            },
-            "hide": false,
-            "refId": "B",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Tooltip mode: All",
-        "transformations": [
-          {
-            "id": "merge",
-            "options": {}
-          }
-        ],
-        "type": "barchart"
-      },
-      {
-        "collapsed": false,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 7
-        },
-        "id": 3,
-        "panels": [],
-        "title": "Field Override - Hide Tooltip",
-        "type": "row"
-      },
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "PD8C576611E62080A"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisCenteredZero": false,
-              "axisColorMode": "text",
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "fillOpacity": 80,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineWidth": 1,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "field 3"
-              },
-              "properties": [
-                {
-                  "id": "custom.hideFrom",
-                  "value": {
-                    "legend": false,
-                    "tooltip": true,
-                    "viz": false
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 6,
-          "w": 9,
-          "x": 0,
-          "y": 8
-        },
-        "id": 5,
-        "options": {
-          "barRadius": 0,
-          "barWidth": 0.97,
-          "fullHighlight": false,
-          "groupWidth": 0.7,
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          },
-          "orientation": "auto",
-          "showValue": "auto",
-          "stacking": "none",
-          "tooltip": {
-            "mode": "multi",
-            "sort": "none"
-          },
-          "xTickLabelRotation": 0,
-          "xTickLabelSpacing": 0
-        },
-        "targets": [
-          {
-            "csvContent": "id, field 1, field 2, field 3\na, 20, 30, 40\nb, 40, 50, 60",
-            "datasource": {
-              "type": "testdata",
-              "uid": "PD8C576611E62080A"
-            },
-            "refId": "A",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Hide 'field 3'",
-        "type": "barchart"
-      },
-      {
-        "datasource": {
-          "type": "testdata",
-          "uid": "PD8C576611E62080A"
-        },
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisCenteredZero": false,
-              "axisColorMode": "text",
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "fillOpacity": 80,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineWidth": 1,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "id"
-              },
-              "properties": [
-                {
-                  "id": "custom.hideFrom",
-                  "value": {
-                    "legend": false,
-                    "tooltip": true,
-                    "viz": false
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 6,
-          "w": 9,
-          "x": 9,
-          "y": 8
-        },
-        "id": 7,
-        "options": {
-          "barRadius": 0,
-          "barWidth": 0.97,
-          "fullHighlight": false,
-          "groupWidth": 0.7,
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          },
-          "orientation": "auto",
-          "showValue": "auto",
-          "stacking": "none",
-          "tooltip": {
-            "mode": "multi",
-            "sort": "none"
-          },
-          "xTickLabelRotation": 0,
-          "xTickLabelSpacing": 0
-        },
-        "targets": [
-          {
-            "csvContent": "id, field 1, field 2, field 3\na, 20, 30, 40\nb, 40, 50, 60",
-            "datasource": {
-              "type": "testdata",
-              "uid": "PD8C576611E62080A"
-            },
-            "refId": "A",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Hide 'id'",
-        "type": "barchart"
-      }
-    ],
-    "refresh": "",
-    "schemaVersion": 38,
-      "tags": [
-        "gdev",
-        "panel-tests",
-        "barchart",
-        "graph-ng"
-      ],
-    "templating": {
-      "list": []
-    },
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {},
-    "timezone": "",
-    "title": "Panel Tests - Bar Chart Tooltip",
-    "uid": "ea33320b-bd97-4fe1-a27c-24bc61a48b41",
-    "version": 12,
-    "weekStart": ""
-  }

devenv/dev-dashboards/panel-timeseries/timeseries-nulls.json

@@ -21,6 +21,7 @@
       }
     ]
   },
+  "description": "",
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
@@ -38,6 +39,295 @@
   ],
   "liveNow": false,
   "panels": [
+    {
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 44,
+      "title": "Enums",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "description": "This visualizes a time series of enumerated values, displaying minimum, maximum, and average values over time to track fluctuations and trends",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Info"
+            },
+            "properties": [
+              {
+                "id": "custom.lineInterpolation",
+                "value": "stepAfter"
+              },
+              {
+                "id": "custom.axisColorMode",
+                "value": "series"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Status"
+            },
+            "properties": [
+              {
+                "id": "custom.lineInterpolation",
+                "value": "stepAfter"
+              },
+              {
+                "id": "custom.axisColorMode",
+                "value": "series"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 16,
+        "w": 12,
+        "x": 0,
+        "y": 1
+      },
+      "id": 45,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "rawFrameContent": "[\n  {\n    \"schema\": {\n      \"refId\": \"A\",\n      \"name\": \"A\",\n      \"fields\": [\n        {\n          \"name\": \"Time\",\n          \"type\": \"time\",\n          \"typeInfo\": {\n            \"frame\": \"time.Time\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Value\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Min\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Max\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Info\",\n          \"type\": \"string\",\n          \"typeInfo\": {\n            \"frame\": \"string\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Status\",\n          \"type\": \"string\",\n          \"typeInfo\": {\n            \"frame\": \"string\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        }\n      ]\n    },\n    \"data\": {\n      \"values\": [\n        [\n          \"2023-06-14T08:16:41Z\",\n          \"2023-06-14T08:16:50Z\",\n          \"2023-06-14T08:16:55Z\",\n          \"2023-06-14T08:17:15Z\",\n          \"2023-06-14T08:17:46Z\",\n          \"2023-06-14T08:17:59Z\",\n          \"2023-06-14T08:18:20Z\",\n          \"2023-06-14T08:18:25Z\"\n        ],\n        [\n          97.56700088585262,\n          97.51875596242603,\n          97.88367836664669,\n          97.64813860191066,\n          97.46344237059202,\n          97.06932713353162,\n          97.11185691118344,\n          97.4315327939052\n        ],\n        [\n          96.17381933561288,\n          96.86449303671965,\n          95.5851820937877,\n          96.94658694041154,\n          96.7433590164638,\n          96.74913605945137,\n          95.61938577725707,\n          96.24186355022567\n        ],\n        [\n          99.69898997339244,\n          98.68620205532211,\n          99.5800005905314,\n          98.2998754185445,\n          98.02873998081307,\n          99.01798295660049,\n          97.95260164072228,\n          98.24811606848421\n        ],\n        [\n          \"down\",\n          \"down\",\n          \"up\",\n          \"down\",\n          \"down\",\n          \"down\",\n          \"up\",\n          \"up\"\n        ],\n        [\n          \"ON\",\n          \"ON\",\n          \"OFF\",\n          \"ON\",\n          \"OFF\",\n          \"ON\",\n          \"STANDBY\",\n          \"OFF\"\n        ]\n      ]\n    }\n  }\n]",
+          "refId": "A",
+          "scenarioId": "raw_frame"
+        }
+      ],
+      "title": "Time series enums",
+      "transformations": [
+        {
+          "id": "convertFieldType",
+          "options": {
+            "conversions": [
+              {
+                "destinationType": "enum",
+                "enumConfig": {
+                  "text": [
+                    "OFF",
+                    "STANDBY",
+                    "ON"
+                  ]
+                },
+                "targetField": "Status"
+              }
+            ],
+            "fields": {}
+          }
+        }
+      ],
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "fillOpacity": 70,
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineWidth": 0,
+            "spanNulls": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 95
+              },
+              {
+                "color": "#E24D42",
+                "value": 95.5
+              },
+              {
+                "color": "#EF843C",
+                "value": 96
+              },
+              {
+                "color": "#1F78C1",
+                "value": 96.5
+              },
+              {
+                "color": "#BA43A9",
+                "value": 96.75
+              },
+              {
+                "color": "#EAB839",
+                "value": 98
+              },
+              {
+                "color": "#6ED0E0",
+                "value": 99
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 16,
+        "w": 12,
+        "x": 12,
+        "y": 1
+      },
+      "id": 46,
+      "options": {
+        "alignValue": "left",
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "mergeValues": true,
+        "rowHeight": 0.9,
+        "showValue": "auto",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "rawFrameContent": "[\n  {\n    \"schema\": {\n      \"refId\": \"A\",\n      \"name\": \"A\",\n      \"fields\": [\n        {\n          \"name\": \"Time\",\n          \"type\": \"time\",\n          \"typeInfo\": {\n            \"frame\": \"time.Time\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Value\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Min\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Max\",\n          \"type\": \"number\",\n          \"typeInfo\": {\n            \"frame\": \"float64\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        },\n        {\n          \"name\": \"Status\",\n          \"type\": \"string\",\n          \"typeInfo\": {\n            \"frame\": \"string\",\n            \"nullable\": true\n          },\n          \"config\": {}\n        }\n      ]\n    },\n    \"data\": {\n      \"values\": [\n        [\n          \"2023-06-14T08:16:41Z\",\n          \"2023-06-14T08:16:50Z\",\n          \"2023-06-14T08:16:55Z\",\n          \"2023-06-14T08:17:15Z\",\n          \"2023-06-14T08:17:46Z\",\n          \"2023-06-14T08:17:59Z\",\n          \"2023-06-14T08:18:20Z\",\n          \"2023-06-14T08:18:25Z\"\n        ],\n        [\n          97.56700088585262,\n          97.51875596242603,\n          97.88367836664669,\n          97.64813860191066,\n          97.46344237059202,\n          97.06932713353162,\n          97.11185691118344,\n          97.4315327939052\n        ],\n        [\n          96.17381933561288,\n          96.86449303671965,\n          95.5851820937877,\n          96.94658694041154,\n          96.7433590164638,\n          96.74913605945137,\n          95.61938577725707,\n          96.24186355022567\n        ],\n        [\n          99.69898997339244,\n          98.68620205532211,\n          99.5800005905314,\n          98.2998754185445,\n          98.02873998081307,\n          99.01798295660049,\n          97.95260164072228,\n          98.24811606848421\n        ],\n        [\n          \"ON\",\n          \"ON\",\n          \"OFF\",\n          \"ON\",\n          \"OFF\",\n          \"ON\",\n          \"STANDBY\",\n          \"OFF\"\n        ]\n      ]\n    }\n  }\n]",
+          "refId": "A",
+          "scenarioId": "raw_frame"
+        }
+      ],
+      "title": "State timeline enums",
+      "transformations": [
+        {
+          "id": "convertFieldType",
+          "options": {
+            "conversions": [
+              {
+                "destinationType": "enum",
+                "enumConfig": {
+                  "text": [
+                    "OFF",
+                    "STANDBY",
+                    "ON"
+                  ]
+                },
+                "targetField": "Status"
+              }
+            ],
+            "fields": {}
+          }
+        }
+      ],
+      "type": "state-timeline"
+    },
+    {
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 17
+      },
+      "id": 43,
+      "title": "Gaps and connected",
+      "type": "row"
+    },
     {
       "datasource": {
         "type": "testdata"
@@ -48,6 +338,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -100,7 +391,7 @@
         "h": 7,
         "w": 7,
         "x": 0,
-        "y": 0
+        "y": 18
       },
       "id": 3,
       "links": [],
@@ -161,6 +452,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -214,7 +506,7 @@
         "h": 7,
         "w": 8,
         "x": 7,
-        "y": 0
+        "y": 18
       },
       "id": 2,
       "links": [],
@@ -283,6 +575,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -336,7 +629,7 @@
         "h": 7,
         "w": 9,
         "x": 15,
-        "y": 0
+        "y": 18
       },
       "id": 6,
       "links": [],
@@ -424,6 +717,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -476,7 +770,7 @@
         "h": 7,
         "w": 7,
         "x": 0,
-        "y": 7
+        "y": 25
       },
       "id": 4,
       "links": [],
@@ -537,6 +831,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -590,7 +885,7 @@
         "h": 7,
         "w": 8,
         "x": 7,
-        "y": 7
+        "y": 25
       },
       "id": 5,
       "links": [],
@@ -659,6 +954,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -712,7 +1008,7 @@
         "h": 7,
         "w": 9,
         "x": 15,
-        "y": 7
+        "y": 25
       },
       "id": 7,
       "links": [],
@@ -800,6 +1096,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -883,7 +1180,7 @@
         "h": 8,
         "w": 7,
         "x": 0,
-        "y": 14
+        "y": 32
       },
       "id": 11,
       "options": {
@@ -948,6 +1245,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1031,7 +1329,7 @@
         "h": 8,
         "w": 7,
         "x": 7,
-        "y": 14
+        "y": 32
       },
       "id": 9,
       "options": {
@@ -1097,6 +1395,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1151,7 +1450,7 @@
         "h": 8,
         "w": 5,
         "x": 14,
-        "y": 14
+        "y": 32
       },
       "id": 15,
       "options": {
@@ -1187,6 +1486,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1241,7 +1541,7 @@
         "h": 8,
         "w": 5,
         "x": 19,
-        "y": 14
+        "y": 32
       },
       "id": 16,
       "options": {
@@ -1281,6 +1581,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1332,7 +1633,7 @@
         "h": 11,
         "w": 24,
         "x": 0,
-        "y": 22
+        "y": 40
       },
       "id": 18,
       "maxDataPoints": 150,
@@ -1373,6 +1674,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1424,7 +1726,7 @@
         "h": 10,
         "w": 12,
         "x": 0,
-        "y": 33
+        "y": 51
       },
       "id": 20,
       "maxDataPoints": 150,
@@ -1465,6 +1767,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1516,7 +1819,7 @@
         "h": 10,
         "w": 12,
         "x": 12,
-        "y": 33
+        "y": 51
       },
       "id": 22,
       "maxDataPoints": 150,
@@ -1557,6 +1860,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1608,7 +1912,7 @@
         "h": 10,
         "w": 8,
         "x": 0,
-        "y": 43
+        "y": 61
       },
       "id": 24,
       "maxDataPoints": 150,
@@ -1649,6 +1953,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1700,7 +2005,7 @@
         "h": 10,
         "w": 8,
         "x": 8,
-        "y": 43
+        "y": 61
       },
       "id": 26,
       "maxDataPoints": 150,
@@ -1741,6 +2046,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1792,7 +2098,7 @@
         "h": 10,
         "w": 8,
         "x": 16,
-        "y": 43
+        "y": 61
       },
       "id": 28,
       "maxDataPoints": 150,
@@ -1828,7 +2134,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 53
+        "y": 71
       },
       "id": 34,
       "panels": [],
@@ -1837,7 +2143,7 @@
     },
     {
       "datasource": {
-        "type": "testdata",
+        "type": "grafana-testdata-datasource",
         "uid": "PD8C576611E62080A"
       },
       "fieldConfig": {
@@ -1846,6 +2152,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1898,7 +2205,7 @@
         "h": 6,
         "w": 7,
         "x": 0,
-        "y": 54
+        "y": 72
       },
       "id": 32,
       "options": {
@@ -1940,6 +2247,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -1992,7 +2300,7 @@
         "h": 6,
         "w": 7,
         "x": 7,
-        "y": 54
+        "y": 72
       },
       "id": 35,
       "options": {
@@ -2078,7 +2386,7 @@
         "h": 6,
         "w": 10,
         "x": 14,
-        "y": 54
+        "y": 72
       },
       "id": 39,
       "options": {
@@ -2123,6 +2431,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2175,7 +2484,7 @@
         "h": 6,
         "w": 7,
         "x": 0,
-        "y": 60
+        "y": 78
       },
       "id": 31,
       "options": {
@@ -2215,6 +2524,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2267,7 +2577,7 @@
         "h": 6,
         "w": 7,
         "x": 7,
-        "y": 60
+        "y": 78
       },
       "id": 36,
       "options": {
@@ -2351,7 +2661,7 @@
         "h": 6,
         "w": 10,
         "x": 14,
-        "y": 60
+        "y": 78
       },
       "id": 40,
       "options": {
@@ -2394,6 +2704,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2446,7 +2757,7 @@
         "h": 6,
         "w": 7,
         "x": 0,
-        "y": 66
+        "y": 84
       },
       "id": 30,
       "options": {
@@ -2486,6 +2797,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2538,7 +2850,7 @@
         "h": 6,
         "w": 7,
         "x": 7,
-        "y": 66
+        "y": 84
       },
       "id": 37,
       "options": {
@@ -2622,7 +2934,7 @@
         "h": 6,
         "w": 10,
         "x": 14,
-        "y": 66
+        "y": 84
       },
       "id": 41,
       "options": {
@@ -2665,6 +2977,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2717,7 +3030,7 @@
         "h": 6,
         "w": 7,
         "x": 0,
-        "y": 72
+        "y": 90
       },
       "id": 29,
       "options": {
@@ -2757,6 +3070,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -2809,7 +3123,7 @@
         "h": 6,
         "w": 7,
         "x": 7,
-        "y": 72
+        "y": 90
       },
       "id": 38,
       "options": {
@@ -2893,7 +3207,7 @@
         "h": 6,
         "w": 10,
         "x": 14,
-        "y": 72
+        "y": 90
       },
       "id": 42,
       "options": {
@@ -2926,15 +3240,16 @@
       "type": "state-timeline"
     }
   ],
-  "refresh": "",
-  "schemaVersion": 38,
+  "refresh": false,
+  "schemaVersion": 39,
   "tags": [
     "gdev",
     "panel-tests",
     "graph-ng",
     "timeseries",
     "trend",
-    "state-timeline"
+    "state-timeline",
+    "transform"
   ],
   "templating": {
     "list": []
@@ -2945,8 +3260,8 @@
   },
   "timepicker": {},
   "timezone": "",
-  "title": "Panel Tests - Graph NG - Gaps and Connected",
+  "title": "Panel Tests - Graph NG - Discrete panels",
   "uid": "8mmCAF1Mz",
-  "version": 5,
+  "version": 25,
   "weekStart": ""
 }

devenv/dev-dashboards/panel-xychart/xychart-tooltip-color-test.json

@@ -0,0 +1,687 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {},
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "blue",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "pointSize": {
+              "fixed": 32
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "fieldMinMax": false,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 7,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "pointColor": {
+              "fixed": "orange"
+            },
+            "x": "Miles_per_Gallon",
+            "y": "Horsepower"
+          }
+        ],
+        "seriesMapping": "auto",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvContent": "x,y,z\n1,2,3\n3,4,5\n5,6,7",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "${DS_GDEV-TESTDATA}"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Standard options: Single color",
+      "type": "xychart"
+    },
+    {
+      "datasource": {},
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "green",
+            "mode": "shades"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "pointSize": {
+              "fixed": 32
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "fieldMinMax": false,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 7,
+        "x": 7,
+        "y": 0
+      },
+      "id": 4,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "pointColor": {
+              "fixed": "orange"
+            },
+            "x": "Miles_per_Gallon",
+            "y": "Horsepower"
+          }
+        ],
+        "seriesMapping": "auto",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvContent": "x,y,z\n1,2,3\n3,4,5\n5,6,7",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "${DS_GDEV-TESTDATA}"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Standard options: Shades of a color",
+      "type": "xychart"
+    },
+    {
+      "datasource": {},
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "yellow",
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "pointSize": {
+              "fixed": 32
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "fieldMinMax": false,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 7,
+        "x": 14,
+        "y": 0
+      },
+      "id": 3,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "pointColor": {
+              "fixed": "orange"
+            },
+            "x": "Miles_per_Gallon",
+            "y": "Horsepower"
+          }
+        ],
+        "seriesMapping": "auto",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvContent": "x,y,z\n1,2,3\n3,4,5\n5,6,7",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "${DS_GDEV-TESTDATA}"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Standard options: Classic palette",
+      "type": "xychart"
+    },
+    {
+      "datasource": {},
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "blue",
+            "mode": "fixed"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "pointSize": {
+              "fixed": 32
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "fieldMinMax": false,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 7,
+        "x": 0,
+        "y": 11
+      },
+      "id": 5,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "pointColor": {
+              "fixed": "orange"
+            },
+            "x": "x",
+            "y": "y"
+          },
+          {
+            "pointColor": {
+              "fixed": "green"
+            },
+            "x": "x",
+            "y": "z"
+          }
+        ],
+        "seriesMapping": "manual",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvContent": "x,y,z\n1,2,3\n3,4,5\n5,6,7",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "${DS_GDEV-TESTDATA}"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Standard options: Single color + Mapping: Fixed color",
+      "type": "xychart"
+    },
+    {
+      "datasource": {},
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "blue",
+            "mode": "shades"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "pointSize": {
+              "fixed": 32
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "fieldMinMax": false,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 7,
+        "x": 7,
+        "y": 11
+      },
+      "id": 6,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "pointColor": {
+              "fixed": "orange"
+            },
+            "x": "x",
+            "y": "y"
+          },
+          {
+            "pointColor": {
+              "fixed": "green"
+            },
+            "x": "x",
+            "y": "z"
+          }
+        ],
+        "seriesMapping": "manual",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvContent": "x,y,z\n1,2,3\n3,4,5\n5,6,7",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "${DS_GDEV-TESTDATA}"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Standard options: Shades of color + Mapping: Fixed color",
+      "type": "xychart"
+    },
+    {
+      "datasource": {},
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "fixedColor": "blue",
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "pointSize": {
+              "fixed": 32
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "fieldMinMax": false,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 7,
+        "x": 14,
+        "y": 11
+      },
+      "id": 7,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "pointColor": {
+              "fixed": "orange"
+            },
+            "x": "x",
+            "y": "y"
+          },
+          {
+            "pointColor": {
+              "fixed": "green"
+            },
+            "x": "x",
+            "y": "z"
+          }
+        ],
+        "seriesMapping": "manual",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvContent": "x,y,z\n1,2,3\n3,4,5\n5,6,7",
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "${DS_GDEV-TESTDATA}"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Standard options: Classic palette + Mapping: Fixed color",
+      "type": "xychart"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "continuous-BlYlRd"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "pointSize": {
+              "fixed": 50
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "show": "points"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 7,
+        "x": 0,
+        "y": 23
+      },
+      "id": 8,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "series": [
+          {
+            "pointColor": {
+              "field": "c",
+              "fixed": "dark-green"
+            },
+            "x": "x",
+            "y": "y"
+          }
+        ],
+        "seriesMapping": "manual",
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "csvContent": "x,y,c\n0,0,0\n50,50,25\n100,100,50",
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_content"
+        }
+      ],
+      "title": "Panel Title",
+      "type": "xychart"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 39,
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "XYChart tooltip color test",
+  "uid": "cb67db43-dd72-4ada-a313-53f46c20adcc",
+  "version": 1,
+  "weekStart": ""
+}

devenv/docker/blocks/elastic/data/data.js

@@ -149,7 +149,8 @@ function getRandomLogItem(counter, timestamp) {
     hostname: chooseRandomElement(['hostname1', 'hostname2', 'hostname3', 'hostname4', 'hostname5', 'hostname6']),
     value: counter,
     metric: chooseRandomElement(['cpu', 'memory', 'latency']),
-    description: "this is description"
+    description: "this is description",
+    slash: "Access to the path '\\\\tkasnpo\\KASNPO\\Files\\contacts.xml' is denied."
   };
 }
 

devenv/docker/blocks/mimir_backend/nginx/nginx.conf.template

@@ -5,9 +5,15 @@ events {}
 http {
   resolver 127.0.0.11 ipv6=off;  
 
+  # Use basic auth user in `X-Scope-OrgID` if the header is not already set.
+  map $http_x_scope_orgid $add_x_scope_orgid {
+    default $http_x_scope_orgid;
+    "" $remote_user;
+  }
+
   server {
     listen 8080;
-    proxy_set_header X-Scope-OrgID $http_x_scope_orgid;
+    proxy_set_header X-Scope-OrgID $add_x_scope_orgid;
 
     location / {
       auth_basic "Mimir Backend";

devenv/docker/blocks/self-instrumentation/agent.flow

@@ -0,0 +1,53 @@
+loki.write "default" {
+	endpoint {
+		url = "http://loki:3100/loki/api/v1/push"
+	}
+	external_labels = {}
+}
+
+logging {
+  level  = "debug"
+  format = "json"
+  write_to = [loki.write.default.receiver]
+}
+
+tracing {
+  sampling_fraction = 1
+  write_to = [otelcol.exporter.otlp.tempo.input]
+}
+
+otelcol.exporter.otlp "tempo" {
+  client {
+    endpoint = "tempo:4317"
+    tls {
+      insecure = true
+      insecure_skip_verify = true
+    }
+  }
+}
+
+faro.receiver "frontend" {
+    server {
+        listen_address = "0.0.0.0"
+        listen_port = 12347
+        cors_allowed_origins = ["*"]
+    }
+
+    output {
+        logs   = [loki.write.default.receiver]
+        traces = [otelcol.exporter.otlp.tempo.input]
+    }
+}
+
+pyroscope.write "default" {
+  endpoint {
+    url = "http://pyroscope:4040"
+  }
+}
+
+pyroscope.scrape "default" {
+  targets = [
+    {"__address__" = "host.docker.internal:6060", "service_name"="grafana"},
+  ]
+  forward_to = [pyroscope.write.default.receiver]
+}

devenv/docker/blocks/self-instrumentation/agent.yaml

@@ -1,40 +0,0 @@
-logs:
-  positions_directory: /tmp/loki-pos
-  configs:
-    - name: default
-      scrape_configs: []
-      clients:
-        - url: http://host.docker.internal:3100/loki/api/v1/push
-traces:
-  configs:
-    - name: default
-      remote_write:
-        - endpoint: http://host.docker.internal:3200
-          insecure: true
-      receivers:
-        otlp:
-          protocols:
-            grpc:
-            http:
-              cors:
-                allowed_origins:
-                  - "*"
-integrations:
-  app_agent_receiver_configs:
-    - autoscrape:
-        enable: false
-      instance: "frontend"
-      logs_instance: "default"
-      traces_instance: "default"
-      server:
-        host: 0.0.0.0
-        port: 12347
-        cors_allowed_origins:
-          - "*"
-      logs_labels: # labels to add to loki log record
-        app: frontend # static value
-        kind: # value will be taken from log items. exception, log, measurement, etc
-      logs_send_timeout: 5000
-      sourcemaps:
-        download: true # will download source file, extract source map location,
-        # download source map and use it to transform stack trace locations

devenv/docker/blocks/self-instrumentation/docker-compose.yaml

@@ -30,15 +30,22 @@
     ports:
       - "14268:14268"
       - "3200:3200"
+      - "4317:4317"
+  pyroscope:
+    image: "grafana/pyroscope:latest"
+    ports:
+      - "4040:4040"
   agent:
-    image: grafana/agent:v0.34.3
+    image: grafana/agent:v0.37.0
+    environment:
+      - AGENT_MODE=flow
     entrypoint:
       - /bin/grafana-agent
-      - -server.http.address=0.0.0.0:12345
-      - -config.file=/etc/agent/agent.yaml
-      - -enable-features=integrations-next
+      - run
+      - --server.http.listen-addr=0.0.0.0:12345
+      - /etc/agent/config.river
     volumes:
-      - ./docker/blocks/self-instrumentation/agent.yaml:/etc/agent/agent.yaml
+      - ./docker/blocks/self-instrumentation/agent.flow:/etc/agent/config.river 
     ports:
       - "12345:12345"
       - "12347:12347"

devenv/docker/blocks/self-instrumentation/promtail.yaml

@@ -9,10 +9,10 @@ clients:
   - url: http://loki:3100/loki/api/v1/push
 
 scrape_configs:
-- job_name: hosted-grafana/grafana
+- job_name: grafana
   static_configs:
   - targets:
       - localhost
     labels:
-      job: hosted-grafana/grafana
+      job: grafana
       __path__: /var/log/grafana/*log

devenv/docker/blocks/self-instrumentation/readme.md

@@ -6,14 +6,26 @@ To run this source, in the Grafana repo root:
 make devenv sources=self-instrumentation
 ```
 
-This will setup Prometheus, Loki and Tempo.
+This will setup Prometheus, Loki, Tempo, and Pyroscope.
 
 You then need to run Grafana with those added config:
 
 ```ini
+[log.file]
+format = json
+
 [log.frontend]
 enabled = true
+custom_endpoint=http://localhost:12347/collect
 
 [tracing.opentelemetry.jaeger]
 address = http://localhost:14268/api/traces
-```
+```
+
+To collect profiles with pyroscope, you need to run Grafana with the following env vars:
+
+```bash
+export GF_DIAGNOSTICS_PROFILING_ENABLED=true
+export GF_DIAGNOSTICS_PROFILING_ADDR=0.0.0.0
+make run
+``````

devenv/docker/blocks/tempo/README.md

@@ -4,3 +4,10 @@ This devenv docker-compose.yaml will allow you to;
 - upload/download trace JSON files
 - view service graphs
 - search traces via Loki
+
+To send traces from grafana use this configuration;
+```
+[tracing.opentelemetry.otlp]
+# otlp destination (ex localhost:4317)
+address = localhost:4317
+```

devenv/jsonnet/Makefile

@@ -1,12 +1,7 @@
-include ../../.bingo/Variables.mk
-
 DASHBOARDS = $(shell find ../dev-dashboards -type f -name '*.json')
 TEMPLATES = $(shell find ./ -type f -name '*.tmpl')
 
-vendor: jsonnetfile.json jsonnetfile.lock.json
-	$(JB) install
-
-dev-dashboards.libsonnet: $(DASHBOARDS) $(TEMPLATES) vendor dev-dashboards.go
+dev-dashboards.libsonnet: $(DASHBOARDS) $(TEMPLATES) dev-dashboards.go
 	go generate ./
 	
-main.libsonnet: dev-dashboards.libsonnet
+main.libsonnet: dev-dashboards.libsonnet

devenv/jsonnet/dev-dashboards.libsonnet

@@ -2,852 +2,128 @@
 // Generated by gen.go
 // Run `make gen-jsonnet` from repository root to regenerate.
 
-local grafana = import "grizzly/grafana.libsonnet";
-local resource = import "grizzly/resource.libsonnet";
-local dashboard = grafana.dashboard;
-
 {
-  folders: [grafana.folder.new('dev-dashboards', 'dev-dashboards')],
-  dashboards: [
-    dashboard.new('Repeating-Kitchen-Sink', import '../dev-dashboards/e2e-repeats/Repeating-Kitchen-Sink.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('Repeating-a-panel-horizontally', import '../dev-dashboards/e2e-repeats/Repeating-a-panel-horizontally.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('Repeating-a-panel-vertically', import '../dev-dashboards/e2e-repeats/Repeating-a-panel-vertically.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('Repeating-a-row-with-a-repeating-horizon', import '../dev-dashboards/e2e-repeats/Repeating-a-row-with-a-repeating-horizontal-panel.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('Repeating-a-row-with-a-repeating-vertica', import '../dev-dashboards/e2e-repeats/Repeating-a-row-with-a-repeating-vertical-panel.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('Repeating-an-empty-row', import '../dev-dashboards/e2e-repeats/Repeating-an-empty-row.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('all-panels', import '../dev-dashboards/all-panels.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('annotation-filtering', import '../dev-dashboards/annotations/annotation-filtering.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('auto_decimals', import '../dev-dashboards/panel-common/auto_decimals.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('bar-gauge-demo2', import '../dev-dashboards/datasource-testdata/bar-gauge-demo2.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('bar_gauge_demo', import '../dev-dashboards/panel-bargauge/bar_gauge_demo.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('barchart-autosizing', import '../dev-dashboards/panel-barchart/barchart-autosizing.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('barchart-label-rotation-skipping', import '../dev-dashboards/panel-barchart/barchart-label-rotation-skipping.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('barchart-thresholds-mappings', import '../dev-dashboards/panel-barchart/barchart-thresholds-mappings.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('barchart-tooltips', import '../dev-dashboards/panel-barchart/barchart-tooltips.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('candlestick', import '../dev-dashboards/panel-candlestick/candlestick.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('canvas-connection-examples', import '../dev-dashboards/panel-canvas/canvas-connection-examples.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('canvas-examples', import '../dev-dashboards/panel-canvas/canvas-examples.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('color_modes', import '../dev-dashboards/panel-common/color_modes.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('config-from-query', import '../dev-dashboards/transforms/config-from-query.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('dashlist', import '../dev-dashboards/panel-dashlist/dashlist.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('datadata-macros', import '../dev-dashboards/feature-templating/datadata-macros.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('datagrid_metric_values', import '../dev-dashboards/panel-datagrid/datagrid_metric_values.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('demo1', import '../dev-dashboards/datasource-testdata/demo1.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('elasticsearch_complex', import '../dev-dashboards/datasource-elasticsearch/elasticsearch_complex.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('elasticsearch_migration', import '../dev-dashboards/datasource-elasticsearch/elasticsearch_migration.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('elasticsearch_simple', import '../dev-dashboards/datasource-elasticsearch/elasticsearch_simple.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('extract-json-paths', import '../dev-dashboards/transforms/extract-json-paths.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('filter', import '../dev-dashboards/transforms/filter.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('gauge-multi-series', import '../dev-dashboards/panel-gauge/gauge-multi-series.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('gauge_tests', import '../dev-dashboards/panel-gauge/gauge_tests.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('geomap-color-field', import '../dev-dashboards/panel-geomap/geomap-color-field.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('geomap-photo-layer', import '../dev-dashboards/panel-geomap/geomap-photo-layer.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('geomap-route-layer', import '../dev-dashboards/panel-geomap/geomap-route-layer.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('geomap-spatial-operations-transformer', import '../dev-dashboards/panel-geomap/geomap-spatial-operations-transformer.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('geomap-v91', import '../dev-dashboards/panel-geomap/geomap-v91.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('geomap_multi-layers', import '../dev-dashboards/panel-geomap/geomap_multi-layers.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('global-variables-and-interpolation', import '../dev-dashboards/feature-templating/global-variables-and-interpolation.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('graph-gradient-area-fills', import '../dev-dashboards/panel-graph/graph-gradient-area-fills.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('graph-shared-tooltips', import '../dev-dashboards/panel-graph/graph-shared-tooltips.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('graph-time-regions', import '../dev-dashboards/panel-graph/graph-time-regions.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('graph_tests', import '../dev-dashboards/panel-graph/graph_tests.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('graph_y_axis', import '../dev-dashboards/panel-graph/graph_y_axis.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('heatmap-calculate-log', import '../dev-dashboards/panel-heatmap/heatmap-calculate-log.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('heatmap-legacy', import '../dev-dashboards/panel-heatmap/heatmap-legacy.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('heatmap-x', import '../dev-dashboards/panel-heatmap/heatmap-x.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('histogram_tests', import '../dev-dashboards/panel-histogram/histogram_tests.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('home', import '../dev-dashboards/home.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('influxdb-logs', import '../dev-dashboards/datasource-influxdb/influxdb-logs.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('influxdb-templated', import '../dev-dashboards/datasource-influxdb/influxdb-templated.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('join-by-field', import '../dev-dashboards/transforms/join-by-field.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('join-by-labels', import '../dev-dashboards/transforms/join-by-labels.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('lazy_loading', import '../dev-dashboards/panel-common/lazy_loading.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('linked-viz', import '../dev-dashboards/panel-common/linked-viz.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('loki_fakedata', import '../dev-dashboards/datasource-loki/loki_fakedata.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('loki_query_splitting', import '../dev-dashboards/datasource-loki/loki_query_splitting.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('migrations', import '../dev-dashboards/migrations/migrations.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('mssql_fakedata', import '../dev-dashboards/datasource-mssql/mssql_fakedata.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('mssql_unittest', import '../dev-dashboards/datasource-mssql/mssql_unittest.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('mysql_fakedata', import '../dev-dashboards/datasource-mysql/mysql_fakedata.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('mysql_unittest', import '../dev-dashboards/datasource-mysql/mysql_unittest.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('new_features_in_v62', import '../dev-dashboards/datasource-testdata/new_features_in_v62.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('new_features_in_v74', import '../dev-dashboards/datasource-testdata/new_features_in_v74.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('new_features_in_v8', import '../dev-dashboards/datasource-testdata/new_features_in_v8.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('opentsdb', import '../dev-dashboards/datasource-opentsdb/opentsdb.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('opentsdb_v23', import '../dev-dashboards/datasource-opentsdb/opentsdb_v23.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('panel-geomap', import '../dev-dashboards/panel-geomap/panel-geomap.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('panel-stat-tests', import '../dev-dashboards/panel-stat/panel-stat-tests.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('panel_test_piechart', import '../dev-dashboards/panel-piechart/panel_test_piechart.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('panel_tests_bar_gauge', import '../dev-dashboards/panel-bargauge/panel_tests_bar_gauge.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('panel_tests_bar_gauge2', import '../dev-dashboards/panel-bargauge/panel_tests_bar_gauge2.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('panel_tests_flame_graph', import '../dev-dashboards/panel-flamegraph/panel_tests_flame_graph.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('panels_without_title', import '../dev-dashboards/panel-common/panels_without_title.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('polystat_test', import '../dev-dashboards/panel-polystat/polystat_test.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('postgres_fakedata', import '../dev-dashboards/datasource-postgres/postgres_fakedata.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('postgres_unittest', import '../dev-dashboards/datasource-postgres/postgres_unittest.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('regression-analysis', import '../dev-dashboards/transforms/regression-analysis.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('relative_time_zone_support', import '../dev-dashboards/scenarios/relative_time_zone_support.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('reuse', import '../dev-dashboards/transforms/reuse.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('rows-to-fields', import '../dev-dashboards/transforms/rows-to-fields.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('shared_queries', import '../dev-dashboards/panel-common/shared_queries.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('slow_queries_and_annotations', import '../dev-dashboards/scenarios/slow_queries_and_annotations.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('table_pagination', import '../dev-dashboards/panel-table/table_pagination.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('table_sparkline_cell', import '../dev-dashboards/panel-table/table_sparkline_cell.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('table_tests', import '../dev-dashboards/panel-table/table_tests.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('table_tests_new', import '../dev-dashboards/panel-table/table_tests_new.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('templating-dashboard-links-and-variables', import '../dev-dashboards/feature-templating/templating-dashboard-links-and-variables.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('templating-repeating-panels', import '../dev-dashboards/feature-templating/templating-repeating-panels.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('templating-repeating-rows', import '../dev-dashboards/feature-templating/templating-repeating-rows.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('templating-textbox-e2e-scenarios', import '../dev-dashboards/feature-templating/templating-textbox-e2e-scenarios.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('testdata-datalinks', import '../dev-dashboards/feature-templating/testdata-datalinks.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('testdata-nested-variables', import '../dev-dashboards/feature-templating/testdata-nested-variables.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('testdata-nested-variables-drilldown', import '../dev-dashboards/feature-templating/testdata-nested-variables-drilldown.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('testdata-test-variable-output', import '../dev-dashboards/feature-templating/testdata-test-variable-output.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('testdata-variables-textbox', import '../dev-dashboards/feature-templating/testdata-variables-textbox.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('testdata-variables-that-update-on-time-c', import '../dev-dashboards/feature-templating/testdata-variables-that-update-on-time-change.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('testdata_alerts', import '../dev-dashboards/alerting/testdata_alerts.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('text-options', import '../dev-dashboards/panel-text/text-options.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('time_zone_support', import '../dev-dashboards/scenarios/time_zone_support.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeline-demo', import '../dev-dashboards/panel-timeline/timeline-demo.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeline-modes', import '../dev-dashboards/panel-timeline/timeline-modes.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeline-thresholds-mappings', import '../dev-dashboards/panel-timeline/timeline-thresholds-mappings.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries', import '../dev-dashboards/panel-timeseries/timeseries.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-bars-high-density', import '../dev-dashboards/panel-timeseries/timeseries-bars-high-density.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-by-value-color-schemes', import '../dev-dashboards/panel-timeseries/timeseries-by-value-color-schemes.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-formats', import '../dev-dashboards/panel-timeseries/timeseries-formats.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-gradient-area', import '../dev-dashboards/panel-timeseries/timeseries-gradient-area.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-hue-gradients', import '../dev-dashboards/panel-timeseries/timeseries-hue-gradients.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-nulls', import '../dev-dashboards/panel-timeseries/timeseries-nulls.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-out-of-rage', import '../dev-dashboards/panel-timeseries/timeseries-out-of-rage.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-shared-tooltip-cursor-positio', import '../dev-dashboards/panel-timeseries/timeseries-shared-tooltip-cursor-position.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-soft-limits', import '../dev-dashboards/panel-timeseries/timeseries-soft-limits.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-stacking', import '../dev-dashboards/panel-timeseries/timeseries-stacking.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-stacking2', import '../dev-dashboards/panel-timeseries/timeseries-stacking2.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-thresholds', import '../dev-dashboards/panel-timeseries/timeseries-thresholds.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-time', import '../dev-dashboards/panel-timeseries/timeseries-time.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-y-ticks-zero-decimals', import '../dev-dashboards/panel-timeseries/timeseries-y-ticks-zero-decimals.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('timeseries-yaxis-ticks', import '../dev-dashboards/panel-timeseries/timeseries-yaxis-ticks.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('trend_example', import '../dev-dashboards/panel-trend/trend_example.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-    dashboard.new('xychart-example', import '../dev-dashboards/panel-xychart/xychart-example.json') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },
-  ],
-} 
+  dashboards+:: {
+    "Repeating-Kitchen-Sink": (import '../dev-dashboards/e2e-repeats/Repeating-Kitchen-Sink.json'),
+    "Repeating-a-panel-horizontally": (import '../dev-dashboards/e2e-repeats/Repeating-a-panel-horizontally.json'),
+    "Repeating-a-panel-vertically": (import '../dev-dashboards/e2e-repeats/Repeating-a-panel-vertically.json'),
+    "Repeating-a-row-with-a-repeating-horizon": (import '../dev-dashboards/e2e-repeats/Repeating-a-row-with-a-repeating-horizontal-panel.json'),
+    "Repeating-a-row-with-a-repeating-vertica": (import '../dev-dashboards/e2e-repeats/Repeating-a-row-with-a-repeating-vertical-panel.json'),
+    "Repeating-an-empty-row": (import '../dev-dashboards/e2e-repeats/Repeating-an-empty-row.json'),
+    "all-panels": (import '../dev-dashboards/all-panels.json'),
+    "annotation-filtering": (import '../dev-dashboards/annotations/annotation-filtering.json'),
+    "auto_decimals": (import '../dev-dashboards/panel-common/auto_decimals.json'),
+    "bar-gauge-demo2": (import '../dev-dashboards/datasource-testdata/bar-gauge-demo2.json'),
+    "bar_gauge_demo": (import '../dev-dashboards/panel-bargauge/bar_gauge_demo.json'),
+    "barchart-autosizing": (import '../dev-dashboards/panel-barchart/barchart-autosizing.json'),
+    "barchart-label-rotation-skipping": (import '../dev-dashboards/panel-barchart/barchart-label-rotation-skipping.json'),
+    "barchart-thresholds-mappings": (import '../dev-dashboards/panel-barchart/barchart-thresholds-mappings.json'),
+    "barchart-tooltips-legends": (import '../dev-dashboards/panel-barchart/barchart-tooltips-legends.json'),
+    "candlestick": (import '../dev-dashboards/panel-candlestick/candlestick.json'),
+    "canvas-connection-examples": (import '../dev-dashboards/panel-canvas/canvas-connection-examples.json'),
+    "canvas-examples": (import '../dev-dashboards/panel-canvas/canvas-examples.json'),
+    "color_modes": (import '../dev-dashboards/panel-common/color_modes.json'),
+    "config-from-query": (import '../dev-dashboards/transforms/config-from-query.json'),
+    "dashlist": (import '../dev-dashboards/panel-dashlist/dashlist.json'),
+    "datadata-macros": (import '../dev-dashboards/feature-templating/datadata-macros.json'),
+    "datagrid_metric_values": (import '../dev-dashboards/panel-datagrid/datagrid_metric_values.json'),
+    "demo1": (import '../dev-dashboards/datasource-testdata/demo1.json'),
+    "elasticsearch_complex": (import '../dev-dashboards/datasource-elasticsearch/elasticsearch_complex.json'),
+    "elasticsearch_migration": (import '../dev-dashboards/datasource-elasticsearch/elasticsearch_migration.json'),
+    "elasticsearch_simple": (import '../dev-dashboards/datasource-elasticsearch/elasticsearch_simple.json'),
+    "extract-json-paths": (import '../dev-dashboards/transforms/extract-json-paths.json'),
+    "filter": (import '../dev-dashboards/transforms/filter.json'),
+    "gauge-multi-series": (import '../dev-dashboards/panel-gauge/gauge-multi-series.json'),
+    "gauge_tests": (import '../dev-dashboards/panel-gauge/gauge_tests.json'),
+    "geomap-color-field": (import '../dev-dashboards/panel-geomap/geomap-color-field.json'),
+    "geomap-photo-layer": (import '../dev-dashboards/panel-geomap/geomap-photo-layer.json'),
+    "geomap-route-layer": (import '../dev-dashboards/panel-geomap/geomap-route-layer.json'),
+    "geomap-spatial-operations-transformer": (import '../dev-dashboards/panel-geomap/geomap-spatial-operations-transformer.json'),
+    "geomap-v91": (import '../dev-dashboards/panel-geomap/geomap-v91.json'),
+    "geomap_multi-layers": (import '../dev-dashboards/panel-geomap/geomap_multi-layers.json'),
+    "global-variables-and-interpolation": (import '../dev-dashboards/feature-templating/global-variables-and-interpolation.json'),
+    "graph-gradient-area-fills": (import '../dev-dashboards/panel-graph/graph-gradient-area-fills.json'),
+    "graph-shared-tooltips": (import '../dev-dashboards/panel-graph/graph-shared-tooltips.json'),
+    "graph-time-regions": (import '../dev-dashboards/panel-graph/graph-time-regions.json'),
+    "graph_tests": (import '../dev-dashboards/panel-graph/graph_tests.json'),
+    "graph_y_axis": (import '../dev-dashboards/panel-graph/graph_y_axis.json'),
+    "heatmap-calculate-log": (import '../dev-dashboards/panel-heatmap/heatmap-calculate-log.json'),
+    "heatmap-legacy": (import '../dev-dashboards/panel-heatmap/heatmap-legacy.json'),
+    "heatmap-x": (import '../dev-dashboards/panel-heatmap/heatmap-x.json'),
+    "histogram_tests": (import '../dev-dashboards/panel-histogram/histogram_tests.json'),
+    "home": (import '../dev-dashboards/home.json'),
+    "influxdb-logs": (import '../dev-dashboards/datasource-influxdb/influxdb-logs.json'),
+    "influxdb-templated": (import '../dev-dashboards/datasource-influxdb/influxdb-templated.json'),
+    "join-by-field": (import '../dev-dashboards/transforms/join-by-field.json'),
+    "join-by-labels": (import '../dev-dashboards/transforms/join-by-labels.json'),
+    "lazy_loading": (import '../dev-dashboards/panel-common/lazy_loading.json'),
+    "linked-viz": (import '../dev-dashboards/panel-common/linked-viz.json'),
+    "loki_fakedata": (import '../dev-dashboards/datasource-loki/loki_fakedata.json'),
+    "loki_query_splitting": (import '../dev-dashboards/datasource-loki/loki_query_splitting.json'),
+    "migrations": (import '../dev-dashboards/migrations/migrations.json'),
+    "mssql_fakedata": (import '../dev-dashboards/datasource-mssql/mssql_fakedata.json'),
+    "mssql_unittest": (import '../dev-dashboards/datasource-mssql/mssql_unittest.json'),
+    "mysql_fakedata": (import '../dev-dashboards/datasource-mysql/mysql_fakedata.json'),
+    "mysql_unittest": (import '../dev-dashboards/datasource-mysql/mysql_unittest.json'),
+    "new_features_in_v62": (import '../dev-dashboards/datasource-testdata/new_features_in_v62.json'),
+    "new_features_in_v74": (import '../dev-dashboards/datasource-testdata/new_features_in_v74.json'),
+    "new_features_in_v8": (import '../dev-dashboards/datasource-testdata/new_features_in_v8.json'),
+    "opentsdb": (import '../dev-dashboards/datasource-opentsdb/opentsdb.json'),
+    "opentsdb_v23": (import '../dev-dashboards/datasource-opentsdb/opentsdb_v23.json'),
+    "panel-geomap": (import '../dev-dashboards/panel-geomap/panel-geomap.json'),
+    "panel-stat-tests": (import '../dev-dashboards/panel-stat/panel-stat-tests.json'),
+    "panel_test_piechart": (import '../dev-dashboards/panel-piechart/panel_test_piechart.json'),
+    "panel_tests_bar_gauge": (import '../dev-dashboards/panel-bargauge/panel_tests_bar_gauge.json'),
+    "panel_tests_bar_gauge2": (import '../dev-dashboards/panel-bargauge/panel_tests_bar_gauge2.json'),
+    "panel_tests_flame_graph": (import '../dev-dashboards/panel-flamegraph/panel_tests_flame_graph.json'),
+    "panels_without_title": (import '../dev-dashboards/panel-common/panels_without_title.json'),
+    "polystat_test": (import '../dev-dashboards/panel-polystat/polystat_test.json'),
+    "postgres_fakedata": (import '../dev-dashboards/datasource-postgres/postgres_fakedata.json'),
+    "postgres_unittest": (import '../dev-dashboards/datasource-postgres/postgres_unittest.json'),
+    "regression-analysis": (import '../dev-dashboards/transforms/regression-analysis.json'),
+    "relative_time_zone_support": (import '../dev-dashboards/scenarios/relative_time_zone_support.json'),
+    "reuse": (import '../dev-dashboards/transforms/reuse.json'),
+    "rows-to-fields": (import '../dev-dashboards/transforms/rows-to-fields.json'),
+    "shared_queries": (import '../dev-dashboards/panel-common/shared_queries.json'),
+    "slow_queries_and_annotations": (import '../dev-dashboards/scenarios/slow_queries_and_annotations.json'),
+    "table_pagination": (import '../dev-dashboards/panel-table/table_pagination.json'),
+    "table_sparkline_cell": (import '../dev-dashboards/panel-table/table_sparkline_cell.json'),
+    "table_tests": (import '../dev-dashboards/panel-table/table_tests.json'),
+    "table_tests_new": (import '../dev-dashboards/panel-table/table_tests_new.json'),
+    "templating-dashboard-links-and-variables": (import '../dev-dashboards/feature-templating/templating-dashboard-links-and-variables.json'),
+    "templating-repeating-panels": (import '../dev-dashboards/feature-templating/templating-repeating-panels.json'),
+    "templating-repeating-rows": (import '../dev-dashboards/feature-templating/templating-repeating-rows.json'),
+    "templating-textbox-e2e-scenarios": (import '../dev-dashboards/feature-templating/templating-textbox-e2e-scenarios.json'),
+    "testdata-datalinks": (import '../dev-dashboards/feature-templating/testdata-datalinks.json'),
+    "testdata-nested-variables": (import '../dev-dashboards/feature-templating/testdata-nested-variables.json'),
+    "testdata-nested-variables-drilldown": (import '../dev-dashboards/feature-templating/testdata-nested-variables-drilldown.json'),
+    "testdata-test-variable-output": (import '../dev-dashboards/feature-templating/testdata-test-variable-output.json'),
+    "testdata-variables-textbox": (import '../dev-dashboards/feature-templating/testdata-variables-textbox.json'),
+    "testdata-variables-that-update-on-time-c": (import '../dev-dashboards/feature-templating/testdata-variables-that-update-on-time-change.json'),
+    "testdata_alerts": (import '../dev-dashboards/alerting/testdata_alerts.json'),
+    "text-options": (import '../dev-dashboards/panel-text/text-options.json'),
+    "time_zone_support": (import '../dev-dashboards/scenarios/time_zone_support.json'),
+    "timeline-demo": (import '../dev-dashboards/panel-timeline/timeline-demo.json'),
+    "timeline-modes": (import '../dev-dashboards/panel-timeline/timeline-modes.json'),
+    "timeline-thresholds-mappings": (import '../dev-dashboards/panel-timeline/timeline-thresholds-mappings.json'),
+    "timeseries": (import '../dev-dashboards/panel-timeseries/timeseries.json'),
+    "timeseries-bars-high-density": (import '../dev-dashboards/panel-timeseries/timeseries-bars-high-density.json'),
+    "timeseries-by-value-color-schemes": (import '../dev-dashboards/panel-timeseries/timeseries-by-value-color-schemes.json'),
+    "timeseries-formats": (import '../dev-dashboards/panel-timeseries/timeseries-formats.json'),
+    "timeseries-gradient-area": (import '../dev-dashboards/panel-timeseries/timeseries-gradient-area.json'),
+    "timeseries-hue-gradients": (import '../dev-dashboards/panel-timeseries/timeseries-hue-gradients.json'),
+    "timeseries-nulls": (import '../dev-dashboards/panel-timeseries/timeseries-nulls.json'),
+    "timeseries-out-of-rage": (import '../dev-dashboards/panel-timeseries/timeseries-out-of-rage.json'),
+    "timeseries-shared-tooltip-cursor-positio": (import '../dev-dashboards/panel-timeseries/timeseries-shared-tooltip-cursor-position.json'),
+    "timeseries-soft-limits": (import '../dev-dashboards/panel-timeseries/timeseries-soft-limits.json'),
+    "timeseries-stacking": (import '../dev-dashboards/panel-timeseries/timeseries-stacking.json'),
+    "timeseries-stacking2": (import '../dev-dashboards/panel-timeseries/timeseries-stacking2.json'),
+    "timeseries-thresholds": (import '../dev-dashboards/panel-timeseries/timeseries-thresholds.json'),
+    "timeseries-time": (import '../dev-dashboards/panel-timeseries/timeseries-time.json'),
+    "timeseries-y-ticks-zero-decimals": (import '../dev-dashboards/panel-timeseries/timeseries-y-ticks-zero-decimals.json'),
+    "timeseries-yaxis-ticks": (import '../dev-dashboards/panel-timeseries/timeseries-yaxis-ticks.json'),
+    "trend_example": (import '../dev-dashboards/panel-trend/trend_example.json'),
+    "xychart-example": (import '../dev-dashboards/panel-xychart/xychart-example.json'),
+    "xychart-tooltip-color-test": (import '../dev-dashboards/panel-xychart/xychart-tooltip-color-test.json'),
+  },
+} 

devenv/jsonnet/jsonnetfile.json

@@ -1,15 +0,0 @@
-{
-  "version": 1,
-  "dependencies": [
-    {
-      "source": {
-        "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs.git",
-          "subdir": "grizzly"
-        }
-      },
-      "version": "master"
-    }
-  ],
-  "legacyImports": true
-}

devenv/jsonnet/jsonnetfile.lock.json

@@ -1,16 +0,0 @@
-{
-  "version": 1,
-  "dependencies": [
-    {
-      "source": {
-        "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs.git",
-          "subdir": "grizzly"
-        }
-      },
-      "version": "49b026e4d0aa15b0fee70ae80cc1d2bb792ee14d",
-      "sum": "yY8w1JvVAuxB3Z62R3OxDVcSRPUKIvEWQZ2ShyD7uis="
-    }
-  ],
-  "legacyImports": false
-}

devenv/jsonnet/tmpl/gen.libsonnet.tmpl

@@ -2,19 +2,8 @@
 // Generated by gen.go
 // Run `make gen-jsonnet` from repository root to regenerate.
 
-local grafana = import "grizzly/grafana.libsonnet";
-local resource = import "grizzly/resource.libsonnet";
-local dashboard = grafana.dashboard;
-
 {
-  folders: [grafana.folder.new('dev-dashboards', 'dev-dashboards')],
-  dashboards: [{{range .Dashboards}}
-    dashboard.new('{{.Name}}', import '../dev-dashboards/{{.Path}}') +
-    resource.addMetadata('folder', 'dev-dashboards') +
-    {
-      spec+: {
-        id: 0,
-      }
-    },{{end}}
-  ],
-} 
+  dashboards+:: {{`{`}}{{range .Dashboards}}
+    "{{.Name}}": (import '../dev-dashboards/{{.Path}}'),{{end}}
+  },
+} 

docs/sources/administration/feature-toggles/index.md

@@ -0,0 +1,55 @@
+---
+description: Learn how authorized users can manage feature toggles
+keywords:
+  - feature
+  - toggle
+labels:
+  products:
+    - enterprise
+    - oss
+title: Feature toggles
+weight: 900
+---
+
+# Feature toggles
+
+Grafana incorporates feature toggles which let you introduce new functionality safeguarded by control flags. This allows Grafana administrators the flexibility to determine the appropriate timing for enabling or disabling specific features.
+For detailed information about particular features and how they operate, refer to [Configure Feature Toggles](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/feature-toggles/).
+
+## Manage feature toggles
+
+In the **Administration** page, the **Feature Management** section enables authorized users to view and edit the various features that are active in their Grafana environment.
+Authorized users include administrators, and users with the [fixed roles]({{< relref "../roles-and-permissions/access-control#fixed-roles" >}}) `featuremgmt.read` and `featuremgmt.write`.
+
+There are different options for visibility and customization depending on the development stage of the feature.
+
+| Stage                | Visibility | Editable |
+| -------------------- | ---------- | -------- |
+| Experimental         | Hidden     | No       |
+| Private preview      | Hidden     | No       |
+| Public preview       | Visible\*  | No       |
+| General availability | Visible\*  | Yes\*    |
+| Deprecated           | Visible\*  | Yes\*    |
+
+{{< admonition type="note" >}}
+Options marked with an asterisk (\*) are defaults for the corresponding feature stage.
+Each feature toggle owner can override its default behavior.
+{{< /admonition >}}
+
+## Edit feature toggles
+
+You can only edit feature toggles if Grafana is configured with the proper feature management settings.
+For more information, refer to [Configure feature management](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/feature-toggles/#configure-feature-management).
+
+Altering the state of a toggle may require restarting your Grafana instance, which can take a few minutes.
+
+To edit a feature toggle, follow these steps:
+
+1. Sign in to Grafana as a server administrator or authorized user.
+1. In the primary menu, go to **Administration > General > Feature toggles**.
+1. Navigate to the list of feature toggles and select your feature state overrides.
+1. Click **Save changes** and wait for your Grafana instance to restart with the updated feature toggles.
+
+{{% admonition type="note" %}}
+Editing feature toggles with the feature toggle management page is available now in all tiers of [Grafana Cloud](/docs/grafana-cloud/).
+{{% /admonition %}}

docs/sources/administration/roles-and-permissions/access-control/_index.md

@@ -90,6 +90,7 @@ Assign fixed roles when the basic roles do not meet your permission requirements
 - [Dashboards and folders]({{< relref "../../../dashboards/" >}})
 - [Data sources]({{< relref "../../../datasources/" >}})
 - [Explore]({{< relref "../../../explore/" >}})
+- [Feature Toggles]({{< relref "../../feature-toggles/" >}})
 - [Folders]({{< relref "../../../dashboards/manage-dashboards/#create-a-dashboard-folder" >}})
 - [LDAP]({{< relref "../../../setup-grafana/configure-security/configure-authentication/ldap/" >}})
 - [Licenses]({{< relref "../../stats-and-license/" >}})

docs/sources/alerting/_index.md

@@ -4,7 +4,7 @@ aliases:
   - ./unified-alerting/alerting/
   - ./alerting/unified-alerting/
 canonical: https://grafana.com/docs/grafana/latest/alerting/
-description: Intro to key benefits and features of Grafana Alerting
+description: Learn about the key benefits and features of Grafana Alerting
 labels:
   products:
     - cloud

docs/sources/alerting/alerting-rules/_index.md

@@ -5,7 +5,7 @@ aliases:
   - unified-alerting/alerting-rules/
   - ./create-alerts/
 canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/
-description: Configure alerting
+description: Configure the features and integrations you need to create and manage your alerts
 labels:
   products:
     - cloud

docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md

@@ -2,7 +2,7 @@
 aliases:
   - ../unified-alerting/alerting-rules/create-grafana-managed-rule/
 canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-grafana-managed-rule/
-description: Configure Grafana-managed alert rules
+description: Configure Grafana-managed alert rules to create alerts that can act on data from any of our supported data sources
 keywords:
   - grafana
   - alerting

docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md

@@ -3,7 +3,7 @@ aliases:
   - ../unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/
   - ../unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
 canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
-description: Configure recording rules
+description: Configure recording rules for an external Grafana Mimir or Loki instance
 keywords:
   - grafana
   - alerting

docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md

@@ -4,7 +4,7 @@ aliases:
   - ../unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
   - ../unified-alerting/alerting-rules/create-mimir-loki-managed-rule/
 canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-rule/
-description: Configure data source-managed alert rules
+description: Configure data source-managed alert rules alert for an external Grafana Mimir or Loki instance
 keywords:
   - grafana
   - alerting

docs/sources/alerting/alerting-rules/create-notification-policy.md

@@ -4,7 +4,7 @@ aliases:
   - ../old-alerting/notifications/
   - ../unified-alerting/notifications/
 canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-notification-policy/
-description: Notification policies
+description: Configure notification policies to determine how alerts are routed to contact points
 keywords:
   - grafana
   - alerting

docs/sources/alerting/alerting-rules/manage-contact-points/_index.md

@@ -8,7 +8,7 @@ aliases:
   - ../manage-notifications/manage-contact-points/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/manage-contact-points/
   - create-contact-point/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/create-contact-point/
 canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/manage-contact-points/
-description: How to manage your contact points
+description: Configure contact points to define how your contacts are notified when an alert rule fires
 keywords:
   - grafana
   - alerting

docs/sources/alerting/alerting-rules/manage-contact-points/integrations/_index.md

@@ -2,7 +2,7 @@
 aliases:
   - alerting/manage-notifications/manage-contact-points/configure-integrations/
 canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/manage-contact-points/integrations/
-description: Configure integrations
+description: Configure contact point integrations to select your preferred communication channels for receiving notifications of firing alerts.
 keywords:
   - Grafana
   - alerting

docs/sources/alerting/alerting-rules/manage-contact-points/integrations/configure-oncall.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/manage-contact-points/integrations/configure-oncall/
-description: Configure the Alerting - Grafana OnCall integration
+description: Configure the Alerting - Grafana OnCall integration to connect alerts generated by Grafana Alerting with Grafana OnCall
 keywords:
   - grafana
   - alerting

docs/sources/alerting/alerting-rules/manage-contact-points/integrations/pager-duty.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/manage-contact-points/integrations/pager-duty/
-description: Configure PagerDuty
+description: Configure the PagerDuty integration for Alerting
 keywords:
   - grafana
   - alerting

docs/sources/alerting/alerting-rules/manage-contact-points/integrations/webhook-notifier.md

@@ -4,7 +4,7 @@ aliases:
   - ../fundamentals/contact-points/webhook-notifier/
   - alerting/manage-notifications/manage-contact-points/webhook-notifier/
 canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/manage-contact-points/integrations/webhook-notifier/
-description: Configure the webhook notifier for notifications
+description: Configure the webhook notifier integration for Alerting
 keywords:
   - grafana
   - alerting

docs/sources/alerting/difference-old-new.md

@@ -4,7 +4,7 @@ _build:
 aliases:
   - ./unified-alerting/difference-old-new/ # /docs/grafana/<GRAFANA VERSION>/alerting/unified-alerting/difference-old-new/
 canonical: https://grafana.com/docs/grafana/latest/alerting/difference-old-new/
-description: Compare new unified alerting compared to legacy dashboard alerting
+description: Learn about how Grafana Alerting compares to legacy alerting
 keywords:
   - grafana
   - alerting

docs/sources/alerting/fundamentals/_index.md

@@ -3,7 +3,7 @@ aliases:
   - metrics/
   - unified-alerting/fundamentals/
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/
-description: Intro to the key concepts in Alerting and how it works
+description: Learn about the fundamentals of Grafana Alerting as well as the key features it offers
 labels:
   products:
     - cloud

docs/sources/alerting/fundamentals/alert-rules/_index.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/
-description: About Grafana alert rules
+description: Learn about alert rules
 keywords:
   - grafana
   - alerting

docs/sources/alerting/fundamentals/alert-rules/alert-instances.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/alert-instances/
-description: Learn about Grafana alert instances
+description: Learn about alert instances
 keywords:
   - grafana
   - alerting

docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/alert-rule-types/
-description: Learn about the different alert rule types
+description: Learn about the different alert rule types that Grafana Alerting supports
 keywords:
   - grafana
   - alerting

docs/sources/alerting/fundamentals/alert-rules/message-templating.md

@@ -4,7 +4,7 @@ aliases:
   - ../../message-templating/
   - ../../unified-alerting/message-templating/
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/message-templating/
-description: Notification templating
+description: Learn about notification templating
 keywords:
   - grafana
   - alerting

docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md

@@ -3,7 +3,7 @@ aliases:
   - ../unified-alerting/alerting-rules/edit-cortex-loki-namespace-group/
     - ../unified-alerting/alerting-rules/edit-mimir-loki-namespace-group/
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/organising-alerts/
-description: Namespaces, folders, and groups
+description: Learn about organizing alerts using namespaces, folders, and groups
 keywords:
   - grafana
   - alerting

docs/sources/alerting/fundamentals/alert-rules/queries-conditions/_index.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/queries-conditions/
-description: Introduction to queries and conditions
+description: Define queries to get the data you want to measure and conditions that need to be met before an alert rule fires
 keywords:
   - grafana
   - alerting
@@ -97,6 +97,27 @@ Checks if any time series data matches the alert condition.
 Classic condition expression queries always produce one alert instance only, no matter how many time series meet the condition.
 Classic conditions exist mainly for compatibility reasons and should be avoided if possible.
 
+## Aggregations
+
+Grafana Alerting provides the following aggregation functions to enable you to further refine your query.
+
+These functions are available for **Reduce** and **Classic condition** expressions only.
+
+| Function         | Expression       | What it does                                                                    |
+| ---------------- | ---------------- | ------------------------------------------------------------------------------- |
+| avg              | Reduce / Classic | Displays the average of the values                                              |
+| min              | Reduce / Classic | Displays the lowest value                                                       |
+| max              | Reduce / Classic | Displays the highest value                                                      |
+| sum              | Reduce / Classic | Displays the sum of all values                                                  |
+| count            | Reduce / Classic | Counts the number of values in the result                                       |
+| last             | Reduce / Classic | Displays the last value                                                         |
+| median           | Reduce / Classic | Displays the median value                                                       |
+| diff             | Classic          | Displays the difference between the newest and oldest value                     |
+| diff_abs         | Classic          | Displays the absolute value of diff                                             |
+| percent_diff     | Classic          | Displays the percentage value of the difference between newest and oldest value |
+| percent_diff_abs | Classic          | Displays the absolute value of percent_diff                                     |
+| count_non_null   | Classic          | Displays a count of values in the result set that aren't `null`                 |
+
 ## Alert condition
 
 An alert condition is the query or expression that determines whether the alert will fire or not depending on the value it yields. There can be only one condition which will determine the triggering of the alert.

docs/sources/alerting/fundamentals/alert-rules/recording-rules/_index.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/recording-rules/
-description: Learn about recording rules
+description: Create recording rules to pre-compute frequently needed or computationally expensive expressions and save the result as a new set of time series
 keywords:
   - grafana
   - alerting

docs/sources/alerting/fundamentals/alert-rules/rule-evaluation/_index.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/rule-evaluation/
-description: Introduction to alert rule evaluation
+description: Use alert rule evaluation to determine how frequently an alert rule should be evaluated and how quickly it should change its state
 keywords:
   - grafana
   - alerting

docs/sources/alerting/fundamentals/alert-rules/state-and-health.md

@@ -2,7 +2,7 @@
 aliases:
   - ../unified-alerting/alerting-rules/state-and-health/
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/state-and-health/
-description: State and Health of alerting rules
+description: Learn about the state and health of alert rules to understand several key status indicators about your alerts
 keywords:
   - grafana
   - alerting

docs/sources/alerting/fundamentals/alertmanager.md

@@ -5,7 +5,7 @@ aliases:
   - ../unified-alerting/fundamentals/alertmanager/
   - alerting/manage-notifications/alertmanager/
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alertmanager/
-description: Intro to the different Alertmanagers
+description: Learn about Alertmanagers and the Alertmanager options for Grafana Alerting
 labels:
   products:
     - cloud

docs/sources/alerting/fundamentals/annotation-label/_index.md

@@ -3,7 +3,7 @@ aliases:
   - ../alerting-rules/alert-annotation-label/
   - ../unified-alerting/alerting-rules/alert-annotation-label/
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/annotation-label/
-description: Annotations and labels for alerting
+description: Learn how to use annotations and labels to store key information about alerts
 keywords:
   - grafana
   - alerting

docs/sources/alerting/fundamentals/annotation-label/how-to-use-labels.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/annotation-label/how-to-use-labels/
-description: Learn about labels and label matchers in alerting
+description: Learn how to use labels to link alert rules to notification policies and silences
 keywords:
   - grafana
   - alerting

docs/sources/alerting/fundamentals/annotation-label/labels-and-label-matchers.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/annotation-label/labels-and-label-matchers/
-description: Learn about labels and label matchers in alerting
+description: Learn how to use label matchers to link alert rules to notification policies and silences
 keywords:
   - grafana
   - alerting

docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/annotation-label/variables-label-annotation/
-description: Learn about templating of labels and annotations
+description: Learn about how to template labels and annotations
 keywords:
   - grafana
   - alerting

docs/sources/alerting/fundamentals/contact-points/index.md

@@ -4,7 +4,7 @@ aliases:
   - /docs/grafana/latest/alerting/unified-alerting/contact-points/
   - /docs/grafana/latest/alerting/fundamentals/contact-points/contact-point-types/
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/contact-points/
-description: Create or edit contact point
+description: Learn about contact points and the supported contact point integrations
 keywords:
   - grafana
   - alerting

docs/sources/alerting/fundamentals/data-source-alerting.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/data-source-alerting/
-description: Data sources in Grafana Alerting
+description: Learn about the data sources supported by Grafana Alerting
 labels:
   products:
     - cloud

docs/sources/alerting/fundamentals/evaluate-grafana-alerts.md

@@ -3,7 +3,7 @@ aliases:
   - ../metrics/
   - ../unified-alerting/fundamentals/evaluate-grafana-alerts/
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/evaluate-grafana-alerts/
-description: How to alert on numeric data
+description: Learn how how Grafana-managed alerts are evaluated by the backend engine as well as how Grafana handles alerting on numeric rather than time series data
 labels:
   products:
     - cloud

docs/sources/alerting/fundamentals/high-availability/_index.md

@@ -3,7 +3,7 @@ aliases:
   - ../high-availability/
   - ../unified-alerting/high-availability/
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/high-availability/
-description: High availability
+description: Learn about high availability in Grafana Alerting
 keywords:
   - grafana
   - alerting

docs/sources/alerting/fundamentals/notification-policies/_index.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/notification-policies/
-description: Introduction to notifications Policies
+description: Learn about how notification policies work
 keywords:
   - grafana
   - alerting

docs/sources/alerting/fundamentals/notification-policies/notifications.md

@@ -3,7 +3,7 @@ aliases:
   - ../notifications/
   - alerting/manage-notifications/create-notification-policy/
 canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/notification-policies/notifications/
-description: Notification policies
+description: Learn about how notification policies work and are structured
 keywords:
   - grafana
   - alerting

docs/sources/alerting/manage-notifications/_index.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/
-description: Manage alert notifications
+description: Manage your alerts by creating silences, mute timings, and more
 keywords:
   - grafana
   - alert

docs/sources/alerting/manage-notifications/create-silence.md

@@ -7,7 +7,7 @@ aliases:
   - ../unified-alerting/silences/
   - ../silences/
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/create-silence/
-description: Add silence alert notification
+description: Create silences to stop notifications from getting created for a specified window of time
 keywords:
   - grafana
   - alerting

docs/sources/alerting/manage-notifications/images-in-notifications.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/images-in-notifications/
-description: How to use images in notifications
+description: Use images in notifications to help users better understand why alerts are firing or have been resolved
 keywords:
   - grafana
   - alerting

docs/sources/alerting/manage-notifications/manage-contact-points.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/manage-contact-points/
-description: Manage contact points
+description: View, edit, copy, or delete your contact points and notification templates
 keywords:
   - grafana
   - alerting

docs/sources/alerting/manage-notifications/mute-timings.md

@@ -3,7 +3,7 @@ aliases:
   - ../notifications/mute-timings/
   - ../unified-alerting/notifications/mute-timings/
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/mute-timings/
-description: Mute timings
+description: Create mute timings to prevent alerts from firing during a specific and reoccurring period of time
 keywords:
   - grafana
   - alerting

docs/sources/alerting/manage-notifications/template-notifications/_index.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/template-notifications/
-description: How to customize your notifications using templating
+description: Customize your notifications using notification templates
 keywords:
   - grafana
   - alerting

docs/sources/alerting/manage-notifications/template-notifications/create-notification-templates.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/template-notifications/create-notification-templates/
-description: How to create notification templates
+description: Create notification templates to sent to your contact points
 keywords:
   - grafana
   - alerting

docs/sources/alerting/manage-notifications/template-notifications/reference.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/template-notifications/reference/
-description: Reference for templating notifications
+description: Learn about templating notifications options
 keywords:
   - grafana
   - alerting

docs/sources/alerting/manage-notifications/template-notifications/use-notification-templates.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/template-notifications/use-notification-templates/
-description: Use notification templates in contact points
+description: Use notification templates in contact points to customize your notifications
 keywords:
   - grafana
   - alerting

docs/sources/alerting/manage-notifications/template-notifications/using-go-templating-language.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/template-notifications/using-go-templating-language/
-description: Use Go's templating language in notifications
+description: Use Go's templating language to create your own notification templates
 keywords:
   - grafana
   - alerting

docs/sources/alerting/manage-notifications/view-alert-rules.md

@@ -4,7 +4,7 @@ aliases:
   - ../view-alert-rules/
   - rule-list/
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/view-alert-rules/
-description: Manage alerting rules
+description: View and filter by alert rules
 keywords:
   - grafana
   - alerting

docs/sources/alerting/manage-notifications/view-notification-errors.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/view-notification-errors/
-description: View notification errors to find out why they weren't sent or received
+description: View notification errors and understand why they failed to be sent or were not received
 keywords:
   - grafana
   - alerting

docs/sources/alerting/manage-notifications/view-state-health.md

@@ -4,7 +4,7 @@ aliases:
   - ../unified-alerting/alerting-rules/state-and-health/
   - ../view-state-health/
 canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/view-state-health/
-description: State and Health of alerting rules
+description: View the state and health of alert rules
 keywords:
   - grafana
   - alert rules
@@ -77,6 +77,10 @@ When evaluation of an alerting rule produces state `NoData` or `Error`, Grafana
 | **alertname**      | Either `DatasourceNoData` or `DatasourceError` depending on the state. |
 | **datasource_uid** | The UID of the data source that caused the state.                      |
 
+{{% admonition type="note" %}}
+You will need to set the No Data and Error Handling to `No Data` or `Error` in the alert rule as per this doc: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-grafana-managed-rule/#configure-no-data-and-error-handling in order to generate the additional labels.
+{{% /admonition %}}
+
 You can handle these alerts the same way as regular alerts by adding a silence, route to a contact point, and so on.
 
 ## State history view

docs/sources/alerting/monitor/_index.md

@@ -3,7 +3,7 @@ aliases:
   - ./meta-monitoring/ # /docs/grafana/<GRAFANA_VERSION>/alerting/meta-monitoring/
   - ./set-up/meta-monitoring/ # /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/meta-monitoring/
 canonical: https://grafana.com/docs/grafana/latest/alerting/monitor/
-description: Meta monitoring
+description: Monitor your alerting metrics to ensure you identify potential issues before they become critical.
 keywords:
   - grafana
   - alerting

docs/sources/alerting/set-up/_index.md

@@ -2,7 +2,7 @@
 aliases:
   - unified-alerting/set-up/
 canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/
-description: How to configure alerting features and integrations
+description: Set up or upgrade your implementation of Grafana Alerting
 labels:
   products:
     - oss

docs/sources/alerting/set-up/configure-alert-state-history/index.md

@@ -1,6 +1,6 @@
 ---
 canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/configure-alert-state-history/
-description: Configure Alert State History
+description: Configure alert state history to explore the behavior of your alert rules
 keywords:
   - grafana
   - alerting

docs/sources/alerting/set-up/configure-alertmanager/index.md

@@ -2,7 +2,7 @@
 aliases:
   - ../configure-alertmanager/
 canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/configure-alertmanager/
-description: Configure Alertmanager
+description: Configure an Alertmanager to receive all of your alerts
 keywords:
   - grafana
   - alerting