"Release: Updated versions in package to 7.4.0" (#30898 )

DataSourceSettings: Adds info box and link to Grafana Cloud (#30891 ) (#30896 )
* Updated * DataSourceSettings: Adds info box and link to Grafana Cloud * Updated wording * Less words * use variables * Fixing ts issues * fixed import (cherry picked from commit 56ef7c4a4c) Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
2021-02-04 11:11:00 +00:00 · 2021-02-04 11:58:02 +01:00 · 2021-02-04 11:31:31 +01:00 · 2021-02-04 10:34:52 +01:00 · 2021-02-04 09:18:19 +01:00 · 2021-02-04 08:05:18 +01:00
1488 changed files with 25721 additions and 54053 deletions
--- a/.drone.yml
+++ b/.drone.yml
--- a/.eslintrc
+++ b/.eslintrc
@@ -11,7 +11,8 @@
  "overrides": [
    {
      "files": [
-        "packages/grafana-ui/src/components/uPlot/**/*.{ts,tsx}",
+        "packages/grafana-ui/**/*/!(*.story).{ts,tsx}",
+        "packages/jaeger-ui-components/**/*.{ts,tsx,js}",
        "public/app/**/*.{ts,tsx}"
      ],
      "rules": {
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -22,15 +22,6 @@
 go.mod @grafana/backend-platform
 go.sum @grafana/backend-platform

-#Cloud Datasources backend code
-/pkg/tsdb/cloudwatch @grafana/cloud-datasources
-/pkg/tsdb/azuremonitor @grafana/cloud-datasources
-/pkg/tsdb/cloudmonitoring @grafana/cloud-datasources
-
-# Database migrations
-/pkg/services/sqlstore/migrations @grafana/backend-platform @grafana/hosted-grafana-team
-*_mig.go @grafana/backend-platform @grafana/hosted-grafana-team
-
 # Backend code docs
 /contribute/style-guides/backend.md @grafana/backend-platform

@@ -57,9 +48,9 @@ lerna.json @grafana/grafana-frontend-platform
 /packages/jaeger-ui-components/ @grafana/observability-squad

 # Core datasources
-/public/app/plugins/datasource/cloudwatch @grafana/cloud-datasources @grafana/observability-squad
+/public/app/plugins/datasource/cloudwatch @grafana/backend-platform @grafana/observability-squad
 /public/app/plugins/datasource/elasticsearch @grafana/observability-squad
-/public/app/plugins/datasource/grafana-azure-monitor-datasource @grafana/cloud-datasources
+/public/app/plugins/datasource/grafana-azure-monitor-datasource @grafana/backend-platform
 /public/app/plugins/datasource/graphite @grafana/observability-squad
 /public/app/plugins/datasource/influxdb @grafana/observability-squad
 /public/app/plugins/datasource/jaeger @grafana/observability-squad
@@ -69,7 +60,7 @@ lerna.json @grafana/grafana-frontend-platform
 /public/app/plugins/datasource/opentsdb @grafana/backend-platform
 /public/app/plugins/datasource/postgres @grafana/backend-platform
 /public/app/plugins/datasource/prometheus @grafana/observability-squad
-/public/app/plugins/datasource/cloud-monitoring @grafana/cloud-datasources
+/public/app/plugins/datasource/cloud-monitoring @grafana/backend-platform
 /public/app/plugins/datasource/zipkin @grafana/observability-squad

 # Cloud middleware
--- a/.github/commands.json
+++ b/.github/commands.json
@@ -35,7 +35,7 @@
    "action": "updateLabels",
    "addLabel": "needs more info",
    "removeLabel": "bot/needs more info",
-    "comment": "Thanks for creating this issue! We think it's missing some basic information. \r\n\r\nFollow the issue template and add additional information that will help us replicate the problem. \r\nFor data visualization issues: \r\n- Query results from the inspect drawer (data tab & query inspector)\r\n- Panel settings can be extracted in the panel inspect drawer JSON tab\r\n\r\nFor dashboard related issues: \r\n- Dashboard JSON can be found in the dashboard settings JSON model view\r\n\r\nFor authentication, provisioning and alerting issues, Grafana server logs are useful. \r\n\r\nHappy graphing!"
+    "comment": "Thanks for creating this issue! We think it's missing some basic information. \r\n\r\nFollow the issue template and add additional information that will help us replicate the problem. \r\nFor data visualization issues: \r\n- Query results from the inspect drawer (data tab & query inspector)\r\n- Panel settings can be extracted in the panel inspect drawer JSON tab\r\n\r\nFor dashboard related issues: \r\n- Dashboard JSON can be found in the dashboard settings JSON model view\r\n\r\nFor authentication and alerting issues, Grafana server logs are useful. \r\n\r\nHappy graphing!"
  },
  {
    "type": "label",
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,44 @@
+name: publish_docs
+
+on:
+  push:
+    branches:
+    - master
+    paths:
+    - 'docs/sources/**'
+    - 'packages/grafana-*/**'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - run: git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.GH_BOT_ACCESS_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync
+    - uses: actions/cache@v2
+      with:
+        path: '**/node_modules'
+        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+    - name: generate-packages-docs
+      uses: actions/setup-node@v2.1.4
+      id: generate-docs
+      with:
+        node-version: '14'
+    - run: yarn install --pure-lockfile --no-progress
+    - run: ./scripts/ci-reference-docs-build.sh
+    - name: publish-to-git
+      uses: ./.github/actions/website-sync
+      id: publish
+      with:
+        repository: grafana/website
+        branch: master
+        host: github.com
+        github_pat: '${{ secrets.GH_BOT_ACCESS_TOKEN }}'
+        source_folder: docs/sources
+        target_folder: content/docs/grafana/latest
+        allow_no_changes: 'true'
+    - shell: bash
+      run: |
+        test -n "${{ steps.publish.outputs.commit_hash }}"
+        test -n "${{ steps.publish.outputs.working_directory }}"
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@ awsconfig
 .yarnrc
 .yarn/
 vendor/
-/docs/menu.yaml

 # Enterprise emails
 /emails/templates/enterprise_*
--- a/.prettierignore
+++ b/.prettierignore
@@ -7,5 +7,3 @@ public/vendor/
 vendor/
 data/
 e2e/tmp
-public/build/
-devenv/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,538 +1,20 @@
-<!-- 8.0.0-beta1 START -->
-
-# 8.0.0-beta1 (2021-05-13)
-
-### Features and enhancements
-
-* **API**: Add org users with pagination. [#33788](https://github.com/grafana/grafana/pull/33788), [@idafurjes](https://github.com/idafurjes)
-* **API**: Return 404 when deleting nonexistent API key. [#33346](https://github.com/grafana/grafana/pull/33346), [@chaudum](https://github.com/chaudum)
-* **API**: Return query results as JSON rather than base64 encoded Arrow. [#32303](https://github.com/grafana/grafana/pull/32303), [@ryantxu](https://github.com/ryantxu)
-* **Alerting**: Allow sending notification tags to Opsgenie as extra properties. [#30332](https://github.com/grafana/grafana/pull/30332), [@DewaldV](https://github.com/DewaldV)
-* **Alerts**: Replaces all uses of InfoBox & FeatureInfoBox with Alert. [#33352](https://github.com/grafana/grafana/pull/33352), [@torkelo](https://github.com/torkelo)
-* **Auth**: Add support for JWT Authentication. [#29995](https://github.com/grafana/grafana/pull/29995), [@marshall-lee](https://github.com/marshall-lee)
-* **AzureMonitor**: Add support for Microsoft.SignalRService/SignalR metrics. [#33246](https://github.com/grafana/grafana/pull/33246), [@M0ns1gn0r](https://github.com/M0ns1gn0r)
-* **AzureMonitor**: Azure settings in Grafana server config. [#33728](https://github.com/grafana/grafana/pull/33728), [@kostrse](https://github.com/kostrse)
-* **AzureMonitor**: Migrate Metrics query editor to React. [#30783](https://github.com/grafana/grafana/pull/30783), [@joshhunt](https://github.com/joshhunt)
-* **BarChart panel**: enable series toggling via legend. [#33955](https://github.com/grafana/grafana/pull/33955), [@dprokop](https://github.com/dprokop)
-* **BarChart panel**: Adds support for Tooltip in BarChartPanel. [#33938](https://github.com/grafana/grafana/pull/33938), [@dprokop](https://github.com/dprokop)
-* **PieChart panel**: Change look of highlighted pie slices. [#33841](https://github.com/grafana/grafana/pull/33841), [@oscarkilhed](https://github.com/oscarkilhed)
-* **CloudMonitoring**: Migrate config editor from angular to react. [#33645](https://github.com/grafana/grafana/pull/33645), [@sunker](https://github.com/sunker)
-* **CloudWatch**: Add Amplify Console metrics and dimensions. [#33171](https://github.com/grafana/grafana/pull/33171), [@rodrigorfk](https://github.com/rodrigorfk)
-* **CloudWatch**: Add missing Redshift metrics to CloudWatch data source. [#32121](https://github.com/grafana/grafana/pull/32121), [@tomdaly](https://github.com/tomdaly)
-* **CloudWatch**: Add metrics for managed RabbitMQ service. [#31838](https://github.com/grafana/grafana/pull/31838), [@nirojan](https://github.com/nirojan)
-* **DashboardList**: Enable templating on search tag input. [#31460](https://github.com/grafana/grafana/pull/31460), [@delta50](https://github.com/delta50)
-* **Datasource config**: correctly remove single custom http header. [#32445](https://github.com/grafana/grafana/pull/32445), [@gabor](https://github.com/gabor)
-* **Elasticsearch**: Add generic support for template variables. [#32762](https://github.com/grafana/grafana/pull/32762), [@Elfo404](https://github.com/Elfo404)
-* **Elasticsearch**: Allow omitting field when metric supports inline script. [#32839](https://github.com/grafana/grafana/pull/32839), [@Elfo404](https://github.com/Elfo404)
-* **Elasticsearch**: Allow setting a custom limit for log queries. [#32422](https://github.com/grafana/grafana/pull/32422), [@Elfo404](https://github.com/Elfo404)
-* **Elasticsearch**: Guess field type from first non-empty value. [#32290](https://github.com/grafana/grafana/pull/32290), [@Elfo404](https://github.com/Elfo404)
-* **Elasticsearch**: Use application/x-ndjson content type for multisearch requests. [#32282](https://github.com/grafana/grafana/pull/32282), [@Elfo404](https://github.com/Elfo404)
-* **Elasticsearch**: Use semver strings to identify ES version. [#33646](https://github.com/grafana/grafana/pull/33646), [@Elfo404](https://github.com/Elfo404)
-* **Explore**: Add logs navigation to request more logs. [#33259](https://github.com/grafana/grafana/pull/33259), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Explore**: Map Graphite queries to Loki. [#33405](https://github.com/grafana/grafana/pull/33405), [@ifrost](https://github.com/ifrost)
-* **Explore**: Scroll split panes in Explore independently. [#32978](https://github.com/grafana/grafana/pull/32978), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Explore**: Wrap each panel in separate error boundary. [#33868](https://github.com/grafana/grafana/pull/33868), [@aocenas](https://github.com/aocenas)
-* **FieldDisplay**: Smarter naming of stat values when visualising row values (all values) in stat panels. [#31704](https://github.com/grafana/grafana/pull/31704), [@torkelo](https://github.com/torkelo)
-* **Graphite**: Expand metric names for variables. [#33694](https://github.com/grafana/grafana/pull/33694), [@ifrost](https://github.com/ifrost)
-* **Graphite**: Handle unknown Graphite functions without breaking the visual editor. [#32635](https://github.com/grafana/grafana/pull/32635), [@ifrost](https://github.com/ifrost)
-* **Graphite**: Show graphite functions descriptions. [#32305](https://github.com/grafana/grafana/pull/32305), [@ifrost](https://github.com/ifrost)
-* **Graphite**: Support request cancellation properly (Uses new backendSrv.fetch Observable request API). [#31928](https://github.com/grafana/grafana/pull/31928), [@mckn](https://github.com/mckn)
-* **InfluxDB**: Flux: Improve handling of complex response-structures. [#33823](https://github.com/grafana/grafana/pull/33823), [@gabor](https://github.com/gabor)
-* **InfluxDB**: Support region annotations. [#31526](https://github.com/grafana/grafana/pull/31526), [@Komalis](https://github.com/Komalis)
-* **Inspector**: Download logs for manual processing. [#32764](https://github.com/grafana/grafana/pull/32764), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Jaeger**: Add node graph view for trace. [#31521](https://github.com/grafana/grafana/pull/31521), [@aocenas](https://github.com/aocenas)
-* **Jaeger**: Search traces. [#32805](https://github.com/grafana/grafana/pull/32805), [@zoltanbedi](https://github.com/zoltanbedi)
-* **Loki**: Use data source settings for alerting queries. [#33942](https://github.com/grafana/grafana/pull/33942), [@ivanahuckova](https://github.com/ivanahuckova)
-* **NodeGraph**: Exploration mode. [#33623](https://github.com/grafana/grafana/pull/33623), [@aocenas](https://github.com/aocenas)
-* **OAuth**: Add support for empty scopes. [#32129](https://github.com/grafana/grafana/pull/32129), [@jvoeller](https://github.com/jvoeller)
-* **PanelChrome**: New logic-less emotion based component with no dependency on PanelModel or DashboardModel. [#29456](https://github.com/grafana/grafana/pull/29456), [@torkelo](https://github.com/torkelo)
-* **PanelEdit**: Adds a table view toggle to quickly view data in table form. [#33753](https://github.com/grafana/grafana/pull/33753), [@torkelo](https://github.com/torkelo)
-* **PanelEdit**: Highlight matched words when searching options. [#33717](https://github.com/grafana/grafana/pull/33717), [@torkelo](https://github.com/torkelo)
-* **PanelEdit**: UX improvements. [#32124](https://github.com/grafana/grafana/pull/32124), [@torkelo](https://github.com/torkelo)
-* **Plugins**: PanelRenderer and simplified QueryRunner to be used from plugins. [#31901](https://github.com/grafana/grafana/pull/31901), [@torkelo](https://github.com/torkelo)
-* **Plugins**: AuthType in route configuration and params interpolation. [#33674](https://github.com/grafana/grafana/pull/33674), [@kostrse](https://github.com/kostrse)
-* **Plugins**: Enable plugin runtime install/uninstall capabilities. [#33836](https://github.com/grafana/grafana/pull/33836), [@wbrowne](https://github.com/wbrowne)
-* **Plugins**: Support set body content in plugin routes. [#32551](https://github.com/grafana/grafana/pull/32551), [@marefr](https://github.com/marefr)
-* **Plugins**: Introduce marketplace app. [#33869](https://github.com/grafana/grafana/pull/33869), [@jackw](https://github.com/jackw)
-* **Plugins**: Moving the DataSourcePicker to grafana/runtime so it can be reused in plugins. [#31628](https://github.com/grafana/grafana/pull/31628), [@mckn](https://github.com/mckn)
-* **Prometheus**: Add custom query params for alert and exemplars queries. [#32440](https://github.com/grafana/grafana/pull/32440), [@aocenas](https://github.com/aocenas)
-* **Prometheus**: Use fuzzy string matching to autocomplete metric names and label. [#32207](https://github.com/grafana/grafana/pull/32207), [@ifrost](https://github.com/ifrost)
-* **Routing**: Replace Angular routing with react-router. [#31463](https://github.com/grafana/grafana/pull/31463), [@dprokop](https://github.com/dprokop)
-* **Slack**: Use chat.postMessage API by default. [#32511](https://github.com/grafana/grafana/pull/32511), [@aknuds1](https://github.com/aknuds1)
-* **Tempo**: Search for Traces by querying Loki directly from Tempo. [#33308](https://github.com/grafana/grafana/pull/33308), [@davkal](https://github.com/davkal)
-* **Tempo**: Show graph view of the trace. [#33635](https://github.com/grafana/grafana/pull/33635), [@aocenas](https://github.com/aocenas)
-* **Themes**: Switch theme without reload using global shortcut. [#32180](https://github.com/grafana/grafana/pull/32180), [@torkelo](https://github.com/torkelo)
-* **TimeSeries panel**: Add support for shared cursor. [#33433](https://github.com/grafana/grafana/pull/33433), [@dprokop](https://github.com/dprokop)
-* **TimeSeries panel**: Do not crash the panel if there is no time series data in the response. [#33993](https://github.com/grafana/grafana/pull/33993), [@dprokop](https://github.com/dprokop)
-* **Variables**: Do not save repeated panels, rows and scopedVars. [#32436](https://github.com/grafana/grafana/pull/32436), [@torkelo](https://github.com/torkelo)
-* **Variables**: Removes experimental Tags feature. [#33361](https://github.com/grafana/grafana/pull/33361), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Variables**: Removes the never refresh option. [#33533](https://github.com/grafana/grafana/pull/33533), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Visualizations**: Unify tooltip options across visualizations. [#33892](https://github.com/grafana/grafana/pull/33892), [@dprokop](https://github.com/dprokop)
-* **Visualizations**: Refactor and unify option creation between new visualizations. [#33867](https://github.com/grafana/grafana/pull/33867), [@oscarkilhed](https://github.com/oscarkilhed)
-* **Visualizations**: Remove singlestat panel. [#31904](https://github.com/grafana/grafana/pull/31904), [@dprokop](https://github.com/dprokop)
-
-### Bug fixes
-
-* **APIKeys**: Fixes issue with adding first api key. [#32201](https://github.com/grafana/grafana/pull/32201), [@torkelo](https://github.com/torkelo)
-* **Alerting**: Add checks for non supported units - disable defaulting to seconds. [#32477](https://github.com/grafana/grafana/pull/32477), [@dsotirakis](https://github.com/dsotirakis)
-* **Alerting**: Fix issue where Slack notifications won't link to user IDs. [#32861](https://github.com/grafana/grafana/pull/32861), [@n-wbrown](https://github.com/n-wbrown)
-* **Alerting**: Omit empty message in PagerDuty notifier. [#31359](https://github.com/grafana/grafana/pull/31359), [@pkoenig10](https://github.com/pkoenig10)
-* **AzureMonitor**: Fix migration error from older versions of App Insights queries. [#32372](https://github.com/grafana/grafana/pull/32372), [@joshhunt](https://github.com/joshhunt)
-* **CloudWatch**: Fix AWS/Connect dimensions. [#33736](https://github.com/grafana/grafana/pull/33736), [@sunker](https://github.com/sunker)
-* **CloudWatch**: Fix broken AWS/MediaTailor dimension name. [#33271](https://github.com/grafana/grafana/pull/33271), [@sunker](https://github.com/sunker)
-* **Dashboards**: Allow string manipulation as advanced variable format option. [#29754](https://github.com/grafana/grafana/pull/29754), [@rscot231](https://github.com/rscot231)
-* **DataLinks**: Includes harmless extended characters like Cyrillic characters. [#33551](https://github.com/grafana/grafana/pull/33551), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Drawer**: Fixes title overflowing its container. [#33857](https://github.com/grafana/grafana/pull/33857), [@thisisobate](https://github.com/thisisobate)
-* **Explore**: Fix issue when some query errors were not shown. [#32212](https://github.com/grafana/grafana/pull/32212), [@aocenas](https://github.com/aocenas)
-* **Generic OAuth**: Prevent adding duplicated users. [#32286](https://github.com/grafana/grafana/pull/32286), [@dsotirakis](https://github.com/dsotirakis)
-* **Graphite**: Handle invalid annotations. [#32437](https://github.com/grafana/grafana/pull/32437), [@ifrost](https://github.com/ifrost)
-* **Graphite**: Fix autocomplete when tags are not available. [#31680](https://github.com/grafana/grafana/pull/31680), [@ifrost](https://github.com/ifrost)
-* **InfluxDB**: Fix Cannot read property 'length' of undefined in when parsing response. [#32504](https://github.com/grafana/grafana/pull/32504), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Instrumentation**: Enable tracing when Jaeger host and port are set. [#33682](https://github.com/grafana/grafana/pull/33682), [@zserge](https://github.com/zserge)
-* **Instrumentation**: Prefix metrics with `grafana`. [#33925](https://github.com/grafana/grafana/pull/33925), [@bergquist](https://github.com/bergquist)
-* **MSSQL**: By default let driver choose port. [#32417](https://github.com/grafana/grafana/pull/32417), [@aknuds1](https://github.com/aknuds1)
-* **OAuth**: Add optional strict parsing of role_attribute_path. [#28021](https://github.com/grafana/grafana/pull/28021), [@klausenbusk](https://github.com/klausenbusk)
-* **Panel**: Fixes description markdown with inline code being rendered on newlines and full width. [#32405](https://github.com/grafana/grafana/pull/32405), [@dprokop](https://github.com/dprokop)
-* **PanelChrome**: Ignore data updates & errors for non data panels. [#33477](https://github.com/grafana/grafana/pull/33477), [@torkelo](https://github.com/torkelo)
-* **Permissions**: Fix inherited folder permissions can prevent new permissions being added to a dashboard. [#33329](https://github.com/grafana/grafana/pull/33329), [@marefr](https://github.com/marefr)
-* **Plugins**: Remove pre-existing plugin installs when installing with grafana-cli. [#31515](https://github.com/grafana/grafana/pull/31515), [@wbrowne](https://github.com/wbrowne)
-* **Plugins**: Support installing to folders with whitespace and fix pluginUrl trailing and leading whitespace failures. [#32506](https://github.com/grafana/grafana/pull/32506), [@wbrowne](https://github.com/wbrowne)
-* **Postgres/MySQL/MSSQL**: Don't return connection failure details to the client. [#32408](https://github.com/grafana/grafana/pull/32408), [@marefr](https://github.com/marefr)
-* **Postgres**: Fix ms precision of interval in time group macro when TimescaleDB is enabled. [#33853](https://github.com/grafana/grafana/pull/33853), [@ying-jeanne](https://github.com/ying-jeanne)
-* **Provisioning**: Use dashboard checksum field as change indicator. [#29797](https://github.com/grafana/grafana/pull/29797), [@cristi-](https://github.com/cristi-)
-* **SQL**: Fix so that all captured errors are returned from sql engine. [#32353](https://github.com/grafana/grafana/pull/32353), [@marefr](https://github.com/marefr)
-* **Shortcuts**: Fixes panel shortcuts so they always work. [#32385](https://github.com/grafana/grafana/pull/32385), [@torkelo](https://github.com/torkelo)
-* **Table**: Fixes so border is visible for cells with links. [#33160](https://github.com/grafana/grafana/pull/33160), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Variables**: Clear query when data source type changes. [#33924](https://github.com/grafana/grafana/pull/33924), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Variables**: Filters out builtin variables from unknown list. [#33933](https://github.com/grafana/grafana/pull/33933), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Variables**: Refreshes all panels even if panel is full screen. [#33201](https://github.com/grafana/grafana/pull/33201), [@hugohaggmark](https://github.com/hugohaggmark)
-
-### Breaking changes
-
-Removes the `never` refresh option for Query variables. Existing variables will be migrated and any stored options will be removed. Issue [#33533](https://github.com/grafana/grafana/issues/33533)
-
-Removes the experimental Tags feature for Variables. Issue [#33361](https://github.com/grafana/grafana/issues/33361)
-
-### Deprecations
-
-The InfoBox & FeatureInfoBox are now deprecated please use the Alert component instead with severity info.
- Issue [#33352](https://github.com/grafana/grafana/issues/33352)
-
-### Plugin development fixes & changes
-
-* **Button**: Introduce buttonStyle prop. [#33384](https://github.com/grafana/grafana/pull/33384), [@jackw](https://github.com/jackw)
-* **DataQueryRequest**: Remove deprecated props showingGraph and showingTabel and exploreMode. [#31876](https://github.com/grafana/grafana/pull/31876), [@torkelo](https://github.com/torkelo)
-* **grafana/ui**: Update React Hook Form to v7. [#33328](https://github.com/grafana/grafana/pull/33328), [@Clarity-89](https://github.com/Clarity-89)
-* **IconButton**: Introduce variant for red and blue icon buttons. [#33479](https://github.com/grafana/grafana/pull/33479), [@jackw](https://github.com/jackw)
-* **Plugins**: Expose the `getTimeZone` function to be able to get the current selected timeZone. [#31900](https://github.com/grafana/grafana/pull/31900), [@mckn](https://github.com/mckn)
-* **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)
-
-<!-- 8.0.0-beta1 END -->
-
-<!-- 7.5.8 START -->
-
-# 7.5.8 (2021-06-16)
-
-### Features and enhancements
-
-* **Datasource:** Add support for max_conns_per_host in dataproxy settings. [#35519](https://github.com/grafana/grafana/pull/35519), [@jvrplmlmn](https://github.com/jvrplmlmn)
-* **Datasource:** Add support for max_idle_connections_per_host in dataproxy settings. [#35365](https://github.com/grafana/grafana/pull/35365), [@dsotirakis](https://github.com/dsotirakis)
-* **Instrumentation:** Add metrics for outbound HTTP connections. [#35321](https://github.com/grafana/grafana/pull/35321), [@dsotirakis](https://github.com/dsotirakis)
-* **Snapshots:** Remove dashboard links from dashboard snapshots. [#35567](https://github.com/grafana/grafana/pull/35567), [@torkelo](https://github.com/torkelo)
-
-<!-- 7.5.8 END -->
-
-<!-- 7.5.7 START -->
-
-# 7.5.7 (2021-05-19)
-
-### Bug fixes
-
-* **Dockerfile:** Fixes missing --no-cache. [#33906](https://github.com/grafana/grafana/pull/33906), [@030](https://github.com/030)
-* **Annotations:** Prevent orphaned annotation tags cleanup when no annotations were cleaned. [#33957](https://github.com/grafana/grafana/pull/33957), [@afayngelerindbx](https://github.com/afayngelerindbx)
-* **Quota:** Do not count folders towards dashboard quota. [#32519](https://github.com/grafana/grafana/pull/32519), [@conorevans](https://github.com/conorevans)
-
-<!-- 7.5.7 END -->
-
-<!-- 7.5.6 START -->
-
-# 7.5.6 (2021-05-11)
-
-### Features and enhancements
-
-* **Database**: Add isolation level configuration parameter for MySQL. [#33830](https://github.com/grafana/grafana/pull/33830), [@zserge](https://github.com/zserge)
-* **InfluxDB**: Improve measurement-autocomplete behavior. [#33494](https://github.com/grafana/grafana/pull/33494), [@gabor](https://github.com/gabor)
-* **Instrumentation**: Don't consider invalid email address a failed email. [#33671](https://github.com/grafana/grafana/pull/33671), [@bergquist](https://github.com/bergquist)
-
-### Bug fixes
-
-* **Loki**: fix label browser crashing when + typed. [#33900](https://github.com/grafana/grafana/pull/33900), [@zoltanbedi](https://github.com/zoltanbedi)
-* **Prometheus**: Sanitize PromLink button. [#33874](https://github.com/grafana/grafana/pull/33874), [@ivanahuckova](https://github.com/ivanahuckova)
-
-<!-- 7.5.6 END -->
-
-<!-- 7.5.5 START -->
-
-# 7.5.5 (2021-04-28)
-
-### Features and enhancements
-
-* **Explore:** Load default data source in Explore when the provided source does not exist. [#32992](https://github.com/grafana/grafana/pull/32992), [@ifrost](https://github.com/ifrost)
-* **Instrumentation:** Add success rate metrics for email notifications. [#33359](https://github.com/grafana/grafana/pull/33359), [@bergquist](https://github.com/bergquist)
-
-### Bug fixes
-
-* **Alerting:** Remove field limitation from Slack notifications. [#33113](https://github.com/grafana/grafana/pull/33113), [@dsotirakis](https://github.com/dsotirakis)
-* **Auth:** Do not clear auth token cookie when token lookup fails. [#32999](https://github.com/grafana/grafana/pull/32999), [@marefr](https://github.com/marefr)
-* **Bug:** Add git command to Dockerfile.ubuntu file. [#33247](https://github.com/grafana/grafana/pull/33247), [@dsotirakis](https://github.com/dsotirakis)
-* **Explore:** Adjust time to the selected timezone. [#33315](https://github.com/grafana/grafana/pull/33315), [@ifrost](https://github.com/ifrost)
-* **GraphNG:** Fix exemplars window position. [#33427](https://github.com/grafana/grafana/pull/33427), [@zoltanbedi](https://github.com/zoltanbedi)
-* **Loki:** Pass Skip TLS Verify setting to alert queries. [#33025](https://github.com/grafana/grafana/pull/33025), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Postgres:** Fix time group macro when TimescaleDB is enabled and interval is less than a second. [#33153](https://github.com/grafana/grafana/pull/33153), [@marefr](https://github.com/marefr)
-
-<!-- 7.5.5 END -->
-
-<!-- 7.5.4 START -->
-
-# 7.5.4 (2021-04-14)
-
-### Features and enhancements
-
-* **AzureMonitor**: Add support for Microsoft.AppConfiguration/configurationStores namespace. [#32123](https://github.com/grafana/grafana/pull/32123), [@deesejohn](https://github.com/deesejohn)
-* **TablePanel**: Make sorting case-insensitive. [#32435](https://github.com/grafana/grafana/pull/32435), [@kaydelaney](https://github.com/kaydelaney)
-
-### Bug fixes
-
-* **AzureMonitor**: Add support for Virtual WAN namespaces. [#32935](https://github.com/grafana/grafana/pull/32935), [@joshhunt](https://github.com/joshhunt)
-* **Bugfix**: Add proper padding when scrolling is added to bar gauge. [#32411](https://github.com/grafana/grafana/pull/32411), [@mckn](https://github.com/mckn)
-* **Datasource**: Prevent default data source named "default" from causing infinite loop. [#32949](https://github.com/grafana/grafana/pull/32949), [@jackw](https://github.com/jackw)
-* **Prometheus**: Allow query_exemplars endpoint in data source proxy. [#32802](https://github.com/grafana/grafana/pull/32802), [@zoltanbedi](https://github.com/zoltanbedi)
-* **Table**: Fix table data links so they refer to correct row after sorting. [#32571](https://github.com/grafana/grafana/pull/32571), [@torkelo](https://github.com/torkelo)
-
-<!-- 7.5.4 END -->
-
-<!-- 7.5.3 START -->
-
-# 7.5.3 (2021-04-07)
-
-### Features and enhancements
-
-* **Dashboard**: Do not include default datasource when externally exporting dashboard with row. [#32494](https://github.com/grafana/grafana/pull/32494), [@kaydelaney](https://github.com/kaydelaney)
-* **Loki**: Remove empty annotations tags. [#32359](https://github.com/grafana/grafana/pull/32359), [@conorevans](https://github.com/conorevans)
-
-### Bug fixes
-
-* **AdHocVariable**: Add default data source to picker. [#32470](https://github.com/grafana/grafana/pull/32470), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Configuration**: Prevent browser hanging / crashing with large number of org users. [#32546](https://github.com/grafana/grafana/pull/32546), [@jackw](https://github.com/jackw)
-* **Elasticsearch**: Fix bucket script variable duplication in UI. [#32705](https://github.com/grafana/grafana/pull/32705), [@Elfo404](https://github.com/Elfo404)
-* **Explore**: Fix bug where navigating to explore would result in wrong query and datasource to be shown. [#32558](https://github.com/grafana/grafana/pull/32558), [@aocenas](https://github.com/aocenas)
-* **FolderPicker**: Prevent dropdown menu from disappearing off screen. [#32603](https://github.com/grafana/grafana/pull/32603), [@jackw](https://github.com/jackw)
-* **SingleStat**: Fix issue with panel links. [#32721](https://github.com/grafana/grafana/pull/32721), [@gjulianm](https://github.com/gjulianm)
-* **Variables**: Confirm selection before opening new picker. [#32586](https://github.com/grafana/grafana/pull/32586), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Variables**: Confirm selection before opening new picker. [#32503](https://github.com/grafana/grafana/pull/32503), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Variables**: Fix unsupported data format error for null values. [#32480](https://github.com/grafana/grafana/pull/32480), [@hugohaggmark](https://github.com/hugohaggmark)
-
-<!-- 7.5.3 END -->
-
-<!-- 7.5.2 START -->
-
-# 7.5.2 (2021-03-30)
-
-### Features and enhancements
-
-* **Explore**: Set Explore's GraphNG to use default value for connected null values setting. [#32471](https://github.com/grafana/grafana/pull/32471), [@ivanahuckova](https://github.com/ivanahuckova)
-
-### Bug fixes
-
-* **DashboardDataSource**: Fix query not being executed after selecting source panel. [#32383](https://github.com/grafana/grafana/pull/32383), [@torkelo](https://github.com/torkelo)
-* **Graph**: Fix setting right y-axis when standard option unit is configured. [#32426](https://github.com/grafana/grafana/pull/32426), [@torkelo](https://github.com/torkelo)
-* **Table**: Fix links for image cells. [#32370](https://github.com/grafana/grafana/pull/32370), [@kaydelaney](https://github.com/kaydelaney)
-* **Variables**: Fix data source variable when default data source is selected. [#32384](https://github.com/grafana/grafana/pull/32384), [@torkelo](https://github.com/torkelo)
-* **Variables**: Fix manually entering non-matching custom value in variable input/picker error. [#32390](https://github.com/grafana/grafana/pull/32390), [@torkelo](https://github.com/torkelo)
-
-<!-- 7.5.2 END -->
-
-<!-- 7.5.1 START -->
-
-# 7.5.1 (2021-03-26)
-
-### Bug fixes
-
-* **MSSQL**: Fix panic not implemented by upgrading go-mssqldb dependency. [#32347](https://github.com/grafana/grafana/pull/32347), [@aknuds1](https://github.com/aknuds1)
-
-<!-- 7.5.1 END -->
-
-<!-- 7.5.0 START -->
-
-# 7.5.0 (2021-03-25)
-
-### Features and enhancements
-
-* **Alerting**: Add ability to include aliases with hyphen in InfluxDB. [#32262](https://github.com/grafana/grafana/pull/32262), [@grafanabot](https://github.com/grafanabot)
-* **CloudWatch**: Use latest version of aws sdk. [#32217](https://github.com/grafana/grafana/pull/32217), [@sunker](https://github.com/sunker)
-
-### Bug fixes
-
-* **Alerting**: Add ability to include aliases with hyphen in InfluxDB. [#32224](https://github.com/grafana/grafana/pull/32224), [@dsotirakis](https://github.com/dsotirakis)
-* **DashboardSettings**: Fixes issue with tags list not updating changes are made. [#32241](https://github.com/grafana/grafana/pull/32241), [@huynhsamha](https://github.com/huynhsamha)
-* **DashboardSettings**: Fixes issue with tags list not updating changes are made. [#32189](https://github.com/grafana/grafana/pull/32189), [@huynhsamha](https://github.com/huynhsamha)
-* **Loki**: Fix text search in Label browser. [#32293](https://github.com/grafana/grafana/pull/32293), [@ivanahuckova](https://github.com/ivanahuckova)
-
-<!-- 7.5.0 END -->
-
-<!-- 7.5.0-beta2 START -->
-
-# 7.5.0-beta2 (2021-03-19)
-
-### Features and enhancements
-
-* **CloudWatch**: Add support for EC2 IAM role. [#31804](https://github.com/grafana/grafana/pull/31804), [@sunker](https://github.com/sunker)
-* **CloudWatch**: Consume the grafana/aws-sdk. [#31807](https://github.com/grafana/grafana/pull/31807), [@sunker](https://github.com/sunker)
-* **CloudWatch**: Restrict auth provider and assume role usage according to Grafana configuration. [#31805](https://github.com/grafana/grafana/pull/31805), [@sunker](https://github.com/sunker)
-* **Cloudwatch**: ListMetrics API page limit. [#31788](https://github.com/grafana/grafana/pull/31788), [@sunker](https://github.com/sunker)
-* **Cloudwatch**: Use shared library for aws auth. [#29550](https://github.com/grafana/grafana/pull/29550), [@ryantxu](https://github.com/ryantxu)
-* **DataLinks**: Bring back single click links for Stat, Gauge and BarGauge panel. [#31692](https://github.com/grafana/grafana/pull/31692), [@dprokop](https://github.com/dprokop)
-* **Docker**: Support pre-installed plugins from other sources in custom Dockerfiles. [#31234](https://github.com/grafana/grafana/pull/31234), [@sgnsys3](https://github.com/sgnsys3)
-* **Elasticseach**: Add support for histogram fields. [#29079](https://github.com/grafana/grafana/pull/29079), [@simianhacker](https://github.com/simianhacker)
-* **Exemplars**: Always query exemplars. [#31673](https://github.com/grafana/grafana/pull/31673), [@zoltanbedi](https://github.com/zoltanbedi)
-* **Explore**: Support full inspect drawer. [#32005](https://github.com/grafana/grafana/pull/32005), [@ivanahuckova](https://github.com/ivanahuckova)
-* **HttpServer**: Make read timeout configurable but disabled by default. [#31575](https://github.com/grafana/grafana/pull/31575), [@bergquist](https://github.com/bergquist)
-* **SQLStore**: Close session in withDbSession. [#31775](https://github.com/grafana/grafana/pull/31775), [@aknuds1](https://github.com/aknuds1)
-* **Templating**: Use dashboard timerange when variables are set to refresh 'On Dashboard Load'. [#31721](https://github.com/grafana/grafana/pull/31721), [@Elfo404](https://github.com/Elfo404)
-* **Tempo**: Convert to backend data source. [#31618](https://github.com/grafana/grafana/pull/31618), [@zoltanbedi](https://github.com/zoltanbedi)
-
-### Bug fixes
-
-* **Admin**: Keeps expired api keys visible in table after delete. [#31636](https://github.com/grafana/grafana/pull/31636), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Data proxy**: Fix encoded characters in URL path should be proxied as encoded. [#30597](https://github.com/grafana/grafana/pull/30597), [@marefr](https://github.com/marefr)
-* **Explore/Logs**: Fix escaping in ANSI logs. [#31731](https://github.com/grafana/grafana/pull/31731), [@ivanahuckova](https://github.com/ivanahuckova)
-* **GraphNG**: Fix tooltip series color for multi data frame scenario. [#32098](https://github.com/grafana/grafana/pull/32098), [@dprokop](https://github.com/dprokop)
-* **GraphNG**: Make sure data set and config are in sync when initializing and re-initializing uPlot. [#32106](https://github.com/grafana/grafana/pull/32106), [@dprokop](https://github.com/dprokop)
-* **Loki**: Fix autocomplete when re-editing Loki label values. [#31828](https://github.com/grafana/grafana/pull/31828), [@ivanahuckova](https://github.com/ivanahuckova)
-* **MixedDataSource**: Name is updated when data source variables change. [#32090](https://github.com/grafana/grafana/pull/32090), [@hugohaggmark](https://github.com/hugohaggmark)
-* **PanelInspect**: Interpolates variables in CSV file name. [#31936](https://github.com/grafana/grafana/pull/31936), [@hugohaggmark](https://github.com/hugohaggmark)
-* **ReduceTransform**: Include series with numeric string  names. [#31763](https://github.com/grafana/grafana/pull/31763), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Snapshots**: Fix usage of sign in link from the snapshot page. [#31986](https://github.com/grafana/grafana/pull/31986), [@marefr](https://github.com/marefr)
-* **TimePicker**: Fixes hidden time picker shown in kiosk TV mode. [#32062](https://github.com/grafana/grafana/pull/32062), [@torkelo](https://github.com/torkelo)
-* **ValueMappings**: Fixes value 0 not being mapped. [#31924](https://github.com/grafana/grafana/pull/31924), [@Willena](https://github.com/Willena)
-* **Variables**: Fixes filtering in picker with null items. [#31979](https://github.com/grafana/grafana/pull/31979), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Variables**: Improves inspection performance and unknown filtering. [#31811](https://github.com/grafana/grafana/pull/31811), [@hugohaggmark](https://github.com/hugohaggmark)
-
-### Plugin development fixes & changes
-
-* **Auth**: Allow soft token revocation. [#31601](https://github.com/grafana/grafana/pull/31601), [@joanlopez](https://github.com/joanlopez)
-
-<!-- 7.5.0-beta2 END -->
-
-<!-- 7.5.0-beta1 START -->
-
-# 7.5.0-beta1 (2021-03-04)
-
-### Features and enhancements
-
-* **Alerting**: Customise OK notification priorities for Pushover notifier. [#30169](https://github.com/grafana/grafana/pull/30169), [@acaire](https://github.com/acaire)
-* **Alerting**: Improve default message for SensuGo notifier. [#31428](https://github.com/grafana/grafana/pull/31428), [@M4teo](https://github.com/M4teo)
-* **Alerting**: PagerDuty: adding current state to the payload. [#29270](https://github.com/grafana/grafana/pull/29270), [@Eraac](https://github.com/Eraac)
-* **AzureMonitor**: Add deprecation message for App Insights/Insights Analytics. [#30633](https://github.com/grafana/grafana/pull/30633), [@joshhunt](https://github.com/joshhunt)
-* **CloudMonitoring**: Allow free text input for GCP project on dashboard variable query. [#28048](https://github.com/grafana/grafana/issues/28048)
-* **CloudMonitoring**: Increase service api page size. [#30892](https://github.com/grafana/grafana/pull/30892), [@sunker](https://github.com/sunker)
-* **CloudMonitoring**: Show service and SLO display name in SLO Query editor. [#30900](https://github.com/grafana/grafana/pull/30900), [@sunker](https://github.com/sunker)
-* **CloudWatch**: Add AWS Ground Station metrics and dimensions. [#31362](https://github.com/grafana/grafana/pull/31362), [@ilyastoli](https://github.com/ilyastoli)
-* **CloudWatch**: Add AWS Network Firewall metrics and dimensions. [#31498](https://github.com/grafana/grafana/pull/31498), [@ilyastoli](https://github.com/ilyastoli)
-* **CloudWatch**: Add AWS Timestream Metrics and Dimensions. [#31624](https://github.com/grafana/grafana/pull/31624), [@ilyastoli](https://github.com/ilyastoli)
-* **CloudWatch**: Add RDS Proxy metrics. [#31595](https://github.com/grafana/grafana/pull/31595), [@sunker](https://github.com/sunker)
-* **CloudWatch**: Add eu-south-1 Cloudwatch region. [#31198](https://github.com/grafana/grafana/pull/31198), [@rubycut](https://github.com/rubycut)
-* **CloudWatch**: Make it possible to specify custom api endpoint. [#31402](https://github.com/grafana/grafana/pull/31402), [@sunker](https://github.com/sunker)
-* **Cloudwatch**: Add AWS/DDoSProtection metrics and dimensions. [#31297](https://github.com/grafana/grafana/pull/31297), [@relvira](https://github.com/relvira)
-* **Dashboard**: Remove template variables option from ShareModal. [#30395](https://github.com/grafana/grafana/pull/30395), [@oscarkilhed](https://github.com/oscarkilhed)
-* **Docs**: Define TLS/SSL terminology. [#30533](https://github.com/grafana/grafana/pull/30533), [@aknuds1](https://github.com/aknuds1)
-* **Elasticsearch**: Add word highlighting to search results. [#30293](https://github.com/grafana/grafana/pull/30293), [@simianhacker](https://github.com/simianhacker)
-* **Folders**: Editors should be able to edit name and delete folders. [#31242](https://github.com/grafana/grafana/pull/31242), [@torkelo](https://github.com/torkelo)
-* **Graphite/SSE**: update graphite to work with server side expressions. [#31455](https://github.com/grafana/grafana/pull/31455), [@kylebrandt](https://github.com/kylebrandt)
-* **InfluxDB**: Improve maxDataPoints error-message in Flux-mode, raise limits. [#31259](https://github.com/grafana/grafana/pull/31259), [@gabor](https://github.com/gabor)
-* **InfluxDB**: In flux query editor, do not run query when disabled. [#31324](https://github.com/grafana/grafana/pull/31324), [@gabor](https://github.com/gabor)
-* **LogsPanel**: Add deduplication option for logs. [#31019](https://github.com/grafana/grafana/pull/31019), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Loki**: Add line limit for annotations. [#31183](https://github.com/grafana/grafana/pull/31183), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Loki**: Add support for alerting. [#31424](https://github.com/grafana/grafana/pull/31424), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Loki**: Label browser. [#30351](https://github.com/grafana/grafana/pull/30351), [@davkal](https://github.com/davkal)
-* **PieChart**: Add color changing options to pie chart. [#31588](https://github.com/grafana/grafana/pull/31588), [@oscarkilhed](https://github.com/oscarkilhed)
-* **PostgreSQL**: Allow providing TLS/SSL certificates as text in addition to file paths. [#30353](https://github.com/grafana/grafana/pull/30353), [@ying-jeanne](https://github.com/ying-jeanne)
-* **Postgres**: SSL certification. [#30352](https://github.com/grafana/grafana/pull/30352), [@ying-jeanne](https://github.com/ying-jeanne)
-* **Profile**: Prevent OAuth users from changing user details or password. [#27886](https://github.com/grafana/grafana/pull/27886), [@dupondje](https://github.com/dupondje)
-* **Prometheus**: Change default httpMethod for new instances to POST. [#31292](https://github.com/grafana/grafana/pull/31292), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Prometheus**: Min step defaults to seconds when no unit is set. [#30966](https://github.com/grafana/grafana/pull/30966), [@nutmos](https://github.com/nutmos)
-* **Stats**: Exclude folders from total dashboard count. [#31320](https://github.com/grafana/grafana/pull/31320), [@bergquist](https://github.com/bergquist)
-* **Tracing**: Specify type of data frame that is expected for TraceView. [#31465](https://github.com/grafana/grafana/pull/31465), [@aocenas](https://github.com/aocenas)
-* **Transformers**: Add search to transform selection. [#30854](https://github.com/grafana/grafana/pull/30854), [@ryantxu](https://github.com/ryantxu)
-
-### Bug fixes
-
-* **Alerting**: Ensure Discord notification is sent when metric name is absent. [#31257](https://github.com/grafana/grafana/pull/31257), [@LeviHarrison](https://github.com/LeviHarrison)
-* **Alerting**: Fix case when Alertmanager notifier fails if a URL is not working. [#31079](https://github.com/grafana/grafana/pull/31079), [@kurokochin](https://github.com/kurokochin)
-* **CloudMonitoring**: Prevent resource type variable function from crashing. [#30901](https://github.com/grafana/grafana/pull/30901), [@sunker](https://github.com/sunker)
-* **Color**: Fix issue where colors are reset to gray when switching panels. [#31611](https://github.com/grafana/grafana/pull/31611), [@torkelo](https://github.com/torkelo)
-* **Explore**: Show ANSI colored logs in logs context. [#31510](https://github.com/grafana/grafana/pull/31510), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Explore**: keep enabled/disabled state in angular based QueryEditors correctly. [#31558](https://github.com/grafana/grafana/pull/31558), [@gabor](https://github.com/gabor)
-* **Graph**: Fix tooltip not being displayed when close to edge of viewport. [#31493](https://github.com/grafana/grafana/pull/31493), [@msober](https://github.com/msober)
-* **Heatmap**: Fix missing value in legend. [#31430](https://github.com/grafana/grafana/pull/31430), [@kurokochin](https://github.com/kurokochin)
-* **InfluxDB**: Handle columns named "table". [#30985](https://github.com/grafana/grafana/pull/30985), [@gabor](https://github.com/gabor)
-* **Prometheus**: Use configured HTTP method for /series and /labels endpoints. [#31401](https://github.com/grafana/grafana/pull/31401), [@ivanahuckova](https://github.com/ivanahuckova)
-* **RefreshPicker**: Make valid intervals in url visible in RefreshPicker. [#30474](https://github.com/grafana/grafana/pull/30474), [@hugohaggmark](https://github.com/hugohaggmark)
-* **TimeSeriesPanel**: Fix overlapping time axis ticks. [#31332](https://github.com/grafana/grafana/pull/31332), [@torkelo](https://github.com/torkelo)
-* **TraceViewer**: Fix show log marker in spanbar. [#30742](https://github.com/grafana/grafana/pull/30742), [@zoltanbedi](https://github.com/zoltanbedi)
-
-### Plugin development fixes & changes
-
-* **Plugins**: Add autoEnabled plugin JSON field to auto enable App plugins and add configuration link to menu by default. [#31354](https://github.com/grafana/grafana/pull/31354), [@torkelo](https://github.com/torkelo)
-* **Pagination**: Improve pagination for large number of pages. [#30151](https://github.com/grafana/grafana/pull/30151), [@nathanrodman](https://github.com/nathanrodman)
-
-<!-- 7.5.0-beta1 END -->
-
-<!-- 7.4.5 START -->
-
-# 7.4.5 (2021-03-18)
-
-### Bug fixes
-
-* **Security**: Fix API permissions issues related to team-sync CVE-2021-28146, CVE-2021-28147. (Enterprise)
-* **Security**: Usage insights requires signed in users CVE-2021-28148. (Enterprise)
-* **Security**: Do not allow editors to incorrectly bypass permissions on the default data source. CVE-2021-27962. (Enterprise)
-
-<!-- 7.4.5 END -->
-
-<!-- 7.4.3 START -->
-
-# 7.4.3 (2021-02-24)
-
-### Bug fixes
-
-* **AdHocVariables**: Fixes crash when values are stored as numbers. [#31382](https://github.com/grafana/grafana/pull/31382), [@hugohaggmark](https://github.com/hugohaggmark)
-* **DashboardLinks**: Fix an issue where the dashboard links were causing a full page reload. [#31334](https://github.com/grafana/grafana/pull/31334), [@torkelo](https://github.com/torkelo)
-* **Elasticsearch**: Fix query initialization logic & query transformation from Prometheus/Loki. [#31322](https://github.com/grafana/grafana/pull/31322), [@Elfo404](https://github.com/Elfo404)
-* **QueryEditor**: Fix disabling queries in dashboards. [#31336](https://github.com/grafana/grafana/pull/31336), [@gabor](https://github.com/gabor)
-* **Streaming**: Fix an issue with the time series panel and streaming data source when scrolling back from being out of view. [#31431](https://github.com/grafana/grafana/pull/31431), [@torkelo](https://github.com/torkelo)
-* **Table**: Fix an issue regarding the fixed min and auto max values in bar gauge cell. [#31316](https://github.com/grafana/grafana/pull/31316), [@torkelo](https://github.com/torkelo)
-
-<!-- 7.4.3 END -->
-
-<!-- 7.4.2 START -->
-
-# 7.4.2 (2021-02-17)
-
-### Features and enhancements
-
-* **Explore**: Do not show non queryable data sources in data source picker. [#31144](https://github.com/grafana/grafana/pull/31144), [@torkelo](https://github.com/torkelo)
-* **Snapshots**: Do not allow an anonymous user to create snapshots. [#31263](https://github.com/grafana/grafana/pull/31263), [@marefr](https://github.com/marefr)
-
-### Bug fixes
-
-* **CloudWatch**: Ensure empty query row errors are not passed to the panel. [#31172](https://github.com/grafana/grafana/pull/31172), [@sunker](https://github.com/sunker)
-* **DashboardLinks**: Fix the links that always cause a full page to reload. [#31178](https://github.com/grafana/grafana/pull/31178), [@torkelo](https://github.com/torkelo)
-* **DashboardListPanel**: Fix issue with folder picker always showing All and using old form styles. [#31160](https://github.com/grafana/grafana/pull/31160), [@torkelo](https://github.com/torkelo)
-* **IPv6**: Support host address configured with enclosing square brackets. [#31226](https://github.com/grafana/grafana/pull/31226), [@aknuds1](https://github.com/aknuds1)
-* **Permissions**: Fix team and role permissions on folders/dashboards not displayed for non Grafana Admin users. [#31132](https://github.com/grafana/grafana/pull/31132), [@AgnesToulet](https://github.com/AgnesToulet)
-* **Postgres**: Fix timeGroup macro converts long intervals to invalid numbers when TimescaleDB is enabled. [#31179](https://github.com/grafana/grafana/pull/31179), [@kurokochin](https://github.com/kurokochin)
-* **Prometheus**: Fix enabling of disabled queries when editing in dashboard. [#31055](https://github.com/grafana/grafana/pull/31055), [@ivanahuckova](https://github.com/ivanahuckova)
-* **QueryEditors**: Fix an issue that happens after moving queries then editing would update other queries. [#31193](https://github.com/grafana/grafana/pull/31193), [@torkelo](https://github.com/torkelo)
-* **SqlDataSources**: Fix the Show Generated SQL button in query editors. [#31236](https://github.com/grafana/grafana/pull/31236), [@torkelo](https://github.com/torkelo)
-* **StatPanels**: Fix an issue where the palette color scheme is not cleared when loading panel. [#31126](https://github.com/grafana/grafana/pull/31126), [@torkelo](https://github.com/torkelo)
-* **Variables**: Add the default option back for the data source variable. [#31208](https://github.com/grafana/grafana/pull/31208), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Variables**: Fix missing empty elements from regex filters. [#31156](https://github.com/grafana/grafana/pull/31156), [@hugohaggmark](https://github.com/hugohaggmark)
-
-<!-- 7.4.2 END -->
-
-<!-- v7.4.2 START -->
-
-
-<!-- v7.4.2 END -->
-
-<!-- 7.4.1 START -->
-
-# 7.4.1 (2021-02-11)
-
-### Features and enhancements
-
-* **Influx**: Make max series limit configurable and show the limiting message if applied. [#31025](https://github.com/grafana/grafana/pull/31025), [@aocenas](https://github.com/aocenas)
-* **Make value mappings correctly interpret numeric-like strings**. [#30893](https://github.com/grafana/grafana/pull/30893), [@dprokop](https://github.com/dprokop)
-* **Variables**: Adds queryparam formatting option. [#30858](https://github.com/grafana/grafana/pull/30858), [@hugohaggmark](https://github.com/hugohaggmark)
-
-### Bug fixes
-
-* **Alerting**: Fixes so notification channels are properly deleted. [#31040](https://github.com/grafana/grafana/pull/31040), [@hugohaggmark](https://github.com/hugohaggmark)
-* **BarGauge**: Improvements to value sizing and table inner width calculations. [#30990](https://github.com/grafana/grafana/pull/30990), [@torkelo](https://github.com/torkelo)
-* **DashboardLinks**: Fixes crash when link has no title. [#31008](https://github.com/grafana/grafana/pull/31008), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Elasticsearch**: Fix alias field value not being shown in query editor. [#30992](https://github.com/grafana/grafana/pull/30992), [@Elfo404](https://github.com/Elfo404)
-* **Elasticsearch**: Fix log row context errors. [#31088](https://github.com/grafana/grafana/pull/31088), [@Elfo404](https://github.com/Elfo404)
-* **Elasticsearch**: Show Size setting for raw_data metric. [#30980](https://github.com/grafana/grafana/pull/30980), [@Elfo404](https://github.com/Elfo404)
-* **Graph**: Fixes so graph is shown for non numeric time values. [#30972](https://github.com/grafana/grafana/pull/30972), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Logging**: Ignore 'file already closed' error when closing file. [#31119](https://github.com/grafana/grafana/pull/31119), [@aknuds1](https://github.com/aknuds1)
-* **Plugins**: Fix plugin signature validation for manifest v2 on Windows. [#31045](https://github.com/grafana/grafana/pull/31045), [@wbrowne](https://github.com/wbrowne)
-* **TextPanel**: Fixes so panel title is updated when variables change. [#30884](https://github.com/grafana/grafana/pull/30884), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Transforms**: Fixes Outer join issue with duplicate field names not getting the same unique field names as before. [#31121](https://github.com/grafana/grafana/pull/31121), [@torkelo](https://github.com/torkelo)
-
-<!-- 7.4.1 END -->
-
-<!-- 7.4.0 START -->
-
-# 7.4.0 (2021-02-04)
-
-### Features and enhancements
-
-* **CDN**: Adds support for serving assets over a CDN. [#30691](https://github.com/grafana/grafana/pull/30691), [@torkelo](https://github.com/torkelo)
-* **DashboardLinks**: Support variable expression in to tooltip - Issue #30409. [#30569](https://github.com/grafana/grafana/pull/30569), [@huynhsamha](https://github.com/huynhsamha)
-* **Explore**: Set Explore's GraphNG to be connected. [#30707](https://github.com/grafana/grafana/pull/30707), [@ivanahuckova](https://github.com/ivanahuckova)
-* **InfluxDB**: Add http configuration when selecting InfluxDB v2 flavor. [#30827](https://github.com/grafana/grafana/pull/30827), [@aocenas](https://github.com/aocenas)
-* **InfluxDB**: Show all datapoints for dynamically windowed flux query. [#30688](https://github.com/grafana/grafana/pull/30688), [@davkal](https://github.com/davkal)
-* **Loki**: Improve live tailing errors. [#30517](https://github.com/grafana/grafana/pull/30517), [@ivanahuckova](https://github.com/ivanahuckova)
-
-### Bug fixes
-
-* **Admin**: Fixes so form values are filled in from backend. [#30544](https://github.com/grafana/grafana/pull/30544), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Admin**: Fixes so whole org drop down is visible when adding users to org. [#30481](https://github.com/grafana/grafana/pull/30481), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Alerting**: Hides threshold handle for percentual thresholds. [#30431](https://github.com/grafana/grafana/pull/30431), [@hugohaggmark](https://github.com/hugohaggmark)
-* **CloudWatch**: Prevent field config from being overwritten. [#30437](https://github.com/grafana/grafana/pull/30437), [@sunker](https://github.com/sunker)
-* **Decimals**: Big Improvements to auto decimals and fixes to auto decimals bug found in 7.4-beta1. [#30519](https://github.com/grafana/grafana/pull/30519), [@torkelo](https://github.com/torkelo)
-* **Explore**: Fix jumpy live tailing. [#30650](https://github.com/grafana/grafana/pull/30650), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Explore**: Fix loading visualisation on the top of the new time series panel. [#30553](https://github.com/grafana/grafana/pull/30553), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Footer**: Fixes layout issue in footer. [#30443](https://github.com/grafana/grafana/pull/30443), [@torkelo](https://github.com/torkelo)
-* **Graph**: Fixes so only users with correct permissions can add annotations. [#30419](https://github.com/grafana/grafana/pull/30419), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Mobile**: Fixes issue scrolling on mobile in chrome. [#30746](https://github.com/grafana/grafana/pull/30746), [@torkelo](https://github.com/torkelo)
-* **PanelEdit**: Trigger refresh when changing data source. [#30744](https://github.com/grafana/grafana/pull/30744), [@torkelo](https://github.com/torkelo)
-* **Panels**: Fixes so panels are refreshed when scrolling past them fast. [#30784](https://github.com/grafana/grafana/pull/30784), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Prometheus**: Fix show query instead of Value if no __name__ and metric. [#30511](https://github.com/grafana/grafana/pull/30511), [@zoltanbedi](https://github.com/zoltanbedi)
-* **TimeSeriesPanel**: Fixes default value for Gradient mode. [#30484](https://github.com/grafana/grafana/pull/30484), [@torkelo](https://github.com/torkelo)
-* **Variables**: Clears drop down state when leaving dashboard. [#30810](https://github.com/grafana/grafana/pull/30810), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Variables**: Fixes display value when using capture groups in regex. [#30636](https://github.com/grafana/grafana/pull/30636), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Variables**: Fixes so queries work for numbers values too. [#30602](https://github.com/grafana/grafana/pull/30602), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Variables**: Fixes so text format will show All instead of custom all value. [#30730](https://github.com/grafana/grafana/pull/30730), [@hugohaggmark](https://github.com/hugohaggmark)
-
-### Plugin development fixes & changes
-
-* **Plugins**: Fix failing plugin builds because of wrong internal import. [#30439](https://github.com/grafana/grafana/pull/30439), [@aocenas](https://github.com/aocenas)
-
-<!-- 7.4.0 END -->

 <!-- 7.4.0-beta1 START -->

-# 7.4.0-beta1 (2021-01-20)
+# 7.4.0-beta1 (unreleased)

 ### Features and enhancements

-* **API**: Add ID to snapshot API responses. [#29600](https://github.com/grafana/grafana/pull/29600), [@AgnesToulet](https://github.com/AgnesToulet)
 * **AlertListPanel**: Add options to sort by Time(asc) and Time(desc). [#29764](https://github.com/grafana/grafana/pull/29764), [@dboslee](https://github.com/dboslee)
 * **AlertListPanel**: Changed alert url to to go the panel view instead of panel edit. [#29060](https://github.com/grafana/grafana/pull/29060), [@zakiharis](https://github.com/zakiharis)
 * **Alerting**: Add support for Sensu Go notification channel. [#28012](https://github.com/grafana/grafana/pull/28012), [@nixwiz](https://github.com/nixwiz)
-* **Alerting**: Add support for alert notification query label interpolation. [#29908](https://github.com/grafana/grafana/pull/29908), [@wbrowne](https://github.com/wbrowne)
 * **Annotations**: Remove annotation_tag entries as part of annotations cleanup. [#29534](https://github.com/grafana/grafana/pull/29534), [@dafydd-t](https://github.com/dafydd-t)
 * **Azure Monitor**: Add Microsoft.Network/natGateways. [#29479](https://github.com/grafana/grafana/pull/29479), [@JoeyLemur](https://github.com/JoeyLemur)
 * **Backend plugins**: Support Forward OAuth Identity for backend data source plugins. [#27055](https://github.com/grafana/grafana/pull/27055), [@billoley](https://github.com/billoley)
-* **Cloud Monitoring**: MQL support. [#26551](https://github.com/grafana/grafana/pull/26551), [@mtanda](https://github.com/mtanda)
 * **CloudWatch**: Add 'EventBusName' dimension to CloudWatch 'AWS/Events' namespace. [#28402](https://github.com/grafana/grafana/pull/28402), [@tomdaly](https://github.com/tomdaly)
 * **CloudWatch**: Add support for AWS DirectConnect ConnectionErrorCount metric. [#29583](https://github.com/grafana/grafana/pull/29583), [@haeringer](https://github.com/haeringer)
 * **CloudWatch**: Add support for AWS/ClientVPN metrics and dimensions. [#29055](https://github.com/grafana/grafana/pull/29055), [@marefr](https://github.com/marefr)
 * **CloudWatch**: Added HTTP API Gateway specific metrics and dimensions. [#28780](https://github.com/grafana/grafana/pull/28780), [@karlatkinson](https://github.com/karlatkinson)
-* **Configuration**: Add an option to hide certain users in the UI. [#28942](https://github.com/grafana/grafana/pull/28942), [@AgnesToulet](https://github.com/AgnesToulet)
 * **Currency**: Adds Indonesian IDR currency. [#28363](https://github.com/grafana/grafana/pull/28363), [@hiddenrebel](https://github.com/hiddenrebel)
 * **Dashboards**: Delete related data (permissions, stars, tags, versions, annotations) when deleting a dashboard or a folder. [#28826](https://github.com/grafana/grafana/pull/28826), [@AgnesToulet](https://github.com/AgnesToulet)
 * **Dependencies**: Update angularjs to 1.8.2. [#28736](https://github.com/grafana/grafana/pull/28736), [@torkelo](https://github.com/torkelo)
@@ -548,16 +30,12 @@ The InfoBox & FeatureInfoBox are now deprecated please use the Alert component i
 * **Field overrides**: Added matcher to match all fields returned by a specific query. [#28872](https://github.com/grafana/grafana/pull/28872), [@mckn](https://github.com/mckn)
 * **Graph**: Add support for spline interpolation (smoothing) added in new time series panel. [#4303](https://github.com/grafana/grafana/issues/4303)
 * **Instrumentation**: Add histograms for database queries. [#29662](https://github.com/grafana/grafana/pull/29662), [@dafydd-t](https://github.com/dafydd-t)
-* **Jaeger**: Remove browser access mode. [#30349](https://github.com/grafana/grafana/pull/30349), [@zoltanbedi](https://github.com/zoltanbedi)
 * **LogsPanel**: Don't show scroll bars when not needed. [#28972](https://github.com/grafana/grafana/pull/28972), [@aocenas](https://github.com/aocenas)
 * **Loki**: Add query type and line limit to query editor in dashboard. [#29356](https://github.com/grafana/grafana/pull/29356), [@ivanahuckova](https://github.com/ivanahuckova)
 * **Loki**: Add query type selector to query editor in Explore. [#28817](https://github.com/grafana/grafana/pull/28817), [@ivanahuckova](https://github.com/ivanahuckova)
 * **Loki**: Retry web socket connection when connection is closed abnormally. [#29438](https://github.com/grafana/grafana/pull/29438), [@ivanahuckova](https://github.com/ivanahuckova)
-* **MS SQL**: Integrated security. [#30369](https://github.com/grafana/grafana/pull/30369), [@daniellee](https://github.com/daniellee)
 * **Middleware**: Add CSP support. [#29740](https://github.com/grafana/grafana/pull/29740), [@aknuds1](https://github.com/aknuds1)
 * **OAuth**: Configurable user name attribute. [#28286](https://github.com/grafana/grafana/pull/28286), [@alexanderzobnin](https://github.com/alexanderzobnin)
-* **PanelEditor**: Render panel field config categories as separate option group sections. [#30301](https://github.com/grafana/grafana/pull/30301), [@dprokop](https://github.com/dprokop)
-* **Postgres**: SSL certification. [#30352](https://github.com/grafana/grafana/pull/30352), [@ying-jeanne](https://github.com/ying-jeanne)
 * **Prometheus**: Add support for Exemplars. [#28057](https://github.com/grafana/grafana/pull/28057), [@zoltanbedi](https://github.com/zoltanbedi)
 * **Prometheus**: Improve autocomplete performance and remove disabling of dynamic label lookup. [#30199](https://github.com/grafana/grafana/pull/30199), [@ivanahuckova](https://github.com/ivanahuckova)
 * **Prometheus**: Update default query type option to "Both" in Explore query editor. [#28935](https://github.com/grafana/grafana/pull/28935), [@ivanahuckova](https://github.com/ivanahuckova)
@@ -570,15 +48,12 @@ The InfoBox & FeatureInfoBox are now deprecated please use the Alert component i
 * **Templating**: Custom variable edit UI, change options input into textarea. [#28322](https://github.com/grafana/grafana/pull/28322), [@darrylsepeda](https://github.com/darrylsepeda)
 * **TimeSeriesPanel**: The new graph panel now supports y-axis value mapping. [#30272](https://github.com/grafana/grafana/pull/30272), [@torkelo](https://github.com/torkelo)
 * **Tracing**: Tag spans with user login and datasource name instead of id. [#29183](https://github.com/grafana/grafana/pull/29183), [@bergquist](https://github.com/bergquist)
-* **Transformations**: Add "Rename By Regex" transformer. [#29281](https://github.com/grafana/grafana/pull/29281), [@simianhacker](https://github.com/simianhacker)
 * **Transformations**: Added new transform for excluding and including rows based on their values. [#26884](https://github.com/grafana/grafana/pull/26884), [@Totalus](https://github.com/Totalus)
-* **Transforms**: Add sort by transformer. [#30370](https://github.com/grafana/grafana/pull/30370), [@ryantxu](https://github.com/ryantxu)
 * **Variables**: Add deprecation warning for value group tags. [#30160](https://github.com/grafana/grafana/pull/30160), [@torkelo](https://github.com/torkelo)
 * **Variables**: Added __user.email to global variable. [#28853](https://github.com/grafana/grafana/pull/28853), [@mckn](https://github.com/mckn)
 * **Variables**: Adds description field. [#29332](https://github.com/grafana/grafana/pull/29332), [@hugohaggmark](https://github.com/hugohaggmark)
 * **Variables**: Adds variables inspection. [#25214](https://github.com/grafana/grafana/pull/25214), [@hugohaggmark](https://github.com/hugohaggmark)
 * **Variables**: New Variables are stored immediately. [#29178](https://github.com/grafana/grafana/pull/29178), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Zipkin**: Remove browser access mode. [#30360](https://github.com/grafana/grafana/pull/30360), [@zoltanbedi](https://github.com/zoltanbedi)

 ### Bug fixes

@@ -593,7 +68,6 @@ The InfoBox & FeatureInfoBox are now deprecated please use the Alert component i
 * **Decimals**: Improving auto decimals logic for high numbers and scaled units. [#30262](https://github.com/grafana/grafana/pull/30262), [@torkelo](https://github.com/torkelo)
 * **Elasticsearch**: Fix date histogram auto interval handling for alert queries. [#30049](https://github.com/grafana/grafana/pull/30049), [@simianhacker](https://github.com/simianhacker)
 * **Elasticsearch**: Fix index pattern not working with multiple base sections. [#28348](https://github.com/grafana/grafana/pull/28348), [@tomdaly](https://github.com/tomdaly)
-* **Explore**: Clear errors after running a new query. [#30367](https://github.com/grafana/grafana/pull/30367), [@ivanahuckova](https://github.com/ivanahuckova)
 * **Graph**: Fixes stacking issues like floating bars when data is not aligned. [#29051](https://github.com/grafana/grafana/pull/29051), [@torkelo](https://github.com/torkelo)
 * **Graph**: Staircase and null value=null calculates auto Y-Min incorrectly (fixed in new Time series panel). [#12995](https://github.com/grafana/grafana/issues/12995)
 * **Graph**: Staircase mode, do now draw line segment from zero when drawing null values as null (Fixed in new Time series panel). [#17838](https://github.com/grafana/grafana/issues/17838)
@@ -603,7 +77,6 @@ The InfoBox & FeatureInfoBox are now deprecated please use the Alert component i
 * **Logs Panel**: Fixes problem dragging scrollbar inside logs panel. [#28974](https://github.com/grafana/grafana/pull/28974), [@aocenas](https://github.com/aocenas)
 * **Loki**: Fix hiding of series in table if labels have number values. [#30185](https://github.com/grafana/grafana/pull/30185), [@ivanahuckova](https://github.com/ivanahuckova)
 * **Loki**: Lower min step to 1ms. [#30135](https://github.com/grafana/grafana/pull/30135), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Loki**: Remove showing of unique labels with the empty string value. [#30363](https://github.com/grafana/grafana/pull/30363), [@ivanahuckova](https://github.com/ivanahuckova)
 * **Loki**: Timeseries should not produce 0-values for missing data. [#30116](https://github.com/grafana/grafana/pull/30116), [@davkal](https://github.com/davkal)
 * **Plugins**: Fix panic when using complex dynamic URLs in app plugin routes. [#27977](https://github.com/grafana/grafana/pull/27977), [@cinaglia](https://github.com/cinaglia)
 * **Prometheus**: Fix link to Prometheus graph in dashboard. [#29543](https://github.com/grafana/grafana/pull/29543), [@ivanahuckova](https://github.com/ivanahuckova)
@@ -642,12 +115,10 @@ This option to group query variable values into groups by tags has been an exper

 ### Plugin development fixes & changes

-* **AngularPlugins**: Angular controller events emitter is now a separate emitter and not the same as PanelModel events emitter. [#30379](https://github.com/grafana/grafana/pull/30379), [@torkelo](https://github.com/torkelo)
 * **FieldConfig API**: Add ability to hide field option or disable it from the overrides. [#29879](https://github.com/grafana/grafana/pull/29879), [@dprokop](https://github.com/dprokop)
 * **Select**: Changes default menu placement for Select from auto to bottom. [#29837](https://github.com/grafana/grafana/pull/29837), [@hugohaggmark](https://github.com/hugohaggmark)
 * **Collapse**: Allow component children to use height: 100% styling. [#29776](https://github.com/grafana/grafana/pull/29776), [@aocenas](https://github.com/aocenas)
 * **DataSourceWithBackend**: Throw error if health check fails in DataSourceWithBackend. [#29743](https://github.com/grafana/grafana/pull/29743), [@aocenas](https://github.com/aocenas)
-* **NodeGraph**: Add node graph visualization. [#29706](https://github.com/grafana/grafana/pull/29706), [@aocenas](https://github.com/aocenas)
 * **FieldColor**: Handling color changes when switching panel types. [#28875](https://github.com/grafana/grafana/pull/28875), [@dprokop](https://github.com/dprokop)
 * **CodeEditor**: Added support for javascript language. [#28818](https://github.com/grafana/grafana/pull/28818), [@ae3e](https://github.com/ae3e)
 * **grafana/toolkit**: Allow builds with lint warnings. [#28810](https://github.com/grafana/grafana/pull/28810), [@dprokop](https://github.com/dprokop)
--- a/6
+++ b/6
@@ -1,4 +1,4 @@
-FROM node:14.15.5-alpine3.13 as js-builder
+FROM node:14.15.1-alpine3.12 as js-builder

 WORKDIR /usr/src/app/

@@ -16,7 +16,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build

-FROM golang:1.16.1-alpine3.13 as go-builder
+FROM golang:1.15.1-alpine3.12 as go-builder

 RUN apk add --no-cache gcc g++

@@ -32,7 +32,7 @@ COPY build.go package.json ./
 RUN go run build.go build

 # Final stage
-FROM alpine:3.13
+FROM alpine:3.12

 LABEL maintainer="Grafana team <hello@grafana.com>"

--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -5,7 +5,6 @@ WORKDIR /usr/src/app/
 COPY package.json yarn.lock ./
 COPY packages packages

-RUN apt-get update && apt-get install -yq git
 RUN yarn install --pure-lockfile

 COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./
--- a/8
+++ b/8
@@ -4,7 +4,7 @@

 -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 revive golangci-lint test-go test-js test run run-frontend clean devenv devenv-down revive-strict protobuf 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 revive golangci-lint tidy-check test-go test-js test run run-frontend clean devenv devenv-down revive-strict protobuf help

 GO = GO111MODULE=on go
 GO_FILES ?= ./pkg/...
@@ -95,7 +95,11 @@ golangci-lint: scripts/go/bin/golangci-lint
 		--config ./scripts/go/configs/.golangci.toml \
 		$(GO_FILES)

-lint-go: golangci-lint revive revive-strict # Run all code checks for backend.
+tidy-check:
+	@echo "check whether go.mod and go.sum are consistent"
+	@scripts/tidy-check.sh
+
+lint-go: golangci-lint revive revive-strict tidy-check # Run all code checks for backend.

 # with disabled SC1071 we are ignored some TCL,Expect `/usr/bin/env expect` scripts
 shellcheck: $(SH_FILES) ## Run checks for shell scripts.
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -69,10 +69,6 @@ socket = /tmp/grafana.sock
 # CDN Url
 cdn_url =

-# Sets the maximum time in minutes before timing out read of an incoming request and closing idle connections.
-# `0` means there is no timeout for reading the request.
-read_timeout = 0
-
 #################################### Database ############################
 [database]
 # You can configure the database connection by specifying type, host, name, user and password
@@ -105,12 +101,6 @@ log_queries =
 # For "mysql", use either "true", "false", or "skip-verify".
 ssl_mode = disable

-# Database drivers may support different transaction isolation levels.
-# Currently, only "mysql" driver supports isolation levels.
-# If the value is empty - driver's default isolation level is applied.
-# For "mysql" use "READ-UNCOMMITTED", "READ-COMMITTED", "REPEATABLE-READ" or "SERIALIZABLE".
-isolation_level =
-
 ca_cert_path =
 client_key_path =
 client_cert_path =
@@ -155,17 +145,9 @@ tls_handshake_timeout_seconds = 10
 # waiting for the server to approve.
 expect_continue_timeout_seconds = 1

-# Optionally limits the total number of connections per host, including connections in the dialing,
-# active, and idle states. On limit violation, dials will block.
-# A value of zero (0) means no limit.
-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

@@ -180,9 +162,6 @@ send_user_header = false
 # Change this option to false to disable reporting.
 reporting_enabled = true

-# The name of the distributor of the Grafana instance. Ex hosted-grafana, grafana-labs
-reporting_distributor = grafana-labs
-
 # Set to false to disable all checks to https://grafana.com
 # for new versions (grafana itself and plugins), check is used
 # in some UI views to notify that grafana or plugin update exists
@@ -318,9 +297,6 @@ password_hint = password
 # Default UI theme ("dark" or "light")
 default_theme = dark

-# Path to a custom home page. Users are only redirected to this if the default home dashboard is used. It should match a frontend route and contain a leading slash.
-home_page =
-
 # External user management
 external_manage_link_url =
 external_manage_link_name =
@@ -526,19 +502,6 @@ allow_sign_up = true
 sync_cron = "0 0 1 * * *"
 active_sync_enabled = true

-#################################### AWS ###########################
-[aws]
-# Enter a comma-separated list of allowed AWS authentication providers.
-# Options are: default (AWS SDK Default), keys (Access && secret key), credentials (Credentials field), ec2_iam_role (EC2 IAM Role)
-allowed_auth_providers = default,keys,credentials
-
-# Allow AWS users to assume a role using temporary security credentials.
-# If true, assume role will be enabled for all AWS authentication providers that are specified in aws_auth_providers
-assume_role_enabled = true
-
-# Specify max no of pages to be returned by the ListMetricPages API
-list_metrics_page_limit = 500
-
 #################################### SMTP / Emailing #####################
 [smtp]
 enabled = false
@@ -706,9 +669,6 @@ max_annotation_age =
 max_annotations_to_keep =

 #################################### Annotations #########################
-[annotations]
-# Configures the batch size for the annotation clean-up job. This setting is used for dashboard, API, and alert annotations.
-cleanupjob_batchsize = 100

 [annotations.dashboard]
 # Dashboard annotations means that annotations are associated with the dashboard they are created on.
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -70,10 +70,6 @@
 # CDN Url
 ;cdn_url =

-# Sets the maximum time using a duration format (5s/5m/5ms) before timing out read of an incoming request and closing idle connections.
-# `0` means there is no timeout for reading the request.
-;read_timeout = 0
-
 #################################### Database ####################################
 [database]
 # You can configure the database connection by specifying type, host, name, user and password
@@ -94,12 +90,6 @@
 # For "postgres" only, either "disable", "require" or "verify-full"
 ;ssl_mode = disable

-# Database drivers may support different transaction isolation levels.
-# Currently, only "mysql" driver supports isolation levels.
-# If the value is empty - driver's default isolation level is applied.
-# For "mysql" use "READ-UNCOMMITTED", "READ-COMMITTED", "REPEATABLE-READ" or "SERIALIZABLE".
-;isolation_level =
-
 ;ca_cert_path =
 ;client_key_path =
 ;client_cert_path =
@@ -161,17 +151,9 @@
 # waiting for the server to approve.
 ;expect_continue_timeout_seconds = 1

-# Optionally limits the total number of connections per host, including connections in the dialing,
-# active, and idle states. On limit violation, dials will block.
-# A value of zero (0) means no limit.
-;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

@@ -186,9 +168,6 @@
 # Change this option to false to disable reporting.
 ;reporting_enabled = true

-# The name of the distributor of the Grafana instance. Ex hosted-grafana, grafana-labs
-;reporting_distributor = grafana-labs
-
 # Set to false to disable all checks to https://grafana.net
 # for new versions (grafana itself and plugins), check is used
 # in some UI views to notify that grafana or plugin update exists
@@ -318,9 +297,6 @@
 # Default UI theme ("dark" or "light")
 ;default_theme = dark

-# Path to a custom home page. Users are only redirected to this if the default home dashboard is used. It should match a frontend route and contain a leading slash.
-; home_page =
-
 # External user management, these options affect the organization users view
 ;external_manage_link_url =
 ;external_manage_link_name =
@@ -516,16 +492,6 @@
 ;sync_cron = "0 0 1 * * *"
 ;active_sync_enabled = true

-#################################### AWS ###########################
-[aws]
-# Enter a comma-separated list of allowed AWS authentication providers.
-# Options are: default (AWS SDK Default), keys (Access && secret key), credentials (Credentials field), ec2_iam_role (EC2 IAM Role)
-; allowed_auth_providers = default,keys,credentials
-
-# Allow AWS users to assume a role using temporary security credentials.
-# If true, assume role will be enabled for all AWS authentication providers that are specified in aws_auth_providers
-; assume_role_enabled = true
-
 #################################### SMTP / Emailing ##########################
 [smtp]
 ;enabled = false
@@ -696,9 +662,6 @@
 ;max_annotations_to_keep =

 #################################### Annotations #########################
-[annotations]
-# Configures the batch size for the annotation clean-up job. This setting is used for dashboard, API, and alert annotations.
-;cleanupjob_batchsize = 100

 [annotations.dashboard]
 # Dashboard annotations means that annotations are associated with the dashboard they are created on.
--- a/contribute/create-pull-request.md
+++ b/contribute/create-pull-request.md
@@ -43,10 +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.

-### Backend-specific guidelines
-
-Please refer to the [backend style guidelines](/contribute/style-guides/backend.md).
-
 ## Code review

 Once you've created a pull request, the next step is to have someone review your change. A review is a learning opportunity for both the reviewer and the author of the pull request.
@@ -97,11 +93,3 @@ The Grafana team _squashes_ all commits into one when we accept a pull request.
 We use the pull request title when we generate change logs for releases. As such, we strive to make the title as informative as possible.

 Make sure that the title for your pull request uses the same format as the subject line in the commit message.
-
-## Configuration changes
-
-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 
--- a/contribute/developer-guide.md
+++ b/contribute/developer-guide.md
@@ -25,10 +25,6 @@ brew install node@14
 npm install -g yarn
 ```

-### Windows
-
-If you are running Grafana on Windows 10, we recommend installing the Windows Subsystem for Linux (WSL). For installation instructions, refer to the [Microsoft WSL Installation Guide](https://docs.microsoft.com/en-us/windows/wsl/install-win10).
-
 ## Download Grafana

 We recommend using the Git command-line interface to download the source code for the Grafana project:
@@ -83,7 +79,7 @@ When you log in for the first time, Grafana asks you to change your password.
 The Grafana backend includes SQLite which requires GCC to compile. So in order to compile Grafana on Windows you need to install GCC. We recommend [TDM-GCC](http://tdm-gcc.tdragon.net/download). Eventually, if you use [Scoop](https://scoop.sh), you can install GCC through that.

 You can simply build the back-end as follows: `go run build.go build`. The Grafana binaries will be in bin\\windows-amd64.
-Alternately, if you wish to use the `make` command, install [Make for Windows](http://gnuwin32.sourceforge.net/packages/make.htm) and use it in a Unix shell (f.ex. Git Bash).
+Alternately, if you wish to use the `make` command, install [Make for Windows](http://gnuwin32.sourceforge.net/packages/make.htm) and use it in a Unix shell (f.ex. Git Bash). 

 ## Test Grafana

@@ -106,7 +102,6 @@ go test -v ./pkg/...
 ```

 #### On Windows
-
 Running the backend tests on Windows currently needs some tweaking, so use the build.go script:

 ```
@@ -177,7 +172,7 @@ make devenv sources=influxdb,loki

 The script generates a Docker Compose file with the databases you specify as `sources`, and runs them in the background.

-See the repository for all the [available data sources](/devenv/docker/blocks). Note that some data sources have specific Docker images for macOS, e.g. `nginx_proxy_mac`.
+See the repository for all the [available data sources](/devenv/docker/blocks). Note that some data sources have specific Docker images for macOS, e.g. `prometheus_mac`.

 ## Build a Docker image

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

 This style guide applies to all documentation created for Grafana products.

-For information about how to write technical documentation, refer to the following resources:
+For information about how to write technical documentation, we suggest reviewing the content of the [Google Technical Writing courses](https://developers.google.com/tech-writing).

-* [Google Technical Writing courses](https://developers.google.com/tech-writing)
-* [Divio documentation system](https://documentation.divio.com/)
-* [Vue writing principles](https://v3.vuejs.org/guide/contributing/writing-guide.html#principles)
+The [Divio documentation system](https://documentation.divio.com/) site and the [Vue writing principles](https://v3.vuejs.org/guide/contributing/writing-guide.html#principles) are also good resources.

 ## Contributing

@@ -14,61 +12,60 @@ The *Documentation style guide* is a living document. Add to it whenever a style

 ## Published guides

-For all items that are not covered in this guide, refer to the [Microsoft Style Guide](https://docs.microsoft.com/en-us/style-guide/welcome/) and the [Chicago Manual of Style](https://www.chicagomanualofstyle.org/home.html).
+For all items not covered in this guide, refer to the [Microsoft Style Guide](https://docs.microsoft.com/en-us/style-guide/welcome/) and the [Chicago Manual of Style](https://www.chicagomanualofstyle.org/home.html).

 ## Spelling

-To catch common misspellings, the [codespell](https://github.com/codespell-project/codespell) tool is run for every change.
+The [codespell](https://github.com/codespell-project/codespell) tool is run for every change to catch common misspellings.

 ## Inclusive language

-Avoid using charged language.
+This section provides guidelines on how to avoid using charged language in documentation.

 ### Allowing and blocking

-When referring to _allowing_ or _blocking_ content or traffic, use a form of _allow_ or _block_:
+Don't use "whitelist" or "blacklist" when referring to allowing or blocking content or traffic.

- (noun) _allowlist_ or _blocklist_
- (verb) _allow_ or _block_
+- When used as a noun, use "allowlist" or "blocklist".
+- When used as a verb, use "allow" or "block"

 Example: _To **allow** outgoing traffic, add the IP to the **allowlist**._

-Avoid _whitelist_ or _blacklist_.
+### Leader and follower

-### Primary and secondary
+Don't use "master" or "slave" to describe relationships between nodes or processes.

-To describe relationships between nodes or processes, there are several options:
+- Use "leader", "main" or "primary," instead of "master."
+- Use "follower" or "secondary," instead of "slave."

- Use _primary_, _main_, or _parent_, instead of _master_.
- Use _secondary_, _replica_, or _child_, instead of _slave_.
+### Exceptions

-Avoid _master_ or _slave_.
+When referring to a configuration or settings used by third-party libraries och technologies outside the Grafana project, prefer the original name to avoid confusion.
+
+For example, use "master" when referring to the default Git branch.

 ## Grafana-specific style

-The following guidelines are specific to Grafana documentation. For the most part, these are *guidelines* are not rigid rules. If you have questions, ask in the #docs channel of Grafana Slack.
+The following sections provide general guidelines on topics specific to Grafana documentation. Note that for the most part, these are *guidelines*, not rigid rules. If you have questions, ask in the #docs channel of Grafana Slack.

 ### General

- Use active voice:
-  - Active: Grafana displays the heatmap visualization.
-  - Passive: The heatmap visualization is displayed.
- Write directly to the reader:
+- Use active voice. Avoid passive voice.
+  - Use active: Grafana displays the heatmap visualization.
+  - Avoid passive: The heatmap visualization is displayed.
+- Write directly to the reader.
  - Use: "After you create a dashboard, you can add a panel to it."
  - Avoid: "After you create a dashboard, it is possible to add a panel to it."
- Write in the imperative second person:
-  - "Click the panel."
-  - "Close the window."
- Write in present tense:
-  - Use: "The panel opens."
-  - Avoid: "The panel will open."
- Do not use an ampersand (&) as an abbreviation for _and_.
+- Write in the imperative second person. Examples: You can write a query. Click the panel. Close the window.
+- Write in present tense.
+  - Use: The panel opens. Grafana opens the panel.
+  - Not: The panel will open.
+- Do not use an ampersand (&) as an abbreviation for "and."
  - **Exceptions:** If an ampersand is used in the Grafana UI, then match the UI.
- Avoid using internal jargon or slang.
- Do not use two spaces after a period; use one space after a sentence.
- Remove any extra space characters at the end of a paragraph.
- Aim for your sentences to be fewer than 25 words. Instead, use smaller complete phrases or change the format, such as using a list.
- Aim for paragraphs to be three sentences or fewer. Make the text more concise, use more headings, or both.
+- Avoid using internal slang and jargon in technical documentation.
+- Do not use two spaces after a period. Only add one space after each sentence. Do not add a space at the end of the paragraph.
+- Sentence length should be 25 words or less. If your thought is longer than 25 words, consider breaking up the sentence or changing the format to a list.
+- Paragraphs should be three sentences or fewer. Break up long paragraphs.

 ### File naming conventions

@@ -147,18 +144,6 @@ The first letter of the name of an integration is always capitalized, even if th
 - Etcd Integration
 - I installed an integration on my local Grafana.

-#### Kubernetes objects
-
-Capitalize Kubernetes objects such as Job, Pod, and StatefulSet when it is clear you are specifically talking about them and not generic jobs, pods, or whatever.
-
-Introduce the object as "Kubernetes XX" on the first usage, then just the object in subsequent uses.
-
-**Example:**
-
-Create the Kubernetes Job and check the logs to retrieve the generated token:
-
-The Job requires the token be submitted as …
-
 ### Links and references

 When referencing another document, use "Refer to" rather than alternatives such as "See" or "Check out."
@@ -303,13 +288,6 @@ When referencing the Prometheus data source exporters, always use "node_exporter
 **Correct:** node_exporter, windows_exporter
 **Incorrect:** Node Exporter, node exporter, Windows Exporter, Windows exporter, windows exporter.

-#### web server
-
-Two words, not one.
-
-**Correct:** webserver
-**Incorrect:** web server
-
 ### MS SQL Server
 Always use "MS SQL" when referring to MS SQL Server application.

--- a/contribute/style-guides/styling.md
+++ b/contribute/style-guides/styling.md
@@ -27,32 +27,28 @@ const ComponentA = () => (

 To access the theme in your styles, use the `useStyles` hook. It provides basic memoization and access to the theme object.

-> Please remember to put `getStyles` function at the end of the file!
-
 ```tsx
 import React, { FC } from 'react';
 import { GrafanaTheme } from '@grafana/data';
 import { useStyles } from '@grafana/ui';
 import { css } from 'emotion';

-const Foo: FC<FooProps> = () => {
-  const styles = useStyles(getStyles);
-
-  // Use styles with classNames
-  return <div className={styles}>...</div>
-
-};
-
-const getStyles = (theme: GrafanaTheme) => css`
+const getComponentStyles = (theme: GrafanaTheme) => css`
  padding: ${theme.spacing.md};
 `;
+
+const Foo: FC<FooProps> = () => {
+  const styles = useStyles(getComponentsStyles);
+
+  // Use styles with className
+};
 ```

 ### Styling complex components

 In more complex cases, especially when you need to style multiple DOM elements in one component, or when using styles that depend on properties and/or state, you should create a helper function that returns an object of styles. This function should also be wrapped in the `stylesFactory` helper function, which will provide basic memoization.

-Let's say you need to style a component that has a different background depending on the `isActive` property :
+Let's say you need to style a component that has a different background depending on the theme:

 ```tsx
 import React from 'react';
@@ -60,26 +56,8 @@ import { css } from 'emotion';
 import { GrafanaTheme } from '@grafana/data';
 import { selectThemeVariant, stylesFactory, useTheme } from '@grafana/ui';

-interface ComponentAProps {
-  isActive: boolean
-}
-
-const ComponentA: React.FC<ComponentAProps> = ({isActive}) => {
-  const theme = useTheme();
-  const styles = getStyles(theme, isActive);
-
-  return (
-    <div className={styles.wrapper}>
-      As red as you can get
-      <i className={styles.icon} />
-    </div>
-  );
-};
-
-
-// Mind, that you can pass multiple arguments, theme included
-const getStyles = stylesFactory((theme: GrafanaTheme, isActive: boolean) => {
-  const backgroundColor = isActive ? theme.colors.red : theme.colors.blue;
+const getStyles = stylesFactory((theme: GrafanaTheme) => {
+  const backgroundColor = selectThemeVariant({ light: theme.colors.red, dark: theme.colors.blue }, theme.type);

  return {
    wrapper: css`
@@ -90,6 +68,18 @@ const getStyles = stylesFactory((theme: GrafanaTheme, isActive: boolean) => {
    `,
  };
 });
+
+const ComponentA = () => {
+  const theme = useTheme();
+  const styles = getStyles(theme);
+
+  return (
+    <div className={styles.wrapper}>
+      As red as you can get
+      <i className={styles.icon} />
+    </div>
+  );
+};
 ```

 For more information about themes at Grafana please see the [themes guide](./themes.md).
--- a/devenv/datasources.yaml
+++ b/devenv/datasources.yaml
@@ -32,19 +32,6 @@ datasources:
      timeInterval: "15s"
    secureJsonData:
      password: grafana
-  
-  - name: gdev-influxdb2
-    type: influxdb
-    access: proxy
-    url: http://localhost:8087
-    user: grafana
-    secureJsonData:
-      token: mytoken
-      password: grafana12345
-    jsonData:
-      version: Flux
-      organization: myorg
-      defaultBucket: mybucket

  - name: gdev-influxdb-telegraf
    type: influxdb
@@ -56,7 +43,7 @@ datasources:
      timeInterval: "10s"
    secureJsonData:
      password: grafana
-    
+
  - name: gdev-opentsdb
    type: opentsdb
    access: proxy
@@ -240,6 +227,20 @@ datasources:
      defaultRegion: eu-west-2
      customMetricsNamespaces: "CWAgent"

+  # Keep to test old /api/prom API
+  - name: gdev-loki-0.3
+    type: loki
+    access: proxy
+    url: http://localhost:3103
+    editable: false
+
+  # First version with new v1 API (remove once v1 is out)
+  - name: gdev-loki-0.4
+    type: loki
+    access: proxy
+    url: http://localhost:3104
+    editable: false
+
  - name: gdev-loki
    type: loki
    access: proxy
--- a/devenv/datasources_docker.yaml
+++ b/devenv/datasources_docker.yaml
@@ -34,17 +34,6 @@ datasources:
    secureJsonData:
      password: grafana

-  - name: gdev-influxdb2
-    type: influxdb
-    access: proxy
-    url: http://influxdb2:8086
-    secureJsonData:
-      token: mytoken
-    jsonData:
-      version: Flux
-      organization: myorg
-      defaultBucket: mybucket
-      
  - name: gdev-influxdb-telegraf
    type: influxdb
    access: proxy
@@ -238,6 +227,20 @@ datasources:
      authType: credentials
      defaultRegion: eu-west-2

+  # Keep to test old /api/prom API
+  - name: gdev-loki-0.3
+    type: loki
+    access: proxy
+    url: http://loki0.3:3100
+    editable: false
+
+  # First version with new v1 API (remove once v1 is out)
+  - name: gdev-loki-0.4
+    type: loki
+    access: proxy
+    url: http://loki0.4:3100
+    editable: false
+
  - name: gdev-loki
    type: loki
    access: proxy
--- a/devenv/dev-dashboards/datasource-testdata/new_features_in_v74.json
+++ b/devenv/dev-dashboards/datasource-testdata/new_features_in_v74.json
--- a/devenv/dev-dashboards/feature-templating/global-variables-and-interpolation.json
+++ b/devenv/dev-dashboards/feature-templating/global-variables-and-interpolation.json
@@ -27,14 +27,14 @@
        "overrides": []
      },
      "gridPos": {
-        "h": 18,
+        "h": 16,
        "w": 24,
        "x": 0,
        "y": 0
      },
      "id": 11,
      "options": {
-        "content": "## Global variables\n\n* `__dashboard` = `${__dashboard}`\n* `__dashboard.name` = `${__dashboard.name}`\n* `__dashboard.uid` = `${__dashboard.uid}`\n* `__org.name` = `${__org.name}`\n* `__org.id` = `${__org.id}`\n* `__user.id` = `${__user.id}`\n* `__user.login` = `${__user.login}`\n* `__user.email` = `${__user.email}`\n         \n## Formats\n\n* `Server:raw` = `${Server:raw}`\n* `Server:regex` = `${Server:regex}`\n* `Server:lucene` = `${Server:lucene}`\n* `Server:glob` = `${Server:glob}`\n* `Server:pipe` = `${Server:pipe}`\n* `Server:distributed` = `${Server:distributed}`\n* `Server:csv` = `${Server:csv}`\n* `Server:html` = `${Server:html}`\n* `Server:json` = `${Server:json}`\n* `Server:percentencode` = `${Server:percentencode}`\n* `Server:singlequote` = `${Server:singlequote}`\n* `Server:doublequote` = `${Server:doublequote}`\n* `Server:sqlstring` = `${Server:sqlstring}`\n* `Server:date` = `${Server:date}`\n* `Server:text` = `${Server:text}`\n* `Server:queryparam` = `${Server:queryparam}`\n\n",
+        "content": "## Global variables\n\n* `__dashboard` = `${__dashboard}`\n* `__dashboard.name` = `${__dashboard.name}`\n* `__dashboard.uid` = `${__dashboard.uid}`\n* `__org.name` = `${__org.name}`\n* `__org.id` = `${__org.id}`\n* `__user.id` = `${__user.id}`\n* `__user.login` = `${__user.login}`\n* `__user.email` = `${__user.email}`\n         \n## Formats\n\n* `Server:raw` = `${Server:raw}`\n* `Server:regex` = `${Server:regex}`\n* `Server:lucene` = `${Server:lucene}`\n* `Server:glob` = `${Server:glob}`\n* `Server:pipe` = `${Server:pipe}`\n* `Server:distributed` = `${Server:distributed}`\n* `Server:csv` = `${Server:csv}`\n* `Server:html` = `${Server:html}`\n* `Server:json` = `${Server:json}`\n* `Server:percentencode` = `${Server:percentencode}`\n* `Server:singlequote` = `${Server:singlequote}`\n* `Server:doublequote` = `${Server:doublequote}`\n* `Server:sqlstring` = `${Server:sqlstring}`\n* `Server:date` = `${Server:date}`\n* `Server:text` = `${Server:text}`\n\n",
        "mode": "markdown"
      },
      "pluginVersion": "7.1.0",
--- a/devenv/dev-dashboards/panel-common/linked-viz.json
+++ b/devenv/dev-dashboards/panel-common/linked-viz.json
--- a/devenv/dev-dashboards/panel-graph/graph-ng-gradient-area.json
+++ b/devenv/dev-dashboards/panel-graph/graph-ng-gradient-area.json
@@ -19,9 +19,7 @@
    {
      "icon": "external link",
      "tags": ["gdev", "graph-ng"],
-      "type": "dashboards",
-      "asDropdown": true,
-      "title": "Graph Tests"
+      "type": "dashboards"
    }
  ],
  "panels": [
--- a/devenv/dev-dashboards/panel-graph/graph-ng-hue-gradients.json
+++ b/devenv/dev-dashboards/panel-graph/graph-ng-hue-gradients.json
@@ -16,15 +16,7 @@
  "gnetId": null,
  "graphTooltip": 0,
  "id": 391,
-  "links": [
-    {
-      "icon": "external link",
-      "tags": ["gdev", "graph-ng"],
-      "type": "dashboards",
-      "asDropdown": true,
-      "title": "Graph Tests"
-    }
-  ],
+  "links": [],
  "panels": [
    {
      "datasource": null,
--- a/devenv/dev-dashboards/panel-graph/graph-ng-nulls.json
+++ b/devenv/dev-dashboards/panel-graph/graph-ng-nulls.json
@@ -19,9 +19,7 @@
    {
      "icon": "external link",
      "tags": ["gdev", "graph-ng"],
-      "type": "dashboards",
-      "asDropdown": true,
-      "title": "Graph Tests"
+      "type": "dashboards"
    }
  ],
  "panels": [
--- a/devenv/dev-dashboards/panel-graph/graph-ng-soft-limits.json
+++ b/devenv/dev-dashboards/panel-graph/graph-ng-soft-limits.json
@@ -19,9 +19,7 @@
    {
      "icon": "external link",
      "tags": ["gdev", "graph-ng"],
-      "type": "dashboards",
-      "asDropdown": true,
-      "title": "Graph Tests"
+      "type": "dashboards"
    }
  ],
  "panels": [
--- a/devenv/dev-dashboards/panel-graph/graph-ng-time.json
+++ b/devenv/dev-dashboards/panel-graph/graph-ng-time.json
@@ -1,470 +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": [
-    {
-      "icon": "external link",
-      "tags": ["gdev", "graph-ng"],
-      "type": "dashboards",
-      "asDropdown": true,
-      "title": "Graph Tests"
-    }
-  ],
-  "panels": [
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 41,
-            "gradientMode": "opacity",
-            "hideFrom": {
-              "graph": false,
-              "legend": false,
-              "tooltip": false
-            },
-            "lineInterpolation": "smooth",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": true
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 8,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "maxDataPoints": 50,
-      "options": {
-        "graph": {},
-        "legend": {
-          "calcs": [],
-          "displayMode": "hidden",
-          "placement": "bottom"
-        },
-        "tooltipOptions": {
-          "mode": "single"
-        }
-      },
-      "pluginVersion": "7.5.0-pre",
-      "timeFrom": "1s",
-      "timeShift": null,
-      "title": "Sub second range ",
-      "type": "timeseries"
-    },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 17,
-            "gradientMode": "opacity",
-            "hideFrom": {
-              "graph": false,
-              "legend": false,
-              "tooltip": false
-            },
-            "lineInterpolation": "smooth",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": true
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 8,
-        "x": 8,
-        "y": 0
-      },
-      "id": 3,
-      "maxDataPoints": 50,
-      "options": {
-        "graph": {},
-        "legend": {
-          "calcs": [],
-          "displayMode": "hidden",
-          "placement": "bottom"
-        },
-        "tooltipOptions": {
-          "mode": "single"
-        }
-      },
-      "pluginVersion": "7.5.0-pre",
-      "timeFrom": "1m",
-      "timeShift": null,
-      "title": "Sub minute range",
-      "type": "timeseries"
-    },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 30,
-            "gradientMode": "opacity",
-            "hideFrom": {
-              "graph": false,
-              "legend": false,
-              "tooltip": false
-            },
-            "lineInterpolation": "smooth",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": true
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 8,
-        "x": 16,
-        "y": 0
-      },
-      "id": 4,
-      "maxDataPoints": 50,
-      "options": {
-        "graph": {},
-        "legend": {
-          "calcs": [],
-          "displayMode": "hidden",
-          "placement": "bottom"
-        },
-        "tooltipOptions": {
-          "mode": "single"
-        }
-      },
-      "pluginVersion": "7.5.0-pre",
-      "timeFrom": "1h",
-      "timeShift": null,
-      "title": "Sub hour range",
-      "type": "timeseries"
-    },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 37,
-            "gradientMode": "opacity",
-            "hideFrom": {
-              "graph": false,
-              "legend": false,
-              "tooltip": false
-            },
-            "lineInterpolation": "smooth",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": true
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 8,
-        "x": 0,
-        "y": 9
-      },
-      "id": 5,
-      "maxDataPoints": 50,
-      "options": {
-        "graph": {},
-        "legend": {
-          "calcs": [],
-          "displayMode": "hidden",
-          "placement": "bottom"
-        },
-        "tooltipOptions": {
-          "mode": "single"
-        }
-      },
-      "pluginVersion": "7.5.0-pre",
-      "timeFrom": "1d",
-      "timeShift": null,
-      "title": "Sub day range",
-      "type": "timeseries"
-    },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 37,
-            "gradientMode": "opacity",
-            "hideFrom": {
-              "graph": false,
-              "legend": false,
-              "tooltip": false
-            },
-            "lineInterpolation": "smooth",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": true
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 8,
-        "x": 8,
-        "y": 9
-      },
-      "id": 6,
-      "maxDataPoints": 50,
-      "options": {
-        "graph": {},
-        "legend": {
-          "calcs": [],
-          "displayMode": "hidden",
-          "placement": "bottom"
-        },
-        "tooltipOptions": {
-          "mode": "single"
-        }
-      },
-      "pluginVersion": "7.5.0-pre",
-      "timeFrom": "2d",
-      "timeShift": null,
-      "title": "Last days (shows date)",
-      "type": "timeseries"
-    },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 37,
-            "gradientMode": "opacity",
-            "hideFrom": {
-              "graph": false,
-              "legend": false,
-              "tooltip": false
-            },
-            "lineInterpolation": "smooth",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": true
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 8,
-        "x": 16,
-        "y": 9
-      },
-      "id": 7,
-      "maxDataPoints": 50,
-      "options": {
-        "graph": {},
-        "legend": {
-          "calcs": [],
-          "displayMode": "hidden",
-          "placement": "bottom"
-        },
-        "tooltipOptions": {
-          "mode": "single"
-        }
-      },
-      "pluginVersion": "7.5.0-pre",
-      "timeFrom": "5y",
-      "timeShift": null,
-      "title": "Last 5 days (year only)",
-      "type": "timeseries"
-    }
-  ],
-  "schemaVersion": 27,
-  "style": "dark",
-  "tags": ["gdev", "panel-tests", "graph-ng"],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "Panel Tests - GraphNG - Time Axis",
-  "uid": "sd27_CPGz",
-  "version": 3
-}
--- a/devenv/dev-dashboards/panel-graph/graph-ng-yaxis-ticks.json
+++ b/devenv/dev-dashboards/panel-graph/graph-ng-yaxis-ticks.json
@@ -19,9 +19,7 @@
    {
      "icon": "external link",
      "tags": ["gdev", "graph-ng"],
-      "type": "dashboards",
-      "asDropdown": true,
-      "title": "Graph Tests"
+      "type": "dashboards"
    }
  ],
  "panels": [
--- a/devenv/dev-dashboards/panel-graph/graph-ng.json
+++ b/devenv/dev-dashboards/panel-graph/graph-ng.json
@@ -19,9 +19,7 @@
    {
      "icon": "external link",
      "tags": ["gdev", "graph-ng"],
-      "type": "dashboards",
-      "asDropdown": true,
-      "title": "Graph Tests"
+      "type": "dashboards"
    }
  ],
  "panels": [
--- a/devenv/dev-dashboards/panel-piechart/panel_test_piechart.json
+++ b/devenv/dev-dashboards/panel-piechart/panel_test_piechart.json
@@ -1,518 +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": 479,
-  "links": [],
-  "panels": [
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {},
-          "decimals": 1,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 14,
-        "w": 8,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "options": {
-        "displayLabels": [
-          "name"
-        ],        
-        "legend": {
-          "values": [],
-          "displayMode": "list",
-          "placement": "right"
-        },
-        "pieType": "donut",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "showLegend": true,
-        "strokeWidth": 1,
-        "text": {}
-      },
-      "pluginVersion": "7.3.0-pre",
-      "targets": [
-        {
-          "alias": "__house_locations",
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 5
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Donut name",
-      "type": "piechart"
-    },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {},
-          "decimals": 1,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 14,
-        "w": 8,
-        "x": 8,
-        "y": 0
-      },
-      "id": 11,
-      "options": {
-        "displayLabels": [
-          "name",
-          "percent"
-        ],        
-        "legend": {
-          "values": [
-            "percent"
-          ],
-          "displayMode": "list",
-          "placement": "right"
-        },
-        "pieType": "pie",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "showLegend": true,
-        "strokeWidth": 1,
-        "text": {}
-      },
-      "pluginVersion": "7.3.0-pre",
-      "targets": [
-        {
-          "alias": "__house_locations",
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 5
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Name and Percent",
-      "type": "piechart"
-    },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 14,
-        "w": 8,
-        "x": 16,
-        "y": 0
-      },
-      "id": 8,
-      "options": {
-        "displayLabels": [
-          "name"
-        ],        
-        "legend": {
-          "values": [],
-          "displayMode": "hidden",
-          "placement": "right"
-        },
-        "pieType": "pie",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "showLegend": false,
-        "strokeWidth": 1,
-        "text": {}
-      },
-      "pluginVersion": "7.3.0-pre",
-      "targets": [
-        {
-          "alias": "__server_names",
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 4
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Name & No legend",
-      "type": "piechart"
-    },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 5,
-        "x": 0,
-        "y": 14
-      },
-      "id": 3,
-      "options": {
-        "displayLabels": [
-          "percent"
-        ],      
-        "legend": {
-          "values": [
-            "percent"
-          ],
-          "displayMode": "table",
-          "placement": "bottom"
-        },
-        "pieType": "pie",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "showLegend": false,
-        "strokeWidth": 1,
-        "text": {}
-      },
-      "pluginVersion": "7.3.0-pre",
-      "targets": [
-        {
-          "alias": "__server_names",
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 4
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Percent",
-      "type": "piechart"
-    },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 5,
-        "x": 5,
-        "y": 14
-      },
-      "id": 9,
-      "options": {
-        "displayLabels": [
-          "value"
-        ],        
-        "legend": {
-          "values": [
-            "value"
-          ],
-          "displayMode": "table",
-          "placement": "bottom"
-        },
-        "pieType": "pie",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "showLegend": false,
-        "strokeWidth": 1,
-        "text": {}
-      },
-      "pluginVersion": "7.3.0-pre",
-      "targets": [
-        {
-          "alias": "__server_names",
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 4
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Value",
-      "type": "piechart"
-    },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 6,
-        "x": 10,
-        "y": 14
-      },
-      "id": 6,
-      "options": {
-        "displayLabels": [
-          "name"
-        ],        
-        "legend": {
-          "values": [],
-          "displayMode": "list",
-          "placement": "bottom"
-        },
-        "pieType": "pie",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "showLegend": false,
-        "strokeWidth": 1,
-        "text": {}
-      },
-      "pluginVersion": "7.3.0-pre",
-      "targets": [
-        {
-          "alias": "__server_names",
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 4
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Name",
-      "type": "piechart"
-    },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 8,
-        "x": 16,
-        "y": 14
-      },
-      "id": 10,
-      "options": {
-        "displayLabels": [],        
-        "legend": {
-          "values": ["percent", "value"],
-          "displayMode": "table",
-          "placement": "bottom"
-        },
-        "pieType": "pie",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "showLegend": false,
-        "strokeWidth": 1,
-        "text": {}
-      },
-      "pluginVersion": "7.3.0-pre",
-      "targets": [
-        {
-          "alias": "__server_names",
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 4
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Memory",
-      "type": "piechart"
-    }
-  ],
-  "schemaVersion": 27,
-  "style": "dark",
-  "tags": [
-    "gdev",
-    "panel-tests"
-  ],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "Panel Tests - Pie chart",
-  "uid": "lVE-2YFMz",
-  "version": 9
-}
--- a/devenv/dev-dashboards/panel-table/table_tests_new.json
+++ b/devenv/dev-dashboards/panel-table/table_tests_new.json
@@ -33,13 +33,9 @@
      "datasource": "gdev-testdata",
      "fieldConfig": {
        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
          "custom": {
            "align": "center",
-            "displayMode": "color-background",
-            "filterable": false
+            "displayMode": "color-background"
          },
          "mappings": [],
          "thresholds": {
@@ -132,7 +128,7 @@
          }
        ]
      },
-      "pluginVersion": "7.5.0-pre",
+      "pluginVersion": "7.1.0-pre",
      "targets": [
        {
          "refId": "A",
@@ -148,11 +144,7 @@
        {
          "id": "reduce",
          "options": {
-            "reducers": [
-              "max",
-              "mean",
-              "last"
-            ]
+            "reducers": ["max", "mean", "last"]
          }
        }
      ],
@@ -162,12 +154,8 @@
      "datasource": "gdev-testdata",
      "fieldConfig": {
        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
          "custom": {
-            "align": null,
-            "filterable": false
+            "align": null
          },
          "mappings": [],
          "thresholds": {
@@ -188,7 +176,7 @@
          {
            "matcher": {
              "id": "byName",
-              "options": "A"
+              "options": "Value"
            },
            "properties": [
              {
@@ -263,7 +251,7 @@
          }
        ]
      },
-      "pluginVersion": "7.5.0-pre",
+      "pluginVersion": "7.1.0-pre",
      "targets": [
        {
          "refId": "A",
@@ -299,12 +287,8 @@
      "description": "",
      "fieldConfig": {
        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
          "custom": {
-            "align": null,
-            "filterable": false
+            "align": null
          },
          "mappings": [],
          "thresholds": {
@@ -325,7 +309,7 @@
          {
            "matcher": {
              "id": "byName",
-              "options": "A"
+              "options": "Value"
            },
            "properties": [
              {
@@ -351,7 +335,7 @@
        "showHeader": true,
        "sortBy": []
      },
-      "pluginVersion": "7.5.0-pre",
+      "pluginVersion": "7.1.0-pre",
      "targets": [
        {
          "refId": "A",
@@ -403,13 +387,9 @@
      "datasource": "gdev-testdata",
      "fieldConfig": {
        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
          "custom": {
            "align": "center",
-            "displayMode": "color-text",
-            "filterable": false
+            "displayMode": "color-text"
          },
          "decimals": 2,
          "mappings": [],
@@ -479,7 +459,7 @@
      "options": {
        "showHeader": true
      },
-      "pluginVersion": "7.5.0-pre",
+      "pluginVersion": "7.1.0-pre",
      "targets": [
        {
          "alias": "S1",
@@ -521,13 +501,9 @@
      "datasource": "gdev-testdata",
      "fieldConfig": {
        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
          "custom": {
            "align": "center",
-            "displayMode": "auto",
-            "filterable": false
+            "displayMode": "auto"
          },
          "mappings": [],
          "thresholds": {
@@ -571,7 +547,7 @@
          }
        ]
      },
-      "pluginVersion": "7.5.0-pre",
+      "pluginVersion": "7.1.0-pre",
      "targets": [
        {
          "refId": "A",
@@ -606,12 +582,9 @@
      "type": "table"
    }
  ],
-  "schemaVersion": 27,
+  "schemaVersion": 25,
  "style": "dark",
-  "tags": [
-    "gdev",
-    "panel-tests"
-  ],
+  "tags": ["gdev", "panel-tests"],
  "templating": {
    "list": []
  },
@@ -620,20 +593,10 @@
    "to": "now"
  },
  "timepicker": {
-    "refresh_intervals": [
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ]
+    "refresh_intervals": ["10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
  },
  "timezone": "",
  "title": "Panel Tests - React Table",
  "uid": "U_bZIMRMk",
-  "version": 1
-}
+  "version": 17
+}
--- a/devenv/docker/blocks/influxdb2/docker-compose.yaml
+++ b/devenv/docker/blocks/influxdb2/docker-compose.yaml
@@ -1,40 +1,39 @@
-  influxdb2:
+  influxdb:
    image: quay.io/influxdb/influxdb:v2.0.3
    container_name: influxdb2
    ports:
-      - '8087:8086'
+      - '8086:8086'
    environment:
      INFLUXDB_REPORTING_DISABLED: 'true'
    volumes:
      - ./docker/blocks/influxdb2/influxdb.conf:/etc/influxdb/influxdb.conf

  # Use the influx cli to set up an influxdb instance.
-  influxdb2_cli:
+  influxdb_cli:
    links:
-      - influxdb2
+      - influxdb
    image: quay.io/influxdb/influxdb:v2.0.3
    # Use these same configurations parameters in your telegraf configuration, mytelegraf.conf.
-    entrypoint: influx setup --bucket mybucket -t mytoken -o myorg --username=grafana --password=grafana12345 --host=http://influxdb2:8086 -f
+    entrypoint: influx setup --bucket mybucket -t mytoken -o myorg --username=grafana --password=grafana12345 --host=http://influxdb:8086 -f
      # Wait for the influxd service in the influxdb container has fully bootstrapped before trying to setup an influxdb instance with the influxdb_cli service.
    restart: on-failure:10
    depends_on:
-      - influxdb2
+      - influxdb

-  fake-influxdb2-data:
+  fake-influxdb-data:
    image: grafana/fake-data-gen
    links:
-      - influxdb2
+      - influxdb
    environment:
-      FD_SERVER: influxdb2
      FD_DATASOURCE: influxdb
      FD_PORT: 8086

-  telegraf2:
+  telegraf:
    image: telegraf
    links:
-      - influxdb2
+      - influxdb
    depends_on:
-      - influxdb2_cli
+      - influxdb_cli
    volumes:
      - ./docker/blocks/influxdb2/telegraf.conf:/etc/telegraf/telegraf.conf:ro
      - /var/log:/var/log
--- a/devenv/docker/blocks/influxdb2/telegraf.conf
+++ b/devenv/docker/blocks/influxdb2/telegraf.conf
@@ -90,7 +90,7 @@
  ## urls will be written to each interval.
  # urls = ["unix:///var/run/influxdb.sock"]
  # urls = ["udp://127.0.0.1:8089"]
-  urls = ["http://influxdb2:8086"]
+  urls = ["http://influxdb:8086"]
  token = "mytoken"
  organization = "myorg"
  bucket = "mybucket"
--- a/devenv/docker/blocks/loki/config.yaml
+++ b/devenv/docker/blocks/loki/config.yaml
@@ -10,6 +10,7 @@ client:

 scrape_configs:
 - job_name: system
+  entry_parser: raw
  static_configs:
  - targets:
      - localhost
@@ -17,6 +18,7 @@ scrape_configs:
      job: varlogs
      __path__: /var/log/*log
 - job_name: grafana
+  entry_parser: raw
  static_configs:
  - targets:
      - localhost
--- a/devenv/docker/blocks/loki0.3/config.yaml
+++ b/devenv/docker/blocks/loki0.3/config.yaml
@@ -0,0 +1,27 @@
+server:
+  http_listen_port: 9080
+  grpc_listen_port: 0
+
+positions:
+  filename: /tmp/positions.yaml
+
+client:
+  url: http://loki0.3:3100/api/prom/push
+
+scrape_configs:
+  - job_name: system
+    entry_parser: raw
+    static_configs:
+      - targets:
+          - localhost
+        labels:
+          job: varlogs
+          __path__: /var/log/*log
+  - job_name: grafana
+    entry_parser: raw
+    static_configs:
+      - targets:
+          - localhost
+        labels:
+          job: grafana
+          __path__: /var/log/grafana/*log
--- a/devenv/docker/blocks/loki0.3/docker-compose.yaml
+++ b/devenv/docker/blocks/loki0.3/docker-compose.yaml
@@ -0,0 +1,15 @@
+  # datasource URL: http://localhost:3103/
+  loki0.3:
+    image: grafana/loki:v0.3.0
+    ports:
+      - "3103:3100"
+    command: -config.file=/etc/loki/local-config.yaml
+
+  promtail0.3:
+    image: grafana/promtail:v0.3.0
+    volumes:
+      - ./docker/blocks/loki0.3/config.yaml:/etc/promtail/docker-config.yaml
+      - /var/log:/var/log
+      - ../data/log:/var/log/grafana
+    command:
+      -config.file=/etc/promtail/docker-config.yaml
--- a/devenv/docker/blocks/loki0.4/config.yaml
+++ b/devenv/docker/blocks/loki0.4/config.yaml
@@ -0,0 +1,27 @@
+server:
+  http_listen_port: 9080
+  grpc_listen_port: 0
+
+positions:
+  filename: /tmp/positions.yaml
+
+client:
+  url: http://loki0.4:3100/api/prom/push
+
+scrape_configs:
+  - job_name: system
+    entry_parser: raw
+    static_configs:
+      - targets:
+          - localhost
+        labels:
+          job: varlogs
+          __path__: /var/log/*log
+  - job_name: grafana
+    entry_parser: raw
+    static_configs:
+      - targets:
+          - localhost
+        labels:
+          job: grafana
+          __path__: /var/log/grafana/*log
--- a/devenv/docker/blocks/loki0.4/docker-compose.yaml
+++ b/devenv/docker/blocks/loki0.4/docker-compose.yaml
@@ -0,0 +1,15 @@
+  # datasource URL: http://localhost:3104/
+  loki0.4:
+    image: grafana/loki:v0.4.0
+    ports:
+      - "3104:3100"
+    command: -config.file=/etc/loki/local-config.yaml
+
+  promtail0.4:
+    image: grafana/promtail:v0.4.0
+    volumes:
+      - ./docker/blocks/loki0.4/config.yaml:/etc/promtail/docker-config.yaml
+      - /var/log:/var/log
+      - ../data/log:/var/log/grafana
+    command:
+      -config.file=/etc/promtail/docker-config.yaml
--- a/devenv/docker/blocks/prometheus2/Dockerfile
+++ b/devenv/docker/blocks/prometheus2/Dockerfile
@@ -1,4 +1,4 @@
-FROM prom/prometheus:latest
+FROM prom/prometheus:v2.7.2
 ADD prometheus.yml /etc/prometheus/
 ADD recording.yml /etc/prometheus/
 ADD alert.yml /etc/prometheus/
--- a/devenv/docker/blocks/prometheus2/docker-compose.yaml
+++ b/devenv/docker/blocks/prometheus2/docker-compose.yaml
@@ -2,8 +2,6 @@
    build: docker/blocks/prometheus2
    ports:
      - "9090:9090"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"

  node_exporter:
    image: prom/node-exporter
--- a/devenv/docker/blocks/prometheus2/prometheus.yml
+++ b/devenv/docker/blocks/prometheus2/prometheus.yml
@@ -32,7 +32,7 @@ scrape_configs:

  - job_name: 'grafana'
    static_configs:
-      - targets: ['host.docker.internal:3000']
+      - targets: ['grafana:3000']

  - job_name: 'prometheus-random-data'
    static_configs:
--- a/devenv/docker/blocks/slow_proxy/Dockerfile
+++ b/devenv/docker/blocks/slow_proxy/Dockerfile
@@ -1,7 +1,7 @@

-FROM golang:latest
+FROM golang:latest 
 ADD main.go /
 WORKDIR /
-RUN GO111MODULE=off go build -o main .
+RUN go build -o main . 
 EXPOSE 3011
 ENTRYPOINT ["/main"]
--- a/devenv/docker/blocks/slow_proxy_mac/Dockerfile
+++ b/devenv/docker/blocks/slow_proxy_mac/Dockerfile
@@ -1,7 +1,7 @@

-FROM golang:latest
+FROM golang:latest 
 ADD main.go /
 WORKDIR /
-RUN GO111MODULE=off go build -o main .
+RUN go build -o main . 
 EXPOSE 3011
 ENTRYPOINT ["/main"]
--- a/devenv/docker/blocks/zipkin/docker-compose.yaml
+++ b/devenv/docker/blocks/zipkin/docker-compose.yaml
@@ -1,21 +1,5 @@
-  # Generate traffic by hitting http://localhost:8081
-  frontend-example:
-    image: ghcr.io/openzipkin/brave-example
-    entrypoint: start-frontend
-    ports:
-      - 8081:8081
-    depends_on:
-      backend-example:
-        condition: service_healthy
-      zipkin:
-        condition: service_started
-  # Serves the /api endpoint the frontend uses
-  backend-example:
-    image: ghcr.io/openzipkin/brave-example
-    entrypoint: start-backend
-    depends_on:
-      zipkin:
-        condition: service_started
+# There is no data generator for this so easiest way to get some data here is run this example app
+# https://github.com/openzipkin/zipkin-js-example/tree/master/web
  zipkin:
    image: openzipkin/zipkin:latest
    ports:
--- a/devenv/setup.sh
+++ b/devenv/setup.sh
@@ -64,7 +64,7 @@ usage() {

 main() {
 	echo -e "------------------------------------------------------------------"
-	echo -e "This script sets up provisioning for dev datasources and dashboards"
+	echo -e "This script setups provisioning for dev datasources and dashboards"
 	echo -e "------------------------------------------------------------------"
 	echo -e "\n"

--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,24 +1,14 @@
-.PHONY: docs docs-no-pull docs-test docs-local-static
+.PHONY: docs docs-no-pull docs-test

 IMAGE = grafana/grafana-docs-dev:latest
-CONTENT_PATH = /hugo/content/docs/grafana/latest
-LOCAL_STATIC_PATH = ../../website/static
-PORT = 3002:3002

 docs:
 	docker pull $(IMAGE)
-	docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE)
+	docker run -v $(shell pwd)/sources:/hugo/content/docs/grafana/latest -p 3002:3002 --rm -it $(IMAGE)

 docs-no-pull:
-	docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE)
+	docker run -v $(shell pwd)/sources:/hugo/content/docs/grafana/latest -p 3002:3002 --rm -it $(IMAGE)

 docs-test:
 	docker pull $(IMAGE)
-	docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z --rm -it $(IMAGE) /bin/bash -c 'make prod'
-
-# expects that you have grafana/website checked out in same path as the grafana repo.
-docs-local-static:
-	docker pull $(IMAGE)
-	if [ ! -d "$(LOCAL_STATIC_PATH)" ]; then echo "local path (website project) $(LOCAL_STATIC_PATH) not found"]; exit 1; fi
-	docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z \
-		-v $(shell pwd)/$(LOCAL_STATIC_PATH):/hugo/static:Z -p $(PORT) --rm -it $(IMAGE)
+	docker run -v $(shell pwd)/sources:/hugo/content/docs/grafana/latest --rm -it $(IMAGE) /bin/bash -c 'make prod'
--- a/docs/README.md
+++ b/docs/README.md
@@ -12,8 +12,6 @@ Yarn >= 1.22.4
 1. On the command line, first change to the docs folder: `cd docs`.
 1. Run `make docs`. This launches a preview of the docs website at `http://localhost:3002/docs/grafana/latest/` which will refresh automatically when changes are made to content in the `sources` directory.

-If you have the grafana/website repo checked out in the same directory as the grafana repo, then you can run `make docs-local-static` to use local assets (such as images).
-
 ---

 ## Content guidelines
--- a/docs/sources/_index.md
+++ b/docs/sources/_index.md
@@ -7,8 +7,6 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",

 # Grafana documentation

-This is documentation for the latest stable release (7.5.x) version of Grafana. For the 8.0 beta documentation, click [here](https://grafana.com/docs/grafana/next/).
-
 ## Installing Grafana

 <div class="nav-cards">
@@ -50,15 +48,11 @@ This is documentation for the latest stable release (7.5.x) version of Grafana.
        <h4>Getting started</h4>
        <p>Learn the basics of using Grafana.</p>
    </a>
-    <a href="{{< relref "basics/_index.md" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>Grafana basics</h4>
-        <p>Learn basic observability.</p>
-    </a>
    <a href="{{< relref "administration/configuration.md" >}}" class="nav-cards__item nav-cards__item--guide">
        <h4>Configure Grafana</h4>
        <p>Review the configuration and setup options.</p>
    </a>
-    <a href="{{< relref "basics/timeseries.md" >}}" class="nav-cards__item nav-cards__item--guide">
+    <a href="{{< relref "getting-started/timeseries.md" >}}" class="nav-cards__item nav-cards__item--guide">
        <h4>Intro to time series</h4>
        <p>Learn about time series data.</p>
    </a>
@@ -66,8 +60,8 @@ This is documentation for the latest stable release (7.5.x) version of Grafana.
        <h4>Provisioning</h4>
        <p>Learn how to automate your Grafana configuration.</p>
    </a>
-    <a href="{{< relref "whatsnew/whats-new-in-v7-5.md" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>What's new in v7.5</h4>
+    <a href="{{< relref "whatsnew/whats-new-in-v7-3.md" >}}" class="nav-cards__item nav-cards__item--guide">
+        <h4>What's new in v7.3</h4>
        <p>Explore the features and enhancements in the latest release.</p>
    </a>

@@ -77,51 +71,51 @@ This is documentation for the latest stable release (7.5.x) version of Grafana.

 <div class="nav-cards">
    <a href="{{< relref "datasources/graphite.md" >}}" class="nav-cards__item nav-cards__item--ds">
-      <img src="/static/img/docs/logos/icon_graphite.svg" >
+      <img src="/img/docs/logos/icon_graphite.svg" >
      <h5>Graphite</h5>
    </a>
    <a href="{{< relref "datasources/elasticsearch.md" >}}" class="nav-cards__item nav-cards__item--ds">
-      <img src="/static/img/docs/logos/icon_elasticsearch.svg" >
+      <img src="/img/docs/logos/icon_elasticsearch.svg" >
      <h5>Elasticsearch</h5>
    </a>
-    <a href="{{< relref "datasources/influxdb/_index.md" >}}" class="nav-cards__item nav-cards__item--ds">
-      <img src="/static/img/docs/logos/icon_influxdb.svg" >
+    <a href="{{< relref "datasources/influxdb.md" >}}" class="nav-cards__item nav-cards__item--ds">
+      <img src="/img/docs/logos/icon_influxdb.svg" >
      <h5>InfluxDB</h5>
    </a>
    <a href="{{< relref "datasources/prometheus.md" >}}" class="nav-cards__item nav-cards__item--ds">
-      <img src="/static/img/docs/logos/icon_prometheus.svg" >
+      <img src="/img/docs/logos/icon_prometheus.svg" >
      <h5>Prometheus</h5>
    </a>
-    <a href="{{< relref "datasources/google-cloud-monitoring/_index.md" >}}" class="nav-cards__item nav-cards__item--ds">
-      <img src="/static/img/docs/logos/icon_cloudmonitoring.svg">
+    <a href="{{< relref "datasources/cloudmonitoring.md" >}}" class="nav-cards__item nav-cards__item--ds">
+      <img src="/img/docs/logos/icon_cloudmonitoring.svg">
      <h5>Google Cloud Monitoring</h5>
    </a>
    <a href="{{< relref "datasources/cloudwatch.md" >}}" class="nav-cards__item nav-cards__item--ds">
-      <img src="/static/img/docs/logos/icon_cloudwatch.svg">
+      <img src="/img/docs/logos/icon_cloudwatch.svg">
      <h5>AWS CloudWatch</h5>
    </a>
    <a href="{{< relref "datasources/azuremonitor.md" >}}" class="nav-cards__item nav-cards__item--ds">
-      <img src="/static/img/docs/logos/icon_azure_monitor.jpg">
+      <img src="/img/docs/logos/icon_azure_monitor.jpg">
      <h5>Azure Monitor</h5>
    </a>
    <a href="{{< relref "datasources/loki.md" >}}" class="nav-cards__item nav-cards__item--ds">
-      <img src="/static/img/docs/logos/icon_loki.svg">
+      <img src="/img/docs/logos/icon_loki.svg">
      <h5>Loki</h5>
    </a>
    <a href="{{< relref "datasources/mysql.md" >}}" class="nav-cards__item nav-cards__item--ds">
-      <img src="/static/img/docs/logos/icon_mysql.png" >
+      <img src="/img/docs/logos/icon_mysql.png" >
      <h5>MySQL</h5>
    </a>
    <a href="{{< relref "datasources/postgres.md" >}}" class="nav-cards__item nav-cards__item--ds">
-      <img src="/static/img/docs/logos/icon_postgres.svg" >
+      <img src="/img/docs/logos/icon_postgres.svg" >
      <h5>Postgres</h5>
    </a>
    <a href="{{< relref "datasources/mssql.md" >}}" class="nav-cards__item nav-cards__item--ds">
-      <img src="/static/img/docs/logos/sql_server_logo.svg">
+      <img src="/img/docs/logos/sql_server_logo.svg">
      <h5>Microsoft SQL Server</h5>
    </a>
    <a href="{{< relref "datasources/opentsdb.md" >}}" class="nav-cards__item nav-cards__item--ds">
-      <img src="/static/img/docs/logos/icon_opentsdb.png" >
+      <img src="/img/docs/logos/icon_opentsdb.png" >
      <h5>OpenTSDB</h5>
    </a>
 </div>
--- a/docs/sources/administration/_index.md
+++ b/docs/sources/administration/_index.md
@@ -8,7 +8,9 @@ weight = 40

 This section includes information for Grafana administrators, team administrators, and users performing administrative tasks:

+- [Change password]({{< relref "change-your-password" >}})
 - [Change Preferences]({{< relref "preferences" >}})
 - [Configuration]({{< relref "configuration" >}})
 - [Configure Docker image]({{< relref "configure-docker" >}})
 - [Security]({{< relref "security" >}})
+
--- a/docs/sources/administration/change-home-dashboard.md
+++ b/docs/sources/administration/change-home-dashboard.md
@@ -0,0 +1,53 @@
+++
+title = "Change the default home dashboard"
+description = "How to replace the default home dashboard"
+keywords = ["grafana", "configuration", "documentation", "home"]
+weight = 100
+++
+
+# Change the default home dashboard
+
+You can change the default dashboard on the organization, team and user level. The home dashboard you set for the whole organization is the one all users will see by default. The team dashboard applies to all users assigned to the team in Grafana. The team dashboard overrides the organization dashboard settings. Personal dashboard settings override team dashboard settings.
+
+## Set the home dashboard for your organization
+
+### Set the default dashboard through preferences
+
+1. Navigate to the dashboard you want to set as the home dashboard.
+1. Star this dashboard by clicking on the star next to the dashboard title.
+1. On the left menu, hover your cursor over the **Configuration** (gear) icon and then click **Preferences**.
+1. In the **Home Dashboard** field, select the dashboard you want to use for your home dashboard. Options include all starred dashboards.
+
+### Set the default dashboard through configuration
+
+If preferences are set as described above, then they override this value.
+You can provide your own JSON file to change the home dashboard. No user will be able to update this dashboard in Grafana.
+
+#### [Optional] Convert an existing dashboard into a JSON file
+1. Navigate to your dashboard page.
+1. Click the **Share dashboard** icon next to the dashboard title.
+1. In the **Export** tab, click on **Save to file**.
+
+#### 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. Read how to update this file in the [configuration]({{< relref "./configuration.md">}}) documentation.
+```ini
+[dashboards]
+# Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json"
+default_home_dashboard_path = data/main-dashboard.json
+```
+
+## Set home dashboard for your team
+
+1. Navigate to the dashboard you want to set as the home dashboard.
+1. Star this dashboard by clicking on the star next to the dashboard title.
+1. On the left menu, hover your cursor over the **Configuration** (gear) icon and then click **Teams**.
+1. Click on the team you want to change the home dashboard for and then navigate to the **Settings** tab.
+1. In the **Home Dashboard** field, select the dashboard you want to use for your home dashboard. Options include all starred dashboards.
+
+## Set your personal home dashboard
+
+1. Navigate to the dashboard you want to set as the home dashboard.
+1. Star this dashboard by clicking on the star next to the dashboard title.
+1. On the left menu, hover your cursor over your avatar and then click **Preferences**.
+1. In the **Home Dashboard** field, select the dashboard you want to use for your home dashboard. Options include all starred dashboards.
--- a/docs/sources/manage-users/user-admin/change-your-password.md
+++ b/docs/sources/manage-users/user-admin/change-your-password.md
@@ -2,13 +2,12 @@
 title = "Change your password"
 description = "How to change your Grafana password"
 keywords = ["grafana", "password", "change", "preferences"]
-aliases = ["/docs/grafana/latest/administration/change-your-password/"]
-weight = 200
+weight = 100
 +++

 # Change your Grafana password

-You can change your Grafana password in the Change Password tab.
+You can change your password in the Change Password tab.

 > **Note:** If your Grafana instance uses an external authentication provider, then you might not be able to change your password. Contact your Grafana administrator for more information.

@@ -19,3 +18,11 @@ You can change your Grafana password in the Change Password tab.
 1. Enter your **Old password** to authorize the change.
 1. Enter your **New password** and then **Confirm password**.
 1. Click **Change Password**.
+
+## Admin user management resources
+
+Grafana admins can use the following tools:
+
+- Use the [User API]({{< relref "../http_api/user.md" >}}) to change your password programmatically or to manage users.
+- The [Manage users]({{< relref "../manage-users/_index.md" >}}) section explains how to manage users and teams.
+
--- a/docs/sources/administration/cli.md
+++ b/docs/sources/administration/cli.md
@@ -2,22 +2,30 @@
 title = "Grafana CLI"
 description = "Guide to using grafana-cli"
 keywords = ["grafana", "cli", "grafana-cli", "command line interface"]
-weight = 400
+weight = 8
 +++

 # Grafana CLI

-Grafana CLI is a small executable that is bundled with Grafana server. It can be executed on the same machine Grafana server is running on. Grafana CLI has `plugins` and `admin` commands, as well as global options.
+Grafana CLI is a small executable that is bundled with Grafana server and is supposed to be executed on the same machine Grafana server is running on.
+
+Grafana CLI has `plugins` and `admin` commands, as well as global options.

 To list all commands and options:
 ```
 grafana-cli -h
 ```
-## Invoking Grafana CLI

-To invoke Grafana CLI, add the path to the grafana binaries in your `PATH` environment variable. Alternately, if your current directory is the `bin` directory, use `./grafana-cli`. Otherwise, you can specify full path to the CLI. For example, on Linux `/usr/share/grafana/bin/grafana-cli` and on Windows `C:\Program Files\GrafanaLabs\grafana\bin\grafana-cli.exe`.
+**Linux users**
+Some commands, such as installing or removing plugins, require `sudo` in order to run.

->**Note:** Some commands, such as installing or removing plugins, require `sudo` on Linux. If you are on Windows, run Windows PowerShell as Administrator. 
+**Windows users**
+Some commands, such as installing or removing plugins, require you to run Windows PowerShell as Administrator.
+
+Before you enter commands, `cd` into the Grafana bin directory. The default path is:
+```
+cd "C:\Program Files\GrafanaLabs\grafana\bin"
+```

 ## Grafana CLI command syntax

@@ -114,7 +122,7 @@ Sets the path for the Grafana install/home path, defaults to working directory.

 **Example:**
 ```bash
-grafana-cli --homepath "/usr/share/grafana" admin reset-admin-password <new password>
+grafana-cli --homepath "c:\Program Files\grafana" admin reset-admin-password mynewpassword
 ```

 ### Override config file
@@ -194,7 +202,7 @@ If there are two flags being used to set the homepath and the config file path,
 To correct this, use the `--homepath` global option to specify the Grafana default homepath for this command:

 ```bash
-grafana-cli --homepath "/usr/share/grafana" admin reset-admin-password <new password>
+grafana-cli admin reset-admin-password --homepath "/usr/share/grafana" <new password>
 ```

 If you have not lost the admin password, we recommend that you change the user password either in the User Preferences or in the Server Admin > User tab.
--- a/docs/sources/administration/configuration.md
+++ b/docs/sources/administration/configuration.md
@@ -3,7 +3,7 @@ title = "Configuration"
 description = "Configuration documentation"
 keywords = ["grafana", "configuration", "documentation"]
 aliases = ["/docs/grafana/latest/installation/configuration/"]
-weight = 150
+weight = 300
 +++

 # Configuration
@@ -12,7 +12,7 @@ Grafana has a number of configuration options that you can specify in a `.ini` c

 > **Note:** You must restart Grafana for any configuration changes to take effect.

-To see all settings currently applied to the Grafana server, refer to [View server settings]({{< relref "view-server/view-server-settings.md" >}}).
+To see all settings currently applied to the Grafana server, refer to [View server settings]({{< relref "view-server-settings.md" >}}).

 ## Config file locations

@@ -36,7 +36,7 @@ Refer to [Configure a Grafana Docker image]({{< relref "configure-docker.md" >}}

 ### macOS

-By default, the configuration file is located at `/usr/local/etc/grafana/grafana.ini`. For a Grafana instance installed using Homebrew, edit the `grafana.ini` file directly. Otherwise, add a configuration file named `custom.ini` to the `conf` folder to override any of the settings defined in `conf/defaults.ini`.
+By default, the configuration file is located at `/usr/local/etc/grafana/grafana.ini`. To configure Grafana, add a configuration file named `custom.ini` to the `conf` folder to override any of the settings defined in `conf/defaults.ini`.

 ## Comments in .ini Files

@@ -168,7 +168,7 @@ Override log path using the command line argument `cfg:default.paths.logs`:

 ### plugins

-Directory where Grafana automatically scans and looks for plugins. For information about manually or automatically installing plugins, refer to [Install Grafana plugins]({{< relref "../plugins/installation.md" >}}).
+Directory where Grafana automatically scans and looks for plugins. Manually or automatically install any [plugins](https://grafana.com/docs/grafana/latest/plugins/installation/) here.

 **macOS:** By default, the Mac plugin location is: `/usr/local/var/lib/grafana/plugins`.

@@ -266,12 +266,7 @@ Path where the socket should be created when `protocol=socket`. Make sure that G
 Specify a full HTTP URL address to the root of your Grafana CDN assets. Grafana will add edition and version paths.

 For example, given a cdn url like `https://cdn.myserver.com` grafana will try to load a javascript file from
-`http://cdn.myserver.com/grafana-oss/7.4.0/public/build/app.<hash>.js`.
-
-### read_timeout
-
-Sets the maximum time using a duration format (5s/5m/5ms) before timing out read of an incoming request and closing idle connections.
-`0` means there is no timeout for reading the request.
+`http://cdn.myserver.com/grafana-oss/v7.4.0/public/build/app.<hash>.js`.

 <hr />

@@ -329,10 +324,6 @@ Set to `true` to log the sql calls and execution times.
 For Postgres, use either `disable`, `require` or `verify-full`.
 For MySQL, use either `true`, `false`, or `skip-verify`.

-### isolation_level
-
-Only the MySQL driver supports isolation levels in Grafana. In case the value is empty, the driver's default isolation level is applied. Available options are "READ-UNCOMMITTED", "READ-COMMITTED", "REPEATABLE-READ" or "SERIALIZABLE".
-
 ### ca_cert_path

 The path to the CA certificate to use. On many Linux systems, certs can be found in `/etc/ssl/certs`.
@@ -414,11 +405,6 @@ The length of time that Grafana will wait for a successful TLS handshake with th

 The length of time that Grafana will wait for a datasource’s first response headers after fully writing the request headers, if the request has an “Expect: 100-continue” header. A value of `0` will result in the body being sent immediately. Default is `1` second. For more details check the [Transport.ExpectContinueTimeout](https://golang.org/pkg/net/http/#Transport.ExpectContinueTimeout) documentation.

-### max_conns_per_host
-
-Optionally limits the total number of connections per host, including connections in the dialing, active, and idle states. On limit violation, dials are blocked. A value of `0` means that there are no limits. Default is `0`.
-For more details check the [Transport.MaxConnsPerHost](https://golang.org/pkg/net/http/#Transport.MaxConnsPerHost) documentation.
-
 ### max_idle_connections

 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.
@@ -531,14 +517,6 @@ Set to `true` to enable the X-Content-Type-Options response header. The X-Conten

 Set to `false` to disable the X-XSS-Protection header, which tells browsers to stop pages from loading when they detect reflected cross-site scripting (XSS) attacks. The default value is `false` until the next minor release, `6.3`.

-### content_security_policy
-
-Set to `true` to add the Content-Security-Policy header to your requests. CSP allows to control resources that the user agent can load and helps prevent XSS attacks.
-
-### content_security_policy_template
-
-Set Content Security Policy template used when adding the Content-Security-Policy header to your requests. `$NONCE` in the template includes a random nonce.
-
 <hr />

 ## [snapshots]
@@ -635,10 +613,6 @@ Text used as placeholder text on login page for password input.

 Set the default UI theme: `dark` or `light`. Default is `dark`.

-### home_page
-
-Path to a custom home page. Users are only redirected to this if the default home dashboard is used. It should match a frontend route and contain a leading slash.
-
 ### External user management

 If you manage users externally you can replace the user invite button for organizations with a link to an external site together with a description.
@@ -658,10 +632,6 @@ The duration in time a user invitation remains valid before expiring.
 This setting should be expressed as a duration. Examples: 6h (hours), 2d (days), 1w (week).
 Default is `24h` (24 hours). The minimum supported duration is `15m` (15 minutes).

-### hidden_users
-
-This is a comma-separated list of usernames. Users specified here are hidden in the Grafana UI. They are still visible to Grafana administrators and to themselves.
-
 <hr>

 ## [auth]
@@ -672,15 +642,13 @@ Grafana provides many ways to authenticate users. Refer to the Grafana [Authenti

 The cookie name for storing the auth token. Default is `grafana_session`.

-### login_maximum_inactive_lifetime_duration
+### login_maximum_inactive_lifetime_days

-The maximum lifetime (duration) an authenticated user can be inactive before being required to login at next visit. Default is 7 days (7d).
-This setting should be expressed as a duration, e.g. 5m (minutes), 6h (hours), 10d (days), 2w (weeks), 1M (month). The lifetime resets at each successful token rotation (token_rotation_interval_minutes).
+The lifetime (days) an authenticated user can be inactive before being required to log in at next visit. Default is 7 days.

-### login_maximum_lifetime_duration
+### login_maximum_lifetime_days

-The maximum lifetime (duration) an authenticated user can be logged in since login time before being required to login. Default is 30 days (30d).
-This setting should be expressed as a duration, e.g. 5m (minutes), 6h (hours), 10d (days), 2w (weeks), 1M (month).
+The maximum lifetime (days) an authenticated user can be logged in before being required to login. Default is 30 days.

 ### token_rotation_interval_minutes

@@ -790,32 +758,6 @@ Refer to [Auth proxy authentication]({{< relref "../auth/auth-proxy.md" >}}) for

 Refer to [LDAP authentication]({{< relref "../auth/ldap.md" >}}) for detailed instructions.

-## [aws]
-
-You can configure core and external AWS plugins.
-
-### allowed_auth_providers
-
-Specify what authentication providers the AWS plugins allow. For a list of allowed providers, refer to the data-source configuration page for a given plugin. If you configure a plugin by provisioning, only providers that are specified in `allowed_auth_providers` are allowed.
-
-Options: `default` (AWS SDK default), `keys` (Access and secret key), `credentials` (Credentials file), `ec2_iam_role` (EC2 IAM role)
-
-### assume_role_enabled
-
-Set to `false` to disable AWS authentication from using an assumed role with temporary security credentials. For details about assume roles, refer to the AWS API reference documentation about the [AssumeRole](https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html) operation.
-
-If this option is disabled, the **Assume Role** and the **External Id** field are removed from the AWS data source configuration page. If the plugin is configured using provisioning, it is possible to use an assumed role as long as `assume_role_enabled` is set to `true`.
-
-### list_metrics_page_limit
-
-Use the [List Metrics API](https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_ListMetrics.html) option to load metrics for custom namespaces in the CloudWatch data source. By default, the page limit is 500.
-
-<hr />
-
-## [auth.jwt]
-
-Refer to [JWT authentication]({{< relref "../auth/jwt.md" >}}) for more information.
-
 <hr />

 ## [smtp]
@@ -1110,12 +1052,6 @@ Configures max number of alert annotations that Grafana stores. Default value is

 <hr>

-## [annotations]
-
-### cleanupjob_batchsize
-
-Configures the batch size for the annotation clean-up job. This setting is used for dashboard, API, and alert annotations.
-
 ## [annotations.dashboard]

 Dashboard annotations means that annotations are associated with the dashboard they are created on.
@@ -1146,7 +1082,7 @@ Configures max number of API annotations that Grafana keeps. Default value is 0,

 ## [explore]

-For more information about this feature, refer to [Explore]({{< relref "../explore/_index.md" >}}).
+For more information about this feature, refer to [Explore]({{< relref "../explore/index.md" >}}).

 ### enabled

@@ -1154,7 +1090,7 @@ Enable or disable the Explore section. Default is `enabled`.

 ## [metrics]

-For detailed instructions, refer to [Internal Grafana metrics]({{< relref "view-server/internal-metrics.md" >}}).
+For detailed instructions, refer to [Internal Grafana metrics]({{< relref "metrics.md" >}}).

 ### enabled

@@ -1541,7 +1477,7 @@ For more information about Grafana Enterprise, refer to [Grafana Enterprise]({{<

 ### enable

-Keys of alpha features to enable, separated by space. Available alpha features are: `ngalert`
+Keys of alpha features to enable, separated by space. Available alpha features are: `transformations`,`ngalert`

 ## [date_formats]

@@ -1580,9 +1516,6 @@ Set this to `true` to have date formats automatically derived from your browser
 Used as the default time zone for user preferences. Can be either `browser` for the browser local time zone or a time zone name from the IANA Time Zone database, such as `UTC` or `Europe/Amsterdam`.

 ## [expressions]
-
 > **Note:** This feature is available in Grafana v7.4 and later versions.
-
 ### enabled
-
 Set this to `false` to disable expressions and hide them in the Grafana UI. Default is `true`.
--- a/docs/sources/administration/configure-docker.md
+++ b/docs/sources/administration/configure-docker.md
@@ -3,7 +3,7 @@ title = "Configure Grafana Docker image"
 description = "Guide for configuring the Grafana Docker image"
 keywords = ["grafana", "configuration", "documentation", "docker"]
 aliases = ["/docs/grafana/latest/installation/configure-docker/"]
-weight = 200
+weight = 400
 +++

 # Configure a Grafana Docker image
--- a/docs/sources/administration/image_rendering.md
+++ b/docs/sources/administration/image_rendering.md
@@ -2,14 +2,12 @@
 title = "Image rendering"
 description = ""
 keywords = ["grafana", "image", "rendering", "plugin"]
-weight = 300
+weight = 8
 +++

 # Image rendering

-Grafana supports automatic rendering of panels as PNG images. This allows Grafana to automatically generate images of your panels to include in [alert notifications]({{< relref "../alerting/notifications.md" >}}).
-
->**Note:** Image rendering of dashboards is not supported at this time.
+Grafana supports automatic rendering of panels and dashboards as PNG images. This allows Grafana to automatically generate images of your panels to include in [alert notifications]({{< relref "../alerting/notifications.md" >}}).

 While an image is being rendered, the PNG image is temporarily written to the file system. When the image is rendered, the PNG image is temporarily written to the `png` folder in the Grafana `data` folder.

@@ -31,7 +29,7 @@ Alert notifications can include images, but rendering many images at the same ti

 The [Grafana image renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) is a plugin that runs on the backend and handles rendering panels and dashboards as PNG images using headless Chrome.

-To install the plugin, refer to the [Grafana Image Renderer Installation instructions](https://grafana.com/grafana/plugins/grafana-image-renderer/?tab=installation).
+To install the plugin, refer to the [Grafana Image Renderer Installation instructions](https://grafana.com/grafana/plugins/grafana-image-renderer/installation).

 ## Run in custom Grafana Docker image

--- a/docs/sources/administration/jaeger-instrumentation.md
+++ b/docs/sources/administration/jaeger-instrumentation.md
@@ -2,7 +2,7 @@
 title = "Jaeger instrumentation"
 description = "Jaeger traces emitted and propagation by Grafana"
 keywords = ["grafana", "jaeger", "tracing"]
-weight = 900
+weight = 9
 +++

 # Jaeger instrumentation
--- a/docs/sources/administration/view-server/internal-metrics.md
+++ b/docs/sources/administration/view-server/internal-metrics.md
@@ -2,15 +2,14 @@
 title = "Internal Grafana metrics"
 description = "Internal metrics exposed by Grafana"
 keywords = ["grafana", "metrics", "internal metrics"]
-aliases = ["/docs/grafana/latest/admin/metrics/"]
-weight = 200
+weight = 8
 +++

 # Internal Grafana metrics

 Grafana collects some metrics about itself internally. Grafana supports pushing metrics to Graphite or exposing them to be scraped by Prometheus.

-For more information about configuration options related to Grafana metrics, refer to [metrics]({{< relref "../../administration/configuration/#metrics" >}}) and [metrics.graphite]({{< relref "../../administration/configuration/#metrics-graphite" >}}) in [Configuration]({{< relref "../../administration/configuration.md" >}}).
+For more information about configuration options related to Grafana metrics, refer to [metrics]({{< relref "../administration/configuration/#metrics" >}}) and [metrics.graphite]({{< relref "../administration/configuration/#metrics-graphite" >}}) in [Configuration]({{< relref "../administration/configuration.md" >}}).

 ## Available metrics

--- a/docs/sources/manage-users/user-admin/user-profile.md
+++ b/docs/sources/manage-users/user-admin/user-profile.md
@@ -1,14 +1,15 @@
 +++
-title = "User account profile"
-description = "View and edit your Grafana user profile"
-weight = 100
+title = "Change your preferences"
+description = "How to change your Grafana preferences"
+keywords = ["grafana", "profile", "change", "preferences"]
+weight = 200
 +++

-# Grafana user account profile
+# Change your Grafana preferences

-You can edit and view important information about your Grafana user account, including your assigned organizations, your sessions, and the information associated with your account.
+You can perform several tasks in the Preferences tab. You can edit your profile, change your Grafana preferences, and view information about your profile and Grafana usage.

-## Edit your profile
+## Edit your Grafana profile

 Your profile includes your name, user name, and email address.

@@ -19,6 +20,19 @@ Your profile includes your name, user name, and email address.
   - **Username -** Edit this field to change your user name.
 1. Click **Save**.

+## Edit your Grafana preferences
+
+Your Grafana preferences include whether uses the dark or light theme, your home dashboard, and your timezone.
+
+> **Note:** Settings on your personal instance override settings made by your administrator at the instance or team level.
+
+1. Navigate to the Preferences tab. Hover your cursor over your user icon in the lower left corner of the screen, and then click **Preferences.**
+1. In the Preferences section, you can edit any of the following:
+   - **UI Theme -** Click to set the **Dark** or **Light** to select a theme. **Default** is either the dark theme or the theme selected by your Grafana administrator.
+   - **Home Dashboard -** Refer to [Set your personal home dashboard]({{< relref "change-home-dashboard.md#set-your-personal-home-dashboard" >}}) for more information.
+   - **Timezone -** Click to select an option in the **Timezone** list. **Default** is either the browser local timezone or the timezone selected by your Grafana administrator. Refer to [Time range controls]({{< relref "../dashboards/time-range-controls.md" >}}) for more information about Grafana time settings.
+1. Click **Save**.
+
 ## View your assigned organizations

 Every user is a member of at least one organization. You can have different roles in every organization that you are a member of.
@@ -26,8 +40,8 @@ Every user is a member of at least one organization. You can have different role
 1. Navigate to the Preferences tab. Hover your cursor over your user icon in the lower left corner of the screen, and then click **Preferences.**
 1. Scroll down to the Organizations section.
   - **Name -** The name of the organizations you are a member of in that Grafana instance.
-   - **Role -** The role you are assigned in the organization. Refer to [Organization roles]({{< relref "../../permissions/organization_roles.md" >}}) about permissions assigned to each role.
-   - **Current -** Grafana tags the organization that you are currently signed in to as _Current_. If you are part of multiple organizations, then you can click **Select** to switch to that organization.
+   - **Role -** The role you are assigned in the organization. Refer to [Organization roles]({{< relref "../permissions/organization_roles.md" >}}) about permissions assigned to each role.
+   - **Current -** Grafana tags the organization that you are currently signed in to as _Current_.

 ## View your Grafana sessions

@@ -39,4 +53,4 @@ Grafana logs your sessions in each Grafana instance. You can review this section
   - **Logged on -** The date you logged on to the current Grafana instance.
   - **IP address -** The IP address that you logged on from.
   - **Browser & OS -** The web browser and operating system used to log on to Grafana.
-   - If you are a Grafana Admin for the instance, then you can revoke a session by clicking the red signout icon in the session row.
+   - If you are a Grafana Admin for the instance, then you can revoke a session by clicking the red signout icon in the session row.
--- a/docs/sources/administration/preferences/_index.md
+++ b/docs/sources/administration/preferences/_index.md
@@ -1,20 +0,0 @@
-+++
-title = "Preferences"
-aliases =["/docs/grafana/latest/administration/preferences.md"]
-weight = 50
-+++
-
-# Grafana preferences
-
-Grafana preferences are basic settings. They control the Grafana UI theme, home dashboard, time zone, and so on.
-
-Preferences are sometimes confusing because they can be set at four different levels, listed from highest level to lowest:
-
- **Server -** Affects all users on the Grafana server. Set by a [Grafana Server Admin]({{< relref "../../permissions/_index.md#grafana-server-admin-role" >}}).
- **Organization -** Affects all users in an organization. Set by an [Organization Admin]({{< relref "../../permissions/organization_roles.md#organization-admin-role" >}}).
- **Team -** Affects all users assigned to a team. Set by an Organization Admin or Team Admin. To learn more about these roles, refer to [Organization roles]({{< relref "../../permissions/organization_roles.md" >}}).
- **User account -** Affects the individual user. Set by the user on their own account.
-
-The lowest level always takes precedence. For example, if a user sets their theme to **Light**, then their visualization of Grafana displays the light theme. Nothing at any higher level can override that.
-
-If the user is aware of the change and intended it, then that's great! But if the user is a Server Admin who made the change to their user preferences a long time ago, they might have forgotten they did that. Then, if that Server Admin is trying to change the theme at the server level, they'll get frustrated as none of their changes have any effect that they can see. (Also, the users on the server might be confused, because _they_ can see the server-level changes!)
--- a/docs/sources/administration/preferences/change-grafana-name.md
+++ b/docs/sources/administration/preferences/change-grafana-name.md
@@ -1,53 +0,0 @@
-+++
-title = "Change name and email"
-keywords = ["grafana", "configuration", "documentation", "home"]
-weight = 100
-+++
-
-# Change Grafana name and email
-
-In Grafana, you can change your names and emails associated with groups or accounts in the Settings or Preferences. This topic provides instructions for each task.
-
-{{< docs/shared "preferences/some-tasks-require-permissions.md" >}}
-
-## Change organization name
-
-Grafana server administrators and organization administrators can change organization names.
-
-### Grafana Server Admin change organization name
-
-Follow these instructions if you are a Grafana Server Admin.
-
-{{< docs/list >}}
-{{< docs/shared "manage-users/view-server-org-list.md" >}}
-1. In the organization list, click the name of the organization that you want to change.
-1. In **Name**, enter the new organization name.
-1. Click **Update**.
-{{< /docs/list >}}
-
-### Organization Admin change organization name
-
-If you are an Organization Admin, follow these steps:
-
-{{< docs/list >}}
-{{< docs/shared "preferences/org-preferences-list.md" >}}
-1. In **Organization name**, enter the new name.
-1. Click **Update organization name**.
-{{< /docs/list >}}
-
-## Change team name or email
-
-Organization administrators and team administrators can change team names and email addresses.
-To change the team name or email, follow these steps:
-1. Hover your cursor over the **Configuration** (gear) icon in the side menu.
-1. Click **Teams**. Grafana displays the team list.
-1. In the team list, click the name of the team that you want to change.
-1. Click the **Settings** tab.
-1. In the Team Settings section, you can edit the following:
-   - **Name -** Edit this field to change the display name associated with the team.
-   - **Email -** Edit this field to change the email address associated with the team.
-1. Click **Update**.
-
-## Change user name or email
-
-To learn how to edit your user information, refer to [Grafana user account profile]({{< relref "../../manage-users/user-admin/user-profile.md" >}}).
--- a/docs/sources/administration/preferences/change-grafana-theme.md
+++ b/docs/sources/administration/preferences/change-grafana-theme.md
@@ -1,66 +0,0 @@
-+++
-title = "Change UI theme"
-description = "How to set the Grafana UI theme"
-keywords = ["grafana", "configuration", "documentation", "home"]
-weight = 200
-+++
-
-# Change Grafana UI theme
-
-In Grafana, you can modify the UI theme configured in the Settings or Preferences. Set the UI theme for the server, an organization, a team, or your personal user account using the instructions in this topic.
-
-{{< docs/shared "preferences/some-tasks-require-permissions.md" >}}
-
-## Theme options
-
-The theme affects how Grafana displays graphs, menus, other UI elements.
-
-### Default
-
-**Default** is either the dark theme or the theme selected in a higher level. For example, if an Organization administrator set the **Light** theme, then that is the default for all the teams in that organization.
-
-### Dark
-
-Here is an example of the dark theme.
-
-![Dark theme example](/static/img/docs/preferences/dark-theme-7-4.png)
-
-### Light
-
-Here is an example of the light theme.
-
-![Light theme example](/static/img/docs/preferences/light-theme-7-4.png)
-
-## Change server UI theme
-
-Grafana server administrators can change the Grafana UI theme for all users on the server by setting the [default_theme]({{< relref "../configuration.md#default-theme" >}}) option in the Grafana configuration file.
-
-To see what the current settings are, refer to [View server settings]({{< relref "../view-server/view-server-settings.md" >}}).
-
-## Change organization UI theme
-
-Organization administrators can change the UI theme for all users in an organization.
-
-{{< docs/list >}}
-{{< docs/shared "preferences/org-preferences-list.md" >}}
-{{< docs/shared "preferences/select-ui-theme-list.md" >}}
-{{< /docs/list >}}
-
-## Change team UI theme
-
-Organization and team administrators can change the UI theme for all users in a team.
-
-{{< docs/list >}}
-{{< docs/shared "manage-users/view-team-list.md" >}}
-1. Click on the team that you want to change the UI theme for and then navigate to the **Settings** tab.
-{{< docs/shared "preferences/select-ui-theme-list.md" >}}
-{{< /docs/list >}}
-
-## Change your personal UI theme
-
-You can change the UI theme for your user account. This setting overrides UI theme settings at higher levels.
-
-{{< docs/list >}}
-{{< docs/shared "preferences/navigate-user-preferences-list.md" >}}
-{{< docs/shared "preferences/select-ui-theme-list.md" >}}
-{{< /docs/list >}}
--- a/docs/sources/administration/preferences/change-grafana-timezone.md
+++ b/docs/sources/administration/preferences/change-grafana-timezone.md
@@ -1,44 +0,0 @@
-+++
-title = "Change default timezone"
-description = "How to change your Grafana timezone"
-keywords = ["grafana", "configuration", "documentation", "home"]
-weight = 400
-+++
-
-# Change the Grafana default timezone
-
-By default, Grafana uses the timezone in your web browser. However, you can override this setting at the server, organization, team, or individual user level. This topic provides instructions for each task.
-
-{{< docs/shared "preferences/some-tasks-require-permissions.md" >}}
-
-## Set server timezone
-
-Grafana server administrators can choose a default timezone for all users on the server by setting the [default_timezone]({{< relref "../configuration.md#default-timezone" >}}) option in the Grafana configuration file.
-
-## Set organization timezone
-
-Organization administrators can choose a default timezone for their organization.
-
-{{< docs/list >}}
-{{< docs/shared "preferences/org-preferences-list.md" >}}
-{{< docs/shared "preferences/select-timezone-list.md" >}}
-{{< /docs/list >}}
-
-## Set team timezone
-
-Organization administrators and team administrators can choose a default timezone for all users in a team.
-
-{{< docs/list >}}
-{{< docs/shared "manage-users/view-team-list.md" >}}
-1. Click on the team you that you want to change the timezone for and then navigate to the **Settings** tab.
-{{< docs/shared "preferences/select-timezone-list.md" >}}
-{{< /docs/list >}}
-
-## Set your personal timezone
-
-You can change the timezone for your user account. This setting overrides timezone settings at higher levels.
-
-{{< docs/list >}}
-{{< docs/shared "preferences/navigate-user-preferences-list.md" >}}
-{{< docs/shared "preferences/select-timezone-list.md" >}}
-{{< /docs/list >}}
--- a/docs/sources/administration/preferences/change-home-dashboard.md
+++ b/docs/sources/administration/preferences/change-home-dashboard.md
@@ -1,72 +0,0 @@
-+++
-title = "Change home dashboard"
-description = "How to replace the default home dashboard"
-keywords = ["grafana", "configuration", "documentation", "home"]
-aliases = ["/docs/grafana/latest/administration/change-home-dashboard/"]
-weight = 300
-+++
-
-# Change the default home dashboard
-
-The home dashboard you set is the one all users will see by default when they log in. You can set the home dashboard for the server, an organization, a team, or your personal user account. This topic provides instructions for each task.
-
-{{< docs/shared "preferences/some-tasks-require-permissions.md" >}}
-
-## Navigate to the home dashboard
-
-The home dashboard is the first dashboard a user sees when they sign in to Grafana. You can also navigate to the home dashboard manually.
-
-1. Hover your cursor over the **Dashboards** (four squares) icon.
-1. Click **Home**.
-
-## Set the home dashboard for the server
-
-Users with the Grafana Server Admin flag on their account or access to the configuration file can define a JSON file to use as the home dashboard for all users on the server.
-
-### [Optional] Convert an existing dashboard into a JSON file
-
-1. Navigate to the page of the dashboard you want to use as the home dashboard.
-1. Click the **Share dashboard** icon next to the dashboard title.
-1. In the Export tab, click **Save to file**. Grafana converts the dashboard to a JSON file and saves it locally.
-
-### 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">}}) for more information about modifying the Grafana configuration files.
-
-```ini
-[dashboards]
-# Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json"
-default_home_dashboard_path = data/main-dashboard.json
-```
-
-## Set the home dashboard for your organization
-
-Organization administrators can choose a home dashboard for their organization.
-
-{{< docs/list >}}
-{{< docs/shared "preferences/navigate-to-the-dashboard-list.md" >}}
-{{< docs/shared "preferences/org-preferences-list.md" >}}
-{{< docs/shared "preferences/select-home-dashboard-list.md" >}}
-{{< /docs/list >}}
-
-## Set home dashboard for your team
-
-Organization administrators and Team Admins can choose a home dashboard for a team.
-
-{{< docs/list >}}
-{{< docs/shared "preferences/navigate-to-the-dashboard-list.md" >}}
-{{< docs/shared "manage-users/view-team-list.md" >}}
-1. Click on the team that you want to change the home dashboard for and then navigate to the **Settings** tab.
-{{< docs/shared "preferences/select-home-dashboard-list.md" >}}
-{{< /docs/list >}}
-
-## Set your personal home dashboard
-
-You can choose your own personal home dashboard. This setting overrides all home dashboards set at higher levels.
-
-{{< docs/list >}}
-{{< docs/shared "preferences/navigate-to-the-dashboard-list.md" >}}
-{{< docs/shared "preferences/navigate-user-preferences-list.md" >}}
-{{< docs/shared "preferences/select-home-dashboard-list.md" >}}
-{{< /docs/list >}}
--- a/docs/sources/administration/provisioning.md
+++ b/docs/sources/administration/provisioning.md
@@ -3,7 +3,7 @@ title = "Provisioning"
 description = ""
 keywords = ["grafana", "provisioning"]
 aliases = ["/docs/grafana/latest/installation/provisioning"]
-weight = 800
+weight = 8
 +++

 # Provisioning Grafana
@@ -147,24 +147,21 @@ Since not all datasources have the same configuration settings we only have the
 | tlsAuthWithCACert       | boolean | _All_                                                            | Enable TLS authentication using CA cert                                                     |
 | tlsSkipVerify           | boolean | _All_                                                            | Controls whether a client verifies the server's certificate chain and host name.            |
 | serverName              | string  | _All_                                                            | Optional. Controls the server name used for certificate common name/subject alternative name verification. Defaults to using the data source URL. |
-| timeout                 | string  | _All_                                                            | Request timeout in seconds. Overrides dataproxy.timeout option                              |
 | graphiteVersion         | string  | Graphite                                                         | Graphite version                                                                            |
-| timeInterval            | string  | Prometheus, Elasticsearch, InfluxDB, MySQL, PostgreSQL and MSSQL | Lowest interval/step value that should be used for this data source.                        |
+| timeInterval            | string  | Prometheus, Elasticsearch, InfluxDB, MySQL, PostgreSQL and MSSQL | Lowest interval/step value that should be used for this data source.                         |
 | httpMode                | string  | Influxdb                                                         | HTTP Method. 'GET', 'POST', defaults to GET                                                 |
-| maxSeries               | number  | Influxdb                                                         | Max number of series/tables that Grafana processes                                          |
 | httpMethod              | string  | Prometheus                                                       | HTTP Method. 'GET', 'POST', defaults to GET                                                 |
-| customQueryParameters   | string  | Prometheus                                                       | Query parameters to add, as a URL-encoded string.                                                 |
 | esVersion               | number  | Elasticsearch                                                    | Elasticsearch version as a number (2/5/56/60/70)                                            |
 | timeField               | string  | Elasticsearch                                                    | Which field that should be used as timestamp                                                |
 | interval                | string  | Elasticsearch                                                    | Index date time format. nil(No Pattern), 'Hourly', 'Daily', 'Weekly', 'Monthly' or 'Yearly' |
 | logMessageField         | string  | Elasticsearch                                                    | Which field should be used as the log message                                               |
 | logLevelField           | string  | Elasticsearch                                                    | Which field should be used to indicate the priority of the log message                      |
-| sigV4Auth               | boolean | Elasticsearch and Prometheus                                     | Enable usage of SigV4                                                                       |
-| sigV4AuthType           | string  | Elasticsearch and Prometheus                                     | SigV4 auth provider. default/credentials/keys                                               |
-| sigV4ExternalId         | string  | Elasticsearch and Prometheus                                     | Optional SigV4 External ID                                                                  |
-| sigV4AssumeRoleArn      | string  | Elasticsearch and Prometheus                                     | Optional SigV4 ARN role to assume                                                           |
-| sigV4Region             | string  | Elasticsearch and Prometheus                                     | SigV4 AWS region                                                                            |
-| sigV4Profile            | string  | Elasticsearch and Prometheus                                     | Optional SigV4  credentials profile                                                         |
+| sigV4Auth               | boolean | Elasticsearch                                                    | Enable usage of SigV4                                                                       |
+| sigV4AuthType           | string  | Elasticsearch                                                    | SigV4 auth provider. default/credentials/keys                                               |
+| sigV4ExternalId         | string  | Elasticsearch                                                    | Optional SigV4 External ID                                                                  |
+| sigV4AssumeRoleArn      | string  | Elasticsearch                                                    | Optional SigV4 ARN role to assume                                                           |
+| sigV4Region             | string  | Elasticsearch                                                    | SigV4 AWS region                                                                            |
+| sigV4Profile            | string  | Elasticsearch                                                    | Optional SigV4  credentials profile                                                         |
 | authType                | string  | Cloudwatch                                                       | Auth provider. default/credentials/keys                                                     |
 | externalId              | string  | Cloudwatch                                                       | Optional External ID                                                                        |
 | assumeRoleArn           | string  | Cloudwatch                                                       | Optional ARN role to assume                                                                 |
@@ -174,7 +171,6 @@ Since not all datasources have the same configuration settings we only have the
 | tsdbVersion             | string  | OpenTSDB                                                         | Version                                                                                     |
 | tsdbResolution          | string  | OpenTSDB                                                         | Resolution                                                                                  |
 | sslmode                 | string  | PostgreSQL                                                       | SSLmode. 'disable', 'require', 'verify-ca' or 'verify-full'                                 |
-| tlsConfigurationMethod  | string  | PostgreSQL                                        | SSL Certificate configuration, either by 'file-path' or 'file-content'                       |
 | sslRootCertFile         | string  | PostgreSQL                                                       | SSL server root certificate file, must be readable by the Grafana user                      |
 | sslCertFile             | string  | PostgreSQL                                                       | SSL client certificate file, must be readable by the Grafana user                           |
 | sslKeyFile              | string  | PostgreSQL                                                       | SSL client key file, must be readable by _only_ the Grafana user                            |
@@ -200,8 +196,8 @@ Secure json data is a map of settings that will be encrypted with [secret key]({
 | basicAuthPassword | string | _All_      | password for basic authentication       |
 | accessKey         | string | Cloudwatch | Access key for connecting to Cloudwatch |
 | secretKey         | string | Cloudwatch | Secret key for connecting to Cloudwatch |
-| sigV4AccessKey    | string | Elasticsearch and Prometheus | SigV4 access key. Required when using keys auth provider |
-| sigV4SecretKey    | string | Elasticsearch and Prometheus | SigV4 secret key. Required when using keys auth provider |
+| sigV4AccessKey    | string | Elasticsearch | SigV4 access key. Required when using keys auth provider |
+| sigV4SecretKey    | string | Elasticsearch | SigV4 secret key. Required when using keys auth provider |

 #### Custom HTTP headers for datasources

@@ -305,13 +301,13 @@ Grafana offers options to export the JSON definition of a dashboard. Either `Cop

 Note: The JSON definition in the input field when using `Copy JSON to Clipboard` or `Save JSON to file` will have the `id` field automatically removed to aid the provisioning workflow.

-{{< figure src="/static/img/docs/v51/provisioning_cannot_save_dashboard.png" max-width="500px" class="docs-image--no-shadow" >}}
+{{< docs-imagebox img="/img/docs/v51/provisioning_cannot_save_dashboard.png" max-width="500px" class="docs-image--no-shadow" >}}

 ### Reusable Dashboard URLs

-If the dashboard in the JSON file contains an [UID]({{< relref "../dashboards/json-model.md" >}}), Grafana forces insert/update on that UID. This allows you to migrate dashboards between Grafana instances and provisioning Grafana from configuration without breaking the URLs given because the new dashboard URL uses the UID as identifier.
-When Grafana starts, it updates/inserts all dashboards available in the configured folders. If you modify the file, then the dashboard is also updated.
-By default, Grafana deletes dashboards in the database if the file is removed. You can disable this behavior using the `disableDeletion` setting.
+If the dashboard in the json file contains an [uid](/reference/dashboard/#json-fields), Grafana will force insert/update on that uid. This allows you to migrate dashboards between Grafana instances and provisioning Grafana from configuration without breaking the URLs given since the new dashboard URL uses the uid as identifier.
+When Grafana starts, it will update/insert all dashboards available in the configured folders. If you modify the file, the dashboard will also be updated.
+By default, Grafana will delete dashboards in the database if the file is removed. You can disable this behavior using the `disableDeletion` setting.

 > **Note:** Provisioning allows you to overwrite existing dashboards
 > which leads to problems if you re-use settings that are supposed to be unique.
@@ -425,17 +421,13 @@ The following sections detail the supported settings and secure settings for eac

 #### Alert notification `pushover`

-| Name       | Secure setting |
-| --------   | -------------- |
-| apiToken   | yes            |
-| userKey    | yes            |
-| device     |                |
-| priority   |                |
-| okPriority |                |
-| retry      |                |
-| expire     |                |
-| sound      |                |
-| okSound    |                |
+| Name     | Secure setting |
+| -------- | -------------- |
+| apiToken | yes            |
+| userKey  | yes            |
+| device   |                |
+| retry    |                |
+| expire   |                |

 #### Alert notification `slack`

@@ -543,7 +535,6 @@ The following sections detail the supported settings and secure settings for eac
 | apiUrl           |                |
 | autoClose        |                |
 | overridePriority |                |
-| sendTagsAs       |                |

 #### Alert notification `telegram`

--- a/docs/sources/administration/security.md
+++ b/docs/sources/administration/security.md
@@ -36,11 +36,3 @@ To address this vulnerability, you can restrict data source query access in the

 - Create multiple data sources with some restrictions added in data source configuration that restrict access (like database name or credentials). Then use the [Data Source Permissions]({{< relref "../permissions/datasource_permissions.md" >}}) Enterprise feature to restrict user access to the data source in Grafana.
 - Create a separate Grafana organization, and in that organization, create a separate data source. Make sure the data source has some option/user/credentials setting that limits access to a subset of the data. Not all data sources have an option to limit access.
-
-## Implications of enabling anonymous access to dashboards
-
-When you enable anonymous access to a dashboard, it is publicly available. This section lists the security implications of enabling Anonymous access.
-
- Anyone with the URL can access the dashboard. 
- Anyone can make view calls to the API and list all folders, dashboards, and data sources.
- Anyone can make arbitrary queries to any data source that the Grafana instance is configured with.
--- a/docs/sources/administration/set-up-for-high-availability.md
+++ b/docs/sources/administration/set-up-for-high-availability.md
@@ -11,7 +11,7 @@ Setting up Grafana for high availability is fairly simple. You just need a share
 and other persistent data. So the default embedded SQLite database will not work, you will have to switch to MySQL or Postgres.

 <div class="text-center">
-  <img src="/static/img/docs/tutorials/grafana-high-availability.png"  max-width= "800px" class="center" />
+  <img src="/img/docs/tutorials/grafana-high-availability.png"  max-width= "800px" class="center" />
 </div>

 ## Configure multiple servers to use the same database
@@ -22,8 +22,26 @@ Grafana will now persist all long term data in the database. How to configure th

 ## Alerting

-Currently alerting supports a limited form of high availability. [Alert notifications]({{< relref "../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.
+Currently alerting supports a limited form of high availability. Since v4.2.0, [alert notifications](https://grafana.com/docs/grafana/latest/alerting/notifications/) are deduped 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.

 ## 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.
+> After Grafana 6.2 you don't need to configure session storage since the database will be used by default.
+> If you want to offload the login session data from the database you can configure [remote_cache]({{< relref "../administration/configuration.md" >}}#remote-cache)
+
+The second thing to consider is how to deal with user sessions and how to configure your load balancer in front of Grafana.
+Grafana supports two ways of storing session data: locally on disk or in a database/cache-server.
+If you want to store sessions on disk you can use `sticky sessions` in your load balancer. If you prefer to store session data in a database/cache-server
+you can use any stateless routing strategy in your load balancer (ex round robin or least connections).
+
+### Sticky sessions
+Using sticky sessions, all traffic for one user will always be sent to the same server. Which means that session related data can be
+stored on disk rather than on a shared database. This is the default behavior for Grafana and if you only want multiple servers for fail over this is a good solution since it requires the least amount of work.
+
+### Stateless sessions
+You can also choose to store session data in a Redis/Memcache/Postgres/MySQL which means that the load balancer can send a user to any Grafana server without having to log in on each server. This requires a little bit more work from the operator but enables you to remove/add grafana servers without impacting the user experience.
+If you use MySQL/Postgres for session storage, you first need a table to store the session data in. More details about that in [[sessions]]({{< relref "../administration/configuration.md" >}}#session)
+
+For Grafana itself it doesn't really matter if you store the session data on disk or database/redis/memcache. But we recommend using a database/redis/memcache since it makes it easier to manage the grafana servers.
+
+
--- a/docs/sources/administration/view-server-settings.md
+++ b/docs/sources/administration/view-server-settings.md
@@ -0,0 +1,21 @@
+++
+title = "View server settings"
+description = "How to view server settings in the Grafana UI"
+keywords = ["grafana", "configuration", "server", "settings"]
+weight = 350
+++
+
+# View Grafana server settings
+
+If you are a Grafana server admin, then you can use the Settings tab to view the settings applied to your Grafana server by the [Configuration]({{< relref "configuration.md#config-file-locations" >}}) file and any environmental variables.
+
+> **Note:** Only Grafana server admins can access the **Server Admin** menu. For more information about about admin permissions, refer to [Grafana server admin]({{< relref "../permissions/_index.md" >}}).
+
+## View server settings
+
+1. Log in to your Grafana server with an account that has the Grafana Admin flag set.
+1. Hover your cursor over the **Server Admin** (shield) icon in the side menu and then click the **Settings** tab.
+
+## Available settings
+
+For a full list of server settings, refer to [Configuration]({{< relref "configuration.md" >}}).
--- a/docs/sources/administration/view-server/view-server-stats.md
+++ b/docs/sources/administration/view-server/view-server-stats.md
@@ -1,15 +1,14 @@
 +++
 title = "View server stats"
 keywords = ["grafana", "server", "statistics"]
-aliases = ["/docs/grafana/latest/admin/view-server-stats/"]
-weight = 400
+weight = 1150
 +++

 # View Grafana server stats

 If you are a Grafana server admin, then you can view useful statistics about your Grafana server in the Stats tab.

-> **Note:** Only Grafana server administrators can access the **Server Admin** menu. For more information about about administrative permissions, refer to [Grafana server admin]({{< relref "../../permissions/_index.md" >}}).
+> **Note:** Only Grafana server admins can access the **Server Admin** menu. For more information about about admin permissions, refer to [Grafana server admin]({{< relref "../permissions/_index.md" >}}).

 ## View server stats

--- a/docs/sources/administration/view-server/_index.md
+++ b/docs/sources/administration/view-server/_index.md
@@ -1,8 +0,0 @@
-+++
-title = "View server"
-weight = 100
-+++
-
-# View server information
-
-This setting contains information about tools that Grafana Server Admins can use to learn more about their Grafana servers.
--- a/docs/sources/administration/view-server/view-server-settings.md
+++ b/docs/sources/administration/view-server/view-server-settings.md
@@ -1,22 +0,0 @@
-+++
-title = "View server settings"
-description = "How to view server settings in the Grafana UI"
-keywords = ["grafana", "configuration", "server", "settings"]
-aliases = ["/docs/grafana/latest/admin/view-server-settings/"]
-weight = 300
-+++
-
-# View Grafana server settings
-
-If you are a Grafana server administrator, use the Settings tab to view the settings that are applied to your Grafana server via the [Configuration]({{< relref "../configuration.md#config-file-locations" >}}) file and any environmental variables.
-
-> **Note:** Only Grafana server administrators can access the **Server Admin** menu. For more information about about administrative permissions, refer to [Grafana server admin]({{< relref "../../permissions/_index.md" >}}).
-
-## View server settings
-
-1. Log in to your Grafana server with an account that has the Grafana Admin flag set.
-1. Hover your cursor over the **Server Admin** (shield) icon in the side menu and then click the **Settings** tab.
-
-## Available settings
-
-For a full list of server settings, refer to [Configuration]({{< relref "../configuration.md" >}}).
--- a/docs/sources/alerting/_index.md
+++ b/docs/sources/alerting/_index.md
@@ -37,14 +37,12 @@ The actual notifications are configured and shared between multiple alerts.
 ## Alert execution

 Alert rules are evaluated in the Grafana backend in a scheduler and query execution engine that is part
-of core Grafana. Alert rules can query only backend data sources with alerting enabled. Such data sources are:
- builtin or developed and maintained by grafana, such as: `Graphite`, `Prometheus`, `Loki`, `InfluxDB`, `Elasticsearch`,
-`Google Cloud Monitoring`, `Cloudwatch`, `Azure Monitor`, `MySQL`, `PostgreSQL`, `MSSQL`, `OpenTSDB`, `Oracle`, and `Azure Data Explorer`
- any community backend data sources with alerting enabled (`backend` and `alerting` properties are set in the [plugin.json]({{< relref "../developers/plugins/metadata.md" >}}))
+of core Grafana. Only some data sources are supported right now. They include `Graphite`, `Prometheus`, `InfluxDB`, `Elasticsearch`,
+`Google Cloud Monitoring`, `Cloudwatch`, `Azure Monitor`, `MySQL`, `PostgreSQL`, `MSSQL`, `OpenTSDB`, `Oracle`, and `Azure Data Explorer`.

 ## Metrics from the alert engine

-The alert engine publishes some internal metrics about itself. You can read more about how Grafana publishes [internal metrics]({{< relref "../administration/view-server/internal-metrics.md" >}}).
+The alert engine publishes some internal metrics about itself. You can read more about how Grafana publishes [internal metrics]({{< relref "../administration/metrics/" >}}).

 Description | Type | Metric name
 ---------- | ----------- | ----------
@@ -52,3 +50,4 @@ Total number of alerts | counter | `alerting.active_alerts`
 Alert execution result | counter | `alerting.result`
 Notifications sent counter | counter | `alerting.notifications_sent`
 Alert execution timer | timer | `alerting.execution_time`
+
--- a/docs/sources/alerting/add-notification-template.md
+++ b/docs/sources/alerting/add-notification-template.md
@@ -17,7 +17,7 @@ This topic explains how you can use alert query labels in alert notifications.
 1. Navigate to the panel you want to add or edit an alert rule for.
 1. Click on the panel title, and then click **Edit**.
 1. On the Alert tab, click **Create Alert**. If an alert already exists for this panel, then you can edit the alert directly.
-1. Refer to the alert query labels in the alert rule name and/or alert notification message field by using the `${Label}` syntax.
+1. Refer to the alert query labels in the alert rule name and/or alert notification message field by using the `${Label}` syntax.    
 1. Click **Save** in the upper right corner to save the alert rule and the dashboard.

-![Alerting notification template](/static/img/docs/alerting/alert-notification-template-7-4.png)
+![Alerting notification template](/img/docs/alerting/notification_template.png)
--- a/docs/sources/alerting/create-alerts.md
+++ b/docs/sources/alerting/create-alerts.md
@@ -9,7 +9,7 @@ weight = 200

 Grafana alerting allows you to attach rules to your dashboard panels. When you save the dashboard, Grafana extracts the alert rules into a separate alert rule storage and schedules them for evaluation.

-![Alerting overview](/static/img/docs/alerting/drag_handles_gif.gif)
+![Alerting overview](/img/docs/alerting/drag_handles_gif.gif)

 In the Alert tab of the graph panel you can configure how often the alert rule should be evaluated and the conditions that need to be met for the alert to change state and trigger its [notifications]({{< relref "notifications.md" >}}).

@@ -46,9 +46,9 @@ If an alert rule has a configured `For` and the query violates the configured th
 Typically, it's always a good idea to use this setting since it's often worse to get false positive than wait a few minutes before the alert notification triggers. Looking at the `Alert list` or `Alert list panels` you will be able to see alerts in pending state.

 Below you can see an example timeline of an alert using the `For` setting. At ~16:04 the alert state changes to `Pending` and after 4 minutes it changes to `Alerting` which is when alert notifications are sent. Once the series falls back to normal the alert rule goes back to `OK`.
-{{< figure class="float-right"  src="/static/img/docs/v54/alerting-for-dark-theme.png" caption="Alerting For" >}}
+{{< imgbox img="/img/docs/v54/alerting-for-dark-theme.png" caption="Alerting For" >}}

-{{< figure class="float-right"  max-width="40%" src="/static/img/docs/v4/alerting_conditions.png" caption="Alerting Conditions" >}}
+{{< imgbox max-width="40%" img="/img/docs/v4/alerting_conditions.png" caption="Alerting Conditions" >}}

 ### Conditions

--- a/docs/sources/alerting/notifications.md
+++ b/docs/sources/alerting/notifications.md
@@ -59,16 +59,16 @@ Hipchat | `hipchat` | yes, external only | no
 [Kafka](#kafka) | `kafka` | yes, external only | no
 Line | `line` | yes, external only | no
 Microsoft Teams | `teams` | yes, external only | no
-[Opsgenie](#opsgenie) | `opsgenie` | yes, external only | yes
+OpsGenie | `opsgenie` | yes, external only | yes
 [Pagerduty](#pagerduty) | `pagerduty` | yes, external only | yes
 Prometheus Alertmanager | `prometheus-alertmanager` | yes, external only | yes
-[Pushover](#pushover) | `pushover` | yes | no
+Pushover | `pushover` | yes | no
 Sensu | `sensu` | yes, external only | no
 [Sensu Go](#sensu-go) | `sensugo` | yes, external only | no
 [Slack](#slack) | `slack` | yes | no
 Telegram | `telegram` | yes | no
 Threema | `threema` | yes, external only | no
-VictorOps | `victorops` | yes, external only | yes
+VictorOps | `victorops` | yes, external only | no
 [Webhook](#webhook) | `webhook` | yes, external only | yes
 [Zenduty](#zenduty) | `webhook` | yes, external only | yes

@@ -89,7 +89,7 @@ Addresses | Email addresses to recipients. You can enter multiple email addresse

 ### Slack

-{{< figure class="float-right"  max-width="40%" src="/static/img/docs/v4/slack_notification.png" caption="Alerting Slack Notification" >}}
+{{< imgbox max-width="40%" img="/img/docs/v4/slack_notification.png" caption="Alerting Slack Notification" >}}

 To set up Slack, you need to configure an incoming Slack webhook URL. You can follow
 [Sending messages using Incoming Webhooks](https://api.slack.com/incoming-webhooks) on how to do that. If you want to include screenshots of the
@@ -111,19 +111,6 @@ Token | If provided, Grafana will upload the generated image via Slack's file.up

 If you are using the token for a slack bot, then you have to invite the bot to the channel you want to send notifications and add the channel to the recipient field.

-### Opsgenie
-
-To setup Opsgenie you will need an API Key and the Alert API Url. These can be obtained by configuring a new [Grafana Integration](https://docs.opsgenie.com/docs/grafana-integration).
-
-Setting | Description
--------|------------
-Alert API URL | The API URL for your Opsgenie instance. This will normally be either `https://api.opsgenie.com` or, for EU customers, `https://api.eu.opsgenie.com`.
-API Key | The API Key as provided by Opsgenie for your configured Grafana integration.
-Override priority | Configures the alert priority using the `og_priority` tag. The `og_priority` tag must have one of the following values: `P1`, `P2`, `P3`, `P4`, or `P5`. Default is `False`.
-Send notification tags as | Specify how you would like [Notification Tags]({{< relref "create-alerts.md/#notifications" >}}) delivered to Opsgenie.
-
-> **Note:** When notification tags are sent as `Tags` they are concatenated into a string with a `key:value` format.
-
 ### PagerDuty

 To set up PagerDuty, all you have to do is to provide an integration key.
@@ -142,32 +129,7 @@ This might break custom event rules in your PagerDuty rules if you rely on the f
 Move any existing rules using `custom_details.myMetric` to `custom_details.queries.myMetric`.
 This behavior will become the default in a future version of Grafana.

-> **Note:** The `dedup_key` tag overrides the Grafana-generated `dedup_key` with a custom key.
-
-> **Note:** The `state` tag overrides the current alert state inside the `custom_details` payload.
-
-### VictorOps
-
-To configure VictorOps, provide the URL from the Grafana Integration and substitute `$routing_key` with a valid key.
-
-> **Note:** The tag `Severity` has special meaning in the [VictorOps Incident Fields](https://help.victorops.com/knowledge-base/incident-fields-glossary/). If an alert panel defines this key, then it replaces the `message_type` in the root of the event sent to VictorOps.
-### Pushover
-
-To set up Pushover, you must provide a user key and an API token. Refer to [What is Pushover and how do I use it](https://support.pushover.net/i7-what-is-pushover-and-how-do-i-use-it) for instructions on how to generate them.
-
-
-Setting | Description
---------- | -----------
-API Token | Application token
-User key(s) | A comma-separated list of user keys
-Device(s) | A comma-separated list of devices
-Priority | The priority alerting nottifications are sent
-OK priority | The priority OK notifications are sent; if not set, then OK notifications are sent with the priority set for alerting notifications
-Retry | How often (in seconds) the Pushover servers send the same notification to the user. (minimum 30 seconds)
-Expire | How many seconds your notification will continue to be retried for (maximum 86400 seconds)
-Alerting sound | The sound for alerting notifications
-OK sound | The sound for OK notifications
-
+> Using `dedup_key` tag will override Grafana generated `dedup_key` with a custom key.
 ### Webhook

 The webhook notification is a simple way to send information about a state change over HTTP to a custom endpoint.
@@ -204,21 +166,23 @@ Example json body:

 ### DingDing/DingTalk

-DingTalk supports the following "message type": `text`, `link` and `markdown`. Only the `link` message type is supported. Refer to the [configuration instructions](https://developers.dingtalk.com/document/app/custom-robot-access) in Chinese language.
+[Instructions in Chinese](https://open-doc.dingtalk.com/docs/doc.htm?spm=a219a.7629140.0.0.p2lr6t&treeId=257&articleId=105733&docType=1).

 In DingTalk PC Client:

 1. Click "more" icon on upper right of the panel.

-2. Click "Robot Manage" item in the pop menu, there will be a new panel call "Robot Manage".
+1. Click "Robot Manage" item in the pop menu, there will be a new panel call "Robot Manage".

-3. In the  "Robot Manage" panel, select "customized: customized robot with Webhook".
+1. In the  "Robot Manage" panel, select "customized: customized robot with Webhook".

-4. In the next new panel named "robot detail", click "Add" button.
+1. In the next new panel named "robot detail", click "Add" button.

-5. In "Add Robot" panel, input a nickname for the robot and select a "message group" which the robot will join in. click "next".
+1. In "Add Robot" panel, input a nickname for the robot and select a "message group" which the robot will join in. click "next".

-6. There will be a Webhook URL in the panel, looks like this: https://oapi.dingtalk.com/robot/send?access_token=xxxxxxxxx. Copy this URL to the Grafana DingTalk setting page and then click "finish".
+1. There will be a Webhook URL in the panel, looks like this: https://oapi.dingtalk.com/robot/send?access_token=xxxxxxxxx. Copy this URL to the Grafana DingTalk setting page and then click "finish".
+
+DingTalk supports the following "message type": `text`, `link` and `markdown`. Only the `link` message type is supported.

 ### Kafka

@@ -235,6 +199,10 @@ Once these two properties are set, you can send the alerts to Kafka for further

 Notifications can be sent by setting up an incoming webhook in Google Hangouts chat. For more information about configuring a webhook, refer to [webhooks](https://developers.google.com/hangouts/chat/how-tos/webhooks).

+### Squadcast
+
+Squadcast helps you get alerted via Phone call, SMS, Email and Push notifications and lets you take actions on those alerts. Grafana notifications can be sent to Squadcast via a simple incoming webhook. Refer the official [Squadcast support documentation](https://support.squadcast.com/docs/grafana) for configuring these webhooks.
+
 ### Prometheus Alertmanager

 Alertmanager handles alerts sent by client applications such as Prometheus server or Grafana. It takes care of deduplicating, grouping, and routing them to the correct receiver. Grafana notifications can be sent to Alertmanager via a simple incoming webhook. Refer to the official [Prometheus Alertmanager documentation](https://prometheus.io/docs/alerting/alertmanager) for configuration information.
@@ -267,4 +235,4 @@ This URL is based on the [domain]({{< relref "../administration/configuration/#d

 > **Note:** Alert notification templating is only available in Grafana v7.4 and above.

-The alert notification template feature allows you to take the [label]({{< relref "../basics/timeseries-dimensions.md#labels" >}}) value from an alert query and [inject that into alert notifications]({{< relref "./add-notification-template.md" >}}).
+The alert notification template feature allows you to take the [label]({{< relref "../getting-started/timeseries-dimensions.md#labels" >}}) value from an alert query and [inject that into alert notifications]({{< relref "./add-notification-template.md" >}}).
--- a/docs/sources/alerting/troubleshoot-alerts.md
+++ b/docs/sources/alerting/troubleshoot-alerts.md
@@ -9,7 +9,7 @@ weight = 500

 If alerts are not behaving as you expect, here are some steps you can take to troubleshoot and figure out what is going wrong.

-![Test Rule](/static/img/docs/v4/alert_test_rule.png)
+![Test Rule](/img/docs/v4/alert_test_rule.png)

 The first level of troubleshooting you can do is click **Test Rule**. You will get result back that you can expand to the point where you can see the raw data that was returned from your query.

--- a/docs/sources/auth/generic-oauth.md
+++ b/docs/sources/auth/generic-oauth.md
@@ -75,10 +75,6 @@ Customize user login using `login_attribute_path` configuration option. Order of

 You can customize the attribute name used to extract the ID token from the returned OAuth token with the `id_token_attribute_name` option.

-You can set the user's display name with JMESPath using the `name_attribute_path` configuration option. It operates the same way as the `login_attribute_path` option.
-
-> **Note:** `name_attribute_path` is available in Grafana 7.4+.
-
 ## Set up OAuth2 with Auth0

 1. Create a new Client in Auth0
--- a/docs/sources/auth/grafana.md
+++ b/docs/sources/auth/grafana.md
@@ -52,7 +52,7 @@ api_key_max_seconds_to_live = -1

 ### Anonymous authentication

-You can make Grafana accessible without any login required by enabling anonymous access in the configuration file. For more information, refer to [Implications of allowing anonymous access to dashboards]({{< relref "../administration/security.md" >}}).
+You can make Grafana accessible without any login required by enabling anonymous access in the configuration file.

 Example:

@@ -65,9 +65,6 @@ org_name = Main Org.

 # Role for unauthenticated users, other valid values are `Editor` and `Admin`
 org_role = Viewer
-
-# Hide the Grafana version text from the footer and help tooltip for unauthenticated users (default: false)
-hide_version = true
 ```

 If you change your organization name in the Grafana UI this setting needs to be updated to match the new name.
--- a/docs/sources/auth/jwt.md
+++ b/docs/sources/auth/jwt.md
@@ -1,92 +0,0 @@
-+++
-title = "JWT Authentication"
-description = "Grafana JWT Authentication"
-keywords = ["grafana", "configuration", "documentation", "jwt", "jwk"]
-weight = 250
-+++
-
-# JWT authentication
-
-You can configure Grafana to accept a JWT token provided in the HTTP header. The token is verified using any of the following:
- PEM-encoded key file
- JSON Web Key Set (JWKS) in a local file 
- JWKS provided by the configured JWKS endpoint
-
-## Enable JWT
-
-To use JWT authentication:
-1. Enable JWT in the [main config file]({{< relref "../administration/configuration.md" >}}).
-1. Specify the header name that contains a token.
-
-```ini
-[auth.jwt]
-# By default, auth.jwt is disabled.
-enabled = true
-
-# HTTP header to look into to get a JWT token.
-header_name = X-JWT-Assertion
-```
-
-## Configure login claim
-
-To identify the user, some of the claims needs to be selected as a login info. You could specify a claim that contains either a username or an email of the Grafana user.
-
-Typically, the subject claim called `"sub"` would be used as a login but it might also be set to some application specific claim.
-
-```ini
-# [auth.jwt]
-# ...
-
-# Specify a claim to use as a username to sign in.
-username_claim = sub
-
-# Specify a claim to use as an email to sign in.
-email_claim = sub
-```
-
-## Signature verification
-
-JSON web token integrity needs to be verified so cryptographic signature is used for this purpose. So we expect that every token must be signed with some known cryptographic key.
-
-You have a variety of options on how to specify where the keys are located.
-
-### Verify token using a JSON Web Key Set loaded from https endpoint
-
-For more information on JWKS endpoints, refer to [Auth0 docs](https://auth0.com/docs/tokens/json-web-tokens/json-web-key-sets).
-
-```ini
-# [auth.jwt]
-# ...
-
-jwk_set_url = https://your-auth-provider.example.com/.well-known/jwks.json
-
-# Cache TTL for data loaded from http endpoint.
-cache_ttl = 60m
-```
-
-### Verify token using a JSON Web Key Set loaded from JSON file
-
-Key set in the same format as in JWKS endpoint but located on disk.
-
-```ini
-jwk_set_file = /path/to/jwks.json
-```
-
-### Verify token using a single key loaded from PEM-encoded file
-
-PEM-encoded key file in PKIX, PKCS #1, PKCS #8 or SEC 1 format.
-
-```ini
-key_file = /path/to/key.pem
-```
-
-## Validate claims
-
-By default, only `"exp"`, `"nbf"` and `"iat"` claims are validated.
-
-You might also want to validate that other claims are really what you expect them to be.
-
-```ini
-# This can be seen as a required "subset" of a JWT Claims Set.
-expect_claims = {"iss": "https://your-token-issuer", "your-custom-claim": "foo"}
-```
--- a/docs/sources/auth/ldap.md
+++ b/docs/sources/auth/ldap.md
@@ -100,7 +100,7 @@ Grafana has an LDAP debug view built-in which allows you to test your LDAP confi

 Within this view, you'll be able to see which LDAP servers are currently reachable and test your current configuration.

-{{< figure src="/static/img/docs/ldap_debug.png" class="docs-image--no-shadow" max-width="600px" >}}
+{{< docs-imagebox img="/img/docs/ldap_debug.png" class="docs-image--no-shadow" max-width="600px" >}}


 To use the debug view:
@@ -109,7 +109,7 @@ To use the debug view:
 1. Then, press "Run"
 1. If the user is found within any of your LDAP instances, the mapping information is displayed

-{{< figure src="/static/img/docs/ldap_debug_mapping_testing.png" class="docs-image--no-shadow" max-width="600px" >}}
+{{< docs-imagebox img="/img/docs/ldap_debug_mapping_testing.png" class="docs-image--no-shadow" max-width="600px" >}}

 ### Bind

--- a/docs/sources/auth/overview.md
+++ b/docs/sources/auth/overview.md
@@ -122,7 +122,7 @@ oauth_auto_login = true

 ### Hide sign-out menu

-Set the option detailed below to true to hide sign-out menu link. Useful if you use an auth proxy or JWT authentication.
+Set the option detailed below to true to hide sign-out menu link. Useful if you use an auth proxy.

 ```bash
 [auth]
--- a/docs/sources/auth/team-sync.md
+++ b/docs/sources/auth/team-sync.md
@@ -12,7 +12,7 @@ With Team Sync, you can set up synchronization between your auth provider's team
 of certain teams/groups to automatically be added/removed as members to certain teams in Grafana. Currently the synchronization will only happen every
 time a user logs in, unless LDAP is used together with active background synchronization that was added in Grafana 6.3.

-{{< figure src="/static/img/docs/enterprise/team_members_ldap.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" >}}
+{{< docs-imagebox img="/img/docs/enterprise/team_members_ldap.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" >}}

 Grafana keeps track of all synchronized users in teams and you can see which users have been synchronized in the team members list, see `LDAP` label in screenshot.
 This mechanism allows Grafana to remove an existing synchronized user from a team when its LDAP group membership (for example) changes. This mechanism also enables you to manually add a user as member of a team and it will not be removed when the user signs in. This gives you flexibility to combine LDAP group memberships and Grafana team memberships.
--- a/docs/sources/basics/_index.md
+++ b/docs/sources/basics/_index.md
@@ -1,14 +0,0 @@
-+++
-title = "Grafana basics"
-weight = 15
-+++
-
-# Grafana basics
-
-This section provides basic information about observability topics in general and Grafana in particular. These topics will help people who are just starting out with observability and monitoring.
-
-{{< docs/shared "basics/what-is-grafana.md" >}}
-
-{{< docs/shared "basics/grafana-cloud.md" >}}
-
-{{< docs/shared "basics/grafana-enterprise.md" >}}
--- a/docs/sources/basics/exemplars.md
+++ b/docs/sources/basics/exemplars.md
@@ -1,22 +0,0 @@
-+++
-title = "Exemplars"
-description = "Exemplars"
-keywords = ["grafana", "concepts", "exemplars", "prometheus"]
-weight = 400
-+++
-
-# Introduction to exemplars
-
-An exemplar is a specific trace representative of a repeated pattern of data in a given time interval. It helps you identify higher cardinality metadata from specific events within time series data.
-
-Suppose your company website is experiencing a surge in traffic volumes. While more than eighty percent of the users are able to access the website in under two seconds, some users are experiencing a higher than normal response time resulting in bad user experience
-
-To identify the factors that are contributing to the latency, you must compare a trace for a fast response against a trace for a slow response. Given the vast amount of data in a typical production environment, it will be extremely laborious and time-consuming effort.
-
-Use exemplars to help isolate problems within your data distribution by pinpointing query traces exhibiting high latency within a time interval. Once you localize the latency problem to a few exemplar traces, you can combine it with additional system based information or location properties to perform a root cause analysis faster, leading to quick resolutions to performance issues.
-
-Support for exemplars is available for the Prometheus data source only. Once you enable the functionality, exemplars data is available by default. For more information on exemplar configuration and how to enable exemplars, refer to [configuring exemplars in Prometheus data source]({{< relref "../datasources/prometheus.md#configuring-exemplars" >}}).
-
-Grafana shows exemplars alongside a metric in the Explore view and in dashboards. Each exemplar displays as a highlighted star. You can hover your cursor over an exemplar to view the unique traceID, which is a combination of a key value pair. To investigate further, click the blue button next to the `traceID` property.
-
-{{< figure src="/static/img/docs/v74/exemplars.png" class="docs-image--no-shadow" max-width= "750px" caption="Screenshot showing the detail window of an Exemplar" >}}
--- a/docs/sources/basics/glossary.md
+++ b/docs/sources/basics/glossary.md
@@ -1,119 +0,0 @@
-+++
-title = "Glossary"
-description = "Grafana glossary"
-keywords = ["grafana", "intro", "glossary", "dictionary"]
-aliases = ["/docs/grafana/latest/guides/glossary", "/docs/grafana/latest/getting-started/glossary"]
-weight = 800
-+++
-
-# Glossary
-
-This topic lists words and abbreviations that are commonly used in the Grafana documentation and community.
-
-<table>
-  <tr>
-    <td style="vertical-align: top">Dashboard</td>
-    <td>
-      A set of one or more panels, organized and arranged into one or more rows, that provide an at-a-glance view of related information.
-    </td>
-  </tr>
-  <tr>
-    <td style="vertical-align: top">Data source</td>
-    <td>
-      A file, database, or service providing the data. Grafana supports several data sources by default, and can be extended to support additional data sources through plugins.
-    </td>
-  </tr>
-  <tr>
-    <td style="vertical-align: top">Exemplar</td>
-    <td>
-      An exemplar is any data that serves as a detailed example of one of the observations aggregated into a metric. An exemplar contains the observed value together with an optional timestamp and arbitrary labels, which are typically used to reference a trace.
-    </td>
-  </tr>
-  <tr>
-    <td style="vertical-align: top">Explore</td>
-    <td>
-      Explore allows a user to focus on building a query. Users can refine the query to return the expected metrics before building a dashboard. For more information, refer to the <a href="https://grafana.com/docs/grafana/latest/explore">Explore</a> topic.
-    </td>
-  </tr>
-  <tr>
-    <td style="vertical-align: top">Export/Import dashboard</td>
-    <td>
-      Grafana includes the ability to export your dashboards to a file containing JSON. Community members sometimes share their created dashboards on the <a href="https://grafana.com/grafana/dashboards">Grafana Dashboards page</a>. Dashboards previously exported or found on this site may be imported by other users.
-    </td>
-  </tr>
-  <tr>
-    <td style="vertical-align: top">Exporter</td>
-    <td>
-      An exporter translates data that comes out of a data source into a format that Prometheus can digest.
-    </td>
-  </tr>
-  <tr>
-    <td style="vertical-align: top">Integration (Grafana Cloud)</td>
-    <td>
-      Each Integration in Grafana Cloud uses the cloud agent to connect your data source to Grafana Cloud for visualizing. Note: Prometheus uses the word “integrations” to refer to software that exposes Prometheus metrics without needing an exporter, which is a different use of the same word we use here.
-    </td>
-  </tr>
-  <tr>
-    <td style="vertical-align: top">Graph</td>
-    <td>
-      A commonly-used visualization that displays data as points, lines, or bars.
-    </td>
-  </tr>
-  <tr>
-    <td style="vertical-align: top">Mixin</td>
-    <td>
-      A mixin is a set of Grafana dashboards and Prometheus rules and alerts, written in Jsonnet and packaged together in a bundle.
-    </td>
-  </tr>
-  <tr>
-    <td style="vertical-align: top">Panel</td>
-    <td>
-      Basic building block in Grafana, composed by a query and a visualization. Can be moved and resized within a dashboard.
-    </td>
-  </tr>
-  <tr>
-    <td style="vertical-align: top">Plugin</td>
-    <td>
-      An extension of Grafana that allows users to provide additional functionality to enhance their experience. The types of plugins currently supported are:
-      <ul>
-        <li>
-          <b>App plugin:</b> Extends Grafana with a customized experience. It includes a set of panel and data source plugins, as well as custom pages.
-        </li>
-        <li>
-          <b>Data source plugin:</b> Extends Grafana with support for additional data sources.
-        </li>
-        <li>
-          <b>Panel plugin:</b> Extends Grafana with additional visualization options.
-        </li>
-      </ul>
-    </td>
-  </tr>
-  <tr>
-    <td style="vertical-align: top">Query</td>
-    <td>
-      Used to request data from a data source. The structure and format of the query depend on the specific data source.
-    </td>
-  </tr>
-  <tr>
-    <td style="vertical-align: top">Time series</td>
-    <td>
-      A series of measurements, ordered by time. Time series are stored in data sources and returned as the result of a query.
-    </td>
-  </tr>
-  <tr>
-    <td style="vertical-align: top">Trace</td>
-    <td>
-      An observed execution path of a request through a distributed system. For more information, refer to <a href="https://opentracing.io/docs/overview/what-is-tracing/">What is Distributed Tracing?</a>
-    </td>
-  </tr>
-  <tr>
-    <td style="vertical-align: top">Transformation</td>
-    <td>
-      Transformations process the result set of a query before it’s passed on for visualization. For more information, refer to the <a href="https://grafana.com/docs/grafana/latest/panels/transformations">Transformations overview</a> topic.
-    </td>
-  </tr>
-  <tr>
-    <td style="vertical-align: top">Visualization</td>
-    <td>A graphical representation of query results.</td>
-  </tr>
-</table>
--- a/docs/sources/basics/intro-histograms.md
+++ b/docs/sources/basics/intro-histograms.md
@@ -1,55 +0,0 @@
-+++
-title = "Histograms and heatmaps"
-description = "An introduction to histograms and heatmaps"
-keywords = ["grafana", "heatmap", "panel", "documentation", "histogram"]
-aliases = ["/docs/grafana/latest/getting-started/intro-histograms"]
-weight = 700
-+++
-
-# Introduction to histograms and heatmaps
-
-A histogram is a graphical representation of the distribution of numerical data. It groups values into buckets
-(sometimes also called bins) and then counts how many values fall into each bucket.
-
-Instead of graphing the actual values, histograms graph the buckets. Each bar represents a bucket,
-and the bar height represents the frequency (such as count) of values that fell into that bucket's interval.
-
-## Histogram example
-
-This histogram shows the value distribution of a couple of time series. You can easily see that
-most values land between 240-300 with a peak between 260-280.
-
-![](/static/img/docs/v43/heatmap_histogram.png)
-
-Histograms only look at _value distributions_ over a specific time range. The problem with histograms is you cannot see any trends or changes in the distribution over time.
-This is where heatmaps become useful.
-
-## Heatmaps
-
-A _heatmap_ is like a histogram, but over time where each time slice represents its own histogram. Instead of using bar height as a representation of frequency, it uses cells and colors the cell proportional to the number of values in the bucket.
-
-In this example, you can clearly see what values are more common and how they trend over time.
-
-![](/static/img/docs/v43/heatmap_histogram_over_time.png)
-
-## Pre-bucketed data
-
-There are a number of data sources supporting histogram over time like Elasticsearch (by using a Histogram bucket
-aggregation) or Prometheus (with [histogram](https://prometheus.io/docs/concepts/metric_types/#histogram) metric type
-and *Format as* option set to Heatmap). But generally, any data source could be used if it meets the requirements:
-returns series with names representing bucket bound or returns series sorted by the bound in ascending order.
-
-## Raw data vs aggregated
-
-If you use the heatmap with regular time series data (not pre-bucketed), then it's important to keep in mind that your data
-is often already aggregated by your time series backend. Most time series queries do not return raw sample data
-but include a group by time interval or maxDataPoints limit coupled with an aggregation function (usually average).
-
-This all depends on the time range of your query of course. But the important point is to know that the histogram bucketing
-that Grafana performs might be done on already aggregated and averaged data. To get more accurate heatmaps it is better
-to do the bucketing during metric collection or store the data in Elasticsearch, or in the other data source which
-supports doing histogram bucketing on the raw data.
-
-If you remove or lower the group by time (or raise maxDataPoints) in your query to return more data points your heatmap will be
-more accurate but this can also be very CPU and memory taxing for your browser and could cause hangs and crashes if the number of
-data points becomes unreasonably large.
--- a/docs/sources/basics/timeseries-dimensions.md
+++ b/docs/sources/basics/timeseries-dimensions.md
@@ -1,85 +0,0 @@
-+++
-title = "Time series dimensions"
-description = "time series dimensions"
-keywords = ["grafana", "intro", "guide", "concepts", "timeseries", "labels"]
-aliases = ["/docs/grafana/latest/guides/timeseries-dimensions", "/docs/grafana/latest/getting-started/timeseries-dimensions"]
-weight = 600
-+++
-
-# Time series dimensions
-
-In [Introduction to time series]({{< relref "timeseries.md#time-series-databases" >}}), the concept of _labels_, also called _tags_, is introduced:
-
-> Another feature of a TSDB is the ability to filter measurements using _tags_. Each data point is labeled with a tag that adds context information, such as where the measurement was taken.
-
-With time series data, the data often contain more than a single series, and is a set of multiple time series. Many Grafana data sources support this type of data.
-
-{{< figure src="/static/img/docs/example_graph_multi_dim.png" class="docs-image--no-shadow" max-width="850px" >}}
-
-The common case is issuing a single query for a measurement with one or more additional properties as dimensions. For example, querying a temperature measurement along with a location property. In this case, multiple series are returned back from that single query and each series has unique location as a dimension.
-
-To identify unique series within a set of time series, Grafana stores dimensions in _labels_.
-
-## Labels
-
-Each time series in Grafana optionally has labels. labels are set a of key/value pairs for identifying dimensions. Example labels could are `{location=us}` or `{country=us,state=ma,city=boston}`. Within a set of time series, the combination of its name and labels identifies each series. For example, `temperature {country=us,state=ma,city=boston}`.
-
-Different sources of time series data have dimensions stored natively, or common storage patterns that allow the data to be extracted into dimensions.
-
-Time series databases (TSDBs) usually natively support dimensionality. Prometheus also stores dimensions in _labels_. In TSDBs such as Graphite or OpenTSDB the term _tags_ is used instead.
-
-In table databases such SQL, these dimensions are generally the `GROUP BY` parameters of a query.
-
-## Multiple dimensions in table format
-
-In SQL or SQL-like databases that return table responses, additional dimensions usually columns in the query response table.
-
-### Single dimension
-
-For example, consider a query like:
-
-```sql
-SELECT BUCKET(StartTime, 1h), AVG(Temperature) AS Temp, Location FROM T
-  GROUP BY BUCKET(StartTime, 1h), Location
-  ORDER BY time asc
-```
-
-Might return a table with three columns that each respectively have data types time, number, and string.
-
-| StartTime | Temp | Location |
-| --------- | ---- | -------- |
-| 09:00     | 24   | LGA      |
-| 09:00     | 20   | BOS      |
-| 10:00     | 26   | LGA      |
-| 10:00     | 22   | BOS      |
-
-The table format is _long_ formatted time series, also called _tall_. It has repeated time stamps, and repeated values in Location. In this case, we have two time series in the set that would be identified as `Temp {Location=LGA}` and `Temp {Location=BOS}`.
-
-Individual time series from the set are extracted by using the time typed column `StartTime` as the time index of the time series, the numeric typed column `Temp` as the series name, and the name and values of the string typed `Location` column to build the labels, such as Location=LGA.
-
-### Multiple dimensions
-
-If the query is updated to select and group by more than just one string column, for example, `GROUP BY BUCKET(StartTime, 1h), Location, Sensor`, then an additional dimension is added:
-
-| StartTime | Temp | Location | Sensor |
-| --------- | ---- | -------- | ------ |
-| 09:00     | 24   | LGA      | A      |
-| 09:00     | 24.1 | LGA      | B      |
-| 09:00     | 20   | BOS      | A      |
-| 09:00     | 20.2 | BOS      | B      |
-| 10:00     | 26   | LGA      | A      |
-| 10:00     | 26.1 | LGA      | B      |
-| 10:00     | 22   | BOS      | A      |
-| 10:00     | 22.2 | BOS      | B      |
-
-In this case the labels that represent the dimensions will have two keys based on the two string typed columns `Location` and `Sensor`. This data results four series: `Temp {Location=LGA,Sensor=A}`, `Temp {Location=LGA,Sensor=B}`, `Temp {Location=BOS,Sensor=A}`, and `Temp {Location=BOS,Sensor=B}`.
-
-> **Note:** More than one dimension is currently only supported in the Logs queries within the Azure Monitor service as of version 7.1.
-
-> **Note:** Multiple dimensions are not supported in a way that maps to multiple alerts in Grafana, but rather they are treated as multiple conditions to a single alert. See the documentation on [creating alerts with multiple series]({{< relref "../alerting/create-alerts.md#multiple-series" >}}).
-
-### Multiple values
-
-In the case SQL-like data sources, more than one numeric column can be selected, with or without additional string columns to be used as dimensions. For example, `AVG(Temperature) AS AvgTemp, MAX(Temperature) AS MaxTemp`. This, if combined with multiple dimensions can result in a lot of series. Selecting multiple values is currently only designed to be used with visualization.
-
-Additional technical information on tabular time series formats and how dimensions are extracted can be found in [the developer documentation on data frames as time series]({{< relref "../developers/plugins/data-frames.md#data-frames-as-time-series" >}}).
--- a/docs/sources/basics/timeseries.md
+++ b/docs/sources/basics/timeseries.md
@@ -1,123 +0,0 @@
-+++
-title = "Time series"
-description = "Introduction to time series"
-keywords = ["grafana", "intro", "guide", "concepts", "timeseries"]
-weight = 400
-+++
-
-# Introduction to time series
-
-Imagine you wanted to know how the temperature outside changes throughout the day. Once every hour, you'd check the thermometer and write down the time along with the current temperature. After a while, you'd have something like this:
-
-| Time  | Value |
-| ----- | ----- |
-| 09:00 | 24°C  |
-| 10:00 | 26°C  |
-| 11:00 | 27°C  |
-
-Temperature data like this is one example of what we call a *time series*—a sequence of measurements, ordered in time. Every row in the table represents one individual measurement at a specific time.
-
-Tables are useful when you want to identify individual measurements but make it difficult to see the big picture. A more common visualization for time series is the _graph_, which instead places each measurement along a time axis. Visual representations like the graph make it easier to discover patterns and features of the data that otherwise would be difficult to see.
-
-{{< figure src="/static/img/docs/example_graph.png" class="docs-image--no-shadow" max-width="850px" >}}
-
-Temperature data like the one in the example, is far from the only example of a time series. Other examples of time series are:
-
- CPU and memory usage
- Sensor data
- Stock market index
-
-While each of these examples are sequences of chronologically ordered measurements, they also share other attributes:
-
- New data is appended at the end, at regular intervals—for example, hourly at 09:00, 10:00, 11:00, and so on.
- Measurements are seldom updated after they were added—for example, yesterday's temperature doesn't change.
-
-Time series are powerful. They help you understand the past by letting you analyze the state of the system at any point in time. Time series could tell you that the server crashed moments after the free disk space went down to zero.
-
-Time series can also help you predict the future, by uncovering trends in your data. If the number of registered users has been increasing monthly by 4% for the past few months, you can predict how big your user base is going to be at the end of the year.
-
-Some time series have patterns that repeat themselves over a known period. For example, the temperature is typically higher during the day, before it dips down at night. By identifying these periodic, or _seasonal_, time series, you can make confident predictions about the next period. If we know that the system load peaks every day around 18:00, we can add more machines right before.
-
-## Aggregating time series
-
-Depending on what you're measuring, the data can vary greatly. What if you wanted to compare periods longer than the interval between measurements? If you'd measure the temperature once every hour, you'd end up with 24 data points per day. To compare the temperature in August over the years, you'd have to combine the 31 times 24 data points into one.
-
-Combining a collection of measurements is called _aggregation_. There are several ways to aggregate time series data. Here are some common ones:
-
- **Average** returns the sum of all values divided by the total number of values.
- **Min** and **Max** return the smallest, and largest value in the collection.
- **Sum** returns the sum of all values in the collection.
- **Count** returns the number of values in the collection.
-
-For example, by aggregating the data in a month, you can determine that August 2017 was, on average, warmer than the year before. Instead, to see which month had the highest temperature, you'd compare the maximum temperature for each month.
-
-How you choose to aggregate your time series data is an important decision and depends on the story you want to tell with your data. It's common to use different aggregations to visualize the same time series data in different ways.
-
-## Time series and monitoring
-
-In the IT industry, time series data is often collected to monitor things like infrastructure, hardware, or application events. Machine-generated time series data is typically collected with short intervals, which allows you to react to any unexpected changes, moments after they occur. As a consequence, data accumulates at a rapid pace, making it vital to have a way to store and query data efficiently. As a result, databases optimized for time series data have seen a rise in popularity in recent years.
-
-### Time series databases
-
-A time series database (TSDB) is a database explicitly designed for time series data. While it's possible to use any regular database to store measurements, a TSDB comes with some useful optimizations.
-
-Modern time series databases take advantage of the fact that measurements are only ever appended, and rarely updated or removed. For example, the timestamps for each measurement change very little over time, which results in redundant data being stored.
-
-Look at this sequence of Unix timestamps:
-
-```
-1572524345, 1572524375, 1572524404, 1572524434, 1572524464
-```
-
-Looking at these timestamps, they all start with `1572524`, leading to poor use of disk space. Instead, we could store each subsequent timestamp as the difference, or _delta_, from the first one:
-
-```
-1572524345, +30, +29, +30, +30
-```
-
-We could even take it a step further, by calculating the deltas of these deltas:
-
-```
-1572524345, +30, -1, +1, +0
-```
-
-If measurements are taken at regular intervals, most of these delta-of-deltas will be 0. Because of optimizations like these, TSDBs uses drastically less space than other databases.
-
-Another feature of a TSDB is the ability to filter measurements using _tags_. Each data point is labeled with a tag that adds context information, such as where the measurement was taken. Here's an example of the [InfluxDB data format](https://docs.influxdata.com/influxdb/v1.7/write_protocols/line_protocol_tutorial/#syntax) that demonstrates how each measurement is stored.
-
-Here are some of the TSDBs supported by Grafana:
-
- [Graphite](https://graphiteapp.org/)
- [InfluxDB](https://www.influxdata.com/products/influxdb-overview/)
- [Prometheus](https://prometheus.io/)
-
-    ```
-    weather,location=us-midwest temperature=82 1465839830100400200
-      |    -------------------- --------------  |
-      |             |             |             |
-      |             |             |             |
-    +-----------+--------+-+---------+-+---------+
-    |measurement|,tag_set| |field_set| |timestamp|
-    +-----------+--------+-+---------+-+---------+
-    ```
-
-### Collecting time series data
-
-Now that we have a place to store our time series, how do we actually gather the measurements? To collect time series data, you'd typically install a _collector_ on the device, machine, or instance you want to monitor. Some collectors are made with a specific database in mind, and some support different output destinations.
-
-Here are some examples of collectors:
-
- [collectd](https://collectd.org/)
- [statsd](https://github.com/statsd/statsd)
- [Prometheus exporters](https://prometheus.io/docs/instrumenting/exporters/)
- [Telegraf](https://github.com/influxdata/telegraf)
-
-A collector either _pushes_ data to a database or lets the database _pull_ the data from it. Both methods come with their own set of pros and cons:
-
-|      | Pros                                                         | Cons                                                         |
-| ---- | ------------------------------------------------------------ | ------------------------------------------------------------ |
-| Push | Easier to replicate data to multiple destinations.           | The TSDB has no control over how much data gets sent.        |
-| Pull | Better control of how much data that gets ingested, and its authenticity. | Firewalls, VPNs or load balancers can make it hard to access the agents. |
-
-Since it would be inefficient to write every measurement to the database, collectors pre-aggregate the data and write to the time series database at regular intervals.
-
--- a/docs/sources/best-practices/_index.md
+++ b/docs/sources/best-practices/_index.md
@@ -12,3 +12,5 @@ This section provides information about best practices for intermediate Grafana
 - [Best practices for managing dashboards]({{< relref "best-practices-for-managing-dashboards" >}})
 - [Common observability strategies]({{< relref "common-observability-strategies" >}})
 - [Dashboard management maturity model]({{< relref "dashboard-management-maturity-levels" >}})
+
+  
--- a/docs/sources/best-practices/dashboard-management-maturity-levels.md
+++ b/docs/sources/best-practices/dashboard-management-maturity-levels.md
@@ -38,11 +38,11 @@ How can you tell you are here?
 - Methodical dashboards according to an [observability strategy]({{< relref "common-observability-strategies.md" >}}).
 - Hierarchical dashboards with drill-downs to the next level.

-  {{< figure class="float-right"  max-width="100%" src="/static/img/docs/best-practices/drill-down-example.png" caption="Example of using drill-down" >}}
+  {{< imgbox max-width="100%" img="/img/docs/best-practices/drill-down-example.png" caption="Example of using drill-down" >}}

 - Dashboard design reflects service hierarchies. The example shown below uses the RED method (request and error rate on the left, latency duration on the right) with one row per service. The row order reflects the data flow.

-  {{< figure class="float-right"  max-width="100%" src="/static/img/docs/best-practices/service-hierarchy-example.png" caption="Example of a service hierarchy" >}}
+  {{< imgbox max-width="100%" img="/img/docs/best-practices/service-hierarchy-example.png" caption="Example of a service hierarchy" >}}

 - Compare like to like: split service dashboards when the magnitude differs. Make sure aggregated metrics don't drown out important information.
 - Expressive charts with meaningful use of color and normalizing axes where you can.
@@ -61,7 +61,7 @@ At this stage, you have optimized your dashboard management use with a consisten
 - Actively reducing sprawl.
  - Regularly review existing dashboards to make sure they are still relevant.
  - Only approved dashboards added to master dashboard list.
-  - Tracking dashboard use. If you're an Enterprise user, you can take advantage of [Usage insights]({{< relref "../enterprise/usage-insights/_index.md" >}}).
+  - Tracking dashboard use. If you're an Enterprise user, you might take advantage of [Usage insights]({{< relref "../enterprise/usage-insights.md" >}}).
 - Consistency by design.
 - Use scripting libraries to generate dashboards, ensure consistency in pattern and style.
  - grafonnet (Jsonnet)
--- a/docs/sources/dashboards/_index.md
+++ b/docs/sources/dashboards/_index.md
@@ -10,7 +10,7 @@ A _dashboard_ is a set of one or more panels organized and arranged into one or

 ## Dashboard UI

-<img src="/static/img/docs/v50/dashboard_annotated.png" class="no-shadow" width="700px">
+<img src="/img/docs/v50/dashboard_annotated.png" class="no-shadow" width="700px">

 1. Zoom out time range
 1. Time picker dropdown. Here you can access relative time range options, auto refresh options and set custom absolute time ranges.
@@ -22,7 +22,7 @@ A _dashboard_ is a set of one or more panels organized and arranged into one or

 Click the new Dashboard link on the right side of the Dashboard picker. You now have a blank Dashboard.

-<img class="no-shadow" src="/static/img/docs/v50/top_nav_annotated.png" width="580px">
+<img class="no-shadow" src="/img/docs/v50/top_nav_annotated.png" width="580px">

 The image above shows you the top header for a Dashboard.

--- a/docs/sources/dashboards/annotations.md
+++ b/docs/sources/dashboards/annotations.md
@@ -7,30 +7,30 @@ weight = 2

 # Annotations

-{{< figure src="/static/img/docs/v46/annotations.png" max-width="800px" >}}
+{{< docs-imagebox img="/img/docs/v46/annotations.png" max-width="800px" >}}

 Annotations provide a way to mark points on the graph with rich events. When you hover over an annotation
 you can get event description and event tags. The text field can include links to other systems with more detail.

 ## Native annotations

-Grafana comes with a native annotation store and the ability to add annotation events directly from the graph panel or via the [HTTP API]({{< relref "../http_api/annotations.md" >}}).
+Grafana v4.6+ comes with a native annotation store and the ability to add annotation events directly from the graph panel or via the [HTTP API]({{< relref "../http_api/annotations.md" >}}).

 ## Adding annotations

 By holding down Ctrl/Cmd+Click. Adding tags to the annotation will make it searchable from other dashboards.

-{{< figure src="/static/img/docs/annotations/annotation-still.png"
-max-width="600px" animated-gif="/static/img/docs/annotations/annotation.gif" >}}
+{{< docs-imagebox img="/img/docs/annotations/annotation-still.png"
+max-width="600px" animated-gif="/img/docs/annotations/annotation.gif" >}}

 ### Adding regions events

 You can also hold down Ctrl/Cmd and select region to create a region annotation.

-{{< figure src="/static/img/docs/annotations/region-annotation-still.png"
-max-width="600px" animated-gif="/static/img/docs/annotations/region-annotation.gif" >}}
+{{< docs-imagebox img="/img/docs/annotations/region-annotation-still.png"
+max-width="600px" animated-gif="/img/docs/annotations/region-annotation.gif" >}}

-### Built-in query
+### Built in query

 After you added an annotation they will still be visible. This is due to the built in annotation query that exists on all dashboards. This annotation query will
 fetch all annotation events that originate from the current dashboard and show them on the panel where they were created. This includes alert state history annotations. You can
@@ -46,7 +46,7 @@ one tag. For example create an annotation query name `outages` and specify a tag

 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/v53/annotation_tag_filter_variable.png" max-width="600px" >}}
+{{< docs-imagebox img="/img/docs/v53/annotation_tag_filter_variable.png" max-width="600px" >}}

 ## Querying other data sources

@@ -54,8 +54,8 @@ Annotation events are fetched via annotation queries. To add a new annotation qu
 open the dashboard settings menu, then select `Annotations`. This will open the dashboard annotations
 settings view. To create a new annotation query hit the `New` button.

-<!--![](/static/img/docs/v50/annotation_new_query.png)-->
-{{< figure src="/static/img/docs/v50/annotation_new_query.png" max-width="600px" >}}
+<!--![](/img/docs/v50/annotation_new_query.png)-->
+{{< docs-imagebox img="/img/docs/v50/annotation_new_query.png" max-width="600px" >}}

 Specify a name for the annotation query. This name is given to the toggle (checkbox) that will allow
 you to enable/disable showing annotation events from this query. For example you might have two
@@ -64,4 +64,12 @@ to show.

 ### Annotation query details

-The annotation query options are different for each data source. For information about annotations in a specific data source, refer to the specific [data source]({{< relref "../datasources/_index.md" >}}) topic.
+The annotation query options are different for each data source.
+
+- [Graphite annotation queries]({{< relref "../datasources/graphite.md#annotations" >}})
+- [Elasticsearch annotation queries]({{< relref "../datasources/elasticsearch.md#annotations" >}})
+- [InfluxDB annotation queries]({{< relref "../datasources/influxdb.md#annotations" >}})
+- [Prometheus annotation queries]({{< relref "../datasources/prometheus.md#annotations" >}})
+- [MySQL annotation queries]({{< relref "../datasources/mysql.md#annotations" >}})
+- [Postgres annotation queries]({{< relref "../datasources/postgres.md#annotations" >}})
+- [Loki annotation queries]({{< relref "../datasources/loki.md#annotations" >}})
--- a/docs/sources/dashboards/dashboard_folders.md
+++ b/docs/sources/dashboards/dashboard_folders.md
@@ -21,7 +21,7 @@ On the Create Folder page, fill in a unique name for the folder and then click C

 ## Manage Dashboards

-{{< figure src="/static/img/docs/v50/manage_dashboard_menu.png" max-width="300px" class="docs-image--right" >}}
+{{< docs-imagebox img="/img/docs/v50/manage_dashboard_menu.png" max-width="300px" class="docs-image--right" >}}

 There is a new Manage Dashboards page where you can carry out a variety of tasks:

@@ -46,6 +46,6 @@ The Dashboard Folder Page is similar to the Manage Dashboards page and is where

 Permissions can be assigned to a folder and inherited by the containing dashboards. An Access Control List (ACL) is used where
 **Organization Role**, **Team** and Individual **User** can be assigned permissions. Read the
- [Dashboard and Folder Permissions]({{< relref "../permissions/dashboard-folder-permissions.md" >}}) docs for more detail
+ [Dashboard and Folder Permissions]({{< relref "../permissions/dashboard_folder_permissions.md" >}}) docs for more detail
 on the permission system.

--- a/docs/sources/dashboards/dashboard_history.md
+++ b/docs/sources/dashboards/dashboard_history.md
@@ -10,7 +10,7 @@ weight = 100

 Whenever you save a version of your dashboard, a copy of that version is saved so that previous versions of your dashboard are never lost. A list of these versions is available by entering the dashboard settings and then selecting "Versions" in the left side menu.

-<img class="no-shadow" src="/static/img/docs/v50/dashboard_versions_list.png">
+<img class="no-shadow" src="/img/docs/v50/dashboard_versions_list.png">

 The dashboard version history feature lets you compare and restore to previously saved dashboard versions.

@@ -18,11 +18,11 @@ The dashboard version history feature lets you compare and restore to previously

 To compare two dashboard versions, select the two versions from the list that you wish to compare. Once selected, the "Compare versions" button will become clickable. Click the button to view the diff between the two versions.

-<img class="no-shadow" src="/static/img/docs/v50/dashboard_versions_select.png">
+<img class="no-shadow" src="/img/docs/v50/dashboard_versions_select.png">

 Upon clicking the button, you'll be brought to the diff view. By default, you'll see a textual summary of the changes, like in the image below.

-<img class="no-shadow" src="/static/img/docs/v50/dashboard_versions_diff_basic.png">
+<img class="no-shadow" src="/img/docs/v50/dashboard_versions_diff_basic.png">

 If you want to view the diff of the raw JSON that represents your dashboard, you can do that as well by clicking the "View JSON Diff" button at the bottom.

@@ -32,6 +32,6 @@ If you want to restore to the version you are diffing against, you can do so by

 If you need to restore to a previously saved dashboard version, you can do so by either clicking the "Restore" button on the right of a row in the dashboard version list, or by clicking the "Restore to version \<x\>" button appearing in the diff view. Clicking the button will bring up the following popup prompting you to confirm the restoration.

-<img class="no-shadow" src="/static/img/docs/v50/dashboard_versions_restore.png">
+<img class="no-shadow" src="/img/docs/v50/dashboard_versions_restore.png">

 After restoring to a previous version, a new version will be created containing the same exact data as the previous version, only with a different version number. This is indicated in the "Notes column" for the row in the new dashboard version. This is done simply to ensure your previous dashboard versions are not affected by the change.
--- a/docs/sources/dashboards/export-import.md
+++ b/docs/sources/dashboards/export-import.md
@@ -15,7 +15,7 @@ Dashboards are exported in Grafana JSON format, and contain everything you need

 The export feature is accessed in the share window which you open by clicking the share button in the dashboard menu.

-{{< figure src="/static/img/docs/export/export-modal.png" max-width="800px" >}}
+{{< docs-imagebox img="/img/docs/export/export-modal.png" max-width="800px" >}}

 ### Making a dashboard portable

@@ -29,12 +29,12 @@ the dashboard, and will also be added as a required input when the dashboard is

 To import a dashboard click the + icon in the side menu, and then click **Import**.

-{{< figure src="/static/img/docs/v70/import_step1.png" max-width="700px" >}}
+{{< docs-imagebox img="/img/docs/v70/import_step1.png" max-width="700px" >}}

 From here you can upload a dashboard JSON file, paste a [Grafana.com](https://grafana.com) dashboard
 URL or paste dashboard JSON text directly into the text area.

-{{< figure src="/static/img/docs/v70/import_step2_grafana.com.png"  max-width="700px" >}}
+{{< docs-imagebox img="/img/docs/v70/import_step2_grafana.com.png"  max-width="700px" >}}

 In step 2 of the import process Grafana will let you change the name of the dashboard, pick what
 data source you want the dashboard to use and specify any metric prefixes (if the dashboard use any).
@@ -43,7 +43,7 @@ data source you want the dashboard to use and specify any metric prefixes (if th

 Find dashboards for common server applications at [Grafana.com/dashboards](https://grafana.com/dashboards).

-{{< figure src="/static/img/docs/v50/gcom_dashboard_list.png" max-width="700px" >}}
+{{< docs-imagebox img="/img/docs/v50/gcom_dashboard_list.png" max-width="700px" >}}

 ## Import and sharing with Grafana 2.x or 3.0

--- a/docs/sources/dashboards/json-model.md
+++ b/docs/sources/dashboards/json-model.md
@@ -9,11 +9,11 @@ weight = 1200

 A dashboard in Grafana is represented by a JSON object, which stores metadata of its dashboard. Dashboard metadata includes dashboard properties, metadata from panels, template variables, panel queries, etc.

-To view the JSON of a dashboard:
+To view the JSON of a dashboard, follow the steps mentioned below:

-  1. Navigate to a dashboard.
-  1. In the top navigation menu, click the **Dashboard settings** (gear) icon.
-  1. Click **JSON Model**.
+  1. Go to a dashboard
+  1. Click on `Manage dashboard` menu on the top navigation bar
+  1. Select `View JSON` from the dropdown menu

 ## JSON fields

--- a/docs/sources/dashboards/playlist.md
+++ b/docs/sources/dashboards/playlist.md
@@ -14,7 +14,7 @@ Grafana automatically scales dashboards to any resolution, which makes them perf

 You can access the Playlist feature from Grafana's side menu, in the Dashboards submenu.

-{{< figure src="/static/img/docs/v50/playlist.png" max-width="25rem">}}
+{{< docs-imagebox img="/img/docs/v50/playlist.png" max-width="25rem">}}

 ## Create a playlist

--- a/docs/sources/dashboards/reporting.md
+++ b/docs/sources/dashboards/reporting.md
@@ -10,6 +10,6 @@ weight = 8

 Reporting allows you to generate PDFs from any of your dashboards and have them sent out to interested parties on a schedule.

-{{< figure src="/static/img/docs/enterprise/reports_list.png" max-width="500px" class="docs-image--no-shadow" >}}
+{{< docs-imagebox img="/img/docs/enterprise/reports_list.png" max-width="500px" class="docs-image--no-shadow" >}}

 > Reporting is only available in Grafana Enterprise, v6.4 or later. For more information, refer to [Reporting]({{< relref "../enterprise/reporting.md" >}}) in [Grafana Enterprise]({{< relref "../enterprise" >}}).
--- a/docs/sources/dashboards/search.md
+++ b/docs/sources/dashboards/search.md
@@ -10,7 +10,7 @@ weight = 5

 Dashboards can be searched by the dashboard name, filtered by one (or many) tags or filtered by starred status. The dashboard search is accessed through the dashboard picker, available in the dashboard top nav area. The dashboard search can also be opened by using the shortcut `F`.

-<img class="no-shadow" src="/static/img/docs/v50/dashboard_search_annotated.png" width="700px">
+<img class="no-shadow" src="/img/docs/v50/dashboard_search_annotated.png" width="700px">

 1. `Search Bar`: The search bar allows you to enter any string and search both database and file based dashboards in real-time.
 1. `Starred`: Here you find all your starred dashboards.
--- a/docs/sources/dashboards/time-range-controls.md
+++ b/docs/sources/dashboards/time-range-controls.md
@@ -26,18 +26,14 @@ Here are some examples:
 | Last 5 minutes         | `now-5m`   | `now`      |
 | The day so far         | `now/d`    | `now`      |
 | This week              | `now/w`    | `now/w`    |
-| This week so far       | `now/w`    | `now`      |
-| This month             | `now/M`    | `now/M`    |
-| This month so far      | `now/M`    | `now`      |
+| Week to date           | `now/w`    | `now`      |
 | Previous Month         | `now-1M/M` | `now-1M/M` |
-| This year so far       | `now/Y`    | `now`      |
-| This Year              | `now/Y`    | `now/Y     |

 ## Common time range controls

 The dashboard and panel time controls have a common user interface (UI).

-<img class="no-shadow" src="/static/img/docs/time-range-controls/common-time-controls-7-0.png" max-width="700px">
+<img class="no-shadow" src="/img/docs/time-range-controls/common-time-controls-7-0.png" max-width="700px">

 The options are defined below.

@@ -47,11 +43,11 @@ The current time range, also called the _time picker_, shows the time range curr

 Hover your cursor over the field to see the exact time stamps in the range and their source (such as the local browser).

-<img class="no-shadow" src="/static/img/docs/time-range-controls/time-picker-7-0.png" max-width="300px">
+<img class="no-shadow" src="/img/docs/time-range-controls/time-picker-7-0.png" max-width="300px">

 Click on the current time range to change the time range. You can change the current time using a _relative time range_, such as the last 15 minutes, or an _absolute time range_, such as `2020-05-14 00:00:00 to 2020-05-15 23:59:59`.

-<img class="no-shadow" src="/static/img/docs/time-range-controls/change-current-time-range-7-0.png" max-width="900px">
+<img class="no-shadow" src="/img/docs/time-range-controls/change-current-time-range-7-0.png" max-width="900px">

 ### Relative time range

--- a/Show More
+++ b/Show More