"Release: Updated versions in package to 8.2.5" (#41859)

(cherry picked from commit e59c3a34fe)

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

.bingo/Variables.mk

@@ -1,4 +1,4 @@
-# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.5.1. DO NOT EDIT.
+# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.4.3. DO NOT EDIT.
 # All tools are designed to be build inside $GOBIN.
 BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 GOPATH ?= $(shell go env GOPATH)
@@ -7,22 +7,16 @@ GO     ?= $(shell which go)
 
 # Below generated variables ensure that every time a tool under each variable is invoked, the correct version
 # will be used; reinstalling only if needed.
-# For example for drone variable:
+# For example for wire variable:
 #
 # In your main Makefile (for non array binaries):
 #
 #include .bingo/Variables.mk # Assuming -dir was set to .bingo .
 #
-#command: $(DRONE)
-#	@echo "Running drone"
-#	@$(DRONE) <flags/args..>
+#command: $(WIRE)
+#	@echo "Running wire"
+#	@$(WIRE) <flags/args..>
 #
-DRONE := $(GOBIN)/drone-v1.4.0
-$(DRONE): $(BINGO_DIR)/drone.mod
-	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/drone-v1.4.0"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.4.0 "github.com/drone/drone-cli/drone"
-
 WIRE := $(GOBIN)/wire-v0.5.0
 $(WIRE): $(BINGO_DIR)/wire.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.

.bingo/drone.mod

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

.bingo/variables.env

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

.dockerignore

@@ -12,14 +12,7 @@ Dockerfile
 docs
 dump.rdb
 node_modules
-**/node_modules
+/local
 /tmp
 *.yml
-!.yarnrc.yml
 *.md
-.yarn/*
-!.yarn/patches
-!.yarn/releases
-!.yarn/plugins
-!.yarn/versions
-!.yarn/cache

.eslintignore

@@ -6,5 +6,3 @@ devenv
 data
 dist
 e2e/tmp
-public/lib/monaco
-deployment_tools_config.json

.github/CODEOWNERS

@@ -14,20 +14,17 @@
 # Documentation owner: Jita Chatterjee
 /docs/ @grafana/docs-squad @pkolyvas
 /contribute/ @marcusolsson @grafana/docs-squad @pkolyvas
-/docs/sources/developers/plugins/ @marcusolsson @grafana/docs-squad @grafana/plugins-platform
-/docs/sources/developers/plugins/backend @marcusolsson @grafana/docs-squad @grafana/plugins-platform-backend
+/docs/sources/developers/plugins/ @marcusolsson @grafana/docs-squad
 /docs/sources/enterprise/ @osg-grafana @grafana/docs-squad
 
 # Backend code
 *.go @grafana/backend-platform
 go.mod @grafana/backend-platform
 go.sum @grafana/backend-platform
-/.bingo @grafana/backend-platform
 
 # Continuous Integration
-.drone.yml @grafana/grafana-release-eng
-.drone.star @grafana/grafana-release-eng
-/scripts/drone/ @grafana/grafana-release-eng
+.drone.yml @malcolmholmes @dsotirakis @zserge
+/scripts/drone/ @malcolmholmes @dsotirakis @zserge
 
 # Cloud Datasources backend code
 /pkg/tsdb/cloudwatch @grafana/cloud-datasources @grafana/observability-squad
@@ -43,86 +40,40 @@ go.sum @grafana/backend-platform
 /pkg/tsdb/zipkin @grafana/observability-squad
 /pkg/tsdb/tempo @grafana/observability-squad
 
-# Database migrations
-/pkg/services/sqlstore/migrations @grafana/backend-platform @grafana/hosted-grafana-team
-*_mig.go @grafana/backend-platform @grafana/hosted-grafana-team
-
-# Grafana live
-/pkg/services/live/ @grafana/grafana-edge-squad
-
 # Unified Alerting
 /pkg/services/ngalert @grafana/alerting-squad
 /pkg/services/sqlstore/migrations/ualert @grafana/alerting-squad
 
-# Library Services
-/pkg/services/libraryelements @grafana/user-essentials
-/pkg/services/librarypanels @grafana/user-essentials
-
-# Plugins
-/pkg/api/pluginproxy @grafana/plugins-platform-backend
-/pkg/plugins @grafana/plugins-platform-backend
-/pkg/services/datasourceproxy @grafana/plugins-platform-backend
-/pkg/services/datasources @grafana/plugins-platform-backend
+# Database migrations
+/pkg/services/sqlstore/migrations @grafana/backend-platform @grafana/hosted-grafana-team
+*_mig.go @grafana/backend-platform @grafana/hosted-grafana-team
 
 # Backend code docs
 /contribute/style-guides/backend.md @grafana/backend-platform
 /contribute/architecture/backend @grafana/backend-platform
 /contribute/engineering/backend @grafana/backend-platform
 
-/e2e @grafana/user-essentials
-/packages @grafana/user-essentials @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
-/packages/grafana-e2e-selectors @grafana/user-essentials
-/packages/grafana-e2e @grafana/user-essentials
-/packages/grafana-toolkit @grafana/plugins-platform-frontend
-/packages/grafana-ui/.storybook @grafana/plugins-platform-frontend
-/packages/grafana-ui/src/components/DateTimePickers @grafana/grafana-bi-squad
-/packages/grafana-ui/src/components/GraphNG @grafana/grafana-bi-squad
-/packages/grafana-ui/src/components/Table @grafana/grafana-bi-squad
-/packages/grafana-ui/src/components/TimeSeries @grafana/grafana-bi-squad
-/packages/grafana-ui/src/components/uPlot @grafana/grafana-bi-squad
-/packages/grafana-ui/src/utils/storybook @grafana/plugins-platform-frontend
-/packages/jaeger-ui-components/ @grafana/observability-squad
-/plugins-bundled @grafana/plugins-platform-frontend
-/public @grafana/user-essentials
-/public/app/core/components/TimePicker @grafana/grafana-bi-squad
-/public/app/features/canvas/ @grafana/grafana-edge-squad
-/public/app/features/dimensions/ @grafana/grafana-edge-squad
-/public/app/features/live/ @grafana/grafana-edge-squad
-/public/app/features/explore/ @grafana/observability-squad
-/public/app/features/plugins @grafana/plugins-platform-frontend
-/public/app/plugins/panel/alertlist @grafana/alerting-squad
-/public/app/plugins/panel/barchart @grafana/grafana-bi-squad
-/public/app/plugins/panel/heatmap @grafana/grafana-bi-squad
-/public/app/plugins/panel/histogram @grafana/grafana-bi-squad
-/public/app/plugins/panel/nodeGraph @grafana/observability-squad
-/public/app/plugins/panel/piechart @grafana/grafana-bi-squad
-/public/app/plugins/panel/state-timeline @grafana/grafana-bi-squad
-/public/app/plugins/panel/status-history @grafana/grafana-bi-squad
-/public/app/plugins/panel/table @grafana/grafana-bi-squad
-/public/app/plugins/panel/timeseries @grafana/grafana-bi-squad
-/public/app/plugins/panel/geomap @grafana/grafana-edge-squad
-/public/app/plugins/panel/canvas @grafana/grafana-edge-squad
-/public/app/plugins/panel/candlestick @grafana/grafana-edge-squad
-/public/app/plugins/panel/icon @grafana/grafana-edge-squad
-/scripts/build/release-packages.sh @grafana/plugins-platform-frontend
-/scripts/circle-release-next-packages.sh @grafana/plugins-platform-frontend
-/scripts/ci-frontend-metrics.sh @grafana/user-essentials @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
-/scripts/ci-reference-docs-build.sh @grafana/plugins-platform-frontend
-/scripts/ci-reference-docs-lint.sh @grafana/plugins-platform-frontend
-/scripts/grunt @grafana/frontend-ops
-/scripts/webpack @grafana/frontend-ops
-/scripts/generate-a11y-report.sh @grafana/user-essentials
-package.json @grafana/frontend-ops
-tsconfig.json @grafana/frontend-ops
-lerna.json @grafana/frontend-ops
-.babelrc @grafana/frontend-ops
-.prettierrc.js @grafana/frontend-ops
-.eslintrc @grafana/frontend-ops
-.pa11yci.conf.js @grafana/user-essentials
-.pa11yci-pr.conf.js @grafana/user-essentials
+/e2e @grafana/grafana-frontend-platform
+/packages @grafana/grafana-frontend-platform
+/plugins-bundled @grafana/grafana-frontend-platform
+/public @grafana/grafana-frontend-platform
+/scripts/build/release-packages.sh @grafana/grafana-frontend-platform
+/scripts/circle-release-next-packages.sh @grafana/grafana-frontend-platform
+/scripts/ci-frontend-metrics.sh @grafana/grafana-frontend-platform
+/scripts/grunt @grafana/grafana-frontend-platform
+/scripts/webpack @grafana/grafana-frontend-platform
+package.json @grafana/grafana-frontend-platform
+tsconfig.json @grafana/grafana-frontend-platform
+lerna.json @grafana/grafana-frontend-platform
+.babelrc @grafana/grafana-frontend-platform
+.prettierrc.js @grafana/grafana-frontend-platform
+.eslintrc @grafana/grafana-frontend-platform
 
 # @grafana/ui component documentation
-*.mdx @marcusolsson @jessover9000 @grafana/plugins-platform-frontend
+*.mdx @marcusolsson @jessover9000 @grafana/grafana-frontend-platform
+
+/public/app/features/explore/ @grafana/observability-squad
+/packages/jaeger-ui-components/ @grafana/observability-squad
 
 # Core datasources
 /public/app/plugins/datasource/cloudwatch @grafana/cloud-datasources @grafana/observability-squad

.github/ISSUE_TEMPLATE/1-bug_report.md

@@ -5,7 +5,7 @@ labels: 'type: bug'
 ---
 
 <!--
-Please use this template to create your bug report. By providing as much info as possible you help us understand the issue, reproduce it and resolve it for you quicker. Therefore take a couple of extra minutes to make sure you have provided all info needed.
+Please use this template to create your bug report. By providing as much info as possible you help us understand the issue, reproduce it and resolve it for you quicker. Therefor take a couple of extra minutes to make sure you have provided all info needed.
 
 PROTIP: record your screen and attach it as a gif to showcase the issue.
 

.github/renovate.json5

@@ -1,40 +0,0 @@
-{
-  "extends": [
-    "config:base"
-  ],
-  "enabledManagers": ["npm"],
-  "ignoreDeps": [
-    "@types/systemjs",
-    "@types/d3-force", // we should bump this once we move to esm modules
-    "@types/d3-interpolate", // we should bump this once we move to esm modules
-    "@types/d3-scale-chromatic", // we should bump this once we move to esm modules
-    "d3",
-    "d3-force", // we should bump this once we move to esm modules
-    "d3-interpolate", // we should bump this once we move to esm modules
-    "d3-scale-chromatic", // we should bump this once we move to esm modules
-    "eslint", // wait until `eslint-plugin-react-hooks>4.2.0` is released
-    "globby", // we should bump this once we move to esm modules
-    "slate",
-    "slate-plain-serializer",
-    "systemjs",
-    "ts-loader", // we should remove ts-loader and use babel-loader instead
-    "ora" // we should bump this once we move to esm modules
-  ],
-  "ignorePaths": ["packages/grafana-toolkit/package.json", "emails/**", "plugins-bundled/**", "**/mocks/**"],
-  "labels": ["area/frontend", "dependencies"],
-  "minor": {
-    "enabled": false
-  },
-  "patch": {
-    "enabled": false
-  },
-  "pin": {
-    "enabled": false
-  },
-  "prConcurrentLimit": 10,
-  "reviewers": ["team:grafana/frontend-ops"],
-  "separateMajorMinor": false,
-  "vulnerabilityAlerts": {
-    "addLabels": ["area/security"]
-  }
-}

.github/workflows/bump-version.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     # This is a basic workflow to help you get started with Actions
-      - uses: actions-ecosystem/action-regex-match@v2.0.2
+      - uses: actions-ecosystem/action-regex-match@v2
         id: regex-match
         with:
           text: ${{ github.event.inputs.version }}
@@ -53,7 +53,7 @@ jobs:
           repository: "grafana/grafana-github-actions"
           path: ./actions
           ref: main
-      - uses: actions/setup-node@v2.4.1
+      - uses: actions/setup-node@v2.1.5
         with:
           node-version: '14'
       - name: Install Actions

.github/workflows/publish.yml

@@ -3,7 +3,7 @@ name: publish_docs
 on:
   push:
     branches:
-    - main
+    - v8.2.x
     paths:
     - 'docs/sources/**'
     - 'packages/grafana-*/**'
@@ -16,21 +16,16 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - run: git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.GH_BOT_ACCESS_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync
+    - uses: actions/cache@v2.1.6
+      with:
+        path: '**/node_modules'
+        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
     - name: generate-packages-docs
-      uses: actions/setup-node@v2.4.1
+      uses: actions/setup-node@v2.1.5
       id: generate-docs
       with:
         node-version: '14'
-    - name: Get yarn cache directory path
-      id: yarn-cache-dir-path
-      run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
-    - uses: actions/cache@v2.1.6
-      with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: yarn-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-            yarn-
-    - run: yarn install --immutable
+    - run: yarn install --pure-lockfile --no-progress
     - run: ./scripts/ci-reference-docs-build.sh
     - name: publish-to-git
       uses: ./.github/actions/website-sync
@@ -41,7 +36,7 @@ jobs:
         host: github.com
         github_pat: '${{ secrets.GH_BOT_ACCESS_TOKEN }}'
         source_folder: docs/sources
-        target_folder: content/docs/grafana/next
+        target_folder: content/docs/grafana/latest
         allow_no_changes: 'true'
     - shell: bash
       run: |

.gitignore

@@ -7,28 +7,17 @@ awsconfig
 /.awcache
 /dist
 /public/build
-public/dist/tsconfig.tsbuildinfo
 /public/views/index.html
 /public/views/error.html
 /emails/dist
 /reports
 /e2e/tmp
+.yarnrc
+.yarn/
 vendor/
 /docs/menu.yaml
 /requests
 
-# Yarn
-.yarn/*
-!.yarn/patches
-!.yarn/releases
-!.yarn/plugins
-!.yarn/sdks
-!.yarn/versions
-# we temporarily commit this file because yarn downloading it
-# somehow produces different checksum values
-!.yarn/cache/pa11y-ci-https-1e9675e9e1-668c9119bd.zip
-.pnp.*
-
 # Enterprise emails
 /emails/templates/enterprise_*
 /public/emails/enterprise_*
@@ -64,7 +53,6 @@ public/css/*.min.css
 !.vscode/launch.json
 .vs/
 .eslintcache
-.stylelintcache
 
 /data/*
 /bin/*
@@ -88,7 +76,6 @@ profile.cov
 /pkg/cmd/grafana-server/debug
 /pkg/extensions/*
 /pkg/server/wireexts_enterprise.go
-/pkg/cmd/grafana-cli/runner/wireexts_enterprise.go
 !/pkg/extensions/main.go
 /public/app/extensions
 debug.test
@@ -96,7 +83,6 @@ debug.test
 /packaging/**/*.rpm
 /packaging/**/*.deb
 /packaging/**/*.tar.gz
-/packaging/**/*.tar.gz.sha256
 
 # Ignore OSX indexing
 .DS_Store
@@ -149,5 +135,3 @@ compilation-stats.json
 
 # auto generated Go files
 *_gen.go
-
-deployment_tools_config.json

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-yarn run precommit

.pa11yci-pr.conf.js

@@ -2,7 +2,6 @@ var config = {
   defaults: {
     concurrency: 1,
     runners: ['axe'],
-    useIncognitoBrowserContext: false,
     chromeLaunchConfig: {
       args: ['--no-sandbox'],
     },
@@ -11,102 +10,79 @@ var config = {
   urls: [
     {
       url: '${HOST}/login',
-      wait: 500,
-      rootElement: '.main-view',
-      threshold: 12,
-    },
-    {
-      url: '${HOST}/login',
-      wait: 500,
       actions: [
-        "wait for element input[name='user'] to be added",
         "set field input[name='user'] to admin",
         "set field input[name='password'] to admin",
         "click element button[aria-label='Login button']",
         "wait for element [aria-label='Skip change password button'] to be visible",
       ],
-      threshold: 13,
-      rootElement: '.main-view',
+      threshold: 3,
     },
     {
       url: '${HOST}/?orgId=1',
-      wait: 500,
-      threshold: 0,
+      threshold: 7,
     },
     {
       url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge',
-      wait: 500,
-      rootElement: '.main-view',
-      threshold: 0,
+      hideElements: '.sidemenu',
+      threshold: 2,
     },
     {
       url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=settings',
-      wait: 500,
-      rootElement: '.main-view',
-      threshold: 0,
+      rootElement: '.dashboard-settings',
+      threshold: 10,
     },
     {
       url: '${HOST}/?orgId=1&search=open',
-      wait: 500,
       rootElement: '.main-view',
-      threshold: 0,
+      threshold: 15,
     },
     {
       url: '${HOST}/alerting/list',
-      wait: 500,
       rootElement: '.main-view',
-      // the unified alerting promotion alert's content contrast is too low
-      // see https://github.com/grafana/grafana/pull/41829
-      threshold: 5,
+      threshold: 7,
     },
     {
       url: '${HOST}/datasources',
-      wait: 500,
       rootElement: '.main-view',
-      threshold: 0,
+      threshold: 36,
     },
     {
       url: '${HOST}/org/users',
-      wait: 500,
       rootElement: '.main-view',
-      threshold: 0,
+      threshold: 4,
     },
     {
       url: '${HOST}/org/teams',
-      wait: 500,
       rootElement: '.main-view',
-      threshold: 0,
+      threshold: 1,
     },
     {
       url: '${HOST}/plugins',
-      wait: 500,
       rootElement: '.main-view',
-      threshold: 0,
+      threshold: 41,
     },
     {
       url: '${HOST}/org',
-      wait: 500,
       rootElement: '.main-view',
-      threshold: 0,
+      threshold: 2,
     },
     {
       url: '${HOST}/org/apikeys',
-      wait: 500,
       rootElement: '.main-view',
-      threshold: 0,
+      threshold: 5,
     },
     {
       url: '${HOST}/dashboards',
-      wait: 500,
       rootElement: '.main-view',
-      threshold: 0,
+      threshold: 8,
     },
   ],
 };
 
 function myPa11yCiConfiguration(urls, defaults) {
   const HOST_SERVER = process.env.HOST || 'localhost';
-  const PORT_SERVER = process.env.PORT || '3001';
+  const PORT_SERVER = process.env.PORT || '3000';
   for (var idx = 0; idx < urls.length; idx++) {
     urls[idx] = { ...urls[idx], url: urls[idx].url.replace('${HOST}', `${HOST_SERVER}:${PORT_SERVER}`) };
   }

.pa11yci.conf.js

@@ -2,7 +2,6 @@ var config = {
   defaults: {
     concurrency: 1,
     runners: ['axe'],
-    useIncognitoBrowserContext: false,
     chromeLaunchConfig: {
       args: ['--no-sandbox'],
     },
@@ -11,78 +10,58 @@ var config = {
   urls: [
     {
       url: '${HOST}/login',
-      wait: 500,
-      rootElement: '.main-view',
-    },
-    {
-      url: '${HOST}/login', //skip password and login
       actions: [
-        "wait for element input[name='user'] to be added",
         "set field input[name='user'] to admin",
         "set field input[name='password'] to admin",
         "click element button[aria-label='Login button']",
         "wait for element [aria-label='Skip change password button'] to be visible",
       ],
-      wait: 500,
-      rootElement: '.main-view',
     },
     {
       url: '${HOST}/?orgId=1',
-      wait: 500,
     },
     {
       url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge',
-      wait: 500,
-      rootElement: '.main-view',
+      hideElements: '.sidemenu',
     },
     {
       url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=settings',
-      wait: 500,
-      rootElement: '.main-view',
+      rootElement: '.dashboard-settings',
     },
     {
       url: '${HOST}/?orgId=1&search=open',
-      wait: 500,
       rootElement: '.main-view',
     },
     {
       url: '${HOST}/alerting/list',
-      wait: 500,
       rootElement: '.main-view',
     },
     {
       url: '${HOST}/datasources',
-      wait: 500,
       rootElement: '.main-view',
     },
     {
       url: '${HOST}/org/users',
-      wait: 500,
       rootElement: '.main-view',
     },
     {
       url: '${HOST}/org/teams',
-      wait: 500,
       rootElement: '.main-view',
     },
     {
       url: '${HOST}/plugins',
-      wait: 500,
       rootElement: '.main-view',
     },
     {
       url: '${HOST}/org',
-      wait: 500,
       rootElement: '.main-view',
     },
     {
       url: '${HOST}/org/apikeys',
-      wait: 500,
       rootElement: '.main-view',
     },
     {
       url: '${HOST}/dashboards',
-      wait: 500,
       rootElement: '.main-view',
     },
   ],
@@ -90,10 +69,11 @@ var config = {
 
 function myPa11yCiConfiguration(urls, defaults) {
   const HOST_SERVER = process.env.HOST || 'localhost';
-  const PORT_SERVER = process.env.PORT || '3001';
+  const PORT_SERVER = process.env.PORT || '3000';
   for (var idx = 0; idx < urls.length; idx++) {
     urls[idx] = { ...urls[idx], url: urls[idx].url.replace('${HOST}', `${HOST_SERVER}:${PORT_SERVER}`) };
   }
+
   return {
     defaults: defaults,
     urls: urls,

.vscode/launch.json

@@ -9,15 +9,6 @@
       "program": "${workspaceFolder}/pkg/cmd/grafana-server/",
       "env": {},
       "args": ["--homepath", "${workspaceFolder}", "--packaging", "dev"]
-    },
-    {
-      "name": "Debug Jest test",
-      "type": "node",
-      "request": "launch",
-      "runtimeArgs": ["--inspect-brk", "${workspaceRoot}/node_modules/.bin/jest", "--runInBand", "${file}"],
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "port": 9229
     }
   ]
 }

.yarn/sdks/eslint/bin/eslint.js

@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require eslint/bin/eslint.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real eslint/bin/eslint.js your application uses
-module.exports = absRequire(`eslint/bin/eslint.js`);

.yarn/sdks/eslint/lib/api.js

@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require eslint/lib/api.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real eslint/lib/api.js your application uses
-module.exports = absRequire(`eslint/lib/api.js`);

.yarn/sdks/eslint/package.json

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

.yarn/sdks/integrations.yml

@@ -1,6 +0,0 @@
-# This file is automatically generated by @yarnpkg/sdks.
-# Manual changes might be lost!
-
-integrations:
-  - vim
-  - vscode

.yarn/sdks/prettier/index.js

@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require prettier/index.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real prettier/index.js your application uses
-module.exports = absRequire(`prettier/index.js`);

.yarn/sdks/prettier/package.json

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

.yarn/sdks/stylelint/bin/stylelint.js

@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require stylelint/bin/stylelint.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real stylelint/bin/stylelint.js your application uses
-module.exports = absRequire(`stylelint/bin/stylelint.js`);

.yarn/sdks/stylelint/lib/index.js

@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require stylelint/lib/index.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real stylelint/lib/index.js your application uses
-module.exports = absRequire(`stylelint/lib/index.js`);

.yarn/sdks/stylelint/package.json

@@ -1,6 +0,0 @@
-{
-  "name": "stylelint",
-  "version": "13.13.1-sdk",
-  "main": "lib/index.js",
-  "type": "commonjs"
-}

.yarn/sdks/typescript/bin/tsc

@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/bin/tsc
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real typescript/bin/tsc your application uses
-module.exports = absRequire(`typescript/bin/tsc`);

.yarn/sdks/typescript/bin/tsserver

@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/bin/tsserver
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real typescript/bin/tsserver your application uses
-module.exports = absRequire(`typescript/bin/tsserver`);

.yarn/sdks/typescript/lib/tsc.js

@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/tsc.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real typescript/lib/tsc.js your application uses
-module.exports = absRequire(`typescript/lib/tsc.js`);

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

@@ -1,184 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-const moduleWrapper = tsserver => {
-  if (!process.versions.pnp) {
-    return tsserver;
-  }
-
-  const {isAbsolute} = require(`path`);
-  const pnpApi = require(`pnpapi`);
-
-  const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
-  const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
-
-  const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
-    return `${locator.name}@${locator.reference}`;
-  }));
-
-  // VSCode sends the zip paths to TS using the "zip://" prefix, that TS
-  // doesn't understand. This layer makes sure to remove the protocol
-  // before forwarding it to TS, and to add it back on all returned paths.
-
-  function toEditorPath(str) {
-    // We add the `zip:` prefix to both `.zip/` paths and virtual paths
-    if (isAbsolute(str) && !str.match(/^\^?(zip:|\/zip\/)/) && (str.match(/\.zip\//) || isVirtual(str))) {
-      // We also take the opportunity to turn virtual paths into physical ones;
-      // this makes it much easier to work with workspaces that list peer
-      // dependencies, since otherwise Ctrl+Click would bring us to the virtual
-      // file instances instead of the real ones.
-      //
-      // We only do this to modules owned by the the dependency tree roots.
-      // This avoids breaking the resolution when jumping inside a vendor
-      // with peer dep (otherwise jumping into react-dom would show resolution
-      // errors on react).
-      //
-      const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
-      if (resolved) {
-        const locator = pnpApi.findPackageLocator(resolved);
-        if (locator && dependencyTreeRoots.has(`${locator.name}@${locator.reference}`)) {
-          str = resolved;
-        }
-      }
-
-      str = normalize(str);
-
-      if (str.match(/\.zip\//)) {
-        switch (hostInfo) {
-          // Absolute VSCode `Uri.fsPath`s need to start with a slash.
-          // VSCode only adds it automatically for supported schemes,
-          // so we have to do it manually for the `zip` scheme.
-          // The path needs to start with a caret otherwise VSCode doesn't handle the protocol
-          //
-          // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
-          //
-          // Update Oct 8 2021: VSCode changed their format in 1.61.
-          // Before | ^zip:/c:/foo/bar.zip/package.json
-          // After  | ^/zip//c:/foo/bar.zip/package.json
-          //
-          case `vscode <1.61`: {
-            str = `^zip:${str}`;
-          } break;
-
-          case `vscode`: {
-            str = `^/zip/${str}`;
-          } break;
-
-          // To make "go to definition" work,
-          // We have to resolve the actual file system path from virtual path
-          // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
-          case `coc-nvim`: {
-            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
-            str = resolve(`zipfile:${str}`);
-          } break;
-
-          // Support neovim native LSP and [typescript-language-server](https://github.com/theia-ide/typescript-language-server)
-          // We have to resolve the actual file system path from virtual path,
-          // everything else is up to neovim
-          case `neovim`: {
-            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
-            str = `zipfile:${str}`;
-          } break;
-
-          default: {
-            str = `zip:${str}`;
-          } break;
-        }
-      }
-    }
-
-    return str;
-  }
-
-  function fromEditorPath(str) {
-    switch (hostInfo) {
-      case `coc-nvim`:
-      case `neovim`: {
-        str = str.replace(/\.zip::/, `.zip/`);
-        // The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
-        // So in order to convert it back, we use .* to match all the thing
-        // before `zipfile:`
-        return process.platform === `win32`
-          ? str.replace(/^.*zipfile:\//, ``)
-          : str.replace(/^.*zipfile:/, ``);
-      } break;
-
-      case `vscode`:
-      default: {
-        return process.platform === `win32`
-          ? str.replace(/^\^?(zip:|\/zip)\/+/, ``)
-          : str.replace(/^\^?(zip:|\/zip)\/+/, `/`);
-      } break;
-    }
-  }
-
-  // Force enable 'allowLocalPluginLoads'
-  // TypeScript tries to resolve plugins using a path relative to itself
-  // which doesn't work when using the global cache
-  // https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238
-  // VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but
-  // TypeScript already does local loads and if this code is running the user trusts the workspace
-  // https://github.com/microsoft/vscode/issues/45856
-  const ConfiguredProject = tsserver.server.ConfiguredProject;
-  const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype;
-  ConfiguredProject.prototype.enablePluginsWithOptions = function() {
-    this.projectService.allowLocalPluginLoads = true;
-    return originalEnablePluginsWithOptions.apply(this, arguments);
-  };
-
-  // And here is the point where we hijack the VSCode <-> TS communications
-  // by adding ourselves in the middle. We locate everything that looks
-  // like an absolute path of ours and normalize it.
-
-  const Session = tsserver.server.Session;
-  const {onMessage: originalOnMessage, send: originalSend} = Session.prototype;
-  let hostInfo = `unknown`;
-
-  Object.assign(Session.prototype, {
-    onMessage(/** @type {string} */ message) {
-      const parsedMessage = JSON.parse(message)
-
-      if (
-        parsedMessage != null &&
-        typeof parsedMessage === `object` &&
-        parsedMessage.arguments &&
-        typeof parsedMessage.arguments.hostInfo === `string`
-      ) {
-        hostInfo = parsedMessage.arguments.hostInfo;
-        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK && process.env.VSCODE_IPC_HOOK.match(/Code\/1\.([1-5][0-9]|60)\./)) {
-          hostInfo += ` <1.61`;
-        }
-      }
-
-      return originalOnMessage.call(this, JSON.stringify(parsedMessage, (key, value) => {
-        return typeof value === `string` ? fromEditorPath(value) : value;
-      }));
-    },
-
-    send(/** @type {any} */ msg) {
-      return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => {
-        return typeof value === `string` ? toEditorPath(value) : value;
-      })));
-    }
-  });
-
-  return tsserver;
-};
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/tsserver.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real typescript/lib/tsserver.js your application uses
-module.exports = moduleWrapper(absRequire(`typescript/lib/tsserver.js`));

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

@@ -1,184 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-const moduleWrapper = tsserver => {
-  if (!process.versions.pnp) {
-    return tsserver;
-  }
-
-  const {isAbsolute} = require(`path`);
-  const pnpApi = require(`pnpapi`);
-
-  const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
-  const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
-
-  const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
-    return `${locator.name}@${locator.reference}`;
-  }));
-
-  // VSCode sends the zip paths to TS using the "zip://" prefix, that TS
-  // doesn't understand. This layer makes sure to remove the protocol
-  // before forwarding it to TS, and to add it back on all returned paths.
-
-  function toEditorPath(str) {
-    // We add the `zip:` prefix to both `.zip/` paths and virtual paths
-    if (isAbsolute(str) && !str.match(/^\^?(zip:|\/zip\/)/) && (str.match(/\.zip\//) || isVirtual(str))) {
-      // We also take the opportunity to turn virtual paths into physical ones;
-      // this makes it much easier to work with workspaces that list peer
-      // dependencies, since otherwise Ctrl+Click would bring us to the virtual
-      // file instances instead of the real ones.
-      //
-      // We only do this to modules owned by the the dependency tree roots.
-      // This avoids breaking the resolution when jumping inside a vendor
-      // with peer dep (otherwise jumping into react-dom would show resolution
-      // errors on react).
-      //
-      const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
-      if (resolved) {
-        const locator = pnpApi.findPackageLocator(resolved);
-        if (locator && dependencyTreeRoots.has(`${locator.name}@${locator.reference}`)) {
-          str = resolved;
-        }
-      }
-
-      str = normalize(str);
-
-      if (str.match(/\.zip\//)) {
-        switch (hostInfo) {
-          // Absolute VSCode `Uri.fsPath`s need to start with a slash.
-          // VSCode only adds it automatically for supported schemes,
-          // so we have to do it manually for the `zip` scheme.
-          // The path needs to start with a caret otherwise VSCode doesn't handle the protocol
-          //
-          // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
-          //
-          // Update Oct 8 2021: VSCode changed their format in 1.61.
-          // Before | ^zip:/c:/foo/bar.zip/package.json
-          // After  | ^/zip//c:/foo/bar.zip/package.json
-          //
-          case `vscode <1.61`: {
-            str = `^zip:${str}`;
-          } break;
-
-          case `vscode`: {
-            str = `^/zip/${str}`;
-          } break;
-
-          // To make "go to definition" work,
-          // We have to resolve the actual file system path from virtual path
-          // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
-          case `coc-nvim`: {
-            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
-            str = resolve(`zipfile:${str}`);
-          } break;
-
-          // Support neovim native LSP and [typescript-language-server](https://github.com/theia-ide/typescript-language-server)
-          // We have to resolve the actual file system path from virtual path,
-          // everything else is up to neovim
-          case `neovim`: {
-            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
-            str = `zipfile:${str}`;
-          } break;
-
-          default: {
-            str = `zip:${str}`;
-          } break;
-        }
-      }
-    }
-
-    return str;
-  }
-
-  function fromEditorPath(str) {
-    switch (hostInfo) {
-      case `coc-nvim`:
-      case `neovim`: {
-        str = str.replace(/\.zip::/, `.zip/`);
-        // The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
-        // So in order to convert it back, we use .* to match all the thing
-        // before `zipfile:`
-        return process.platform === `win32`
-          ? str.replace(/^.*zipfile:\//, ``)
-          : str.replace(/^.*zipfile:/, ``);
-      } break;
-
-      case `vscode`:
-      default: {
-        return process.platform === `win32`
-          ? str.replace(/^\^?(zip:|\/zip)\/+/, ``)
-          : str.replace(/^\^?(zip:|\/zip)\/+/, `/`);
-      } break;
-    }
-  }
-
-  // Force enable 'allowLocalPluginLoads'
-  // TypeScript tries to resolve plugins using a path relative to itself
-  // which doesn't work when using the global cache
-  // https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238
-  // VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but
-  // TypeScript already does local loads and if this code is running the user trusts the workspace
-  // https://github.com/microsoft/vscode/issues/45856
-  const ConfiguredProject = tsserver.server.ConfiguredProject;
-  const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype;
-  ConfiguredProject.prototype.enablePluginsWithOptions = function() {
-    this.projectService.allowLocalPluginLoads = true;
-    return originalEnablePluginsWithOptions.apply(this, arguments);
-  };
-
-  // And here is the point where we hijack the VSCode <-> TS communications
-  // by adding ourselves in the middle. We locate everything that looks
-  // like an absolute path of ours and normalize it.
-
-  const Session = tsserver.server.Session;
-  const {onMessage: originalOnMessage, send: originalSend} = Session.prototype;
-  let hostInfo = `unknown`;
-
-  Object.assign(Session.prototype, {
-    onMessage(/** @type {string} */ message) {
-      const parsedMessage = JSON.parse(message)
-
-      if (
-        parsedMessage != null &&
-        typeof parsedMessage === `object` &&
-        parsedMessage.arguments &&
-        typeof parsedMessage.arguments.hostInfo === `string`
-      ) {
-        hostInfo = parsedMessage.arguments.hostInfo;
-        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK && process.env.VSCODE_IPC_HOOK.match(/Code\/1\.([1-5][0-9]|60)\./)) {
-          hostInfo += ` <1.61`;
-        }
-      }
-
-      return originalOnMessage.call(this, JSON.stringify(parsedMessage, (key, value) => {
-        return typeof value === `string` ? fromEditorPath(value) : value;
-      }));
-    },
-
-    send(/** @type {any} */ msg) {
-      return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => {
-        return typeof value === `string` ? toEditorPath(value) : value;
-      })));
-    }
-  });
-
-  return tsserver;
-};
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/tsserverlibrary.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real typescript/lib/tsserverlibrary.js your application uses
-module.exports = moduleWrapper(absRequire(`typescript/lib/tsserverlibrary.js`));

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

@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/typescript.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real typescript/lib/typescript.js your application uses
-module.exports = absRequire(`typescript/lib/typescript.js`);

.yarn/sdks/typescript/package.json

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

.yarnrc.yml

@@ -1,81 +0,0 @@
-enableTelemetry: false
-nodeLinker: "pnp"
-
-packageExtensions:
-  "@grafana/slate-react@0.22.10-grafana":
-    peerDependencies:
-      slate-react: ">=0.22.0"
-  "@mdx-js/loader@1.6.22":
-    peerDependencies:
-      react: 17.0.1
-  "@storybook/addon-essentials@6.3.7":
-    peerDependencies:
-      "@storybook/components": 6.3.7
-      "@storybook/core-events": 6.3.7
-      "@storybook/theming": 6.3.7
-  "@storybook/addon-knobs@6.3.0":
-    dependencies:
-      copy-to-clipboard: ^3.3.1
-  "@storybook/core-server@6.3.7":
-    peerDependencies:
-      "@babel/core": ^7.0.0
-  "@storybook/core@6.3.7":
-    peerDependencies:
-      "@babel/core": ^7.0.0
-      "@storybook/manager-webpack5": 6.3.7
-      webpack: 5.51.1
-  "@storybook/csf-tools@6.3.7":
-    peerDependencies:
-      "@babel/core": ^7.0.0
-  "@storybook/react@6.3.7":
-    peerDependencies:
-      "@storybook/manager-webpack5": 6.3.7
-  doctrine@3.0.0:
-    dependencies:
-      assert: 2.0.0
-  moveable@0.26.0:
-    dependencies:
-      "@daybrush/utils": 1.6.0
-      framework-utils: ^1.1.0
-      react-simple-compat: 1.2.1
-  rc-time-picker@3.7.3:
-    peerDependencies:
-      react: 17.0.1
-      react-dom: 17.0.1
-  rc-trigger@2.6.5:
-    peerDependencies:
-      react: 17.0.1
-      react-dom: 17.0.1
-  react-compat-moveable@0.14.0:
-    dependencies:
-      "@egjs/agent": ^2.2.1
-      "@egjs/children-differ": ^1.0.1
-      "@scena/matrix": 1.1.1
-      css-to-mat: ^1.0.3
-      gesto: ^1.4.0
-      overlap-area: ^1.0.0
-    peerDependencies:
-      framework-utils: ^1.1.0
-  react-dev-utils@11.0.4:
-    peerDependencies:
-      typescript: 4.4.3
-      webpack: 5.51.1
-  react-docgen-typescript-loader@3.7.2:
-    peerDependencies:
-      webpack: 4.41.5
-  react-icons@2.2.7:
-    peerDependencies:
-      prop-types: "*"
-  react-resizable@3.0.4:
-    peerDependencies:
-      react-dom: 17.0.1
-
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
-    spec: "@yarnpkg/plugin-typescript"
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
-  - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
-    spec: "https://mskelton.dev/yarn-outdated/v2"
-
-yarnPath: .yarn/releases/yarn-3.1.0.cjs

CHANGELOG.md

@@ -1,30 +1,3 @@
-<!-- 8.2.5 START -->
-
-# 8.2.5 (2021-11-18)
-
-### Bug fixes
-
-- **Alerting:** Fix a bug where the metric in the evaluation string was not correctly populated. [#41731](https://github.com/grafana/grafana/pull/41731), [@JohnnyQQQQ](https://github.com/JohnnyQQQQ)
-- **Alerting:** Fix no data behaviour in Legacy Alerting for alert rules using the AND operator. [#41305](https://github.com/grafana/grafana/pull/41305), [@gerobinson](https://github.com/gerobinson)
-- **CloudMonitoring:** Ignore min and max aggregation in MQL queries. [#41302](https://github.com/grafana/grafana/pull/41302), [@sunker](https://github.com/sunker)
-- **Dashboards:** 'Copy' is no longer added to new dashboard titles. [#41344](https://github.com/grafana/grafana/pull/41344), [@joshhunt](https://github.com/joshhunt)
-- **DataProxy:** Fix overriding response body when response is a WebSocket upgrade. [#41364](https://github.com/grafana/grafana/pull/41364), [@marefr](https://github.com/marefr)
-- **Elasticsearch:** Use field configured in query editor as field for date_histogram aggregations. [#41258](https://github.com/grafana/grafana/pull/41258), [@Elfo404](https://github.com/Elfo404)
-- **Explore:** Fix running queries without a datasource property set. [#40805](https://github.com/grafana/grafana/pull/40805), [@Elfo404](https://github.com/Elfo404)
-- **InfluxDB:** Fix numeric aliases in queries. [#41531](https://github.com/grafana/grafana/pull/41531), [@gabor](https://github.com/gabor)
-- **Plugins:** Ensure consistent plugin settings list response. [#41346](https://github.com/grafana/grafana/pull/41346), [@wbrowne](https://github.com/wbrowne)
-- **Tempo:** Fix validation of float durations. [#41400](https://github.com/grafana/grafana/pull/41400), [@ivanahuckova](https://github.com/ivanahuckova)
-- **Tracing:** Correct tags for each span are shown. [#41473](https://github.com/grafana/grafana/pull/41473), [@ivanahuckova](https://github.com/ivanahuckova)
-
-### Breaking changes
-
-### Fix No Data behaviour in Legacy Alerting
-
-In Grafana 8.2.5 and later, this change fixes a bug in the evaluation of alert rules when using the AND operator to compare two or more conditions. In Grafana 8.2.4 and earlier such alert rules would evaluate to `OK` if at least one, but not all, conditions returned no data. This change fixes that bug such that in Grafana 8.2.5 these alert rules now evaluate to `No Data`.
-
-If an alert should evaluate to `OK` when one or all conditions return `No Data` then this can be done via changing `If no data or all values are null` to `OK`. However, this will not preserve the old behaviour in 8.2.4 where an alert will be `OK` if at least one, but not all, conditions return no data and then `No Data` if all conditions return `No Data`. Issue [#41305](https://github.com/grafana/grafana/issues/41305)
-
-<!-- 8.2.5 END -->
 <!-- 8.2.4 START -->
 
 # 8.2.4 (2021-11-15)
@@ -175,13 +148,10 @@ In this scenario (upgrade from 8.0.x - 8.1.x with multiple organizations and `ng
 ### Features and enhancements
 
 - **AccessControl:** Introduce new permissions to restrict access for reloading provisioning configuration. [#38906](https://github.com/grafana/grafana/pull/38906), [@vtorosyan](https://github.com/vtorosyan)
-- **Admin:** Update license page UI. (Enterprise)
 - **Alerting:** Add UI to edit Cortex/Loki namespace, group names, and group evaluation interval. [#38543](https://github.com/grafana/grafana/pull/38543), [@domasx2](https://github.com/domasx2)
 - **Alerting:** Add a Test button to test contact point. [#37475](https://github.com/grafana/grafana/pull/37475), [@domasx2](https://github.com/domasx2)
 - **Alerting:** Allow creating/editing recording rules for Loki and Cortex. [#38064](https://github.com/grafana/grafana/pull/38064), [@domasx2](https://github.com/domasx2)
-- **Alerting:** Metrics should have the label `org` instead of `user`. [#39353](https://github.com/grafana/grafana/pull/39353), [@gotjosh](https://github.com/gotjosh)
 - **Alerting:** Sort notification channels by name to make them easier to locate. [#37426](https://github.com/grafana/grafana/pull/37426), [@jstangroome](https://github.com/jstangroome)
-- **Alerting:** Support org level isolation of notification configuration. [#37414](https://github.com/grafana/grafana/pull/37414), [@papagian](https://github.com/papagian)
 - **AzureMonitor:** Add data links to deep link to Azure Portal Azure Resource Graph. [#35591](https://github.com/grafana/grafana/pull/35591), [@shuotli](https://github.com/shuotli)
 - **AzureMonitor:** Add support for annotations from Azure Monitor Metrics and Azure Resource Graph services. [#37633](https://github.com/grafana/grafana/pull/37633), [@joshhunt](https://github.com/joshhunt)
 - **AzureMonitor:** Show error message when subscriptions request fails in ConfigEditor. [#37837](https://github.com/grafana/grafana/pull/37837), [@joshhunt](https://github.com/joshhunt)
@@ -200,7 +170,6 @@ In this scenario (upgrade from 8.0.x - 8.1.x with multiple organizations and `ng
 - **Graphite:** Deprecate browser access mode. [#38783](https://github.com/grafana/grafana/pull/38783), [@ifrost](https://github.com/ifrost)
 - **InfluxDB:** Improve handling of intervals in alerting. [#37588](https://github.com/grafana/grafana/pull/37588), [@gabor](https://github.com/gabor)
 - **InfluxDB:** InfluxQL query editor: Handle unusual characters in tag values better. [#39170](https://github.com/grafana/grafana/pull/39170), [@gabor](https://github.com/gabor)
-- Introduce "monitored queries" service. (Enterprise)
 - **Jaeger:** Add ability to upload JSON file for trace data. [#37205](https://github.com/grafana/grafana/pull/37205), [@zoltanbedi](https://github.com/zoltanbedi)
 - **LibraryElements:** Enable specifying UID for new and existing library elements. [#39019](https://github.com/grafana/grafana/pull/39019), [@hugohaggmark](https://github.com/hugohaggmark)
 - **LibraryPanels:** Remove library panel icon from the panel header so you can no longer tell that a panel is a library panel from the dashboard view. [#38749](https://github.com/grafana/grafana/pull/38749), [@hugohaggmark](https://github.com/hugohaggmark)
@@ -213,12 +182,9 @@ In this scenario (upgrade from 8.0.x - 8.1.x with multiple organizations and `ng
 - **Postgres/MySQL/MSSQL:** Add setting to limit the maximum number of rows processed. [#38986](https://github.com/grafana/grafana/pull/38986), [@marefr](https://github.com/marefr)
 - **Prometheus:** Add browser access mode deprecation warning. [#37578](https://github.com/grafana/grafana/pull/37578), [@ivanahuckova](https://github.com/ivanahuckova)
 - **Prometheus:** Add interpolation for built-in-time variables to backend. [#39051](https://github.com/grafana/grafana/pull/39051), [@ivanahuckova](https://github.com/ivanahuckova)
-- **Recorded Queries:** Finish rest API endpoints. (Enterprise)
-- **Reporting:** enable creating reports from dashboard. (Enterprise)
 - **Tempo:** Add ability to upload trace data in JSON format. [#37407](https://github.com/grafana/grafana/pull/37407), [@zoltanbedi](https://github.com/zoltanbedi)
 - **TimeSeries/XYChart:** Allow grid lines visibility control in XYChart and TimeSeries panels. [#38502](https://github.com/grafana/grafana/pull/38502), [@dprokop](https://github.com/dprokop)
 - **Transformations:** Convert field types to time string number or boolean. [#38517](https://github.com/grafana/grafana/pull/38517), [@nikki-kiga](https://github.com/nikki-kiga)
-- **Usage Insights:** Support writing events to Grafana's log. (Enterprise)
 - **Value mappings:** Add regular-expression based value mapping. [#38931](https://github.com/grafana/grafana/pull/38931), [@mcdee](https://github.com/mcdee)
 - **Zipkin:** Add ability to upload trace JSON. [#37483](https://github.com/grafana/grafana/pull/37483), [@zoltanbedi](https://github.com/zoltanbedi)
 
@@ -241,11 +207,6 @@ The mandatory `css` prop in `grafana/ui` components has been removed.
 Previous versions of `grafana/ui` components were typed incorrectly due to a dependency mismatch between emotion 10 and 11 causing a `css` prop to be added to components that extended react types.
 Issue [#38078](https://github.com/grafana/grafana/issues/38078)
 
-### Unified Alerting (Grafana 8 Alerting) data loss
-
-Grafana v8.2 fixed an issue with org isolation for notification configuration but to fix this Grafana will now re-run the migration from old alerting and this will cause complete removal of all new alert rules and notification configurations. This data loss is not something we find acceptable and are working on ways to mitigate it. So in the meantime, if you are an early adopter of unified alerting please wait with trying v8.2 beta.
-Issue [#37414](https://github.com/grafana/grafana/issues/37414)
-
 Panel queries and/or annotation queries that used more than one statistic will be converted into one query/annotation per statistic. In case an alerting rule was based on a query row that had more than one statistic, it would now be based only on the first statistic for that query row. New alerting rules will not be created for migrated queries. Please note that in most cases it would not make sense to have an alerting rule that is based on multiple statistics anyway. Issue [#36925](https://github.com/grafana/grafana/issues/36925)
 
 ### Deprecations
@@ -377,7 +338,7 @@ Panel queries and/or annotation queries that used more than one statistic will b
 ### Bug fixes
 
 - **CloudWatch Logs:** Fix crash when no region is selected. [#37639](https://github.com/grafana/grafana/pull/37639), [@aocenas](https://github.com/aocenas)
-- **Reporting:** Fix timezone parsing for scheduler. (Enterprise)
+- **Reporting:** Fix timezone parsing for scheduler (enterprise)
 
 <!-- 8.1.1 END -->
 <!-- 8.1.0 START -->
@@ -388,9 +349,7 @@ Panel queries and/or annotation queries that used more than one statistic will b
 
 - **Alerting:** Deduplicate receivers during migration. [#36812](https://github.com/grafana/grafana/pull/36812), [@codesome](https://github.com/codesome)
 - **ColorPicker:** Display colors as RGBA. [#37231](https://github.com/grafana/grafana/pull/37231), [@nikki-kiga](https://github.com/nikki-kiga)
-- **Encryption:** Add support for multiple encryption algorithms (aes-gcm). (Enterprise)
 - **Select:** Make portalling the menu opt-in, but opt-in _everywhere_. [#37501](https://github.com/grafana/grafana/pull/37501), [@ashharrison90](https://github.com/ashharrison90)
-- **TeamSync:** Batch team synchronization. (Enterprise)
 - **TimeRangePicker:** Improve accessibility. [#36912](https://github.com/grafana/grafana/pull/36912), [@tskarhed](https://github.com/tskarhed)
 
 ### Bug fixes
@@ -490,8 +449,6 @@ Panel queries and/or annotation queries that used more than one statistic will b
 - **Prometheus:** Update PromQL typeahead and highlighting. [#36730](https://github.com/grafana/grafana/pull/36730), [@ekpdt](https://github.com/ekpdt)
 - **Prometheus:** interpolate variable for step field. [#36437](https://github.com/grafana/grafana/pull/36437), [@zoltanbedi](https://github.com/zoltanbedi)
 - **Provisioning:** Improve validation by validating across all dashboard providers. [#26742](https://github.com/grafana/grafana/pull/26742), [@nabokihms](https://github.com/nabokihms)
-- **Query cache:** Adding an encryption option for caching. (Enterprise)
-- **Reporting:** Use start and end dates for scheduling. (Enterprise)
 - **SQL Datasources:** Allow multiple string/labels columns with time series. [#36485](https://github.com/grafana/grafana/pull/36485), [@kylebrandt](https://github.com/kylebrandt)
 - **Select:** Portal select menu to document.body. [#36398](https://github.com/grafana/grafana/pull/36398), [@ashharrison90](https://github.com/ashharrison90)
 - **Team Sync:** Add group mapping to support team sync in the Generic OAuth provider. [#36307](https://github.com/grafana/grafana/pull/36307), [@wardbekker](https://github.com/wardbekker)
@@ -727,7 +684,7 @@ The following endpoints were deprecated for Grafana v5.0 and support for them ha
 - **AzureMonitor:** Support querying subscriptions and resource groups in Azure Monitor Logs. [#34766](https://github.com/grafana/grafana/pull/34766), [@joshhunt](https://github.com/joshhunt)
 - **AzureMonitor:** remove requirement for default subscription. [#34787](https://github.com/grafana/grafana/pull/34787), [@kostrse](https://github.com/kostrse)
 - **CloudWatch:** Add Lambda@Edge Amazon CloudFront metrics. [#34561](https://github.com/grafana/grafana/pull/34561), [@razor-x](https://github.com/razor-x)
-- **CloudWatch:** Add missing AWS AppSync metrics. [#34691](https://github.com/grafana/grafana/pull/34691), [@razor-x](https://github.com/razor-x)
+- **CloudWatch:** Add missing AWS and AppSync metrics. [#34691](https://github.com/grafana/grafana/pull/34691), [@razor-x](https://github.com/razor-x)
 - **ConfirmModal:** Auto focus delete button. [#34917](https://github.com/grafana/grafana/pull/34917), [@torkelo](https://github.com/torkelo)
 - **Explore:** Add caching for queries that are run from logs navigation. [#34297](https://github.com/grafana/grafana/pull/34297), [@ivanahuckova](https://github.com/ivanahuckova)
 - **Loki:** Add formatting for annotations. [#34774](https://github.com/grafana/grafana/pull/34774), [@fredr](https://github.com/fredr)
@@ -736,8 +693,6 @@ The following endpoints were deprecated for Grafana v5.0 and support for them ha
 - **Overrides:** Include a manual override option to hide something from visualization. [#34783](https://github.com/grafana/grafana/pull/34783), [@torkelo](https://github.com/torkelo)
 - **PieChart:** Support row data in pie charts. [#34755](https://github.com/grafana/grafana/pull/34755), [@torkelo](https://github.com/torkelo)
 - **Prometheus:** Update default HTTP method to POST for existing data sources. [#34599](https://github.com/grafana/grafana/pull/34599), [@ivanahuckova](https://github.com/ivanahuckova)
-- **Reporting:** Enable generating PDF for anonymous users. (Enterprise)
-- **SAML:** Make private key and certificate optional. (Enterprise)
 - **Time series panel:** Position tooltip correctly when window is scrolled or resized. [#34782](https://github.com/grafana/grafana/pull/34782), [@dprokop](https://github.com/dprokop)
 
 ### Bug fixes
@@ -1065,17 +1020,16 @@ Issue [#33352](https://github.com/grafana/grafana/issues/33352)
 
 ### Features and enhancements
 
-- **Auditing:** Use nanosecond resolution for audit log timestamps. (Enterprise)
-- **AzureMonitor:** Add support for Microsoft.AppConfiguration/configurationStores namespace. [#32123](https://github.com/grafana/grafana/pull/32123), [@deesejohn](https://github.com/deesejohn)
-- **TablePanel:** Make sorting case-insensitive. [#32435](https://github.com/grafana/grafana/pull/32435), [@kaydelaney](https://github.com/kaydelaney)
+- **AzureMonitor**: Add support for Microsoft.AppConfiguration/configurationStores namespace. [#32123](https://github.com/grafana/grafana/pull/32123), [@deesejohn](https://github.com/deesejohn)
+- **TablePanel**: Make sorting case-insensitive. [#32435](https://github.com/grafana/grafana/pull/32435), [@kaydelaney](https://github.com/kaydelaney)
 
 ### Bug fixes
 
-- **AzureMonitor:** Add support for Virtual WAN namespaces. [#32935](https://github.com/grafana/grafana/pull/32935), [@joshhunt](https://github.com/joshhunt)
-- **Bugfix:** Add proper padding when scrolling is added to bar gauge. [#32411](https://github.com/grafana/grafana/pull/32411), [@mckn](https://github.com/mckn)
-- **Datasource:** Prevent default data source named "default" from causing infinite loop. [#32949](https://github.com/grafana/grafana/pull/32949), [@jackw](https://github.com/jackw)
-- **Prometheus:** Allow exemplars endpoint in data source proxy. [#32802](https://github.com/grafana/grafana/pull/32802), [@zoltanbedi](https://github.com/zoltanbedi)
-- **Table:** Fix table data links so they refer to correct row after sorting. [#32571](https://github.com/grafana/grafana/pull/32571), [@torkelo](https://github.com/torkelo)
+- **AzureMonitor**: Add support for Virtual WAN namespaces. [#32935](https://github.com/grafana/grafana/pull/32935), [@joshhunt](https://github.com/joshhunt)
+- **Bugfix**: Add proper padding when scrolling is added to bar gauge. [#32411](https://github.com/grafana/grafana/pull/32411), [@mckn](https://github.com/mckn)
+- **Datasource**: Prevent default data source named "default" from causing infinite loop. [#32949](https://github.com/grafana/grafana/pull/32949), [@jackw](https://github.com/jackw)
+- **Prometheus**: Allow query_exemplars endpoint in data source proxy. [#32802](https://github.com/grafana/grafana/pull/32802), [@zoltanbedi](https://github.com/zoltanbedi)
+- **Table**: Fix table data links so they refer to correct row after sorting. [#32571](https://github.com/grafana/grafana/pull/32571), [@torkelo](https://github.com/torkelo)
 
 <!-- 7.5.4 END -->
 

CHANGELOG_ARCHIVE.md

@@ -1,3 +1,4 @@
+
 # 5.4.5 (2019-08-29)
 
 - **Security**: Urgent security patch release. Please read more in our [blog](https://grafana.com/blog/2019/08/29/grafana-5.4.5-and-6.3.4-released-with-important-security-fix/)
@@ -179,7 +180,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-3-3-and-4-
 - **Alerting**: Link to view full size image in Microsoft Teams alert notifier [#13121](https://github.com/grafana/grafana/issues/13121), thx [@holiiveira](https://github.com/holiiveira)
 - **Alerting**: Fixes a bug where all alerts would send reminders after upgrade & restart [#13402](https://github.com/grafana/grafana/pull/13402)
 - **Alerting**: Concurrent render limit for graphs used in notifications [#13401](https://github.com/grafana/grafana/pull/13401)
-- **Postgres/MySQL/MSSQL**: Add support for replacing $\_\_interval and $\_\_interval_ms in alert queries [#11555](https://github.com/grafana/grafana/issues/11555), thx [@svenklemm](https://github.com/svenklemm)
+- **Postgres/MySQL/MSSQL**: Add support for replacing $__interval and  $\_\_interval_ms in alert queries [#11555](https://github.com/grafana/grafana/issues/11555), thx [@svenklemm](https://github.com/svenklemm)
 
 # 5.3.0-beta1 (2018-09-06)
 
@@ -213,18 +214,18 @@ See [security announcement](https://community.grafana.com/t/grafana-5-3-3-and-4-
 - **OAuth**: Fix overriding tls_skip_verify_insecure using environment variable [#12747](https://github.com/grafana/grafana/issues/12747), thx [@jangaraj](https://github.com/jangaraj)
 - **Prometheus**: Fix graph panel bar width issue in aligned prometheus queries [#12379](https://github.com/grafana/grafana/issues/12379)
 - **Prometheus**: Heatmap - fix unhandled error when some points are missing [#12484](https://github.com/grafana/grafana/issues/12484)
-- **Prometheus**: Add $**interval, $**interval_ms, \$**range, $**range_s & $\_\_range_ms support for dashboard and template queries [#12597](https://github.com/grafana/grafana/issues/12597) [#12882](https://github.com/grafana/grafana/issues/12882), thx [@roidelapluie](https://github.com/roidelapluie)
+- **Prometheus**: Add $__interval, $**interval_ms, \$**range, $__range_s & $\_\_range_ms support for dashboard and template queries [#12597](https://github.com/grafana/grafana/issues/12597) [#12882](https://github.com/grafana/grafana/issues/12882), thx [@roidelapluie](https://github.com/roidelapluie)
 - **Elasticsearch**: For alerting/backend, support having index name to the right of pattern in index pattern [#12731](https://github.com/grafana/grafana/issues/12731)
 - **Graphite**: Fix for quoting of int function parameters (when using variables) [#11927](https://github.com/grafana/grafana/pull/11927)
 - **InfluxDB**: Support timeFilter in query templating for InfluxDB [#12598](https://github.com/grafana/grafana/pull/12598), thx [kichristensen](https://github.com/kichristensen)
-- **Postgres/MySQL/MSSQL**: New $\_\_unixEpochGroup and $\_\_unixEpochGroupAlias macros [#12892](https://github.com/grafana/grafana/issues/12892), thx [@svenklemm](https://github.com/svenklemm)
+- **Postgres/MySQL/MSSQL**: New $__unixEpochGroup and $\_\_unixEpochGroupAlias macros [#12892](https://github.com/grafana/grafana/issues/12892), thx [@svenklemm](https://github.com/svenklemm)
 - **Postgres/MySQL/MSSQL**: Add previous fill mode to \$\_\_timeGroup macro which will fill in previously seen value when point is missing [#12756](https://github.com/grafana/grafana/issues/12756), thx [@svenklemm](https://github.com/svenklemm)
 - **Postgres/MySQL/MSSQL**: Use floor rounding in \$\_\_timeGroup macro function [#12460](https://github.com/grafana/grafana/issues/12460), thx [@svenklemm](https://github.com/svenklemm)
 - **Postgres/MySQL/MSSQL**: Use metric column as prefix when returning multiple value columns [#12727](https://github.com/grafana/grafana/issues/12727), thx [@svenklemm](https://github.com/svenklemm)
-- **Postgres/MySQL/MSSQL**: New $\_\_timeGroupAlias macro. Postgres $\_\_timeGroup no longer automatically adds time column alias [#12749](https://github.com/grafana/grafana/issues/12749), thx [@svenklemm](https://github.com/svenklemm)
+- **Postgres/MySQL/MSSQL**: New $__timeGroupAlias macro. Postgres $\_\_timeGroup no longer automatically adds time column alias [#12749](https://github.com/grafana/grafana/issues/12749), thx [@svenklemm](https://github.com/svenklemm)
 - **Postgres/MySQL/MSSQL**: Escape single quotes in variables [#12785](https://github.com/grafana/grafana/issues/12785), thx [@eMerzh](https://github.com/eMerzh)
 - **Postgres/MySQL/MSSQL**: Min time interval support [#13157](https://github.com/grafana/grafana/issues/13157), thx [@svenklemm](https://github.com/svenklemm)
-- **MySQL/MSSQL**: Use datetime format instead of epoch for $\_\_timeFilter, $**timeFrom and \$**timeTo macros [#11618](https://github.com/grafana/grafana/issues/11618) [#11619](https://github.com/grafana/grafana/issues/11619), thx [@AustinWinstanley](https://github.com/AustinWinstanley)
+- **MySQL/MSSQL**: Use datetime format instead of epoch for $__timeFilter, $**timeFrom and \$**timeTo macros [#11618](https://github.com/grafana/grafana/issues/11618) [#11619](https://github.com/grafana/grafana/issues/11619), thx [@AustinWinstanley](https://github.com/AustinWinstanley)
 - **Postgres**: Escape ssl mode parameter in connectionstring [#12644](https://github.com/grafana/grafana/issues/12644), thx [@yogyrahmawan](https://github.com/yogyrahmawan)
 - **Cloudwatch**: Improved error handling [#12489](https://github.com/grafana/grafana/issues/12489), thx [@mtanda](https://github.com/mtanda)
 - **Cloudwatch**: AppSync metrics and dimensions [#12300](https://github.com/grafana/grafana/issues/12300), thx [@franciscocpg](https://github.com/franciscocpg)
@@ -1018,7 +1019,7 @@ Pull Request: [#8472](https://github.com/grafana/grafana/pull/8472)
 ## Enhancements
 
 - **Telegram**: Added Telegram alert notifier [#7098](https://github.com/grafana/grafana/pull/7098), thx [@leonoff](https://github.com/leonoff)
-- **Templating**: Make $\_\_interval and $\_\_interval_ms global built in variables that can be used in by any data source (in panel queries), closes [#7190](https://github.com/grafana/grafana/issues/7190), closes [#6582](https://github.com/grafana/grafana/issues/6582)
+- **Templating**: Make $__interval and $\_\_interval_ms global built in variables that can be used in by any data source (in panel queries), closes [#7190](https://github.com/grafana/grafana/issues/7190), closes [#6582](https://github.com/grafana/grafana/issues/6582)
 - **S3 Image Store**: External s3 image store (used in alert notifications) now support AWS IAM Roles, closes [#6985](https://github.com/grafana/grafana/issues/6985), [#7058](https://github.com/grafana/grafana/issues/7058) thx [@mtanda](https://github.com/mtanda)
 - **SingleStat**: Implements diff aggregation method for singlestat [#7234](https://github.com/grafana/grafana/issues/7234), thx [@oliverpool](https://github.com/oliverpool)
 - **Dataproxy**: Added setting to enable more verbose logging in dataproxy [#7209](https://github.com/grafana/grafana/pull/7209), thx [@Ricky-N](https://github.com/Ricky-N)

Dockerfile

@@ -1,15 +1,12 @@
 FROM node:16-alpine3.14 as js-builder
 
-ENV NODE_OPTIONS=--max_old_space_size=8000
+WORKDIR /usr/src/app/
 
-WORKDIR /grafana
-
-COPY package.json yarn.lock .yarnrc.yml ./
-COPY .yarn .yarn
+COPY package.json yarn.lock ./
 COPY packages packages
-COPY plugins-bundled plugins-bundled
 
-RUN yarn install
+RUN apk --no-cache add git
+RUN yarn install --pure-lockfile --no-progress
 
 COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./
 COPY public public
@@ -22,22 +19,20 @@ RUN yarn build
 
 FROM golang:1.17.0-alpine3.14 as go-builder
 
-RUN apk add --no-cache gcc g++ make
+RUN apk add --no-cache gcc g++
 
-WORKDIR /grafana
+WORKDIR $GOPATH/src/github.com/grafana/grafana
 
-COPY go.mod go.sum embed.go Makefile build.go package.json ./
-COPY ./local/* ./local/
+COPY go.mod go.sum embed.go ./
 COPY cue cue
+COPY cue.mod cue.mod
 COPY packages/grafana-schema packages/grafana-schema
 COPY public/app/plugins public/app/plugins
 COPY pkg pkg
-COPY scripts scripts
-COPY cue.mod cue.mod
-COPY .bingo .bingo
+COPY build.go package.json ./
 
 RUN go mod verify
-RUN make build-go
+RUN go run build.go build
 
 # Final stage
 FROM alpine:3.14.2
@@ -48,45 +43,43 @@ ARG GF_UID="472"
 ARG GF_GID="0"
 
 ENV PATH="/usr/share/grafana/bin:$PATH" \
-  GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
-  GF_PATHS_DATA="/var/lib/grafana" \
-  GF_PATHS_HOME="/usr/share/grafana" \
-  GF_PATHS_LOGS="/var/log/grafana" \
-  GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
-  GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
+    GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
+    GF_PATHS_DATA="/var/lib/grafana" \
+    GF_PATHS_HOME="/usr/share/grafana" \
+    GF_PATHS_LOGS="/var/log/grafana" \
+    GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
+    GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
 
 WORKDIR $GF_PATHS_HOME
 
-RUN apk add --no-cache ca-certificates bash tzdata musl-utils
-RUN apk add --no-cache openssl ncurses-libs ncurses-terminfo-base --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
-RUN apk upgrade ncurses-libs ncurses-terminfo-base --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
-RUN apk info -vv | sort
+RUN apk add --no-cache ca-certificates bash tzdata && \
+    apk add --no-cache openssl musl-utils
 
 COPY conf ./conf
 
 RUN if [ ! $(getent group "$GF_GID") ]; then \
-  addgroup -S -g $GF_GID grafana; \
-  fi
+      addgroup -S -g $GF_GID grafana; \
+    fi
 
 RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \
-  mkdir -p "$GF_PATHS_HOME/.aws" && \
-  adduser -S -u $GF_UID -G "$GF_GID_NAME" grafana && \
-  mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
-  "$GF_PATHS_PROVISIONING/dashboards" \
-  "$GF_PATHS_PROVISIONING/notifiers" \
-  "$GF_PATHS_PROVISIONING/plugins" \
-  "$GF_PATHS_PROVISIONING/access-control" \
-  "$GF_PATHS_LOGS" \
-  "$GF_PATHS_PLUGINS" \
-  "$GF_PATHS_DATA" && \
-  cp "$GF_PATHS_HOME/conf/sample.ini" "$GF_PATHS_CONFIG" && \
-  cp "$GF_PATHS_HOME/conf/ldap.toml" /etc/grafana/ldap.toml && \
-  chown -R "grafana:$GF_GID_NAME" "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
-  chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
+    mkdir -p "$GF_PATHS_HOME/.aws" && \
+    adduser -S -u $GF_UID -G "$GF_GID_NAME" grafana && \
+    mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
+             "$GF_PATHS_PROVISIONING/dashboards" \
+             "$GF_PATHS_PROVISIONING/notifiers" \
+             "$GF_PATHS_PROVISIONING/plugins" \
+             "$GF_PATHS_PROVISIONING/access-control" \
+             "$GF_PATHS_LOGS" \
+             "$GF_PATHS_PLUGINS" \
+             "$GF_PATHS_DATA" && \
+    cp "$GF_PATHS_HOME/conf/sample.ini" "$GF_PATHS_CONFIG" && \
+    cp "$GF_PATHS_HOME/conf/ldap.toml" /etc/grafana/ldap.toml && \
+    chown -R "grafana:$GF_GID_NAME" "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
+    chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
 
-COPY --from=go-builder /grafana/bin/*/grafana-server /grafana/bin/*/grafana-cli ./bin/
-COPY --from=js-builder /grafana/public ./public
-COPY --from=js-builder /grafana/tools ./tools
+COPY --from=go-builder /go/src/github.com/grafana/grafana/bin/*/grafana-server /go/src/github.com/grafana/grafana/bin/*/grafana-cli ./bin/
+COPY --from=js-builder /usr/src/app/public ./public
+COPY --from=js-builder /usr/src/app/tools ./tools
 
 EXPOSE 3000
 

Dockerfile.ubuntu

@@ -1,16 +1,12 @@
-FROM node:16-alpine3.14 as js-builder
-
-ENV NODE_OPTIONS=--max_old_space_size=8000
+FROM node:14.15.1-slim AS js-builder
 
 WORKDIR /usr/src/app/
 
 COPY package.json yarn.lock ./
 COPY packages packages
-COPY .yarnrc.yml ./
-COPY .yarn .yarn
-COPY plugins-bundled plugins-bundled
 
-RUN yarn install
+RUN apt-get update && apt-get install -yq git
+RUN yarn install --pure-lockfile
 
 COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./
 COPY public public
@@ -26,8 +22,7 @@ FROM golang:1.17.0 AS go-builder
 WORKDIR /src/grafana
 
 COPY go.mod go.sum embed.go ./
-COPY Makefile build.go package.json ./
-COPY .bingo .bingo
+COPY build.go package.json ./
 COPY pkg pkg/
 COPY cue cue/
 COPY cue.mod cue.mod/
@@ -35,7 +30,7 @@ COPY packages/grafana-schema packages/grafana-schema/
 COPY public/app/plugins public/app/plugins/
 
 RUN go mod verify
-RUN make build-go
+RUN go run build.go build
 
 FROM ubuntu:20.04
 

ISSUE_TRIAGE.md

@@ -4,7 +4,7 @@ The main goal of issue triage is to categorize all incoming Grafana issues and m
 
 > **Note:** This information is for Grafana project Maintainers, Owners, and Admins. If you are a Contributor, then you will not be able to perform most of the tasks in this topic.
 
-The core maintainers of the Grafana project are responsible for categorizing all incoming issues and delegating any critical or important issue to other maintainers. Currently one maintainer each week is responsible. Besides that part, triage provides an important way to contribute to an open source project.
+The core maintainers of the Grafana project are responsible for categorizing all incoming issues and delegating any critical or important issue to other maintainers. Currently one maintainer each week is responsible. Besides that part, triage provides an important way to contribute to an open source project. 
 
 Triage helps ensure issues resolve quickly by:
 
@@ -18,7 +18,6 @@ If you don't have the knowledge or time to code, consider helping with triage. T
 ## Simplified flowchart diagram of the issue triage process
 
 <!-- https://textik.com/#610afa78553def29 -->
-
 ```
                         +--------------------------+
        +----------------+  New issue opened/       |
@@ -77,16 +76,15 @@ Instructions for setting up filters in Gmail can be found [here](#setting-up-gma
 
 ## 2. Ensure the issue contains basic information
 
-Before triaging an issue very far, make sure that the issue's author provided the standard issue information. This will help you make an educated recommendation on how to categorize the issue. The Grafana project utilizes [GitHub issue templates](https://help.github.com/en/articles/creating-issue-templates-for-your-repository) to guide contributors to provide standard information that must be included for each type of template or type of issue.
+Before triaging an issue very far, make sure that the issue's author provided the standard issue information. This will help you make an educated recommendation on how to categorize the issue. The Grafana project utilizes [GitHub issue templates](https://help.github.com/en/articles/creating-issue-templates-for-your-repository) to guide  contributors to provide standard information that must be included for each type of template or type of issue.
 
 ### Standard issue information that must be included
 
-Given a certain [issue template](<[template](https://github.com/grafana/grafana/issues/new/choose)>) have been used by the issue author or depending how the issue is perceived by the issue triage responsible, the following should help you understand what standard issue information that must be included.
+Given a certain [issue template]([template](https://github.com/grafana/grafana/issues/new/choose)) have been used by the issue author or depending how the issue is perceived by the issue triage responsible, the following should help you understand what standard issue information that must be included.
 
 #### Bug reports
 
 Should explain what happened, what was expected and how to reproduce it together with any additional information that may help giving a complete picture of what happened such as screenshots, [query inspector](https://community.grafana.com/t/using-grafanas-query-inspector-to-troubleshoot-issues/2630) output and any environment related information that's applicable and/or maybe related to the reported problem:
-
 - Grafana version
 - Data source type & version
 - Platform & OS Grafana is installed on
@@ -172,12 +170,10 @@ If it's not perfectly clear that it's an actual bug, quickly try to reproduce it
 4. Move on to [prioritizing the issue](#4-prioritization-of-issues).
 
 **It can't be reproduced:**
-
 1. Either [ask for more information](#2-ensure-the-issue-contains-basic-information) needed to investigate it more thoroughly.
 2. Either [delegate further investigations](#investigation-of-issues) to someone else.
 
 **It works as intended/by design:**
-
 1. Kindly and politely add a comment explaining briefly why we think it works as intended and close the issue.
 2. Label the issue `type/works-as-intended`.
 
@@ -199,7 +195,6 @@ Second, label the issue `type/docs` and at least one `area/*` or `datasource/*`
 **Minor typo/error/lack of information:**
 
 There's a minor typo/error/lack of information that adds a lot of confusion for users and given the amount of work is a big win to make sure fixing it:
-
 1. Either update the documentation yourself and open a pull request.
 2. Either delegate the work to someone else by assigning that person to the issue and add the issue to next major/minor milestone.
 
@@ -304,12 +299,12 @@ For some other combinations it may not be possible at all for a maintainer to se
 
 Even if you don't have the time or knowledge to investigate an issue we highly recommend that you [upvote](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments) the issue if you happen to have the same problem. If you have further details that may help investigating the issue please provide as much information as possible.
 
-## Automation
+## Automation 
 
 We have some automation that triggers on comments or labels being added to issues. Many of these automated behaviors are defined in [commands.json](https://github.com/grafana/grafana/blob/main/.github/commands.json). Or in other [GitHub Actions](https://github.com/grafana/grafana/tree/main/.github/workflows)
 
-- Add /duplicate `#<issue number>` to have Grafana label & close issue with an appropriate message.
-- Add `bot/question` and the bot will close it with an appropriate message.
+* Add /duplicate `#<issue number>`  to have Grafana label & close issue with an appropriate message. 
+* Add `bot/question` and the bot will close it with an appropriate message. 
 
 [Read more on bot actions](https://github.com/grafana/grafana/blob/main/.github/bot.md)
 
@@ -329,7 +324,6 @@ Part of issue triage should also be triaging of external PRs. Main goal should b
 If you're using Gmail it's highly recommended that you setup filters to automatically remove email from the inbox and label them accordingly to make it easy for you to understand when you need to act upon a notification or process all incoming issues that haven't been triaged.
 
 This may be setup by personal preference, but here's a working configuration for reference.
-
 1. Follow instructions in [gist](https://gist.github.com/marefr/9167c2e31466f6316c1cba118874e74f)
 2. In Gmail, go to Settings -> Filters and Blocked Addresses
 3. Import filters -> select xml file -> Open file
@@ -338,7 +332,6 @@ This may be setup by personal preference, but here's a working configuration for
 6. Create filters
 
 This will give you a structure of labels in the sidebar similar to the following:
-
 ```
  - Inbox
  ...

Makefile

@@ -7,7 +7,7 @@ WIRE_TAGS = "oss"
 -include local/Makefile
 include .bingo/Variables.mk
 
-.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go golangci-lint test-go test-js gen-ts test run run-frontend clean devenv devenv-down protobuf drone help
+.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go golangci-lint test-go test-js test run run-frontend clean devenv devenv-down protobuf drone help
 
 GO = go
 GO_FILES ?= ./pkg/...
@@ -26,13 +26,13 @@ deps: deps-js ## Install all dependencies.
 
 node_modules: package.json yarn.lock ## Install node modules.
 	@echo "install frontend dependencies"
-	YARN_ENABLE_PROGRESS_BARS=false yarn install --immutable
+	yarn install --pure-lockfile --no-progress
 
 ##@ Building
 
 gen-go: $(WIRE)
 	@echo "generate go files"
-	$(WIRE) gen -tags $(WIRE_TAGS) ./pkg/server ./pkg/cmd/grafana-cli/runner
+	$(WIRE) gen -tags $(WIRE_TAGS) ./pkg/server
 
 build-go: gen-go ## Build all Go binaries.
 	@echo "build go files"
@@ -86,7 +86,7 @@ golangci-lint: scripts/go/bin/golangci-lint
 		--config ./scripts/go/configs/.golangci.toml \
 		$(GO_FILES)
 
-lint-go: golangci-lint ## Run all code checks for backend. You can use GO_FILES to specify exact files to check
+lint-go: golangci-lint # Run all code checks for backend.
 
 # with disabled SC1071 we are ignored some TCL,Expect `/usr/bin/env expect` scripts
 shellcheck: $(SH_FILES) ## Run checks for shell scripts.
@@ -147,19 +147,13 @@ clean: ## Clean up intermediate build artifacts.
 	rm -rf node_modules
 	rm -rf public/build
 
-gen-ts:
-	@echo "generating TypeScript definitions"
-	go get github.com/tkrajina/typescriptify-golang-structs/typescriptify@v0.1.7
-	tscriptify -interface -package=github.com/grafana/grafana/pkg/services/live/pipeline -import="import { FieldConfig } from '@grafana/data'" -target=public/app/features/live/pipeline/models.gen.ts pkg/services/live/pipeline/config.go
-	go mod tidy
-
 # This repository's configuration is protected (https://readme.drone.io/signature/).
 # Use this make target to regenerate the configuration YAML files when
 # you modify starlark files.
-drone: $(DRONE)
-	$(DRONE) starlark --format
-	$(DRONE) lint .drone.yml
-	$(DRONE) --server https://drone.grafana.net sign --save grafana/grafana
+drone:
+	drone starlark
+	drone lint
+	drone --server https://drone.grafana.net sign --save grafana/grafana
 
 help: ## Display this help.
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)

NOTICE.md

@@ -1,4 +1,6 @@
+
 Copyright 2014-2021 Grafana Labs
 
-This software is based on Kibana:
+This software is based on Kibana: 
 Copyright 2012-2013 Elasticsearch BV
+

PLUGIN_DEV.md

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

README.md

@@ -30,8 +30,8 @@ The Grafana documentation is available at [grafana.com/docs](https://grafana.com
 
 If you're interested in contributing to the Grafana project:
 
-- Start by reading the [Contributing guide](https://github.com/grafana/grafana/blob/HEAD/CONTRIBUTING.md).
-- Learn how to set up your local environment, in our [Developer guide](https://github.com/grafana/grafana/blob/HEAD/contribute/developer-guide.md).
+- Start by reading the [Contributing guide](/CONTRIBUTING.md).
+- Learn how to set up your local environment, in our [Developer guide](/contribute/developer-guide.md).
 - Explore our [beginner-friendly issues](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22).
 - Look through our [style guide and Storybook](https://developers.grafana.com/ui/latest/index.html).
 
@@ -40,8 +40,8 @@ If you're interested in contributing to the Grafana project:
 - Follow [@grafana on Twitter](https://twitter.com/grafana/).
 - Read and subscribe to the [Grafana blog](https://grafana.com/blog/).
 - If you have a specific question, check out our [discussion forums](https://community.grafana.com/).
-- For general discussions, join us on the [official Slack](https://slack.grafana.com) team.
+- For general discussions, join us on the [official Slack](http://slack.raintank.io/) team.
 
 ## License
 
-Grafana is distributed under [AGPL-3.0-only](LICENSE). For Apache-2.0 exceptions, see [LICENSING.md](https://github.com/grafana/grafana/blob/HEAD/LICENSING.md).
+Grafana is distributed under [AGPL-3.0-only](LICENSE). For Apache-2.0 exceptions, see [LICENSING.md](LICENSING.md).

ROADMAP.md

@@ -1,5 +1,5 @@
 # Roadmap
 
-The roadmap is a tentative plan for the core development team. Things change constantly as pull requests come in and priorities change, but it will give you an idea of our current vision and plan.
-
+The roadmap is a tentative plan for the core development team. Things change constantly as pull requests come in and priorities change, but it will give you an idea of our current vision and plan. 
+  
 To view the Roadmap, go to the Issues tab on GitHub. There you will find three roadmap issues pinned at the top.

SECURITY.md

@@ -1,10 +1,10 @@
 # Reporting security issues
 
-If you think you have found a security vulnerability, please send a report to [security@grafana.com](mailto:security@grafana.com). This address can be used for all of Grafana Labs's open source and commercial products (including but not limited to Grafana, Grafana Cloud, Grafana Enterprise, and grafana.com). We can accept only vulnerability reports at this address.
+If you think you have found a security vulnerability, please send a report to [security@grafana.com](mailto:security@grafana.com). This address can be used for all of Grafana Labs's open source and commercial products (including but not limited to Grafana, Grafana Cloud, Grafana Enterprise, and grafana.com). We can accept only vulnerability reports at this address. 
 
 Please encrypt your message to us; please use our PGP key. The key fingerprint is:
 
-F988 7BEA 027A 049F AE8E 5CAA D125 8932 BE24 C5CA
+F988 7BEA 027A 049F AE8E  5CAA D125 8932 BE24 C5CA
 
 The key is available from [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=0xF9887BEA027A049FAE8E5CAAD1258932BE24C5CA&fingerprint=on&op=index).
 
@@ -15,6 +15,6 @@ Grafana Labs will send you a response indicating the next steps in handling your
 ## Security announcements
 
 We maintain a category on the community site called [Security Announcements](https://community.grafana.com/c/security-announcements),
-where we will post a summary, remediation, and mitigation details for any patch containing security fixes.
+where we will post a summary, remediation, and mitigation details for any patch containing security fixes. 
 
 You can also subscribe to email updates to this category if you have a grafana.com account and sign on to the community site or track updates via an [RSS feed](https://community.grafana.com/c/security-announcements.rss).

SUPPORT.md

@@ -1,13 +1,10 @@
 # Get Grafana help
-
----
-
+------------------
 First, check the official [Grafana documentation](https://grafana.com/docs/).
 
 If you require further help or support then ask a question in the [Grafana community site](https://community.grafana.com/) or [Grafana Slack](http://slack.raintank.io/). You can also search the community site for previously answered questions, in case someone already had your problem and got help.
 
-**Please note:**
-
+ **Please note:**
 - The Grafana project uses GitHub mainly for tracking bugs and feature requests.
 - Do not open an issue just to ask a question. The issue will be closed immediately.
 - Only submit issues for bug reports, feature requests, or enhancements.

WORKFLOW.md

@@ -13,7 +13,6 @@ Team members and their access to repositories is maintained through [GitHub team
 ## Proposing changes
 
 Examples of proposed changes are overarching architecture, component design, and specific code or graphical elements. Proposed changes SHOULD cover the big picture and intention, but individual parts SHOULD be split into the smallest possible changes. Changes SHOULD be based on and target the main branch. Depending on size of the proposed change, each change SHOULD be discussed, in increasing order of change size and complexity:
-
 - Directly in a RR (Pull Request) - this MAY be done, but SHOULD not be the common case.
 - Issue
 - Developer mailing list
@@ -25,7 +24,6 @@ Significant changes MUST be discussed and agreed upon with the relevant subsyste
 
 Depending on the size and complexity of a PR, different requirements MUST be applied. Any team member contributing substantially to a PR MUST NOT count against review requirements.
 Commits MUST be merged into main using PRs. They MUST NOT be merged into main directly.
-
 - Every merge MUST be approved by at least one team member.
 - Non-trivial changes MUST be approved by at least
   - two team members, or
@@ -35,7 +33,6 @@ Commits MUST be merged into main using PRs. They MUST NOT be merged into main di
   - the relevant subsystem maintainer.
 
 PRs MUST be [reviewed](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/reviewing-changes-in-pull-requests) and [approved](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/approving-a-pull-request-with-required-reviews) via GitHub’s review system.
-
 - Reviewers MAY write comments if approving
 - Reviewers MUST write comments if rejecting a PR or if requesting changes.
 
@@ -43,9 +40,9 @@ Once a PR is approved as per above, any team member MAY merge the PR.
 
 ## Backporting a PR
 
-PRs intended for inclusion in the next PATCH release they must be backported to the release branch. The bot can do this automatically. [Read more on backport PRs](https://github.com/grafana/grafana/blob/main/.github/bot.md). Both the source PR and the backport PR should be assigned to the patch release milestone, unless you are backporting to many releases then it can differ.
+PRs intended for inclusion in the next PATCH release they must be backported to the release branch. The bot can do this automatically. [Read more on backport PRs](https://github.com/grafana/grafana/blob/main/.github/bot.md). Both the source PR and the backport PR should be assigned to the patch release milestone, unless you are backporting to many releases then it can differ. 
 
-Backport PRs are also needed during the beta period to get fixes into the stable release.
+Backport PRs are also needed during the beta period to get fixes into the stable release. 
 
 # Release workflow
 
@@ -54,7 +51,6 @@ Backport PRs are also needed during the beta period to get fixes into the stable
 Grafana uses trunk-based development.
 
 In particular, we found that the following principles match how we work:
-
 - Main and release branches MUST always build without failure.
 - Branches SHOULD be merged often. Larger changes SHOULD be activated with feature flags until they are ready. Long-lived development branches SHOULD be avoided.
 - Changes MAY be enabled by default once they are in a complete state
@@ -65,7 +61,6 @@ In particular, we found that the following principles match how we work:
 Releases MUST follow [Semantic Versioning](https://semver.org/) in naming and SHOULD follow Semantic Versioning as closely as reasonably possible for non-library software.
 
 Release branches MUST be split from the following branches.
-
 - MAJOR release branches MUST be based on main.
 - MINOR release branches MUST be based on main.
 - PATCH release branches MUST be split from the relevant MINOR release branch’s most current PATCH
@@ -73,7 +68,6 @@ Release branches MUST be split from the following branches.
 Security releases follow the same process but MUST be prepared in secret. Security releases MUST NOT include changes which are not related to the security fix. Normal release processes MUST accommodate the security release process. SECURITY.md MUST be followed.
 
 Releases follow the following cadence
-
 - MAJOR: Yearly
 - MINOR: Every 4-6 weeks
 - PATCH: As needed

conf/defaults.ini

@@ -228,9 +228,6 @@ admin_password = admin
 # used for signing
 secret_key = SW2YcwTIb9zpOOhoPsMm
 
-# key provider used for envelope encryption, default to static value specified by secret_key
-encryption_provider = secretKey
-
 # disable gravatar profile images
 disable_gravatar = false
 
@@ -525,7 +522,6 @@ tls_skip_verify_insecure = false
 tls_client_cert =
 tls_client_key =
 tls_client_ca =
-use_pkce = false
 
 #################################### Basic Auth ##########################
 [auth.basic]
@@ -739,7 +735,7 @@ global_alert_rule = -1
 enabled = false
 
 # Comma-separated list of organization IDs for which to disable unified alerting. Only supported if unified alerting is enabled.
-disabled_orgs =
+disabled_orgs = 
 
 # Specify the frequency of polling for admin config changes.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
@@ -972,8 +968,6 @@ allow_loading_unsigned_plugins =
 plugin_admin_enabled = true
 plugin_admin_external_manage_enabled = false
 plugin_catalog_url = https://grafana.com/grafana/plugins/
-# Enter a comma-separated list of plugin identifiers to hide in the plugin catalog.
-plugin_catalog_hidden_plugins =
 
 #################################### Grafana Live ##########################################
 [live]

conf/sample.ini

@@ -222,9 +222,6 @@
 # used for signing
 ;secret_key = SW2YcwTIb9zpOOhoPsMm
 
-# key provider used for envelope encryption, default to static value specified by secret_key
-;encryption_provider = secretKey
-
 # disable gravatar profile images
 ;disable_gravatar = false
 
@@ -504,7 +501,6 @@
 ;tls_client_cert =
 ;tls_client_key =
 ;tls_client_ca =
-;use_pkce = false
 
 #################################### Basic Auth ##########################
 [auth.basic]
@@ -716,7 +712,7 @@
 ;enabled = false
 
 # Comma-separated list of organization IDs for which to disable unified alerting. Only supported if unified alerting is enabled.
-;disabled_orgs =
+;disabled_orgs = 
 
 # Specify the frequency of polling for admin config changes.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
@@ -945,8 +941,6 @@
 ;plugin_admin_enabled = false
 ;plugin_admin_external_manage_enabled = false
 ;plugin_catalog_url = https://grafana.com/grafana/plugins/
-# Enter a comma-separated list of plugin identifiers to hide in the plugin catalog.
-;plugin_catalog_hidden_plugins =
 
 #################################### Grafana Live ##########################################
 [live]

contribute/architecture/README.md

@@ -4,10 +4,10 @@ Are you looking to take on contributions with bigger impact? These guides help y
 
 Learn more about the backend architecture:
 
-- Part 1: [Services](backend/services.md)
+- Part 1: [Services](backend/services.md) 
 - Part 2: [Communication](backend/communication.md)
 - Part 3: [Database](backend/database.md)
 
 Learn more about the frontend architecture:
-
 - Part 1: [Data requests](frontend-data-requests.md)
+

contribute/architecture/backend/package-hierarchy.md

@@ -1,12 +1,12 @@
 # Package hierarchy
 
 The Go package hierarchy in Grafana should be organized logically (Ben Johnson's
-[article](https://medium.com/@benbjohnson/standard-package-layout-7cdbc8391fc1) served as inspiration), according to the
+[article](https://medium.com/@benbjohnson/standard-package-layout-7cdbc8391fc1) served as inspiration), according to the 
 following principles:
 
-- Domain types and interfaces should be in "root" packages (not necessarily at the very top, of the hierarchy, but
+* Domain types and interfaces should be in "root" packages (not necessarily at the very top, of the hierarchy, but
   logical roots)
-- Sub-packages should depend on roots - sub-packages here typically contain implementations, for example of services
+* Sub-packages should depend on roots - sub-packages here typically contain implementations, for example of services
 
 ## Practical example
 

contribute/architecture/backend/services.md

@@ -121,7 +121,7 @@ You can see an example implementation above of the IsDisabled method and custom
 
 ## Run Wire / generate code
 
-When running `make run` it will call `make gen-go` on the first run. `gen-go` in turn will call the wire binary and generate the code in [wire_gen.go](/pkg/server/wire_gen.go) and [wire_gen.go](/pkg/cmd/grafana-cli/runner/wire_gen.go). The wire binary is installed using [bingo](https://github.com/bwplotka/bingo) which will make sure to download and install all the tools needed, including the Wire binary at using a specific version.
+When running `make run` it will call `make gen-go` on the first run. `gen-go` in turn will call the wire binary and generate the code in [wire_gen.go](/pkg/server/wire_gen.go). The wire binary is installed using [bingo](https://github.com/bwplotka/bingo) which will make sure to download and install all the tools needed, including the Wire binary at using a specific version.
 
 ## OSS vs Enterprise
 

contribute/architecture/frontend-data-requests.md

@@ -3,7 +3,6 @@
 [BackendSrv](https://grafana.com/docs/grafana/latest/packages_api/runtime/backendsrv) handles all outgoing HTTP requests from Grafana. This document explains the high-level concepts used by `BackendSrv`.
 
 ## Canceling requests
-
 This section describes how canceling requests work in Grafana. While data sources can implement their own cancellation concept, we recommend that you use the method we describe here.
 
 A data request can take a long time to finish. During the time between when a request starts and finishes, the user can change context. For example, the user may navigate away or issue the same request again.
@@ -13,35 +12,29 @@ If we wait for canceled requests to complete, it might create unnecessary load o
 Grafana uses a concept called _request cancelation_ to cancel any ongoing request that Grafana doesn't need.
 
 #### Before Grafana 7.2
-
 Before Grafana can cancel any data request, it has to identify that request. Grafana identifies a request using the property `requestId` [passed as options](https://github.com/grafana/grafana/blob/main/docs/sources/packages_api/runtime/backendsrvrequest.md) when you use [BackendSrv](https://grafana.com/docs/grafana/latest/packages_api/runtime/backendsrv).
 
 The cancellation logic is as follows:
-
 - When an ongoing request discovers that an additional request with the same `requestId` has started, then Grafana will cancel the ongoing request.
 - When an ongoing request discovers that the special "cancel all requests" `requestId` was sent, then Grafana will cancel the ongoing request.
 
 #### After Grafana 7.2
-
 Grafana 7.2 introduced an additional way of canceling requests using [RxJs](https://github.com/ReactiveX/rxjs). To support the new cancellation functionality, the data source needs to use the new `fetch` function in [BackendSrv](https://grafana.com/docs/grafana/latest/packages_api/runtime/backendsrv).
 
 Migrating the core data sources to the new `fetch` function [is an ongoing process that you can read about in this issue.](https://github.com/grafana/grafana/issues/27222)
 
 ## Request queue
-
-Depending on how the web browser implements the protocol for HTTP 1.1, it will limit the number of parallel requests, lets call this limit _max_parallel_browser_request_.
+Depending on how the web browser implements the protocol for HTTP 1.1, it will limit the number of parallel requests, lets call this limit _max_parallel_browser_request_. 
 
 Unless you have configured Grafana to use HTTP2, the browser limits parallel data requests according to the browser's implementation. For more information on how to enable HTTP2, refer to [Configuration](https://grafana.com/docs/grafana/latest/administration/configuration/#protocol).
 
 Because there is a _max_parallel_browser_request_ limit, if some of the requests take a long time, they will block later requests and make interacting with Grafana very slow.
 
 #### Before Grafana 7.2
-
-Not supported.
+Not supported. 
 
 #### After Grafana 7.2
-
-Grafana uses a _request queue_ to process all incoming data requests in order while reserving a free "spot" for any requests to the Grafana API.
+Grafana uses a _request queue_ to process all incoming data requests in order while reserving a free "spot" for any requests to the Grafana API. 
 
 Since the first implementation of the request queue doesn't take into account what browser the user uses, the _request queue_ limit for parallel data source requests is hard-coded to 5.
 

contribute/create-pull-request.md

@@ -62,7 +62,7 @@ We use [pa11y-ci](https://github.com/pa11y/pa11y-ci) to collect accessibility er
 If the contribution introduces new a11y errors, our continuous integration will fail, preventing you to merge on the main branch. In those cases there are two alternatives for moving forward:
 
 - Check the error log on the pipeline step `test-a11y-frontend-pr`, identify what was the error, and fix it.
-- Locally run the command `yarn test:accessibility-report` that generates an HTML accessibility report, then go to the URL that contains your change, identify the error, and fix it. Keep in mind, a local e2e Grafana instance is going to be running on `http://localhost:3001`.
+- Locally run the command `yarn test:accessibility-report` that generates an HTML accessibility report, then go to the URL that contains your change, identify the error, and fix it. Keep in mind, a local Grafana instance needs to be running on `http://localhost:3000`.
 
 You can also prevent introducing a11y errors by installing an a11y plugin in your browser, for example, axe DevTools, Accessibility Insights for Web among others.
 
@@ -95,25 +95,25 @@ The area should use upper camel case, e.g. UpperCamelCase.
 
 Prefer using one of the following areas:
 
-- **Build:** Change the build system, or external dependencies
-- **Chore:** Change that don't affect functionality
-- **Dashboard:** Change the Dashboard feature
-- **Docs:** Change documentation
-- **Explore:** Change the Explore feature
-- **Plugins:** Change the ... plugin
+- **Build:** Changes to the build system, or external dependencies.
+- **Chore:** Changes that don't affect functionality.
+- **Dashboard:** Changes to the Dashboard feature.
+- **Docs:** Changes to documentation.
+- **Explore:** Changes to the Explore feature.
+- **Plugins:** Changes to any of the plugins.
 
-For changes to data sources, the area is the name of the data source. For example, AzureMonitor, Graphite, or Prometheus.
+For changes to data sources, the area should be the name of the data source, e.g., AzureMonitor, Graphite, and Prometheus.
 
-For changes to panels, the area is the name of the panel, suffixed with Panel. For example, GraphPanel, SinglestatPanel, or TablePanel.
+For changes to panels, the area should be the name of the panel, suffixed with Panel, e.g., GraphPanel, SinglestatPanel, and TablePanel.
 
 **Examples**
 
 - `Build: Support publishing MSI to grafana.com`
 - `Explore: Add Live option for supported data sources`
 - `GraphPanel: Fix legend sorting issues`
-- `Docs: Change url to URL in all documentation files`
+- `Docs: Changed url to URL in all documentation files`
 
-If you're unsure, see the existing [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md) for inspiration or guidance.
+If you're unsure, please have a look at the existing [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md) for inspiration/guidance.
 
 ### Pull request titles
 

contribute/developer-guide.md

@@ -10,8 +10,14 @@ Make sure you have the following dependencies installed before setting up your d
 
 - [Git](https://git-scm.com/)
 - [Go](https://golang.org/dl/) (see [go.mod](../go.mod#L3) for minimum required version)
-- [Node.js (Long Term Support)](https://nodejs.org)
-- [Yarn](https://yarnpkg.com)
+
+Additionally you'll need:
+
+- [Node.js](https://nodejs.org) (see `volta.node` property in [package.json](../package.json) for the correct version).
+- [Yarn](https://yarnpkg.com) (see `volta.yarn` property in [package.json](../package.json) for the correct version).
+
+We recommend using [Volta](https://github.com/volta-cli/volta) to manage your JS toolchain.
+Refer to the [Volta Getting Started Guide](https://docs.volta.sh/guide/getting-started) for setup instructions for your operating system.
 
 ### macOS
 
@@ -20,8 +26,6 @@ We recommend using [Homebrew](https://brew.sh/) for installing any missing depen
 ```
 brew install git
 brew install go
-brew install node@16
-npm install -g yarn
 ```
 
 ### Windows
@@ -48,7 +52,7 @@ Grafana consists of two components; the _frontend_, and the _backend_.
 Before we can build the frontend assets, we need to install the dependencies:
 
 ```
-yarn install --immutable
+yarn install --pure-lockfile
 ```
 
 After the command has finished, we can start building our source code:
@@ -212,7 +216,7 @@ ulimit -a
 To change the number of open files allowed, run:
 
 ```
-ulimit -S -n 4096
+ulimit -S -n 2048
 ```
 
 The number of files needed may be different on your environment. To determine the number of open files needed by `make run`, run:

contribute/engineering/backend/upgrading-dependencies.md

@@ -17,6 +17,6 @@ mage protobuf
 After upgrading the protobuf dependency in Grafana and the plugin SDK, it might be wise to test that things still work,
 before making corresponding PRs:
 
-- Test a plugin built with upgraded SDK on upgraded Grafana
-- Test a plugin built with non-upgraded SDK on upgraded Grafana
-- Test a plugin built with upgraded SDK on non-upgraded Grafana
+* Test a plugin built with upgraded SDK on upgraded Grafana
+* Test a plugin built with non-upgraded SDK on upgraded Grafana
+* Test a plugin built with upgraded SDK on non-upgraded Grafana

contribute/engineering/terminology.md

@@ -6,12 +6,12 @@ This document defines technical terms used in Grafana.
 
 ## TLS/SSL
 
-The acronyms [TLS](https://en.wikipedia.org/wiki/Transport_Layer_Security) (Transport Layer Security and
+The acronyms [TLS](https://en.wikipedia.org/wiki/Transport_Layer_Security) (Transport Layer Security and 
 [SSL](https://en.wikipedia.org/wiki/SSL) (Secure Socket Layer) are both used to describe the HTTPS security layer,
 and are in practice synonymous. However, TLS is considered the current name for the technology, and SSL is considered
-[deprecated](https://tools.ietf.org/html/rfc7568).
+[deprecated](https://tools.ietf.org/html/rfc7568). 
 
-As such, while both terms are in use (also in our codebase) and are indeed interchangeable, TLS is the preferred term.
-That said however, we have at Grafana Labs decided to use both acronyms in combination when referring to this type of
+As such, while both terms are in use (also in our codebase) and are indeed interchangeable, TLS is the preferred term. 
+That said however, we have at Grafana Labs decided to use both acronyms in combination when referring to this type of 
 technology, i.e. _TLS/SSL_. This is in order to not confuse those who may not be aware of them being synonymous,
 and SSL still being so prevalent in common discourse.

contribute/style-guides/backend.md

@@ -42,8 +42,8 @@ In the `sqlstore` package we do database operations in tests and while some migh
 
 ### Assertions
 
-Use respectively [`assert.*`](https://github.com/stretchr/testify#assert-package) functions to make assertions that
-should _not_ halt the test ("soft checks") and [`require.*`](https://github.com/stretchr/testify#require-package)
+Use respectively [`assert.*`](https://github.com/stretchr/testify#assert-package) functions to make assertions that 
+should _not_ halt the test ("soft checks") and [`require.*`](https://github.com/stretchr/testify#require-package) 
 functions to make assertions that _should_ halt the test ("hard checks"). Typically you want to use the latter type of
 check to assert that errors have or have not happened, since continuing the test after such an assertion fails is
 chaotic (the system under test will be in an undefined state) and you'll often have segfaults in practice.
@@ -70,10 +70,10 @@ In general, use value types and only reach for pointers when there's a real need
 increase the risk of bugs, since a pointer can be nil and dereferencing a nil pointer leads to a panic (AKA segfault).
 Valid reasons to use a pointer include (but not necessarily limited to):
 
-- You might need to pass a modifiable argument to a function
-- Copying an object might incur a performance hit (benchmark to check your assumptions, copying is often faster than
+* You might need to pass a modifiable argument to a function
+* Copying an object might incur a performance hit (benchmark to check your assumptions, copying is often faster than
   allocating heap memory)
-- You might _need_ `nil` to tell if a variable isn't set, although usually it's better to use the type's zero
+* You might *need* `nil` to tell if a variable isn't set, although usually it's better to use the type's zero
   value to tell instead
 
 ## Database
@@ -83,7 +83,7 @@ In database related code, we follow certain patterns.
 ### Foreign keys
 
 While they can be useful, we don't generally use foreign key constraints in Grafana, for historical and
-technical reasons. See this [comment](https://github.com/grafana/grafana/issues/3269#issuecomment-383328548) by Torkel
+technical reasons. See this [comment](https://github.com/grafana/grafana/issues/3269#issuecomment-383328548) by Torkel 
 for context.
 
 ### Unique columns
@@ -93,7 +93,7 @@ If a column, or column combination, should be unique, add a corresponding unique
 ## JSON
 
 The simplejson package is used a lot throughout the backend codebase, but it's legacy, so if at all possible
-avoid using it in new code. Use [json-iterator](https://github.com/json-iterator/go) instead, which is a more performant
+avoid using it in new code. Use [json-iterator](https://github.com/json-iterator/go) instead, which is a more performant 
 drop-in alternative to the standard [encoding/json](https://golang.org/pkg/encoding/json/) package. While encoding/json
 is a fine choice, profiling shows that json-iterator may be 3-4 times more efficient for encoding. We haven't profiled
 its parsing performance yet, but according to json-iterator's own benchmarks, it appears even more superior in this

contribute/style-guides/code-comments.md

@@ -1,4 +1,4 @@
-# Guidelines for code comments in grafana-\* packages
+# Guidelines for code comments in grafana-* packages
 
 This document aims to give you some recommendation on how to add code comments to the exported code in the grafana packages.
 
@@ -9,12 +9,11 @@ This document aims to give you some recommendation on how to add code comments t
 1. [Deprecate an API](#deprecate-an-api)
 1. [Specify parameters](#specify-parameters)
 1. [Set return values](#set-return-values)
+____
 
----
+ ## Add package description
 
-## Add package description
-
-Each package has an overview explaining the overall responsibility and usage of the package.
+Each package has an overview explaining the overall responsibility and usage of the package. 
 
 You can document this description with [`@packageDocumentation`](https://api-extractor.com/pages/tsdoc/tag_packagedocumentation/) tag.
 
@@ -33,34 +32,33 @@ All `exported` apis from the package should have a release tag to indicate its s
 
 Add a tag to mark the stability of the whole exported `class/interface/function/type` etc.
 
-Please place the `release tag` at the bottom of the comment to make it consistent among files and easier to read.
+Please place the `release tag` at the bottom of the comment to make it consistent among files and easier to read. 
 
 **Do:**
 
-````typescript
+```typescript
 /**
- * Will help to create DataFrame objects and handle
+ * Will help to create DataFrame objects and handle 
  * the heavy lifting of creating a complex object.
- *
+ * 
  * @example
  * ```typescript
  * const dataFrame = factory.create();
  * ```
- *
+ * 
  * @public
  **/
 export class DataFrameFactory {
-  create(): DataFrame {}
+    create(): DataFrame { }
 }
-````
+```
 
 **Don't**
-
-````typescript
+```typescript
 /**
- * Will help to create DataFrame objects and handle
+ * Will help to create DataFrame objects and handle 
  * the heavy lifting of creating a complex object.
- *
+ * 
  * @public
  * @example
  * ```typescript
@@ -68,9 +66,9 @@ export class DataFrameFactory {
  * ```
  **/
 export class DataFrameFactory {
-  create(): DataFrame {}
+    create(): DataFrame { }
 }
-````
+```
 
 ### Partial stability of APIs
 
@@ -80,61 +78,59 @@ Then override the non-stable parts of the API with the proper [release tag](#rel
 
 **Do:**
 
-````typescript
+```typescript
 /**
- * Will help to create DataFrame objects and handle
+ * Will help to create DataFrame objects and handle 
  * the heavy lifting of creating a complex object.
- *
+ * 
  * @example
  * ```typescript
  * const dataFrame = factory.create();
  * ```
- *
+ * 
  * @public
  **/
 export class DataFrameFactory {
-  create(): DataFrame {}
+    create(): DataFrame { }
 
-  /**
-   * @beta
-   **/
-  createMany(): DataFrames[] {}
+    /**
+     * @beta
+     **/
+    createMany(): DataFrames[] {}
 }
-````
+```
 
 **Don't**
 
-````typescript
+```typescript
 /**
- * Will help to create DataFrame objects and handle
+ * Will help to create DataFrame objects and handle 
  * the heavy lifting of creating a complex object.
- *
+ * 
  * @example
  * ```typescript
  * const dataFrame = factory.create();
  * ```
  **/
 export class DataFrameFactory {
-  /**
-   * @public
-   **/
-  create(): DataFrame {}
+    /**
+     * @public
+     **/
+    create(): DataFrame { }
 
-  /**
-   * @beta
-   **/
-  createMany(): DataFrame[] {}
+    /**
+     * @beta
+     **/
+    createMany(): DataFrame[] {}
 }
-````
+```
 
 ## Deprecate an API
-
 If you want to mark an API as deprecated to signal that this API will be removed in the future, then add the [`@deprecated`](https://api-extractor.com/pages/tsdoc/tag_deprecated/) tag.
 
 If applicable add a reason why the API is deprecated directly after the `@deprecated tag`.
 
 ## Specify parameters
-
 If you want to specify the possible parameters that can be passed to an API, then add the [`@param`](https://api-extractor.com/pages/tsdoc/tag_param/) tag.
 
 This attribute can be skipped if the type provided by `typescript` and the function comment or the function name is enough to explain what the parameters are.
@@ -145,17 +141,17 @@ This attribute can be skipped if the type provided by `typescript` and the funct
 /**
  * Will help to create a resource resolver depending
  * on the current execution context.
- *
+ * 
  * @param context - The current execution context.
  * @returns FileResolver if executed on the server otherwise a HttpResolver.
  * @public
  **/
 export const factory = (context: Context): IResolver => {
-  if (context.isServer) {
-    return new FileResolver();
-  }
-  return new HttpResolver();
-};
+    if (context.isServer) {
+        return new FileResolver();
+    }
+    return new HttpResolver();
+}
 ```
 
 **Don't**
@@ -163,18 +159,18 @@ export const factory = (context: Context): IResolver => {
 ```typescript
 /**
  * Will compare two numbers to see if they are equal to each others.
- *
+ * 
  * @param x - The first number
  * @param y - The second number
  * @public
  **/
 export const isEqual = (x: number, y: number): boolean => {
-  return x === y;
-};
+    return x === y;
+}
 ```
 
-## Set return values
 
+## Set return values
 If you want to specify the return value from a function you can use the [`@returns`](https://api-extractor.com/pages/tsdoc/tag_returns/) tag.
 
 This attribute can be skipped if the type provided by `typescript` and the function comment or the function name is enough to explain what the function returns.
@@ -185,17 +181,17 @@ This attribute can be skipped if the type provided by `typescript` and the funct
 /**
  * Will help to create a resource resolver depending
  * on the current execution context.
- *
+ * 
  * @param context - The current execution context.
  * @returns FileResolver if executed on the server otherwise a HttpResolver.
  * @public
  **/
 export const factory = (context: Context): IResolver => {
-  if (context.isServer) {
-    return new FileResolver();
-  }
-  return new HttpResolver();
-};
+    if (context.isServer) {
+        return new FileResolver();
+    }
+    return new HttpResolver();
+}
 ```
 
 **Don't**
@@ -203,11 +199,11 @@ export const factory = (context: Context): IResolver => {
 ```typescript
 /**
  * Will compare two numbers to see if they are equal to each others.
- *
+ * 
  * @returns true if values are equal
  * @public
  **/
 export const isEqual = (x: number, y: number): boolean => {
-  return x === y;
-};
+    return x === y;
+}
 ```

contribute/style-guides/documentation-markdown-guide.md

@@ -12,18 +12,19 @@ In Markdown, the number of "#" symbols creates different heading levels, similar
 - \#\# is \<h2>.
 - \#\#\# is \<h3>.
 
-Start your document with a single `#` for the title of the page. Add the sub-headings with two `##`.
+Start your document with a single ``#`` for the title of the page. Add the sub-headings with two ``##``.
 
 ## Bold and emphasis
 
 - Make text **bold** using two asterisks.
 
-**Example:** It is `**important**` to use GitHub-flavored Markdown emoji consistently.
+**Example:** It is ``**important**`` to use GitHub-flavored Markdown emoji consistently.
 
-- Make text `_emphasized_` using single ` _underscores_`. Do not use the single asterisk, it can be easily confused with bold.
+- Make text ``_emphasized_`` using single `` _underscores_``. Do not use the single asterisk, it can be easily confused with bold.
 
 **Example:** GitHub-flavored markdown emoji should _only_ appear in specific cases.
 
+
 ## Links and references
 
 Create links to other website by wrapping the display text in square brackets, and the web URL in curved brackets.
@@ -61,13 +62,12 @@ Write the name of the language after the first set of back tics, no spaces, to s
 ```javascript
 function testNum(a) {
   if (a > 0) {
-    return 'positive';
+    return "positive";
   } else {
-    return 'NOT positive';
+    return "NOT positive";
   }
 }
 ```
-
 ## Tables
 
 Construct a table by typing the table headings, and separating them with a "|" character. Then, add a second line of dashes ("-") separated by another "|" character. When constructing the table cells, separate each cell data with another "|".
@@ -82,9 +82,9 @@ Cell one data| Cell two data
 
 Will publish as:
 
-| Heading one   | Heading two   |
-| ------------- | ------------- |
-| Cell one data | Cell two data |
+Heading one | Heading two
+------------|------------
+Cell one data| Cell two data
 
 ## Lists
 
@@ -121,20 +121,19 @@ _Do not_ use image shortcodes at this time.
 Include images in a document using the following syntax:
 
 ```
-![Alt text](link to image, starting with /static/img/docs/ if it is to an internal image "Title of image in sentence case")
+![Alt text](link to image, starting with /img/docs/ if it is to an internal image "Title of image in sentence case")
 ```
 
 > **Note:** Alt text does not appear when the user hovers the mouse over the image, but title text does.
 
-**Examples:**
+**Examples:** 
 
-- \!\[Grafana logo](/link/to/grafanalogo/logo.png "Grafana logo")
-- \!\[Example](/static/img/docs/folder_name/alert_test_rule.png "Example title")
+- \!\[Grafana logo](/link/to/grafanalogo/logo.png)
+- \!\[Example](/img/docs/folder_name/alert_test_rule.png)
 
 This follows the format of "!", alt text wrapped in "[]" and the link URL wrapped in "()".
 
 You can also use HTML such as the following:
-
 ```
 <img src="example.png"
      alt="Example image"

contribute/style-guides/e2e-core.md

@@ -22,4 +22,4 @@ The above commands use some utils scripts under [_\<repo-root>/e2e_](../../e2e)
 
 ## Test suites
 
-All the integration tests are located at _\<repo-root>/e2e/suite\<x>/specs_. The page objects and reusable flows are in the [_\<repo-root>/packages/grafana-e2e_](../../packages/grafana-e2e) package.
+All the integration tests are located at _\<repo-root>/e2e/suite\<x>/specs_. The page objects and reusable flows are in the [_\<repo-root>/packages/grafana-e2e_](../../packages/grafana-e2e) package.  

contribute/style-guides/frontend.md

@@ -268,7 +268,6 @@ For code that needs to be used by external plugin:
 
 - Use named exports for all code you want to export from a file.
 - Use declaration exports (i.e. `export const foo = ...`).
-- Avoid using default exports (for example, `export default foo`).
 - Export only the code that is meant to be used outside the module.
 
 ### Comments
@@ -345,14 +344,6 @@ static defaultProps = { ... }
 static defaultProps: Partial<Props> = { ... }
 ```
 
-### How to declare functional components
-
-We recommend using named regular functions when creating a new react functional component.
-
-```typescript
-export function Component(props: Props): ReactElement { ... }
-```
-
 ## State management
 
 - Don't mutate state in reducers or thunks.

contribute/style-guides/redux.md

@@ -1,7 +1,6 @@
 # Redux framework
 
 Grafana uses [Redux Toolkit](https://redux-toolkit.js.org/) to handle Redux boilerplate code.
-
 > Some of our Reducers are used by Angular and therefore state is to be considered as mutable for those reducers.
 
 ## Test functionality
@@ -20,7 +19,6 @@ reducerTester()
 ```
 
 #### Complex usage
-
 Sometimes you encounter a `resulting state` that contains properties that are hard to compare, such as `Dates`, but you still want to compare that other props in state are correct.
 
 Then you can use `thenStatePredicateShouldEqual` function on `reducerTester` that will return the `resulting state` so that you can expect upon individual properties..
@@ -29,9 +27,9 @@ Then you can use `thenStatePredicateShouldEqual` function on `reducerTester` tha
 reducerTester()
   .givenReducer(someReducer, initialState)
   .whenActionIsDispatched(someAction('reducer tests'))
-  .thenStatePredicateShouldEqual((resultingState) => {
+  .thenStatePredicateShouldEqual(resultingState => {
     expect(resultingState.data).toEqual('reducer tests');
-    return true;
+    return true;  
   });
 ```
 
@@ -42,7 +40,9 @@ Fluent API that simplifies the testing of thunks.
 #### Usage
 
 ```typescript
-const dispatchedActions = await thunkTester(initialState).givenThunk(someThunk).whenThunkIsDispatched(arg1, arg2, arg3);
+const dispatchedActions = await thunkTester(initialState)
+    .givenThunk(someThunk)
+    .whenThunkIsDispatched(arg1, arg2, arg3);
 
 expect(dispatchedActions).toEqual([someAction('reducer tests')]);
 ```
@@ -52,7 +52,7 @@ expect(dispatchedActions).toEqual([someAction('reducer tests')]);
 It is possible to infer connected props automatically from `mapStateToProps` and `mapDispatchToProps` using a helper type `ConnectedProps` from Redux. For this to work the `connect` call has to be split into two parts.
 
 ```typescript
-import { connect, ConnectedProps } from 'react-redux';
+import { connect, ConnectedProps } from 'react-redux'
 
 const mapStateToProps = (state: StoreState) => {
   return {
@@ -75,9 +75,8 @@ const connector = connect(mapStateToProps, mapDispatchToProps);
 
 type Props = OwnProps & ConnectedProps<typeof connector>;
 
-class PanelEditorUnconnected extends PureComponent<Props> {}
+class PanelEditorUnconnected extends PureComponent<Props> {};
 
 export const PanelEditor = connector(PanelEditorUnconnected);
 ```
-
 For more examples, refer to the [Redux docs](https://react-redux.js.org/using-react-redux/static-typing#inferring-the-connected-props-automatically).

contribute/templates/README.md

@@ -15,37 +15,34 @@ Feel free to add templates to the `templates` folder. Try to make them as generi
 
 ## Documentation templates
 
-In an ideal world, each topic will correspond to an information _type_ ([task](doc-task-template.md), [reference](doc-reference-template.md), [concept](doc-concept-template.md)) and contain only that type of information.
+In an ideal world, each topic will correspond to an information *type* ([task](doc-task-template.md), [reference](doc-reference-template.md), [concept](doc-concept-template.md)) and contain only that type of information.
 
 However, this is not always practical. For example, you have a series of short topics, you can group them into one topic.
 
-Try to _chunk_ your content. This means you should organize the document so that the same kinds of content are grouped together.
+Try to *chunk* your content. This means you should organize the document so that the same kinds of content are grouped together.
 
 ### Chunking example
 
-If I was writing content for a site called _Doggie handbook_, I might organize it like this.
+If I was writing content for a site called *Doggie handbook*, I might organize it like this. 
 
 **Concept**
-
 - What a dog is
 - Brief history of dogs
 - Why you might want a dog
 - Tasks dogs can be trained to do
-
+  
 **Tasks**
-
 - Feed the dog
 - Groom the dog
 - Train the dog
 
 **Reference**
-
 - List of dog equipment you will need
 - Table of breeds that includes breed name, size range, short or long hair, and type of dog
 
 ### Audience
 
-Write for an audience that is computer literate and has general technical knowledge, but is not necessarily familiar with Grafana or the finer points of observability.
+Write for an audience that is computer literate and has general technical knowledge, but is not necessarily familiar with Grafana or the finer points of observability. 
 
 Pretend you are explaining your topic to a brand new Grafana user or developer.
 
@@ -53,7 +50,7 @@ Pretend you are explaining your topic to a brand new Grafana user or developer.
 
 Thanks to search engines, every page in the documentation might be a reader's entry point. This means that each page needs to be self-contained and make sense on its own. The reader should not need to read other topics in order to perform the task or understand the concept.
 
-However, try to be helpful and link to related information. Using the _Doggie handbook_ example, the concept topic that explains what dogs can be trained to do might link to the Train the dog task.
+However, try to be helpful and link to related information. Using the *Doggie handbook* example, the concept topic that explains what dogs can be trained to do might link to the Train the dog task.
 
 ## Code templates
 

contribute/templates/doc-concept-template.md

@@ -23,20 +23,20 @@ Concepts are topic types for any information that doesn't involve task lists or
 
 ## Idea
 
-Concept topics or sections explain _what_ and _why_. They do not explain _how_. If you are a new user, you might look for concept information to learn about what Grafana is, why it might be useful to you, and what the general workflow is.
+Concept topics or sections explain *what* and *why*. They do not explain *how*. If you are a new user, you might look for concept information to learn about what Grafana is, why it might be useful to you, and what the general workflow is. 
 
 ## Workflow
 
-Continuing the example in the previous section, here is a sample Grafana workflow.
+Continuing the example in the previous section, here is a sample Grafana workflow. 
 
 1. Install Grafana. <link to task for installing Grafana>
 1. Set up data sources. <link to data sources concept topic, which links to data source task topics>
 1. Create panels. <link to panel concept topic, which links to tasks>
-1. Create dashboards. <link to panel concept topic, which links to tasks>
+1. Create dashboards.  <link to panel concept topic, which links to tasks>
 1. Enter queries. <link to query editor concept topic>
 1. Add users. <link to user management concept topic, which links to tasks>
 1. Create playlists. <link to Playlist topic that contains concept information and tasks>
 
 ## Next steps
 
-Concept tasks often link to related information, including _tasks_ related to the concept and _reference_ topics related to the concept.
+Concept tasks often link to related information, including *tasks* related to the concept and *reference* topics related to the concept.

contribute/templates/doc-reference-template.md

@@ -15,9 +15,9 @@ weight = 100
 
 # Reference
 
-The _reference_ topic type is for storing reference information, such as extensive tables, lists, or other information that is used as support for a task. Reference topics are also designed for API information.
+The *reference* topic type is for storing reference information, such as extensive tables, lists, or other information that is used as support for a task. Reference topics are also designed for API information.
 
-Often reference topics are linked from _task_ topics, because they contain information the user needs in order to perform a task.
+Often reference topics are linked from *task* topics, because they contain information the user needs in order to perform a task.
 
 [Grafana CLI](https://grafana.com/docs/grafana/latest/administration/cli/) is one example of a reference topic.
 
@@ -41,12 +41,12 @@ The [Glossary](https://grafana.com/docs/grafana/latest/guides/glossary/) provide
 
 While you might not need a heading for each table, headings are a good way to chunk information if you have several tables. They also make the content easy to skim. Use headings or intro paragraphs like this one to explain to the reader what the information in the table is used for.
 
-|     |     |     |     |     |     |
-| :-- | :-- | :-: | :-: | --: | --: |
-|     |     |     |     |     |     |
-|     |     |     |     |     |     |
-|     |     |     |     |     |     |
-|     |     |     |     |     |     |
+|    |    |    |    |    |    |
+|:---|:---|:--:|:--:|---:|---:|
+|    |    |    |    |    |    |
+|    |    |    |    |    |    |
+|    |    |    |    |    |    |
+|    |    |    |    |    |    |
 
 ### Empty HTML table
 

contribute/templates/doc-task-template.md

@@ -14,7 +14,7 @@ weight = 100
 
 # Task
 
-A _task_ topic is intended for a procedure that describes how to accomplish a task. It lists a series of steps that users follow to produce an intended outcome. It tells the reader _how_ to do something. [Install Grafana plugins](https://grafana.com/docs/grafana/latest/plugins/installation/) and [Playlist](https://grafana.com/docs/grafana/latest/reference/playlist/) are examples of task topics. Playlist includes a small amount of concept information in the introduction, which is appropriate.
+A *task* topic is intended for a procedure that describes how to accomplish a task. It lists a series of steps that users follow to produce an intended outcome. It tells the reader *how* to do something. [Install Grafana plugins](https://grafana.com/docs/grafana/latest/plugins/installation/) and [Playlist](https://grafana.com/docs/grafana/latest/reference/playlist/) are examples of task topics. Playlist includes a small amount of concept information in the introduction, which is appropriate.
 
 Always include an introduction of a short paragraph or two to explain what the task is for, perhaps give the reader an idea of what the outcome will be.
 
@@ -52,6 +52,6 @@ Thanks to internet search engines, every page in the documentation could be page
 
 ## Testing
 
-It is a good practice to have someone else test the task you have written. If they can successfully complete the task using _only_ what the steps you have written, not guessing or using their inherent knowledge, then your task has passed the test. However, it is very common to find you have skipped steps, because _you_ are very familiar with Grafana and the topic you are explaining.
+It is a good practice to have someone else test the task you have written. If they can successfully complete the task using *only* what the steps you have written, not guessing or using their inherent knowledge, then your task has passed the test. However, it is very common to find you have skipped steps, because *you* are very familiar with Grafana and the topic you are explaining.
 
 New users or people from other teams are very helpful for these tests.

devenv/dev-dashboards/all-panels.json

@@ -1,990 +0,0 @@
-{
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": "-- Grafana --",
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations & Alerts",
-          "target": {
-            "limit": 100,
-            "matchAny": false,
-            "tags": [],
-            "type": "dashboard"
-          },
-          "type": "dashboard"
-        }
-      ]
-    },
-    "editable": true,
-    "graphTooltip": 0,
-    "iteration": 1629464729438,
-    "links": [
-      {
-        "asDropdown": true,
-        "icon": "external link",
-        "includeVars": false,
-        "keepTime": false,
-        "tags": [
-          "gdev",
-          "panel-tests"
-        ],
-        "targetBlank": false,
-        "title": "Dropdown link",
-        "tooltip": "",
-        "type": "dashboards",
-        "url": ""
-      },
-      {
-        "asDropdown": false,
-        "icon": "external link",
-        "includeVars": false,
-        "keepTime": false,
-        "tags": [],
-        "targetBlank": false,
-        "title": "External link",
-        "tooltip": "localhost",
-        "type": "link",
-        "url": "localhost:3000"
-      }
-    ],
-    "panels": [
-      {
-        "gridPos": {
-          "h": 3,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "id": 34,
-        "options": {
-          "content": "# All panels\n\nThis dashboard was created to quickly check accessiblity issues on a lot of panels at the same time           ",
-          "mode": "markdown"
-        },
-        "pluginVersion": "8.1.0-pre",
-        "transparent": true,
-        "type": "text"
-      },
-      {
-        "gridPos": {
-          "h": 3,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "id": 35,
-        "options": {
-          "content": "# Another text panel\n\nBecause why not",
-          "mode": "markdown"
-        },
-        "pluginVersion": "8.1.0-pre",
-        "transparent": true,
-        "type": "text"
-      },
-      {
-        "collapsed": false,
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 3
-        },
-        "id": 32,
-        "panels": [],
-        "title": "Row title",
-        "type": "row"
-      },
-      {
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "fillOpacity": 70,
-              "lineWidth": 1
-            },
-            "mappings": [
-              {
-                "options": {
-                  "CRITICAL": {
-                    "color": "red",
-                    "index": 3
-                  },
-                  "HIGH": {
-                    "color": "orange",
-                    "index": 2
-                  },
-                  "LOW": {
-                    "color": "blue",
-                    "index": 0
-                  },
-                  "NORMAL": {
-                    "color": "green",
-                    "index": 1
-                  }
-                },
-                "type": "value"
-              }
-            ],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 9,
-          "w": 24,
-          "x": 0,
-          "y": 4
-        },
-        "id": 41,
-        "options": {
-          "alignValue": "left",
-          "legend": {
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "mergeValues": true,
-          "rowHeight": 0.99,
-          "showValue": "auto",
-          "tooltip": {
-            "mode": "single"
-          }
-        },
-        "targets": [
-          {
-            "refId": "A",
-            "scenarioId": "csv_metric_values",
-            "stringInput": "LOW,HIGH,NORMAL,NORMAL,NORMAL,LOW,LOW,NORMAL,HIGH,CRITICAL"
-          },
-          {
-            "refId": "B",
-            "scenarioId": "csv_metric_values",
-            "stringInput": "NORMAL,LOW,LOW,CRITICAL,CRITICAL,LOW,LOW,NORMAL,HIGH,CRITICAL"
-          },
-          {
-            "refId": "C",
-            "scenarioId": "csv_metric_values",
-            "stringInput": "NORMAL,NORMAL,NORMAL,NORMAL,CRITICAL,LOW,NORMAL,NORMAL,NORMAL,LOW"
-          }
-        ],
-        "title": "State timeline",
-        "type": "state-timeline"
-      },
-      {
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "continuous-GrYlRd"
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 11,
-          "w": 9,
-          "x": 0,
-          "y": 0
-        },
-        "id": 62,
-        "options": {
-          "basemap": {
-            "config": {},
-            "type": "default"
-          },
-          "controls": {
-            "mouseWheelZoom": true,
-            "showAttribution": true,
-            "showDebug": false,
-            "showScale": false,
-            "showZoom": true
-          },
-          "layers": [
-            {
-              "config": {
-                "color": {
-                  "field": "Price",
-                  "fixed": "dark-green"
-                },
-                "fillOpacity": 0.4,
-                "shape": "circle",
-                "showLegend": true,
-                "size": {
-                  "field": "Count",
-                  "fixed": 5,
-                  "max": 15,
-                  "min": 2
-                }
-              },
-              "location": {
-                "gazetteer": "public/gazetteer/usa-states.json",
-                "lookup": "State",
-                "mode": "auto"
-              },
-              "type": "markers"
-            }
-          ],
-          "view": {
-            "id": "coords",
-            "lat": 38.297683,
-            "lon": -99.228359,
-            "shared": true,
-            "zoom": 3.98
-          }
-        },
-        "targets": [
-          {
-            "csvFileName": "flight_info_by_state.csv",
-            "refId": "A",
-            "scenarioId": "csv_file"
-          }
-        ],
-        "title": "Size, color mapped to different fields + share view",
-        "type": "geomap"
-      },
-      {
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "fillOpacity": 80,
-              "gradientMode": "hue",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineWidth": 1
-            },
-            "links": [
-              {
-                "title": "Data link",
-                "url": "/"
-              }
-            ],
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 13
-        },
-        "id": 4,
-        "options": {
-          "bucketOffset": 0,
-          "combine": false,
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom"
-          }
-        },
-        "title": "Histogram",
-        "type": "histogram"
-      },
-      {
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 21
-        },
-        "id": 28,
-        "options": {
-          "dedupStrategy": "none",
-          "enableLogDetails": true,
-          "prettifyLogMessage": false,
-          "showCommonLabels": false,
-          "showLabels": false,
-          "showTime": false,
-          "sortOrder": "Descending",
-          "wrapLogMessage": false
-        },
-        "targets": [
-          {
-            "refId": "A",
-            "scenarioId": "logs"
-          }
-        ],
-        "title": "Logs",
-        "type": "logs"
-      },
-      {
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 21
-        },
-        "id": 8,
-        "options": {
-          "maxItems": 10,
-          "query": "",
-          "showHeadings": true,
-          "showRecentlyViewed": true,
-          "showSearch": true,
-          "showStarred": true,
-          "tags": []
-        },
-        "pluginVersion": "8.1.0-pre",
-        "title": "Dashboard list",
-        "type": "dashlist"
-      },
-      {
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 29
-        },
-        "id": 30,
-        "title": "Panel list",
-        "type": "pluginlist"
-      },
-      {
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 29
-        },
-        "id": 6,
-        "options": {
-          "alertName": "",
-          "dashboardAlerts": false,
-          "maxItems": 20,
-          "showInstances": false,
-          "sortOrder": 1,
-          "stateFilter": {
-            "firing": true,
-            "inactive": false,
-            "pending": true
-          }
-        },
-        "title": "Alert list",
-        "type": "alertlist"
-      },
-      {
-        "cards": {
-        },
-        "color": {
-          "cardColor": "#b4ff00",
-          "colorScale": "sqrt",
-          "colorScheme": "interpolateOranges",
-          "exponent": 0.5,
-          "mode": "spectrum"
-        },
-        "dataFormat": "timeseries",
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 37
-        },
-        "heatmap": {},
-        "hideZeroBuckets": false,
-        "highlightCards": true,
-        "id": 26,
-        "legend": {
-          "show": false
-        },
-        "reverseYBuckets": false,
-        "targets": [
-          {
-            "refId": "A",
-            "scenarioId": "exponential_heatmap_bucket_data"
-          }
-        ],
-        "title": "Heatmap",
-        "tooltip": {
-          "show": true,
-          "showHistogram": false
-        },
-        "type": "heatmap",
-        "xAxis": {
-          "show": true
-        },
-        "yAxis": {
-          "format": "short",
-          "logBase": 1,
-          "show": true
-        },
-        "yBucketBound": "auto"
-      },
-      {
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 37
-        },
-        "id": 20,
-        "options": {
-          "displayMode": "gradient",
-          "orientation": "auto",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "showUnfilled": true,
-          "text": {}
-        },
-        "pluginVersion": "8.1.0-pre",
-        "targets": [
-          {
-            "refId": "A",
-            "scenarioId": "random_walk",
-            "seriesCount": 10
-          }
-        ],
-        "title": "Bar gauge",
-        "type": "bargauge"
-      },
-      {
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              }
-            },
-            "mappings": []
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 45
-        },
-        "id": 24,
-        "options": {
-          "legend": {
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "pieType": "pie",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "tooltip": {
-            "mode": "single"
-          }
-        },
-        "targets": [
-          {
-            "refId": "A",
-            "scenarioId": "random_walk",
-            "seriesCount": 6
-          }
-        ],
-        "title": "Pie chart",
-        "type": "piechart"
-      },
-      {
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 45
-        },
-        "id": 18,
-        "options": {
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "orientation": "auto",
-          "showValue": "auto",
-          "showThresholdLabels": false,
-          "showThresholdMarkers": true,
-          "text": {}
-        },
-        "pluginVersion": "8.1.0-pre",
-        "targets": [
-          {
-            "refId": "A",
-            "scenarioId": "random_walk",
-            "seriesCount": 3
-          }
-        ],
-        "title": "Gauge",
-        "type": "gauge"
-      },
-      {
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {
-              "align": "auto",
-              "displayMode": "auto"
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 53
-        },
-        "id": 22,
-        "options": {
-          "showHeader": true
-        },
-        "pluginVersion": "8.1.0-pre",
-        "targets": [
-          {
-            "refId": "A",
-            "scenarioId": "table_static"
-          }
-        ],
-        "title": "Tabel",
-        "type": "table"
-      },
-      {
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 53
-        },
-        "id": 10,
-        "options": {
-          "limit": 10,
-          "navigateAfter": "10m",
-          "navigateBefore": "10m",
-          "onlyFromThisDashboard": false,
-          "onlyInTimeRange": false,
-          "showTags": true,
-          "showTime": true,
-          "showUser": true
-        },
-        "title": "Annotation list",
-        "type": "annolist"
-      },
-      {
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 61
-        },
-        "id": 16,
-        "options": {
-          "colorMode": "value",
-          "graphMode": "area",
-          "justifyMode": "auto",
-          "orientation": "auto",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "text": {},
-          "textMode": "auto"
-        },
-        "pluginVersion": "8.1.0-pre",
-        "title": "Stat",
-        "type": "stat"
-      },
-      {
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "drawStyle": "line",
-              "fillOpacity": 0,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": 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"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 9,
-          "w": 12,
-          "x": 12,
-          "y": 61
-        },
-        "id": 2,
-        "links": [],
-        "options": {
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "tooltip": {
-            "mode": "single"
-          }
-        },
-        "targets": [
-          {
-            "refId": "A",
-            "scenarioId": "random_walk",
-            "seriesCount": 4,
-            "spread": 120
-          }
-        ],
-        "title": "Graph NG",
-        "type": "timeseries"
-      },
-      {
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "axisSoftMin": 0,
-              "fillOpacity": 80,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineWidth": 1
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 69
-        },
-        "id": 14,
-        "options": {
-          "barWidth": 0.97,
-          "groupWidth": 0.7,
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "orientation": "auto",
-          "showValue": "auto",
-          "stacking": "none",
-          "text": {},
-          "tooltip": {
-            "mode": "single"
-          }
-        },
-        "targets": [
-          {
-            "csvContent": "Series, Value\nBar 2, 20\nBar 3, 25\nBar 3, 55.4",
-            "refId": "A",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Bar chart",
-        "type": "barchart"
-      },
-      {
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 77
-        },
-        "id": 12,
-        "options": {
-          "showImage": true
-        },
-        "title": "News panel",
-        "type": "news"
-      }
-    ],
-    "refresh": "",
-    "schemaVersion": 30,
-    "style": "dark",
-    "tags": [
-      "gdev",
-      "panel-tests",
-      "all-panels"
-    ],
-    "templating": {
-      "list": [
-        {
-          "current": {},
-          "datasource": "gdev-testdata",
-          "definition": "*",
-          "hide": 0,
-          "includeAll": true,
-          "multi": true,
-          "name": "query0",
-          "options": [],
-          "query": {
-            "query": "*",
-            "refId": "StandardVariableQuery"
-          },
-          "refresh": 1,
-          "regex": "",
-          "skipUrlSync": false,
-          "sort": 0,
-          "type": "query"
-        },
-        {
-          "current": {
-            "selected": true,
-            "text": "7",
-            "value": "7"
-          },
-          "hide": 0,
-          "includeAll": false,
-          "multi": false,
-          "name": "query1",
-          "options": [
-            {
-              "selected": false,
-              "text": "1",
-              "value": "1"
-            },
-            {
-              "selected": false,
-              "text": "5",
-              "value": "5"
-            },
-            {
-              "selected": false,
-              "text": "6",
-              "value": "6"
-            },
-            {
-              "selected": true,
-              "text": "7",
-              "value": "7"
-            }
-          ],
-          "query": "1,5,6,7",
-          "queryValue": "",
-          "skipUrlSync": false,
-          "type": "custom"
-        },
-        {
-          "current": {
-            "selected": false,
-            "text": "",
-            "value": ""
-          },
-          "description": "This is some descriptive text",
-          "hide": 0,
-          "label": "Plain text",
-          "name": "text",
-          "options": [
-            {
-              "selected": true,
-              "text": "",
-              "value": ""
-            }
-          ],
-          "query": "",
-          "skipUrlSync": false,
-          "type": "textbox"
-        }
-      ]
-    },
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {},
-    "timezone": "",
-    "title": "Panel tests - All panels",
-    "uid": "n1jR8vnnz",
-    "version": 24
-  }

devenv/dev-dashboards/datasource-testdata/new_features_in_v74.json

@@ -2156,7 +2156,6 @@
   "style": "dark",
   "tags": [
     "gdev",
-    "graph-ng",
     "demo"
   ],
   "templating": {

devenv/dev-dashboards/datasource-testdata/new_features_in_v8.json

@@ -2746,7 +2746,6 @@
     "style": "dark",
     "tags": [
       "gdev",
-      "graph-ng",
       "demo"
     ],
     "templating": {

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

@@ -524,8 +524,7 @@
   "tags": [
     "gdev",
     "panel-tests",
-    "barchart",
-    "graph-ng"
+    "barchart"
   ],
   "templating": {
     "list": []

devenv/dev-dashboards/panel-candlestick/candlestick.json

@@ -1,522 +0,0 @@
-{
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": "-- Grafana --",
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations & Alerts",
-          "target": {
-            "limit": 100,
-            "matchAny": false,
-            "tags": [],
-            "type": "dashboard"
-          },
-          "type": "dashboard"
-        }
-      ]
-    },
-    "editable": true,
-    "fiscalYearStartMonth": 0,
-    "graphTooltip": 2,
-    "id": 319,
-    "links": [],
-    "liveNow": false,
-    "panels": [
-      {
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "drawStyle": "line",
-              "fillOpacity": 0,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineInterpolation": "linear",
-              "lineStyle": {
-                "dash": [
-                  10,
-                  10
-                ],
-                "fill": "dash"
-              },
-              "lineWidth": 1,
-              "pointSize": 5,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "showPoints": "never",
-              "spanNulls": false,
-              "stacking": {
-                "group": "A",
-                "mode": "none"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            },
-            "unit": "currencyUSD"
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "sma"
-              },
-              "properties": [
-                {
-                  "id": "color",
-                  "value": {
-                    "fixedColor": "orange",
-                    "mode": "fixed"
-                  }
-                },
-                {
-                  "id": "custom.lineWidth",
-                  "value": 5
-                },
-                {
-                  "id": "custom.lineStyle",
-                  "value": {
-                    "dash": [
-                      0,
-                      20
-                    ],
-                    "fill": "dot"
-                  }
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "bolup"
-              },
-              "properties": [
-                {
-                  "id": "custom.fillBelowTo",
-                  "value": "boldn"
-                },
-                {
-                  "id": "custom.fillOpacity",
-                  "value": 8
-                },
-                {
-                  "id": "color",
-                  "value": {
-                    "fixedColor": "blue",
-                    "mode": "fixed"
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 16,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "id": 2,
-        "options": {
-          "colorStrategy": "open-close",
-          "colors": {
-            "down": "red",
-            "up": "green"
-          },
-          "fields": {},
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "mode": "candles+volume",
-          "candleStyle": "candles"
-        },
-        "targets": [
-          {
-            "csvFileName": "ohlc_dogecoin.csv",
-            "refId": "A",
-            "scenarioId": "csv_file"
-          }
-        ],
-        "title": "Price & Volume",
-        "type": "candlestick"
-      },
-      {
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "drawStyle": "line",
-              "fillOpacity": 0,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": 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"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            },
-            "unit": "currencyUSD"
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 20,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "id": 7,
-        "options": {
-          "colorStrategy": "close-close",
-          "colors": {
-            "down": "red",
-            "up": "green"
-          },
-          "fields": {},
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "mode": "candles",
-          "candleStyle": "candles"
-        },
-        "targets": [
-          {
-            "csvFileName": "ohlc_dogecoin.csv",
-            "refId": "A",
-            "scenarioId": "csv_file"
-          }
-        ],
-        "title": "Price Only, Hollow Candles",
-        "transformations": [
-          {
-            "id": "filterFieldsByName",
-            "options": {
-              "include": {
-                "names": [
-                  "time",
-                  "open",
-                  "high",
-                  "low",
-                  "close"
-                ]
-              }
-            }
-          }
-        ],
-        "type": "candlestick"
-      },
-      {
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "drawStyle": "line",
-              "fillOpacity": 0,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": 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"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            },
-            "unit": "currencyUSD"
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 10,
-          "w": 12,
-          "x": 0,
-          "y": 16
-        },
-        "id": 6,
-        "options": {
-          "colorStrategy": "open-close",
-          "colors": {
-            "down": "red",
-            "up": "blue"
-          },
-          "fields": { },
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "mode": "candles",
-          "candleStyle": "ohlcbars"
-        },
-        "targets": [
-          {
-            "csvFileName": "ohlc_dogecoin.csv",
-            "refId": "A",
-            "scenarioId": "csv_file"
-          }
-        ],
-        "title": "Price Only, OHLC Bars",
-        "transformations": [
-          {
-            "id": "filterFieldsByName",
-            "options": {
-              "include": {
-                "names": [
-                  "time",
-                  "open",
-                  "high",
-                  "low",
-                  "close"
-                ]
-              }
-            }
-          }
-        ],
-        "type": "candlestick"
-      },
-      {
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "drawStyle": "line",
-              "fillOpacity": 100,
-              "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": 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"
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            },
-            "unit": "currencyUSD"
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "open"
-              },
-              "properties": [
-                {
-                  "id": "custom.hideFrom",
-                  "value": {
-                    "legend": true,
-                    "tooltip": true,
-                    "viz": true
-                  }
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "close"
-              },
-              "properties": [
-                {
-                  "id": "custom.hideFrom",
-                  "value": {
-                    "legend": true,
-                    "tooltip": true,
-                    "viz": true
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 6,
-          "w": 12,
-          "x": 12,
-          "y": 20
-        },
-        "id": 4,
-        "options": {
-          "colorStrategy": "open-close",
-          "colors": {
-            "down": "red",
-            "up": "yellow"
-          },
-          "fields": {},
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "mode": "volume",
-          "candleStyle": "candles"
-        },
-        "targets": [
-          {
-            "csvFileName": "ohlc_dogecoin.csv",
-            "refId": "A",
-            "scenarioId": "csv_file"
-          }
-        ],
-        "title": "Volume Only,  Alt Colors, 100% Opacity",
-        "transformations": [
-          {
-            "id": "filterFieldsByName",
-            "options": {
-              "include": {
-                "names": [
-                  "time",
-                  "volume",
-                  "open",
-                  "close"
-                ]
-              }
-            }
-          }
-        ],
-        "type": "candlestick"
-      }
-    ],
-    "refresh": false,
-    "schemaVersion": 33,
-    "style": "dark",
-    "tags": [
-      "gdev",
-      "panel-tests",
-      "graph-ng"
-    ],
-    "templating": {
-      "list": []
-    },
-    "time": {
-      "from": "2021-07-13T22:13:30.740Z",
-      "to": "2021-07-13T22:46:18.921Z"
-    },
-    "timepicker": {},
-    "timezone": "",
-    "title": "Candlestick",
-    "uid": "MP-Di9F7k",
-    "version": 7,
-    "weekStart": ""
-  }

devenv/dev-dashboards/panel-graph/graph-ng-by-value-color-schemes.json

@@ -829,8 +829,7 @@
   "style": "dark",
   "tags": [
     "gdev",
-    "panel-tests",
-    "graph-ng"
+    "panel-tests"
   ],
   "templating": {
     "list": []

devenv/dev-dashboards/panel-graph/graph-ng-stacking.json

@@ -880,11 +880,7 @@
   ],
   "schemaVersion": 27,
   "style": "dark",
-  "tags": [
-    "gdev",
-    "panel-tests",
-    "graph-ng"
-  ],
+  "tags": [],
   "templating": {
     "list": []
   },

devenv/dev-dashboards/panel-graph/graph-ng-thresholds.json

@@ -1231,8 +1231,7 @@
   "style": "dark",
   "tags": [
     "gdev",
-    "panel-tests",
-    "graph-ng"
+    "panel-tests"
   ],
   "templating": {
     "list": []

devenv/dev-dashboards/panel-histogram/histogram_tests.json

@@ -413,8 +413,7 @@
     "style": "dark",
     "tags": [
       "gdev",
-      "panel-tests",
-      "graph-ng"
+      "panel-tests"
     ],
     "templating": {
       "list": []

devenv/dev-dashboards/panel-stat/panel-stat-tests.json

@@ -772,11 +772,7 @@
   ],
   "schemaVersion": 26,
   "style": "dark",
-  "tags": [
-    "gdev",
-    "panel-tests",
-    "graph-ng"
-  ],
+  "tags": ["gdev", "panel-tests"],
   "templating": {
     "list": []
   },

devenv/dev-dashboards/panel-table/table_tests_new.json

@@ -132,7 +132,7 @@
           }
         ]
       },
-      "pluginVersion": "",
+      "pluginVersion": "7.5.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -263,7 +263,7 @@
           }
         ]
       },
-      "pluginVersion": "",
+      "pluginVersion": "7.5.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -351,7 +351,7 @@
         "showHeader": true,
         "sortBy": []
       },
-      "pluginVersion": "",
+      "pluginVersion": "7.5.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -387,7 +387,7 @@
     },
     {
       "collapsed": false,
-      "datasource": "gdev-testdata",
+      "datasource": null,
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -460,7 +460,7 @@
                 "value": [
                   {
                     "title": "Details",
-                    "url": "http://detail?serverLabel=${__field.labels.server}&valueNumeric=${__value.numeric}"
+                    "url": "http://detail?serverLabel=${__field.labels.server}&valueNumeric=${__value.numeric}"
                   }
                 ]
               }
@@ -479,7 +479,7 @@
       "options": {
         "showHeader": true
       },
-      "pluginVersion": "",
+      "pluginVersion": "7.5.0-pre",
       "targets": [
         {
           "alias": "S1",
@@ -571,7 +571,7 @@
           }
         ]
       },
-      "pluginVersion": "",
+      "pluginVersion": "7.5.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -604,55 +604,6 @@
         }
       ],
       "type": "table"
-    },
-    {
-      "datasource": "gdev-testdata",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {
-            "align": "auto",
-            "displayMode": "auto"
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": 0
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 26
-      },
-      "id": 12,
-      "options": {
-        "footer": {
-          "show": true,
-          "fields": "",
-          "reducer": [
-            "sum"
-          ]
-        },
-        "showHeader": true
-      },
-      "pluginVersion": "",
-      "title": "Footer",
-      "type": "table"
     }
   ],
   "schemaVersion": 27,
@@ -684,5 +635,5 @@
   "timezone": "",
   "title": "Panel Tests - React Table",
   "uid": "U_bZIMRMk",
-  "version": 6
+  "version": 1
 }

devenv/dev-dashboards/panel-timeline/timeline-demo.json

@@ -414,8 +414,6 @@
   "style": "dark",
   "tags": [
     "gdev",
-    "panel-tests",
-    "graph-ng",
     "demo"
   ],
   "templating": {

devenv/dev-dashboards/panel-timeline/timeline-modes.json

@@ -362,8 +362,7 @@
   "style": "dark",
   "tags": [
     "gdev",
-    "panel-tests",
-    "graph-ng"
+    "panel-tests"
   ],
   "templating": {
     "list": []

devenv/docker/blocks/elastic/docker-compose.yaml

@@ -1,22 +1,19 @@
 # You need to run 'sysctl -w vm.max_map_count=262144' on the host machine
 
   elasticsearch-latest:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.0.0-beta1
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.13.2
     command: elasticsearch
     environment:
       - "discovery.type=single-node"
-      - "xpack.license.self_generated.type=basic"
-      - "xpack.security.enabled=false"
     ports:
       - "14200:9200"
       - "14300:9300"
 
-  # TODO: uncomment when https://github.com/grafana/fake-data-gen/pull/20 is merged
-  # fake-elastic-latest-data:
-  #   image: grafana/fake-data-gen
-  #   links:
-  #     - elasticsearch-latest
-  #   environment:
-  #     FD_SERVER: elasticsearch-latest
-  #     FD_DATASOURCE: elasticsearch8
-  #     FD_PORT: 9200
+  fake-elastic-latest-data:
+    image: grafana/fake-data-gen
+    links:
+      - elasticsearch-latest
+    environment:
+      FD_SERVER: elasticsearch-latest
+      FD_DATASOURCE: elasticsearch7
+      FD_PORT: 9200

devenv/docker/blocks/elastic/elasticsearch.yml

@@ -0,0 +1,3 @@
+script.inline: on
+script.indexed: on
+xpack.license.self_generated.type: basic

devenv/docker/blocks/elastic2/docker-compose.yaml

@@ -9,7 +9,7 @@
 
   fake-elastic-data:
     image: grafana/fake-data-gen
+    network_mode: bridge
     environment:
-      FD_SERVER: elasticsearch2
-      FD_DATASOURCE: elasticsearch
+      FD_DATASOURCE: elasticsearch2
       FD_PORT: 9200

devenv/docker/blocks/graphite/docker-compose.yaml

@@ -7,6 +7,7 @@
 
   fake-graphite11-data:
     image: grafana/fake-data-gen
+    network_mode: bridge
     environment:
       FD_DATASOURCE: graphite
       FD_PORT: 2103

devenv/docker/blocks/graphite09/docker-compose.yaml

@@ -10,7 +10,10 @@
 
   fake-graphite09-data:
     image: grafana/fake-data-gen
+    network_mode: bridge
     environment:
       FD_DATASOURCE: graphite
       FD_PORT: 2303
       FD_GRAPHITE_VERSION: 0.9
+
+

devenv/docker/blocks/graphite1/docker-compose.yaml

@@ -7,6 +7,7 @@
 
   fake-graphite1-data:
     image: grafana/fake-data-gen
+    network_mode: bridge
     environment:
       FD_DATASOURCE: graphite
       FD_PORT: 2203

devenv/docker/blocks/influxdb/docker-compose.yaml

@@ -5,22 +5,30 @@
       - '8086:8086'
     environment:
       INFLUXD_REPORTING_DISABLED: 'true'
-      DOCKER_INFLUXDB_INIT_MODE: 'setup'
-      DOCKER_INFLUXDB_INIT_USERNAME: 'grafana'
-      DOCKER_INFLUXDB_INIT_PASSWORD: 'grafana12345'
-      DOCKER_INFLUXDB_INIT_ORG: 'myorg'
-      DOCKER_INFLUXDB_INIT_BUCKET: 'mybucket'
-      DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: 'mytoken'
     volumes:
       - ./docker/blocks/influxdb/config.yaml:/etc/influxdb2/config.yaml
-      - ./docker/blocks/influxdb/setup_influxql.sh:/docker-entrypoint-initdb.d/setup_influxql.sh
+
+  # Use the influx cli to set up an influxdb instance.
+  influxdb_cli:
+    links:
+      - influxdb
+    image: influxdb:latest
+    # The following long command does 2 things:
+    #   1. It initializes the bucket
+    #   2. Maps bucket to database to enable backward-compatible access (influxql queries)
+    # Use these same configurations parameters in your telegraf configuration, mytelegraf.conf.
+    entrypoint: bash -c "influx setup --bucket mybucket -t mytoken -o myorg --username=grafana --password=grafana12345 --host=http://influxdb:8086 -f && influx -t mytoken -o myorg --host=http://influxdb:8086 bucket list -n mybucket --hide-headers | cut -f 1 | xargs influx -t mytoken -o myorg --host=http://influxdb:8086 v1 dbrp create --db mybucket --rp default --default --bucket-id"
+      # Wait for the influxd service in the influxdb container has fully bootstrapped before trying to setup an influxdb instance with the influxdb_cli service.
+    restart: on-failure:10
+    depends_on:
+      - influxdb
 
   telegraf:
     image: telegraf:latest
     links:
       - influxdb
     depends_on:
-      - influxdb
+      - influxdb_cli
     volumes:
       - ./docker/blocks/influxdb/telegraf.conf:/etc/telegraf/telegraf.conf:ro
       - /var/log:/var/log/host

devenv/docker/blocks/influxdb/setup_influxql.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-influx v1 dbrp create --bucket-id "${DOCKER_INFLUXDB_INIT_BUCKET_ID}" --org myorg --db mybucket --rp default --default

devenv/docker/blocks/mssql/docker-compose.yaml

@@ -13,6 +13,7 @@
 
   fake-mssql-data:
     image: grafana/fake-data-gen
+    network_mode: bridge
     environment:
       FD_DATASOURCE: mssql
-      FD_PORT: 1433
+      FD_PORT: 1433

devenv/docker/blocks/mysql/docker-compose.yaml

@@ -11,6 +11,8 @@
 
   fake-mysql-data:
     image: grafana/fake-data-gen
+    network_mode: bridge
     environment:
       FD_DATASOURCE: mysql
       FD_PORT: 3306
+

devenv/docker/blocks/opentsdb/docker-compose.yaml

@@ -5,7 +5,7 @@
 
   fake-opentsdb-data:
     image: grafana/fake-data-gen
+    network_mode: bridge
     environment:
       FD_DATASOURCE: opentsdb
-      FD_PORT: 4242
 

devenv/docker/blocks/postgres/docker-compose.yaml

@@ -15,6 +15,7 @@
 
   fake-postgres-data:
     image: grafana/fake-data-gen
+    network_mode: bridge
     environment:
       FD_DATASOURCE: postgres
       FD_PORT: 5432

devenv/docker/loadtest/run.sh

@@ -39,7 +39,7 @@ run() {
 	done
 	shift $((OPTIND-1))
 
-  docker run -t --network=host -v $PWD:/src -e URL=$url -e SLOW_QUERY=$slowQuery -e K6_OUT=$out -e API_KEY=$apiKey --rm -i loadimpact/k6:master run --vus $vus --duration $duration /src/$testcase.js
+  docker run -t --network=host -v $PWD:/src -e URL=$url -e SLOW_QUERY=$slowQuery -e K6_OUT=$out -e API_KEY=$apiKey --rm -i loadimpact/k6:master run --vus $vus --duration $duration src/$testcase.js
 }
 
 run "$@"

docs/README.md

@@ -20,8 +20,6 @@ If you have the grafana/website repo checked out in the same directory as the gr
 
 Edit content in the `sources` directory.
 
-### [Contributing](https://github.com/grafana/grafana/blob/main/contribute/documentation.md)
-
 ### Using `relref` for internal links
 
 Use the Hugo shortcode [relref](https://gohugo.io/content-management/cross-references/#use-ref-and-relref) any time you are linking to other internal docs pages.

docs/sources/administration/configuration.md

@@ -8,15 +8,21 @@ weight = 150
 
 # Configuration
 
-Grafana has default and custom configuration files. You can customize your Grafana instance by modifying the custom configuration file or by using environment variables. To see the list of settings for a Grafana instance, refer to [View server settings]({{< relref "view-server/view-server-settings.md" >}}).
+Grafana has a number of configuration options that you can specify in a `.ini` configuration file or specified using environment variables.
 
-> **Note:** After you add custom options, [uncomment](#remove-comments-in-the-ini-files) the relevant sections of the configuration file. Restart Grafana for your changes to take effect.
+> **Note:** You must restart Grafana for any configuration changes to take effect.
 
-## Configuration file location
+To see all settings currently applied to the Grafana server, refer to [View server settings]({{< relref "view-server/view-server-settings.md" >}}).
+
+## Config file locations
 
 The default settings for a Grafana instance are stored in the `$WORKING_DIR/conf/defaults.ini` file. _Do not_ change the location in this file.
 
-Depending on your OS, your custom configuration file is either the `$WORKING_DIR/conf/defaults.ini` file or the `/usr/local/etc/grafana/grafana.ini` file. The custom configuration file path can be overridden using the `--config` parameter.
+_Do not_ change `defaults.ini`! Grafana defaults are stored in this file. Depending on your OS, make all configuration changes in either `custom.ini` or `grafana.ini`.
+
+- Default configuration from `$WORKING_DIR/conf/defaults.ini`
+- Custom configuration from `$WORKING_DIR/conf/custom.ini`
+- The custom configuration file path can be overridden using the `--config` parameter
 
 ### Linux
 
@@ -28,23 +34,25 @@ Refer to [Configure a Grafana Docker image]({{< relref "configure-docker.md" >}}
 
 ### Windows
 
-On Windows, the `sample.ini` file is located in the same directory as `defaults.ini` file. It contains all the settings commented out. Copy `sample.ini` and name it `custom.ini`.
+`sample.ini` is in the same directory as `defaults.ini` and contains all the settings commented out. Copy `sample.ini` and name it `custom.ini`.
 
 ### macOS
 
-By default, the configuration file is located at `/usr/local/etc/grafana/grafana.ini`. For a Grafana instance installed using Homebrew, edit the `grafana.ini` file directly. Otherwise, add a configuration file named `custom.ini` to the `conf` folder to override the settings defined in `conf/defaults.ini`.
+By default, the configuration file is located at `/usr/local/etc/grafana/grafana.ini`. For a Grafana instance installed using Homebrew, edit the `grafana.ini` file directly. Otherwise, add a configuration file named `custom.ini` to the `conf` folder to override any of the settings defined in `conf/defaults.ini`.
 
-## Remove comments in the .ini files
+## Comments in .ini Files
 
-Grafana uses semicolons (the `;` char) to comment out lines in a `.ini` file. You must uncomment each line in the `custom.ini` or the `grafana.ini` file that you are modify by removing `;` from the beginning of that line. Otherwise your changes will be ignored.
+Semicolons (the `;` char) are the standard way to comment out lines in a `.ini` file. If you want to change a setting, you must delete the semicolon (`;`) in front of the setting before it will work.
 
-For example:
+**Example**
 
 ```
 # The HTTP port  to use
 ;http_port = 3000
 ```
 
+A common problem is forgetting to uncomment a line in the `custom.ini` (or `grafana.ini`) file which causes the configuration option to be ignored.
+
 ## Override configuration with environment variables
 
 Do not use environment variables to _add_ new configuration settings. Instead, use environmental variables to _override_ existing options.
@@ -1594,10 +1602,6 @@ Set to `true` if you want to enable external management of plugins. Default is `
 
 Custom install/learn more URL for enterprise plugins. Defaults to https://grafana.com/grafana/plugins/.
 
-### plugin_catalog_hidden_plugins
-
-Enter a comma-separated list of plugin identifiers to hide in the plugin catalog.
-
 <hr>
 
 ## [live]
@@ -1789,10 +1793,6 @@ Set this to `true` to have date formats automatically derived from your browser
 
 Used as the default time zone for user preferences. Can be either `browser` for the browser local time zone or a time zone name from the IANA Time Zone database, such as `UTC` or `Europe/Amsterdam`.
 
-### default_week_start
-
-Set the default start of the week, valid values are: `saturday`, `sunday`, `monday` or `browser` to use the browser locale to define the first day of the week. Default is `browser`.
-
 ## [expressions]
 
 > **Note:** This feature is available in Grafana v7.4 and later versions.

docs/sources/administration/provisioning.md

@@ -143,52 +143,51 @@ Since not all datasources have the same configuration settings we only have the
 
 > **Note:** Datasources tagged with _HTTP\*_ below denotes any data source which communicates using the HTTP protocol, e.g. all core data source plugins except MySQL, PostgreSQL and MSSQL.
 
-| Name                       | Type    | Datasource                                                       | Description                                                                                                                                                                                                                                                                                                         |
-| -------------------------- | ------- | ---------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| tlsAuth                    | boolean | _HTTP\*_, MySQL                                                  | Enable TLS authentication using client cert configured in secure json data                                                                                                                                                                                                                                          |
-| tlsAuthWithCACert          | boolean | _HTTP\*_, MySQL, PostgreSQL                                      | Enable TLS authentication using CA cert                                                                                                                                                                                                                                                                             |
-| tlsSkipVerify              | boolean | _HTTP\*_, MySQL, PostgreSQL                                      | Controls whether a client verifies the server's certificate chain and host name.                                                                                                                                                                                                                                    |
-| serverName                 | string  | _HTTP\*_                                                         | Optional. Controls the server name used for certificate common name/subject alternative name verification. Defaults to using the data source URL.                                                                                                                                                                   |
-| timeout                    | string  | _HTTP\*_                                                         | Request timeout in seconds. Overrides dataproxy.timeout option                                                                                                                                                                                                                                                      |
-| graphiteVersion            | string  | Graphite                                                         | Graphite version                                                                                                                                                                                                                                                                                                    |
-| timeInterval               | string  | Prometheus, Elasticsearch, InfluxDB, MySQL, PostgreSQL and MSSQL | Lowest interval/step value that should be used for this data source.                                                                                                                                                                                                                                                |
-| httpMode                   | string  | Influxdb                                                         | HTTP Method. 'GET', 'POST', defaults to GET                                                                                                                                                                                                                                                                         |
-| maxSeries                  | number  | Influxdb                                                         | Max number of series/tables that Grafana processes                                                                                                                                                                                                                                                                  |
-| httpMethod                 | string  | Prometheus                                                       | HTTP Method. 'GET', 'POST', defaults to POST                                                                                                                                                                                                                                                                        |
-| customQueryParameters      | string  | Prometheus                                                       | Query parameters to add, as a URL-encoded string.                                                                                                                                                                                                                                                                   |
-| manageAlerts               | boolean | Prometheus and Loki                                              | Manage alerts via Alerting UI                                                                                                                                                                                                                                                                                       |
-| esVersion                  | string  | Elasticsearch                                                    | Elasticsearch version (E.g. `7.0.0`, `7.6.1`)                                                                                                                                                                                                                                                                       |
-| timeField                  | string  | Elasticsearch                                                    | Which field that should be used as timestamp                                                                                                                                                                                                                                                                        |
-| interval                   | string  | Elasticsearch                                                    | Index date time format. nil(No Pattern), 'Hourly', 'Daily', 'Weekly', 'Monthly' or 'Yearly'                                                                                                                                                                                                                         |
-| logMessageField            | string  | Elasticsearch                                                    | Which field should be used as the log message                                                                                                                                                                                                                                                                       |
-| logLevelField              | string  | Elasticsearch                                                    | Which field should be used to indicate the priority of the log message                                                                                                                                                                                                                                              |
-| maxConcurrentShardRequests | number  | Elasticsearch                                                    | Maximum number of concurrent shard requests that each sub-search request executes per node. Defaults to 5 if esVersion is greater than or equals 7.0.0. When the esVersion is less than 7.0.0 and greater than or equals 5.6.0, then the default value is 256. Option is ignored when esVersion is less than 5.6.0. |
-| sigV4Auth                  | boolean | Elasticsearch and Prometheus                                     | Enable usage of SigV4                                                                                                                                                                                                                                                                                               |
-| sigV4AuthType              | string  | Elasticsearch and Prometheus                                     | SigV4 auth provider. default/credentials/keys                                                                                                                                                                                                                                                                       |
-| sigV4ExternalId            | string  | Elasticsearch and Prometheus                                     | Optional SigV4 External ID                                                                                                                                                                                                                                                                                          |
-| sigV4AssumeRoleArn         | string  | Elasticsearch and Prometheus                                     | Optional SigV4 ARN role to assume                                                                                                                                                                                                                                                                                   |
-| sigV4Region                | string  | Elasticsearch and Prometheus                                     | SigV4 AWS region                                                                                                                                                                                                                                                                                                    |
-| sigV4Profile               | string  | Elasticsearch and Prometheus                                     | Optional SigV4 credentials profile                                                                                                                                                                                                                                                                                  |
-| authType                   | string  | Cloudwatch                                                       | Auth provider. default/credentials/keys                                                                                                                                                                                                                                                                             |
-| externalId                 | string  | Cloudwatch                                                       | Optional External ID                                                                                                                                                                                                                                                                                                |
-| assumeRoleArn              | string  | Cloudwatch                                                       | Optional ARN role to assume                                                                                                                                                                                                                                                                                         |
-| defaultRegion              | string  | Cloudwatch                                                       | Optional default AWS region                                                                                                                                                                                                                                                                                         |
-| customMetricsNamespaces    | string  | Cloudwatch                                                       | Namespaces of Custom Metrics                                                                                                                                                                                                                                                                                        |
-| profile                    | string  | Cloudwatch                                                       | Optional credentials profile                                                                                                                                                                                                                                                                                        |
-| tsdbVersion                | string  | OpenTSDB                                                         | Version                                                                                                                                                                                                                                                                                                             |
-| tsdbResolution             | string  | OpenTSDB                                                         | Resolution                                                                                                                                                                                                                                                                                                          |
-| sslmode                    | string  | PostgreSQL                                                       | SSLmode. 'disable', 'require', 'verify-ca' or 'verify-full'                                                                                                                                                                                                                                                         |
-| tlsConfigurationMethod     | string  | PostgreSQL                                                       | SSL Certificate configuration, either by 'file-path' or 'file-content'                                                                                                                                                                                                                                              |
-| sslRootCertFile            | string  | PostgreSQL                                                       | SSL server root certificate file, must be readable by the Grafana user                                                                                                                                                                                                                                              |
-| sslCertFile                | string  | PostgreSQL                                                       | SSL client certificate file, must be readable by the Grafana user                                                                                                                                                                                                                                                   |
-| sslKeyFile                 | string  | PostgreSQL                                                       | SSL client key file, must be readable by _only_ the Grafana user                                                                                                                                                                                                                                                    |
-| encrypt                    | string  | MSSQL                                                            | Connection SSL encryption handling. 'disable', 'false' or 'true'                                                                                                                                                                                                                                                    |
-| postgresVersion            | number  | PostgreSQL                                                       | Postgres version as a number (903/904/905/906/1000) meaning v9.3, v9.4, ..., v10                                                                                                                                                                                                                                    |
-| timescaledb                | boolean | PostgreSQL                                                       | Enable usage of TimescaleDB extension                                                                                                                                                                                                                                                                               |
-| maxOpenConns               | number  | MySQL, PostgreSQL and MSSQL                                      | Maximum number of open connections to the database (Grafana v5.4+)                                                                                                                                                                                                                                                  |
-| maxIdleConns               | number  | MySQL, PostgreSQL and MSSQL                                      | Maximum number of connections in the idle connection pool (Grafana v5.4+)                                                                                                                                                                                                                                           |
-| connMaxLifetime            | number  | MySQL, PostgreSQL and MSSQL                                      | Maximum amount of time in seconds a connection may be reused (Grafana v5.4+)                                                                                                                                                                                                                                        |
-| keepCookies                | array   | _HTTP\*_                                                         | Cookies that needs to be passed along while communicating with datasources                                                                                                                                                                                                                                          |
+| Name                    | Type    | Datasource                                                       | Description                                                                                                                                       |
+| ----------------------- | ------- | ---------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- |
+| tlsAuth                 | boolean | _HTTP\*_, MySQL                                                  | Enable TLS authentication using client cert configured in secure json data                                                                        |
+| tlsAuthWithCACert       | boolean | _HTTP\*_, MySQL, PostgreSQL                                      | Enable TLS authentication using CA cert                                                                                                           |
+| tlsSkipVerify           | boolean | _HTTP\*_, MySQL, PostgreSQL                                      | Controls whether a client verifies the server's certificate chain and host name.                                                                  |
+| serverName              | string  | _HTTP\*_                                                         | Optional. Controls the server name used for certificate common name/subject alternative name verification. Defaults to using the data source URL. |
+| timeout                 | string  | _HTTP\*_                                                         | Request timeout in seconds. Overrides dataproxy.timeout option                                                                                    |
+| graphiteVersion         | string  | Graphite                                                         | Graphite version                                                                                                                                  |
+| timeInterval            | string  | Prometheus, Elasticsearch, InfluxDB, MySQL, PostgreSQL and MSSQL | Lowest interval/step value that should be used for this data source.                                                                              |
+| httpMode                | string  | Influxdb                                                         | HTTP Method. 'GET', 'POST', defaults to GET                                                                                                       |
+| maxSeries               | number  | Influxdb                                                         | Max number of series/tables that Grafana processes                                                                                                |
+| httpMethod              | string  | Prometheus                                                       | HTTP Method. 'GET', 'POST', defaults to POST                                                                                                      |
+| customQueryParameters   | string  | Prometheus                                                       | Query parameters to add, as a URL-encoded string.                                                                                                 |
+| manageAlerts            | boolean | Prometheus and Loki                                              | Manage alerts via Alerting UI                                                                                                                     |
+| esVersion               | string  | Elasticsearch                                                    | Elasticsearch version (E.g. `7.0.0`, `7.6.1`)                                                                                                     |
+| timeField               | string  | Elasticsearch                                                    | Which field that should be used as timestamp                                                                                                      |
+| interval                | string  | Elasticsearch                                                    | Index date time format. nil(No Pattern), 'Hourly', 'Daily', 'Weekly', 'Monthly' or 'Yearly'                                                       |
+| logMessageField         | string  | Elasticsearch                                                    | Which field should be used as the log message                                                                                                     |
+| logLevelField           | string  | Elasticsearch                                                    | Which field should be used to indicate the priority of the log message                                                                            |
+| sigV4Auth               | boolean | Elasticsearch and Prometheus                                     | Enable usage of SigV4                                                                                                                             |
+| sigV4AuthType           | string  | Elasticsearch and Prometheus                                     | SigV4 auth provider. default/credentials/keys                                                                                                     |
+| sigV4ExternalId         | string  | Elasticsearch and Prometheus                                     | Optional SigV4 External ID                                                                                                                        |
+| sigV4AssumeRoleArn      | string  | Elasticsearch and Prometheus                                     | Optional SigV4 ARN role to assume                                                                                                                 |
+| sigV4Region             | string  | Elasticsearch and Prometheus                                     | SigV4 AWS region                                                                                                                                  |
+| sigV4Profile            | string  | Elasticsearch and Prometheus                                     | Optional SigV4 credentials profile                                                                                                                |
+| authType                | string  | Cloudwatch                                                       | Auth provider. default/credentials/keys                                                                                                           |
+| externalId              | string  | Cloudwatch                                                       | Optional External ID                                                                                                                              |
+| assumeRoleArn           | string  | Cloudwatch                                                       | Optional ARN role to assume                                                                                                                       |
+| defaultRegion           | string  | Cloudwatch                                                       | Optional default AWS region                                                                                                                       |
+| customMetricsNamespaces | string  | Cloudwatch                                                       | Namespaces of Custom Metrics                                                                                                                      |
+| profile                 | string  | Cloudwatch                                                       | Optional credentials profile                                                                                                                      |
+| tsdbVersion             | string  | OpenTSDB                                                         | Version                                                                                                                                           |
+| tsdbResolution          | string  | OpenTSDB                                                         | Resolution                                                                                                                                        |
+| sslmode                 | string  | PostgreSQL                                                       | SSLmode. 'disable', 'require', 'verify-ca' or 'verify-full'                                                                                       |
+| tlsConfigurationMethod  | string  | PostgreSQL                                                       | SSL Certificate configuration, either by 'file-path' or 'file-content'                                                                            |
+| sslRootCertFile         | string  | PostgreSQL                                                       | SSL server root certificate file, must be readable by the Grafana user                                                                            |
+| sslCertFile             | string  | PostgreSQL                                                       | SSL client certificate file, must be readable by the Grafana user                                                                                 |
+| sslKeyFile              | string  | PostgreSQL                                                       | SSL client key file, must be readable by _only_ the Grafana user                                                                                  |
+| encrypt                 | string  | MSSQL                                                            | Connection SSL encryption handling. 'disable', 'false' or 'true'                                                                                  |
+| postgresVersion         | number  | PostgreSQL                                                       | Postgres version as a number (903/904/905/906/1000) meaning v9.3, v9.4, ..., v10                                                                  |
+| timescaledb             | boolean | PostgreSQL                                                       | Enable usage of TimescaleDB extension                                                                                                             |
+| maxOpenConns            | number  | MySQL, PostgreSQL and MSSQL                                      | Maximum number of open connections to the database (Grafana v5.4+)                                                                                |
+| maxIdleConns            | number  | MySQL, PostgreSQL and MSSQL                                      | Maximum number of connections in the idle connection pool (Grafana v5.4+)                                                                         |
+| connMaxLifetime         | number  | MySQL, PostgreSQL and MSSQL                                      | Maximum amount of time in seconds a connection may be reused (Grafana v5.4+)                                                                      |
+| keepCookies             | array   | _HTTP\*_                                                         | Cookies that needs to be passed along while communicating with datasources                                                                        |
 
 #### Secure Json Data
 
@@ -451,12 +450,11 @@ The following sections detail the supported settings and secure settings for eac
 
 #### Alert notification `discord`
 
-| Name                 | Secure setting |
-| -------------------- | -------------- |
-| url                  | yes            |
-| avatar_url           |                |
-| content              |                |
-| use_discord_username |                |
+| Name       | Secure setting |
+| ---------- | -------------- |
+| url        | yes            |
+| avatar_url |                |
+| content    |                |
 
 #### Alert notification `slack`
 

docs/sources/alerting/old-alerting/notifications.md

@@ -51,26 +51,26 @@ These examples show how often and when reminders are sent for a triggered alert.
 ## List of supported notifiers
 
 | Name                                          | Type                      | Supports images    | Supports alert rule tags |
-| --------------------------------------------- | ------------------------- | ------------------ | ------------------------ |
-| [DingDing](#dingdingdingtalk)                 | `dingding`                | yes, external only | no                       |
-| [Discord](#discord)                           | `discord`                 | yes                | no                       |
-| [Email](#email)                               | `email`                   | yes                | no                       |
-| [Google Hangouts Chat](#google-hangouts-chat) | `googlechat`              | yes, external only | no                       |
-| Hipchat                                       | `hipchat`                 | yes, external only | no                       |
-| [Kafka](#kafka)                               | `kafka`                   | yes, external only | no                       |
-| Line                                          | `line`                    | yes, external only | no                       |
-| Microsoft Teams                               | `teams`                   | yes, external only | no                       |
-| [Opsgenie](#opsgenie)                         | `opsgenie`                | yes, external only | yes                      |
-| [Pagerduty](#pagerduty)                       | `pagerduty`               | yes, external only | yes                      |
-| Prometheus Alertmanager                       | `prometheus-alertmanager` | yes, external only | yes                      |
-| [Pushover](#pushover)                         | `pushover`                | yes                | no                       |
-| Sensu                                         | `sensu`                   | yes, external only | no                       |
-| [Sensu Go](#sensu-go)                         | `sensugo`                 | yes, external only | no                       |
-| [Slack](#slack)                               | `slack`                   | yes                | no                       |
-| Telegram                                      | `telegram`                | yes                | no                       |
-| Threema                                       | `threema`                 | yes, external only | no                       |
-| VictorOps                                     | `victorops`               | yes, external only | yes                      |
-| [Webhook](#webhook)                           | `webhook`                 | yes, external only | yes                      |
+| --------------------------------------------- | ------------------------- | ------------------ | ----------------------- |
+| [DingDing](#dingdingdingtalk)                 | `dingding`                | yes, external only | no                      |
+| [Discord](#discord)                           | `discord`                 | yes                | no                      |
+| [Email](#email)                               | `email`                   | yes                | no                      |
+| [Google Hangouts Chat](#google-hangouts-chat) | `googlechat`              | yes, external only | no                      |
+| Hipchat                                       | `hipchat`                 | yes, external only | no                      |
+| [Kafka](#kafka)                               | `kafka`                   | yes, external only | no                      |
+| Line                                          | `line`                    | yes, external only | no                      |
+| Microsoft Teams                               | `teams`                   | yes, external only | no                      |
+| [Opsgenie](#opsgenie)                         | `opsgenie`                | yes, external only | yes                     |
+| [Pagerduty](#pagerduty)                       | `pagerduty`               | yes, external only | yes                     |
+| Prometheus Alertmanager                       | `prometheus-alertmanager` | yes, external only | yes                     |
+| [Pushover](#pushover)                         | `pushover`                | yes                | no                      |
+| Sensu                                         | `sensu`                   | yes, external only | no                      |
+| [Sensu Go](#sensu-go)                         | `sensugo`                 | yes, external only | no                      |
+| [Slack](#slack)                               | `slack`                   | yes                | no                      |
+| Telegram                                      | `telegram`                | yes                | no                      |
+| Threema                                       | `threema`                 | yes, external only | no                      |
+| VictorOps                                     | `victorops`               | yes, external only | yes                     |
+| [Webhook](#webhook)                           | `webhook`                 | yes, external only | yes                     |
 
 ### Email
 
@@ -227,12 +227,11 @@ In DingTalk PC Client:
 To set up Discord, you must create a Discord channel webhook. For instructions on how to create the channel, refer to
 [Intro to Webhooks](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks).
 
-| Setting                        | Description                                                                                           |
-| ------------------------------ | ----------------------------------------------------------------------------------------------------- |
-| Webhook URL                    | Discord webhook URL.                                                                                  |
-| Message Content                | Mention a group using @ or a user using <@ID> when notifying in a channel.                            |
-| Avatar URL                     | Optionally, provide a URL to an image to use as the avatar for the bot's message.                     |
-| Use Discord's Webhook Username | Use the username configured in Discord's webhook settings. Otherwise, the username will be 'Grafana.' |
+| Setting         | Description                                                                       |
+| --------------- | --------------------------------------------------------------------------------- |
+| Webhook URL     | Discord webhook URL.                                                              |
+| Message Content | Mention a group using @ or a user using <@ID> when notifying in a channel.        |
+| Avatar URL      | Optionally, provide a URL to an image to use as the avatar for the bot's message. |
 
 Alternately, use the [Slack](#slack) notifier by appending `/slack` to a Discord webhook URL.