"Release: Updated versions in package to 8.0.3" (#35929 )

Prometheus: Fixes issue where legend name was replaced with name Value in stat & gauge panels (#35863 ) (#35905 )
(cherry picked from commit 22203fd4df) Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
2021-06-18 10:56:02 +02:00 · 2021-06-18 09:19:26 +01:00 · 2021-06-18 09:12:39 +02:00 · 2021-06-18 09:06:44 +02:00 · 2021-06-18 08:31:16 +02:00 · 2021-06-18 08:28:23 +02:00
1530 changed files with 23955 additions and 86067 deletions
--- a/.drone.star
+++ b/.drone.star
@@ -1,9 +1,3 @@
-# To generate the .drone.yml file:
-# 1. Modify the *.star definitions
-# 2. Login to drone and export the env variables (token and server) shown here: https://drone.grafana.net/account
-# 3. Run `make drone`
-# More information about this process here: https://github.com/grafana/deployment_tools/blob/master/docs/infrastructure/drone/signing.md
-
 load('scripts/pr.star', 'pr_pipelines')
 load('scripts/main.star', 'main_pipelines')
 load('scripts/release.star', 'release_pipelines', 'test_release_pipelines')
--- a/.drone.yml
+++ b/.drone.yml
@@ -17,7 +17,7 @@ steps:
  image: grafana/build-container:1.4.1
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl
  - chmod +x bin/grabpl
  - ./bin/grabpl verify-drone
  - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
@@ -98,7 +98,7 @@ steps:
 - name: validate-scuemata
  image: grafana/build-container:1.4.1
  commands:
-  - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
+  - ./bin/linux-amd64/grafana-cli cue validate-schema
  depends_on:
  - build-backend

@@ -258,7 +258,7 @@ steps:
  image: grafana/build-container:1.4.1
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl
  - chmod +x bin/grabpl
  - ./bin/grabpl verify-drone
  - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
@@ -323,6 +323,17 @@ steps:
  depends_on:
  - initialize

+- name: publish-frontend-metrics
+  image: grafana/build-container:1.4.1
+  commands:
+  - ./scripts/ci-frontend-metrics.sh | ./bin/grabpl publish-metrics $${GRAFANA_MISC_STATS_API_KEY}
+  environment:
+    GRAFANA_MISC_STATS_API_KEY:
+      from_secret: grafana_misc_stats_api_key
+  failure: ignore
+  depends_on:
+  - initialize
+
 - name: build-backend
  image: grafana/build-container:1.4.1
  commands:
@@ -354,7 +365,7 @@ steps:
 - name: validate-scuemata
  image: grafana/build-container:1.4.1
  commands:
-  - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
+  - ./bin/linux-amd64/grafana-cli cue validate-schema
  depends_on:
  - build-backend

@@ -432,17 +443,6 @@ steps:
  - build-storybook
  - end-to-end-tests

- name: publish-frontend-metrics
-  image: grafana/build-container:1.4.1
-  commands:
-  - ./scripts/ci-frontend-metrics.sh | ./bin/grabpl publish-metrics $${GRAFANA_MISC_STATS_API_KEY}
-  environment:
-    GRAFANA_MISC_STATS_API_KEY:
-      from_secret: grafana_misc_stats_api_key
-  failure: ignore
-  depends_on:
-  - build-frontend
-
 - name: build-frontend-docs
  image: grafana/build-container:1.4.1
  commands:
@@ -589,7 +589,8 @@ steps:
  image: grafana/ci-wix:0.1.1
  commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/windows/grabpl.exe -OutFile grabpl.exe
+  - .\grabpl.exe verify-drone

 - name: build-windows-installer
  image: grafana/ci-wix:0.1.1
@@ -638,7 +639,7 @@ steps:
  image: grafana/build-container:1.4.1
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl
  - chmod +x bin/grabpl
  - ./bin/grabpl verify-drone
  environment:
@@ -723,7 +724,7 @@ steps:
  image: grafana/build-container:1.4.1
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl
  - chmod +x bin/grabpl
  - ./bin/grabpl verify-drone
  - ./bin/grabpl verify-version ${DRONE_TAG}
@@ -811,7 +812,7 @@ steps:
 - name: validate-scuemata
  image: grafana/build-container:1.4.1
  commands:
-  - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
+  - ./bin/linux-amd64/grafana-cli cue validate-schema
  depends_on:
  - build-backend

@@ -1029,7 +1030,8 @@ steps:
  image: grafana/ci-wix:0.1.1
  commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/windows/grabpl.exe -OutFile grabpl.exe
+  - .\grabpl.exe verify-drone

 - name: build-windows-installer
  image: grafana/ci-wix:0.1.1
@@ -1079,7 +1081,7 @@ steps:
  image: grafana/build-container:1.4.1
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl
  - chmod +x bin/grabpl
  - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
  - cd grafana-enterprise
@@ -1186,7 +1188,7 @@ steps:
 - name: validate-scuemata
  image: grafana/build-container:1.4.1
  commands:
-  - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
+  - ./bin/linux-amd64/grafana-cli cue validate-schema
  depends_on:
  - build-backend

@@ -1504,7 +1506,7 @@ steps:
  image: grafana/ci-wix:0.1.1
  commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/windows/grabpl.exe -OutFile grabpl.exe
  - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
  - cd grafana-enterprise
  - git checkout ${DRONE_TAG}
@@ -1521,6 +1523,7 @@ steps:
  - rm -force grabpl.exe
  - C:\App\grabpl.exe init-enterprise C:\App\grafana-enterprise
  - cp C:\App\grabpl.exe grabpl.exe
+  - .\grabpl.exe verify-drone
  depends_on:
  - clone

@@ -1572,7 +1575,7 @@ steps:
  image: grafana/build-container:1.4.1
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl
  - chmod +x bin/grabpl
  - ./bin/grabpl verify-drone
  - ./bin/grabpl verify-version ${DRONE_TAG}
@@ -1677,7 +1680,7 @@ steps:
  image: grafana/build-container:1.4.1
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl
  - chmod +x bin/grabpl
  - ./bin/grabpl verify-drone
  - ./bin/grabpl verify-version v7.3.0-test
@@ -1765,7 +1768,7 @@ steps:
 - name: validate-scuemata
  image: grafana/build-container:1.4.1
  commands:
-  - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
+  - ./bin/linux-amd64/grafana-cli cue validate-schema
  depends_on:
  - build-backend

@@ -1972,7 +1975,8 @@ steps:
  image: grafana/ci-wix:0.1.1
  commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/windows/grabpl.exe -OutFile grabpl.exe
+  - .\grabpl.exe verify-drone

 - name: build-windows-installer
  image: grafana/ci-wix:0.1.1
@@ -2022,7 +2026,7 @@ steps:
  image: grafana/build-container:1.4.1
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl
  - chmod +x bin/grabpl
  - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
  - cd grafana-enterprise
@@ -2129,7 +2133,7 @@ steps:
 - name: validate-scuemata
  image: grafana/build-container:1.4.1
  commands:
-  - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
+  - ./bin/linux-amd64/grafana-cli cue validate-schema
  depends_on:
  - build-backend

@@ -2441,7 +2445,7 @@ steps:
  image: grafana/ci-wix:0.1.1
  commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/windows/grabpl.exe -OutFile grabpl.exe
  - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
  - cd grafana-enterprise
  - git checkout main
@@ -2458,6 +2462,7 @@ steps:
  - rm -force grabpl.exe
  - C:\App\grabpl.exe init-enterprise C:\App\grafana-enterprise
  - cp C:\App\grabpl.exe grabpl.exe
+  - .\grabpl.exe verify-drone
  depends_on:
  - clone

@@ -2509,7 +2514,7 @@ steps:
  image: grafana/build-container:1.4.1
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl
  - chmod +x bin/grabpl
  - ./bin/grabpl verify-drone
  - ./bin/grabpl verify-version v7.3.0-test
@@ -2614,7 +2619,7 @@ steps:
  image: grafana/build-container:1.4.1
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl
  - chmod +x bin/grabpl
  - ./bin/grabpl verify-drone
  - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
@@ -2698,7 +2703,7 @@ steps:
 - name: validate-scuemata
  image: grafana/build-container:1.4.1
  commands:
-  - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
+  - ./bin/linux-amd64/grafana-cli cue validate-schema
  depends_on:
  - build-backend

@@ -2884,7 +2889,8 @@ steps:
  image: grafana/ci-wix:0.1.1
  commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/windows/grabpl.exe -OutFile grabpl.exe
+  - .\grabpl.exe verify-drone

 - name: build-windows-installer
  image: grafana/ci-wix:0.1.1
@@ -2930,7 +2936,7 @@ steps:
  image: grafana/build-container:1.4.1
  commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/grabpl
  - chmod +x bin/grabpl
  - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
  - cd grafana-enterprise
@@ -3033,7 +3039,7 @@ steps:
 - name: validate-scuemata
  image: grafana/build-container:1.4.1
  commands:
-  - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
+  - ./bin/linux-amd64/grafana-cli cue validate-schema
  depends_on:
  - build-backend

@@ -3352,7 +3358,7 @@ steps:
  image: grafana/ci-wix:0.1.1
  commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.0.0/windows/grabpl.exe -OutFile grabpl.exe
  - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
  - cd grafana-enterprise
  - git checkout $$env:DRONE_BRANCH
@@ -3369,6 +3375,7 @@ steps:
  - rm -force grabpl.exe
  - C:\App\grabpl.exe init-enterprise C:\App\grafana-enterprise
  - cp C:\App\grabpl.exe grabpl.exe
+  - .\grabpl.exe verify-drone
  depends_on:
  - clone

@@ -3486,16 +3493,4 @@ get:
  path: infra/data/ci/github/grafanabot
  name: pat

---
-kind: secret
-name: drone_token
-
-get:
-  path: infra/data/ci/drone
-  name: machine-user-token
-
---
-kind: signature
-hmac: fa16b4de5ce285e6e9495b3ed797383627ffd4d43539eab58186fe8cc227d3e7
-
 ...
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -11,9 +11,9 @@
 # In each subsection folders are ordered first by depth, then alphabetically.
 # This should make it easy to add new rules without breaking existing ones.

-# Documentation owner: Jita Chatterjee
-/docs/ @grafana/docs-squad @pkolyvas
-/contribute/ @marcusolsson @grafana/docs-squad @pkolyvas
+# Documentation owner: Diana Payton
+/docs/ @grafana/docs-squad
+/contribute/ @marcusolsson @grafana/docs-squad
 /docs/sources/developers/plugins/ @marcusolsson @grafana/docs-squad
 /docs/sources/enterprise/ @osg-grafana @grafana/docs-squad

--- a/.github/ISSUE_TEMPLATE/2-feature_request.md
+++ b/.github/ISSUE_TEMPLATE/2-feature_request.md
@@ -0,0 +1,11 @@
+---
+name: Enhancement request
+about: Suggest an enhancement or new feature for the Grafana project
+labels: 'type: feature request'
+---
+
+<!-- Please only use this template for submitting feature requests -->
+
+**What would you like to be added**:
+
+**Why is this needed**:
--- a/.github/ISSUE_TEMPLATE/3-accessibility.md
+++ b/.github/ISSUE_TEMPLATE/3-accessibility.md
--- a/.github/ISSUE_TEMPLATE/4-grafana_ui_component.md
+++ b/.github/ISSUE_TEMPLATE/4-grafana_ui_component.md
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Feature Request
-    url: https://github.com/grafana/grafana/discussions/new
-    about: Discuss ideas for new features of changes
  - name: Questions & Help
    url: https://community.grafana.com
    about: Please ask and answer questions here.
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -3,7 +3,7 @@ name: publish_docs
 on:
  push:
    branches:
-    - main
+    - v8.0.x
    paths:
    - 'docs/sources/**'
    - 'packages/grafana-*/**'
@@ -36,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: |
--- a/.gitignore
+++ b/.gitignore
@@ -50,7 +50,6 @@ public/css/*.min.css
 *.tmp
 .DS_Store
 .vscode/
-!.vscode/launch.json
 .vs/
 .eslintcache

--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,14 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Run Server",
-      "type": "go",
-      "request": "launch",
-      "mode": "auto",
-      "program": "${workspaceFolder}/pkg/cmd/grafana-server/",
-      "env": {},
-      "args": ["--homepath", "${workspaceFolder}", "--packaging", "dev"]
-    }
-  ]
-}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,192 +1,4 @@

-<!-- 8.1.0-beta1 START -->
-
-# 8.1.0-beta1 (2021-07-22)
-
-### Features and enhancements
-
-* **Alerting:** Add Alertmanager notifications tab. [#35759](https://github.com/grafana/grafana/pull/35759), [@nathanrodman](https://github.com/nathanrodman)
-* **Alerting:** Add button to deactivate current Alertmanager configuration. [#36951](https://github.com/grafana/grafana/pull/36951), [@domasx2](https://github.com/domasx2)
-* **Alerting:** Add toggle in Loki/Prometheus data source configuration to opt out of alerting UI. [#36552](https://github.com/grafana/grafana/pull/36552), [@domasx2](https://github.com/domasx2)
-* **Alerting:** Allow any "evaluate for" value >=0 in the alert rule form. [#35807](https://github.com/grafana/grafana/pull/35807), [@domasx2](https://github.com/domasx2)
-* **Alerting:** Load default configuration from status endpoint, if Cortex Alertmanager returns empty user configuration. [#35769](https://github.com/grafana/grafana/pull/35769), [@domasx2](https://github.com/domasx2)
-* **Alerting:** view to display alert rule and its underlying data. [#35546](https://github.com/grafana/grafana/pull/35546), [@mckn](https://github.com/mckn)
-* **Annotation panel:** Release the annotation panel. [#36959](https://github.com/grafana/grafana/pull/36959), [@ryantxu](https://github.com/ryantxu)
-* **Annotations:** Add typeahead support for tags in built-in annotations. [#36377](https://github.com/grafana/grafana/pull/36377), [@ashharrison90](https://github.com/ashharrison90)
-* **AzureMonitor:** Add curated dashboards for Azure services. [#35356](https://github.com/grafana/grafana/pull/35356), [@avidhanju](https://github.com/avidhanju)
-* **AzureMonitor:** Add support for deep links to Microsoft Azure portal for Metrics. [#32273](https://github.com/grafana/grafana/pull/32273), [@shuotli](https://github.com/shuotli)
-* **AzureMonitor:** Remove support for different credentials for Azure Monitor Logs. [#35121](https://github.com/grafana/grafana/pull/35121), [@andresmgot](https://github.com/andresmgot)
-* **AzureMonitor:** Support querying any Resource for Logs queries. [#33879](https://github.com/grafana/grafana/pull/33879), [@joshhunt](https://github.com/joshhunt)
-* **Elasticsearch:** Add frozen indices search support. [#36018](https://github.com/grafana/grafana/pull/36018), [@Elfo404](https://github.com/Elfo404)
-* **Elasticsearch:** Name fields after template variables values instead of their name. [#36035](https://github.com/grafana/grafana/pull/36035), [@Elfo404](https://github.com/Elfo404)
-* **Elasticsearch:** add rate aggregation. [#33311](https://github.com/grafana/grafana/pull/33311), [@estermv](https://github.com/estermv)
-* **Email:** Allow configuration of content types for email notifications. [#34530](https://github.com/grafana/grafana/pull/34530), [@djairhogeuens](https://github.com/djairhogeuens)
-* **Explore:** Add more meta information when line limit is hit. [#33069](https://github.com/grafana/grafana/pull/33069), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Explore:** UI improvements to trace view. [#34276](https://github.com/grafana/grafana/pull/34276), [@aocenas](https://github.com/aocenas)
-* **FieldOverrides:** Added support to change display name in an override field and have it be matched by a later rule. [#35893](https://github.com/grafana/grafana/pull/35893), [@torkelo](https://github.com/torkelo)
-* **HTTP Client:** Introduce `dataproxy_max_idle_connections` config variable. [#35864](https://github.com/grafana/grafana/pull/35864), [@dsotirakis](https://github.com/dsotirakis)
-* **InfluxDB:** InfluxQL: adds tags to timeseries data. [#36702](https://github.com/grafana/grafana/pull/36702), [@gabor](https://github.com/gabor)
-* **InfluxDB:** InfluxQL: make measurement search case insensitive. [#34563](https://github.com/grafana/grafana/pull/34563), [@gabor](https://github.com/gabor)
-* **Legacy Alerting:** Replace simplejson with a struct in webhook notification channel. [#34952](https://github.com/grafana/grafana/pull/34952), [@KEVISONG](https://github.com/KEVISONG)
-* **Legend:** Updates display name for Last (not null) to just Last*. [#35633](https://github.com/grafana/grafana/pull/35633), [@torkelo](https://github.com/torkelo)
-* **Logs panel:** Add option to show common labels. [#36166](https://github.com/grafana/grafana/pull/36166), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Loki:** Add $__range variable. [#36175](https://github.com/grafana/grafana/pull/36175), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Loki:** Add support for "label_values(log stream selector, label)" in templating. [#35488](https://github.com/grafana/grafana/pull/35488), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Loki:** Add support for ad-hoc filtering in dashboard. [#36393](https://github.com/grafana/grafana/pull/36393), [@ivanahuckova](https://github.com/ivanahuckova)
-* **MySQL Datasource:** Add timezone parameter. [#27535](https://github.com/grafana/grafana/pull/27535), [@andipabst](https://github.com/andipabst)
-* **NodeGraph:** Show gradient fields in legend. [#34078](https://github.com/grafana/grafana/pull/34078), [@aocenas](https://github.com/aocenas)
-* **PanelOptions:** Don't mutate panel options/field config object when updating. [#36441](https://github.com/grafana/grafana/pull/36441), [@dprokop](https://github.com/dprokop)
-* **PieChart:** Make pie gradient more subtle to match other charts. [#36961](https://github.com/grafana/grafana/pull/36961), [@nikki-kiga](https://github.com/nikki-kiga)
-* **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)
-* **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)
-* **Tooltip:** Make active series more noticeable. [#36824](https://github.com/grafana/grafana/pull/36824), [@nikki-kiga](https://github.com/nikki-kiga)
-* **Tracing:** Add support to configure trace to logs start and end time. [#34995](https://github.com/grafana/grafana/pull/34995), [@zoltanbedi](https://github.com/zoltanbedi)
-* **Transformations:** Skip merge when there is only a single data frame. [#36407](https://github.com/grafana/grafana/pull/36407), [@edgarpoce](https://github.com/edgarpoce)
-* **ValueMapping:** Added support for mapping text to color, boolean values, NaN and Null. Improved UI for value mapping. [#33820](https://github.com/grafana/grafana/pull/33820), [@torkelo](https://github.com/torkelo)
-* **Visualizations:** Dynamically set any config (min, max, unit, color, thresholds) from query results. [#36548](https://github.com/grafana/grafana/pull/36548), [@torkelo](https://github.com/torkelo)
-* **live:** Add support to handle origin without a value for the port when matching with root_url. [#36834](https://github.com/grafana/grafana/pull/36834), [@FZambia](https://github.com/FZambia)
-
-### Bug fixes
-
-* **Alerting:** Handle marshaling Inf values. [#36947](https://github.com/grafana/grafana/pull/36947), [@kylebrandt](https://github.com/kylebrandt)
-* **AzureMonitor:** Fix macro resolution for template variables. [#36944](https://github.com/grafana/grafana/pull/36944), [@andresmgot](https://github.com/andresmgot)
-* **AzureMonitor:** Fix queries with Microsoft.NetApp/../../volumes resources. [#32661](https://github.com/grafana/grafana/pull/32661), [@pckls](https://github.com/pckls)
-* **AzureMonitor:** Request and concat subsequent resource pages. [#36958](https://github.com/grafana/grafana/pull/36958), [@andresmgot](https://github.com/andresmgot)
-* **Bug:** Fix parse duration for day. [#36942](https://github.com/grafana/grafana/pull/36942), [@idafurjes](https://github.com/idafurjes)
-* **Datasources:** Improve error handling for error messages. [#35120](https://github.com/grafana/grafana/pull/35120), [@ifrost](https://github.com/ifrost)
-* **Explore:** Correct the functionality of shift-enter shortcut across all uses. [#36600](https://github.com/grafana/grafana/pull/36600), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Explore:** Show all dataFrames in data tab in Inspector. [#32161](https://github.com/grafana/grafana/pull/32161), [@ivanahuckova](https://github.com/ivanahuckova)
-* **GraphNG:** Fix Tooltip mode 'All' for XYChart. [#31260](https://github.com/grafana/grafana/pull/31260), [@Posnet](https://github.com/Posnet)
-* **Loki:** Fix highlight of logs when using filter expressions with backticks. [#36024](https://github.com/grafana/grafana/pull/36024), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Modal:** Force modal content to overflow with scroll. [#36754](https://github.com/grafana/grafana/pull/36754), [@ashharrison90](https://github.com/ashharrison90)
-* **Plugins:** Ignore symlinked folders when verifying plugin signature. [#34434](https://github.com/grafana/grafana/pull/34434), [@wbrowne](https://github.com/wbrowne)
-
-### Breaking changes
-
-
-When parsing Elasticsearch query responses using template variables, each field gets named after the variable value instead of the name.
-For example, executing a `terms` aggregation on a variable named `$groupBy` that has `@hostname` as a value, the resulting column in the table response will be `@hostname` instead of `$groupBy` Issue [#36035](https://github.com/grafana/grafana/issues/36035)
-
-
-Azure Monitor data source no longer supports different credentials for Metrics and Logs in existing data sources. To use different credentials for Azure Monitor Logs, create another data source. Issue [#35121](https://github.com/grafana/grafana/issues/35121)
-
-Existing Azure Metrics Logs queries for Log Analytics Workspaces should be backward compatible with this change and should not get impacted. Panels will be migrated to use the new resource-centric backend when you first edit and save them.
-
-Application Insights and Insights Analytics queries are now read-only and cannot be modified. To update Application Insights queries, users can manually recreate them as Metrics queries, and Insights Analytics are recreated with Logs.
-
- Issue [#33879](https://github.com/grafana/grafana/issues/33879)
-
-### Plugin development fixes & changes
-
-* **Toolkit:** Improve error messages when tasks fail. [#36381](https://github.com/grafana/grafana/pull/36381), [@joshhunt](https://github.com/joshhunt)
-
-<!-- 8.1.0-beta1 END -->
-
-<!-- 8.0.6 START -->
-
-# 8.0.6 (2021-07-14)
-
-### Features and enhancements
-
-* **Alerting:** Add annotation upon alert state change. [#36535](https://github.com/grafana/grafana/pull/36535), [@davidmparrott](https://github.com/davidmparrott)
-* **Alerting:** Allow space in label and annotation names. [#36549](https://github.com/grafana/grafana/pull/36549), [@codesome](https://github.com/codesome)
-* **InfluxDB:** Improve legend labels for InfluxDB query results. [#36603](https://github.com/grafana/grafana/pull/36603), [@gabor](https://github.com/gabor)
-
-### Bug fixes
-
-* **Alerting:** Fix improper alert by changing the handling of empty labels. [#36679](https://github.com/grafana/grafana/pull/36679), [@davidmparrott](https://github.com/davidmparrott)
-* **CloudWatch/Logs:** Reestablish Cloud Watch alert behavior. [#36558](https://github.com/grafana/grafana/pull/36558), [@aocenas](https://github.com/aocenas)
-* **Dashboard:** Avoid migration breaking on fieldConfig without defaults field in folded panel. [#36666](https://github.com/grafana/grafana/pull/36666), [@glindstedt](https://github.com/glindstedt)
-* **DashboardList:** Fix issue not re-fetching dashboard list after variable change. [#36591](https://github.com/grafana/grafana/pull/36591), [@torkelo](https://github.com/torkelo)
-* **Database:** Fix incorrect format of isolation level configuration parameter for MySQL. [#36565](https://github.com/grafana/grafana/pull/36565), [@marefr](https://github.com/marefr)
-* **InfluxDB:** Correct tag filtering on InfluxDB data. [#36570](https://github.com/grafana/grafana/pull/36570), [@gabor](https://github.com/gabor)
-* **Links:** Fix links that caused a full page reload. [#36631](https://github.com/grafana/grafana/pull/36631), [@torkelo](https://github.com/torkelo)
-* **Live:** Fix HTTP error when InfluxDB metrics have an incomplete or asymmetrical field set. [#36664](https://github.com/grafana/grafana/pull/36664), [@FZambia](https://github.com/FZambia)
-* **Postgres/MySQL/MSSQL:** Change time field to "Time" for time series queries. [#36720](https://github.com/grafana/grafana/pull/36720), [@marefr](https://github.com/marefr)
-* **Postgres:** Fix the handling of a null return value in query results. [#36648](https://github.com/grafana/grafana/pull/36648), [@idafurjes](https://github.com/idafurjes)
-* **Tempo:** Show hex strings instead of uints for IDs. [#36471](https://github.com/grafana/grafana/pull/36471), [@zoltanbedi](https://github.com/zoltanbedi)
-* **TimeSeries:** Improve tooltip positioning when tooltip overflows. [#36440](https://github.com/grafana/grafana/pull/36440), [@ashharrison90](https://github.com/ashharrison90)
-* **Transformations:** Add 'prepare time series' transformer. [#36737](https://github.com/grafana/grafana/pull/36737), [@ryantxu](https://github.com/ryantxu)
-
-<!-- 8.0.6 END -->
-
-<!-- 8.0.5 START -->
-
-# 8.0.5 (2021-07-08)
-
-### Features and enhancements
-
-* **Cloudwatch Logs:** Send error down to client. [#36277](https://github.com/grafana/grafana/pull/36277), [@zoltanbedi](https://github.com/zoltanbedi)
-* **Folders:** Return 409 Conflict status when folder already exists. [#36429](https://github.com/grafana/grafana/pull/36429), [@dsotirakis](https://github.com/dsotirakis)
-* **TimeSeries:** Do not show series in tooltip if it's hidden in the viz. [#36353](https://github.com/grafana/grafana/pull/36353), [@dprokop](https://github.com/dprokop)
-
-### Bug fixes
-
-* **AzureMonitor:** Fix issue where resource group name is missing on the resource picker button. [#36400](https://github.com/grafana/grafana/pull/36400), [@joshhunt](https://github.com/joshhunt)
-* **Chore:** Fix AWS auth assuming role with workspace IAM. [#36430](https://github.com/grafana/grafana/pull/36430), [@wbrowne](https://github.com/wbrowne)
-* **DashboardQueryRunner:** Fixes unrestrained subscriptions being created. [#36371](https://github.com/grafana/grafana/pull/36371), [@hugohaggmark](https://github.com/hugohaggmark)
-* **DateFormats:** Fix reading correct setting key for use_browser_locale. [#36428](https://github.com/grafana/grafana/pull/36428), [@torkelo](https://github.com/torkelo)
-* **Links:** Fix links to other apps outside Grafana when under sub path. [#36498](https://github.com/grafana/grafana/pull/36498), [@torkelo](https://github.com/torkelo)
-* **Snapshots:** Fix snapshot absolute time range issue. [#36350](https://github.com/grafana/grafana/pull/36350), [@torkelo](https://github.com/torkelo)
-* **Table:** Fix data link color. [#36446](https://github.com/grafana/grafana/pull/36446), [@tharun208](https://github.com/tharun208)
-* **Time Series:** Fix X-axis time format when tick increment is larger than a year. [#36335](https://github.com/grafana/grafana/pull/36335), [@torkelo](https://github.com/torkelo)
-* **Tooltip Plugin:** Prevent tooltip render if field is undefined. [#36260](https://github.com/grafana/grafana/pull/36260), [@ashharrison90](https://github.com/ashharrison90)
-
-<!-- 8.0.5 END -->
-
-<!-- 8.0.4 START -->
-
-# 8.0.4 (2021-07-01)
-
-### Features and enhancements
-
-* **Live:** Rely on app url for origin check. [#35983](https://github.com/grafana/grafana/pull/35983), [@FZambia](https://github.com/FZambia)
-* **PieChart:** Sort legend descending, update placeholder to show default …. [#36062](https://github.com/grafana/grafana/pull/36062), [@ashharrison90](https://github.com/ashharrison90)
-* **TimeSeries panel:** Do not reinitialize plot when thresholds mode change. [#35952](https://github.com/grafana/grafana/pull/35952), [@dprokop](https://github.com/dprokop)
-
-### Bug fixes
-
-* **Elasticsearch:** Allow case sensitive custom options in date_histogram interval. [#36168](https://github.com/grafana/grafana/pull/36168), [@Elfo404](https://github.com/Elfo404)
-* **Elasticsearch:** Restore previous field naming strategy when using variables. [#35624](https://github.com/grafana/grafana/pull/35624), [@Elfo404](https://github.com/Elfo404)
-* **Explore:** Fix import of queries between SQL data sources. [#36210](https://github.com/grafana/grafana/pull/36210), [@ivanahuckova](https://github.com/ivanahuckova)
-* **InfluxDB:** InfluxQL query editor: fix retention policy handling. [#36022](https://github.com/grafana/grafana/pull/36022), [@gabor](https://github.com/gabor)
-* **Loki:** Send correct time range in template variable queries. [#36268](https://github.com/grafana/grafana/pull/36268), [@ivanahuckova](https://github.com/ivanahuckova)
-* **TimeSeries:** Preserve RegExp series overrides when migrating from old graph panel. [#36134](https://github.com/grafana/grafana/pull/36134), [@ashharrison90](https://github.com/ashharrison90)
-
-<!-- 8.0.4 END -->
-
-<!-- 8.0.3 START -->
-
-# 8.0.3 (2021-06-18)
-
-### Features and enhancements
-
-* **Alerting:** Increase alertmanager_conf column if MySQL. [#35657](https://github.com/grafana/grafana/pull/35657), [@kylebrandt](https://github.com/kylebrandt)
-* **Time series/Bar chart panel:** Handle infinite numbers as nulls when converting to plot array. [#35638](https://github.com/grafana/grafana/pull/35638), [@dprokop](https://github.com/dprokop)
-* **TimeSeries:** Ensure series overrides that contain color are migrated, and migrate the previous `fieldConfig` when changing the panel type. [#35676](https://github.com/grafana/grafana/pull/35676), [@ashharrison90](https://github.com/ashharrison90)
-* **ValueMappings:** Improve singlestat value mappings migration. [#35578](https://github.com/grafana/grafana/pull/35578), [@dprokop](https://github.com/dprokop)
-
-### Bug fixes
-
-* **Annotations:** Fix annotation line and marker colors. [#35608](https://github.com/grafana/grafana/pull/35608), [@torkelo](https://github.com/torkelo)
-* **AzureMonitor:** Fix KQL template variable queries without default workspace. [#35836](https://github.com/grafana/grafana/pull/35836), [@joshhunt](https://github.com/joshhunt)
-* **CloudWatch/Logs:** Fix missing response data for log queries. [#35724](https://github.com/grafana/grafana/pull/35724), [@aocenas](https://github.com/aocenas)
-* **Elasticsearch:** Restore previous field naming strategy when using variables. [#35624](https://github.com/grafana/grafana/pull/35624), [@Elfo404](https://github.com/Elfo404)
-* **LibraryPanels:** Fix crash in library panels list when panel plugin is not found. [#35907](https://github.com/grafana/grafana/pull/35907), [@torkelo](https://github.com/torkelo)
-* **LogsPanel:** Fix performance drop when moving logs panel in dashboard. [#35379](https://github.com/grafana/grafana/pull/35379), [@aocenas](https://github.com/aocenas)
-* **Loki:** Parse log levels when ANSI coloring is enabled. [#35607](https://github.com/grafana/grafana/pull/35607), [@olbo98](https://github.com/olbo98)
-* **MSSQL:** Fix issue with hidden queries still being executed. [#35787](https://github.com/grafana/grafana/pull/35787), [@torkelo](https://github.com/torkelo)
-* **PanelEdit:** Display the VisualizationPicker that was not displayed if a panel has an unknown panel plugin. [#35831](https://github.com/grafana/grafana/pull/35831), [@jackw](https://github.com/jackw)
-* **Plugins:** Fix loading symbolically linked plugins. [#35635](https://github.com/grafana/grafana/pull/35635), [@domasx2](https://github.com/domasx2)
-* **Prometheus:** Fix issue where legend name was replaced with name Value in stat and gauge panels. [#35863](https://github.com/grafana/grafana/pull/35863), [@torkelo](https://github.com/torkelo)
-* **State Timeline:** Fix crash when hovering over panel. [#35692](https://github.com/grafana/grafana/pull/35692), [@hugohaggmark](https://github.com/hugohaggmark)
-
-<!-- 8.0.3 END -->
-
 <!-- 8.0.2 START -->

 # 8.0.2 (2021-06-14)
@@ -513,31 +325,8 @@ The InfoBox & FeatureInfoBox are now deprecated please use the Alert component i
 * **TagsInput**: Add className to TagsInput. [#33944](https://github.com/grafana/grafana/pull/33944), [@Clarity-89](https://github.com/Clarity-89)
 * **VizLegend**: Move onSeriesColorChanged to PanelContext (breaking change). [#33611](https://github.com/grafana/grafana/pull/33611), [@ryantxu](https://github.com/ryantxu)

-### License update
-* **AGPL License:** Update license from Apache 2.0 to the GNU Affero General Public License (AGPL). [#33184](https://github.com/grafana/grafana/pull/33184)
-
 <!-- 8.0.0-beta1 END -->

-<!-- 7.5.10 START -->
-
-# 7.5.10 (2021-07-15)
-
-### Bug fixes
-
-* **[v7.5.x] Transformations:** add 'prepare time series' transformer. [#36749](https://github.com/grafana/grafana/pull/36749), [@mckn](https://github.com/mckn)
-
-<!-- 7.5.10 END -->
-
-<!-- 7.5.9 START -->
-
-# 7.5.9 (2021-06-23)
-
-### Bug fixes
-
-* **Login:** Fix Unauthorized message that is displayed on sign-in or snapshot page. [#35880](https://github.com/grafana/grafana/pull/35880), [@torkelo](https://github.com/torkelo)
-
-<!-- 7.5.9 END -->
-
 <!-- 7.5.8 START -->

 # 7.5.8 (2021-06-16)
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -78,7 +78,6 @@ The current team members are:
 - Diana Sarlinska ([Grafana Labs](https://grafana.com/))
 - Dominik Prokop ([Grafana Labs](https://grafana.com/))
 - Emil Tullstedt ([Grafana Labs](https://grafana.com/))
- Erik Sundell ([Grafana Labs](https://grafana.com/))
 - Fredrik Enestad ([Soundtrack Your Brand](https://www.soundtrackyourbrand.com/))
 - Hugo Häggmark ([Grafana Labs](https://grafana.com/))
 - Ivana Huckova ([Grafana Labs](https://grafana.com/))
@@ -103,8 +102,6 @@ The current team members are:
 - Tobias Skarhed ([Grafana Labs](https://grafana.com/))
 - Torkel Ödegaard ([Grafana Labs](https://grafana.com/))
 - Utkarsh Bhatnagar ([Tinder](https://www.tinder.com/))
- Will Browne ([Grafana Labs](https://grafana.com/))
- Zoltán Bedi ([Grafana Labs](https://grafana.com/))

 ### Maintainers

--- a/LICENSING.md
+++ b/LICENSING.md
@@ -6,7 +6,7 @@ The default license for this project is [AGPL-3.0-only](LICENSE).

 ## Apache-2.0

-The following directories and their subdirectories are licensed under Apache-2.0:
+The following folders and their subfolders are licensed under Apache-2.0:

 ```
 packages/grafana-data/
@@ -20,9 +20,3 @@ packaging/
 grafana-mixin/
 cue/
 ```
-
-The following directories and their subdirectories are the original upstream licenses:
-
-```
-public/vendor/
-```
--- a/14
+++ b/14
@@ -4,9 +4,9 @@

 -include local/Makefile

-.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
+.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 help

-GO = go
+GO = GO111MODULE=on go
 GO_FILES ?= ./pkg/...
 SH_FILES ?= $(shell find ./scripts -name *.sh)

@@ -51,7 +51,7 @@ scripts/go/bin/bra: scripts/go/go.mod
 	$(GO) build -o ./bin/bra github.com/unknwon/bra

 run: scripts/go/bin/bra ## Build and run web server on filesystem changes.
-	@scripts/go/bin/bra run
+	@GO111MODULE=on scripts/go/bin/bra run

 run-frontend: deps-js ## Fetch js dependencies and watch frontend for rebuild
 	yarn start
@@ -140,13 +140,5 @@ clean: ## Clean up intermediate build artifacts.
 	rm -rf node_modules
 	rm -rf public/build

-# 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 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)
--- a/UPGRADING_DEPENDENCIES.md
+++ b/UPGRADING_DEPENDENCIES.md
@@ -4,14 +4,14 @@ Upgrading Go or Node.js requires making changes in many different files. See bel

 ## Go

- Drone
+- CircleCi
 - `grafana/build-container`
 - Appveyor
 - Dockerfile

 ## Node.js

- Drone
+- CircleCI
 - `grafana/build-container`
 - Appveyor
 - Dockerfile
@@ -20,29 +20,28 @@ Upgrading Go or Node.js requires making changes in many different files. See bel

 The Grafana project uses [Go modules](https://golang.org/cmd/go/#hdr-Modules__module_versions__and_more) to manage dependencies on external packages. This requires a working Go environment with version 1.11 or greater installed.

+> **Note:** Since most developers of Grafana still use the `GOPATH` we need to specify `GO111MODULE=on` to make `go mod` and `got get` work as intended. If you have setup Grafana outside of the `GOPATH` on your machine you can skip `GO111MODULE=on` when running the commands below.
+
 To add or update a new dependency, use the `go get` command:

 ```bash
-go get example.com/some/module/pkg
+# The GO111MODULE variable can be omitted when the code isn't located in GOPATH.
+# Pick the latest tagged release.
+GO111MODULE=on go get example.com/some/module/pkg

 # Pick a specific version.
-go get example.com/some/module/pkg@vX.Y.Z
+GO111MODULE=on go get example.com/some/module/pkg@vX.Y.Z
 ```

 Tidy up the `go.mod` and `go.sum` files:

 ```bash
-go mod tidy
+# The GO111MODULE variable can be omitted when the code isn't located in GOPATH.
+GO111MODULE=on go mod tidy
 ```

 You have to commit the changes to `go.mod` and `go.sum` before submitting the pull request.

-To understand what the actual dependencies of `grafana-server` are, one could run it with `-vv` flag. This might produce an output, different from `go.mod` contents and `-vv` option is the source of truth here. It lists the modules _compiled_ into the executable, while `go.mod` lists also test and weak transitive dependencies (modules, used in some package, which is not in use by itself). If you are interested in reporting a vulnerability in a dependency module - please consult `-vv` output, maybe the "dependency" is not a dependency as such.
-
-### Upgrading dependencies
-
-If you need to upgrade a direct or indirect dependency, you can do it like so, $MODULE being the dependency in question: `go get -u $MODULE`. The corresponding entry in go.mod should then have the version you specified; if it's an indirect dependency, the entry should have the `// indirect` comment. Follow this by executing `go mod tidy`, to ensure that go.mod and go.sum are up to date. If the indirect dependency turns out to not be used (transitively) by any of our packages, `go mod tidy` will actually strip it from go.mod. In that case, you can just ignore it since it isn't used in the end.
-
 ## Node.js dependencies

 Updated using `yarn`.
@@ -51,9 +50,9 @@ Updated using `yarn`.

 ## Where to make changes

-### Drone
+### CircleCI

-Our CI builds run on Drone.
+Our builds run on CircleCI through our build script.

 #### Files

@@ -67,7 +66,7 @@ Our CI builds run on Drone.

 ### grafana/build-container

-The main build steps (in Drone) happen using a custom Docker image that comes pre-baked with some of the necessary dependencies.
+The main build step (in CircleCI) is built using a custom build container that comes pre-baked with some of the necessary dependencies.

 Link: [grafana/build-container](https://github.com/grafana/grafana/tree/main/scripts/build/ci-build)

--- a/build.go
+++ b/build.go
@@ -342,6 +342,9 @@ func setBuildEnv() {
 	} else {
 		os.Setenv("GOARCH", goarch)
 	}
+	if goarch == "386" {
+		os.Setenv("GO386", "387")
+	}
 	if cgo {
 		os.Setenv("CGO_ENABLED", "1")
 	}
@@ -393,6 +396,7 @@ func runError(cmd string, args ...string) ([]byte, error) {
 func runPrint(cmd string, args ...string) {
 	log.Println(cmd, strings.Join(args, " "))
 	ecmd := exec.Command(cmd, args...)
+	ecmd.Env = append(os.Environ(), "GO111MODULE=on")
 	ecmd.Stdout = os.Stdout
 	ecmd.Stderr = os.Stderr
 	err := ecmd.Run()
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -166,6 +166,9 @@ max_conns_per_host = 0
 # The maximum number of idle connections that Grafana will keep alive.
 max_idle_connections = 100

+# The maximum number of idle connections per host that Grafana will keep alive.
+max_idle_connections_per_host = 2
+
 # How many seconds the data proxy keeps an idle connection open before timing out.
 idle_conn_timeout_seconds = 90

@@ -196,12 +199,6 @@ google_analytics_ua_id =
 # Google Tag Manager ID, only enabled if you specify an id here
 google_tag_manager_id =

-# Rudderstack write key, enabled only if rudderstack_data_plane_url is also set
-rudderstack_write_key =
-
-# Rudderstack data plane url, enabled only if rudderstack_write_key is also set
-rudderstack_data_plane_url =
-
 #################################### Security ############################
 [security]
 # disable creation of admin user on first start of grafana
@@ -496,7 +493,6 @@ login_attribute_path =
 name_attribute_path =
 role_attribute_path =
 role_attribute_strict = false
-groups_attribute_path =
 id_token_attribute_name =
 auth_url =
 token_url =
@@ -595,8 +591,7 @@ startTLS_policy =

 [emails]
 welcome_email_on_sign_up = false
-templates_pattern = emails/*.html, emails/*.txt
-content_types = text/html
+templates_pattern = emails/*.html

 #################################### Logging ##########################
 [log]
@@ -906,21 +901,6 @@ plugin_catalog_url = https://grafana.com/grafana/plugins/
 # tuning. 0 disables Live, -1 means unlimited connections.
 max_connections = 100

-# allowed_origins is a comma-separated list of origins that can establish connection with Grafana Live.
-# If not set then origin will be matched over root_url. Supports wildcard symbol "*".
-allowed_origins =
-
-# engine defines an HA (high availability) engine to use for Grafana Live. By default no engine used - in
-# this case Live features work only on a single Grafana server.
-# Available options: "redis".
-# Setting ha_engine is an EXPERIMENTAL feature.
-ha_engine =
-
-# ha_engine_address sets a connection address for Live HA engine. Depending on engine type address format can differ.
-# For now we only support Redis connection address in "host:port" format.
-# This option is EXPERIMENTAL.
-ha_engine_address = "127.0.0.1:6379"
-
 #################################### Grafana Image Renderer Plugin ##########################
 [plugin.grafana-image-renderer]
 # Instruct headless browser instance to use a default timezone when not provided by Grafana, e.g. when rendering panel image of alert.
@@ -1011,10 +991,3 @@ default_timezone = browser
 [expressions]
 # Enable or disable the expressions functionality.
 enabled = true
-
-[geomap]
-# Set the JSON configuration for the default basemap
-default_baselayer_config =
-
-# Enable or disable loading other base map layers
-enable_custom_baselayers = true
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -172,6 +172,9 @@
 # The maximum number of idle connections that Grafana will keep alive.
 ;max_idle_connections = 100

+# The maximum number of idle connections per host that Grafana will keep alive.
+;max_idle_connections_per_host = 2
+
 # How many seconds the data proxy keeps an idle connection open before timing out.
 ;idle_conn_timeout_seconds = 90

@@ -488,7 +491,6 @@
 ;allowed_organizations =
 ;role_attribute_path =
 ;role_attribute_strict = false
-;groups_attribute_path =
 ;tls_skip_verify_insecure = false
 ;tls_client_cert =
 ;tls_client_key =
@@ -578,8 +580,7 @@

 [emails]
 ;welcome_email_on_sign_up = false
-;templates_pattern = emails/*.html, emails/*.txt
-;content_types = text/html
+;templates_pattern = emails/*.html

 #################################### Logging ##########################
 [log]
@@ -886,20 +887,6 @@
 # tuning. 0 disables Live, -1 means unlimited connections.
 ;max_connections = 100

-# allowed_origins is a comma-separated list of origins that can establish connection with Grafana Live.
-# If not set then origin will be matched over root_url. Supports wildcard symbol "*".
-;allowed_origins =
-
-# engine defines an HA (high availability) engine to use for Grafana Live. By default no engine used - in
-# this case Live features work only on a single Grafana server. Available options: "redis".
-# Setting ha_engine is an EXPERIMENTAL feature.
-;ha_engine =
-
-# ha_engine_address sets a connection address for Live HA engine. Depending on engine type address format can differ.
-# For now we only support Redis connection address in "host:port" format.
-# This option is EXPERIMENTAL.
-;ha_engine_address = "127.0.0.1:6379"
-
 #################################### Grafana Image Renderer Plugin ##########################
 [plugin.grafana-image-renderer]
 # Instruct headless browser instance to use a default timezone when not provided by Grafana, e.g. when rendering panel image of alert.
@@ -991,16 +978,3 @@
 [expressions]
 # Enable or disable the expressions functionality.
 ;enabled = true
-
-[geomap]
-# Set the JSON configuration for the default basemap
-;default_baselayer_config = `{
-;  "type": "xyz",
-;  "config": {
-;    "attribution": "Open street map",
-;    "url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png"
-;  }
-;}`
-
-# Enable or disable loading other base map layers
-;enable_custom_baselayers = true
--- a/contribute/architecture/backend/communication.md
+++ b/contribute/architecture/backend/communication.md
@@ -12,7 +12,7 @@ An event is something that happened in the past. Since an event has already happ

 ### Subscribe to an event

-In order to react to an event, you first need to _subscribe_ to it.
+In order to react to an event, you first need to _subscribe_ to it. 

 To subscribe to an event, register an _event listener_ in the service's `Init` method:

@@ -51,16 +51,14 @@ A command is a request for an action to be taken. Unlike an event's fire-and-for

 ### Dispatch a command

-To dispatch a command, pass the `context.Context` and object to the `DispatchCtx` method:
+To dispatch a command, pass the object to the `Dispatch` method:

 ```go
-// context.Context from caller
-ctx := req.Request.Context()
 cmd := &models.SendStickersCommand {
    UserID: "taylor",
    Count: 1,
 }
-if err := s.bus.DispatchCtx(ctx, cmd); err != nil {
+if err := s.bus.Dispatch(cmd); err != nil {
  if err == bus.ErrHandlerNotFound {
    return nil
  }
@@ -68,9 +66,7 @@ if err := s.bus.DispatchCtx(ctx, cmd); err != nil {
 }
 ```

-> **Note:** `DispatchCtx` will return an error if no handler is registered for that command.
-
-> **Note:** `Dispatch` currently exists and requires no `context.Context` to be provided, but it's strongly suggested to not use this since there's an ongoing refactoring to remove usage of non-context-aware functions/methods and use context.Context everywhere.
+> **Note:** `Dispatch` will return an error if no handler is registered for that command.

 **Tip:** Browse the available commands in the `models` package.

@@ -82,34 +78,30 @@ To handle a command, register a command handler in the `Init` function.

 ```go
 func (s *MyService) Init() error {
-    s.bus.AddHandlerCtx(s.SendStickers)
+    s.bus.AddHandler(s.SendStickers)
    return nil
 }

-func (s *MyService) SendStickers(ctx context.Context, cmd *models.SendStickersCommand) error {
+func (s *MyService) SendStickers(cmd *models.SendStickersCommand) error {
    // ...
 }
 ```

 > **Note:** The handler method may return an error if unable to complete the command.

-> **Note:** `AddHandler` currently exists and requires no `context.Context` to be provided, but it's strongly suggested to not use this since there's an ongoing refactoring to remove usage of non-context-aware functions/methods and use context.Context everywhere.
-
 ## Queries

 A command handler can optionally populate the command sent to it. This pattern is commonly used to implement _queries_.

 ### Making a query

-To make a query, dispatch the query instance just like you would a command. When the `DispatchCtx` method returns, the `Results` field contains the result of the query.
+To make a query, dispatch the query instance just like you would a command. When the `Dispatch` method returns, the `Results` field contains the result of the query.

 ```go
-// context.Context from caller
-ctx := req.Request.Context()
 query := &models.FindDashboardQuery{
    ID: "foo",
 }
-if err := bus.DispatchCtx(ctx, query); err != nil {
+if err := bus.Dispatch(query); err != nil {
    return err
 }
 // The query now contains a result.
@@ -118,14 +110,12 @@ for _, item := range query.Results {
 }
 ```

-> **Note:** `Dispatch` currently exists and requires no `context.Context` to be provided, but it's strongly suggested to not use this since there's an ongoing refactoring to remove usage of non-context-aware functions/methods and use context.Context everywhere.
-
 ### Return query results

 To return results for a query, set any of the fields on the query argument before returning:

 ```go
-func (s *MyService) FindDashboard(ctx context.Context, query *models.FindDashboardQuery) error {
+func (s *MyService) FindDashboard(query *models.FindDashboardQuery) error {
    // ...
    query.Result = dashboard
    return nil
--- a/contribute/architecture/backend/database.md
+++ b/contribute/architecture/backend/database.md
@@ -33,18 +33,18 @@ To register a handler:

 ```go
 func init() {
-    bus.AddHandlerCtx("sql", DeleteDashboard)
+    bus.AddHandler("sql", DeleteDashboard)
 }

-func DeleteDashboard(ctx context.Context, cmd *models.DeleteDashboardCommand) error {
-    return inTransactionCtx(ctx, func(sess *DBSession) error {
+func DeleteDashboard(cmd *models.DeleteDashboardCommand) error {
+    return inTransaction(func(sess *DBSession) error {
        _, err := sess.Exec("DELETE FROM dashboards WHERE dashboard_id=?", cmd.DashboardID)
        return err
    })
 }
 ```

-Here, `inTransactionCtx` is a helper function in the `sqlstore` package that provides a session, that lets you execute SQL statements.
+Here, `inTransaction` is a helper function in the `sqlstore` package that provides a session, that lets you execute SQL statements.

 ## `SQLStore`

@@ -61,7 +61,7 @@ type MyService struct {
 You can now make SQL queries in any of your [command handlers](communication.md#handle-commands) or [event listeners](communication.md#subscribe-to-an-event):

 ```go
-func (s *MyService) DeleteDashboard(ctx context.Context, cmd *models.DeleteDashboardCommand) error {
+func (s *MyService) DeleteDashboard(cmd *models.DeleteDashboardCommand) error {
    if err := s.SQLStore.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
        _, err := sess.Exec("DELETE FROM dashboards WHERE dashboard_id=?", cmd.DashboardID)
        return err
--- a/contribute/architecture/backend/services.md
+++ b/contribute/architecture/backend/services.md
@@ -1,6 +1,6 @@
 # Services

-A Grafana _service_ encapsulates and exposes application logic to the rest of the application, through a set of related operations.
+A Grafana _service_ encapsulates and exposes application logic to the rest of the application, through a set of related operations. 

 Before a service can start communicating with the rest of Grafana, it needs to be registered in the _service registry_.

@@ -48,7 +48,7 @@ import _ "github.com/grafana/grafana/pkg/services/mysvc"

 ## Dependencies

-Grafana uses the [inject](https://github.com/facebookgo/inject) package to inject dependencies during runtime.
+Grafana uses the [inject](https://github.com/facebookgo/inject) package to inject dependencies during runtime. 

 For example, to access the [bus](communication.md), add it to the `MyService` struct:

@@ -67,7 +67,3 @@ type MyService struct {
 ```

 > **Note:** Any injected dependency needs to be an exported field. Any unexported fields result in a runtime error.
-
-## Methods
-
-Any public method of a service should take `context.Context` as its first argument. If the method calls the bus, other services or the database the context should be propagated, if possible.
--- a/contribute/create-pull-request.md
+++ b/contribute/create-pull-request.md
@@ -16,7 +16,7 @@ If this is your first time contributing to an open-source project on GitHub, mak
 To increase the chance of having your pull request accepted, make sure your pull request follows these guidelines:

 - Title and description matches the implementation.
- Commits within the pull request follow the [Formatting guidelines](#Formatting-guidelines).
+- Commits within the pull request follow the [Formatting guidelines](#Formatting-guidelines). 
 - The pull request closes one related issue.
 - The pull request contains necessary tests that verify the intended behavior.
 - If your pull request has conflicts, rebase your branch onto the main branch.
@@ -43,18 +43,6 @@ Pull requests for Redux contributions must:
 - Not contain code that mutates state in reducers or thunks.
 - Not contain code that accesses the reducers state slice directly. Instead, the code should use state selectors to access state.

-Pull requests that add or modify unit tests that are written in Jest must adhere to these guidelines:
-
- Don't add snapshots tests. We are incrementally removing existing snapshot tests, we don't want more.
- If an existing unit test is written in Enzyme, migrate it to RTL (React Testing Library), unless you’re fixing a bug. Bug fixes usually shouldn't include any bigger refactoring, so it’s ok to skip migrating the test to RTL.
-
-Pull requests that create new UI components or modify existing ones must adhere to the following accessibility guidelines:
-
- Use semantic HTML.
- Use ARIA roles, labels and other accessibility attributes correctly. Accessibility attributes should only be used when semantic HTML doesn't satisfy your use case.
- Use the [Grafana theme palette](/contribute/style-guides/themes.md) for styling. It contains colors with good contrast which aids accessibility.
- Use [RTL](https://testing-library.com/docs/dom-testing-library/api-accessibility/) for writing unit tests. It helps to create accessible components.
-
 ### Backend-specific guidelines

 Please refer to the [backend style guidelines](/contribute/style-guides/backend.md).
@@ -114,6 +102,6 @@ Make sure that the title for your pull request uses the same format as the subje

 If your PR includes configuration changes, all of the following files must be changed correspondingly:

- conf/defaults.ini
- conf/sample.ini
- docs/sources/administration/configuration.md
+* conf/defaults.ini
+* conf/sample.ini
+* docs/sources/administration/configuration.md 
--- a/contribute/developer-guide.md
+++ b/contribute/developer-guide.md
@@ -10,14 +10,8 @@ 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)
-
-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.
+- [Node.js (Long Term Support)](https://nodejs.org)
+- [Yarn](https://yarnpkg.com)

 ### macOS

@@ -26,6 +20,9 @@ We recommend using [Homebrew](https://brew.sh/) for installing any missing depen
 ```
 brew install git
 brew install go
+brew install node@14
+
+npm install -g yarn
 ```

 ### Windows
--- a/contribute/style-guides/e2e.md
+++ b/contribute/style-guides/e2e.md
@@ -160,41 +160,3 @@ describe('List test', () => {
  });
 });
 ```
-
-## Aria-Labels vs data-testid
-Our selectors are set up to work with both aria-labels and data-testid attributes. Aria-labels help assistive technologies such as screenreaders identify interactive elements of a page for our users. 
-
-A good example of a time to use an aria-label might be if you have a button with an X to close:
-```
-<button aria-label="close">X<button>
-```
-It might be clear visually that the X closes the modal, but audibly it would not be clear for example.
-```
-<button aria-label="close">Close<button>
-```
-The above example for example might read aloud to a user "Close, Close" or something similar. 
-
-However adding aria-labels to elements that are already clearly labeled or not interactive can be confusing and redundant for users with assistive technologies.
-
-In such cases rather than adding unnecessary aria-labels to components so as to make them selectable for testing, it is preferable to use a data attribute that would not be read aloud with an assistive technology for example:
-
-```
-<button data-testid="modal-close-button">Close<button>
-```
-
-We have added support for this in our selectors, to use:
-
-Prefix your selector string with "data-testid":
-```typescript
-export const Components = {
-  Login: {
-    openButton: "data-testid-open", // this would look for a data-testid
-    closeButton: "close-button" // this would look for an aria-label
-  },
-};
-```
-
-and in your component, import the selectors and add the data test id:
-```
-<button data-testid={Selectors.Components.Login.openButton}>
-```
--- a/contribute/style-guides/themes.md
+++ b/contribute/style-guides/themes.md
@@ -4,8 +4,11 @@

 **Themes are implemented in Typescript.** That's because our goal is to share variables between Grafana TypeScript and [Sass](https://sass-lang.com/) code. Theme definitions are located in the following files:

- [packages/grafana-data/src/themes/createTheme.ts](../../packages/grafana-data/src/themes/createTheme.ts)
- [packages/grafana-data/src/themes/createColors.ts](../../packages/grafana-data/src/themes/createColors.ts)
+- [packages/grafana-ui/src/themes/dark.ts](../../packages/grafana-ui/src/themes/dark.ts)
+- [packages/grafana-ui/src/themes/default.ts](../../packages/grafana-ui/src/themes/default.ts)
+- [packages/grafana-ui/src/themes/light.ts](../../packages/grafana-ui/src/themes/light.ts)
+
+The `default.ts` file holds common variables like typography and spacing definitions, while `[light|dark].ts` primarily specify colors used in themes.

 ## Usage

@@ -15,22 +18,23 @@ This section provides usage guidelines.

 Here's how to use Grafana themes in React components.

-#### useStyles2 hook
+#### useStyles hook

-`useStyles2` memoizes the function and provides access to the theme.
+`useStyles` memoizes the function and provides access to the theme.

 ```tsx
 import React, { FC } from 'react';
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
+import { GrafanaTheme } from '@grafana/data';
+import { useStyles } from '@grafana/ui';
 import { css } from '@emotion/css';

-const getComponentStyles = (theme: GrafanaTheme2) => css`
+const getComponentStyles = (theme: GrafanaTheme) => css`
  padding: ${theme.spacing.md};
 `;

 const Foo: FC<FooProps> = () => {
-  const styles = useStyles2(getComponentsStyles);
+  const styles = useStyles(getComponentsStyles);
+
  // Use styles with className
 };
 ```
@@ -39,89 +43,15 @@ const Foo: FC<FooProps> = () => {

 ```tsx
 import React, { FC } from 'react';
-import { useTheme2 } from '@grafana/ui';
+import { useTheme } from '@grafana/ui';

 const Foo: FC<FooProps> = () => {
-  const theme = useTheme2();
+  const theme = useTheme();

  // Your component has access to the theme variables now
 };
 ```

-## Picking the right variable
-
-### The rich color object and the state colors
-
-The theme.colors object has 6 rich color objects for `primary`, `secondary`, `info`, `success`, `warning` and `error`. These all
-have the same sub colors that have different use cases.
-
-| Property     | When to use                                                |
-| ------------ | ---------------------------------------------------------- |
-| main         | For backgrounds                                            |
-| shade        | For hover highlight                                        |
-| text         | For text color                                             |
-| border       | For borders, currently always the same as text color       |
-| contrastText | Text color to use for text placed on top of the main color |
-
-Example use cases:
-
- Want a `red` background? Use `theme.colors.error.main`
- Want `green` text? Use `theme.colors.success.text`
- Want text to be visible when placed inside a background that uses `theme.colors.error.main` then use `theme.colors.error.contrastText`.
-
-### Text colors
-
-| Property                      | When to use                                                                    |
-| ----------------------------- | ------------------------------------------------------------------------------ |
-| theme.colors.text.primary     | The default text color                                                         |
-| theme.colors.text.secondary   | Text color for things that should be a bit less prominent                      |
-| theme.colors.text.disabled    | Text color for disabled / faint things                                         |
-| theme.colors.text.link        | Text link color                                                                |
-| theme.colors.text.maxContrast | Maximum contrast (absolute white in dark theme, absolute black in white theme) |
-
-### Background colors
-
-| Property                          | When to use                                                                                       |
-| --------------------------------- | ------------------------------------------------------------------------------------------------- |
-| theme.colors.background.canvas    | Think dashboard background. A background surface for panels and panes that use primary background |
-| theme.colors.background.primary   | The default content background for content panes and panels                                       |
-| theme.colors.background.secondary | For cards and other surfaces that need to stand out when placed on top of the primary background  |
-
-### Borders
-
-| Property                   | When to use                                                  |
-| -------------------------- | ------------------------------------------------------------ |
-| theme.colors.border.weak   | Primary border for panels and panes and other subtle borders |
-| theme.colors.border.medium | For stronger borders like inputs                             |
-| theme.colors.border.strong | For even stronger border like hover highighted border        |
-
-### Actions
-
-| Property                     | When to use                                           |
-| ---------------------------- | ----------------------------------------------------- |
-| theme.colors.action.hover    | Background color for hover on card, menu or list item |
-| theme.colors.action.focus    | Background color for focused card, menu or list item  |
-| theme.colors.action.selected | Background color for selected card, menu or list item |
-
-### Paddings and margins
-
-| Example                     | Result            |
-| --------------------------- | ----------------- |
-| theme.spacing(1)            | 8px               |
-| theme.spacing(1, 2)         | 8px 16px          |
-| theme.spacing(1, 2, 0.5, 4) | 8px 16px 4px 32px |
-
-### Border radius
-
-| Example                     | Result |
-| --------------------------- | ------ |
-| theme.shape.borderRadius(1) | 2px    |
-| theme.shape.borderRadius(2) | 4px    |
-
-### Typography
-
-For font family, font sizes and line heights use the variables under `theme.typography`. 
-
 #### Using `ThemeContext` directly

 ```tsx
@@ -137,25 +67,39 @@ With this method your component will be automatically wrapped in `ThemeContext.C
 ```ts
 import  { ThemeContext, Themeable } from '@grafana/ui';

-interface FooProps extends Themeable2 {}
+interface FooProps extends Themeable {}

 const Foo: React.FunctionComponent<FooProps> = () => ...

-export default withTheme2(Foo);
+export default withTheme(Foo);
 ```

-### Using theme in tests
+### Test components that use `ThemeContext`

-If you need to pass a theme object to a function under test just import `createTheme` and call it without
-any arguments.
+When implementing snapshot tests for components that use the `withTheme` HOC, the snapshot will contain the entire theme object. Any change to the theme renders the snapshot outdated.
+
+To make your snapshot theme independent, use the `mockThemeContext` helper function:

 ```tsx
-import { createTheme } from '@grafana/data';
+import { mockThemeContext } from '@grafana/ui';
+import { MyComponent } from './MyComponent';

 describe('MyComponent', () => {
-  it('should work', () => {
-    result = functionThatNeedsTheme(createTheme());
-    expect(result).toBe(true);
+  let restoreThemeContext;
+
+  beforeAll(() => {
+    // Create ThemeContext mock before any snapshot test is executed
+    restoreThemeContext = mockThemeContext({ type: GrafanaThemeType.Dark });
+  });
+
+  afterAll(() => {
+    // Make sure the theme is restored after snapshot tests are performed
+    restoreThemeContext();
+  });
+
+  it('renders correctly', () => {
+    const wrapper = mount(<MyComponent />);
+    expect(wrapper).toMatchSnapshot();
  });
 });
 ```
@@ -172,5 +116,36 @@ This section provides insight into frequently-asked questions.

 `[_variables|_variables.dark|_variables.light].generated.scss` files are the ones that are referenced in the main Sass files for Sass variables to be available. **These files are automatically generated and should never be modified by hand!**

-If you need to modify the sass variable files be sure to update the files that end with `.tmpl.ts` and
-not the `.generated.scss` files.
+#### If you need to modify a _Sass variable value_ you need to modify the corresponding Typescript file that is the source of the variables:
+
+- `_variables.generated.scss` - modify `grafana-ui/src/themes/default.ts`
+- `_variables.light.generated.scss` - modify `grafana-ui/src/themes/light.ts`
+- `_variables.dark.generated.scss` - modify `grafana-ui/src/themes/dark.ts`
+
+#### If you need to _add new variable_ to Sass variables you need to modify corresponding template file:
+
+- `_variables.generated.scss` - modify `grafana-ui/src/themes/_variables.scss.tmpl.ts`
+- `_variables.light.generated.scss` - modify `grafana-ui/src/themes/_variables.light.scss.tmpl.ts`
+- `_variables.dark.generated.scss` - modify `grafana-ui/src/themes/_variables.dark.scss.tmpl.ts`
+
+## Limitations
+
+This section describes limitations with Grafana's theming system.
+
+### You must ensure `ThemeContext` provider is available in a React tree
+
+By default all react2angular directives have `ThemeContext.Provider` ensured. But, there are cases where we create another React tree via `ReactDOM.render`. This happens in the case of graph legend rendering and the `ReactContainer` directive. In such cases theme consumption will fail. To make sure theme context is available in such cases, you need to wrap your rendered component with ThemeContext.Provider using the `provideTheme` function:
+
+```ts
+// graph.ts
+import { provideTheme } from 'app/core/utils/ConfigProvider';
+
+// Create component with ThemeContext.Provider first.
+// Otherwise React will create new components every time it renders!
+const LegendWithThemeProvider = provideTheme(Legend);
+
+const legendReactElem = React.createElement(LegendWithThemeProvider, legendProps);
+ReactDOM.render(legendReactElem, this.legendElem, () => this.renderPanel());
+```
+
+`provideTheme` makes current theme available via ThemeContext by checking if user has `lightTheme` set in her boot data.
--- a/cue/data/gen.cue
+++ b/cue/data/gen.cue
@@ -80,6 +80,7 @@ Family: scuemata.#Family & {
                // synthetic Family to represent them in Go, for ease of generating
                // e.g. JSON Schema.
                #Panel: {
+                    ...
                    // The panel plugin type id. 
                    type: !=""

@@ -134,6 +135,7 @@ Family: scuemata.#Family & {
                    options: {...}
                    fieldConfig: {
                        defaults: {
+                            ...
                            // The display value for this field.  This supports template variables blank is auto
                            displayName?: string

@@ -187,7 +189,7 @@ Family: scuemata.#Family & {
                            // Can always exist. Valid fields within this are
                            // defined by the panel plugin - that's the
                            // PanelFieldConfig that comes from the plugin.
-                            custom?: {}
+                            custom?: {...}
                        }
                        overrides: [...{
                            matcher: {
--- a/devenv/README.md
+++ b/devenv/README.md
@@ -57,10 +57,13 @@ Jaeger block runs both Jaeger and Loki container. Loki container sends traces to

 ## Troubleshooting

-### Containers that read from log files fail to start (Mac OS)
-
-If you are running Mac OSX, containers that read from the log files (e.g. Telegraf, Fileabeat, Promtail) can fail to start. This is because the default Docker for Mac does not have permission to create `grafana` folder at the `/var/log` location, as it runs as the current user. To solve this issue, manually create the folder `/var/log/grafana`, then start the containers again.
+### Containers fail to start (Mac OS)

 ```
-sudo mkdir /var/log/grafana
+ERROR: for <service_name> Cannot start service <service_name>: OCI runtime create failed: container_linux.go:349: starting container process caused "process_linux.go:449: container init caused \"rootfs_linux.go:58: mounting ... merged/var/log/grafana: operation not permitted\\\"\"": unknown
+ERROR: Encountered errors while bringing up the project.
 ```
+
+If running Mac OSX the above error might be encountered when starting certain Docker containers that mount `/var/log/`. When first run this causes Docker to try to create the folder `/var/log/grafana` however by default Docker for Mac does not have permission to create folders at this location as it runs as the current user. 
+
+To solve this issue manually create the folder `/var/log/grafana` and give your user write permissions then try starting the containers again.
--- a/devenv/datasources.yaml
+++ b/devenv/datasources.yaml
@@ -84,14 +84,6 @@ datasources:
      tsdbResolution: 1
      tsdbVersion: 1

-  - name: gdev-opentsdb-v2.3
-    type: opentsdb
-    access: proxy
-    url: http://localhost:4242
-    jsonData:
-      tsdbResolution: 1
-      tsdbVersion: 3
-
  - name: gdev-elasticsearch-v2-metrics
    type: elasticsearch
    access: proxy
--- a/devenv/dev-dashboards/datasource-opentsdb/opentsdb_v2.3.json
+++ b/devenv/dev-dashboards/datasource-opentsdb/opentsdb_v2.3.json
@@ -1,258 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "id": 3151,
-  "links": [],
-  "panels": [
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-opentsdb-v2.3",
-      "fieldConfig": {
-        "defaults": {
-          "links": []
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "8.1.0-pre",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "aggregator": "sum",
-          "alias": "$tag_hostname",
-          "currentFilterGroupBy": false,
-          "currentFilterKey": "",
-          "currentFilterType": "literal_or",
-          "currentFilterValue": "",
-          "disableDownsampling": false,
-          "downsampleAggregator": "avg",
-          "downsampleFillPolicy": "none",
-          "explicitTags": false,
-          "filters": [
-            {
-              "filter": "*",
-              "groupBy": true,
-              "tagk": "hostname",
-              "type": "wildcard"
-            }
-          ],
-          "metric": "cpu",
-          "refId": "A",
-          "shouldComputeRate": false
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "CPU per host",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-opentsdb-v2.3",
-      "fieldConfig": {
-        "defaults": {
-          "links": []
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 12,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 4,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "8.1.0-pre",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "aggregator": "sum",
-          "alias": "$tag_hostname",
-          "currentFilterGroupBy": false,
-          "currentFilterKey": "",
-          "currentFilterType": "literal_or",
-          "currentFilterValue": "",
-          "downsampleAggregator": "avg",
-          "downsampleFillPolicy": "none",
-          "filters": [
-            {
-              "filter": "*",
-              "groupBy": true,
-              "tagk": "hostname",
-              "type": "wildcard"
-            }
-          ],
-          "metric": "logins.count",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Login Count per host",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "schemaVersion": 30,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "Datasource tests - OpenTSDB v2.3",
-  "uid": "rZRUGik7k",
-  "version": 3
-}
--- a/devenv/dev-dashboards/home.json
+++ b/devenv/dev-dashboards/home.json
@@ -8,12 +8,6 @@
        "hide": true,
        "iconColor": "rgba(0, 211, 255, 1)",
        "name": "Annotations & Alerts",
-        "target": {
-          "limit": 100,
-          "matchAny": false,
-          "tags": [],
-          "type": "dashboard"
-        },
        "type": "dashboard"
      }
    ]
@@ -24,26 +18,21 @@
  "links": [],
  "panels": [
    {
-      "datasource": null,
+      "folderId": null,
      "gridPos": {
        "h": 26,
        "w": 6,
        "x": 0,
        "y": 0
      },
+      "headings": true,
      "id": 7,
+      "limit": 100,
      "links": [],
-      "options": {
-        "folderId": null,
-        "maxItems": 100,
-        "query": "",
-        "showHeadings": true,
-        "showRecentlyViewed": true,
-        "showSearch": false,
-        "showStarred": true,
-        "tags": []
-      },
-      "pluginVersion": "8.1.0-pre",
+      "query": "",
+      "recent": true,
+      "search": false,
+      "starred": true,
      "tags": [],
      "timeFrom": null,
      "timeShift": null,
@@ -51,167 +40,95 @@
      "type": "dashlist"
    },
    {
-      "datasource": null,
+      "folderId": null,
      "gridPos": {
        "h": 13,
        "w": 6,
        "x": 6,
        "y": 0
      },
+      "headings": false,
      "id": 2,
+      "limit": 1000,
      "links": [],
-      "options": {
-        "maxItems": 1000,
-        "query": "",
-        "showHeadings": false,
-        "showRecentlyViewed": false,
-        "showSearch": true,
-        "showStarred": false,
-        "tags": [
-          "panel-tests"
-        ]
-      },
-      "pluginVersion": "8.1.0-pre",
-      "tags": [
-        "panel-tests"
-      ],
+      "query": "",
+      "recent": false,
+      "search": true,
+      "starred": false,
+      "tags": ["panel-tests"],
      "timeFrom": null,
      "timeShift": null,
      "title": "tag: panel-tests",
      "type": "dashlist"
    },
    {
-      "datasource": null,
+      "folderId": null,
      "gridPos": {
-        "h": 13,
+        "h": 26,
        "w": 6,
        "x": 12,
        "y": 0
      },
+      "headings": false,
      "id": 3,
+      "limit": 1000,
      "links": [],
-      "options": {
-        "folderId": null,
-        "maxItems": 1000,
-        "query": "",
-        "showHeadings": false,
-        "showRecentlyViewed": false,
-        "showSearch": true,
-        "showStarred": false,
-        "tags": [
-          "gdev",
-          "demo"
-        ]
-      },
-      "pluginVersion": "8.1.0-pre",
-      "tags": [
-        "gdev",
-        "demo"
-      ],
+      "query": "",
+      "recent": false,
+      "search": true,
+      "starred": false,
+      "tags": ["gdev", "demo"],
      "timeFrom": null,
      "timeShift": null,
      "title": "tag: dashboard-demo",
      "type": "dashlist"
    },
    {
-      "datasource": null,
+      "folderId": null,
      "gridPos": {
        "h": 26,
        "w": 6,
        "x": 18,
        "y": 0
      },
+      "headings": false,
      "id": 5,
+      "limit": 1000,
      "links": [],
-      "options": {
-        "folderId": null,
-        "maxItems": 1000,
-        "query": "",
-        "showHeadings": false,
-        "showRecentlyViewed": false,
-        "showSearch": true,
-        "showStarred": false,
-        "tags": [
-          "gdev",
-          "datasource-test"
-        ]
-      },
-      "pluginVersion": "8.1.0-pre",
-      "tags": [
-        "gdev",
-        "datasource-test"
-      ],
+      "query": "",
+      "recent": false,
+      "search": true,
+      "starred": false,
+      "tags": ["gdev", "datasource-test"],
      "timeFrom": null,
      "timeShift": null,
      "title": "Data source tests",
      "type": "dashlist"
    },
    {
-      "datasource": null,
+      "folderId": null,
      "gridPos": {
        "h": 13,
        "w": 6,
        "x": 6,
        "y": 13
      },
+      "headings": false,
      "id": 4,
+      "limit": 1000,
      "links": [],
-      "options": {
-        "maxItems": 1000,
-        "query": "",
-        "showHeadings": false,
-        "showRecentlyViewed": false,
-        "showSearch": true,
-        "showStarred": false,
-        "tags": [
-          "templating",
-          "gdev"
-        ]
-      },
-      "pluginVersion": "8.1.0-pre",
-      "tags": [
-        "templating",
-        "gdev"
-      ],
+      "query": "",
+      "recent": false,
+      "search": true,
+      "starred": false,
+      "tags": ["templating", "gdev"],
      "timeFrom": null,
      "timeShift": null,
      "title": "tag: templating ",
      "type": "dashlist"
-    },
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 13,
-        "w": 6,
-        "x": 12,
-        "y": 13
-      },
-      "id": 8,
-      "links": [],
-      "options": {
-        "maxItems": 1000,
-        "query": "",
-        "showHeadings": false,
-        "showRecentlyViewed": false,
-        "showSearch": true,
-        "showStarred": false,
-        "tags": [
-          "gdev",
-          "transform"
-        ]
-      },
-      "pluginVersion": "8.1.0-pre",
-      "tags": [
-        "gdev",
-        "demo"
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "tag: transforms",
-      "type": "dashlist"
    }
  ],
-  "schemaVersion": 30,
+  "schemaVersion": 18,
  "style": "dark",
  "tags": [],
  "templating": {
@@ -222,32 +139,11 @@
    "to": "now"
  },
  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ],
-    "time_options": [
-      "5m",
-      "15m",
-      "1h",
-      "6h",
-      "12h",
-      "24h",
-      "2d",
-      "7d",
-      "30d"
-    ]
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
+    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
  },
  "timezone": "",
  "title": "Grafana Dev Overview & Home",
  "uid": "j6T00KRZz",
  "version": 2
-}
+}
--- a/devenv/dev-dashboards/panel-barchart/barchart-autosizing.json
+++ b/devenv/dev-dashboards/panel-barchart/barchart-autosizing.json
@@ -8,12 +8,6 @@
        "hide": true,
        "iconColor": "rgba(0, 211, 255, 1)",
        "name": "Annotations & Alerts",
-        "target": {
-          "limit": 100,
-          "matchAny": false,
-          "tags": [],
-          "type": "dashboard"
-        },
        "type": "dashboard"
      }
    ]
@@ -39,8 +33,7 @@
            "hideFrom": {
              "graph": false,
              "legend": false,
-              "tooltip": false,
-              "viz": false
+              "tooltip": false
            },
            "lineWidth": 0
          },
@@ -112,8 +105,7 @@
            "hideFrom": {
              "graph": false,
              "legend": false,
-              "tooltip": false,
-              "viz": false
+              "tooltip": false
            },
            "lineWidth": 0
          },
@@ -185,8 +177,7 @@
            "hideFrom": {
              "graph": false,
              "legend": false,
-              "tooltip": false,
-              "viz": false
+              "tooltip": false
            },
            "lineWidth": 0
          },
@@ -257,8 +248,7 @@
            "hideFrom": {
              "graph": false,
              "legend": false,
-              "tooltip": false,
-              "viz": false
+              "tooltip": false
            },
            "lineWidth": 0
          },
@@ -329,8 +319,7 @@
            "hideFrom": {
              "graph": false,
              "legend": false,
-              "tooltip": false,
-              "viz": false
+              "tooltip": false
            },
            "lineWidth": 0
          },
@@ -401,12 +390,10 @@
            "hideFrom": {
              "graph": false,
              "legend": false,
-              "tooltip": false,
-              "viz": false
+              "tooltip": false
            },
            "lineWidth": 0
          },
-          "decimals": 7,
          "mappings": [],
          "thresholds": {
            "mode": "absolute",
@@ -450,7 +437,7 @@
      },
      "targets": [
        {
-          "csvContent": "Name,Stat1,Stat2\nStockholm, 10, 15\nNew York, 19, -5\nLondon, 10, 1\nLong value, 15,10",
+          "csvContent": "Name,Stat1,Stat2\nStockholm, 10, 15\nNew York, 19, 5\nLondon, 10, 1\nLong value, 15,10",
          "refId": "A",
          "scenarioId": "csv_content"
        }
@@ -475,8 +462,7 @@
            "hideFrom": {
              "graph": false,
              "legend": false,
-              "tooltip": false,
-              "viz": false
+              "tooltip": false
            },
            "lineWidth": 0
          },
@@ -551,5 +537,5 @@
  "timezone": "",
  "title": "BarChart - Panel Tests - Value sizing",
  "uid": "WFlOM-jM1",
-  "version": 9
+  "version": 3
 }
--- a/devenv/dev-dashboards/panel-graph/graph-ng-by-value-color-schemes.json
+++ b/devenv/dev-dashboards/panel-graph/graph-ng-by-value-color-schemes.json
@@ -1,593 +0,0 @@
-{
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": "-- Grafana --",
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations & Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "editable": true,
-    "gnetId": null,
-    "graphTooltip": 0,    
-    "links": [],
-    "panels": [
-      {
-        "datasource": "-- Dashboard --",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "drawStyle": "line",
-              "fillOpacity": 5,
-              "gradientMode": "scheme",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineInterpolation": "smooth",
-              "lineWidth": 3,
-              "pointSize": 5,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "showPoints": "never",
-              "spanNulls": false,
-              "stacking": {
-                "group": "A",
-                "mode": "none"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "max": 50,
-            "min": 0,
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "orange",
-                  "value": 20
-                },
-                {
-                  "color": "red",
-                  "value": 30
-                }
-              ]
-            },
-            "unit": "degree"
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 7,
-          "w": 11,
-          "x": 0,
-          "y": 0
-        },
-        "id": 9,
-        "maxDataPoints": 45,
-        "options": {
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "tooltip": {
-            "mode": "single"
-          }
-        },
-        "targets": [
-          {
-            "panelId": 4,
-            "refId": "A"
-          }
-        ],
-        "title": "Color line by discrete tresholds",
-        "type": "timeseries"
-      },
-      {
-        "datasource": null,
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "drawStyle": "bars",
-              "fillOpacity": 84,
-              "gradientMode": "scheme",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineInterpolation": "smooth",
-              "lineWidth": 0,
-              "pointSize": 5,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "showPoints": "never",
-              "spanNulls": false,
-              "stacking": {
-                "group": "A",
-                "mode": "none"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "max": 50,
-            "min": 0,
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "orange",
-                  "value": 20
-                },
-                {
-                  "color": "red",
-                  "value": 30
-                }
-              ]
-            },
-            "unit": "degree"
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 7,
-          "w": 13,
-          "x": 11,
-          "y": 0
-        },
-        "id": 4,
-        "interval": "80s",
-        "maxDataPoints": 42,
-        "options": {
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "tooltip": {
-            "mode": "single"
-          }
-        },
-        "targets": [
-          {
-            "max": 40,
-            "min": 0,
-            "noise": 1,
-            "refId": "A",
-            "scenarioId": "random_walk",
-            "spread": 20,
-            "startValue": 1
-          }
-        ],
-        "timeFrom": null,
-        "title": "Color bars by discrete thresholds",
-        "type": "timeseries"
-      },
-      {
-        "datasource": "-- Dashboard --",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "continuous-GrYlRd"
-            },
-            "custom": {
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "drawStyle": "line",
-              "fillOpacity": 10,
-              "gradientMode": "scheme",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineInterpolation": "smooth",
-              "lineWidth": 3,
-              "pointSize": 5,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "showPoints": "never",
-              "spanNulls": false,
-              "stacking": {
-                "group": "A",
-                "mode": "none"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "max": 50,
-            "min": 1,
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "blue",
-                  "value": null
-                },
-                {
-                  "color": "green",
-                  "value": 0
-                },
-                {
-                  "color": "orange",
-                  "value": 20
-                },
-                {
-                  "color": "red",
-                  "value": 30
-                }
-              ]
-            },
-            "unit": "degree"
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 11,
-          "x": 0,
-          "y": 7
-        },
-        "id": 6,
-        "maxDataPoints": 50,
-        "options": {
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "tooltip": {
-            "mode": "single"
-          }
-        },
-        "targets": [
-          {
-            "panelId": 4,
-            "refId": "A"
-          }
-        ],
-        "title": "Color line by color scale",
-        "type": "timeseries"
-      },
-      {
-        "datasource": "-- Dashboard --",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "continuous-GrYlRd"
-            },
-            "custom": {
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "drawStyle": "bars",
-              "fillOpacity": 64,
-              "gradientMode": "scheme",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineInterpolation": "smooth",
-              "lineWidth": 1,
-              "pointSize": 5,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "showPoints": "never",
-              "spanNulls": false,
-              "stacking": {
-                "group": "A",
-                "mode": "none"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "max": 50,
-            "min": 1,
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "blue",
-                  "value": null
-                },
-                {
-                  "color": "green",
-                  "value": 0
-                },
-                {
-                  "color": "orange",
-                  "value": 20
-                },
-                {
-                  "color": "red",
-                  "value": 30
-                }
-              ]
-            },
-            "unit": "degree"
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 13,
-          "x": 11,
-          "y": 7
-        },
-        "id": 10,
-        "maxDataPoints": 45,
-        "options": {
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "tooltip": {
-            "mode": "single"
-          }
-        },
-        "targets": [
-          {
-            "panelId": 4,
-            "refId": "A"
-          }
-        ],
-        "title": "Color bars by color scale",
-        "type": "timeseries"
-      },
-      {
-        "datasource": "-- Dashboard --",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "continuous-GrYlRd"
-            },
-            "custom": {
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "drawStyle": "line",
-              "fillOpacity": 64,
-              "gradientMode": "scheme",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineInterpolation": "smooth",
-              "lineWidth": 1,
-              "pointSize": 5,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "showPoints": "never",
-              "spanNulls": false,
-              "stacking": {
-                "group": "A",
-                "mode": "none"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "max": 50,
-            "min": 1,
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "blue",
-                  "value": null
-                },
-                {
-                  "color": "green",
-                  "value": 0
-                },
-                {
-                  "color": "orange",
-                  "value": 20
-                },
-                {
-                  "color": "red",
-                  "value": 30
-                }
-              ]
-            },
-            "unit": "degree"
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 6,
-          "w": 24,
-          "x": 0,
-          "y": 15
-        },
-        "id": 7,
-        "maxDataPoints": 50,
-        "options": {
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "tooltip": {
-            "mode": "single"
-          }
-        },
-        "targets": [
-          {
-            "panelId": 4,
-            "refId": "A"
-          }
-        ],
-        "title": "Color line by color scale",
-        "type": "timeseries"
-      },
-      {
-        "datasource": null,
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "continuous-GrYlRd"
-            },
-            "custom": {
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
-              "drawStyle": "points",
-              "fillOpacity": 10,
-              "gradientMode": "scheme",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
-              "lineInterpolation": "smooth",
-              "lineWidth": 3,
-              "pointSize": 5,
-              "scaleDistribution": {
-                "type": "linear"
-              },
-              "showPoints": "never",
-              "spanNulls": false,
-              "stacking": {
-                "group": "A",
-                "mode": "none"
-              },
-              "thresholdsStyle": {
-                "mode": "off"
-              }
-            },
-            "mappings": [],
-            "max": 50,
-            "min": 1,
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "blue",
-                  "value": null
-                },
-                {
-                  "color": "green",
-                  "value": 0
-                },
-                {
-                  "color": "orange",
-                  "value": 20
-                },
-                {
-                  "color": "red",
-                  "value": 30
-                }
-              ]
-            },
-            "unit": "degree"
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 13,
-          "w": 24,
-          "x": 0,
-          "y": 21
-        },
-        "id": 8,
-        "maxDataPoints": 250,
-        "options": {
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "tooltip": {
-            "mode": "single"
-          }
-        },
-        "targets": [
-          {
-            "max": 45,
-            "min": 20,
-            "noise": 0,
-            "refId": "A",
-            "scenarioId": "random_walk",
-            "spread": 12,
-            "startValue": 40
-          },
-          {
-            "hide": false,
-            "max": 20,
-            "min": 1,
-            "noise": 0,
-            "refId": "B",
-            "scenarioId": "random_walk",
-            "spread": 10
-          }
-        ],
-        "title": "Color line by color scale",
-        "type": "timeseries"
-      }
-    ],
-    "refresh": false,
-    "schemaVersion": 30,
-    "style": "dark",
-    "tags": [
-      "gdev",
-      "panel-tests"
-    ],
-    "templating": {
-      "list": []
-    },
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {},
-    "timezone": "",
-    "title": "Panel Tests - Graph NG - By value color schemes",
-    "uid": "aBXrJ0R7z",
-    "version": 20
-  }
--- a/devenv/dev-dashboards/panel-piechart/panel_test_piechart.json
+++ b/devenv/dev-dashboards/panel-piechart/panel_test_piechart.json
@@ -14,7 +14,7 @@
  },
  "editable": true,
  "gnetId": null,
-  "graphTooltip": 1,
+  "graphTooltip": 0,
  "id": 479,
  "links": [],
  "panels": [
--- a/devenv/dev-dashboards/transforms/config-from-query.json
+++ b/devenv/dev-dashboards/transforms/config-from-query.json
@@ -1,568 +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"
-        }
-      ]
-    },
-    "description": "",
-    "editable": true,
-    "gnetId": null,
-    "graphTooltip": 0,
-    "links": [],
-    "panels": [
-      {
-        "datasource": null,
-        "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": "line"
-              }
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 9,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "id": 2,
-        "options": {
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "tooltip": {
-            "mode": "single"
-          }
-        },
-        "targets": [
-          {
-            "hide": false,
-            "max": 100,
-            "min": 1,
-            "refId": "A",
-            "scenarioId": "random_walk",
-            "startValue": 50
-          },
-          {
-            "alias": "",
-            "csvContent": "min,max,threshold1\n1000,1000,8000\n0,100,80\n\n",
-            "refId": "config",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Min, max, threshold from separate query",
-        "transformations": [
-          {
-            "id": "configFromData",
-            "options": {
-              "configRefId": "config",
-              "mappings": []
-            }
-          }
-        ],
-        "type": "timeseries"
-      },
-      {
-        "datasource": null,
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {
-              "align": "left",
-              "displayMode": "auto"
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "SensorA"
-              },
-              "properties": [
-                {
-                  "id": "custom.displayMode",
-                  "value": "color-text"
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 9,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "id": 5,
-        "options": {
-          "showHeader": true
-        },
-        "pluginVersion": "8.1.0-pre",
-        "targets": [
-          {
-            "csvContent": "Name, Value, SensorA, MyUnit, MyColor\nGoogle, 10, 50, km/h, blue\nGoogle, 100, 100,km/h, orange\n",
-            "hide": false,
-            "refId": "A",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Custom mappings and apply to self",
-        "transformations": [
-          {
-            "id": "configFromData",
-            "options": {
-              "applyTo": {
-                "id": "byName",
-                "options": "SensorA"
-              },
-              "applyToConfig": true,
-              "configRefId": "A",
-              "mappings": [
-                {
-                  "configProperty": "unit",
-                  "fieldName": "MyUnit",
-                  "handlerKey": "unit"
-                },
-                {
-                  "fieldName": "MyColor",
-                  "handlerKey": "color"
-                }
-              ]
-            }
-          }
-        ],
-        "type": "table"
-      },
-      {
-        "datasource": null,
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {
-              "align": "center",
-              "displayMode": "auto"
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "Value"
-              },
-              "properties": [
-                {
-                  "id": "custom.displayMode",
-                  "value": "color-background-solid"
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 5,
-          "w": 12,
-          "x": 0,
-          "y": 9
-        },
-        "id": 7,
-        "options": {
-          "showHeader": true
-        },
-        "pluginVersion": "8.1.0-pre",
-        "targets": [
-          {
-            "csvContent": "ID, DisplayText\n21412312312, Homer\n12421412413, Simpsons \n12321312313, Bart",
-            "hide": false,
-            "refId": "A",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Mapping data",
-        "transformations": [
-          {
-            "id": "configFromData",
-            "options": {
-              "applyToConfig": true,
-              "configRefId": "A",
-              "mappings": [
-                {
-                  "fieldName": "Color",
-                  "handlerKey": "mappings.color"
-                },
-                {
-                  "fieldName": "Value",
-                  "handlerKey": "mappings.value"
-                }
-              ]
-            }
-          }
-        ],
-        "type": "table"
-      },
-      {
-        "datasource": null,
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {
-              "align": "center",
-              "displayMode": "auto"
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "Value"
-              },
-              "properties": [
-                {
-                  "id": "custom.displayMode",
-                  "value": "color-background-solid"
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 10,
-          "w": 12,
-          "x": 12,
-          "y": 9
-        },
-        "id": 6,
-        "options": {
-          "showHeader": true
-        },
-        "pluginVersion": "8.1.0-pre",
-        "targets": [
-          {
-            "csvContent": "Value, Color\nOK, blue\nPretty bad, red\nYay it's green, green\nSomething is off, orange\nNo idea, #88AA00\nAm I purple?, purple",
-            "hide": false,
-            "refId": "A",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Value mappings from query result applied to itself",
-        "transformations": [
-          {
-            "id": "configFromData",
-            "options": {
-              "applyTo": {
-                "id": "byName",
-                "options": "Value"
-              },
-              "applyToConfig": true,
-              "configRefId": "A",
-              "mappings": [
-                {
-                  "fieldName": "Color",
-                  "handlerKey": "mappings.color"
-                },
-                {
-                  "fieldName": "Value",
-                  "handlerKey": "mappings.value"
-                }
-              ]
-            }
-          }
-        ],
-        "type": "table"
-      },
-      {
-        "datasource": null,
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {
-              "align": "center",
-              "displayMode": "auto"
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 5,
-          "w": 12,
-          "x": 0,
-          "y": 14
-        },
-        "id": 8,
-        "options": {
-          "showHeader": true
-        },
-        "pluginVersion": "8.1.0-pre",
-        "targets": [
-          {
-            "csvContent": "ID, Value\n21412312312, 100\n12421412413, 20\n12321312313, 10",
-            "hide": false,
-            "refId": "A",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Display data",
-        "transformations": [
-          {
-            "id": "configFromData",
-            "options": {
-              "applyToConfig": true,
-              "configRefId": "A",
-              "mappings": [
-                {
-                  "fieldName": "Color",
-                  "handlerKey": "mappings.color"
-                },
-                {
-                  "fieldName": "Value",
-                  "handlerKey": "mappings.value"
-                }
-              ]
-            }
-          }
-        ],
-        "type": "table"
-      },
-      {
-        "datasource": null,
-        "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",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 10,
-          "w": 12,
-          "x": 0,
-          "y": 19
-        },
-        "id": 9,
-        "options": {
-          "barWidth": 0.97,
-          "groupWidth": 0.7,
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "orientation": "horizontal",
-          "showValue": "auto",
-          "text": {},
-          "tooltip": {
-            "mode": "single"
-          }
-        },
-        "pluginVersion": "8.1.0-pre",
-        "targets": [
-          {
-            "csvContent": "ID, Value\nA21412312312, 100\nA12421412413, 20\nA12321312313, 10\n",
-            "hide": false,
-            "refId": "data",
-            "scenarioId": "csv_content"
-          },
-          {
-            "csvContent": "ID, DisplayText\nA21412312312, Homer\nA12421412413, Marge \nA12321312313, Bart",
-            "hide": false,
-            "refId": "mappings",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Value mapping ID -> DisplayText from separate query",
-        "transformations": [
-          {
-            "id": "configFromData",
-            "options": {
-              "applyTo": {
-                "id": "byName",
-                "options": "ID"
-              },
-              "applyToConfig": false,
-              "configRefId": "mappings",
-              "mappings": [
-                {
-                  "fieldName": "ID",
-                  "handlerKey": "mappings.value"
-                },
-                {
-                  "fieldName": "DisplayText",
-                  "handlerKey": "mappings.text"
-                }
-              ]
-            }
-          }
-        ],
-        "type": "barchart"
-      }
-    ],
-    "refresh": "",
-    "schemaVersion": 30,
-    "style": "dark",
-    "tags": [
-      "gdev",
-      "transform"
-    ],
-    "templating": {
-      "list": []
-    },
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {},
-    "timezone": "",
-    "title": "Transforms - Config from query",
-    "uid": "Juj4_7ink",
-    "version": 1
-  }
--- a/devenv/dev-dashboards/transforms/rows-to-fields.json
+++ b/devenv/dev-dashboards/transforms/rows-to-fields.json
@@ -1,615 +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,
-    "gnetId": null,
-    "graphTooltip": 0,
-    "links": [],
-    "panels": [
-      {
-        "datasource": "-- Dashboard --",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {
-              "align": "left",
-              "displayMode": "auto"
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 5,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "id": 8,
-        "options": {
-          "showHeader": true
-        },
-        "pluginVersion": "8.1.0-pre",
-        "targets": [
-          {
-            "panelId": 2,
-            "refId": "A"
-          }
-        ],
-        "title": "Raw data",
-        "type": "table"
-      },
-      {
-        "datasource": "-- Dashboard --",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {
-              "align": "left",
-              "displayMode": "auto"
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "Value"
-              },
-              "properties": [
-                {
-                  "id": "custom.width",
-                  "value": 82
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "Unit"
-              },
-              "properties": [
-                {
-                  "id": "custom.width",
-                  "value": 108
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 5,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "id": 7,
-        "options": {
-          "showHeader": true,
-          "sortBy": []
-        },
-        "pluginVersion": "8.1.0-pre",
-        "targets": [
-          {
-            "panelId": 3,
-            "refId": "A"
-          }
-        ],
-        "title": "Raw data",
-        "type": "table"
-      },
-      {
-        "datasource": null,
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 0,
-          "y": 5
-        },
-        "id": 2,
-        "options": {
-          "colorMode": "value",
-          "graphMode": "none",
-          "justifyMode": "auto",
-          "orientation": "auto",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "text": {},
-          "textMode": "auto"
-        },
-        "pluginVersion": "8.1.0-pre",
-        "targets": [
-          {
-            "csvContent": "Name,Value,Unit,Color\nTemperature,10,degree,green\nPressure,100,bar,blue\nSpeed,30,km/h,red",
-            "refId": "A",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Unit and color from data",
-        "transformations": [
-          {
-            "id": "rowsToFields",
-            "options": {}
-          }
-        ],
-        "type": "stat"
-      },
-      {
-        "datasource": null,
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "mappings": [],
-            "min": 0,
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 12,
-          "y": 5
-        },
-        "id": 3,
-        "options": {
-          "orientation": "auto",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "showThresholdLabels": true,
-          "showThresholdMarkers": true,
-          "text": {}
-        },
-        "pluginVersion": "8.1.0-pre",
-        "targets": [
-          {
-            "csvContent": "Name,Value,Unit,min,max, threshold1\nTemperature,10,degree,0,50,30\nPressure,100,Pa,0,300,200\nSpeed,30,km/h,0,150,110",
-            "refId": "A",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Min, Max & Thresholds from data",
-        "transformations": [
-          {
-            "id": "rowsToFields",
-            "options": {}
-          }
-        ],
-        "type": "gauge"
-      },
-      {
-        "datasource": "-- Dashboard --",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {
-              "align": "left",
-              "displayMode": "auto"
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 5,
-          "w": 12,
-          "x": 0,
-          "y": 12
-        },
-        "id": 10,
-        "options": {
-          "showHeader": true
-        },
-        "pluginVersion": "8.1.0-pre",
-        "targets": [
-          {
-            "panelId": 9,
-            "refId": "A"
-          }
-        ],
-        "title": "Raw data",
-        "type": "table"
-      },
-      {
-        "datasource": "-- Dashboard --",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {
-              "align": "left",
-              "displayMode": "auto"
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": [
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "Value"
-              },
-              "properties": [
-                {
-                  "id": "custom.width",
-                  "value": 82
-                }
-              ]
-            },
-            {
-              "matcher": {
-                "id": "byName",
-                "options": "Unit"
-              },
-              "properties": [
-                {
-                  "id": "custom.width",
-                  "value": 108
-                }
-              ]
-            }
-          ]
-        },
-        "gridPos": {
-          "h": 5,
-          "w": 12,
-          "x": 12,
-          "y": 12
-        },
-        "id": 12,
-        "options": {
-          "showHeader": true,
-          "sortBy": []
-        },
-        "pluginVersion": "8.1.0-pre",
-        "targets": [
-          {
-            "panelId": 11,
-            "refId": "A"
-          }
-        ],
-        "title": "Raw data (Custom mapping)",
-        "type": "table"
-      },
-      {
-        "datasource": null,
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "continuous-GrYlRd"
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 0,
-          "y": 17
-        },
-        "id": 9,
-        "options": {
-          "displayMode": "gradient",
-          "orientation": "auto",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "showUnfilled": true,
-          "text": {}
-        },
-        "pluginVersion": "8.1.0-pre",
-        "targets": [
-          {
-            "csvContent": "Name,Value,Unit,Min,Max\nTemperature,20,degree,0,50\nPressure,150,Pa,0,300\nSpeed,100,km/h,0,110",
-            "refId": "A",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Min max from data",
-        "transformations": [
-          {
-            "id": "rowsToFields",
-            "options": {}
-          }
-        ],
-        "type": "bargauge"
-      },
-      {
-        "datasource": null,
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "mappings": [],
-            "min": 0,
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 12,
-          "y": 17
-        },
-        "id": 11,
-        "options": {
-          "orientation": "auto",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "showThresholdLabels": true,
-          "showThresholdMarkers": true,
-          "text": {}
-        },
-        "pluginVersion": "8.1.0-pre",
-        "targets": [
-          {
-            "csvContent": "Name,Value,Type,Quota, Warning\nTemperature,25,degree,50,30\nPressure,100,Pa,300,200\nSpeed,30,km/h,150,130",
-            "refId": "A",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Custom mapping",
-        "transformations": [
-          {
-            "id": "rowsToFields",
-            "options": {
-              "mappings": [
-                {
-                  "configProperty": "unit",
-                  "fieldName": "Type",
-                  "handlerKey": "unit"
-                },
-                {
-                  "configProperty": "max",
-                  "fieldName": "Quota",
-                  "handlerKey": "max"
-                },
-                {
-                  "configProperty": "threshold1",
-                  "fieldName": "Warning",
-                  "handlerKey": "threshold1"
-                }
-              ]
-            }
-          }
-        ],
-        "type": "gauge"
-      },
-      {
-        "datasource": null,
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "mappings": [],
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "green",
-                  "value": null
-                },
-                {
-                  "color": "red",
-                  "value": 80
-                }
-              ]
-            }
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 0,
-          "y": 24
-        },
-        "id": 13,
-        "options": {
-          "colorMode": "value",
-          "graphMode": "none",
-          "justifyMode": "auto",
-          "orientation": "horizontal",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "text": {},
-          "textMode": "auto"
-        },
-        "pluginVersion": "8.1.0-pre",
-        "targets": [
-          {
-            "csvContent": "Name, City, Country, Value\nSensorA, Stockholm, Sweden, 20\nSensorB, London, England, 50\nSensorC, New York, USA,100",
-            "refId": "A",
-            "scenarioId": "csv_content"
-          }
-        ],
-        "title": "Extra string fields to labels",
-        "transformations": [
-          {
-            "id": "rowsToFields",
-            "options": {}
-          }
-        ],
-        "type": "stat"
-      }
-    ],
-    "refresh": "",
-    "schemaVersion": 30,
-    "style": "dark",
-    "tags": [
-      "gdev",
-      "transform"
-    ],
-    "templating": {
-      "list": []
-    },
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {},
-    "timezone": "",
-    "title": "Transforms - Rows to fields",
-    "uid": "PMtIInink",
-    "version": 1
-  }
--- a/devenv/docker/blocks/elastic/docker-compose.yaml
+++ b/devenv/docker/blocks/elastic/docker-compose.yaml
@@ -1,19 +1,15 @@
-# You need to run 'sysctl -w vm.max_map_count=262144' on the host machine
-
-  elasticsearch-latest:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.13.2
-    command: elasticsearch
-    environment:
-      - "discovery.type=single-node"
+  elasticsearch:
+    image: elasticsearch:2.4.1
+    command: elasticsearch -Des.network.host=0.0.0.0
    ports:
-      - "14200:9200"
-      - "14300:9300"
+      - "9200:9200"
+      - "9300:9300"
+    volumes:
+      - ./docker/blocks/elastic/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml

-  fake-elastic-latest-data:
+  fake-elastic-data:
    image: grafana/fake-data-gen
-    links:
-      - elasticsearch-latest
+    network_mode: bridge
    environment:
-      FD_SERVER: elasticsearch-latest
-      FD_DATASOURCE: elasticsearch7
-      FD_PORT: 9200
+      FD_DATASOURCE: elasticsearch
+      FD_PORT: 9200
--- a/devenv/docker/blocks/elastic/elasticsearch.yml
+++ b/devenv/docker/blocks/elastic/elasticsearch.yml
@@ -1,3 +1,2 @@
 script.inline: on
 script.indexed: on
-xpack.license.self_generated.type: basic
--- a/devenv/docker/blocks/elastic2/docker-compose.yaml
+++ b/devenv/docker/blocks/elastic2/docker-compose.yaml
@@ -1,15 +0,0 @@
-  elasticsearch2:
-    image: elasticsearch:2.4.1
-    command: elasticsearch -Des.network.host=0.0.0.0
-    ports:
-      - "9200:9200"
-      - "9300:9300"
-    volumes:
-      - ./docker/blocks/elastic2/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
-
-  fake-elastic-data:
-    image: grafana/fake-data-gen
-    network_mode: bridge
-    environment:
-      FD_DATASOURCE: elasticsearch2
-      FD_PORT: 9200
--- a/devenv/docker/blocks/elastic2/elasticsearch.yml
+++ b/devenv/docker/blocks/elastic2/elasticsearch.yml
@@ -1,2 +0,0 @@
-script.inline: on
-script.indexed: on
--- a/devenv/docker/blocks/elastic77/docker-compose.yaml
+++ b/devenv/docker/blocks/elastic77/docker-compose.yaml
@@ -1,44 +0,0 @@
-# You need to run 'sysctl -w vm.max_map_count=262144' on the host machine
-
-  elasticsearch77:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.7.1
-    command: elasticsearch
-    environment:
-      - "discovery.type=single-node"
-    ports:
-      - "13200:9200"
-      - "13300:9300"
-
-  fake-elastic77-data:
-    image: grafana/fake-data-gen
-    links:
-      - elasticsearch77
-    environment:
-      FD_SERVER: elasticsearch77
-      FD_DATASOURCE: elasticsearch7
-      FD_PORT: 9200
-
-  filebeat77:
-    image: docker.elastic.co/beats/filebeat:7.7.1
-    command: filebeat -e -strict.perms=false
-    volumes:
-      - ./docker/blocks/elastic77/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
-      - /var/log:/var/log:ro
-      - ../data/log:/var/log/grafana:ro
-
-  metricbeat77:
-    image: docker.elastic.co/beats/metricbeat:7.7.1
-    command: metricbeat -e -strict.perms=false
-    user: root
-    volumes:
-      - ./docker/blocks/elastic77/metricbeat.yml:/usr/share/metricbeat/metricbeat.yml:ro
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-
-  kibana77:
-    image: docker.elastic.co/kibana/kibana:7.7.1
-    ports:
-      - "5601:5601"
-    links:
-      - elasticsearch77
-    environment:
-      ELASTICSEARCH_HOSTS: http://elasticsearch77:9200
--- a/devenv/docker/blocks/elastic77/elasticsearch.yml
+++ b/devenv/docker/blocks/elastic77/elasticsearch.yml
@@ -1,3 +0,0 @@
-script.inline: on
-script.indexed: on
-xpack.license.self_generated.type: basic
--- a/devenv/docker/blocks/elastic77/filebeat.yml
+++ b/devenv/docker/blocks/elastic77/filebeat.yml
--- a/devenv/docker/blocks/elastic77/metricbeat.yml
+++ b/devenv/docker/blocks/elastic77/metricbeat.yml
@@ -1,38 +0,0 @@
-metricbeat.config:
-  modules:
-    path: ${path.config}/modules.d/*.yml
-    # Reload module configs as they change:
-    reload.enabled: false
-
-metricbeat.autodiscover:
-  providers:
-    - type: docker
-      hints.enabled: true
-
-metricbeat.modules:
- module: docker
-  metricsets:
-    - "container"
-    - "cpu"
-    - "diskio"
-    - "healthcheck"
-    - "info"
-    #- "image"
-    - "memory"
-    - "network"
-  hosts: ["unix:///var/run/docker.sock"]
-  period: 10s
-  enabled: true
-
-processors:
-  - add_cloud_metadata: ~
-
-output.elasticsearch:
-  hosts: ["elasticsearch77:9200"]
-  index: "metricbeat-%{+yyyy.MM.dd}"
-
-setup.template.name: "metricbeat"
-setup.template.pattern: "metricbeat-*"
-setup.template.settings:
-  index.number_of_shards: 1
-  index.number_of_replicas: 1
--- a/devenv/docker/blocks/influxdb/docker-compose.yaml
+++ b/devenv/docker/blocks/influxdb/docker-compose.yaml
@@ -24,7 +24,7 @@
      - influxdb

  telegraf:
-    image: telegraf:1.19.1
+    image: telegraf:1.10.4
    links:
      - influxdb
    depends_on:
--- a/devenv/docker/blocks/influxdb1/docker-compose.yaml
+++ b/devenv/docker/blocks/influxdb1/docker-compose.yaml
@@ -1,5 +1,5 @@
  influxdb1:
-    image: influxdb:1.8.6
+    image: influxdb:1.8.4-alpine
    container_name: influxdb1
    ports:
      - '2004:2004'
@@ -22,7 +22,7 @@
      FD_PORT: 8086

  telegraf-influxdb1:
-    image: telegraf:1.19.1
+    image: telegraf:1.10.4
    links:
      - influxdb1
    volumes:
--- a/devenv/docker/blocks/jaeger/docker-compose.yaml
+++ b/devenv/docker/blocks/jaeger/docker-compose.yaml
@@ -1,7 +1,7 @@
  jaeger:
    image: jaegertracing/all-in-one:latest
    ports:
-      - "6831:6831/udp"
+      - "6831:6831"
      - "16686:16686"
  # Additional loki to generate some traces
  # datasource URL: http://localhost:3100/
--- a/devenv/docker/blocks/slow_proxy/.env
+++ b/devenv/docker/blocks/slow_proxy/.env
@@ -1,2 +1,2 @@
-ORIGIN_SERVER=http://host.docker.internal:9090/
+ORIGIN_SERVER=http://localhost:9090/
 SLEEP_DURATION=60s
--- a/devenv/docker/blocks/slow_proxy/Dockerfile
+++ b/devenv/docker/blocks/slow_proxy/Dockerfile
@@ -1,11 +1,7 @@
-FROM golang:latest as builder
+
+FROM golang:latest
 ADD main.go /
 WORKDIR /
-RUN go mod init proxy
-RUN CGO_ENABLED=0 go build -o main .
-
-FROM scratch
-WORKDIR /
+RUN GO111MODULE=off go build -o main .
 EXPOSE 3011
-COPY --from=builder /main /main
 ENTRYPOINT ["/main"]
--- a/devenv/docker/blocks/slow_proxy/docker-compose.yaml
+++ b/devenv/docker/blocks/slow_proxy/docker-compose.yaml
@@ -1,9 +1,8 @@
  slow_proxy:
    build: docker/blocks/slow_proxy
+    network_mode: host
    ports:
      - "3011:3011"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
    environment:
      ORIGIN_SERVER: ${ORIGIN_SERVER}
      SLEEP_DURATION: ${SLEEP_DURATION}
--- a/devenv/docker/blocks/slow_proxy/main.go
+++ b/devenv/docker/blocks/slow_proxy/main.go
@@ -12,14 +12,12 @@ import (
 func main() {
 	origin := os.Getenv("ORIGIN_SERVER")
 	if origin == "" {
-		// it is never not-set, the default is in the `.env` file
-		log.Fatalf("missing env-variable ORIGIN_SERVER")
+		origin = "http://localhost:9090/"
 	}

 	sleepDurationStr := os.Getenv("SLEEP_DURATION")
 	if sleepDurationStr == "" {
-		// it is never not-set, the default is in the `.env` file
-		log.Fatalf("missing env-variable SLEEP_DURATION")
+		sleepDurationStr = "60s"
 	}

 	sleep, err := time.ParseDuration(sleepDurationStr)
--- a/devenv/docker/blocks/slow_proxy_mac/Dockerfile
+++ b/devenv/docker/blocks/slow_proxy_mac/Dockerfile
@@ -0,0 +1,7 @@
+
+FROM golang:latest
+ADD main.go /
+WORKDIR /
+RUN GO111MODULE=off go build -o main .
+EXPOSE 3011
+ENTRYPOINT ["/main"]
--- a/devenv/docker/blocks/slow_proxy_mac/docker-compose.yaml
+++ b/devenv/docker/blocks/slow_proxy_mac/docker-compose.yaml
@@ -0,0 +1,6 @@
+  slow_proxy_mac:
+    build: docker/blocks/slow_proxy_mac
+    ports:
+      - '3011:3011'
+    environment:
+      ORIGIN_SERVER: 'http://host.docker.internal:9090/'
--- a/devenv/docker/blocks/slow_proxy_mac/main.go
+++ b/devenv/docker/blocks/slow_proxy_mac/main.go
@@ -0,0 +1,31 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"net/http"
+	"net/http/httputil"
+	"net/url"
+	"os"
+	"time"
+)
+
+func main() {
+	origin := os.Getenv("ORIGIN_SERVER")
+	if origin == "" {
+		origin = "http://host.docker.internal:9090/"
+	}
+
+	sleep := time.Minute
+
+	originURL, _ := url.Parse(origin)
+	proxy := httputil.NewSingleHostReverseProxy(originURL)
+
+	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		fmt.Printf("sleeping for %s then proxying request: %s", sleep.String(), r.RequestURI)
+		<-time.After(sleep)
+		proxy.ServeHTTP(w, r)
+	})
+
+	log.Fatal(http.ListenAndServe(":3011", nil))
+}
--- a/docs/sources/_index.md
+++ b/docs/sources/_index.md
@@ -1,8 +1,8 @@
 +++
 title = "Grafana documentation"
-description = "Guides, Installation and Feature Documentation"
+description = "Guides, installation, and feature documentation"
 keywords = ["grafana", "installation", "documentation"]
-aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin", "/docs/grafana/v3.1"]
+aliases = ["/docs/grafana/latest/guides/reference/admin"]
 +++

 # Grafana documentation
@@ -98,7 +98,7 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
      <img src="/static/img/docs/logos/icon_cloudwatch.svg">
      <h5>AWS CloudWatch</h5>
    </a>
-    <a href="{{< relref "datasources/azuremonitor/_index.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/azuremonitor.md" >}}" class="nav-cards__item nav-cards__item--ds">
      <img src="/static/img/docs/logos/icon_azure_monitor.jpg">
      <h5>Azure Monitor</h5>
    </a>
--- a/docs/sources/administration/configuration.md
+++ b/docs/sources/administration/configuration.md
@@ -202,14 +202,15 @@ Or redirect port 80 to the Grafana port using:
 $ sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 3000
 ```

-Another way is to put a web server like Nginx or Apache in front of Grafana and have them proxy requests to Grafana.
+Another way is put a webserver like Nginx or Apache in front of Grafana and have them proxy requests to Grafana.

 ### domain

+This setting is only used in as a part of the `root_url` setting (see below). Important if you use GitHub or Google OAuth.

 ### enforce_domain

-Redirect to correct domain if the host header does not match the domain. Prevents DNS rebinding attacks. Default is `false`.
+Redirect to correct domain if host header does not match domain. Prevents DNS rebinding attacks. Default is `false`.

 ### root_url

@@ -423,7 +424,6 @@ For more details check the [Transport.MaxConnsPerHost](https://golang.org/pkg/ne
 The maximum number of idle connections that Grafana will maintain. Default is `100`. For more details check the [Transport.MaxIdleConns](https://golang.org/pkg/net/http/#Transport.MaxIdleConns) documentation.

 ### max_idle_connections_per_host
-[Deprecated - use max_idle_connections instead]

 The maximum number of idle connections per host that Grafana will maintain. Default is `2`. For more details check the [Transport.MaxIdleConnsPerHost](https://golang.org/pkg/net/http/#Transport.MaxIdleConnsPerHost) documentation.

@@ -509,7 +509,7 @@ Sets the `SameSite` cookie attribute and prevents the browser from sending this

 When `false`, the HTTP header `X-Frame-Options: deny` will be set in Grafana HTTP responses which will instruct
 browsers to not allow rendering Grafana in a `<frame>`, `<iframe>`, `<embed>` or `<object>`. The main goal is to
-mitigate the risk of [Clickjacking](https://owasp.org/www-community/attacks/Clickjacking). Default is `false`.
+mitigate the risk of [Clickjacking](https://www.owasp.org/index.php/Clickjacking). Default is `false`.

 ### strict_transport_security

@@ -586,9 +586,7 @@ As of Grafana v7.3, this also limits the refresh interval options in Explore.

 ### default_home_dashboard_path

-Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json".
-
->**Note:** On Linux, Grafana uses `/usr/share/grafana/public/dashboards/home.json` as the default home dashboard location.
+Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json"

 <hr />

@@ -909,11 +907,7 @@ Default is `false`.

 ### templates_pattern

-Enter a comma separated list of template patterns. Default is `emails/*.html, emails/*.txt`.
-
-### content_types
-
-Enter a comma-separated list of content types that should be included in the emails that are sent. List the content types according descending preference, e.g. `text/html, text/plain` for HTML as the most preferred. The order of the parts is significant as the mail clients will use the content type that is supported and most preferred by the sender. Supported content types are `text/html` and `text/plain`. Default is `text/html`.
+Default is `emails/*.html`.

 <hr>

@@ -1393,7 +1387,7 @@ Basic auth password.

 ### public_url

-Optional URL to send to users in notifications. If the string contains the sequence `${file}`, it is replaced with the uploaded filename. Otherwise, the file name is appended to the path part of the URL, leaving any query string unchanged.
+Optional URL to send to users in notifications. If the string contains the sequence \${file}, it is replaced with the uploaded filename. Otherwise, the file name is appended to the path part of the URL, leaving any query string unchanged.

 <hr>

@@ -1512,23 +1506,6 @@ Refer to [Grafana Live configuration documentation]({{< relref "../live/configur

 0 disables Grafana Live, -1 means unlimited connections.

-### allowed_origins
-
-> **Note**: Available in Grafana v8.0.4 and later versions.
-
-The `allowed_origins` option is a comma-separated list of additional origins (`Origin` header of HTTP Upgrade request during WebSocket connection establishment) that will be accepted by Grafana Live.
-
-If not set (default), then the origin is matched over [root_url]({{< relref "#root_url" >}}) which should be sufficient for most scenarios.
-
-Origin patterns support wildcard symbol "*".
-
-For example:
-
-```ini
-[live]
-allowed_origins = "https://*.example.com"
-```
-
 <hr>

 ## [plugin.grafana-image-renderer]
@@ -1672,26 +1649,3 @@ Used as the default time zone for user preferences. Can be either `browser` for
 ### enabled

 Set this to `false` to disable expressions and hide them in the Grafana UI. Default is `true`.
-
-## [geomap]
-
-This section controls the defaults settings for Geomap Plugin.
-
-### default_baselayer_config
-
-The json config used to define the default base map. Four base map options to choose from are `carto`, `esriXYZTiles`, `xyzTiles`, `standard`.
-For example, to set cartoDB light as the default base layer:
-
-```ini
-default_baselayer_config = `{
-  "type": "xyz",
-  "config": {
-    "attribution": "Open street map",
-    "url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png"
-  }
-}`
-```
-
-### enable_custom_baselayers
-
-Set this to `true` to disable loading other custom base maps and hide them in the Grafana UI. Default is `false`.
--- a/docs/sources/administration/image_rendering.md
+++ b/docs/sources/administration/image_rendering.md
@@ -158,13 +158,13 @@ libx11-6 libx11-xcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3
 On Debian 9 (Stretch) the following dependencies have been confirmed as needed for the image rendering to function.

 ```bash
-libx11 libcairo bcairo2 libcairo2 libxtst6 libxcomposite1 libx11-xcb1 libxcursor1 libxdamage1 libnss3 libcups libcups2 libXss libXss1 libxss1 libxrandr2 libasound2 libatk1.0-0 libatk-bridge2.0-0 libpangocairo-1.0-0 libgtk-3-0 libgbm1
+libx11 libcairo bcairo2 libcairo2 libxtst6 libxcomposite1 libx11-xcb1 libxcursor1 libxdamage1 libnss3 libcups libcups2 libXss libXss1 libxss1 libxrandr2 libasound2 libatk1.0-0 libatk-bridge2.0-0 libpangocairo-1.0-0 libgtk-3-0
 ```

 On Debian 10 (Buster) the following dependencies have been confirmed as needed for the image rendering to function.

 ```bash
-libxdamage1 libxext6 libxi6 libxtst6 libnss3 libnss3 libcups2 libxss1 libxrandr2 libasound2 libatk1.0-0 libatk-bridge2.0-0 libpangocairo-1.0-0 libpango-1.0-0 libcairo2 libatspi2.0-0 libgtk3.0-cil libgdk3.0-cil libx11-xcb-dev libgbm1
+libxdamage1 libxext6 libxi6 libxtst6 libnss3 libnss3 libcups2 libxss1 libxrandr2 libasound2 libatk1.0-0 libatk-bridge2.0-0 libpangocairo-1.0-0 libpango-1.0-0 libcairo2 libatspi2.0-0 libgtk3.0-cil libgdk3.0-cil libx11-xcb-dev
 ```

 **Centos:**
@@ -208,5 +208,5 @@ instead of the pre-packaged version of Chromium.
 To override the path to the Chrome/Chromium executable, set an environment variable and make sure that it's available for the Grafana process. For example:

 ```bash
-export GF_PLUGIN_RENDERING_CHROME_BIN="/usr/bin/chromium-browser"
+export GF_RENDERER_PLUGIN_CHROME_BIN="/usr/bin/chromium-browser"
 ```
--- a/docs/sources/administration/preferences/change-home-dashboard.md
+++ b/docs/sources/administration/preferences/change-home-dashboard.md
@@ -32,7 +32,7 @@ Users with the Grafana Server Admin flag on their account or access to the confi
 ### Use a JSON file as the home dashboard

 1. Save your JSON file somewhere that Grafana can access it. For example, in the Grafana `data` folder of Grafana.
-1. Update your configuration file to set the path to the JSON file. Refer to [default_home_dashboard_path]({{< relref "../configuration.md#default_home_dashboard_path">}}) for more information about modifying the Grafana configuration files.
+1. Update your configuration file to set the path to the JSON file. Refer to [default_home_dashboard_path]({{< relref "../configuration.md">}}) for more information about modifying the Grafana configuration files.

 ```ini
 [dashboards]
@@ -40,8 +40,6 @@ Users with the Grafana Server Admin flag on their account or access to the confi
 default_home_dashboard_path = data/main-dashboard.json
 ```

->**Note:** On Linux, Grafana uses `/usr/share/grafana/public/dashboards/home.json` as the default home dashboard location.
-
 ## Set the home dashboard for your organization

 Organization administrators can choose a home dashboard for their organization.
--- a/docs/sources/administration/set-up-for-high-availability.md
+++ b/docs/sources/administration/set-up-for-high-availability.md
@@ -24,10 +24,6 @@ Grafana will now persist all long term data in the database. How to configure th

 Currently alerting supports a limited form of high availability. [Alert notifications]({{< relref "../alerting/old-alerting/notifications.md" >}}) are deduplicated when running multiple servers. This means all alerts are executed on every server but alert notifications are only sent once per alert. Grafana does not support load distribution between servers.

-## Grafana Live
-
-Grafana Live works with limitations in highly available setup. For details, refer to the [Grafana Live documentation]({{< relref "../live/live-ha-setup.md" >}}).
-
 ## User sessions

 Grafana uses auth token strategy with database by default. This means that a load balancer can send a user to any Grafana server without having to log in on each server.
--- a/docs/sources/alerting/_index.md
+++ b/docs/sources/alerting/_index.md
@@ -1,11 +1,12 @@
 +++
 title = "Alerts"
+aliases = ["/docs/grafana/latest/alerting/rules/", "/docs/grafana/latest/alerting/metrics/"]
 weight = 110
 +++

 # Grafana alerts

-Alerts allow you to know about problems in your systems moments after they occur. Robust and actionable alerts help you identify and resolve issues quickly, minimizing disruption to your services.
+Alerts allow you to know about problems in your systems moments after they occur. Robust and actionable alerts help you identify and resolve issues quickly, minimizing disruption to your services. 

 Grafana 8.0 has new and improved alerts. The new alerting system are an [opt-in]({{< relref "./unified-alerting/opt-in.md" >}}) feature that centralizes alerting information for Grafana managed alerts and alerts from Prometheus-compatible data sources in one UI and API.

@@ -18,11 +19,7 @@ Alerts have four main components:

 You can create and edit alerting rules for Grafana managed alerts, Cortex alerts, and Loki alerts as well as see alerting information from prometheus-compatible data sources in a single, searchable view. For more information, on how to create and edit alerts and notifications, refer to [Overview of Grafana 8.0 alerts]({{< relref "../alerting/unified-alerting/_index.md" >}}).

-For handling notifications for Grafana managed alerts, we use an embedded Alertmanager. You can configure its contact points, notification policies, silences and templates from the new Grafana alerting UI by selecting `Grafana` from the Alertmanager dropdown on the top of the respective tab.
-
-> **Note:** Currently the configuration of this embedded Alertmanager is shared across organisations. Therefore users are advised to use the new Grafana 8 Alerts only if they have one organisation otherwise all contact points, notification policies, silences and templates for Grafana managed alerts will be visible by all organizations.
-
-As part of the new alert changes, we have introduced a new data source, Alertmanager, which includes built-in support for Prometheus Alertmanager. It is presently in alpha and it not accessible unless alpha plugins are enabled in Grafana settings. For more information, refer to [Alertmanager data source]({{< relref "../datasources/alertmanager.md" >}}). If such a data source is present, then you can view and modify its silences, contact points and notification policies from the Grafana alerting UI by selecting it from the Alertmanager dropdown on the top of respective tab.
+As part of the new alert changes, we have introduced a new data source, Alertmanager, which includes built-in support for Prometheus Alertmanager. It is presently in alpha and it not accessible unless alpha plugins are enabled in Grafana settings. For more information, refer to [Alertmanager data source]({{< relref "../datasources/alertmanager.md" >}}).

 > **Note:** Out of the box, Grafana still supports old Grafana alerts. They are legacy alerts at this time, and will be deprecated in a future release. For more information, refer to [Legacy Grafana alerts]({{< relref "./old-alerting/_index.md" >}}).

--- a/docs/sources/alerting/old-alerting/_index.md
+++ b/docs/sources/alerting/old-alerting/_index.md
@@ -1,5 +1,6 @@
 +++
 title = "Legacy Grafana Alerts"
+aliases = ["/docs/grafana/latest/alerting/rules/", "/docs/grafana/latest/alerting/metrics/"]
 weight = 114
 +++

@@ -14,7 +15,7 @@ Notification channel - How the alert is delivered. When the conditions of an ale

 Currently only the graph panel visualization supports alerts.

-Legacy alerts have two main components:
+Legacy aerts have two main components:

 - Alert rule - When the alert is triggered. Alert rules are defined by one or more conditions that are regularly evaluated by Grafana.
 - Notification channel -  How the alert is delivered. When the conditions of an alert rule are met, the Grafana notifies the channels configured for that alert.
--- a/docs/sources/alerting/old-alerting/add-notification-template.md
+++ b/docs/sources/alerting/old-alerting/add-notification-template.md
@@ -2,7 +2,6 @@
 title = "Alert notification templating"
 keywords = ["grafana", "documentation", "alerting", "alerts", "notification", "templating"]
 weight = 110
-aliases = ["/docs/grafana/latest/alerting/add-notification-template/"]
 +++

 # Alert notification templating
--- a/docs/sources/alerting/old-alerting/create-alerts.md
+++ b/docs/sources/alerting/old-alerting/create-alerts.md
@@ -3,7 +3,6 @@ title = "Create alerts"
 description = "Configure alert rules"
 keywords = ["grafana", "alerting", "guide", "rules"]
 weight = 200
-aliases = ["/docs/grafana/latest/alerting/create-alerts/"]
 +++

 # Create alerts
--- a/docs/sources/alerting/old-alerting/notifications.md
+++ b/docs/sources/alerting/old-alerting/notifications.md
@@ -3,7 +3,6 @@ title = "Alert notifications"
 description = "Alerting notifications guide"
 keywords = ["Grafana", "alerting", "guide", "notifications"]
 weight = 100
-aliases = ["/docs/grafana/latest/alerting/notifications/"]
 +++

 # Alert notifications
@@ -223,8 +222,8 @@ In DingTalk PC Client:

 ### Discord

-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).
+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) f.

 Setting | Description
 ---------- | -----------
--- a/docs/sources/alerting/old-alerting/pause-an-alert-rule.md
+++ b/docs/sources/alerting/old-alerting/pause-an-alert-rule.md
@@ -3,7 +3,6 @@ title = "Pause alert rule"
 description = "Pause an existing alert rule"
 keywords = ["grafana", "alerting", "guide", "rules", "view"]
 weight = 400
-aliases = ["/docs/grafana/latest/alerting/pause-an-alert-rule/"]
 +++

 # Pause an alert rule
--- a/docs/sources/alerting/old-alerting/troubleshoot-alerts.md
+++ b/docs/sources/alerting/old-alerting/troubleshoot-alerts.md
@@ -3,7 +3,6 @@ title = "Troubleshoot alerts"
 description = "Troubleshoot alert rules"
 keywords = ["grafana", "alerting", "guide", "rules", "troubleshoot"]
 weight = 500
-aliases = ["/docs/grafana/latest/alerting/troubleshoot-alerts/"]
 +++

 # Troubleshoot alerts
--- a/docs/sources/alerting/old-alerting/view-alerts.md
+++ b/docs/sources/alerting/old-alerting/view-alerts.md
@@ -3,7 +3,6 @@ title = "View alerts"
 description = "View existing alert rules"
 keywords = ["grafana", "alerting", "guide", "rules", "view"]
 weight = 400
-aliases = ["/docs/grafana/latest/alerting/view-alerts/"]
 +++

 # View existing alert rules
--- a/docs/sources/alerting/unified-alerting/_index.md
+++ b/docs/sources/alerting/unified-alerting/_index.md
@@ -31,7 +31,7 @@ You can perform the following tasks for alerts:

 ## Clustering

-The current alerting system doesn't support high availability. Alert notifications are not deduplicated and load balancing is not supported between instances e.g. silences from one instance will not appear in the other. The Grafana team aims to have this feature by Grafana version 8.1+.
+Currently alerting supports a limited form of high availability. Alert notifications are deduped when running multiple servers. This means all alerts are executed on every server but no duplicate alert notifications are sent due to the deduping logic. Proper load balancing of alerts will be introduced in the future.

 ## Alert evaluation

--- a/docs/sources/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-rule.md
+++ b/docs/sources/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-rule.md
@@ -9,9 +9,6 @@ weight = 400

 Grafana allows you manage alerting rules for an external Cortex or Loki instance. 

-
-In order for both Cortex and Loki data sources to work with Grafana 8.0 alerting, enable the ruler API by configuring their respective services.  The`local` rule storage type, default for Loki, only supports viewing of rules. If you want to edit rules, then configure one of the other rule storage types. When configuring a Grafana Prometheus data source to point to Cortex, use the legacy `/api/prom` prefix, not `/prometheus`. Only single-binary mode is currently supported, and it is not possible to provide a separate URL for the ruler API. 
-
 ## Add or edit a Cortex or Loki managed alerting rule

 1. In the Grafana menu hover your cursor over the Alerting (bell) icon.
@@ -62,8 +59,4 @@ Labels are key value pairs that categorize or identify an alert. Labels are  use

 ## Preview alerts

-To evaluate the rule and see what alerts it would produce, click **Preview alerts**. It will display a list of alerts with state and value of for each one.
-
-## Opt-out a Loki or Prometheus data source
-
-If you do not want to allow creating rules for a particular Loki or Prometheus data source, go to its settings page and clear the **Manage alerts via Alerting UI** checkbox.
+To evaluate the rule and see what alerts it would produce, click **Preview alerts**. It will display a list of alerts with state and value of for each one.
--- a/docs/sources/alerting/unified-alerting/alerting-rules/create-grafana-managed-rule.md
+++ b/docs/sources/alerting/unified-alerting/alerting-rules/create-grafana-managed-rule.md
@@ -103,16 +103,6 @@ Labels are key value pairs that categorize or identify an alert. Labels are  use

 ![Details section](/static/img/docs/alerting/unified/rule-edit-details-8-0.png 'Details section screenshot')

-#### Template variables
-
-The following template variables are available when expanding annotations and labels.
-
-| Name    | Description     |
-| ------- | --------------- |
-| $labels | The labels from the query or condition. For example, `{{ $labels.instance }}` and `{{ $labels.job }}`. |
-| $values | The values of all reduce and math expressions that were evaluated for this alert rule. For example, `{{ $values.A }}`, `{{ $values.A.Labels }}` and `{{ $values.A.Value }}` where `A` is the `refID` of the expression. |
-| $value  | The value string of the alert instance. For example, `[ var='A' labels={instance=foo} value=10 ]`. |
-
 ## Preview alerts

 To evaluate the rule and see what alerts it would produce, click **Preview alerts**. It will display a list of alerts with state and value for each one.
--- a/docs/sources/alerting/unified-alerting/alerting-rules/rule-list.md
+++ b/docs/sources/alerting/unified-alerting/alerting-rules/rule-list.md
@@ -46,7 +46,3 @@ To edit or delete a rule:
 1. Expand this rule to reveal rule controls. 
 1. Click **Edit** to go to the rule editing form. Make changes following [instructions listed here]({{< relref "./create-grafana-managed-rule.md" >}}).
 1. Click **Delete"** to delete a rule. 
-
-## Opt-out a Loki or Prometheus data source
-
-If you do not want rules to be loaded from a Prometheus or Loki data source, go to its settings page and clear the **Manage alerts via Alerting UI** checkbox.
--- a/docs/sources/alerting/unified-alerting/contact-points.md
+++ b/docs/sources/alerting/unified-alerting/contact-points.md
@@ -9,10 +9,6 @@ weight = 400

 Contact points define where to send notifications about alerts that match a particular [notification policy]({{< relref "./notification-policies.md" >}}). A contact point can contain one or more contact point types, eg email, slack, webhook and so on. A notification will dispatched to all contact point types defined on a contact point. [Templating]({{< relref "./message-templating/_index.md" >}}) can be used to customize contact point type message with alert data. Grafana alerting UI can be used to configure both Grafana managed contact points and contact points for an [external Alertmanager if one is configured]({{< relref "../../datasources/alertmanager.md" >}}).

-Grafana alerting UI allows you to configure contact points for the Grafana managed alerts (handled by the embedded Alertmanager) as well as contact points for an [external Alertmanager if one is configured]({{< relref "../../datasources/alertmanager.md" >}}), using the Alertmanager dropdown.
-
-> **Note:** Currently the configuration of the embedded Alertmanager is shared across organisations. Therefore users are advised to use the new Grafana 8 Alerts only if they have one organisation otherwise contact points for the Grafana managed alerts will be visible by all organizations.
-
 ## Add a contact point

 1. In the Grafana side bar, hover your cursor over the **Alerting** (bell) icon and then click **Contact points**.
--- a/docs/sources/alerting/unified-alerting/message-templating/_index.md
+++ b/docs/sources/alerting/unified-alerting/message-templating/_index.md
@@ -10,6 +10,7 @@ weight = 400

 Notifications sent via [contact points]({{< relref "../contact-points.md" >}}) are built using templates. Grafana comes with default templates which you can customize. Grafana's notification templates are based on the [Go templating system](https://golang.org/pkg/text/template) where some fields are evaluated as text, while others are evaluated as HTML which can affect escaping. Since most of the contact point fields can be templated, you can create reusable templates and them in multiple contact points. See [template data reference]({{< relref "./template-data.md" >}}) to check what variables are available in the templates.

+
 ## Using templating in contact point fields

 This section shows an example of using templating to render a number of firing or resolved alerts in Slack message title, and listing alerts with status and name in the message body:
@@ -20,10 +21,6 @@ This section shows an example of using templating to render a number of firing o

 You can create named templates and then reuse them in contact point fields or other templates.

-Grafana alerting UI allows you to configure templates for the Grafana managed alerts (handled by the embedded Alertmanager) as well as templates for an [external Alertmanager if one is configured]({{< relref "../../../datasources/alertmanager.md" >}}), using the Alertmanager dropdown.
-
-> **Note:** Currently the configuration of the embedded Alertmanager is shared across organisations. Therefore users are advised to use the new Grafana 8 Alerts only if they have one organisation otherwise templates for the Grafana managed alerts will be visible by all organizations
-
 ### Create a template
 1. In the Grafana side bar, hover your cursor over the **Alerting** (bell) icon and then click **Contact points**.
 1. Click **Add template**.
--- a/docs/sources/alerting/unified-alerting/message-templating/template-data.md
+++ b/docs/sources/alerting/unified-alerting/message-templating/template-data.md
@@ -37,7 +37,6 @@ SilenceURL   | string    | Link to grafana silence for with labels for this aler
 DashboardURL | string    | Link to grafana dashboard, if alert rule belongs to one. Only for Grafana managed alerts.
 PanelURL     | string    | Link to grafana dashboard panel, if alert rule belongs to one. Only for Grafana managed alerts.
 Fingerprint  | string    | Fingerprint that can be used to identify the alert.
-ValueString  | string    | A string that contains the labels and value of each reduced expression in the alert.

 ## KeyValue

--- a/docs/sources/alerting/unified-alerting/notification-policies.md
+++ b/docs/sources/alerting/unified-alerting/notification-policies.md
@@ -9,9 +9,8 @@ weight = 400

 Notification policies determine how alerts are routed to contact points. Policies have a tree structure, where each policy can have one or more child policies. Each policy except for the root policy can also match specific alert labels. Each alert enters policy tree at the root and then traverses each child policy. If `Continue matching subsequent sibling nodes` is not checked, it stops at the first matching node, otherwise, it continues matching it's siblings as well. If an alert does not match any children of a policy, the alert is handled based on the configuration settings of this policy and notified to the contact point configured on this policy. Alert that does not match any specific policy is handled by the root policy.

-Grafana alerting UI allows you to configure notification policies for the Grafana managed alerts (handled by the embedded Alertmanager) as well as notification policies for an [external Alertmanager if one is configured]({{< relref "../../datasources/alertmanager.md" >}}), using the Alertmanager dropdown.
+Grafana alerting UI allows you to configure Grafana notification policies as well as notification policies (routes) for an [external Alertmanager if one is configured]({{< relref "../../datasources/alertmanager.md" >}}).

-> **Note:** Currently the configuration of the embedded Alertmanager is shared across organisations. Therefore users are advised to use the new Grafana 8 Alerts only if they have one organisation otherwise notification policies for the Grafana managed alerts will be visible by all organizations.

 ## Edit notification policies

--- a/docs/sources/alerting/unified-alerting/opt-in.md
+++ b/docs/sources/alerting/unified-alerting/opt-in.md
@@ -8,12 +8,10 @@ weight = 128

 Setting the `ngalert` feature toggle enables the new Grafana 8 alerting system.

->**Note:** We recommend that you backup Grafana's database before enabling this feature. If you are using PostgreSQL as the backend data source, then the minimum required version is 9.5.
+>**Note:** It is recommended to backup Grafana's database before enabling this feature. If you are using PostgreSQL as the backend data source, then the minimum required version is 9.5.

 At startup, when [the feature toggle is enabled]({{< relref "../../administration/configuration.md">}}#feature_toggles), the legacy Grafana dashboard alerting is disabled and existing dashboard alerts are migrated into a format that is compatible with the Grafana 8 alerting system. You can view these migrated rules, alongside any new alerts you create after the migration, from the Alerting page of your Grafana instance.

->**Note:** Since the new system stores the notification log and silences on disk, we require the use of persistent disks for using Grafana 8 alerts. Otherwise, the silences and notification log will get lost on a restart, and you might get unwanted or duplicate notifications.
-
 Read and write access to dashboard alerts in Grafana versions 7 and earlier were governed by the dashboard and folder permissions under which the alerts were stored. In Grafana 8, alerts are stored in folders and inherit the permissions of those folders. During the migration, dashboard alert permissions are matched to the new rules permissions as follows:

 - If alert's dashboard has permissions, it will create a folder named like `Migrated {"dashboardUid": "UID", "panelId": 1, "alertId": 1}` to match permissions of the dashboard (including the inherited permissions from the folder).
--- a/docs/sources/alerting/unified-alerting/silences.md
+++ b/docs/sources/alerting/unified-alerting/silences.md
@@ -11,10 +11,6 @@ Grafana allows to you to prevent notifications from one or more alert rules by c

 Silences do not prevent alert rules from being evaluated. They also do not stop alert instances being shown in the user interface. Silences only prevent notifications from being created.

-Grafana alerting UI allows you to configure silences for the Grafana managed alerts (handled by the embedded Alertmanager) as well as silences for an [external Alertmanager if one is configured]({{< relref "../../datasources/alertmanager.md" >}}), using the Alertmanager dropdown.
-
-> **Note:** Currently the configuration of the embedded Alertmanager is shared across organisations. Therefore users are advised to use the new Grafana 8 Alerts only if they have one organisation otherwise silences for the Grafana managed alerts will be visible by all organizations.
-
 ## Add a silence

 To add a silence:
--- a/docs/sources/auth/auth-proxy.md
+++ b/docs/sources/auth/auth-proxy.md
@@ -30,7 +30,7 @@ sync_ttl = 60
 # Example `whitelist = 192.168.1.1, 192.168.1.0/24, 2001::23, 2001::0/120`
 whitelist =
 # Optionally define more headers to sync other user attributes
-# Example `headers = Name:X-WEBAUTH-NAME Role:X-WEBAUTH-ROLE Email:X-WEBAUTH-EMAIL Groups:X-WEBAUTH-GROUPS`
+# Example `headers = Name:X-WEBAUTH-NAME Email:X-WEBAUTH-EMAIL Groups:X-WEBAUTH-GROUPS`
 headers =
 # Check out docs on this for more details on the below setting
 enable_login_token = false
--- a/docs/sources/auth/azuread.md
+++ b/docs/sources/auth/azuread.md
@@ -9,7 +9,7 @@ weight = 700

 > Only available in Grafana v6.7+

-The Azure AD authentication allows you to use an Azure Active Directory tenant as an identity provider for Grafana. You can use Azure AD Application Roles to assign users and groups to Grafana roles from the Azure Portal.
+The Azure AD authentication provides the possibility to use an Azure Active Directory tenant as an identity provider for Grafana. By using Azure AD Application Roles it is also possible to assign Users and Groups to Grafana roles from the Azure Portal.

 ## Create the Azure AD application

@@ -23,27 +23,22 @@ To enable the Azure AD OAuth2 you must register your application with Azure AD.

 1. Add the redirect URL `https://<grafana domain>/login/azuread`, then click **Register**.

-1. The app's **Overview** page is displayed. Note the **Application ID**. This is the OAuth client ID.
+1. The app's **Overview** page is displayed. Note the **Application ID**, this is the OAuth client id.

 1. Click **Endpoints** from the top menu.

-   - Note the **OAuth 2.0 authorization endpoint (v2)**. This is the auth URL.
-   - Note the **OAuth 2.0 token endpoint (v2)**. This is the token URL.
+   - Note the **OAuth 2.0 authorization endpoint (v2)**, this is the auth URL.
+   - Note the **OAuth 2.0 token endpoint (v2)**, this is the token URL.

-1. Click **Certificates & secrets** and then add a new entry under **Client secrets**.
+1. Click **Certificates & secrets** and add a new entry under Client secrets.
+    - Description: Grafana OAuth
+    - Expires: Never

-   - Description: Grafana OAuth
-   - Expires: Never
-
-1. Click **Add**, and then copy the key value. This is the OAuth client secret.
+1. Click **Add**, then copy the key value. This is the OAuth client secret.

 1. Click **Manifest**.
-
-   - Define the required Application Role values for Grafana: Viewer, Editor, Admin. Otherwise, all users will have the Viewer role.
-   - Every role requires a unique ID.
-   - Generate the unique ID on Linux with `uuidgen`, and on Windows through Microsoft
-   PowerShell with `New-Guid`.
-   - Include the unique ID in the configuration file:
+   - Add definitions for the required Application Roles for Grafana (Viewer, Editor, Admin). Without this configuration, all users will be assigned the Viewer role.
+   - Every role requires a unique id. On Linux, this can be created with `uuidgen`. For example:

        ```json
        "appRoles": [
@@ -108,30 +103,25 @@ allowed_domains =
 allowed_groups =
 ```

-**Note:** Ensure that the [root_url]({{< relref "../administration/configuration/#root-url" >}}) in Grafana is set in your Azure Application Reply URLs (**App** -> **Settings** -> **Reply URLs**)
+> **Note:** Ensure that the [root_url]({{< relref "../administration/configuration/#root-url" >}}) in Grafana is set in your Azure Application Reply URLs (App -> Settings -> Reply URLs)

-### Configure allowed groups
+### Configure allowed groups and domains

-To limit access to authenticated users who are members of one or more groups, set `allowed_groups`
-to a comma- or space-separated list of group object IDs. You can find object IDs for a specific group on the Azure portal:
-
-1. Go to **Azure Active Directory -> Groups**.
-
-For example, if you want to only give access to members of the group `example` with an ID of `8bab1c86-8fba-33e5-2089-1d1c80ec267d`, set the following:
+To limit access to authenticated users that are members of one or more groups, set `allowed_groups`
+to a comma- or space-separated list of group Object Ids. Object Id for a specific group can be found on the Azure portal: go to Azure Active Directory -> Groups. For instance, if you want to
+only give access to members of the group `example` which has Id `8bab1c86-8fba-33e5-2089-1d1c80ec267d`, set

 ```ini
 allowed_groups = 8bab1c86-8fba-33e5-2089-1d1c80ec267d
 ```

-You'll need to ensure that you've [enabled group attributes](https://docs.microsoft.com/en-us/azure/active-directory/hybrid/how-to-connect-fed-group-claims#configure-the-azure-ad-application-registration-for-group-attributes) in your Azure AD Application Registration manifest file. Navigate to **Azure Portal** -> **Azure Active Directory** -> **Application Registrations** -> **Select Application** -> **Manifest**, and set the following:
+You'll need to ensure that you've [enabled group attributes](https://docs.microsoft.com/en-us/azure/active-directory/hybrid/how-to-connect-fed-group-claims#configure-the-azure-ad-application-registration-for-group-attributes) in your Azure AD Application Registration manifest file (Azure Portal -> Azure Active Directory -> Application Registrations -> Select Application -> Manifest)

 ```json
 "groupMembershipClaims": "ApplicationGroup, SecurityGroup"
 ```

-### Configure allowed domains
-
-The `allowed_domains` option limits access to users who belong to specific domains. Separate domains with space or comma.
+The `allowed_domains` option limits access to the users belonging to the specific domains. Domains should be separated by space or comma.

 ```ini
 allowed_domains = mycompany.com mycompany.org
@@ -144,6 +134,6 @@ allowed_domains = mycompany.com mycompany.org
 With Team Sync you can map your Azure AD groups to teams in Grafana so that your users will automatically be added to
 the correct teams.

-You can reference Azure AD groups by group object ID, like `8bab1c86-8fba-33e5-2089-1d1c80ec267d`.
+Azure AD groups can be referenced by group Object Id, like `8bab1c86-8fba-33e5-2089-1d1c80ec267d`.

 [Learn more about Team Sync]({{< relref "team-sync.md" >}})
--- a/docs/sources/auth/generic-oauth.md
+++ b/docs/sources/auth/generic-oauth.md
@@ -15,7 +15,6 @@ You can configure many different OAuth2 authentication services with Grafana usi
  - [Set up OAuth2 with OneLogin](#set-up-oauth2-with-onelogin)
  - [JMESPath examples](#jmespath-examples)
    - [Role mapping](#role-mapping)
-    - [Groups mapping](#groups-mapping)

 This callback URL must match the full HTTP address that you use in your browser to access Grafana, but with the suffixed path of `/login/generic_oauth`.

@@ -66,10 +65,6 @@ Grafana will also attempt to do role mapping through OAuth as described below.

 Check for the presence of a role using the [JMESPath](http://jmespath.org/examples.html) specified via the `role_attribute_path` configuration option. The JSON used for the path lookup is the HTTP response obtained from querying the UserInfo endpoint specified via the `api_url` configuration option. The result after evaluating the `role_attribute_path` JMESPath expression needs to be a valid Grafana role, i.e. `Viewer`, `Editor` or `Admin`.

-Grafana also attempts to map teams through OAuth as described below.
-
-Check for the presence of groups using the [JMESPath](http://jmespath.org/examples.html) specified via the `groups_attribute_path` configuration option. The JSON used for the path lookup is the HTTP response obtained from querying the UserInfo endpoint specified via the `api_url` configuration option. After evaluating the `groups_attribute_path` JMESPath expression, the result should be a string array of groups.
-
 See [JMESPath examples](#jmespath-examples) for more information.

 Customize user login using `login_attribute_path` configuration option. Order of operations is as follows:
@@ -220,7 +215,7 @@ role_attribute_path = role

 **Advanced example:**

-In the following example user will get `Admin` as role when authenticating since it has a role `admin`. If a user has a role `editor` it will get `Editor` as role, otherwise `Viewer`.
+In the following example user will get `Admin` as role when authenticating since it has a group `admin`. If a user has a group `editor` it will get `Editor` as role, otherwise `Viewer`.

 Payload:
 ```json
@@ -228,7 +223,7 @@ Payload:
    ...
    "info": {
        ...
-        "roles": [
+        "groups": [
            "engineer",
            "admin",
        ],
@@ -240,38 +235,5 @@ Payload:

 Config:
 ```bash
-role_attribute_path = contains(info.roles[*], 'admin') && 'Admin' || contains(info.roles[*], 'editor') && 'Editor' || 'Viewer'
+role_attribute_path = contains(info.groups[*], 'admin') && 'Admin' || contains(info.groups[*], 'editor') && 'Editor' || 'Viewer'
 ```
-
-
-### Groups mapping
-
->  Available in Grafana Enterprise v8.1 and later versions.
-
-With Team Sync you can map your Generic OAuth groups to teams in Grafana so that the users are automatically added to the correct teams.
-
-Generic OAuth groups can be referenced by group ID, like `8bab1c86-8fba-33e5-2089-1d1c80ec267d` or `myteam`.
-
-[Learn more about Team Sync]({{< relref "team-sync.md" >}})
-
-Config:
-
-```bash
-groups_attribute_path = info.groups
-```
-
-Payload:
-```json
-{
-    ...
-    "info": {
-        ...
-        "groups": [
-            "engineers",
-            "analysts",
-        ],
-        ...
-    },
-    ...
-}
-```
--- a/docs/sources/auth/ldap.md
+++ b/docs/sources/auth/ldap.md
@@ -11,7 +11,7 @@ weight = 300
 The LDAP integration in Grafana allows your Grafana users to login with their LDAP credentials. You can also specify mappings between LDAP
 group memberships and Grafana Organization user roles.

-> [Enhanced LDAP authentication]({{< relref "../enterprise/enhanced_ldap.md" >}}) is available in [Grafana Cloud Pro and Advanced](https://grafana.com/docs/grafana-cloud/) and in [Grafana Enterprise]({{< relref "../enterprise" >}}).
+> [Enhanced LDAP authentication]({{< relref "../enterprise/enhanced_ldap.md" >}}) is available in [Grafana Enterprise]({{< relref "../enterprise" >}}).

 ## Supported LDAP Servers

--- a/docs/sources/auth/saml.md
+++ b/docs/sources/auth/saml.md
@@ -10,4 +10,4 @@ weight = 1100

 The SAML authentication integration allows your Grafana users to log in by using an external SAML Identity Provider (IdP). To enable this, Grafana becomes a Service Provider (SP) in the authentication flow, interacting with the IdP to exchange user information.

-> SAML authentication integration is available in Grafana Cloud Pro and Advanced and in Grafana Enterprise. For more information, refer to [SAML authentication]({{< relref "../enterprise/saml.md" >}}) in [Grafana Enterprise]({{< relref "../enterprise" >}}).
+> SAML authentication integration is only available in Grafana Enterprise v6.3 or later. For more information, refer to [SAML authentication]({{< relref "../enterprise/saml.md" >}}) in [Grafana Enterprise]({{< relref "../enterprise" >}}).
--- a/docs/sources/auth/team-sync.md
+++ b/docs/sources/auth/team-sync.md
@@ -19,4 +19,4 @@ This mechanism allows Grafana to remove an existing synchronized user from a tea

 <div class="clearfix"></div>

-> Team Sync is available in Grafana Enterprise Cloud Pro and Advanced and in Grafana Enterprise.  For more information, refer to [Team sync]({{< relref "../enterprise/team-sync.md" >}}) in [Grafana Enterprise]({{< relref "../enterprise" >}}).
+> Team Sync is only available in Grafana Enterprise.  For more information, refer to [Team sync]({{< relref "../enterprise/team-sync.md" >}}) in [Grafana Enterprise]({{< relref "../enterprise" >}}).
--- a/docs/sources/dashboards/annotations.md
+++ b/docs/sources/dashboards/annotations.md
@@ -41,18 +41,12 @@ can still show them if you add a new **Annotation Query** and filter by tags. Bu

 ### Query by tag

-
-You can create new queries to fetch annotations from the native annotation store via the `-- Grafana --` data source by setting *Filter by* to `Tags`. 
-
-Grafana v8.1 and later versions also support typeahead of existing tags, provide at least one tag.
-
-For example, create an annotation query name `outages` and specify a tag `outage`. This query will show all annotations (from any dashboard or via API) with the `outage` tag. If multiple tags are defined in an annotation query, then Grafana will only show annotations matching all the tags. To modify the behavior, enable `Match any`, and Grafana will show annotations that contain any one of the tags you provided.
-
-{{< figure src="/static/img/docs/annotations/annotations_typeahead_support-8-1-0.png" max-width="600px" >}}
+You can create new annotation queries that fetch annotations from the native annotation store via the `-- Grafana --` data source and by setting *Filter by* to `Tags`. Specify at least
+one tag. For example create an annotation query name `outages` and specify a tag named `outage`. This query will show all annotations you create (from any dashboard or via API) that have the `outage` tag. By default, if you add multiple tags in the annotation query, Grafana will only show annotations that have all the tags you supplied. You can invert the behavior by enabling `Match any` which means that Grafana will show annotations that contains at least one of the tags you supplied.

 In Grafana v5.3+ it's possible to use template variables in the tag query. So if you have a dashboard showing stats for different services and a template variable that dictates which services to show, you can now use the same template variable in your annotation query to only show annotations for those services.

-{{< figure src="/static/img/docs/annotations/annotation_tag_filter_variable-8-1-0.png" max-width="600px" >}}
+{{< figure src="/static/img/docs/v53/annotation_tag_filter_variable.png" max-width="600px" >}}

 ## Querying other data sources

--- a/docs/sources/dashboards/shortcuts.md
+++ b/docs/sources/dashboards/shortcuts.md
@@ -5,7 +5,7 @@ weight = 7

 # Keyboard shortcuts

-Grafana has a number of keyboard shortcuts available. Press `?` or `h` on your keyboard to display all keyboard shortcuts available in your version of Grafana.
+Grafana has a number of keyboard shortcuts available. Press Shift + `?` on your keyboard to display all keyboard shortcuts available in your version of Grafana.

 **Popular shortcuts:**

--- a/docs/sources/datasources/_index.md
+++ b/docs/sources/datasources/_index.md
@@ -18,7 +18,7 @@ The following data sources are officially supported:

 - [Alertmanager]({{< relref "alertmanager.md" >}})
 - [AWS CloudWatch]({{< relref "cloudwatch.md" >}})
- [Azure Monitor]({{< relref "azuremonitor/_index.md" >}})
+- [Azure Monitor]({{< relref "azuremonitor.md" >}})
 - [Elasticsearch]({{< relref "elasticsearch.md" >}})
 - [Google Cloud Monitoring]({{< relref "google-cloud-monitoring/_index.md" >}})
 - [Graphite]({{< relref "graphite.md" >}})
@@ -46,3 +46,4 @@ In addition to the data sources that you have configured in your Grafana, there
 ## Data source plugins

 Since Grafana 3.0 you can install data sources as plugins. Check out [Grafana.com/plugins](https://grafana.com/plugins) for more data sources.
+
--- a/docs/sources/datasources/azuremonitor.md
+++ b/docs/sources/datasources/azuremonitor.md
@@ -0,0 +1,434 @@
+++
+title = "Azure Monitor"
+description = "Guide for using Azure Monitor in Grafana"
+keywords = ["grafana", "microsoft", "azure", "monitor", "application", "insights", "log", "analytics", "guide"]
+aliases = ["/docs/grafana/latest/features/datasources/azuremonitor"]
+weight = 300
+++
+
+# Azure Monitor data source
+
+The Azure Monitor data source supports multiple services in the Azure cloud:
+
+- **[Azure Monitor Metrics]({{< relref "#query-the-metrics-service" >}})** (or Metrics) is the platform service that provides a single source for monitoring Azure resources.
+- **[Azure Monitor Logs]({{< relref "#query-the-logs-service" >}})** (or Logs) gives you access to log data collected by Azure Monitor.
+- **[Azure Resource Graph]({{< relref "#query-the-azure-resource-graph-service" >}})** allows you to query the resources on your Azure subscription.
+
+## Add the data source
+
+The Azure Monitor data source can access metrics from three different services. Configure access to the services that you plan to use. To use different credentials for different Azure services, configure multiple Azure Monitor data sources.
+
+- [Guide to setting up an Azure Active Directory Application for Azure Monitor.](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-create-service-principal-portal)
+- [Guide to setting up an Azure Active Directory Application for Azure Monitor Logs.](https://dev.loganalytics.io/documentation/Authorization/AAD-Setup)
+
+1. Accessed from the Grafana main menu, newly installed data sources can be added immediately within the Data Sources section. Next, click the "Add data source" button in the upper right. The Azure Monitor data source will be available for selection in the Cloud section in the list of data sources.
+
+1. In the name field, Grafana will automatically fill in a name for the data source - `Azure Monitor` or something like `Azure Monitor - 3`. If you are going to configure multiple data sources, then change the name to something more informative.
+
+1. Fill in the Azure AD App Registration details:
+
+   - **Tenant Id** (Azure Active Directory -> Properties -> Directory ID)
+   - **Client Id** (Azure Active Directory -> App Registrations -> Choose your app -> Application ID)
+   - **Client Secret** (Azure Active Directory -> App Registrations -> Choose your app -> Keys)
+   - **Default Subscription Id** (Subscriptions -> Choose subscription -> Overview -> Subscription ID)
+
+1. Paste these four items into the fields in the Azure Monitor API Details section:
+   {{< figure src="/static/img/docs/v62/config_1_azure_monitor_details.png" class="docs-image--no-shadow" caption="Azure Monitor Configuration Details" >}}
+
+   - The Subscription Id can be changed per query. Save the data source and refresh the page to see the list of subscriptions available for the specified Client Id.
+
+1. Test that the configuration details are correct by clicking on the "Save & Test" button:
+   {{< figure src="/static/img/docs/v62/config_3_save_and_test.png" class="docs-image--no-shadow" caption="Save and Test" >}}
+
+Alternatively on step 4 if creating a new Azure Active Directory App, use the [Azure CLI](https://docs.microsoft.com/en-us/cli/azure/?view=azure-cli-latest):
+
+```bash
+az ad sp create-for-rbac -n "http://localhost:3000"
+```
+
+## Choose a Service
+
+In the query editor for a panel, after choosing your Azure Monitor data source, the first option is to choose a service. There are three options here:
+
+- Metrics
+- Logs
+- Azure Resource Graph
+
+The query editor changes depending on which one you pick. Metrics is the default.
+
+In Grafana 7.4, the Azure Monitor query type was renamed to Metrics, and Azure Logs Analytics was renamed to Logs. In Grafana 8.0 Application Insights and Insights Analytics is unavailable for new panels, in favor of querying through Metrics and Logs.
+
+## Query the Metrics service
+
+The Metrics service provides metrics for all the Azure services that you have running. It helps you understand how your applications on Azure are performing and to proactively find issues affecting your applications.
+
+If your Azure Monitor credentials give you access to multiple subscriptions, then choose the appropriate subscription first.
+
+Examples of metrics that you can get from the service are:
+
+- `Microsoft.Compute/virtualMachines - Percentage CPU`
+- `Microsoft.Network/networkInterfaces - Bytes sent`
+- `Microsoft.Storage/storageAccounts - Used Capacity`
+
+{{< figure src="/static/img/docs/v60/azuremonitor-service-query-editor.png" class="docs-image--no-shadow" caption="Metrics Query Editor" >}}
+
+As of Grafana 7.1, the query editor allows you to query multiple dimensions for metrics that support them. Metrics that support multiple dimensions are those listed in the [Azure Monitor supported Metrics List](https://docs.microsoft.com/en-us/azure/azure-monitor/platform/metrics-supported) that have one or more values listed in the "Dimension" column for the metric.
+
+### Format legend keys with aliases for Metrics
+
+The default legend formatting for the Metrics API is:
+
+`metricName{dimensionName=dimensionValue,dimensionTwoName=DimensionTwoValue}`
+
+> **Note:** Before Grafana 7.1, the formatting included the resource name in the default: `resourceName{dimensionName=dimensionValue}.metricName`. As of Grafana 7.1, the resource name has been removed from the default legend.
+
+These can be quite long, but this formatting can be changed by using aliases. In the **Legend Format** field, you can combine the aliases defined below any way you want.
+
+Metrics examples:
+
+- `Blob Type: {{ blobtype }}`
+- `{{ resourcegroup }} - {{ resourcename }}`
+
+### Alias patterns for Metrics
+
+- `{{ resourcegroup }}` = replaced with the value of the Resource Group
+- `{{ namespace }}` = replaced with the value of the Namespace (e.g. Microsoft.Compute/virtualMachines)
+- `{{ resourcename }}` = replaced with the value of the Resource Name
+- `{{ metric }}` = replaced with metric name (e.g. Percentage CPU)
+- `{{ dimensionname }}` = _Legacy as of 7.1+ (for backwards compatibility)_ replaced with the first dimension's key/label (as sorted by the key/label) (e.g. blobtype)
+- `{{ dimensionvalue }}` = _Legacy as of 7.1+ (for backwards compatibility)_ replaced with first dimension's value (as sorted by the key/label) (e.g. BlockBlob)
+- `{{ arbitraryDim }}` = _Available in 7.1+_ replaced with the value of the corresponding dimension. (e.g. `{{ blobtype }}` becomes BlockBlob)
+
+### Create template variables for Metrics
+
+Instead of hard-coding things like server, application and sensor name in your metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard.
+
+Note that the Metrics service does not support multiple values yet. If you want to visualize multiple time series (for example, metrics for server1 and server2) then you have to add multiple queries to able to view them on the same graph or in the same table.
+
+The Metrics data source Plugin provides the following queries you can specify in the `Query` field in the Variable edit view. They allow you to fill a variable's options list.
+
+| Name                                                                                               | Description                                                                     |
+| -------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- |
+| `Subscriptions()`                                                                                  | Returns a list of subscriptions.                                                |
+| `ResourceGroups()`                                                                                 | Returns a list of resource groups.                                              |
+| `ResourceGroups(12345678-aaaa-bbbb-cccc-123456789aaa)`                                             | Returns a list of resource groups for a specified subscription.                 |
+| `Namespaces(aResourceGroup)`                                                                       | Returns a list of namespaces for the specified resource group.                  |
+| `Namespaces(12345678-aaaa-bbbb-cccc-123456789aaa, aResourceGroup)`                                 | Returns a list of namespaces for the specified resource group and subscription. |
+| `ResourceNames(aResourceGroup, aNamespace)`                                                        | Returns a list of resource names.                                               |
+| `ResourceNames(12345678-aaaa-bbbb-cccc-123456789aaa, aResourceGroup, aNamespace)`                  | Returns a list of resource names for a specified subscription.                  |
+| `MetricNamespace(aResourceGroup, aNamespace, aResourceName)`                                       | Returns a list of metric namespaces.                                            |
+| `MetricNamespace(12345678-aaaa-bbbb-cccc-123456789aaa, aResourceGroup, aNamespace, aResourceName)` | Returns a list of metric namespaces for a specified subscription.               |
+| `MetricNames(aResourceGroup, aNamespace, aResourceName)`                                           | Returns a list of metric names.                                                 |
+| `MetricNames(12345678-aaaa-bbbb-cccc-123456789aaa, aResourceGroup, aNamespace, aResourceName)`     | Returns a list of metric names for a specified subscription.                    |
+
+Examples:
+
+- Resource Groups query: `ResourceGroups()`
+- Passing in metric name variable: `Namespaces(cosmo)`
+- Chaining template variables: `ResourceNames($rg, $ns)`
+- Do not quote parameters: `MetricNames(hg, Microsoft.Network/publicIPAddresses, grafanaIP)`
+
+{{< figure src="/static/img/docs/v60/azuremonitor-service-variables.png" class="docs-image--no-shadow" caption="Nested Azure Monitor Template Variables" >}}
+
+Check out the [Templating]({{< relref "../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
+types of template variables.
+
+### List of supported Azure Monitor metrics
+
+Not all metrics returned by the Azure Monitor Metrics API have values. To make it easier for you when building a query, the Grafana data source has a list of supported metrics and ignores metrics which will never have values. This list is updated regularly as new services and metrics are added to the Azure cloud. For more information about the list of metrics, refer to [current supported namespaces](https://github.com/grafana/grafana/blob/main/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/supported_namespaces.ts).
+
+### Alerting
+
+Grafana alerting is supported for the Azure Monitor service. This is not Azure Alerts support. For more information about Grafana alerting, refer to [how alerting in Grafana works]({{< relref "../alerting/_index.md" >}}).
+
+{{< figure src="/static/img/docs/v60/azuremonitor-alerting.png" class="docs-image--no-shadow" caption="Azure Monitor Alerting" >}}
+
+## Query the Logs service
+
+Queries are written in the [Kusto Query Language](https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/). A Logs query can be formatted as time series data or as table data.
+
+If your credentials give you access to multiple subscriptions, then choose the appropriate subscription before entering queries.
+
+### Time series queries
+
+Time series queries are for the Graph panel and other panels like the SingleStat panel. Each query must contain at least a datetime column and a numeric value column. The result must also be sorted in ascending order by the datetime column.
+
+Here is an example query that returns the aggregated count grouped by hour:
+
+```kusto
+Perf
+| where $__timeFilter(TimeGenerated)
+| summarize count() by bin(TimeGenerated, 1h)
+| order by TimeGenerated asc
+```
+
+A query can also have one or more non-numeric/non-datetime columns, and those columns are considered dimensions and become labels in the response. For example, a query that returns the aggregated count grouped by hour, Computer, and the CounterName:
+
+```kusto
+Perf
+| where $__timeFilter(TimeGenerated)
+| summarize count() by bin(TimeGenerated, 1h), Computer, CounterName
+| order by TimeGenerated asc
+```
+
+You can also select additional number value columns (with, or without multiple dimensions). For example, getting a count and average value by hour, Computer, CounterName, and InstanceName:
+
+```kusto
+Perf
+| where $__timeFilter(TimeGenerated)
+| summarize Samples=count(), ["Avg Value"]=avg(CounterValue)
+    by bin(TimeGenerated, $__interval), Computer, CounterName, InstanceName
+| order by TimeGenerated asc
+```
+
+> **Tip**: In the above query, the Kusto syntax `Samples=count()` and `["Avg Value"]=...` is used to rename those columns — the second syntax allowing for the space. This changes the name of the metric that Grafana uses, and as a result, things like series legends and table columns will match what you specify. Here `Samples` is displayed instead of `_count`.
+
+{{< figure src="/static/img/docs/azure-monitor/logs_multi-value_multi-dim.png" class="docs-image--no-shadow" caption="Azure Logs query with multiple values and multiple dimensions" >}}
+
+### Table queries
+
+Table queries are mainly used in the Table panel and show a list of columns and rows. This example query returns rows with the six specified columns:
+
+```kusto
+AzureActivity
+| where $__timeFilter()
+| project TimeGenerated, ResourceGroup, Category, OperationName, ActivityStatus, Caller
+| order by TimeGenerated desc
+```
+
+### Format the display name for Log Analytics
+
+The default display name format is:
+
+`metricName{dimensionName=dimensionValue,dimensionTwoName=DimensionTwoValue}`
+
+This can be customized by using the [display name field option]({{< relref "../panels/standard-options.md#display-name" >}}).
+
+### Logs macros
+
+To make writing queries easier there are several Grafana macros that can be used in the where clause of a query:
+
+- `$__timeFilter()` - Expands to
+  `TimeGenerated ≥ datetime(2018-06-05T18:09:58.907Z) and`
+  `TimeGenerated ≤ datetime(2018-06-05T20:09:58.907Z)` where the from and to datetimes are from the Grafana time picker.
+
+- `$__timeFilter(datetimeColumn)` - Expands to
+  `datetimeColumn ≥ datetime(2018-06-05T18:09:58.907Z) and`
+  `datetimeColumn ≤ datetime(2018-06-05T20:09:58.907Z)` where the from and to datetimes are from the Grafana time picker.
+
+- `$__timeFrom()` - Returns the From datetime from the Grafana picker. Example: `datetime(2018-06-05T18:09:58.907Z)`.
+
+- `$__timeTo()` - Returns the From datetime from the Grafana picker. Example: `datetime(2018-06-05T20:09:58.907Z)`.
+
+- `$__escapeMulti($myVar)` - is to be used with multi-value template variables that contain illegal characters. If `$myVar` has the following two values as a string `'\\grafana-vm\Network(eth0)\Total','\\hello!'`, then it expands to: `@'\\grafana-vm\Network(eth0)\Total', @'\\hello!'`. If using single value variables there is no need for this macro, simply escape the variable inline instead - `@'\$myVar'`.
+
+- `$__contains(colName, $myVar)` - is to be used with multi-value template variables. If `$myVar` has the value `'value1','value2'`, it expands to: `colName in ('value1','value2')`.
+
+  If using the `All` option, then check the `Include All Option` checkbox and in the `Custom all value` field type in the following value: `all`. If `$myVar` has value `all` then the macro will instead expand to `1 == 1`. For template variables with a lot of options, this will increase the query performance by not building a large "where..in" clause.
+
+### Logs builtin variables
+
+There are also some Grafana variables that can be used in Logs queries:
+
+- `$__interval` - Grafana calculates the minimum time grain that can be used to group by time in queries. For more information about `$__interval`, refer to [interval variables]({{< relref "../variables/variable-types/_index.md#interval-variables" >}}). It returns a time grain like `5m` or `1h` that can be used in the bin function. E.g. `summarize count() by bin(TimeGenerated, $__interval)`
+
+### Templating with variables for Logs
+
+Any Log Analytics query that returns a list of values can be used in the `Query` field in the Variable edit view. There is also one Grafana function for Log Analytics that returns a list of workspaces.
+
+Refer to the [Variables]({{< relref "../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
+types of template variables.
+
+| Name                                               | Description                                                                                            |
+| -------------------------------------------------- | ------------------------------------------------------------------------------------------------------ |
+| `workspaces()`                                     | Returns a list of workspaces for the default subscription.                                             |
+| `workspaces(12345678-aaaa-bbbb-cccc-123456789aaa)` | Returns a list of workspaces for the specified subscription (the parameter can be quoted or unquoted). |
+
+Example variable queries:
+
+<!-- prettier-ignore-start -->
+| Query                                                                                   | Description                                               |
+| --------------------------------------------------------------------------------------- | --------------------------------------------------------- |
+| `subscriptions()`                                                                       | Returns a list of Azure subscriptions                     |
+| `workspaces()`                                                                          | Returns a list of workspaces for default subscription     |
+| `workspaces("12345678-aaaa-bbbb-cccc-123456789aaa")`                                    | Returns a list of workspaces for a specified subscription |
+| `workspaces("$subscription")`                                                           | With template variable for the subscription parameter     |
+| `workspace("myWorkspace").Heartbeat \| distinct Computer`                               | Returns a list of Virtual Machines                        |
+| `workspace("$workspace").Heartbeat \| distinct Computer`                                | Returns a list of Virtual Machines with template variable |
+| `workspace("$workspace").Perf \| distinct ObjectName`                                   | Returns a list of objects from the Perf table             |
+| `workspace("$workspace").Perf \| where ObjectName == "$object" \| distinct CounterName` | Returns a list of metric names from the Perf table        |
+
+<!-- prettier-ignore-end -->
+
+Example of a time series query using variables:
+
+```kusto
+Perf
+| where ObjectName == "$object" and CounterName == "$metric"
+| where TimeGenerated >= $__timeFrom() and TimeGenerated <= $__timeTo()
+| where  $__contains(Computer, $computer)
+| summarize avg(CounterValue) by bin(TimeGenerated, $__interval), Computer
+| order by TimeGenerated asc
+```
+
+### Deep linking from Grafana panels to the Azure Metric Logs query editor in Azure Portal
+
+> Only available in Grafana v7.0+.
+
+{{< figure src="/static/img/docs/v70/azure-log-analytics-deep-linking.png" max-width="500px" class="docs-image--right" caption="Logs deep linking" >}}
+
+Click on a time series in the panel to see a context menu with a link to `View in Azure Portal`. Clicking that link opens the Azure Metric Logs query editor in the Azure Portal and runs the query from the Grafana panel there.
+
+If you're not currently logged in to the Azure Portal, then the link opens the login page. The provided link is valid for any account, but it only displays the query if your account has access to the Azure Metric Logs workspace specified in the query.
+
+<div class="clearfix"></div>
+
+## Query the Azure Resource Graph service
+
+Azure Resource Graph (ARG) is a service in Azure that is designed to extend Azure Resource Management by providing efficient and performant resource exploration with the ability to query at scale across a given set of subscriptions so that you can effectively govern your environment. By querying ARG, you can query resources with complex filtering, iteratively explore resources based on governance requirements, and assess the impact of applying policies in a vast cloud environment.
+
+{{< figure src="/static/img/docs/azure-monitor/azure-resource-graph.png" class="docs-image--no-shadow" caption="Azure Resource Graph editor" max-width="650px" >}}
+
+### Table queries
+
+Queries are written in the [Kusto Query Language](https://docs.microsoft.com/en-us/azure/governance/resource-graph/concepts/query-language). Not all Kusto language features are available in ARG. An Azure Resource Graph query is formatted as table data.
+
+If your credentials give you access to multiple subscriptions, then you can choose multiple subscriptions before entering queries.
+
+### Sort results by resource properties
+
+Here is an example query that returns any type of resource, but only the name, type, and location properties:
+
+```kusto
+Resources
+| project name, type, location
+| order by name asc
+```
+
+The query uses `order by` to sort the properties by the `name` property in ascending (asc) order. You can change what property to sort by and the order (`asc` or `desc`). The query uses `project` to show the listed properties in the results. You can add or remove properties.
+
+### Query resources with complex filtering
+
+Filtering for Azure resources with a tag name of `Environment` that have a value of `Internal`. You can change these to any desired tag key and value. The `=~` in the `type` match tells Resource Graph to be case insensitive. You can project by other properties or add/ remove more.
+
+The tag key is case sensitive. `Environment` and `environment` will give different results. For example, a query that returns a list of resources with a specified tag value:
+
+```kusto
+Resources
+| where tags.environment=~'internal'
+| project name
+```
+
+### Group and aggregate the values by property
+
+You can also use `summarize` and `count` to define how to group and aggregate the values by property. For example, returning count of healthy, unhealthy, and not applicable resources per recommendation:
+
+```kusto
+securityresources
+| where type == 'microsoft.security/assessments'
+| extend resourceId=id,
+    recommendationId=name,
+    resourceType=type,
+    recommendationName=properties.displayName,
+    source=properties.resourceDetails.Source,
+    recommendationState=properties.status.code,
+    description=properties.metadata.description,
+    assessmentType=properties.metadata.assessmentType,
+    remediationDescription=properties.metadata.remediationDescription,
+    policyDefinitionId=properties.metadata.policyDefinitionId,
+    implementationEffort=properties.metadata.implementationEffort,
+    recommendationSeverity=properties.metadata.severity,
+    category=properties.metadata.categories,
+    userImpact=properties.metadata.userImpact,
+    threats=properties.metadata.threats,
+    portalLink=properties.links.azurePortal
+| summarize numberOfResources=count(resourceId) by tostring(recommendationName), tostring(recommendationState)
+```
+
+## Configure the data source with provisioning
+
+You can configure data sources using config files with Grafana’s provisioning system. For more information on how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../administration/provisioning/#datasources" >}})
+
+Here are some provisioning examples for this data source.
+
+### Azure AD App Registration (client secret)
+
+```yaml
+# config file version
+apiVersion: 1
+
+datasources:
+  - name: Azure Monitor
+    type: grafana-azure-monitor-datasource
+    access: proxy
+    jsonData:
+      azureAuthType: clientsecret
+      cloudName: azuremonitor # See table below
+      tenantId: <tenant-id>
+      clientId: <client-id>
+      subscriptionId: <subscription-id> # Optional, default subscription
+    secureJsonData:
+      clientSecret: <client-secret>
+    version: 1
+```
+
+### Managed Identity
+
+```yaml
+# config file version
+apiVersion: 1
+
+datasources:
+  - name: Azure Monitor
+    type: grafana-azure-monitor-datasource
+    access: proxy
+    jsonData:
+      azureAuthType: msi
+      subscriptionId: <subscription-id> # Optional, default subscription
+    version: 1
+```
+
+### App Registration (client secret)
+
+```yaml
+datasources:
+  - name: Azure Monitor
+    type: grafana-azure-monitor-datasource
+    access: proxy
+    jsonData:
+      azureAuthType: clientsecret
+      cloudName: azuremonitor # See table below
+      tenantId: <tenant-id>
+      clientId: <client-id>
+      subscriptionId: <subscription-id> # Optional, default subscription
+    secureJsonData:
+      clientSecret: <client-secret>
+    version: 1
+```
+
+### Supported cloud names
+
+| Azure Cloud                                      | Value                      |
+| ------------------------------------------------ | -------------------------- |
+| Microsoft Azure public cloud                     | `azuremonitor` (_default_) |
+| Microsoft Chinese national cloud                 | `chinaazuremonitor`        |
+| US Government cloud                              | `govazuremonitor`          |
+| Microsoft German national cloud ("Black Forest") | `germanyazuremonitor`      |
+
+## Deprecated Application Insights and Insights Analytics
+
+Application Insights and Insights Analytics are two ways to query the same Azure Application Insights data, which can also be queried from Metrics and Logs. In Grafana 8.0, Application Insights and Insights Analytics are deprecated and made read-only in favor of querying this data through Metrics and Logs. Existing queries will continue to work, but you cannot edit them. New panels are not able to use Application Insights or Insights Analytics.
+
+For Application Insights, new queries can be made with the Metrics query type by selecting the "Application Insights" resource type.
+
+{{< figure src="/static/img/docs/azure-monitor/app-insights-metrics.png" max-width="650px" class="docs-image--no-shadow" caption="Azure Monitor Application Insights example" >}}
+
+For Insights Analaytics, new queries can be written with Kusto in the Logs query type by selecting your Application Insights resource.
+
+{{< figure src="/static/img/docs/azure-monitor/app-insights-logs.png" max-width="650px" class="docs-image--no-shadow" caption="Azure Logs Application Insights example" >}}
+
+The new resource picker for Logs shows all resources on your Azure subscription compatible with Logs.
+
+{{< figure src="/static/img/docs/azure-monitor/app-insights-resource-picker.png" max-width="650px" class="docs-image--no-shadow" caption="Azure Logs Application Insights resource picker" >}}
+
+Azure Monitor Metrics and Azure Monitor Logs do not use Application Insights API keys, so make sure the data source is configured with an Azure AD app registration that has access to Application Insights
--- a/docs/sources/datasources/azuremonitor/_index.md
+++ b/docs/sources/datasources/azuremonitor/_index.md
@@ -1,277 +0,0 @@
-+++
-title = "Azure Monitor"
-description = "Guide for using Azure Monitor in Grafana"
-keywords = ["grafana", "microsoft", "azure", "monitor", "application", "insights", "log", "analytics", "guide"]
-aliases = ["/docs/grafana/latest/features/datasources/azuremonitor"]
-weight = 300
-+++
-
-# Azure Monitor data source
-
-Grafana includes built-in support for Azure Monitor, the Azure service to maximize the availability and performance of your applications and services in the Azure Cloud. The Azure Monitor data source supports visualizing data from three Azure services:
-
- **Azure Monitor Metrics** to collect numeric data from resources in your Azure account.
- **Azure Monitor Logs** to collect log and performance data from your Azure account, and query using the powerful Kusto Language.
- **Azure Resource Graph** to quickly query your Azure resources across subscriptions.
-
-This topic explains configuring, querying, and other options specific to the Azure Monitor data source. Refer to [Add a data source]({{< relref "../add-a-data-source.md" >}}) for instructions on how to add a data source to Grafana.
-
-## Azure Monitor configuration
-
-To access Azure Monitor configuration, hover your mouse over the **Configuration** (gear) icon, click **Data Sources**, and then select the Azure Monitor data source. If you haven't already, you'll need to [add the Azure Monitor data source]({{< relref "../add-a-data-source.md" >}}).
-
-You must create an app registration and service principal in Azure AD to authenticate the data source. See the [Azure documentation](https://docs.microsoft.com/en-us/azure/active-directory/develop/howto-create-service-principal-portal#get-tenant-and-app-id-values-for-signing-in) for configuration details. Alternatively, if you are hosting Grafana in Azure (e.g. App Service, or Azure Virtual Machines) you can configure the Azure Monitor data source to use Managed Identity to securely authenticate without entering credentials into Grafana. Refer to [Configuring using Managed Identity](#configuring-using-managed-identity) for more details.
-
-| Name                    | Description                                                                                                                                                                                                                                                                                                             |
-| ----------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Authentication          | Enables Managed Identity. Selecting Managed Identity will hide many of the fields below. See [Configuring using Managed Identity](#configuring-using-managed-identity) for more details.                                                                                                                                |
-| Azure Cloud             | The national cloud for your Azure account. For most users, this is the default "Azure". For more information, see [the Azure documentation.](https://docs.microsoft.com/en-us/azure/active-directory/develop/authentication-national-cloud)                                                                             |
-| Directory (tenant) ID   | The directory/tenant ID for the Azure AD app registration to use for authentication. See [Get tenant and app ID values for signing in](https://docs.microsoft.com/en-us/azure/active-directory/develop/howto-create-service-principal-portal#get-tenant-and-app-id-values-for-signing-in) from the Azure documentation. |
-| Application (client) ID | The application/client ID for the Azure AD app registration to use for authentication.                                                                                                                                                                                                                                  |
-| Client secret           | The application client secret for the Azure AD app registration to use for authentication. See [Create a new application secret](https://docs.microsoft.com/en-us/azure/active-directory/develop/howto-create-service-principal-portal#option-2-create-a-new-application-secret) from the Azure documentation.          |
-| Default subscription    | _(optional)_ Sets a default subscription for template variables to use                                                                                                                                                                                                                                                  |
-| Default workspace       | _(optional)_ Sets a default workspace for Log Analytics-based template variable queries to use                                                                                                                                                                                                                          |
-
-## Azure Monitor query editor
-
-The Azure Monitor data source has three different modes depending on which Azure service you wish to query:
-
- **Metrics** for [Azure Monitor Metrics](#querying-azure-monitor-metrics)
- **Logs** for [Azure Monitor Logs](#querying-azure-monitor-logs)
- [**Azure Resource Graph**](#querying-azure-resource-graph)
-
-### Querying Azure Monitor Metrics
-
-Azure Monitor Metrics collects numeric data from [supported resources](https://docs.microsoft.com/en-us/azure/azure-monitor/monitor-reference) and allows you to query them to investigate the health and utilization of your resources to maximise availability and performance.
-
-Metrics are a lightweight format that only stores simple numeric data in a particular structure. Metrics is capable for supporting near real-time scenarios making it useful for fast detection of issues. Azure Monitor Logs can store a variety of different data types each with their own structure.
-
-{{< figure src="/static/img/docs/azure-monitor/query-editor-metrics.png" max-width="800px" class="docs-image--no-shadow" caption="Azure Logs Metrics sample query visualizing CPU percentage over time" >}}
-
-#### Your first Azure Monitor Metrics query
-
-1. Select the Metrics service
-1. Select a resource to pull metrics from using the subscription, resource group, resource type, and resource fields.
-1. Some resources, such as storage accounts, organise metrics under multiple metric namespaces. Grafana will pick a default namespace, but change this to see which other metrics are available.
-1. Select a metric from the Metric field.
-
-Optionally, you can apply further aggregations or filter by dimensions for further analysis.
-
-1. Change the aggregation from the default average to show minimum, maximum or total values.
-1. Set a specific custom time grain. By default Grafana will automatically select a time grain interval based on your selected time range.
-1. For metrics that have multiple dimensions, you can split and filter further the returned metrics. For example, the Application Insights dependency calls metric supports returning multiple time series for successful vs unsuccessful calls.
-
-{{< figure src="/static/img/docs/azure-monitor/query-editor-metrics-dimensions.png" max-width="800px" class="docs-image--no-shadow" caption="Azure Monitor Metrics screenshot showing Dimensions" >}}
-
-The options available will change depending on what is most relevant to the selected metric.
-
-#### Legend alias formatting
-
-The legend label for Metrics can be changed using aliases. In the Legend Format field, you can combine aliases defined below any way you want e.g
-
- `Blob Type: {{ blobtype }}` becomes `Blob Type: PageBlob`, `Blob Type: BlockBlob`
- `{{ resourcegroup }} - {{ resourcename }}` becomes `production - web_server`
-
-| Alias pattern                 | Description                                                                                 |
-| ----------------------------- | ------------------------------------------------------------------------------------------- |
-| `{{ resourcegroup }}`         | Replaced with the the resource group                                                        |
-| `{{ namespace }}`             | Replaced with the resource type / namespace (e.g. Microsoft.Compute/virtualMachines)        |
-| `{{ resourcename }}`          | Replaced with the resource name                                                             |
-| `{{ metric }}`                | Replaced with the metric name (e.g. Percentage CPU)                                         |
-| _`{{ arbitaryDimensionID }}`_ | Replaced with the value of the specified dimension. (e.g. {{ blobtype }} becomes BlockBlob) |
-| `{{ dimensionname }}`         | _(Legacy for backwards compatibility)_ Replaced with the name of the first dimension        |
-| `{{ dimensionvalue }}`        | _(Legacy for backwards compatibility)_ Replaced with the value of the first dimension       |
-
-#### Supported Azure Monitor metrics
-
-Not all metrics returned by the Azure Monitor Metrics API have values. To make it easier for you when building a query, the Grafana data source has a list of supported metrics and ignores metrics which will never have values. This list is updated regularly as new services and metrics are added to the Azure cloud. For more information about the list of metrics, refer to [current supported namespaces](https://github.com/grafana/grafana/blob/main/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/supported_namespaces.ts).
-
-### Querying Azure Monitor Logs
-
-Azure Monitor Logs collects and organises log and performance data from [supported resources](https://docs.microsoft.com/en-us/azure/azure-monitor/monitor-reference) and makes many sources of data available to query together with the sophisticated [Kusto Query Language (KQL)](https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/).
-
-While Azure Monitor Metrics only stores simplified numerical data, Logs can store different data types each with their own structure and can perform complexe analysis of data using KQL.
-
-{{< figure src="/static/img/docs/azure-monitor/query-editor-logs.png" max-width="800px" class="docs-image--no-shadow" caption="Azure Monitor Logs sample query comparing successful requests to failed requests" >}}
-
-#### Your first Azure Monitor Logs query
-
-1. Select the Logs service
-2. Select a resource to query. Alternatively, you can dynamically query all resources under a single resource group or subscription.
-3. Enter in your KQL query. See below for examples.
-
-##### Kusto Query Language
-
-Azure Monitor Logs queries are written using the Kusto Query Language (KQL), a rich language designed to be easy to read and write, which should be familiar to those know who SQL. The Azure documentation has plenty of resource to help with learning KQL:
-
- [Log queries in Azure Monitor](https://docs.microsoft.com/en-us/azure/azure-monitor/logs/log-query-overview)
- [Getting started with Kusto](https://docs.microsoft.com/en-us/azure/data-explorer/kusto/concepts/)
- [Tutorial: Use Kusto queries in Azure Monitor](https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/tutorial?pivots=azuremonitor)
- [SQL to Kusto cheat sheet](https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/sqlcheatsheet)
-
-Here is an example query that returns a virtual machine's CPU performance, averaged over 5m time grains
-
-```kusto
-Perf
-# $__timeFilter is a special Grafana macro that filters the results to the time span of the dashboard
-| where $__timeFilter(TimeGenerated)
-| where CounterName == "% Processor Time"
-| summarize avg(CounterValue) by bin(TimeGenerated, 5m), Computer
-| order by TimeGenerated asc
-```
-
-Time series queries are for values that change over time, usually for graph visualisations such as the Time series panel. Each query should return at least a datetime column and a numeric value column. The result must also be sorted in ascending order by the datetime column.
-
-A query can also have one or more non-numeric/non-datetime columns, and those columns are considered dimensions and become labels in the response. For example, a query that returns the aggregated count grouped by hour, Computer, and the CounterName:
-
-```kusto
-Perf
-| where $__timeFilter(TimeGenerated)
-| summarize count() by bin(TimeGenerated, 1h), Computer, CounterName
-| order by TimeGenerated asc
-```
-
-You can also select additional number value columns (with, or without multiple dimensions). For example, getting a count and average value by hour, Computer, CounterName, and InstanceName:
-
-```kusto
-Perf
-| where $__timeFilter(TimeGenerated)
-| summarize Samples=count(), ["Avg Value"]=avg(CounterValue)
-    by bin(TimeGenerated, $__interval), Computer, CounterName, InstanceName
-| order by TimeGenerated asc
-```
-
-Table queries are mainly used in the Table panel and show a list of columns and rows. This example query returns rows with the six specified columns:
-
-```kusto
-AzureActivity
-| where $__timeFilter()
-| project TimeGenerated, ResourceGroup, Category, OperationName, ActivityStatus, Caller
-| order by TimeGenerated desc
-```
-
-##### Logs macros
-
-To make writing queries easier there are several Grafana macros that can be used in the where clause of a query:
-
-| Macro                           | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-| ------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `$__timeFilter()`               | Used to filter the results to the time range of the dashboard.<br/>Example: `TimeGenerated >= datetime(2018-06-05T18:09:58.907Z) and TimeGenerated <= datetime(2018-06-05T20:09:58.907Z)`.                                                                                                                                                                                                                                                                                                                 |
-| `$__timeFilter(datetimeColumn)` | Like `$__timeFilter()`, but specifies a custom field to filter on.                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-| `$__timeFrom()`                 | Expands to the start of the dashboard time range.<br/>Example: `datetime(2018-06-05T18:09:58.907Z)`.                                                                                                                                                                                                                                                                                                                                                                                                       |
-| `$__timeTo()`                   | Expands to the end of the dashboard time range.<br/>Example: `datetime(2018-06-05T20:09:58.907Z)`.                                                                                                                                                                                                                                                                                                                                                                                                         |
-| `$__escapeMulti($myVar)`        | Used with multi-value template variables that contain illegal characters.<br/>If `$myVar` has the following two values as a string `'\\grafana-vm\Network(eth0)\Total','\\hello!'`, then it expands to `@'\\grafana-vm\Network(eth0)\Total', @'\\hello!'`.<br/><br/>If using single value variables there is no need for this macro, simply escape the variable inline instead - `@'\$myVar'`.                                                                                                             |
-| `$__contains(colName, $myVar)`  | Used with multi-value template variables.<br/>If `$myVar` has the value `'value1','value2'`, it expands to: `colName in ('value1','value2')`.<br/><br/>If using the `All` option, then check the `Include All Option` checkbox and in the `Custom all value` field type in the value `all`. If `$myVar` has value `all` then the macro will instead expand to `1 == 1`. For template variables with a lot of options, this will increase the query performance by not building a large "where..in" clause. |
-
-Additionally, Grafana has the built-in `$__interval` macro
-
-### Querying Azure Resource Graph
-
-Azure Resource Graph (ARG) is a service in Azure that is designed to extend Azure Resource Management by providing efficient and performant resource exploration, with the ability to query at scale across a given set of subscriptions so that you can effectively govern your environment. By querying ARG, you can query resources with complex filtering, iteratively explore resources based on governance requirements, and assess the impact of applying policies in a vast cloud environment.
-
-{{< figure src="/static/img/docs/azure-monitor/query-editor-arg.png" max-width="800px" class="docs-image--no-shadow" caption="Azure Resource Graph sample query listing virtual machines on an account" >}}
-
-### Your first Azure Resource Graph query
-
-ARG queries are written in a variant of the [Kusto Query Language](https://docs.microsoft.com/en-us/azure/governance/resource-graph/concepts/query-language), but not all Kusto language features are available in ARG. An Azure Resource Graph query is formatted as table data.
-
-If your credentials give you access to multiple subscriptions, then you can choose multiple subscriptions before entering queries.
-
-#### Sort results by resource properties
-
-Here is an example query that returns all resources in the selected subscriptions, but only the name, type, and location properties:
-
-```kusto
-Resources
-| project name, type, location
-| order by name asc
-```
-
-The query uses `order by` to sort the properties by the `name` property in ascending (`asc`) order. You can change what property to sort by and the order (`asc` or `desc`). The query uses `project` to show only the listed properties in the results. You can add or remove properties.
-
-#### Query resources with complex filtering
-
-Filtering for Azure resources with a tag name of `environment` that have a value of `Internal`. You can change these to any desired tag key and value. The `=~` in the `type` match tells Resource Graph to be case insensitive. You can project by other properties or add/remove more.
-
-For example, a query that returns a list of resources with an `environment` tag value of `Internal`:
-
-```kusto
-Resources
-| where tags.environment=~'internal'
-| project name
-```
-
-#### Group and aggregate the values by property
-
-You can also use `summarize` and `count` to define how to group and aggregate the values by property. For example, returning count of healthy, unhealthy, and not applicable resources per recommendation:
-
-```kusto
-securityresources
-| where type == 'microsoft.security/assessments'
-| extend resourceId=id,
-    recommendationId=name,
-    resourceType=type,
-    recommendationName=properties.displayName,
-    source=properties.resourceDetails.Source,
-    recommendationState=properties.status.code,
-    description=properties.metadata.description,
-    assessmentType=properties.metadata.assessmentType,
-    remediationDescription=properties.metadata.remediationDescription,
-    policyDefinitionId=properties.metadata.policyDefinitionId,
-    implementationEffort=properties.metadata.implementationEffort,
-    recommendationSeverity=properties.metadata.severity,
-    category=properties.metadata.categories,
-    userImpact=properties.metadata.userImpact,
-    threats=properties.metadata.threats,
-    portalLink=properties.links.azurePortal
-| summarize numberOfResources=count(resourceId) by tostring(recommendationName), tostring(recommendationState)
-```
-
-In Azure Resource Graph many nested properties (`properties.displayName`) are of a `dynamic` type, and should be cast to a string with `tostring()` to operate on them.
-
-The Azure documentation also hosts [many sample queries](https://docs.microsoft.com/en-gb/azure/governance/resource-graph/samples/starter) to help you get started
-
-### Azure Resource Graph macros
-
-You can use Grafana macros when constructing a query. Use the macros in the where clause of a query:
-
- `$__timeFilter()` - Expands to
-  `timestamp ≥ datetime(2018-06-05T18:09:58.907Z) and`
-  `timestamp ≤ datetime(2018-06-05T20:09:58.907Z)` where the from and to datetimes are from the Grafana time picker.
-
- `$__timeFilter(datetimeColumn)` - Expands to
-  `datetimeColumn ≥ datetime(2018-06-05T18:09:58.907Z) and`
-  `datetimeColumn ≤ datetime(2018-06-05T20:09:58.907Z)` where the from and to datetimes are from the Grafana time picker.
-
- `$__timeFrom()` - Returns the From datetime from the Grafana picker. Example: `datetime(2018-06-05T18:09:58.907Z)`.
-
- `$__timeTo()` - Returns the To datetime from the Grafana picker. Example: `datetime(2018-06-05T20:09:58.907Z)`.
-
- `$__escapeMulti($myVar)` - Use with multi-value template variables that contain illegal characters. If `$myVar` has the two values as a string `'\\grafana-vm\Network(eth0)\Total','\\hello!'`, then it expands to: `@'\\grafana-vm\Network(eth0)\Total', @'\\hello!'`. If you are using single value variables, then there is no need for this macro, simply escape the variable inline instead - `@'\$myVar'`.
-
- `$__contains(colName, $myVar)` - Use with multi-value template variables. If `$myVar` has the value `'value1','value2'`, the it expands to: `colName in ('value1','value2')`.
-
-  If using the `All` option, then check the `Include All Option` checkbox and in the `Custom all value` field type in the following value: `all`. If `$myVar` has value `all` then the macro will instead expand to `1 == 1`. For template variables with a lot of options, this will increase the query performance by not building a large "where..in" clause.
-
-## Going further with Azure Monitor
-
-See the following topics to learn more about the Azure Monitor data source:
-
- [Azure Monitor template variables]({{< relref "./template-variables.md" >}}) for more interactive, dynamic, and reusable dashboards.
- [Provisioning Azure Monitor]({{< relref "./provisioning.md" >}}) for configuring the Azure Monitor data source using YAML files
- [Deprecating Application Insights]({{< relref "./provisioning.md" >}}) and migrating to Metrics and Logs queries
-
-### Configuring using Managed Identity
-
-Customers who host Grafana in Azure (e.g. App Service, Azure Virtual Machines) and have managed identity enabled on their VM, will now be able to use the managed identity to configure Azure Monitor in Grafana. This will simplify the data source configuration, requiring the data source to be securely authenticated without having to manually configure credentials via Azure AD App Registrations for each data source. For more details on Azure managed identities, refer to the [Azure documentation](https://docs.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/overview).
-
-To enable managed identity for Grafana, set the `managed_identity_enabled` flag in the `[azure]` section of the [Grafana server config](https://grafana.com/docs/grafana/latest/administration/configuration/#azure).
-
-```ini
-[azure]
-managed_identity_enabled = true
-```
-
-Then, in the Azure Monitor data source configuration and set Authentication to Managed Identity. The directory ID, application ID and client secret fields will be hidden and the data source will use managed identity for authenticating to Azure Monitor Metrics, Logs, and Azure Resource Graph.
-
-{{< figure src="/static/img/docs/azure-monitor/managed-identity.png" max-width="800px" class="docs-image--no-shadow" caption="Azure Monitor Metrics screenshot showing Dimensions" >}}
--- a/docs/sources/datasources/azuremonitor/deprecated-application-insights.md
+++ b/docs/sources/datasources/azuremonitor/deprecated-application-insights.md
@@ -1,28 +0,0 @@
-+++
-title = "Application Insights deprecation"
-description = "Template to provision the Azure Monitor data source"
-keywords = ["grafana", "microsoft", "azure", "monitor", "application", "insights", "log", "analytics", "guide"]
-weight = 999
-+++
-
-# Deprecated Application Insights and Insights Analytics
-
-Application Insights and Insights Analytics are two ways to query the same Azure Application Insights data, which can also be queried from Metrics and Logs. In Grafana 8.0, Application Insights and Insights Analytics are deprecated and made read-only in favor of querying this data through Metrics and Logs. Existing queries will continue to work, but you cannot edit them. New panels are not able to use Application Insights or Insights Analytics.
-
-Azure Monitor Metrics and Azure Monitor Logs do not use Application Insights API keys, so make sure the data source is configured with an Azure AD app registration that has access to Application Insights.
-
-## Application Insights
-
-New Application Insights queries can be made with the Metrics service and selecting the "Application Insights" resource type. Application Insights has metrics available between two different metric
-
-{{< figure src="/static/img/docs/azure-monitor/app-insights-metrics.png" max-width="800px" class="docs-image--no-shadow" caption="Azure Monitor Application Insights example" >}}
-
-## Insights Analytics
-
-New Insights Analaytics queries can be written with Kusto in the Logs query type by selecting your Application Insights resource.
-
-{{< figure src="/static/img/docs/azure-monitor/app-insights-logs.png" max-width="800px" class="docs-image--no-shadow" caption="Azure Logs Application Insights example" >}}
-
-The new resource picker for Logs shows all resources on your Azure subscription compatible with Logs.
-
-{{< figure src="/static/img/docs/azure-monitor/app-insights-resource-picker.png" max-width="800px" class="docs-image--no-shadow" caption="Azure Logs Application Insights resource picker" >}}
--- a/docs/sources/datasources/azuremonitor/provisioning.md
+++ b/docs/sources/datasources/azuremonitor/provisioning.md
@@ -1,56 +0,0 @@
-+++
-title = "Provisioning Azure Monitor"
-description = "Template to provision the Azure Monitor data source"
-keywords = ["grafana", "microsoft", "azure", "monitor", "application", "insights", "log", "analytics", "guide"]
-weight = 2
-+++
-
-# Configure the data source with provisioning
-
-You can configure data sources using config files with Grafana’s provisioning system. For more information on how it works and all the settings you can set for data sources on the [Provisioning documentation page]({{< relref "../../administration/provisioning/#datasources" >}})
-
-Here are some provisioning examples for this data source.
-
-## Azure AD App Registration (client secret)
-
-```yaml
-apiVersion: 1 # config file version
-
-datasources:
-  - name: Azure Monitor
-    type: grafana-azure-monitor-datasource
-    access: proxy
-    jsonData:
-      azureAuthType: clientsecret
-      cloudName: azuremonitor # See table below
-      tenantId: <tenant-id>
-      clientId: <client-id>
-      subscriptionId: <subscription-id> # Optional, default subscription
-    secureJsonData:
-      clientSecret: <client-secret>
-    version: 1
-```
-
-## Managed Identity
-
-```yaml
-apiVersion: 1 # config file version
-
-datasources:
-  - name: Azure Monitor
-    type: grafana-azure-monitor-datasource
-    access: proxy
-    jsonData:
-      azureAuthType: msi
-      subscriptionId: <subscription-id> # Optional, default subscription
-    version: 1
-```
-
-## Supported cloud names
-
-| Azure Cloud                                      | Value                      |
-| ------------------------------------------------ | -------------------------- |
-| Microsoft Azure public cloud                     | `azuremonitor` (_default_) |
-| Microsoft Chinese national cloud                 | `chinaazuremonitor`        |
-| US Government cloud                              | `govazuremonitor`          |
-| Microsoft German national cloud ("Black Forest") | `germanyazuremonitor`      |
--- a/docs/sources/datasources/azuremonitor/template-variables.md
+++ b/docs/sources/datasources/azuremonitor/template-variables.md
@@ -1,53 +0,0 @@
-+++
-title = "Azure Monitor template variables"
-description = "Using template variables with Azure Monitor in Grafana"
-keywords = ["grafana", "microsoft", "azure", "monitor", "application", "insights", "log", "analytics", "guide"]
-weight = 2
-+++
-
-# Template variables
-
-Instead of hard-coding values for fields like resource group or resource name in your queries, you can use variables in their place to create more interactive, dynamic, and reusable dashboards.
-
-Check out the [Templating]({{< relref "../../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different
-types of template variables.
-
-The Azure Monitor data source provides the following queries you can specify in the Query field in the Variable edit view
-
-| Name                                                                               | Description                                                                                            |
-| ---------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------ |
-| `Subscriptions()`                                                                  | Returns subscriptions.                                                                                 |
-| `ResourceGroups()`                                                                 | Returns resource groups.                                                                               |
-| `ResourceGroups(subscriptionID)`                                                   | Returns resource groups for a specified subscription.                                                  |
-| `Namespaces(aResourceGroup)`                                                       | Returns namespaces for the default subscription and specified resource group.                          |
-| `Namespaces(subscriptionID, aResourceGroup)`                                       | Returns namespaces for the specified subscription and resource group.                                  |
-| `ResourceNames(aResourceGroup, aNamespace)`                                        | Returns a list of resource names.                                                                      |
-| `ResourceNames(subscriptionID, aResourceGroup, aNamespace)`                        | Returns a list of resource names for a specified subscription.                                         |
-| `MetricNamespace(aResourceGroup, aNamespace, aResourceName)`                       | Returns a list of metric namespaces.                                                                   |
-| `MetricNamespace(subscriptionID, aResourceGroup, aNamespace, aResourceName)`       | Returns a list of metric namespaces for a specified subscription.                                      |
-| `MetricNames(aResourceGroup, aMetricDefinition, aResourceName, aMetricNamespace)`  | Returns a list of metric names.                                                                        |
-| `MetricNames(aSubscriptionID, aMetricDefinition, aResourceName, aMetricNamespace)` | Returns a list of metric names for a specified subscription.                                           |
-| `workspaces()`                                                                     | Returns a list of workspaces for the default subscription.                                             |
-| `workspaces(subscriptionID)`                                                       | Returns a list of workspaces for the specified subscription (the parameter can be quoted or unquoted). |
-
-Where a subscription ID is not specified, a default subscription must be specified in the data source configuration, which will be used.
-
-Any Log Analytics KQL query that returns a single list of values can also be used in the Query field. For example:
-
-| Query                                                                                     | Description                                               |
-| ----------------------------------------------------------------------------------------- | --------------------------------------------------------- |
-| `workspace("myWorkspace").Heartbeat \| distinct Computer`                                 | Returns a list of Virtual Machines                        |
-| `workspace("$workspace").Heartbeat \| distinct Computer`                                  | Returns a list of Virtual Machines with template variable |
-| `workspace("$workspace").Perf \| distinct ObjectName`                                     | Returns a list of objects from the Perf table             |
-| `workspace("$workspace").Perf \| where ObjectName == "$object"` `\| distinct CounterName` | Returns a list of metric names from the Perf table        |
-
-Example of a time series query using variables:
-
-```kusto
-Perf
-| where ObjectName == "$object" and CounterName == "$metric"
-| where TimeGenerated >= $__timeFrom() and TimeGenerated <= $__timeTo()
-| where  $__contains(Computer, $computer)
-| summarize avg(CounterValue) by bin(TimeGenerated, $__interval), Computer
-| order by TimeGenerated asc
-```
--- a/docs/sources/datasources/elasticsearch.md
+++ b/docs/sources/datasources/elasticsearch.md
@@ -57,7 +57,7 @@ a time pattern for the index name or a wildcard.
 ### Elasticsearch version

 Select the version of your Elasticsearch data source from the version selection dropdown. Different query compositions and functionalities are available in the query editor for different versions.
-Available Elasticsearch versions are `2.x`, `5.x`, `5.6+`, `6.0+`, `7.0+`, `7.7+` and `7.10+`. Select the option that best matches your data source version.
+Available Elasticsearch versions are `2.x`, `5.x`, `5.6+`, `6.0+`, `7.0+` and `7.7+`. Select the option that best matches your data source version.

 Grafana assumes that you are running the lowest possible version for a specified range. This ensures that new features or breaking changes in a future Elasticsearch release will not affect your configuration.

@@ -80,13 +80,6 @@ number followed by a valid time identifier, e.g. `1m` (1 minute) or `30s` (30 se
 | `s`        | second      |
 | `ms`       | millisecond |

-### X-Pack enabled
-
-Enables `X-Pack` specific features and options, providing the query editor with additional aggregations such as `Rate` and `Top Metrics`.
-
-#### Include frozen indices
-
-When `X-Pack enabled` is active and the configured Elasticsearch version is higher than `6.6.0`, you can configure Grafana to not ignore [frozen indices](https://www.elastic.co/guide/en/elasticsearch/reference/7.13/frozen-indices.html) when performing search requests.
 ### Logs

 There are two parameters, `Message field name` and `Level field name`, that can optionally be configured from the data source settings page that determine
@@ -183,7 +176,7 @@ In the above example, we have a lucene query that filters documents based on the
 a variable in the *Terms* group by field input box. This allows you to use a variable to quickly change how the data is grouped.

 Example dashboard:
-[Elasticsearch Templated Dashboard](https://play.grafana.org/d/CknOEXDMk/elasticsearch-templated?orgId=1d)
+[Elasticsearch Templated Dashboard](https://play.grafana.org/dashboard/db/elasticsearch-templated)

 ## Annotations

--- a/docs/sources/datasources/jaeger.md
+++ b/docs/sources/datasources/jaeger.md
@@ -32,10 +32,8 @@ This is a configuration for the [trace to logs feature]({{< relref "../explore/t

 - **Data source -** Target data source.
 - **Tags -** The tags that will be used in the Loki query. Default is `'cluster', 'hostname', 'namespace', 'pod'`.
- **Span start time shift -** Shift in the start time for the Loki query based on the span start time. In order to extend to the past, you need to use a negative value.  Time units can be used here, for example, 5s, 1m, 3h. The default is 0.
- **Span end time shift -** Shift in the end time for the Loki query based on the span end time. Time units can be used here, for example, 5s, 1m, 3h. The default is 0.

-![Trace to logs settings](/static/img/docs/explore/trace-to-logs-settings-8.png 'Screenshot of the trace to logs settings')
+![Trace to logs settings](/static/img/docs/explore/trace-to-logs-settings-7-4.png 'Screenshot of the trace to logs settings')

 ## Query traces

--- a/docs/sources/datasources/loki.md
+++ b/docs/sources/datasources/loki.md
@@ -148,18 +148,11 @@ Check out the [Templating]({{< relref "../variables/_index.md" >}}) documentatio
 Variable of the type _Query_ allows you to query Loki for a list labels or label values. The Loki data source plugin
 provides the following functions you can use in the `Query` input field.

-| Name                                       | Description                                                                          |
-| -------------------------------------------| -------------------------------------------------------------------------------------|
-| `label_names()`                            | Returns a list of label names.                                                       |
-| `label_values(label)`                      | Returns a list of label values for the `label`.                                      |
-| `label_values(log stream selector, label)` | Returns a list of label values for the `label` in the specified `log stream selector`.|
+| Name                  | Description                                                     |
+| --------------------- | --------------------------------------------------------------- |
+| `label_names()`       | Returns a list of label names.                                  |
+| `label_values(label)` | Returns a list of label values for the `label` in every metric. |

-### Ad hoc filters variable
-Loki supports the special ad hoc filters variable type. It allows you to specify any number of label/value filters on the fly. These filters are automatically applied to all your Loki queries.
-
-### Using interval and range variables
-
-You can use some global built-in variables in query variables; `$__interval`, `$__interval_ms`, `$__range`, `$__range_s` and `$__range_ms`. For more information, refer to [Global built-in variables]({{< relref "../variables/variable-types/global-variables.md" >}}).
 ## Annotations

 You can use any non-metric Loki query as a source for [annotations]({{< relref "../dashboards/annotations" >}}). Log content will be used as annotation text and your log stream labels as tags, so there is no need for additional mapping.
--- a/docs/sources/datasources/prometheus.md
+++ b/docs/sources/datasources/prometheus.md
@@ -127,7 +127,9 @@ For details of what _metric names_, _label names_ and _label values_ are please

 > Support for `$__range`, `$__range_s` and `$__range_ms` only available from Grafana v5.3

-You can use some global built-in variables in query variables, for example, `$__interval`, `$__interval_ms`, `$__range`, `$__range_s` and `$__range_ms`. See [Global built-in variables]({{< relref "../variables/variable-types/global-variables.md" >}}) for more information. They are convenient to use in conjunction with the `query_result` function when you need to filter variable queries since the `label_values` function doesn't support queries.
+You can use some global built-in variables in query variables; `$__interval`, `$__interval_ms`, `$__range`, `$__range_s` and `$__range_ms`, see [Global built-in variables]({{< relref "../variables/variable-types/global-variables.md" >}}) for more information. These can be convenient to use in conjunction with the `query_result` function when you need to filter variable queries since
+
+`label_values` function doesn't support queries.

 Make sure to set the variable's `refresh` trigger to be `On Time Range Change` to get the correct instances when changing the time range on the dashboard.

@@ -147,18 +149,11 @@ Query: query_result(max_over_time(<metric>[${__range_s}s]) != <state>)
 Regex:
 ```

-### Using `$__rate_interval`
+### Using `$__rate_interval` variable

 > **Note:** Available in Grafana 7.2 and above

-`$__rate_interval` is the recommended interval to use in the `rate` and `increase` functions. It will "just work" in most cases, avoiding most of the pitfalls that can occur when using a fixed interval or `$__interval`.
-
-```
-OK:       rate(http_requests_total[5m])
-Better:   rate(http_requests_total[$__rate_interval])
-```
-
-Details: `$__rate_interval` is defined as max(`$__interval` + _Scrape interval_, 4 \* _Scrape interval_), where _Scrape interval_ is the Min step setting (AKA query_interval, a setting per PromQL query) if any is set. Otherwise, the Scrape interval setting in the Prometheus data source is used. (The Min interval setting in the panel is modified by the resolution setting and therefore doesn't have any effect on _Scrape interval_.) [This article](https://grafana.com/blog/2020/09/28/new-in-grafana-7.2-__rate_interval-for-prometheus-rate-queries-that-just-work/) contains additional details.
+The `$__rate_interval` variable is meant to be used in the rate function. It is defined as max( `$__interval` + _Scrape interval_, 4 \* _Scrape interval_), where _Scrape interval_ is the Min step setting (AKA query*interval, a setting per PromQL query), if any is set, and otherwise the \_Scrape interval* as set in the Prometheus data source (but ignoring any Min interval setting in the panel, because the latter is modified by the resolution setting).

 ### Using variables in queries

--- a/docs/sources/datasources/tempo.md
+++ b/docs/sources/datasources/tempo.md
@@ -31,10 +31,8 @@ This is a configuration for the [trace to logs feature]({{< relref "../explore/t

 - **Data source -** Target data source.
 - **Tags -** The tags that will be used in the Loki query. Default is `'cluster', 'hostname', 'namespace', 'pod'`.
- **Span start time shift -** Shift in the start time for the Loki query based on the span start time. In order to extend to the past, you need to use a negative value.  Time units can be used here, for example, 5s, 1m, 3h. The default is 0.
- **Span end time shift -** Shift in the end time for the Loki query based on the span end time. Time units can be used here, for example, 5s, 1m, 3h. The default is 0.

-![Trace to logs settings](/static/img/docs/explore/trace-to-logs-settings-8.png 'Screenshot of the trace to logs settings')
+![Trace to logs settings](/static/img/docs/explore/trace-to-logs-settings-7-4.png 'Screenshot of the trace to logs settings')

 ## Query traces

--- a/docs/sources/datasources/zipkin.md
+++ b/docs/sources/datasources/zipkin.md
@@ -32,10 +32,8 @@ This is a configuration for the [trace to logs feature]({{< relref "../explore/t

 - **Data source -** Target data source.
 - **Tags -** The tags that will be used in the Loki query. Default is `'cluster', 'hostname', 'namespace', 'pod'`.
- **Span start time shift -** Shift in the start time for the Loki query based on the span start time. In order to extend to the past, you need to use a negative value.  Time units can be used here, for example, 5s, 1m, 3h. The default is 0.
- **Span end time shift -** Shift in the end time for the Loki query based on the span end time. Time units can be used here, for example, 5s, 1m, 3h. The default is 0.

-![Trace to logs settings](/static/img/docs/explore/trace-to-logs-settings-8.png 'Screenshot of the trace to logs settings')
+![Trace to logs settings](/static/img/docs/explore/trace-to-logs-settings-7-4.png "Screenshot of the trace to logs settings")

 ## Query traces

--- a/docs/sources/developers/plugins/custom-panel-option-editors.md
+++ b/docs/sources/developers/plugins/custom-panel-option-editors.md
@@ -57,7 +57,7 @@ export const SimpleEditor: React.FC<StandardEditorProps<number, Settings>>  = ({

  // Default values
  const from = item.settings?.from ?? 1;
-  const to = item.settings?.to ?? 10;
+  const to = item.settings?.from ?? 10;

  for (let i = from; i <= to; i++) {
    options.push({
--- a/docs/sources/developers/plugins/data-frames.md
+++ b/docs/sources/developers/plugins/data-frames.md
@@ -30,17 +30,17 @@ In essence, a data frame is a collection of _fields_, where each field correspon

 ```ts
 interface Field {
-  name: string;
-  // Prometheus like Labels / Tags
-  labels?: Record<string, string>;
+    name:    string;
+     // Prometheus like Labels / Tags
+    labels?: Record<string, string>;

-  // For example string, number, time (or more specific primitives in the backend)
-  type: FieldType;
-  // Array of values all of the same type
-  values: Vector<T>;
+    // For example string, number, time (or more specific primitives in the backend)
+    type:   FieldType;
+    // Array of values all of the same type
+    values: Vector<T>;

-  // Optional display data for the field (e.g. unit, name over-ride, etc)
-  config: FieldConfig;
+    // Optional display data for the field (e.g. unit, name over-ride, etc)
+    config: FieldConfig;
 }
 ```

@@ -163,8 +163,6 @@ Dimensions: 5 fields by 2 rows
 +---------------------+------------------+------------------+------------------+------------------+
 ```

-> **Note:** Not all panels support the wide time series data frame format. To keep full backward compatibility we have introduced a transformation that can be used to convert from the wide to the long format. Read more about how to use it here: [Prepare time series-transformation]({{< relref "../../panels/transformations/types-options.md#prepare-time-series" >}}).
-
 ## Technical references

 This section contains links to technical reference and implementations of data frames.
--- a/docs/sources/developers/plugins/plugin.schema.json
+++ b/docs/sources/developers/plugins/plugin.schema.json
@@ -62,10 +62,6 @@
        "type": "object",
        "additionalItems": false,
        "properties": {
-          "uid": {
-            "type": "string",
-            "description": "Unique identifier of the included resource"
-          },
          "type": {
            "type": "string",
            "enum": ["dashboard", "page", "panel", "datasource"]
--- a/docs/sources/enterprise/_index.md
+++ b/docs/sources/enterprise/_index.md
@@ -63,7 +63,6 @@ With a Grafana Enterprise license, you get access to premium data sources, inclu
 - [DataDog](https://grafana.com/plugins/grafana-datadog-datasource)
 - [Dynatrace](https://grafana.com/plugins/grafana-dynatrace-datasource)
 - [Gitlab](https://grafana.com/grafana/plugins/grafana-gitlab-datasource)
- [Honeycomb](https://grafana.com/grafana/plugins/grafana-honeycomb-datasource)
 - [Jira](https://grafana.com/grafana/plugins/grafana-jira-datasource)
 - [MongoDB](https://grafana.com/grafana/plugins/grafana-mongodb-datasource)
 - [New Relic](https://grafana.com/plugins/grafana-newrelic-datasource)
--- a/Show More
+++ b/Show More