"Release: Updated versions in package to 8.1.0-beta.1" (#37091)

* pick changes from PR 33811, use UID in dashboard navlinks

* use proper spelling for UID

* add uid to the plugin schema

* Update docs/sources/developers/plugins/plugin.schema.json

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

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

.github/CODEOWNERS

@@ -11,9 +11,9 @@
 # In each subsection folders are ordered first by depth, then alphabetically.
 # This should make it easy to add new rules without breaking existing ones.
 
-# Documentation owner: Diana Payton
-/docs/ @grafana/docs-squad
-/contribute/ @marcusolsson @grafana/docs-squad
+# Documentation owner: Jita Chatterjee
+/docs/ @grafana/docs-squad @pkolyvas
+/contribute/ @marcusolsson @grafana/docs-squad @pkolyvas
 /docs/sources/developers/plugins/ @marcusolsson @grafana/docs-squad
 /docs/sources/enterprise/ @osg-grafana @grafana/docs-squad
 

.github/ISSUE_TEMPLATE/2-feature_request.md

@@ -1,11 +0,0 @@
----
-name: Enhancement request
-about: Suggest an enhancement or new feature for the Grafana project
-labels: 'type: feature request'
----
-
-<!-- Please only use this template for submitting feature requests -->
-
-**What would you like to be added**:
-
-**Why is this needed**:

.github/ISSUE_TEMPLATE/config.yml

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

.github/workflows/publish.yml

@@ -0,0 +1,44 @@
+name: publish_docs
+
+on:
+  push:
+    branches:
+    - main
+    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.1.5
+      with:
+        path: '**/node_modules'
+        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+    - name: generate-packages-docs
+      uses: actions/setup-node@v2.1.5
+      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/next
+        allow_no_changes: 'true'
+    - shell: bash
+      run: |
+        test -n "${{ steps.publish.outputs.commit_hash }}"
+        test -n "${{ steps.publish.outputs.working_directory }}"

.gitignore

@@ -50,6 +50,7 @@ public/css/*.min.css
 *.tmp
 .DS_Store
 .vscode/
+!.vscode/launch.json
 .vs/
 .eslintcache
 

.vscode/launch.json

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

CHANGELOG.md

@@ -426,6 +426,9 @@ The InfoBox & FeatureInfoBox are now deprecated please use the Alert component i
 * **TagsInput**: Add className to TagsInput. [#33944](https://github.com/grafana/grafana/pull/33944), [@Clarity-89](https://github.com/Clarity-89)
 * **VizLegend**: Move onSeriesColorChanged to PanelContext (breaking change). [#33611](https://github.com/grafana/grafana/pull/33611), [@ryantxu](https://github.com/ryantxu)
 
+### License update
+* **AGPL License:** Update license from Apache 2.0 to the GNU Affero General Public License (AGPL). [#33184](https://github.com/grafana/grafana/pull/33184)
+
 <!-- 8.0.0-beta1 END -->
 
 <!-- 7.5.10 START -->

GOVERNANCE.md

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

LICENSING.md

@@ -6,7 +6,7 @@ The default license for this project is [AGPL-3.0-only](LICENSE).
 
 ## Apache-2.0
 
-The following folders and their subfolders are licensed under Apache-2.0:
+The following directories and their subdirectories are licensed under Apache-2.0:
 
 ```
 packages/grafana-data/
@@ -20,3 +20,9 @@ packaging/
 grafana-mixin/
 cue/
 ```
+
+The following directories and their subdirectories are the original upstream licenses:
+
+```
+public/vendor/
+```

Makefile

@@ -4,9 +4,9 @@
 
 -include local/Makefile
 
-.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go golangci-lint test-go test-js test run run-frontend clean devenv devenv-down protobuf help
+.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go golangci-lint test-go test-js test run run-frontend clean devenv devenv-down protobuf drone help
 
-GO = GO111MODULE=on go
+GO = go
 GO_FILES ?= ./pkg/...
 SH_FILES ?= $(shell find ./scripts -name *.sh)
 
@@ -51,7 +51,7 @@ scripts/go/bin/bra: scripts/go/go.mod
 	$(GO) build -o ./bin/bra github.com/unknwon/bra
 
 run: scripts/go/bin/bra ## Build and run web server on filesystem changes.
-	@GO111MODULE=on scripts/go/bin/bra run
+	@scripts/go/bin/bra run
 
 run-frontend: deps-js ## Fetch js dependencies and watch frontend for rebuild
 	yarn start

UPGRADING_DEPENDENCIES.md

@@ -4,14 +4,14 @@ Upgrading Go or Node.js requires making changes in many different files. See bel
 
 ## Go
 
-- CircleCi
+- Drone
 - `grafana/build-container`
 - Appveyor
 - Dockerfile
 
 ## Node.js
 
-- CircleCI
+- Drone
 - `grafana/build-container`
 - Appveyor
 - Dockerfile
@@ -20,28 +20,29 @@ Upgrading Go or Node.js requires making changes in many different files. See bel
 
 The Grafana project uses [Go modules](https://golang.org/cmd/go/#hdr-Modules__module_versions__and_more) to manage dependencies on external packages. This requires a working Go environment with version 1.11 or greater installed.
 
-> **Note:** Since most developers of Grafana still use the `GOPATH` we need to specify `GO111MODULE=on` to make `go mod` and `got get` work as intended. If you have setup Grafana outside of the `GOPATH` on your machine you can skip `GO111MODULE=on` when running the commands below.
-
 To add or update a new dependency, use the `go get` command:
 
 ```bash
-# The GO111MODULE variable can be omitted when the code isn't located in GOPATH.
-# Pick the latest tagged release.
-GO111MODULE=on go get example.com/some/module/pkg
+go get example.com/some/module/pkg
 
 # Pick a specific version.
-GO111MODULE=on go get example.com/some/module/pkg@vX.Y.Z
+go get example.com/some/module/pkg@vX.Y.Z
 ```
 
 Tidy up the `go.mod` and `go.sum` files:
 
 ```bash
-# The GO111MODULE variable can be omitted when the code isn't located in GOPATH.
-GO111MODULE=on go mod tidy
+go mod tidy
 ```
 
 You have to commit the changes to `go.mod` and `go.sum` before submitting the pull request.
 
+To understand what the actual dependencies of `grafana-server` are, one could run it with `-vv` flag. This might produce an output, different from `go.mod` contents and `-vv` option is the source of truth here. It lists the modules _compiled_ into the executable, while `go.mod` lists also test and weak transitive dependencies (modules, used in some package, which is not in use by itself). If you are interested in reporting a vulnerability in a dependency module - please consult `-vv` output, maybe the "dependency" is not a dependency as such.
+
+### Upgrading dependencies
+
+If you need to upgrade a direct or indirect dependency, you can do it like so, $MODULE being the dependency in question: `go get -u $MODULE`. The corresponding entry in go.mod should then have the version you specified; if it's an indirect dependency, the entry should have the `// indirect` comment. Follow this by executing `go mod tidy`, to ensure that go.mod and go.sum are up to date. If the indirect dependency turns out to not be used (transitively) by any of our packages, `go mod tidy` will actually strip it from go.mod. In that case, you can just ignore it since it isn't used in the end.
+
 ## Node.js dependencies
 
 Updated using `yarn`.
@@ -50,9 +51,9 @@ Updated using `yarn`.
 
 ## Where to make changes
 
-### CircleCI
+### Drone
 
-Our builds run on CircleCI through our build script.
+Our CI builds run on Drone.
 
 #### Files
 
@@ -66,7 +67,7 @@ Our builds run on CircleCI through our build script.
 
 ### grafana/build-container
 
-The main build step (in CircleCI) is built using a custom build container that comes pre-baked with some of the necessary dependencies.
+The main build steps (in Drone) happen using a custom Docker image that comes pre-baked with some of the necessary dependencies.
 
 Link: [grafana/build-container](https://github.com/grafana/grafana/tree/main/scripts/build/ci-build)
 

build.go

@@ -342,9 +342,6 @@ func setBuildEnv() {
 	} else {
 		os.Setenv("GOARCH", goarch)
 	}
-	if goarch == "386" {
-		os.Setenv("GO386", "387")
-	}
 	if cgo {
 		os.Setenv("CGO_ENABLED", "1")
 	}
@@ -396,7 +393,6 @@ func runError(cmd string, args ...string) ([]byte, error) {
 func runPrint(cmd string, args ...string) {
 	log.Println(cmd, strings.Join(args, " "))
 	ecmd := exec.Command(cmd, args...)
-	ecmd.Env = append(os.Environ(), "GO111MODULE=on")
 	ecmd.Stdout = os.Stdout
 	ecmd.Stderr = os.Stderr
 	err := ecmd.Run()

conf/defaults.ini

@@ -166,9 +166,6 @@ 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
 
@@ -199,6 +196,12 @@ google_analytics_ua_id =
 # Google Tag Manager ID, only enabled if you specify an id here
 google_tag_manager_id =
 
+# Rudderstack write key, enabled only if rudderstack_data_plane_url is also set
+rudderstack_write_key =
+
+# Rudderstack data plane url, enabled only if rudderstack_write_key is also set
+rudderstack_data_plane_url =
+
 #################################### Security ############################
 [security]
 # disable creation of admin user on first start of grafana
@@ -493,6 +496,7 @@ login_attribute_path =
 name_attribute_path =
 role_attribute_path =
 role_attribute_strict = false
+groups_attribute_path =
 id_token_attribute_name =
 auth_url =
 token_url =
@@ -591,7 +595,8 @@ startTLS_policy =
 
 [emails]
 welcome_email_on_sign_up = false
-templates_pattern = emails/*.html
+templates_pattern = emails/*.html, emails/*.txt
+content_types = text/html
 
 #################################### Logging ##########################
 [log]
@@ -905,6 +910,17 @@ max_connections = 100
 # If not set then origin will be matched over root_url. Supports wildcard symbol "*".
 allowed_origins =
 
+# engine defines an HA (high availability) engine to use for Grafana Live. By default no engine used - in
+# this case Live features work only on a single Grafana server.
+# Available options: "redis".
+# Setting ha_engine is an EXPERIMENTAL feature.
+ha_engine =
+
+# ha_engine_address sets a connection address for Live HA engine. Depending on engine type address format can differ.
+# For now we only support Redis connection address in "host:port" format.
+# This option is EXPERIMENTAL.
+ha_engine_address = "127.0.0.1:6379"
+
 #################################### Grafana Image Renderer Plugin ##########################
 [plugin.grafana-image-renderer]
 # Instruct headless browser instance to use a default timezone when not provided by Grafana, e.g. when rendering panel image of alert.
@@ -995,3 +1011,10 @@ default_timezone = browser
 [expressions]
 # Enable or disable the expressions functionality.
 enabled = true
+
+[geomap]
+# Set the JSON configuration for the default basemap
+default_baselayer_config =
+
+# Enable or disable loading other base map layers
+enable_custom_baselayers = true

conf/sample.ini

@@ -172,9 +172,6 @@
 # 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
 
@@ -491,6 +488,7 @@
 ;allowed_organizations =
 ;role_attribute_path =
 ;role_attribute_strict = false
+;groups_attribute_path =
 ;tls_skip_verify_insecure = false
 ;tls_client_cert =
 ;tls_client_key =
@@ -580,7 +578,8 @@
 
 [emails]
 ;welcome_email_on_sign_up = false
-;templates_pattern = emails/*.html
+;templates_pattern = emails/*.html, emails/*.txt
+;content_types = text/html
 
 #################################### Logging ##########################
 [log]
@@ -891,6 +890,16 @@
 # If not set then origin will be matched over root_url. Supports wildcard symbol "*".
 ;allowed_origins =
 
+# engine defines an HA (high availability) engine to use for Grafana Live. By default no engine used - in
+# this case Live features work only on a single Grafana server. Available options: "redis".
+# Setting ha_engine is an EXPERIMENTAL feature.
+;ha_engine =
+
+# ha_engine_address sets a connection address for Live HA engine. Depending on engine type address format can differ.
+# For now we only support Redis connection address in "host:port" format.
+# This option is EXPERIMENTAL.
+;ha_engine_address = "127.0.0.1:6379"
+
 #################################### Grafana Image Renderer Plugin ##########################
 [plugin.grafana-image-renderer]
 # Instruct headless browser instance to use a default timezone when not provided by Grafana, e.g. when rendering panel image of alert.
@@ -982,3 +991,16 @@
 [expressions]
 # Enable or disable the expressions functionality.
 ;enabled = true
+
+[geomap]
+# Set the JSON configuration for the default basemap
+;default_baselayer_config = `{
+  "type": "xyz",
+  "config": {
+    "attribution": "Open street map",
+    "url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png"
+  }
+}`
+
+# Enable or disable loading other base map layers
+;enable_custom_baselayers = true

contribute/architecture/backend/communication.md

@@ -12,7 +12,7 @@ An event is something that happened in the past. Since an event has already happ
 
 ### Subscribe to an event
 
-In order to react to an event, you first need to _subscribe_ to it. 
+In order to react to an event, you first need to _subscribe_ to it.
 
 To subscribe to an event, register an _event listener_ in the service's `Init` method:
 
@@ -51,14 +51,16 @@ A command is a request for an action to be taken. Unlike an event's fire-and-for
 
 ### Dispatch a command
 
-To dispatch a command, pass the object to the `Dispatch` method:
+To dispatch a command, pass the `context.Context` and object to the `DispatchCtx` method:
 
 ```go
+// context.Context from caller
+ctx := req.Request.Context()
 cmd := &models.SendStickersCommand {
     UserID: "taylor",
     Count: 1,
 }
-if err := s.bus.Dispatch(cmd); err != nil {
+if err := s.bus.DispatchCtx(ctx, cmd); err != nil {
   if err == bus.ErrHandlerNotFound {
     return nil
   }
@@ -66,7 +68,9 @@ if err := s.bus.Dispatch(cmd); err != nil {
 }
 ```
 
-> **Note:** `Dispatch` will return an error if no handler is registered for that command.
+> **Note:** `DispatchCtx` will return an error if no handler is registered for that command.
+
+> **Note:** `Dispatch` currently exists and requires no `context.Context` to be provided, but it's strongly suggested to not use this since there's an ongoing refactoring to remove usage of non-context-aware functions/methods and use context.Context everywhere.
 
 **Tip:** Browse the available commands in the `models` package.
 
@@ -78,30 +82,34 @@ To handle a command, register a command handler in the `Init` function.
 
 ```go
 func (s *MyService) Init() error {
-    s.bus.AddHandler(s.SendStickers)
+    s.bus.AddHandlerCtx(s.SendStickers)
     return nil
 }
 
-func (s *MyService) SendStickers(cmd *models.SendStickersCommand) error {
+func (s *MyService) SendStickers(ctx context.Context, cmd *models.SendStickersCommand) error {
     // ...
 }
 ```
 
 > **Note:** The handler method may return an error if unable to complete the command.
 
+> **Note:** `AddHandler` currently exists and requires no `context.Context` to be provided, but it's strongly suggested to not use this since there's an ongoing refactoring to remove usage of non-context-aware functions/methods and use context.Context everywhere.
+
 ## Queries
 
 A command handler can optionally populate the command sent to it. This pattern is commonly used to implement _queries_.
 
 ### Making a query
 
-To make a query, dispatch the query instance just like you would a command. When the `Dispatch` method returns, the `Results` field contains the result of the query.
+To make a query, dispatch the query instance just like you would a command. When the `DispatchCtx` method returns, the `Results` field contains the result of the query.
 
 ```go
+// context.Context from caller
+ctx := req.Request.Context()
 query := &models.FindDashboardQuery{
     ID: "foo",
 }
-if err := bus.Dispatch(query); err != nil {
+if err := bus.DispatchCtx(ctx, query); err != nil {
     return err
 }
 // The query now contains a result.
@@ -110,12 +118,14 @@ for _, item := range query.Results {
 }
 ```
 
+> **Note:** `Dispatch` currently exists and requires no `context.Context` to be provided, but it's strongly suggested to not use this since there's an ongoing refactoring to remove usage of non-context-aware functions/methods and use context.Context everywhere.
+
 ### Return query results
 
 To return results for a query, set any of the fields on the query argument before returning:
 
 ```go
-func (s *MyService) FindDashboard(query *models.FindDashboardQuery) error {
+func (s *MyService) FindDashboard(ctx context.Context, query *models.FindDashboardQuery) error {
     // ...
     query.Result = dashboard
     return nil

contribute/architecture/backend/database.md

@@ -33,18 +33,18 @@ To register a handler:
 
 ```go
 func init() {
-    bus.AddHandler("sql", DeleteDashboard)
+    bus.AddHandlerCtx("sql", DeleteDashboard)
 }
 
-func DeleteDashboard(cmd *models.DeleteDashboardCommand) error {
-    return inTransaction(func(sess *DBSession) error {
+func DeleteDashboard(ctx context.Context, cmd *models.DeleteDashboardCommand) error {
+    return inTransactionCtx(ctx, func(sess *DBSession) error {
         _, err := sess.Exec("DELETE FROM dashboards WHERE dashboard_id=?", cmd.DashboardID)
         return err
     })
 }
 ```
 
-Here, `inTransaction` is a helper function in the `sqlstore` package that provides a session, that lets you execute SQL statements.
+Here, `inTransactionCtx` is a helper function in the `sqlstore` package that provides a session, that lets you execute SQL statements.
 
 ## `SQLStore`
 
@@ -61,7 +61,7 @@ type MyService struct {
 You can now make SQL queries in any of your [command handlers](communication.md#handle-commands) or [event listeners](communication.md#subscribe-to-an-event):
 
 ```go
-func (s *MyService) DeleteDashboard(cmd *models.DeleteDashboardCommand) error {
+func (s *MyService) DeleteDashboard(ctx context.Context, cmd *models.DeleteDashboardCommand) error {
     if err := s.SQLStore.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
         _, err := sess.Exec("DELETE FROM dashboards WHERE dashboard_id=?", cmd.DashboardID)
         return err

contribute/architecture/backend/services.md

@@ -1,6 +1,6 @@
 # Services
 
-A Grafana _service_ encapsulates and exposes application logic to the rest of the application, through a set of related operations. 
+A Grafana _service_ encapsulates and exposes application logic to the rest of the application, through a set of related operations.
 
 Before a service can start communicating with the rest of Grafana, it needs to be registered in the _service registry_.
 
@@ -48,7 +48,7 @@ import _ "github.com/grafana/grafana/pkg/services/mysvc"
 
 ## Dependencies
 
-Grafana uses the [inject](https://github.com/facebookgo/inject) package to inject dependencies during runtime. 
+Grafana uses the [inject](https://github.com/facebookgo/inject) package to inject dependencies during runtime.
 
 For example, to access the [bus](communication.md), add it to the `MyService` struct:
 
@@ -67,3 +67,7 @@ type MyService struct {
 ```
 
 > **Note:** Any injected dependency needs to be an exported field. Any unexported fields result in a runtime error.
+
+## Methods
+
+Any public method of a service should take `context.Context` as its first argument. If the method calls the bus, other services or the database the context should be propagated, if possible.

contribute/create-pull-request.md

@@ -16,7 +16,7 @@ If this is your first time contributing to an open-source project on GitHub, mak
 To increase the chance of having your pull request accepted, make sure your pull request follows these guidelines:
 
 - Title and description matches the implementation.
-- Commits within the pull request follow the [Formatting guidelines](#Formatting-guidelines). 
+- Commits within the pull request follow the [Formatting guidelines](#Formatting-guidelines).
 - The pull request closes one related issue.
 - The pull request contains necessary tests that verify the intended behavior.
 - If your pull request has conflicts, rebase your branch onto the main branch.
@@ -43,6 +43,18 @@ Pull requests for Redux contributions must:
 - Not contain code that mutates state in reducers or thunks.
 - Not contain code that accesses the reducers state slice directly. Instead, the code should use state selectors to access state.
 
+Pull requests that add or modify unit tests that are written in Jest must adhere to these guidelines:
+
+- Don't add snapshots tests. We are incrementally removing existing snapshot tests, we don't want more.
+- If an existing unit test is written in Enzyme, migrate it to RTL (React Testing Library), unless you’re fixing a bug. Bug fixes usually shouldn't include any bigger refactoring, so it’s ok to skip migrating the test to RTL.
+
+Pull requests that create new UI components or modify existing ones must adhere to the following accessibility guidelines:
+
+- Use semantic HTML.
+- Use ARIA roles, labels and other accessibility attributes correctly. Accessibility attributes should only be used when semantic HTML doesn't satisfy your use case.
+- Use the [Grafana theme palette](/contribute/style-guides/themes.md) for styling. It contains colors with good contrast which aids accessibility.
+- Use [RTL](https://testing-library.com/docs/dom-testing-library/api-accessibility/) for writing unit tests. It helps to create accessible components.
+
 ### Backend-specific guidelines
 
 Please refer to the [backend style guidelines](/contribute/style-guides/backend.md).
@@ -102,6 +114,6 @@ Make sure that the title for your pull request uses the same format as the subje
 
 If your PR includes configuration changes, all of the following files must be changed correspondingly:
 
-* conf/defaults.ini
-* conf/sample.ini
-* docs/sources/administration/configuration.md 
+- conf/defaults.ini
+- conf/sample.ini
+- docs/sources/administration/configuration.md

contribute/developer-guide.md

@@ -10,8 +10,14 @@ Make sure you have the following dependencies installed before setting up your d
 
 - [Git](https://git-scm.com/)
 - [Go](https://golang.org/dl/) (see [go.mod](../go.mod#L3) for minimum required version)
-- [Node.js (Long Term Support)](https://nodejs.org)
-- [Yarn](https://yarnpkg.com)
+
+Additionally you'll need:
+
+- [Node.js](https://nodejs.org) (see `volta.node` property in [package.json](../package.json) for the correct version).
+- [Yarn](https://yarnpkg.com) (see `volta.yarn` property in [package.json](../package.json) for the correct version).
+
+We recommend using [Volta](https://github.com/volta-cli/volta) to manage your JS toolchain.
+Refer to the [Volta Getting Started Guide](https://docs.volta.sh/guide/getting-started) for setup instructions for your operating system.
 
 ### macOS
 
@@ -20,9 +26,6 @@ We recommend using [Homebrew](https://brew.sh/) for installing any missing depen
 ```
 brew install git
 brew install go
-brew install node@14
-
-npm install -g yarn
 ```
 
 ### Windows

contribute/style-guides/e2e.md

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

contribute/style-guides/themes.md

@@ -4,11 +4,8 @@
 
 **Themes are implemented in Typescript.** That's because our goal is to share variables between Grafana TypeScript and [Sass](https://sass-lang.com/) code. Theme definitions are located in the following files:
 
-- [packages/grafana-ui/src/themes/dark.ts](../../packages/grafana-ui/src/themes/dark.ts)
-- [packages/grafana-ui/src/themes/default.ts](../../packages/grafana-ui/src/themes/default.ts)
-- [packages/grafana-ui/src/themes/light.ts](../../packages/grafana-ui/src/themes/light.ts)
-
-The `default.ts` file holds common variables like typography and spacing definitions, while `[light|dark].ts` primarily specify colors used in themes.
+- [packages/grafana-data/src/themes/createTheme.ts](../../packages/grafana-data/src/themes/createTheme.ts)
+- [packages/grafana-data/src/themes/createColors.ts](../../packages/grafana-data/src/themes/createColors.ts)
 
 ## Usage
 
@@ -18,23 +15,22 @@ This section provides usage guidelines.
 
 Here's how to use Grafana themes in React components.
 
-#### useStyles hook
+#### useStyles2 hook
 
-`useStyles` memoizes the function and provides access to the theme.
+`useStyles2` memoizes the function and provides access to the theme.
 
 ```tsx
 import React, { FC } from 'react';
-import { GrafanaTheme } from '@grafana/data';
-import { useStyles } from '@grafana/ui';
+import { GrafanaTheme2 } from '@grafana/data';
+import { useStyles2 } from '@grafana/ui';
 import { css } from '@emotion/css';
 
-const getComponentStyles = (theme: GrafanaTheme) => css`
+const getComponentStyles = (theme: GrafanaTheme2) => css`
   padding: ${theme.spacing.md};
 `;
 
 const Foo: FC<FooProps> = () => {
-  const styles = useStyles(getComponentsStyles);
-
+  const styles = useStyles2(getComponentsStyles);
   // Use styles with className
 };
 ```
@@ -43,15 +39,89 @@ const Foo: FC<FooProps> = () => {
 
 ```tsx
 import React, { FC } from 'react';
-import { useTheme } from '@grafana/ui';
+import { useTheme2 } from '@grafana/ui';
 
 const Foo: FC<FooProps> = () => {
-  const theme = useTheme();
+  const theme = useTheme2();
 
   // Your component has access to the theme variables now
 };
 ```
 
+## Picking the right variable
+
+### The rich color object and the state colors
+
+The theme.colors object has 6 rich color objects for `primary`, `secondary`, `info`, `success`, `warning` and `error`. These all
+have the same sub colors that have different use cases.
+
+| Property     | When to use                                                |
+| ------------ | ---------------------------------------------------------- |
+| main         | For backgrounds                                            |
+| shade        | For hover highlight                                        |
+| text         | For text color                                             |
+| border       | For borders, currently always the same as text color       |
+| contrastText | Text color to use for text placed on top of the main color |
+
+Example use cases:
+
+- Want a `red` background? Use `theme.colors.error.main`
+- Want `green` text? Use `theme.colors.success.text`
+- Want text to be visible when placed inside a background that uses `theme.colors.error.main` then use `theme.colors.error.contrastText`.
+
+### Text colors
+
+| Property                      | When to use                                                                    |
+| ----------------------------- | ------------------------------------------------------------------------------ |
+| theme.colors.text.primary     | The default text color                                                         |
+| theme.colors.text.secondary   | Text color for things that should be a bit less prominent                      |
+| theme.colors.text.disabled    | Text color for disabled / faint things                                         |
+| theme.colors.text.link        | Text link color                                                                |
+| theme.colors.text.maxContrast | Maximum contrast (absolute white in dark theme, absolute black in white theme) |
+
+### Background colors
+
+| Property                          | When to use                                                                                       |
+| --------------------------------- | ------------------------------------------------------------------------------------------------- |
+| theme.colors.background.canvas    | Think dashboard background. A background surface for panels and panes that use primary background |
+| theme.colors.background.primary   | The default content background for content panes and panels                                       |
+| theme.colors.background.secondary | For cards and other surfaces that need to stand out when placed on top of the primary background  |
+
+### Borders
+
+| Property                   | When to use                                                  |
+| -------------------------- | ------------------------------------------------------------ |
+| theme.colors.border.weak   | Primary border for panels and panes and other subtle borders |
+| theme.colors.border.medium | For stronger borders like inputs                             |
+| theme.colors.border.strong | For even stronger border like hover highighted border        |
+
+### Actions
+
+| Property                     | When to use                                           |
+| ---------------------------- | ----------------------------------------------------- |
+| theme.colors.action.hover    | Background color for hover on card, menu or list item |
+| theme.colors.action.focus    | Background color for focused card, menu or list item  |
+| theme.colors.action.selected | Background color for selected card, menu or list item |
+
+### Paddings and margins
+
+| Example                     | Result            |
+| --------------------------- | ----------------- |
+| theme.spacing(1)            | 8px               |
+| theme.spacing(1, 2)         | 8px 16px          |
+| theme.spacing(1, 2, 0.5, 4) | 8px 16px 4px 32px |
+
+### Border radius
+
+| Example                     | Result |
+| --------------------------- | ------ |
+| theme.shape.borderRadius(1) | 2px    |
+| theme.shape.borderRadius(2) | 4px    |
+
+### Typography
+
+For font family, font sizes and line heights use the variables under `theme.typography`. 
+
 #### Using `ThemeContext` directly
 
 ```tsx
@@ -67,39 +137,25 @@ With this method your component will be automatically wrapped in `ThemeContext.C
 ```ts
 import  { ThemeContext, Themeable } from '@grafana/ui';
 
-interface FooProps extends Themeable {}
+interface FooProps extends Themeable2 {}
 
 const Foo: React.FunctionComponent<FooProps> = () => ...
 
-export default withTheme(Foo);
+export default withTheme2(Foo);
 ```
 
-### Test components that use `ThemeContext`
+### Using theme in tests
 
-When implementing snapshot tests for components that use the `withTheme` HOC, the snapshot will contain the entire theme object. Any change to the theme renders the snapshot outdated.
-
-To make your snapshot theme independent, use the `mockThemeContext` helper function:
+If you need to pass a theme object to a function under test just import `createTheme` and call it without
+any arguments.
 
 ```tsx
-import { mockThemeContext } from '@grafana/ui';
-import { MyComponent } from './MyComponent';
+import { createTheme } from '@grafana/data';
 
 describe('MyComponent', () => {
-  let restoreThemeContext;
-
-  beforeAll(() => {
-    // Create ThemeContext mock before any snapshot test is executed
-    restoreThemeContext = mockThemeContext({ type: GrafanaThemeType.Dark });
-  });
-
-  afterAll(() => {
-    // Make sure the theme is restored after snapshot tests are performed
-    restoreThemeContext();
-  });
-
-  it('renders correctly', () => {
-    const wrapper = mount(<MyComponent />);
-    expect(wrapper).toMatchSnapshot();
+  it('should work', () => {
+    result = functionThatNeedsTheme(createTheme());
+    expect(result).toBe(true);
   });
 });
 ```
@@ -116,36 +172,5 @@ This section provides insight into frequently-asked questions.
 
 `[_variables|_variables.dark|_variables.light].generated.scss` files are the ones that are referenced in the main Sass files for Sass variables to be available. **These files are automatically generated and should never be modified by hand!**
 
-#### If you need to modify a _Sass variable value_ you need to modify the corresponding Typescript file that is the source of the variables:
-
-- `_variables.generated.scss` - modify `grafana-ui/src/themes/default.ts`
-- `_variables.light.generated.scss` - modify `grafana-ui/src/themes/light.ts`
-- `_variables.dark.generated.scss` - modify `grafana-ui/src/themes/dark.ts`
-
-#### If you need to _add new variable_ to Sass variables you need to modify corresponding template file:
-
-- `_variables.generated.scss` - modify `grafana-ui/src/themes/_variables.scss.tmpl.ts`
-- `_variables.light.generated.scss` - modify `grafana-ui/src/themes/_variables.light.scss.tmpl.ts`
-- `_variables.dark.generated.scss` - modify `grafana-ui/src/themes/_variables.dark.scss.tmpl.ts`
-
-## Limitations
-
-This section describes limitations with Grafana's theming system.
-
-### You must ensure `ThemeContext` provider is available in a React tree
-
-By default all react2angular directives have `ThemeContext.Provider` ensured. But, there are cases where we create another React tree via `ReactDOM.render`. This happens in the case of graph legend rendering and the `ReactContainer` directive. In such cases theme consumption will fail. To make sure theme context is available in such cases, you need to wrap your rendered component with ThemeContext.Provider using the `provideTheme` function:
-
-```ts
-// graph.ts
-import { provideTheme } from 'app/core/utils/ConfigProvider';
-
-// Create component with ThemeContext.Provider first.
-// Otherwise React will create new components every time it renders!
-const LegendWithThemeProvider = provideTheme(Legend);
-
-const legendReactElem = React.createElement(LegendWithThemeProvider, legendProps);
-ReactDOM.render(legendReactElem, this.legendElem, () => this.renderPanel());
-```
-
-`provideTheme` makes current theme available via ThemeContext by checking if user has `lightTheme` set in her boot data.
+If you need to modify the sass variable files be sure to update the files that end with `.tmpl.ts` and
+not the `.generated.scss` files.

cue/data/gen.cue

@@ -80,7 +80,6 @@ Family: scuemata.#Family & {
                 // synthetic Family to represent them in Go, for ease of generating
                 // e.g. JSON Schema.
                 #Panel: {
-                    ...
                     // The panel plugin type id. 
                     type: !=""
 
@@ -135,7 +134,6 @@ Family: scuemata.#Family & {
                     options: {...}
                     fieldConfig: {
                         defaults: {
-                            ...
                             // The display value for this field.  This supports template variables blank is auto
                             displayName?: string
 
@@ -189,7 +187,7 @@ Family: scuemata.#Family & {
                             // Can always exist. Valid fields within this are
                             // defined by the panel plugin - that's the
                             // PanelFieldConfig that comes from the plugin.
-                            custom?: {...}
+                            custom?: {}
                         }
                         overrides: [...{
                             matcher: {

devenv/README.md

@@ -57,13 +57,10 @@ Jaeger block runs both Jaeger and Loki container. Loki container sends traces to
 
 ## Troubleshooting
 
-### Containers fail to start (Mac OS)
+### Containers that read from log files fail to start (Mac OS)
+
+If you are running Mac OSX, containers that read from the log files (e.g. Telegraf, Fileabeat, Promtail) can fail to start. This is because the default Docker for Mac does not have permission to create `grafana` folder at the `/var/log` location, as it runs as the current user. To solve this issue, manually create the folder `/var/log/grafana`, then start the containers again.
 
 ```
-ERROR: for <service_name> Cannot start service <service_name>: OCI runtime create failed: container_linux.go:349: starting container process caused "process_linux.go:449: container init caused \"rootfs_linux.go:58: mounting ... merged/var/log/grafana: operation not permitted\\\"\"": unknown
-ERROR: Encountered errors while bringing up the project.
+sudo mkdir /var/log/grafana
 ```
-
-If running Mac OSX the above error might be encountered when starting certain Docker containers that mount `/var/log/`. When first run this causes Docker to try to create the folder `/var/log/grafana` however by default Docker for Mac does not have permission to create folders at this location as it runs as the current user. 
-
-To solve this issue manually create the folder `/var/log/grafana` and give your user write permissions then try starting the containers again.

devenv/datasources.yaml

@@ -84,6 +84,14 @@ datasources:
       tsdbResolution: 1
       tsdbVersion: 1
 
+  - name: gdev-opentsdb-v2.3
+    type: opentsdb
+    access: proxy
+    url: http://localhost:4242
+    jsonData:
+      tsdbResolution: 1
+      tsdbVersion: 3
+
   - name: gdev-elasticsearch-v2-metrics
     type: elasticsearch
     access: proxy

devenv/dev-dashboards/datasource-opentsdb/opentsdb_v2.3.json

@@ -0,0 +1,258 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": 3151,
+  "links": [],
+  "panels": [
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "gdev-opentsdb-v2.3",
+      "fieldConfig": {
+        "defaults": {
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 2,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "8.1.0-pre",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "aggregator": "sum",
+          "alias": "$tag_hostname",
+          "currentFilterGroupBy": false,
+          "currentFilterKey": "",
+          "currentFilterType": "literal_or",
+          "currentFilterValue": "",
+          "disableDownsampling": false,
+          "downsampleAggregator": "avg",
+          "downsampleFillPolicy": "none",
+          "explicitTags": false,
+          "filters": [
+            {
+              "filter": "*",
+              "groupBy": true,
+              "tagk": "hostname",
+              "type": "wildcard"
+            }
+          ],
+          "metric": "cpu",
+          "refId": "A",
+          "shouldComputeRate": false
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "CPU per host",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "gdev-opentsdb-v2.3",
+      "fieldConfig": {
+        "defaults": {
+          "links": []
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 12,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 4,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "8.1.0-pre",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "aggregator": "sum",
+          "alias": "$tag_hostname",
+          "currentFilterGroupBy": false,
+          "currentFilterKey": "",
+          "currentFilterType": "literal_or",
+          "currentFilterValue": "",
+          "downsampleAggregator": "avg",
+          "downsampleFillPolicy": "none",
+          "filters": [
+            {
+              "filter": "*",
+              "groupBy": true,
+              "tagk": "hostname",
+              "type": "wildcard"
+            }
+          ],
+          "metric": "logins.count",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Login Count per host",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    }
+  ],
+  "schemaVersion": 30,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-1h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Datasource tests - OpenTSDB v2.3",
+  "uid": "rZRUGik7k",
+  "version": 3
+}

devenv/dev-dashboards/home.json

@@ -8,6 +8,12 @@
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
         "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
         "type": "dashboard"
       }
     ]
@@ -18,21 +24,26 @@
   "links": [],
   "panels": [
     {
-      "folderId": null,
+      "datasource": null,
       "gridPos": {
         "h": 26,
         "w": 6,
         "x": 0,
         "y": 0
       },
-      "headings": true,
       "id": 7,
-      "limit": 100,
       "links": [],
-      "query": "",
-      "recent": true,
-      "search": false,
-      "starred": true,
+      "options": {
+        "folderId": null,
+        "maxItems": 100,
+        "query": "",
+        "showHeadings": true,
+        "showRecentlyViewed": true,
+        "showSearch": false,
+        "showStarred": true,
+        "tags": []
+      },
+      "pluginVersion": "8.1.0-pre",
       "tags": [],
       "timeFrom": null,
       "timeShift": null,
@@ -40,95 +51,167 @@
       "type": "dashlist"
     },
     {
-      "folderId": null,
+      "datasource": null,
       "gridPos": {
         "h": 13,
         "w": 6,
         "x": 6,
         "y": 0
       },
-      "headings": false,
       "id": 2,
-      "limit": 1000,
       "links": [],
-      "query": "",
-      "recent": false,
-      "search": true,
-      "starred": false,
-      "tags": ["panel-tests"],
+      "options": {
+        "maxItems": 1000,
+        "query": "",
+        "showHeadings": false,
+        "showRecentlyViewed": false,
+        "showSearch": true,
+        "showStarred": false,
+        "tags": [
+          "panel-tests"
+        ]
+      },
+      "pluginVersion": "8.1.0-pre",
+      "tags": [
+        "panel-tests"
+      ],
       "timeFrom": null,
       "timeShift": null,
       "title": "tag: panel-tests",
       "type": "dashlist"
     },
     {
-      "folderId": null,
+      "datasource": null,
       "gridPos": {
-        "h": 26,
+        "h": 13,
         "w": 6,
         "x": 12,
         "y": 0
       },
-      "headings": false,
       "id": 3,
-      "limit": 1000,
       "links": [],
-      "query": "",
-      "recent": false,
-      "search": true,
-      "starred": false,
-      "tags": ["gdev", "demo"],
+      "options": {
+        "folderId": null,
+        "maxItems": 1000,
+        "query": "",
+        "showHeadings": false,
+        "showRecentlyViewed": false,
+        "showSearch": true,
+        "showStarred": false,
+        "tags": [
+          "gdev",
+          "demo"
+        ]
+      },
+      "pluginVersion": "8.1.0-pre",
+      "tags": [
+        "gdev",
+        "demo"
+      ],
       "timeFrom": null,
       "timeShift": null,
       "title": "tag: dashboard-demo",
       "type": "dashlist"
     },
     {
-      "folderId": null,
+      "datasource": null,
       "gridPos": {
         "h": 26,
         "w": 6,
         "x": 18,
         "y": 0
       },
-      "headings": false,
       "id": 5,
-      "limit": 1000,
       "links": [],
-      "query": "",
-      "recent": false,
-      "search": true,
-      "starred": false,
-      "tags": ["gdev", "datasource-test"],
+      "options": {
+        "folderId": null,
+        "maxItems": 1000,
+        "query": "",
+        "showHeadings": false,
+        "showRecentlyViewed": false,
+        "showSearch": true,
+        "showStarred": false,
+        "tags": [
+          "gdev",
+          "datasource-test"
+        ]
+      },
+      "pluginVersion": "8.1.0-pre",
+      "tags": [
+        "gdev",
+        "datasource-test"
+      ],
       "timeFrom": null,
       "timeShift": null,
       "title": "Data source tests",
       "type": "dashlist"
     },
     {
-      "folderId": null,
+      "datasource": null,
       "gridPos": {
         "h": 13,
         "w": 6,
         "x": 6,
         "y": 13
       },
-      "headings": false,
       "id": 4,
-      "limit": 1000,
       "links": [],
-      "query": "",
-      "recent": false,
-      "search": true,
-      "starred": false,
-      "tags": ["templating", "gdev"],
+      "options": {
+        "maxItems": 1000,
+        "query": "",
+        "showHeadings": false,
+        "showRecentlyViewed": false,
+        "showSearch": true,
+        "showStarred": false,
+        "tags": [
+          "templating",
+          "gdev"
+        ]
+      },
+      "pluginVersion": "8.1.0-pre",
+      "tags": [
+        "templating",
+        "gdev"
+      ],
       "timeFrom": null,
       "timeShift": null,
       "title": "tag: templating ",
       "type": "dashlist"
+    },
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 13,
+        "w": 6,
+        "x": 12,
+        "y": 13
+      },
+      "id": 8,
+      "links": [],
+      "options": {
+        "maxItems": 1000,
+        "query": "",
+        "showHeadings": false,
+        "showRecentlyViewed": false,
+        "showSearch": true,
+        "showStarred": false,
+        "tags": [
+          "gdev",
+          "transform"
+        ]
+      },
+      "pluginVersion": "8.1.0-pre",
+      "tags": [
+        "gdev",
+        "demo"
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "tag: transforms",
+      "type": "dashlist"
     }
   ],
-  "schemaVersion": 18,
+  "schemaVersion": 30,
   "style": "dark",
   "tags": [],
   "templating": {
@@ -139,11 +222,32 @@
     "to": "now"
   },
   "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
-    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ],
+    "time_options": [
+      "5m",
+      "15m",
+      "1h",
+      "6h",
+      "12h",
+      "24h",
+      "2d",
+      "7d",
+      "30d"
+    ]
   },
   "timezone": "",
   "title": "Grafana Dev Overview & Home",
   "uid": "j6T00KRZz",
   "version": 2
-}
+}

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

@@ -8,6 +8,12 @@
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
         "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
         "type": "dashboard"
       }
     ]
@@ -33,7 +39,8 @@
             "hideFrom": {
               "graph": false,
               "legend": false,
-              "tooltip": false
+              "tooltip": false,
+              "viz": false
             },
             "lineWidth": 0
           },
@@ -105,7 +112,8 @@
             "hideFrom": {
               "graph": false,
               "legend": false,
-              "tooltip": false
+              "tooltip": false,
+              "viz": false
             },
             "lineWidth": 0
           },
@@ -177,7 +185,8 @@
             "hideFrom": {
               "graph": false,
               "legend": false,
-              "tooltip": false
+              "tooltip": false,
+              "viz": false
             },
             "lineWidth": 0
           },
@@ -248,7 +257,8 @@
             "hideFrom": {
               "graph": false,
               "legend": false,
-              "tooltip": false
+              "tooltip": false,
+              "viz": false
             },
             "lineWidth": 0
           },
@@ -319,7 +329,8 @@
             "hideFrom": {
               "graph": false,
               "legend": false,
-              "tooltip": false
+              "tooltip": false,
+              "viz": false
             },
             "lineWidth": 0
           },
@@ -390,10 +401,12 @@
             "hideFrom": {
               "graph": false,
               "legend": false,
-              "tooltip": false
+              "tooltip": false,
+              "viz": false
             },
             "lineWidth": 0
           },
+          "decimals": 7,
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -437,7 +450,7 @@
       },
       "targets": [
         {
-          "csvContent": "Name,Stat1,Stat2\nStockholm, 10, 15\nNew York, 19, 5\nLondon, 10, 1\nLong value, 15,10",
+          "csvContent": "Name,Stat1,Stat2\nStockholm, 10, 15\nNew York, 19, -5\nLondon, 10, 1\nLong value, 15,10",
           "refId": "A",
           "scenarioId": "csv_content"
         }
@@ -462,7 +475,8 @@
             "hideFrom": {
               "graph": false,
               "legend": false,
-              "tooltip": false
+              "tooltip": false,
+              "viz": false
             },
             "lineWidth": 0
           },
@@ -537,5 +551,5 @@
   "timezone": "",
   "title": "BarChart - Panel Tests - Value sizing",
   "uid": "WFlOM-jM1",
-  "version": 3
+  "version": 9
 }

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

@@ -0,0 +1,593 @@
+{
+    "annotations": {
+      "list": [
+        {
+          "builtIn": 1,
+          "datasource": "-- Grafana --",
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "type": "dashboard"
+        }
+      ]
+    },
+    "editable": true,
+    "gnetId": null,
+    "graphTooltip": 0,    
+    "links": [],
+    "panels": [
+      {
+        "datasource": "-- Dashboard --",
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 5,
+              "gradientMode": "scheme",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "lineInterpolation": "smooth",
+              "lineWidth": 3,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "never",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "max": 50,
+            "min": 0,
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "orange",
+                  "value": 20
+                },
+                {
+                  "color": "red",
+                  "value": 30
+                }
+              ]
+            },
+            "unit": "degree"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 7,
+          "w": 11,
+          "x": 0,
+          "y": 0
+        },
+        "id": 9,
+        "maxDataPoints": 45,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom"
+          },
+          "tooltip": {
+            "mode": "single"
+          }
+        },
+        "targets": [
+          {
+            "panelId": 4,
+            "refId": "A"
+          }
+        ],
+        "title": "Color line by discrete tresholds",
+        "type": "timeseries"
+      },
+      {
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "bars",
+              "fillOpacity": 84,
+              "gradientMode": "scheme",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "lineInterpolation": "smooth",
+              "lineWidth": 0,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "never",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "max": 50,
+            "min": 0,
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "orange",
+                  "value": 20
+                },
+                {
+                  "color": "red",
+                  "value": 30
+                }
+              ]
+            },
+            "unit": "degree"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 7,
+          "w": 13,
+          "x": 11,
+          "y": 0
+        },
+        "id": 4,
+        "interval": "80s",
+        "maxDataPoints": 42,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom"
+          },
+          "tooltip": {
+            "mode": "single"
+          }
+        },
+        "targets": [
+          {
+            "max": 40,
+            "min": 0,
+            "noise": 1,
+            "refId": "A",
+            "scenarioId": "random_walk",
+            "spread": 20,
+            "startValue": 1
+          }
+        ],
+        "timeFrom": null,
+        "title": "Color bars by discrete thresholds",
+        "type": "timeseries"
+      },
+      {
+        "datasource": "-- Dashboard --",
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "continuous-GrYlRd"
+            },
+            "custom": {
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 10,
+              "gradientMode": "scheme",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "lineInterpolation": "smooth",
+              "lineWidth": 3,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "never",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "max": 50,
+            "min": 1,
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "blue",
+                  "value": null
+                },
+                {
+                  "color": "green",
+                  "value": 0
+                },
+                {
+                  "color": "orange",
+                  "value": 20
+                },
+                {
+                  "color": "red",
+                  "value": 30
+                }
+              ]
+            },
+            "unit": "degree"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 11,
+          "x": 0,
+          "y": 7
+        },
+        "id": 6,
+        "maxDataPoints": 50,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom"
+          },
+          "tooltip": {
+            "mode": "single"
+          }
+        },
+        "targets": [
+          {
+            "panelId": 4,
+            "refId": "A"
+          }
+        ],
+        "title": "Color line by color scale",
+        "type": "timeseries"
+      },
+      {
+        "datasource": "-- Dashboard --",
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "continuous-GrYlRd"
+            },
+            "custom": {
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "bars",
+              "fillOpacity": 64,
+              "gradientMode": "scheme",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "lineInterpolation": "smooth",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "never",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "max": 50,
+            "min": 1,
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "blue",
+                  "value": null
+                },
+                {
+                  "color": "green",
+                  "value": 0
+                },
+                {
+                  "color": "orange",
+                  "value": 20
+                },
+                {
+                  "color": "red",
+                  "value": 30
+                }
+              ]
+            },
+            "unit": "degree"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 13,
+          "x": 11,
+          "y": 7
+        },
+        "id": 10,
+        "maxDataPoints": 45,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom"
+          },
+          "tooltip": {
+            "mode": "single"
+          }
+        },
+        "targets": [
+          {
+            "panelId": 4,
+            "refId": "A"
+          }
+        ],
+        "title": "Color bars by color scale",
+        "type": "timeseries"
+      },
+      {
+        "datasource": "-- Dashboard --",
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "continuous-GrYlRd"
+            },
+            "custom": {
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 64,
+              "gradientMode": "scheme",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "lineInterpolation": "smooth",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "never",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "max": 50,
+            "min": 1,
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "blue",
+                  "value": null
+                },
+                {
+                  "color": "green",
+                  "value": 0
+                },
+                {
+                  "color": "orange",
+                  "value": 20
+                },
+                {
+                  "color": "red",
+                  "value": 30
+                }
+              ]
+            },
+            "unit": "degree"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 6,
+          "w": 24,
+          "x": 0,
+          "y": 15
+        },
+        "id": 7,
+        "maxDataPoints": 50,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom"
+          },
+          "tooltip": {
+            "mode": "single"
+          }
+        },
+        "targets": [
+          {
+            "panelId": 4,
+            "refId": "A"
+          }
+        ],
+        "title": "Color line by color scale",
+        "type": "timeseries"
+      },
+      {
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "continuous-GrYlRd"
+            },
+            "custom": {
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "points",
+              "fillOpacity": 10,
+              "gradientMode": "scheme",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "lineInterpolation": "smooth",
+              "lineWidth": 3,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "never",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "max": 50,
+            "min": 1,
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "blue",
+                  "value": null
+                },
+                {
+                  "color": "green",
+                  "value": 0
+                },
+                {
+                  "color": "orange",
+                  "value": 20
+                },
+                {
+                  "color": "red",
+                  "value": 30
+                }
+              ]
+            },
+            "unit": "degree"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 13,
+          "w": 24,
+          "x": 0,
+          "y": 21
+        },
+        "id": 8,
+        "maxDataPoints": 250,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom"
+          },
+          "tooltip": {
+            "mode": "single"
+          }
+        },
+        "targets": [
+          {
+            "max": 45,
+            "min": 20,
+            "noise": 0,
+            "refId": "A",
+            "scenarioId": "random_walk",
+            "spread": 12,
+            "startValue": 40
+          },
+          {
+            "hide": false,
+            "max": 20,
+            "min": 1,
+            "noise": 0,
+            "refId": "B",
+            "scenarioId": "random_walk",
+            "spread": 10
+          }
+        ],
+        "title": "Color line by color scale",
+        "type": "timeseries"
+      }
+    ],
+    "refresh": false,
+    "schemaVersion": 30,
+    "style": "dark",
+    "tags": [
+      "gdev",
+      "panel-tests"
+    ],
+    "templating": {
+      "list": []
+    },
+    "time": {
+      "from": "now-6h",
+      "to": "now"
+    },
+    "timepicker": {},
+    "timezone": "",
+    "title": "Panel Tests - Graph NG - By value color schemes",
+    "uid": "aBXrJ0R7z",
+    "version": 20
+  }

devenv/dev-dashboards/panel-piechart/panel_test_piechart.json

@@ -14,7 +14,7 @@
   },
   "editable": true,
   "gnetId": null,
-  "graphTooltip": 0,
+  "graphTooltip": 1,
   "id": 479,
   "links": [],
   "panels": [

devenv/dev-dashboards/transforms/config-from-query.json

@@ -0,0 +1,568 @@
+{
+    "annotations": {
+      "list": [
+        {
+          "builtIn": 1,
+          "datasource": "-- Grafana --",
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "target": {
+            "limit": 100,
+            "matchAny": false,
+            "tags": [],
+            "type": "dashboard"
+          },
+          "type": "dashboard"
+        }
+      ]
+    },
+    "description": "",
+    "editable": true,
+    "gnetId": null,
+    "graphTooltip": 0,
+    "links": [],
+    "panels": [
+      {
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "line"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 9,
+          "w": 12,
+          "x": 0,
+          "y": 0
+        },
+        "id": 2,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom"
+          },
+          "tooltip": {
+            "mode": "single"
+          }
+        },
+        "targets": [
+          {
+            "hide": false,
+            "max": 100,
+            "min": 1,
+            "refId": "A",
+            "scenarioId": "random_walk",
+            "startValue": 50
+          },
+          {
+            "alias": "",
+            "csvContent": "min,max,threshold1\n1000,1000,8000\n0,100,80\n\n",
+            "refId": "config",
+            "scenarioId": "csv_content"
+          }
+        ],
+        "title": "Min, max, threshold from separate query",
+        "transformations": [
+          {
+            "id": "configFromData",
+            "options": {
+              "configRefId": "config",
+              "mappings": []
+            }
+          }
+        ],
+        "type": "timeseries"
+      },
+      {
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {
+              "align": "left",
+              "displayMode": "auto"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": [
+            {
+              "matcher": {
+                "id": "byName",
+                "options": "SensorA"
+              },
+              "properties": [
+                {
+                  "id": "custom.displayMode",
+                  "value": "color-text"
+                }
+              ]
+            }
+          ]
+        },
+        "gridPos": {
+          "h": 9,
+          "w": 12,
+          "x": 12,
+          "y": 0
+        },
+        "id": 5,
+        "options": {
+          "showHeader": true
+        },
+        "pluginVersion": "8.1.0-pre",
+        "targets": [
+          {
+            "csvContent": "Name, Value, SensorA, MyUnit, MyColor\nGoogle, 10, 50, km/h, blue\nGoogle, 100, 100,km/h, orange\n",
+            "hide": false,
+            "refId": "A",
+            "scenarioId": "csv_content"
+          }
+        ],
+        "title": "Custom mappings and apply to self",
+        "transformations": [
+          {
+            "id": "configFromData",
+            "options": {
+              "applyTo": {
+                "id": "byName",
+                "options": "SensorA"
+              },
+              "applyToConfig": true,
+              "configRefId": "A",
+              "mappings": [
+                {
+                  "configProperty": "unit",
+                  "fieldName": "MyUnit",
+                  "handlerKey": "unit"
+                },
+                {
+                  "fieldName": "MyColor",
+                  "handlerKey": "color"
+                }
+              ]
+            }
+          }
+        ],
+        "type": "table"
+      },
+      {
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {
+              "align": "center",
+              "displayMode": "auto"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": [
+            {
+              "matcher": {
+                "id": "byName",
+                "options": "Value"
+              },
+              "properties": [
+                {
+                  "id": "custom.displayMode",
+                  "value": "color-background-solid"
+                }
+              ]
+            }
+          ]
+        },
+        "gridPos": {
+          "h": 5,
+          "w": 12,
+          "x": 0,
+          "y": 9
+        },
+        "id": 7,
+        "options": {
+          "showHeader": true
+        },
+        "pluginVersion": "8.1.0-pre",
+        "targets": [
+          {
+            "csvContent": "ID, DisplayText\n21412312312, Homer\n12421412413, Simpsons \n12321312313, Bart",
+            "hide": false,
+            "refId": "A",
+            "scenarioId": "csv_content"
+          }
+        ],
+        "title": "Mapping data",
+        "transformations": [
+          {
+            "id": "configFromData",
+            "options": {
+              "applyToConfig": true,
+              "configRefId": "A",
+              "mappings": [
+                {
+                  "fieldName": "Color",
+                  "handlerKey": "mappings.color"
+                },
+                {
+                  "fieldName": "Value",
+                  "handlerKey": "mappings.value"
+                }
+              ]
+            }
+          }
+        ],
+        "type": "table"
+      },
+      {
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {
+              "align": "center",
+              "displayMode": "auto"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": [
+            {
+              "matcher": {
+                "id": "byName",
+                "options": "Value"
+              },
+              "properties": [
+                {
+                  "id": "custom.displayMode",
+                  "value": "color-background-solid"
+                }
+              ]
+            }
+          ]
+        },
+        "gridPos": {
+          "h": 10,
+          "w": 12,
+          "x": 12,
+          "y": 9
+        },
+        "id": 6,
+        "options": {
+          "showHeader": true
+        },
+        "pluginVersion": "8.1.0-pre",
+        "targets": [
+          {
+            "csvContent": "Value, Color\nOK, blue\nPretty bad, red\nYay it's green, green\nSomething is off, orange\nNo idea, #88AA00\nAm I purple?, purple",
+            "hide": false,
+            "refId": "A",
+            "scenarioId": "csv_content"
+          }
+        ],
+        "title": "Value mappings from query result applied to itself",
+        "transformations": [
+          {
+            "id": "configFromData",
+            "options": {
+              "applyTo": {
+                "id": "byName",
+                "options": "Value"
+              },
+              "applyToConfig": true,
+              "configRefId": "A",
+              "mappings": [
+                {
+                  "fieldName": "Color",
+                  "handlerKey": "mappings.color"
+                },
+                {
+                  "fieldName": "Value",
+                  "handlerKey": "mappings.value"
+                }
+              ]
+            }
+          }
+        ],
+        "type": "table"
+      },
+      {
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {
+              "align": "center",
+              "displayMode": "auto"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 5,
+          "w": 12,
+          "x": 0,
+          "y": 14
+        },
+        "id": 8,
+        "options": {
+          "showHeader": true
+        },
+        "pluginVersion": "8.1.0-pre",
+        "targets": [
+          {
+            "csvContent": "ID, Value\n21412312312, 100\n12421412413, 20\n12321312313, 10",
+            "hide": false,
+            "refId": "A",
+            "scenarioId": "csv_content"
+          }
+        ],
+        "title": "Display data",
+        "transformations": [
+          {
+            "id": "configFromData",
+            "options": {
+              "applyToConfig": true,
+              "configRefId": "A",
+              "mappings": [
+                {
+                  "fieldName": "Color",
+                  "handlerKey": "mappings.color"
+                },
+                {
+                  "fieldName": "Value",
+                  "handlerKey": "mappings.value"
+                }
+              ]
+            }
+          }
+        ],
+        "type": "table"
+      },
+      {
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "axisSoftMin": 0,
+              "fillOpacity": 80,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "lineWidth": 1
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 10,
+          "w": 12,
+          "x": 0,
+          "y": 19
+        },
+        "id": 9,
+        "options": {
+          "barWidth": 0.97,
+          "groupWidth": 0.7,
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom"
+          },
+          "orientation": "horizontal",
+          "showValue": "auto",
+          "text": {},
+          "tooltip": {
+            "mode": "single"
+          }
+        },
+        "pluginVersion": "8.1.0-pre",
+        "targets": [
+          {
+            "csvContent": "ID, Value\nA21412312312, 100\nA12421412413, 20\nA12321312313, 10\n",
+            "hide": false,
+            "refId": "data",
+            "scenarioId": "csv_content"
+          },
+          {
+            "csvContent": "ID, DisplayText\nA21412312312, Homer\nA12421412413, Marge \nA12321312313, Bart",
+            "hide": false,
+            "refId": "mappings",
+            "scenarioId": "csv_content"
+          }
+        ],
+        "title": "Value mapping ID -> DisplayText from separate query",
+        "transformations": [
+          {
+            "id": "configFromData",
+            "options": {
+              "applyTo": {
+                "id": "byName",
+                "options": "ID"
+              },
+              "applyToConfig": false,
+              "configRefId": "mappings",
+              "mappings": [
+                {
+                  "fieldName": "ID",
+                  "handlerKey": "mappings.value"
+                },
+                {
+                  "fieldName": "DisplayText",
+                  "handlerKey": "mappings.text"
+                }
+              ]
+            }
+          }
+        ],
+        "type": "barchart"
+      }
+    ],
+    "refresh": "",
+    "schemaVersion": 30,
+    "style": "dark",
+    "tags": [
+      "gdev",
+      "transform"
+    ],
+    "templating": {
+      "list": []
+    },
+    "time": {
+      "from": "now-6h",
+      "to": "now"
+    },
+    "timepicker": {},
+    "timezone": "",
+    "title": "Transforms - Config from query",
+    "uid": "Juj4_7ink",
+    "version": 1
+  }

devenv/dev-dashboards/transforms/rows-to-fields.json

@@ -0,0 +1,615 @@
+{
+    "annotations": {
+      "list": [
+        {
+          "builtIn": 1,
+          "datasource": "-- Grafana --",
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "target": {
+            "limit": 100,
+            "matchAny": false,
+            "tags": [],
+            "type": "dashboard"
+          },
+          "type": "dashboard"
+        }
+      ]
+    },
+    "editable": true,
+    "gnetId": null,
+    "graphTooltip": 0,
+    "links": [],
+    "panels": [
+      {
+        "datasource": "-- Dashboard --",
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {
+              "align": "left",
+              "displayMode": "auto"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 5,
+          "w": 12,
+          "x": 0,
+          "y": 0
+        },
+        "id": 8,
+        "options": {
+          "showHeader": true
+        },
+        "pluginVersion": "8.1.0-pre",
+        "targets": [
+          {
+            "panelId": 2,
+            "refId": "A"
+          }
+        ],
+        "title": "Raw data",
+        "type": "table"
+      },
+      {
+        "datasource": "-- Dashboard --",
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {
+              "align": "left",
+              "displayMode": "auto"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": [
+            {
+              "matcher": {
+                "id": "byName",
+                "options": "Value"
+              },
+              "properties": [
+                {
+                  "id": "custom.width",
+                  "value": 82
+                }
+              ]
+            },
+            {
+              "matcher": {
+                "id": "byName",
+                "options": "Unit"
+              },
+              "properties": [
+                {
+                  "id": "custom.width",
+                  "value": 108
+                }
+              ]
+            }
+          ]
+        },
+        "gridPos": {
+          "h": 5,
+          "w": 12,
+          "x": 12,
+          "y": 0
+        },
+        "id": 7,
+        "options": {
+          "showHeader": true,
+          "sortBy": []
+        },
+        "pluginVersion": "8.1.0-pre",
+        "targets": [
+          {
+            "panelId": 3,
+            "refId": "A"
+          }
+        ],
+        "title": "Raw data",
+        "type": "table"
+      },
+      {
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 7,
+          "w": 12,
+          "x": 0,
+          "y": 5
+        },
+        "id": 2,
+        "options": {
+          "colorMode": "value",
+          "graphMode": "none",
+          "justifyMode": "auto",
+          "orientation": "auto",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "text": {},
+          "textMode": "auto"
+        },
+        "pluginVersion": "8.1.0-pre",
+        "targets": [
+          {
+            "csvContent": "Name,Value,Unit,Color\nTemperature,10,degree,green\nPressure,100,bar,blue\nSpeed,30,km/h,red",
+            "refId": "A",
+            "scenarioId": "csv_content"
+          }
+        ],
+        "title": "Unit and color from data",
+        "transformations": [
+          {
+            "id": "rowsToFields",
+            "options": {}
+          }
+        ],
+        "type": "stat"
+      },
+      {
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [],
+            "min": 0,
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 7,
+          "w": 12,
+          "x": 12,
+          "y": 5
+        },
+        "id": 3,
+        "options": {
+          "orientation": "auto",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "showThresholdLabels": true,
+          "showThresholdMarkers": true,
+          "text": {}
+        },
+        "pluginVersion": "8.1.0-pre",
+        "targets": [
+          {
+            "csvContent": "Name,Value,Unit,min,max, threshold1\nTemperature,10,degree,0,50,30\nPressure,100,Pa,0,300,200\nSpeed,30,km/h,0,150,110",
+            "refId": "A",
+            "scenarioId": "csv_content"
+          }
+        ],
+        "title": "Min, Max & Thresholds from data",
+        "transformations": [
+          {
+            "id": "rowsToFields",
+            "options": {}
+          }
+        ],
+        "type": "gauge"
+      },
+      {
+        "datasource": "-- Dashboard --",
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {
+              "align": "left",
+              "displayMode": "auto"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 5,
+          "w": 12,
+          "x": 0,
+          "y": 12
+        },
+        "id": 10,
+        "options": {
+          "showHeader": true
+        },
+        "pluginVersion": "8.1.0-pre",
+        "targets": [
+          {
+            "panelId": 9,
+            "refId": "A"
+          }
+        ],
+        "title": "Raw data",
+        "type": "table"
+      },
+      {
+        "datasource": "-- Dashboard --",
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {
+              "align": "left",
+              "displayMode": "auto"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": [
+            {
+              "matcher": {
+                "id": "byName",
+                "options": "Value"
+              },
+              "properties": [
+                {
+                  "id": "custom.width",
+                  "value": 82
+                }
+              ]
+            },
+            {
+              "matcher": {
+                "id": "byName",
+                "options": "Unit"
+              },
+              "properties": [
+                {
+                  "id": "custom.width",
+                  "value": 108
+                }
+              ]
+            }
+          ]
+        },
+        "gridPos": {
+          "h": 5,
+          "w": 12,
+          "x": 12,
+          "y": 12
+        },
+        "id": 12,
+        "options": {
+          "showHeader": true,
+          "sortBy": []
+        },
+        "pluginVersion": "8.1.0-pre",
+        "targets": [
+          {
+            "panelId": 11,
+            "refId": "A"
+          }
+        ],
+        "title": "Raw data (Custom mapping)",
+        "type": "table"
+      },
+      {
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "continuous-GrYlRd"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 7,
+          "w": 12,
+          "x": 0,
+          "y": 17
+        },
+        "id": 9,
+        "options": {
+          "displayMode": "gradient",
+          "orientation": "auto",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "showUnfilled": true,
+          "text": {}
+        },
+        "pluginVersion": "8.1.0-pre",
+        "targets": [
+          {
+            "csvContent": "Name,Value,Unit,Min,Max\nTemperature,20,degree,0,50\nPressure,150,Pa,0,300\nSpeed,100,km/h,0,110",
+            "refId": "A",
+            "scenarioId": "csv_content"
+          }
+        ],
+        "title": "Min max from data",
+        "transformations": [
+          {
+            "id": "rowsToFields",
+            "options": {}
+          }
+        ],
+        "type": "bargauge"
+      },
+      {
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [],
+            "min": 0,
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 7,
+          "w": 12,
+          "x": 12,
+          "y": 17
+        },
+        "id": 11,
+        "options": {
+          "orientation": "auto",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "showThresholdLabels": true,
+          "showThresholdMarkers": true,
+          "text": {}
+        },
+        "pluginVersion": "8.1.0-pre",
+        "targets": [
+          {
+            "csvContent": "Name,Value,Type,Quota, Warning\nTemperature,25,degree,50,30\nPressure,100,Pa,300,200\nSpeed,30,km/h,150,130",
+            "refId": "A",
+            "scenarioId": "csv_content"
+          }
+        ],
+        "title": "Custom mapping",
+        "transformations": [
+          {
+            "id": "rowsToFields",
+            "options": {
+              "mappings": [
+                {
+                  "configProperty": "unit",
+                  "fieldName": "Type",
+                  "handlerKey": "unit"
+                },
+                {
+                  "configProperty": "max",
+                  "fieldName": "Quota",
+                  "handlerKey": "max"
+                },
+                {
+                  "configProperty": "threshold1",
+                  "fieldName": "Warning",
+                  "handlerKey": "threshold1"
+                }
+              ]
+            }
+          }
+        ],
+        "type": "gauge"
+      },
+      {
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 7,
+          "w": 12,
+          "x": 0,
+          "y": 24
+        },
+        "id": 13,
+        "options": {
+          "colorMode": "value",
+          "graphMode": "none",
+          "justifyMode": "auto",
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "text": {},
+          "textMode": "auto"
+        },
+        "pluginVersion": "8.1.0-pre",
+        "targets": [
+          {
+            "csvContent": "Name, City, Country, Value\nSensorA, Stockholm, Sweden, 20\nSensorB, London, England, 50\nSensorC, New York, USA,100",
+            "refId": "A",
+            "scenarioId": "csv_content"
+          }
+        ],
+        "title": "Extra string fields to labels",
+        "transformations": [
+          {
+            "id": "rowsToFields",
+            "options": {}
+          }
+        ],
+        "type": "stat"
+      }
+    ],
+    "refresh": "",
+    "schemaVersion": 30,
+    "style": "dark",
+    "tags": [
+      "gdev",
+      "transform"
+    ],
+    "templating": {
+      "list": []
+    },
+    "time": {
+      "from": "now-6h",
+      "to": "now"
+    },
+    "timepicker": {},
+    "timezone": "",
+    "title": "Transforms - Rows to fields",
+    "uid": "PMtIInink",
+    "version": 1
+  }

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

@@ -1,15 +1,19 @@
-  elasticsearch:
-    image: elasticsearch:2.4.1
-    command: elasticsearch -Des.network.host=0.0.0.0
-    ports:
-      - "9200:9200"
-      - "9300:9300"
-    volumes:
-      - ./docker/blocks/elastic/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
+# You need to run 'sysctl -w vm.max_map_count=262144' on the host machine
 
-  fake-elastic-data:
-    image: grafana/fake-data-gen
-    network_mode: bridge
+  elasticsearch-latest:
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.13.2
+    command: elasticsearch
     environment:
-      FD_DATASOURCE: elasticsearch
-      FD_PORT: 9200
+      - "discovery.type=single-node"
+    ports:
+      - "14200:9200"
+      - "14300:9300"
+
+  fake-elastic-latest-data:
+    image: grafana/fake-data-gen
+    links:
+      - elasticsearch-latest
+    environment:
+      FD_SERVER: elasticsearch-latest
+      FD_DATASOURCE: elasticsearch7
+      FD_PORT: 9200

devenv/docker/blocks/elastic/elasticsearch.yml

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

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

@@ -0,0 +1,15 @@
+  elasticsearch2:
+    image: elasticsearch:2.4.1
+    command: elasticsearch -Des.network.host=0.0.0.0
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+    volumes:
+      - ./docker/blocks/elastic2/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
+
+  fake-elastic-data:
+    image: grafana/fake-data-gen
+    network_mode: bridge
+    environment:
+      FD_DATASOURCE: elasticsearch2
+      FD_PORT: 9200

devenv/docker/blocks/elastic2/elasticsearch.yml

@@ -0,0 +1,2 @@
+script.inline: on
+script.indexed: on

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

@@ -0,0 +1,44 @@
+# You need to run 'sysctl -w vm.max_map_count=262144' on the host machine
+
+  elasticsearch77:
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.7.1
+    command: elasticsearch
+    environment:
+      - "discovery.type=single-node"
+    ports:
+      - "13200:9200"
+      - "13300:9300"
+
+  fake-elastic77-data:
+    image: grafana/fake-data-gen
+    links:
+      - elasticsearch77
+    environment:
+      FD_SERVER: elasticsearch77
+      FD_DATASOURCE: elasticsearch7
+      FD_PORT: 9200
+
+  filebeat77:
+    image: docker.elastic.co/beats/filebeat:7.7.1
+    command: filebeat -e -strict.perms=false
+    volumes:
+      - ./docker/blocks/elastic77/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
+      - /var/log:/var/log:ro
+      - ../data/log:/var/log/grafana:ro
+
+  metricbeat77:
+    image: docker.elastic.co/beats/metricbeat:7.7.1
+    command: metricbeat -e -strict.perms=false
+    user: root
+    volumes:
+      - ./docker/blocks/elastic77/metricbeat.yml:/usr/share/metricbeat/metricbeat.yml:ro
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+
+  kibana77:
+    image: docker.elastic.co/kibana/kibana:7.7.1
+    ports:
+      - "5601:5601"
+    links:
+      - elasticsearch77
+    environment:
+      ELASTICSEARCH_HOSTS: http://elasticsearch77:9200

devenv/docker/blocks/elastic77/elasticsearch.yml

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

devenv/docker/blocks/elastic77/metricbeat.yml

@@ -0,0 +1,38 @@
+metricbeat.config:
+  modules:
+    path: ${path.config}/modules.d/*.yml
+    # Reload module configs as they change:
+    reload.enabled: false
+
+metricbeat.autodiscover:
+  providers:
+    - type: docker
+      hints.enabled: true
+
+metricbeat.modules:
+- module: docker
+  metricsets:
+    - "container"
+    - "cpu"
+    - "diskio"
+    - "healthcheck"
+    - "info"
+    #- "image"
+    - "memory"
+    - "network"
+  hosts: ["unix:///var/run/docker.sock"]
+  period: 10s
+  enabled: true
+
+processors:
+  - add_cloud_metadata: ~
+
+output.elasticsearch:
+  hosts: ["elasticsearch77:9200"]
+  index: "metricbeat-%{+yyyy.MM.dd}"
+
+setup.template.name: "metricbeat"
+setup.template.pattern: "metricbeat-*"
+setup.template.settings:
+  index.number_of_shards: 1
+  index.number_of_replicas: 1

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

@@ -24,7 +24,7 @@
       - influxdb
 
   telegraf:
-    image: telegraf:1.10.4
+    image: telegraf:1.19.1
     links:
       - influxdb
     depends_on:

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

@@ -1,5 +1,5 @@
   influxdb1:
-    image: influxdb:1.8.4-alpine
+    image: influxdb:1.8.6
     container_name: influxdb1
     ports:
       - '2004:2004'
@@ -22,7 +22,7 @@
       FD_PORT: 8086
 
   telegraf-influxdb1:
-    image: telegraf:1.10.4
+    image: telegraf:1.19.1
     links:
       - influxdb1
     volumes:

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

@@ -1,7 +1,7 @@
   jaeger:
     image: jaegertracing/all-in-one:latest
     ports:
-      - "6831:6831"
+      - "6831:6831/udp"
       - "16686:16686"
   # Additional loki to generate some traces
   # datasource URL: http://localhost:3100/

devenv/docker/blocks/slow_proxy/.env

@@ -1,2 +1,2 @@
-ORIGIN_SERVER=http://localhost:9090/
+ORIGIN_SERVER=http://host.docker.internal:9090/
 SLEEP_DURATION=60s

devenv/docker/blocks/slow_proxy/Dockerfile

@@ -1,7 +1,11 @@
-
-FROM golang:latest
+FROM golang:latest as builder
 ADD main.go /
 WORKDIR /
-RUN GO111MODULE=off go build -o main .
+RUN go mod init proxy
+RUN CGO_ENABLED=0 go build -o main .
+
+FROM scratch
+WORKDIR /
 EXPOSE 3011
+COPY --from=builder /main /main
 ENTRYPOINT ["/main"]

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

@@ -1,8 +1,9 @@
   slow_proxy:
     build: docker/blocks/slow_proxy
-    network_mode: host
     ports:
       - "3011:3011"
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     environment:
       ORIGIN_SERVER: ${ORIGIN_SERVER}
       SLEEP_DURATION: ${SLEEP_DURATION}

devenv/docker/blocks/slow_proxy/main.go

@@ -12,12 +12,14 @@ import (
 func main() {
 	origin := os.Getenv("ORIGIN_SERVER")
 	if origin == "" {
-		origin = "http://localhost:9090/"
+		// it is never not-set, the default is in the `.env` file
+		log.Fatalf("missing env-variable ORIGIN_SERVER")
 	}
 
 	sleepDurationStr := os.Getenv("SLEEP_DURATION")
 	if sleepDurationStr == "" {
-		sleepDurationStr = "60s"
+		// it is never not-set, the default is in the `.env` file
+		log.Fatalf("missing env-variable SLEEP_DURATION")
 	}
 
 	sleep, err := time.ParseDuration(sleepDurationStr)

devenv/docker/blocks/slow_proxy_mac/Dockerfile

@@ -1,7 +0,0 @@
-
-FROM golang:latest
-ADD main.go /
-WORKDIR /
-RUN GO111MODULE=off go build -o main .
-EXPOSE 3011
-ENTRYPOINT ["/main"]

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

@@ -1,6 +0,0 @@
-  slow_proxy_mac:
-    build: docker/blocks/slow_proxy_mac
-    ports:
-      - '3011:3011'
-    environment:
-      ORIGIN_SERVER: 'http://host.docker.internal:9090/'

devenv/docker/blocks/slow_proxy_mac/main.go

@@ -1,31 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-	"net/http"
-	"net/http/httputil"
-	"net/url"
-	"os"
-	"time"
-)
-
-func main() {
-	origin := os.Getenv("ORIGIN_SERVER")
-	if origin == "" {
-		origin = "http://host.docker.internal:9090/"
-	}
-
-	sleep := time.Minute
-
-	originURL, _ := url.Parse(origin)
-	proxy := httputil.NewSingleHostReverseProxy(originURL)
-
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		fmt.Printf("sleeping for %s then proxying request: %s", sleep.String(), r.RequestURI)
-		<-time.After(sleep)
-		proxy.ServeHTTP(w, r)
-	})
-
-	log.Fatal(http.ListenAndServe(":3011", nil))
-}

docs/sources/_index.md

@@ -1,8 +1,8 @@
 +++
 title = "Grafana documentation"
-description = "Guides, installation, and feature documentation"
+description = "Guides, Installation and Feature Documentation"
 keywords = ["grafana", "installation", "documentation"]
-aliases = ["/docs/grafana/latest/guides/reference/admin"]
+aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin", "/docs/grafana/v3.1"]
 +++
 
 # Grafana documentation

docs/sources/administration/configuration.md

@@ -8,15 +8,19 @@ weight = 150
 
 # Configuration
 
-Grafana has default and custom configuration files. You can customize your Grafana instance by modifying the custom configuration file or by using environment variables. To see the list of settings for a Grafana instance, refer to [View server settings]({{< relref "view-server/view-server-settings.md" >}}).
+Grafana has a number of configuration options that you can specify in a `.ini` configuration file or specified using environment variables.
 
-> **Note:** After you add custom options, [uncomment](#remove-comments-in-the-ini-files) the relevant sections of the configuration file. Restart Grafana for your changes to take effect.
+> **Note:** You must restart Grafana for any configuration changes to take effect.
 
-## Configuration file location
+To see all settings currently applied to the Grafana server, refer to [View server settings]({{< relref "view-server/view-server-settings.md" >}}).
 
-The default settings for a Grafana instance are stored in the `$WORKING_DIR/conf/defaults.ini` file. _Do not_ change the location in this file. 
+## Config file locations
 
-Depending on your OS, your custom configuration file is either the `$WORKING_DIR/conf/defaults.ini` file or the `/usr/local/etc/grafana/grafana.ini` file. The custom configuration file path can be overridden using the `--config` parameter.
+_Do not_ change `defaults.ini`! Grafana defaults are stored in this file. Depending on your OS, make all configuration changes in either `custom.ini` or `grafana.ini`.
+
+- Default configuration from `$WORKING_DIR/conf/defaults.ini`
+- Custom configuration from `$WORKING_DIR/conf/custom.ini`
+- The custom configuration file path can be overridden using the `--config` parameter
 
 ### Linux
 
@@ -28,23 +32,25 @@ Refer to [Configure a Grafana Docker image]({{< relref "configure-docker.md" >}}
 
 ### Windows
 
-On Windows, the `sample.ini` file is located in the same directory as `defaults.ini` file. It contains all the settings commented out. Copy `sample.ini` and name it `custom.ini`.
+`sample.ini` is in the same directory as `defaults.ini` and contains all the settings commented out. Copy `sample.ini` and name it `custom.ini`.
 
 ### macOS
 
-By default, the configuration file is located at `/usr/local/etc/grafana/grafana.ini`. For a Grafana instance installed using Homebrew, edit the `grafana.ini` file directly. Otherwise, add a configuration file named `custom.ini` to the `conf` folder to override the settings defined in `conf/defaults.ini`.
+By default, the configuration file is located at `/usr/local/etc/grafana/grafana.ini`. For a Grafana instance installed using Homebrew, edit the `grafana.ini` file directly. Otherwise, add a configuration file named `custom.ini` to the `conf` folder to override any of the settings defined in `conf/defaults.ini`.
 
-## Remove comments in the .ini files
+## Comments in .ini Files
 
-Grafana uses semicolons (the `;` char) to comment out lines in a `.ini` file. You must uncomment each line in the `custom.ini` or the `grafana.ini` file that you are modify by removing `;` from the beginning of that line. Otherwise your changes will be ignored.
+Semicolons (the `;` char) are the standard way to comment out lines in a `.ini` file. If you want to change a setting, you must delete the semicolon (`;`) in front of the setting before it will work.
 
-For example:
+**Example**
 
 ```
 # The HTTP port  to use
 ;http_port = 3000
 ```
 
+A common problem is forgetting to uncomment a line in the `custom.ini` (or `grafana.ini`) file which causes the configuration option to be ignored.
+
 ## Configure with environment variables
 
 All options in the configuration file can be overridden using environment variables using the syntax:
@@ -196,15 +202,14 @@ Or redirect port 80 to the Grafana port using:
 $ sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 3000
 ```
 
-Another way is put a webserver like Nginx or Apache in front of Grafana and have them proxy requests to Grafana.
+Another way is to put a web server like Nginx or Apache in front of Grafana and have them proxy requests to Grafana.
 
 ### domain
 
-This setting is only used in as a part of the `root_url` setting (see below). Important if you use GitHub or Google OAuth.
 
 ### enforce_domain
 
-Redirect to correct domain if host header does not match domain. Prevents DNS rebinding attacks. Default is `false`.
+Redirect to correct domain if the host header does not match the domain. Prevents DNS rebinding attacks. Default is `false`.
 
 ### root_url
 
@@ -418,6 +423,7 @@ For more details check the [Transport.MaxConnsPerHost](https://golang.org/pkg/ne
 The maximum number of idle connections that Grafana will maintain. Default is `100`. For more details check the [Transport.MaxIdleConns](https://golang.org/pkg/net/http/#Transport.MaxIdleConns) documentation.
 
 ### max_idle_connections_per_host
+[Deprecated - use max_idle_connections instead]
 
 The maximum number of idle connections per host that Grafana will maintain. Default is `2`. For more details check the [Transport.MaxIdleConnsPerHost](https://golang.org/pkg/net/http/#Transport.MaxIdleConnsPerHost) documentation.
 
@@ -903,7 +909,11 @@ Default is `false`.
 
 ### templates_pattern
 
-Default is `emails/*.html`.
+Enter a comma separated list of template patterns. Default is `emails/*.html, emails/*.txt`.
+
+### content_types
+
+Enter a comma-separated list of content types that should be included in the emails that are sent. List the content types according descending preference, e.g. `text/html, text/plain` for HTML as the most preferred. The order of the parts is significant as the mail clients will use the content type that is supported and most preferred by the sender. Supported content types are `text/html` and `text/plain`. Default is `text/html`.
 
 <hr>
 
@@ -1662,3 +1672,26 @@ Used as the default time zone for user preferences. Can be either `browser` for
 ### enabled
 
 Set this to `false` to disable expressions and hide them in the Grafana UI. Default is `true`.
+
+## [geomap]
+
+This section controls the defaults settings for Geomap Plugin.
+
+### default_baselayer_config
+
+The json config used to define the default base map. Four base map options to choose from are `carto`, `esriXYZTiles`, `xyzTiles`, `standard`.
+For example, to set cartoDB light as the default base layer:
+
+```ini
+default_baselayer_config = `{
+  "type": "xyz",
+  "config": {
+    "attribution": "Open street map",
+    "url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png"
+  }
+}`
+```
+
+### enable_custom_baselayers
+
+Set this to `true` to disable loading other custom base maps and hide them in the Grafana UI. Default is `false`.

docs/sources/administration/image_rendering.md

@@ -158,13 +158,13 @@ libx11-6 libx11-xcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3
 On Debian 9 (Stretch) the following dependencies have been confirmed as needed for the image rendering to function.
 
 ```bash
-libx11 libcairo bcairo2 libcairo2 libxtst6 libxcomposite1 libx11-xcb1 libxcursor1 libxdamage1 libnss3 libcups libcups2 libXss libXss1 libxss1 libxrandr2 libasound2 libatk1.0-0 libatk-bridge2.0-0 libpangocairo-1.0-0 libgtk-3-0
+libx11 libcairo bcairo2 libcairo2 libxtst6 libxcomposite1 libx11-xcb1 libxcursor1 libxdamage1 libnss3 libcups libcups2 libXss libXss1 libxss1 libxrandr2 libasound2 libatk1.0-0 libatk-bridge2.0-0 libpangocairo-1.0-0 libgtk-3-0 libgbm1
 ```
 
 On Debian 10 (Buster) the following dependencies have been confirmed as needed for the image rendering to function.
 
 ```bash
-libxdamage1 libxext6 libxi6 libxtst6 libnss3 libnss3 libcups2 libxss1 libxrandr2 libasound2 libatk1.0-0 libatk-bridge2.0-0 libpangocairo-1.0-0 libpango-1.0-0 libcairo2 libatspi2.0-0 libgtk3.0-cil libgdk3.0-cil libx11-xcb-dev
+libxdamage1 libxext6 libxi6 libxtst6 libnss3 libnss3 libcups2 libxss1 libxrandr2 libasound2 libatk1.0-0 libatk-bridge2.0-0 libpangocairo-1.0-0 libpango-1.0-0 libcairo2 libatspi2.0-0 libgtk3.0-cil libgdk3.0-cil libx11-xcb-dev libgbm1
 ```
 
 **Centos:**
@@ -208,5 +208,5 @@ instead of the pre-packaged version of Chromium.
 To override the path to the Chrome/Chromium executable, set an environment variable and make sure that it's available for the Grafana process. For example:
 
 ```bash
-export GF_RENDERER_PLUGIN_CHROME_BIN="/usr/bin/chromium-browser"
+export GF_PLUGIN_RENDERING_CHROME_BIN="/usr/bin/chromium-browser"
 ```

docs/sources/administration/provisioning.md

@@ -439,11 +439,11 @@ The following sections detail the supported settings and secure settings for eac
 
 #### Alert notification `discord`
 
-| Name       | Secure setting |
-| ---------- | -------------- |
-| url        | yes            |
-| avatar_url |                |
-| content    |                |
+| Name           | Secure setting |
+| -------------- | -------------- |
+| url            | yes            |
+| avatar_url     |                |
+| message        |                |
 
 #### Alert notification `slack`
 

docs/sources/administration/set-up-for-high-availability.md

@@ -18,7 +18,7 @@ and other persistent data. So the default embedded SQLite database will not work
 
 First, you need to set up MySQL or Postgres on another server and configure Grafana to use that database.
 You can find the configuration for doing that in the [[database]]({{< relref "../administration/configuration.md#database" >}}) section in the Grafana config.
-Grafana will now persist all long term data in the database. How to configure the database for high availability is out of scope for this guide. We recommend finding an expert on the database you're using.
+Grafana will now persist all long term data in the database. How to configure the database for high availability is out of scope for this guide. We recommend finding an expert on for the database you're using.
 
 ## Alerting
 

docs/sources/alerting/_index.md

@@ -1,12 +1,11 @@
 +++
 title = "Alerts"
-aliases = ["/docs/grafana/latest/alerting/rules/", "/docs/grafana/latest/alerting/metrics/"]
 weight = 110
 +++
 
 # Grafana alerts
 
-Alerts allow you to know about problems in your systems moments after they occur. Robust and actionable alerts help you identify and resolve issues quickly, minimizing disruption to your services. 
+Alerts allow you to know about problems in your systems moments after they occur. Robust and actionable alerts help you identify and resolve issues quickly, minimizing disruption to your services.
 
 Grafana 8.0 has new and improved alerts. The new alerting system are an [opt-in]({{< relref "./unified-alerting/opt-in.md" >}}) feature that centralizes alerting information for Grafana managed alerts and alerts from Prometheus-compatible data sources in one UI and API.
 

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

@@ -1,6 +1,5 @@
 +++
 title = "Legacy Grafana Alerts"
-aliases = ["/docs/grafana/latest/alerting/rules/", "/docs/grafana/latest/alerting/metrics/"]
 weight = 114
 +++
 

docs/sources/alerting/old-alerting/add-notification-template.md

@@ -2,6 +2,7 @@
 title = "Alert notification templating"
 keywords = ["grafana", "documentation", "alerting", "alerts", "notification", "templating"]
 weight = 110
+aliases = ["/docs/grafana/latest/alerting/add-notification-template/"]
 +++
 
 # Alert notification templating

docs/sources/alerting/old-alerting/create-alerts.md

@@ -3,6 +3,7 @@ title = "Create alerts"
 description = "Configure alert rules"
 keywords = ["grafana", "alerting", "guide", "rules"]
 weight = 200
+aliases = ["/docs/grafana/latest/alerting/create-alerts/"]
 +++
 
 # Create alerts

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

@@ -3,6 +3,7 @@ title = "Alert notifications"
 description = "Alerting notifications guide"
 keywords = ["Grafana", "alerting", "guide", "notifications"]
 weight = 100
+aliases = ["/docs/grafana/latest/alerting/notifications/"]
 +++
 
 # Alert notifications
@@ -222,8 +223,8 @@ In DingTalk PC Client:
 
 ### Discord
 
-To set up Discord, you must create a Discord channel webhook. For instructions on how to create the channel, refer to 
-[Intro to Webhooks](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks) f.
+To set up Discord, you must create a Discord channel webhook. For instructions on how to create the channel, refer to
+[Intro to Webhooks](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks).
 
 Setting | Description
 ---------- | -----------

docs/sources/alerting/old-alerting/pause-an-alert-rule.md

@@ -3,6 +3,7 @@ title = "Pause alert rule"
 description = "Pause an existing alert rule"
 keywords = ["grafana", "alerting", "guide", "rules", "view"]
 weight = 400
+aliases = ["/docs/grafana/latest/alerting/pause-an-alert-rule/"]
 +++
 
 # Pause an alert rule

docs/sources/alerting/old-alerting/troubleshoot-alerts.md

@@ -3,6 +3,7 @@ title = "Troubleshoot alerts"
 description = "Troubleshoot alert rules"
 keywords = ["grafana", "alerting", "guide", "rules", "troubleshoot"]
 weight = 500
+aliases = ["/docs/grafana/latest/alerting/troubleshoot-alerts/"]
 +++
 
 # Troubleshoot alerts

docs/sources/alerting/old-alerting/view-alerts.md

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

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

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

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

@@ -103,6 +103,15 @@ Labels are key value pairs that categorize or identify an alert. Labels are  use
 
 ![Details section](/static/img/docs/alerting/unified/rule-edit-details-8-0.png 'Details section screenshot')
 
+#### Template variables
+
+The following template variables are available when expanding annotations and labels.
+
+| Name    | Description     |
+| ------- | --------------- |
+| $labels | Labels contains the labels from the query or condition. For example, `{{ $labels.instance }}` and `{{ $labels.job }}`. |
+| $values | Values contains the values of all reduce and math expressions that were evaluated for this alert rule. For example, `{{ $values.A }}`, `{{ $values.A.Labels }}` and `{{ $values.A.Value }}` where `A` is the `refID` of the expression. |
+
 ## Preview alerts
 
 To evaluate the rule and see what alerts it would produce, click **Preview alerts**. It will display a list of alerts with state and value for each one.

docs/sources/alerting/unified-alerting/alerting-rules/rule-list.md

@@ -46,3 +46,7 @@ To edit or delete a rule:
 1. Expand this rule to reveal rule controls. 
 1. Click **Edit** to go to the rule editing form. Make changes following [instructions listed here]({{< relref "./create-grafana-managed-rule.md" >}}).
 1. Click **Delete"** to delete a rule. 
+
+## Opt-out a Loki or Prometheus data source
+
+If you do not want rules to be loaded from a Prometheus or Loki data source, go to its settings page and clear the **Manage alerts via Alerting UI** checkbox.

docs/sources/auth/azuread.md

@@ -9,7 +9,7 @@ weight = 700
 
 > Only available in Grafana v6.7+
 
-The Azure AD authentication provides the possibility to use an Azure Active Directory tenant as an identity provider for Grafana. By using Azure AD Application Roles it is also possible to assign Users and Groups to Grafana roles from the Azure Portal.
+The Azure AD authentication allows you to use an Azure Active Directory tenant as an identity provider for Grafana. You can use Azure AD Application Roles to assign users and groups to Grafana roles from the Azure Portal.
 
 ## Create the Azure AD application
 
@@ -23,22 +23,27 @@ To enable the Azure AD OAuth2 you must register your application with Azure AD.
 
 1. Add the redirect URL `https://<grafana domain>/login/azuread`, then click **Register**.
 
-1. The app's **Overview** page is displayed. Note the **Application ID**, this is the OAuth client id.
+1. The app's **Overview** page is displayed. Note the **Application ID**. This is the OAuth client ID.
 
 1. Click **Endpoints** from the top menu.
 
-   - Note the **OAuth 2.0 authorization endpoint (v2)**, this is the auth URL.
-   - Note the **OAuth 2.0 token endpoint (v2)**, this is the token URL.
+   - Note the **OAuth 2.0 authorization endpoint (v2)**. This is the auth URL.
+   - Note the **OAuth 2.0 token endpoint (v2)**. This is the token URL.
 
-1. Click **Certificates & secrets** and add a new entry under Client secrets.
-    - Description: Grafana OAuth
-    - Expires: Never
+1. Click **Certificates & secrets** and then add a new entry under **Client secrets**.
 
-1. Click **Add**, then copy the key value. This is the OAuth client secret.
+   - Description: Grafana OAuth
+   - Expires: Never
+
+1. Click **Add**, and then copy the key value. This is the OAuth client secret.
 
 1. Click **Manifest**.
-   - Add definitions for the required Application Roles for Grafana (Viewer, Editor, Admin). Without this configuration, all users will be assigned the Viewer role.
-   - Every role requires a unique id. On Linux, this can be created with `uuidgen`. For example:
+
+   - Define the required Application Role values for Grafana: Viewer, Editor, Admin. Otherwise, all users will have the Viewer role.
+   - Every role requires a unique ID.
+   - Generate the unique ID on Linux with `uuidgen`, and on Windows through Microsoft
+   PowerShell with `New-Guid`.
+   - Include the unique ID in the configuration file:
 
         ```json
         "appRoles": [
@@ -103,25 +108,30 @@ allowed_domains =
 allowed_groups =
 ```
 
-> **Note:** Ensure that the [root_url]({{< relref "../administration/configuration/#root-url" >}}) in Grafana is set in your Azure Application Reply URLs (App -> Settings -> Reply URLs)
+**Note:** Ensure that the [root_url]({{< relref "../administration/configuration/#root-url" >}}) in Grafana is set in your Azure Application Reply URLs (**App** -> **Settings** -> **Reply URLs**)
 
-### Configure allowed groups and domains
+### Configure allowed groups
 
-To limit access to authenticated users that are members of one or more groups, set `allowed_groups`
-to a comma- or space-separated list of group Object Ids. Object Id for a specific group can be found on the Azure portal: go to Azure Active Directory -> Groups. For instance, if you want to
-only give access to members of the group `example` which has Id `8bab1c86-8fba-33e5-2089-1d1c80ec267d`, set
+To limit access to authenticated users who are members of one or more groups, set `allowed_groups`
+to a comma- or space-separated list of group object IDs. You can find object IDs for a specific group on the Azure portal:
+
+1. Go to **Azure Active Directory -> Groups**.
+
+For example, if you want to only give access to members of the group `example` with an ID of `8bab1c86-8fba-33e5-2089-1d1c80ec267d`, set the following:
 
 ```ini
 allowed_groups = 8bab1c86-8fba-33e5-2089-1d1c80ec267d
 ```
 
-You'll need to ensure that you've [enabled group attributes](https://docs.microsoft.com/en-us/azure/active-directory/hybrid/how-to-connect-fed-group-claims#configure-the-azure-ad-application-registration-for-group-attributes) in your Azure AD Application Registration manifest file (Azure Portal -> Azure Active Directory -> Application Registrations -> Select Application -> Manifest)
+You'll need to ensure that you've [enabled group attributes](https://docs.microsoft.com/en-us/azure/active-directory/hybrid/how-to-connect-fed-group-claims#configure-the-azure-ad-application-registration-for-group-attributes) in your Azure AD Application Registration manifest file. Navigate to **Azure Portal** -> **Azure Active Directory** -> **Application Registrations** -> **Select Application** -> **Manifest**, and set the following:
 
 ```json
 "groupMembershipClaims": "ApplicationGroup, SecurityGroup"
 ```
 
-The `allowed_domains` option limits access to the users belonging to the specific domains. Domains should be separated by space or comma.
+### Configure allowed domains
+
+The `allowed_domains` option limits access to users who belong to specific domains. Separate domains with space or comma.
 
 ```ini
 allowed_domains = mycompany.com mycompany.org
@@ -134,6 +144,6 @@ allowed_domains = mycompany.com mycompany.org
 With Team Sync you can map your Azure AD groups to teams in Grafana so that your users will automatically be added to
 the correct teams.
 
-Azure AD groups can be referenced by group Object Id, like `8bab1c86-8fba-33e5-2089-1d1c80ec267d`.
+You can reference Azure AD groups by group object ID, like `8bab1c86-8fba-33e5-2089-1d1c80ec267d`.
 
 [Learn more about Team Sync]({{< relref "team-sync.md" >}})

docs/sources/auth/generic-oauth.md

@@ -15,6 +15,7 @@ You can configure many different OAuth2 authentication services with Grafana usi
   - [Set up OAuth2 with OneLogin](#set-up-oauth2-with-onelogin)
   - [JMESPath examples](#jmespath-examples)
     - [Role mapping](#role-mapping)
+    - [Groups mapping](#groups-mapping)
 
 This callback URL must match the full HTTP address that you use in your browser to access Grafana, but with the suffixed path of `/login/generic_oauth`.
 
@@ -65,6 +66,10 @@ Grafana will also attempt to do role mapping through OAuth as described below.
 
 Check for the presence of a role using the [JMESPath](http://jmespath.org/examples.html) specified via the `role_attribute_path` configuration option. The JSON used for the path lookup is the HTTP response obtained from querying the UserInfo endpoint specified via the `api_url` configuration option. The result after evaluating the `role_attribute_path` JMESPath expression needs to be a valid Grafana role, i.e. `Viewer`, `Editor` or `Admin`.
 
+Grafana also attempts to map teams through OAuth as described below.
+
+Check for the presence of groups using the [JMESPath](http://jmespath.org/examples.html) specified via the `groups_attribute_path` configuration option. The JSON used for the path lookup is the HTTP response obtained from querying the UserInfo endpoint specified via the `api_url` configuration option. After evaluating the `groups_attribute_path` JMESPath expression, the result should be a string array of groups.
+
 See [JMESPath examples](#jmespath-examples) for more information.
 
 Customize user login using `login_attribute_path` configuration option. Order of operations is as follows:
@@ -215,7 +220,7 @@ role_attribute_path = role
 
 **Advanced example:**
 
-In the following example user will get `Admin` as role when authenticating since it has a group `admin`. If a user has a group `editor` it will get `Editor` as role, otherwise `Viewer`.
+In the following example user will get `Admin` as role when authenticating since it has a role `admin`. If a user has a role `editor` it will get `Editor` as role, otherwise `Viewer`.
 
 Payload:
 ```json
@@ -223,7 +228,7 @@ Payload:
     ...
     "info": {
         ...
-        "groups": [
+        "roles": [
             "engineer",
             "admin",
         ],
@@ -235,5 +240,38 @@ Payload:
 
 Config:
 ```bash
-role_attribute_path = contains(info.groups[*], 'admin') && 'Admin' || contains(info.groups[*], 'editor') && 'Editor' || 'Viewer'
+role_attribute_path = contains(info.roles[*], 'admin') && 'Admin' || contains(info.roles[*], 'editor') && 'Editor' || 'Viewer'
 ```
+
+
+### Groups mapping
+
+>  Available in Grafana Enterprise v8.1 and later versions.
+
+With Team Sync you can map your Generic OAuth groups to teams in Grafana so that the users are automatically added to the correct teams.
+
+Generic OAuth groups can be referenced by group ID, like `8bab1c86-8fba-33e5-2089-1d1c80ec267d` or `myteam`.
+
+[Learn more about Team Sync]({{< relref "team-sync.md" >}})
+
+Config:
+
+```bash
+groups_attribute_path = info.groups
+```
+
+Payload:
+```json
+{
+    ...
+    "info": {
+        ...
+        "groups": [
+            "engineers",
+            "analysts",
+        ],
+        ...
+    },
+    ...
+}
+```

docs/sources/auth/grafana.md

@@ -18,9 +18,9 @@ provider (listed above). There is also options for allowing self sign up.
 Grafana are using short-lived tokens as a mechanism for verifying authenticated users.
 These short-lived tokens are rotated each `token_rotation_interval_minutes` for an active authenticated user.
 
-An active authenticated user that gets it token rotated will extend the `login_maximum_inactive_lifetime_duration` time from "now" that Grafana will remember the user.
-This means that a user can close its browser and come back before `now + login_maximum_inactive_lifetime_duration` and still being authenticated.
- This is true as long as the time since user login is less than `login_maximum_lifetime_duration`.
+An active authenticated user that gets it token rotated will extend the `login_maximum_inactive_lifetime_days` time from "now" that Grafana will remember the user.
+This means that a user can close its browser and come back before `now + login_maximum_inactive_lifetime_days` and still being authenticated.
+ This is true as long as the time since user login is less than `login_maximum_lifetime_days`.
 
 #### Remote logout
 
@@ -38,10 +38,10 @@ Example:
 login_cookie_name = grafana_session
 
 # The lifetime (days) an authenticated user can be inactive before being required to login at next visit. Default is 7 days.
-login_maximum_inactive_lifetime_duration = 7d
+login_maximum_inactive_lifetime_days = 7
 
 # The maximum lifetime (days) an authenticated user can be logged in since login time before being required to login. Default is 30 days.
-login_maximum_lifetime_duration = 30d
+login_maximum_lifetime_days = 30
 
 # How often should auth tokens be rotated for authenticated users when being active. The default is each 10 minutes.
 token_rotation_interval_minutes = 10

docs/sources/auth/overview.md

@@ -36,9 +36,9 @@ provider (listed above). There are also options for allowing self sign up.
 Grafana are using short-lived tokens as a mechanism for verifying authenticated users.
 These short-lived tokens are rotated each `token_rotation_interval_minutes` for an active authenticated user.
 
-An active authenticated user that gets it token rotated will extend the `login_maximum_inactive_lifetime_duration` time from "now" that Grafana will remember the user.
-This means that a user can close its browser and come back before `now + login_maximum_inactive_lifetime_duration` and still being authenticated.
- This is true as long as the time since user login is less than `login_maximum_lifetime_duration`.
+An active authenticated user that gets it token rotated will extend the `login_maximum_inactive_lifetime_days` time from "now" that Grafana will remember the user.
+This means that a user can close its browser and come back before `now + login_maximum_inactive_lifetime_days` and still being authenticated.
+ This is true as long as the time since user login is less than `login_maximum_lifetime_days`.
 
 #### Remote logout
 
@@ -121,11 +121,6 @@ Defaults to `false`.
 oauth_auto_login = true
 ```
 
-### Avoid automatic OAuth login
-
-To sign in with a username and password and avoid automatic OAuth login, add the `disableAutoLogin` parameter to your login URL.
-For example: `grafana.example.com/login?disableAutoLogin` or `grafana.example.com/login?disableAutoLogin=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.

docs/sources/basics/exemplars/_index.md

@@ -9,7 +9,7 @@ weight = 400
 
 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.
+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.
 

docs/sources/dashboards/annotations.md

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

docs/sources/dashboards/time-range-controls.md

@@ -31,7 +31,7 @@ Here are some examples:
 | This month so far      | `now/M`    | `now`      |
 | Previous Month         | `now-1M/M` | `now-1M/M` |
 | This year so far       | `now/Y`    | `now`      |
-| This Year              | `now/Y`    | `now/Y`    |
+| This Year              | `now/Y`    | `now/Y     |
 
 ## Common time range controls
 

docs/sources/datasources/azuremonitor/_index.md

@@ -231,6 +231,28 @@ In Azure Resource Graph many nested properties (`properties.displayName`) are of
 
 The Azure documentation also hosts [many sample queries](https://docs.microsoft.com/en-gb/azure/governance/resource-graph/samples/starter) to help you get started
 
+### Azure Resource Graph macros
+
+You can use Grafana macros when constructing a query. Use the macros in the where clause of a query:
+
+- `$__timeFilter()` - Expands to
+  `timestamp ≥ datetime(2018-06-05T18:09:58.907Z) and`
+  `timestamp ≤ datetime(2018-06-05T20:09:58.907Z)` where the from and to datetimes are from the Grafana time picker.
+
+- `$__timeFilter(datetimeColumn)` - Expands to
+  `datetimeColumn ≥ datetime(2018-06-05T18:09:58.907Z) and`
+  `datetimeColumn ≤ datetime(2018-06-05T20:09:58.907Z)` where the from and to datetimes are from the Grafana time picker.
+
+- `$__timeFrom()` - Returns the From datetime from the Grafana picker. Example: `datetime(2018-06-05T18:09:58.907Z)`.
+
+- `$__timeTo()` - Returns the To datetime from the Grafana picker. Example: `datetime(2018-06-05T20:09:58.907Z)`.
+
+- `$__escapeMulti($myVar)` - Use with multi-value template variables that contain illegal characters. If `$myVar` has the two values as a string `'\\grafana-vm\Network(eth0)\Total','\\hello!'`, then it expands to: `@'\\grafana-vm\Network(eth0)\Total', @'\\hello!'`. If you are using single value variables, then there is no need for this macro, simply escape the variable inline instead - `@'\$myVar'`.
+
+- `$__contains(colName, $myVar)` - Use with multi-value template variables. If `$myVar` has the value `'value1','value2'`, the it expands to: `colName in ('value1','value2')`.
+
+  If using the `All` option, then check the `Include All Option` checkbox and in the `Custom all value` field type in the following value: `all`. If `$myVar` has value `all` then the macro will instead expand to `1 == 1`. For template variables with a lot of options, this will increase the query performance by not building a large "where..in" clause.
+
 ## Going further with Azure Monitor
 
 See the following topics to learn more about the Azure Monitor data source:

docs/sources/datasources/cloudwatch.md

@@ -41,7 +41,7 @@ There are three different authentication methods available. `AWS SDK Default` pe
 
 ### IAM roles
 
-Currently all access to CloudWatch is done server side by the Grafana backend using the official AWS SDK. Providing you have chosen the _AWS SDK Default_ authentication method, and your Grafana server is running on AWS, you can use IAM Roles to handle authentication automatically.
+Currently all access to CloudWatch is done server side by the Grafana backend using the official AWS SDK. Providing you have chosen the _AWS SDK Default_ authentication method, and your Grafana server is running on AWS, you can use IAM Roles to handle authentication automically.
 
 See the AWS documentation on [IAM Roles](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html)
 

docs/sources/datasources/elasticsearch.md

@@ -57,7 +57,7 @@ a time pattern for the index name or a wildcard.
 ### Elasticsearch version
 
 Select the version of your Elasticsearch data source from the version selection dropdown. Different query compositions and functionalities are available in the query editor for different versions.
-Available Elasticsearch versions are `2.x`, `5.x`, `5.6+`, `6.0+`, `7.0+` and `7.7+`. Select the option that best matches your data source version.
+Available Elasticsearch versions are `2.x`, `5.x`, `5.6+`, `6.0+`, `7.0+`, `7.7+` and `7.10+`. Select the option that best matches your data source version.
 
 Grafana assumes that you are running the lowest possible version for a specified range. This ensures that new features or breaking changes in a future Elasticsearch release will not affect your configuration.
 
@@ -80,6 +80,13 @@ number followed by a valid time identifier, e.g. `1m` (1 minute) or `30s` (30 se
 | `s`        | second      |
 | `ms`       | millisecond |
 
+### X-Pack enabled
+
+Enables `X-Pack` specific features and options, providing the query editor with additional aggregations such as `Rate` and `Top Metrics`.
+
+#### Include frozen indices
+
+When `X-Pack enabled` is active and the configured Elasticsearch version is higher than `6.6.0`, you can configure Grafana to not ignore [frozen indices](https://www.elastic.co/guide/en/elasticsearch/reference/7.13/frozen-indices.html) when performing search requests.
 ### Logs
 
 There are two parameters, `Message field name` and `Level field name`, that can optionally be configured from the data source settings page that determine

docs/sources/datasources/jaeger.md

@@ -32,8 +32,10 @@ This is a configuration for the [trace to logs feature]({{< relref "../explore/t
 
 - **Data source -** Target data source.
 - **Tags -** The tags that will be used in the Loki query. Default is `'cluster', 'hostname', 'namespace', 'pod'`.
+- **Span start time shift -** Shift in the start time for the Loki query based on the span start time. In order to extend to the past, you need to use a negative value.  Time units can be used here, for example, 5s, 1m, 3h. The default is 0.
+- **Span end time shift -** Shift in the end time for the Loki query based on the span end time. Time units can be used here, for example, 5s, 1m, 3h. The default is 0.
 
-![Trace to logs settings](/static/img/docs/explore/trace-to-logs-settings-7-4.png 'Screenshot of the trace to logs settings')
+![Trace to logs settings](/static/img/docs/explore/trace-to-logs-settings-8.png 'Screenshot of the trace to logs settings')
 
 ## Query traces
 

docs/sources/datasources/loki.md

@@ -148,11 +148,18 @@ Check out the [Templating]({{< relref "../variables/_index.md" >}}) documentatio
 Variable of the type _Query_ allows you to query Loki for a list labels or label values. The Loki data source plugin
 provides the following functions you can use in the `Query` input field.
 
-| Name                  | Description                                                     |
-| --------------------- | --------------------------------------------------------------- |
-| `label_names()`       | Returns a list of label names.                                  |
-| `label_values(label)` | Returns a list of label values for the `label` in every metric. |
+| Name                                       | Description                                                                          |
+| -------------------------------------------| -------------------------------------------------------------------------------------|
+| `label_names()`                            | Returns a list of label names.                                                       |
+| `label_values(label)`                      | Returns a list of label values for the `label`.                                      |
+| `label_values(log stream selector, label)` | Returns a list of label values for the `label` in the specified `log stream selector`.|
 
+### Ad hoc filters variable
+Loki supports the special ad hoc filters variable type. It allows you to specify any number of label/value filters on the fly. These filters are automatically applied to all your Loki queries.
+
+### Using interval and range variables
+
+You can use some global built-in variables in query variables; `$__interval`, `$__interval_ms`, `$__range`, `$__range_s` and `$__range_ms`. For more information, refer to [Global built-in variables]({{< relref "../variables/variable-types/global-variables.md" >}}).
 ## Annotations
 
 You can use any non-metric Loki query as a source for [annotations]({{< relref "../dashboards/annotations" >}}). Log content will be used as annotation text and your log stream labels as tags, so there is no need for additional mapping.

docs/sources/datasources/mssql.md

@@ -168,97 +168,123 @@ The resulting table panel:
 
 ## Time series queries
 
-If you set Format as to _Time series_, then the query must have a column named time that returns either a SQL datetime or any numeric datatype representing Unix epoch in seconds. In addition, result sets of time series queries must be sorted by time for panels to properly visualize the result.
+If you set `Format as` to `Time series`, for use in Graph panel for example, then the query must have a column named `time` that returns either a SQL datetime or any numeric datatype representing Unix epoch in seconds. You may return a column named `metric` that is used as metric name for the value column. Any column except `time` and `metric` is treated as a value column. If you omit the `metric` column, the name of the value column will be the metric name. You may select multiple value columns, each will have its name as metric.
+If you return multiple value columns and a column named `metric` then this column is used as prefix for the series name (only available in Grafana 5.3+).
 
-A time series query result is returned in a [wide data frame format]({{< relref "../developers/plugins/data-frames.md#wide-format" >}}). Any column except time or of type string transforms into value fields in the data frame query result. Any string column transforms into field labels in the data frame query result.
+Result sets of time series queries need to be sorted by time.
 
-> For backward compatibility, there's an exception to the above rule for queries that return three columns including a string column named metric. Instead of transforming the metric column into field labels, it becomes the field name, and then the series name is formatted as the value of the metric column. See the example with the metric column below.
+**Example database table:**
 
-You can optionally customize the default series name formatting using instructions in [Standard field options/Display name]({{< relref "../panels/standard-options.md#display-name" >}}).
+```sql
+CREATE TABLE [event] (
+  time_sec bigint,
+  description nvarchar(100),
+  tags nvarchar(100),
+)
+```
 
-**Example with `metric` column:**
+```sql
+CREATE TABLE metric_values (
+  time datetime,
+  measurement nvarchar(100),
+  valueOne int,
+  valueTwo int,
+)
+
+INSERT metric_values (time, measurement, valueOne, valueTwo) VALUES('2018-03-15 12:30:00', 'Metric A', 62, 6)
+INSERT metric_values (time, measurement, valueOne, valueTwo) VALUES('2018-03-15 12:30:00', 'Metric B', 49, 11)
+...
+INSERT metric_values (time, measurement, valueOne, valueTwo) VALUES('2018-03-15 13:55:00', 'Metric A', 14, 25)
+INSERT metric_values (time, measurement, valueOne, valueTwo) VALUES('2018-03-15 13:55:00', 'Metric B', 48, 10)
+
+```
+
+{{< figure src="/static/img/docs/v51/mssql_time_series_one.png" class="docs-image--no-shadow docs-image--right" >}}
+
+**Example with one `value` and one `metric` column.**
 
 ```sql
 SELECT
-  $__timeGroup(time_date_time, '5m') as time,
-  min("value_double"),
-  'min' as metric
-FROM test_data
-WHERE $__timeFilter(time_date_time)
-GROUP BY $__timeGroup(time_date_time, '5m')
-ORDER BY 1
-```
-
-Data frame result:
-
-```text
-+---------------------+-----------------+
-| Name: time          | Name: min       |
-| Labels:             | Labels:         |
-| Type: []time.Time   | Type: []float64 |
-+---------------------+-----------------+
-| 2020-01-02 03:05:00 | 3               |
-| 2020-01-02 03:10:00 | 6               |
-+---------------------+-----------------+
-```
-
-**Example using the fill parameter in the $\_\_timeGroup macro to convert null values to be zero instead:**
-
-```sql
-SELECT
-  $__timeGroup(createdAt, '5m', 0) as time,
-  sum(value) as value,
-  hostname
-FROM test_data
+  time,
+  valueOne,
+  measurement as metric
+FROM
+  metric_values
 WHERE
-  $__timeFilter(createdAt)
-GROUP BY
-  $__timeGroup(createdAt, '5m', 0),
-  hostname
+  $__timeFilter(time)
 ORDER BY 1
 ```
 
-Given the data frame result in the following example and using the graph panel, you will get two series named _value 10.0.1.1_ and _value 10.0.1.2_. To render the series with a name of _10.0.1.1_ and _10.0.1.2_ , use a [Standard field options/Display name]({{< relref "../panels/standard-options.md#display-name" >}}) value of `${__field.labels.hostname}`.
+When the above query is used in a graph panel, it will produce two series named `Metric A` and `Metric B` with the values `valueOne` and `valueTwo` plotted over `time`.
 
-Data frame result:
+<div class="clearfix"></div>
 
-```text
-+---------------------+---------------------------+---------------------------+
-| Name: time          | Name: value               | Name: value               |
-| Labels:             | Labels: hostname=10.0.1.1 | Labels: hostname=10.0.1.2 |
-| Type: []time.Time   | Type: []float64           | Type: []float64           |
-+---------------------+---------------------------+---------------------------+
-| 2020-01-02 03:05:00 | 3                         | 4                         |
-| 2020-01-02 03:10:00 | 6                         | 7                         |
-+---------------------+---------------------------+---------------------------+
-```
+{{< figure src="/static/img/docs/v51/mssql_time_series_two.png" class="docs-image--no-shadow docs-image--right" >}}
 
-**Example with multiple columns:**
+**Example with multiple `value` columns:**
 
 ```sql
 SELECT
-  $__timeGroup(time_date_time, '5m'),
-  min(value_double) as min_value,
-  max(value_double) as max_value
-FROM test_data
-WHERE $__timeFilter(time_date_time)
-GROUP BY $__timeGroup(time_date_time, '5m')
+  time,
+  valueOne,
+  valueTwo
+FROM
+  metric_values
+WHERE
+  $__timeFilter(time)
 ORDER BY 1
 ```
 
-Data frame result:
+When the above query is used in a graph panel, it will produce two series named `Metric A` and `Metric B` with the values `valueOne` and `valueTwo` plotted over `time`.
 
-```text
-+---------------------+-----------------+-----------------+
-| Name: time          | Name: min_value | Name: max_value |
-| Labels:             | Labels:         | Labels:         |
-| Type: []time.Time   | Type: []float64 | Type: []float64 |
-+---------------------+-----------------+-----------------+
-| 2020-01-02 03:04:00 | 3               | 4               |
-| 2020-01-02 03:05:00 | 6               | 7               |
-+---------------------+-----------------+-----------------+
+<div class="clearfix"></div>
+
+{{< figure src="/static/img/docs/v51/mssql_time_series_three.png" class="docs-image--no-shadow docs-image--right" >}}
+
+**Example using the \$\_\_timeGroup macro:**
+
+```sql
+SELECT
+  $__timeGroup(time, '3m') as time,
+  measurement as metric,
+  avg(valueOne)
+FROM
+  metric_values
+WHERE
+  $__timeFilter(time)
+GROUP BY
+  $__timeGroup(time, '3m'),
+  measurement
+ORDER BY 1
 ```
 
+When the above query is used in a graph panel, it will produce two series named `Metric A` and `Metric B` with the values `valueOne` and `valueTwo` plotted over `time`.
+Any two series lacking a value in a three-minute window will render a line between those two lines. You'll notice that the graph to the right never goes down to zero.
+
+<div class="clearfix"></div>
+
+{{< figure src="/static/img/docs/v51/mssql_time_series_four.png" class="docs-image--no-shadow docs-image--right" >}}
+
+**Example using the \$\_\_timeGroup macro with fill parameter set to zero:**
+
+```sql
+SELECT
+  $__timeGroup(time, '3m', 0) as time,
+  measurement as metric,
+  sum(valueTwo)
+FROM
+  metric_values
+WHERE
+  $__timeFilter(time)
+GROUP BY
+  $__timeGroup(time, '3m'),
+  measurement
+ORDER BY 1
+```
+
+When the above query is used in a graph panel, the result is two series named `Metric A` and `Metric B` with a sum of `valueTwo` plotted over `time`.
+Any series lacking a value in a 3 minute window will have a value of zero which you'll see rendered in the graph to the right.
+
 ## Templating
 
 Instead of hard-coding things like server, application and sensor name in your metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard.

docs/sources/datasources/mysql.md

@@ -177,13 +177,12 @@ The resulting table panel:
 
 ## Time series queries
 
-If you set Format as to _Time series_, then the query must have a column named time that returns either a SQL datetime or any numeric datatype representing Unix epoch in seconds. In addition, result sets of time series queries must be sorted by time for panels to properly visualize the result.
+If you set `Format as` to `Time series`, for use in Graph panel for example, then the query must return a column named `time` that returns either a SQL datetime or any numeric datatype representing Unix epoch.
+Any column except `time` and `metric` is treated as a value column.
+You may return a column named `metric` that is used as metric name for the value column.
+If you return multiple value columns and a column named `metric` then this column is used as prefix for the series name (only available in Grafana 5.3+).
 
-A time series query result is returned in a [wide data frame format]({{< relref "../developers/plugins/data-frames.md#wide-format" >}}). Any column except time or of type string transforms into value fields in the data frame query result. Any string column transforms into field labels in the data frame query result.
-
-> For backward compatibility, there's an exception to the above rule for queries that return three columns including a string column named metric. Instead of transforming the metric column into field labels, it becomes the field name, and then the series name is formatted as the value of the metric column. See the example with the metric column below.
-
-You can optionally customize the default series name formatting using instructions in [Standard field options/Display name]({{< relref "../panels/standard-options.md#display-name" >}}).
+Resultsets of time series queries need to be sorted by time.
 
 **Example with `metric` column:**
 
@@ -198,48 +197,20 @@ GROUP BY time
 ORDER BY time
 ```
 
-Data frame result:
-
-```text
-+---------------------+-----------------+
-| Name: time          | Name: min       |
-| Labels:             | Labels:         |
-| Type: []time.Time   | Type: []float64 |
-+---------------------+-----------------+
-| 2020-01-02 03:05:00 | 3               |
-| 2020-01-02 03:10:00 | 6               |
-+---------------------+-----------------+
-```
-
-**Example using the fill parameter in the $\_\_timeGroup macro to convert null values to be zero instead:**
+**Example using the fill parameter in the $__timeGroup macro to convert null values to be zero instead:**
 
 ```sql
 SELECT
   $__timeGroup(createdAt,'5m',0),
   sum(value_double) as value,
-  hostname
+  measurement
 FROM test_data
 WHERE
   $__timeFilter(createdAt)
-GROUP BY time, hostname
+GROUP BY time, measurement
 ORDER BY time
 ```
 
-Given the data frame result in the following example and using the graph panel, you will get two series named _value 10.0.1.1_ and _value 10.0.1.2_. To render the series with a name of _10.0.1.1_ and _10.0.1.2_ , use a [Standard field options/Display name]({{< relref "../panels/standard-options.md#display-name" >}}) value of `${__field.labels.hostname}`.
-
-Data frame result:
-
-```text
-+---------------------+---------------------------+---------------------------+
-| Name: time          | Name: value               | Name: value               |
-| Labels:             | Labels: hostname=10.0.1.1 | Labels: hostname=10.0.1.2 |
-| Type: []time.Time   | Type: []float64           | Type: []float64           |
-+---------------------+---------------------------+---------------------------+
-| 2020-01-02 03:05:00 | 3                         | 4                         |
-| 2020-01-02 03:10:00 | 6                         | 7                         |
-+---------------------+---------------------------+---------------------------+
-```
-
 **Example with multiple columns:**
 
 ```sql
@@ -253,19 +224,6 @@ GROUP BY time
 ORDER BY time
 ```
 
-Data frame result:
-
-```text
-+---------------------+-----------------+-----------------+
-| Name: time          | Name: min_value | Name: max_value |
-| Labels:             | Labels:         | Labels:         |
-| Type: []time.Time   | Type: []float64 | Type: []float64 |
-+---------------------+-----------------+-----------------+
-| 2020-01-02 03:04:00 | 3               | 4               |
-| 2020-01-02 03:05:00 | 6               | 7               |
-+---------------------+-----------------+-----------------+
-```
-
 Currently, there is no support for a dynamic group by time based on time range and panel width.
 This is something we plan to add.
 

docs/sources/datasources/postgres.md

@@ -183,13 +183,12 @@ The resulting table panel:
 
 ## Time series queries
 
-If you set Format as to _Time series_, then the query must have a column named time that returns either a SQL datetime or any numeric datatype representing Unix epoch in seconds. In addition, result sets of time series queries must be sorted by time for panels to properly visualize the result.
+If you set `Format as` to `Time series`, for use in Graph panel for example, then the query must return a column named `time` that returns either a SQL datetime or any numeric datatype representing Unix epoch.
+Any column except `time` and `metric` are treated as a value column.
+You may return a column named `metric` that is used as metric name for the value column.
+If you return multiple value columns and a column named `metric` then this column is used as prefix for the series name (only available in Grafana 5.3+).
 
-A time series query result is returned in a [wide data frame format]({{< relref "../developers/plugins/data-frames.md#wide-format" >}}). Any column except time or of type string transforms into value fields in the data frame query result. Any string column transforms into field labels in the data frame query result.
-
-> For backward compatibility, there's an exception to the above rule for queries that return three columns including a string column named metric. Instead of transforming the metric column into field labels, it becomes the field name, and then the series name is formatted as the value of the metric column. See the example with the metric column below.
-
-You can optionally customize the default series name formatting using instructions in [Standard field options/Display name]({{< relref "../panels/standard-options.md#display-name" >}}).
+Resultsets of time series queries need to be sorted by time.
 
 **Example with `metric` column:**
 
@@ -204,48 +203,20 @@ GROUP BY time
 ORDER BY time
 ```
 
-Data frame result:
-
-```text
-+---------------------+-----------------+
-| Name: time          | Name: min       |
-| Labels:             | Labels:         |
-| Type: []time.Time   | Type: []float64 |
-+---------------------+-----------------+
-| 2020-01-02 03:05:00 | 3               |
-| 2020-01-02 03:10:00 | 6               |
-+---------------------+-----------------+
-```
-
-**Example using the fill parameter in the $\_\_timeGroup macro to convert null values to be zero instead:**
+**Example using the fill parameter in the $__timeGroup macro to convert null values to be zero instead:**
 
 ```sql
 SELECT
   $__timeGroup("createdAt",'5m',0),
   sum(value) as value,
-  hostname
+  measurement
 FROM test_data
 WHERE
   $__timeFilter("createdAt")
-GROUP BY time, hostname
+GROUP BY time, measurement
 ORDER BY time
 ```
 
-Given the data frame result in the following example and using the graph panel, you will get two series named _value 10.0.1.1_ and _value 10.0.1.2_. To render the series with a name of _10.0.1.1_ and _10.0.1.2_ , use a [Standard field options/Display name]({{< relref "../panels/standard-options.md#display-name" >}}) value of `${__field.labels.hostname}`.
-
-Data frame result:
-
-```text
-+---------------------+---------------------------+---------------------------+
-| Name: time          | Name: value               | Name: value               |
-| Labels:             | Labels: hostname=10.0.1.1 | Labels: hostname=10.0.1.2 |
-| Type: []time.Time   | Type: []float64           | Type: []float64           |
-+---------------------+---------------------------+---------------------------+
-| 2020-01-02 03:05:00 | 3                         | 4                         |
-| 2020-01-02 03:10:00 | 6                         | 7                         |
-+---------------------+---------------------------+---------------------------+
-```
-
 **Example with multiple columns:**
 
 ```sql
@@ -259,19 +230,6 @@ GROUP BY time
 ORDER BY time
 ```
 
-Data frame result:
-
-```text
-+---------------------+-----------------+-----------------+
-| Name: time          | Name: min_value | Name: max_value |
-| Labels:             | Labels:         | Labels:         |
-| Type: []time.Time   | Type: []float64 | Type: []float64 |
-+---------------------+-----------------+-----------------+
-| 2020-01-02 03:04:00 | 3               | 4               |
-| 2020-01-02 03:05:00 | 6               | 7               |
-+---------------------+-----------------+-----------------+
-```
-
 ## Templating
 
 Instead of hard-coding things like server, application and sensor name in your metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard.

docs/sources/datasources/tempo.md

@@ -31,8 +31,10 @@ This is a configuration for the [trace to logs feature]({{< relref "../explore/t
 
 - **Data source -** Target data source.
 - **Tags -** The tags that will be used in the Loki query. Default is `'cluster', 'hostname', 'namespace', 'pod'`.
+- **Span start time shift -** Shift in the start time for the Loki query based on the span start time. In order to extend to the past, you need to use a negative value.  Time units can be used here, for example, 5s, 1m, 3h. The default is 0.
+- **Span end time shift -** Shift in the end time for the Loki query based on the span end time. Time units can be used here, for example, 5s, 1m, 3h. The default is 0.
 
-![Trace to logs settings](/static/img/docs/explore/trace-to-logs-settings-7-4.png 'Screenshot of the trace to logs settings')
+![Trace to logs settings](/static/img/docs/explore/trace-to-logs-settings-8.png 'Screenshot of the trace to logs settings')
 
 ## Query traces
 

docs/sources/datasources/zipkin.md

@@ -32,8 +32,10 @@ This is a configuration for the [trace to logs feature]({{< relref "../explore/t
 
 - **Data source -** Target data source.
 - **Tags -** The tags that will be used in the Loki query. Default is `'cluster', 'hostname', 'namespace', 'pod'`.
+- **Span start time shift -** Shift in the start time for the Loki query based on the span start time. In order to extend to the past, you need to use a negative value.  Time units can be used here, for example, 5s, 1m, 3h. The default is 0.
+- **Span end time shift -** Shift in the end time for the Loki query based on the span end time. Time units can be used here, for example, 5s, 1m, 3h. The default is 0.
 
-![Trace to logs settings](/static/img/docs/explore/trace-to-logs-settings-7-4.png "Screenshot of the trace to logs settings")
+![Trace to logs settings](/static/img/docs/explore/trace-to-logs-settings-8.png 'Screenshot of the trace to logs settings')
 
 ## Query traces
 

docs/sources/developers/plugins/migration-guide.md

@@ -4,410 +4,44 @@ title = "Plugin migration guide"
 
 # Plugin migration guide
 
-## Introduction
+This guide explains how to migrate pre-Grafana 7.0 plugins from Angular to the new React-based plugin platform introduced in Grafana 7.0.
 
-This guide helps you identify the steps you need to take based on the Grafana version your plugin supports and explains how to migrate the plugin to the 8.2.x or a later version.
+It's written for:
 
-> **Note:** If you've successfully migrated your plugin using this guide, then share your experiences with us! If you find missing information, then we encourage you to [submit an issue on GitHub](https://github.com/grafana/grafana/issues/new?title=Docs%20feedback:%20/developers/plugins/migration-guide.md) so that we can improve this guide!
+- Plugin authors who want to migrate their plugins to Grafana 7.0+.
+- Plugin users who are using custom plugins and want to know whether they can upgrade to Grafana 7.0 without losing functionality.
 
-## Table of contents
+> If you've successfully migrated your plugin from Angular to React, please [submit an issue on GitHub](https://github.com/grafana/grafana/issues/new?title=Docs%20feedback:%20/developers/plugins/migration-guide.md) and share your experiences with us so that we can improve this guide!
 
-- [From version 7.x.x to 8.0.0](#from-version-7xx-to-800)
-  - [Backend plugin v1 support has been dropped](#backend-plugin-v1-support-has-been-dropped)
-    - [1. Add dependency on grafana-plugin-sdk-go](#1-add-dependency-on-grafana-plugin-sdk-go)
-    - [2. Update the way you bootstrap your plugin](#2-update-the-way-you-bootstrap-your-plugin)
-    - [3. Update the plugin package](#3-update-the-plugin-package)
-  - [Unsigned backend plugins will not be loaded](#unsigned-backend-plugins-will-not-be-loaded)
-  - [Update react-hook-form from v6 to v7](#update-react-hook-form-from-v6-to-v7)
-  - [Update the plugin.json](#update-the-pluginjson)
-  - [Update imports to match emotion 11](#update-imports-to-match-emotion-11)
-  - [8.0 Deprecations](#80-deprecations)
-    - [Grafana theme v1](#grafana-theme-v1)
-- [From version 6.2.x to 7.4.0](#from-version-62x-to-740)
-  - [Legend components](#legend-components)
-- [From version 6.x.x to 7.0.0](#from-version-6xx-to-700)
-  - [What's new in Grafana 7.0?](#whats-new-in-grafana-70)
-  - [Migrate a plugin from Angular to React](#migrate-a-plugin-from-angular-to-react)
-    - [Migrate a panel plugin](#migrate-a-panel-plugin)
-    - [Migrate a data source plugin](#migrate-a-data-source-plugin)
-    - [Migrate to data frames](#migrate-to-data-frames)
-  - [Troubleshoot plugin migration](#troubleshoot-plugin-migration)
-
-## From version 7.x.x to 8.x.x
-
-This section explains how to migrate Grafana v7.x.x plugins to the updated plugin system available in Grafana v8.x.x. Depending on your plugin, you need to perform one or more of the following steps. We have documented the breaking changes in Grafana v8.x.x and the steps you need to take to upgrade your plugin.
-
-### Backend plugin v1 support has been dropped
-
-Use the new [plugin sdk](https://github.com/grafana/grafana-plugin-sdk-go) to run your backend plugin running in Grafana 8.
-
-#### 1. Add dependency on grafana-plugin-sdk-go
-
-Add a dependency on the `https://github.com/grafana/grafana-plugin-sdk-go`. We recommend using [go modules](https://go.dev/blog/using-go-modules) to manage your dependencies.
-
-#### 2. Update the way you bootstrap your plugin
-
-Update your `main` package to bootstrap via the new plugin sdk.
-
-```go
-// before
-package main
-
-import (
-  "github.com/grafana/grafana_plugin_model/go/datasource"
-  hclog "github.com/hashicorp/go-hclog"
-  plugin "github.com/hashicorp/go-plugin"
-
-  "github.com/myorgid/datasource/pkg/plugin"
-)
-
-func main() {
-  pluginLogger.Debug("Running GRPC server")
-
-  ds, err := NewSampleDatasource(pluginLogger);
-  if err != nil {
-    pluginLogger.Error("Unable to create plugin");
-  }
-
-  plugin.Serve(&plugin.ServeConfig{
-    HandshakeConfig: plugin.HandshakeConfig{
-			ProtocolVersion:  1,
-			MagicCookieKey:   "grafana_plugin_type",
-			MagicCookieValue: "datasource",
-		},
-    Plugins: map[string]plugin.Plugin{
-			"myorgid-datasource": &datasource.DatasourcePluginImpl{Plugin: ds},
-    },
-    GRPCServer: plugin.DefaultGRPCServer,
-  })
-}
-
-// after
-package main
-
-import (
-  "os"
-
-  "github.com/grafana/grafana-plugin-sdk-go/backend/log"
-  "github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
-
-  "github.com/myorgid/datasource/pkg/plugin"
-)
-
-func main() {
-  log.DefaultLogger.Debug("Running GRPC server")
-
-  if err := datasource.Manage("myorgid-datasource", NewSampleDatasource, datasource.ManageOpts{}); err != nil {
-				log.DefaultLogger.Error(err.Error())
-				os.Exit(1)
-		}
-}
-```
-
-#### 3. Update the plugin package
-
-Update your `plugin` package to use the new plugin sdk.
-
-```go
-// before
-package plugin
-
-import (
-  "context"
-
-  "github.com/grafana/grafana_plugin_model/go/datasource"
-  "github.com/hashicorp/go-hclog"
-)
-
-func NewSampleDatasource(pluginLogger hclog.Logger) (*SampleDatasource, error) {
-	return &SampleDatasource{
-		logger: pluginLogger,
-	}, nil
-}
-
-type SampleDatasource struct{
-  logger hclog.Logger
-}
-
-func (d *SampleDatasource) Query(ctx context.Context, tsdbReq *datasource.DatasourceRequest) (*datasource.DatasourceResponse, error) {
-  d.logger.Info("QueryData called", "request", req)
-  // logic for querying your datasource.
-}
-
-// after
-package plugin
-
-import (
-  "context"
-
-  "github.com/grafana/grafana-plugin-sdk-go/backend"
-  "github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-  "github.com/grafana/grafana-plugin-sdk-go/backend/log"
-  "github.com/grafana/grafana-plugin-sdk-go/data"
-)
-
-func NewSampleDatasource(_ backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-	return &SampleDatasource{}, nil
-}
-
-type SampleDatasource struct{}
-
-
-func (d *SampleDatasource) Dispose() {
-	// Clean up datasource instance resources.
-}
-
-func (d *SampleDatasource) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-  log.DefaultLogger.Info("QueryData called", "request", req)
-  // logic for querying your datasource.
-}
-
-func (d *SampleDatasource) CheckHealth(_ context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
-  log.DefaultLogger.Info("CheckHealth called", "request", req)
-  // The main use case for these health checks is the test button on the
-  // datasource configuration page which allows users to verify that
-  // a datasource is working as expected.
-}
-```
-
-### Sign and load backend plugins
-
-We strongly recommend that you not allow unsigned plugins in your Grafana installation. By allowing unsigned plugins, we cannot guarantee the authenticity of the plugin, which could compromise the security of your Grafana installation.
-
-To sign your plugin, see [Sign a plugin](https://grafana.com/docs/grafana/latest/developers/plugins/sign-a-plugin/#sign-a-plugin).
-
-You can still run and develop an unsigned plugin by running your Grafana instance in [development mode](https://grafana.com/docs/grafana/latest/administration/configuration/#app_mode). Alternatively, you can use the [allow_loading_unsigned_plugins configuration setting.]({{< relref "../administration/#allow_loading_unsigned_plugins" >}})
-
-### Update react-hook-form from v6 to v7
-
-We have upgraded react-hook-form from version 6 to version 7. To make your forms compatible with version 7, refer to the [react-hook-form-migration-guide](https://react-hook-form.com/migrate-v6-to-v7/).
-
-### Update the plugin.json
-
-The property that defines which Grafana version your plugin supports has been renamed and now it is a range instead of a specific version.
-
-```json
-// before
-{
-"dependencies": {
-    "grafanaVersion": "7.5.x",
-    "plugins": []
-  }
-}
-
-// after
-{
-  "dependencies": {
-    "grafanaDependency": ">=8.0.0",
-    "plugins": []
-  }
-}
-```
-
-### Update imports to match emotion 11
-
-Grafana uses Emotion library to manage frontend styling. We have updated the Emotion package and this can affect your frontend plugin if you have custom styling. You only need to update the import statements to get it working in Grafana 8.
-
-```ts
-// before
-import { cx, css } from 'emotion';
-
-// after
-import { cx, css } from '@emotion/css';
-```
-
-### 8.0 deprecations
-
-#### Grafana theme v1
-
-In Grafana 8 we have introduced a new improved version of our theming system. The previous version of the theming system is still available but is deprecated and will be removed in the next major version of Grafana.
-
-You can find more detailed information on how to apply the v2 theme [here](https://github.com/grafana/grafana/blob/main/contribute/style-guides/themes.md#theming-grafana).
-
-**How to style a functional component**
-
-The `useStyles` hook is the preferred way to access the theme when styling. It provides basic memoization and access to the theme object.
-
-```ts
-// before
-import React, { ReactElement } from 'react';
-import css from 'emotion';
-import { GrafanaTheme } from '@grafana/data';
-import { useStyles } from '@grafana/ui';
-
-function Component(): ReactElement | null {
-  const styles = useStyles(getStyles);
-}
-
-const getStyles = (theme: GrafanaTheme) => ({
-  myStyle: css`
-    background: ${theme.colors.bodyBg};
-    display: flex;
-  `,
-});
-
-// after
-import React, { ReactElement } from 'react';
-import { css } from '@emotion/css';
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
-
-function Component(): ReactElement | null {
-  const theme = useStyles2(getStyles);
-}
-
-const getStyles = (theme: GrafanaTheme2) => ({
-  myStyle: css`
-    background: ${theme.colors.background.canvas};
-    display: flex;
-  `,
-});
-```
-
-**How to use the theme in a functional component**
-
-```ts
-// before
-import React, { ReactElement } from 'react';
-import { useTheme } from '@grafana/ui';
-
-function Component(): ReactElement | null {
-  const theme = useTheme();
-}
-
-// after
-import React, { ReactElement } from 'react';
-import { useTheme2 } from '@grafana/ui';
-
-function Component(): ReactElement | null {
-  const theme = useTheme2();
-  // Your component has access to the theme variables now
-}
-```
-
-**How to use the theme in a class component**
-
-```ts
-// before
-import React from 'react';
-import { Themeable, withTheme } from '@grafana/ui';
-
-type Props = {} & Themeable;
-
-class Component extends React.Component<Props> {
-  render() {
-    const { theme } = this.props;
-    // Your component has access to the theme variables now
-  }
-}
-
-export default withTheme(Component);
-
-// after
-import React from 'react';
-import { Themeable2, withTheme2 } from '@grafana/ui';
-
-type Props = {} & Themeable2;
-
-class Component extends React.Component<Props> {
-  render() {
-    const { theme } = this.props;
-    // Your component has access to the theme variables now
-  }
-}
-
-export default withTheme2(Component);
-```
-
-**Gradually migrating components**
-
-If you need to use both the v1 and v2 themes due to using migrated and non-migrated components in the same context, use the `v1` property on the `v2` theme as described in the following example.
-
-```ts
-function Component(): ReactElement | null {
-  const theme = useTheme2();
-  return (
-    <NonMigrated theme={theme.v1}>
-      <Migrated theme={theme] />
-    </NonMigrate>
-  );
-};
-```
-
-## From version 6.2.x to 7.4.0
-
-### Legend components
-
-The Legend components have been refactored and introduced the following changes within the `@grafana/ui` package.
-
-```ts
-// before
-import { LegendItem, LegendOptions, GraphLegend } from '@grafana/ui';
-
-// after
-import { VizLegendItem, VizLegendOptions, VizLegend } from '@grafana/ui';
-```
-
-- `LegendPlacement` has been updated from `'under' | 'right' | 'over'` to `'bottom' | 'right'` so you can not place the legend above the visualization anymore.
-- The `isVisible` in the `LegendItem` has been renamed to `disabled` in `VizLegendItem`.
-
-## From version 6.5.x to 7.3.0
-
-### getColorForTheme changes
-
-The `getColorForTheme` function arguments have changed from `(color: ColorDefinition, theme?: GrafanaThemeType)` to `(color: string, theme: GrafanaTheme)`.
-
-```ts
-// before
-const color: ColorDefinition = {
-  hue: 'green';
-  name: 'dark-green';
-  variants: {
-    light: '#19730E'
-    dark: '#37872D'
-  };
-}
-const themeType: GrafanaThemeType = 'dark';
-const themeColor = getColorForTheme(color, themeType);
-
-// after
-const color = 'green';
-const theme: GrafanaTheme = useTheme();
-const themeColor = getColorForTheme(color, theme);
-
-```
-
-## From version 6.x.x to 7.x.x
-
-### What's new in Grafana 7.0?
+## What's new in Grafana 7.0?
 
 Grafana 7.0 introduced a whole new plugin platform based on React. The new platform supersedes the previous Angular-based plugin platform.
 
 Plugins built using Angular still work for the foreseeable future, but we encourage new plugin authors to develop with the new platform.
 
-#### New data format
+### New data format
 
 Along with the move to React, the new plugin platform introduced a new internal data format called [data frames]({{< relref "data-frames.md" >}}).
 
 Previously, data source plugins could send data either as time series or tables. With data frames, data sources can send any data in a table-like structure. This gives you more flexibility to visualize your data in Grafana.
 
-#### Improved TypeScript support
+### Improved TypeScript support
 
 While the previous Angular-based plugin SDK did support TypeScript, for the React platform, we’ve greatly improved the support. All our APIs are now TypeScript, which might require existing code to update to the new stricter type definitions. Grafana 7.0 also introduced several new APIs for plugin developers that take advantage of many of the new features in Grafana 7.0.
 
-#### Grafana Toolkit
+### Grafana Toolkit
 
 With Grafana 7.0, we released a new tool for making it easier to develop plugins. Before, you’d use Gulp, Grunt, or similar tools to generate the minified assets. Grafana Toolkit takes care of building and testing your plugin without complicated configuration files.
 
 For more information, refer to [@grafana/toolkit](https://www.npmjs.com/package/@grafana/toolkit).
 
-#### Field options
+### Field options
 
 Grafana 7.0 introduced the concept of _field options_, a new way of configuring your data before it gets visualized. Since this was not available in previous versions, any plugin that enables field-based configuration will not work in previous versions of Grafana.
 
 For plugins prior to Grafana 7.0, all options are considered _Display options_. The tab for field configuration isn't available.
 
-#### Backend plugins
+### Backend plugins
 
 While backend plugins were available as an experimental feature in previous versions of Grafana, the support has been greatly improved for Grafana 7. Backend plugins for Grafana 7.0 are backwards-compatible and will continue to work. However, the old backend plugin system has been deprecated, and we recommend that you use the new SDK for backend plugins.
 
@@ -415,7 +49,32 @@ Since Grafana 7.0 introduced [signing of backend plugins]({{< relref "../../plug
 
 To learn more, refer to [Backend plugins]({{< relref "backend" >}}).
 
-### Migrate a plugin from Angular to React
+## Why should I migrate my plugin?
+
+There are several benefits in using the new plugin platform.
+
+- **Better performance:** Components written in React are more responsive.
+- **Support for field options:** By migrating to the new data frame format, you can leverage the new field options to let users customize their data and display options.
+
+## Compatibility between Grafana versions
+
+A plugin developed for Grafana 6 will work for Grafana 7.0. However, plugins developed using the new plugin platform in Grafana 7.0 will only work for Grafana 7.0 and up.
+
+### Interoperability between data formats
+
+Grafana detects the data format sent by the data source and transforms it for the panel, if needed.
+
+For example:
+
+- A legacy panel with data source that returns data frames: Grafana converts the response to the legacy format.
+- A legacy data source with a panel using data frames: Grafana converts the response to the data frame format.
+- If both panel and data source use the same format, no transformations are made. Data is passed as is.
+
+### target and jsonData are unchanged
+
+The query model, `target`, and the configuration model, jsonData, are still the same. This means that if you use the same query model and configuration for your plugin, then the migrated plugin will use existing queries and configuration. You don’t have to worry about breaking existing dashboards.
+
+## Migrate a plugin from Angular to React
 
 If you’re looking to migrate a plugin to the new plugin platform, then we recommend that you release it under a new major version. Consider keeping a release branch for the previous version to be able to roll out patch releases for versions prior to Grafana 7.
 
@@ -425,7 +84,7 @@ While there's no 1-to-1 migration path from an Angular plugin to the new React p
 1. Start from scratch with one of the templates provided by Grafana Toolkit.
 1. Move the existing code into the new plugin incrementally, one component at a time.
 
-#### Migrate a panel plugin
+### Migrate a panel plugin
 
 Prior to Grafana 7.0, you would export a MetricsPanelCtrl from module.ts.
 
@@ -463,7 +122,7 @@ export const MyPanel: React.FC<Props> = ({ options, data, width, height }) => {
 };
 ```
 
-#### Migrate a data source plugin
+### Migrate a data source plugin
 
 While all plugins are different, we'd like to share a migration process that has worked for some of our users.
 
@@ -476,7 +135,7 @@ By now, you should be able to release your new version.
 
 To fully migrate to the new plugin platform, convert the time series response to a data frame response.
 
-#### Migrate to data frames
+### Migrate to data frames
 
 Before 7.0, data source and panel plugins exchanged data using either time series or tables. Starting with 7.0, plugins use the new data frame format to pass data from data sources to panels.
 
@@ -503,6 +162,6 @@ async query(options: DataQueryRequest<MyQuery>): Promise<DataQueryResponse> {
 
 For more information, refer to [Data frames]({{< relref "data-frames.md">}}).
 
-### Troubleshoot plugin migration
+## Troubleshoot plugin migration
 
 As of Grafana 7.0, backend plugins can now be cryptographically signed to verify their origin. By default, Grafana ignores unsigned plugins. For more information, refer to [Allow unsigned plugins]({{< relref "../../plugins/plugin-signatures.md#allow-unsigned-plugins" >}}).

docs/sources/developers/plugins/plugin.schema.json

@@ -62,6 +62,10 @@
         "type": "object",
         "additionalItems": false,
         "properties": {
+          "uid": {
+            "type": "string",
+            "description": "Unique identifier of the included resource"
+          },
           "type": {
             "type": "string",
             "enum": ["dashboard", "page", "panel", "datasource"]

docs/sources/developers/plugins/sign-a-plugin.md

@@ -26,7 +26,7 @@ To verify ownership of your plugin, you need to generate an API key that you'll
 
    You can find the plugin ID in the `plugin.json` file inside your plugin directory. For example, if your account slug is `acmecorp`, you need to prefix the plugin ID with `acmecorp-`.
 
-1. [Create a Grafana Cloud API key](https://grafana.com/docs/grafana-cloud/reference/create-api-key/) with the **PluginPublisher** role.
+1. [Create a Grafana Cloud API key](https://grafana.com/docs/grafana-cloud/cloud-portal/create-api-key/) with the **PluginPublisher** role.
 
 ## Sign a public plugin
 

docs/sources/enterprise/_index.md

@@ -63,6 +63,7 @@ With a Grafana Enterprise license, you get access to premium data sources, inclu
 - [DataDog](https://grafana.com/plugins/grafana-datadog-datasource)
 - [Dynatrace](https://grafana.com/plugins/grafana-dynatrace-datasource)
 - [Gitlab](https://grafana.com/grafana/plugins/grafana-gitlab-datasource)
+- [Honeycomb](https://grafana.com/grafana/plugins/grafana-honeycomb-datasource)
 - [Jira](https://grafana.com/grafana/plugins/grafana-jira-datasource)
 - [MongoDB](https://grafana.com/grafana/plugins/grafana-mongodb-datasource)
 - [New Relic](https://grafana.com/plugins/grafana-newrelic-datasource)

docs/sources/enterprise/access-control/fine-grained-access-control-references.md

@@ -12,20 +12,25 @@ The reference information that follows complements conceptual information about
 
 Fixed roles | Permissions | Descriptions
 --- | --- | ---
-fixed:permissions:admin:read | roles:read<br>roles:list<br>roles.builtin:list | Allows to list and get available roles and built-in role assignments.
-fixed:permissions:admin:edit | All permissions from `fixed:permissions:admin:read` and <br>roles:write<br>roles:delete<br>roles.builtin:add<br>roles.builtin:remove | Allows every read action and in addition allows to create, change and delete custom roles and create or remove built-in role assignments.
-fixed:reporting:admin:read | reports:read<br>reports:send<br>reports.settings:read | Allows to read reports and report settings.
-fixed:reporting:admin:edit | All permissions from `fixed:reporting:admin:read` and <br>reports.admin:write<br>reports:delete<br>reports.settings:write | Allows every read action for reports and in addition allows to administer reports. 
-fixed:users:admin:read | users.authtoken:list<br>users.quotas:list<br>users:read<br>users.teams:read | Allows to list and get users and related information.
-fixed:users:admin:edit | All permissions from `fixed:users:admin:read` and <br>users.password:update<br>users:write<br>users:create<br>users:delete<br>users:enable<br>users:disable<br>users.permissions:update<br>users:logout<br>users.authtoken:update<br>users.quotas:update | Allows every read action for users and in addition allows to administer users. 
-fixed:users:org:read | org.users:read | Allows to get user organizations.
-fixed:users:org:edit | All permissions from `fixed:users:org:read` and <br>org.users:add<br>org.users:remove<br>org.users.role:update | Allows every read action for user organizations and in addition allows to administer user organizations.
-fixed:ldap:admin:read | ldap.user:read<br>ldap.status:read | Allows to read LDAP information and status.
-fixed:ldap:admin:edit | All permissions from `fixed:ldap:admin:read` and <br>ldap.user:sync | Allows every read action for LDAP and in addition allows to administer LDAP.
+`fixed:permissions:admin:read` | `roles:read`<br>`roles:list`<br>`roles.builtin:list` | Allows to list and get available roles and built-in role assignments.
+`fixed:permissions:admin:edit` | All permissions from `fixed:permissions:admin:read` and <br>`roles:write`<br>`roles:delete`<br>`roles.builtin:add`<br>`roles.builtin:remove` | Allows every read action and in addition allows to create, change and delete custom roles and create or remove built-in role assignments.
+`fixed:reporting:admin:read` | `reports:read`<br>`reports:send`<br>`reports.settings:read` | Allows to read reports and report settings.
+`fixed:reporting:admin:edit` | All permissions from `fixed:reporting:admin:read` and <br>`reports.admin:write`<br>`reports:delete`<br>`reports.settings:write` | Allows every read action for reports and in addition allows to administer reports. 
+`fixed:users:admin:read` | `users.authtoken:list`<br>`users.quotas:list`<br>`users:read`<br>`users.teams:read` | Allows to list and get users and related information.
+`fixed:users:admin:edit` | All permissions from `fixed:users:admin:read` and <br>`users.password:update`<br>`users:write`<br>`users:create`<br>`users:delete`<br>`users:enable`<br>`users:disable`<br>`users.permissions:update`<br>`users:logout`<br>`users.authtoken:update`<br>`users.quotas:update` | Allows every read action for users and in addition allows to administer users. 
+`fixed:users:org:read` | `org.users:read` | Allows to get user organizations.
+`fixed:users:org:edit` | All permissions from `fixed:users:org:read` and <br>`org.users:add`<br>`org.users:remove`<br>`org.users.role:update` | Allows every read action for user organizations and in addition allows to administer user organizations.
+`fixed:ldap:admin:read` | `ldap.user:read`<br>`ldap.status:read` | Allows to read LDAP information and status.
+`fixed:ldap:admin:edit` | All permissions from `fixed:ldap:admin:read` and <br>`ldap.user:sync`<br>`ldap.config:reload` | Allows every read action for LDAP and in addition allows to administer LDAP.
+`fixed:server:admin:read` | `server.stats:read` | Read server stats
+`fixed:settings:admin:read` | `settings:read` | Read settings
+`fixed:settings:admin:edit` | All permissions from `fixed:settings:admin:read` and<br>`settings:write` | Update settings
+`fixed:datasource:editor:read` | `datasources:explore` | Explore datasources
 
 ## Default built-in role assignments
 
 Built-in roles | Associated roles | Descriptions
 --- | --- | ---
-Grafana Admin | fixed:permissions:admin:edit<br>fixed:permissions:admin:read<br>fixed:reporting:admin:edit<br>fixed:reporting:admin:read<br>fixed:users:admin:edit<br>fixed:users:admin:read<br>fixed:users:org:edit<br>fixed:users:org:read<br>fixed:ldap:admin:edit<br>fixed:ldap:admin:read | Allows access to resources which [Grafana Server Admin]({{< relref "../../permissions/_index.md#grafana-server-admin-role" >}}) has permissions by default.
-Admin | fixed:users:org:edit<br>fixed:users:org:read<br>fixed:reporting:admin:edit<br>fixed:reporting:admin:read | Allows access to resource which [Admin]({{< relref "../../permissions/organization_roles.md" >}}) has permissions by default.
+Grafana Admin | `fixed:permissions:admin:edit`<br>`fixed:permissions:admin:read`<br>`fixed:reporting:admin:edit`<br>`fixed:reporting:admin:read`<br>`fixed:users:admin:edit`<br>`fixed:users:admin:read`<br>`fixed:users:org:edit`<br>`fixed:users:org:read`<br>`fixed:ldap:admin:edit`<br>`fixed:ldap:admin:read`<br>`fixed:server:admin:read`<br>`fixed:settings:admin:read`<br>`fixed:settings:admin:edit` | Allows access to resources which [Grafana Server Admin]({{< relref "../../permissions/_index.md#grafana-server-admin-role" >}}) has permissions by default.
+Admin | `fixed:users:org:edit`<br>`fixed:users:org:read`<br>`fixed:reporting:admin:edit`<br>`fixed:reporting:admin:read` | Allows access to resource which [Admin]({{< relref "../../permissions/organization_roles.md" >}}) has permissions by default.
+Editor | `fixed:datasource:editor:read`

docs/sources/enterprise/access-control/permissions.md

@@ -25,43 +25,48 @@ The following list contains fine-grained access control actions.
 
 Actions | Applicable scopes | Descriptions
 --- | --- | ---
-roles:list | roles:* | List available roles without permissions.
-roles:read | roles:* | Read a specific role with it's permissions.
-roles:write | permissions:delegate | Create or update a custom role.
-roles:delete | permissions:delegate | Delete a custom role.
-roles.builtin:list | roles:* | List built-in role assignments.
-roles.builtin:add | permissions:delegate | Create a built-in role assignment.
-roles.builtin:remove | permissions:delegate | Delete a built-in role assignment.
-reports.admin:create | reports:* | Create reports.
-reports.admin:write | reports:* | Update reports.
-reports:delete | reports:* | Delete reports.
-reports:read | reports:* | List all available reports or get a specific report.
-reports:send | reports:* | Send a report email.
-reports.settings:write | n/a | Update report settings.
-reports.settings:read | n/a | Read report settings.
-provisioning:reload | service:access-control | Reload provisioning files.
-users:read | global:users:* | Read or search user profiles.
-users:write | global:users:* | Update a user’s profile.
-users.teams:read | global:users:* | Read a user’s teams.
-users.authtoken:list | global:users:* | List authentication tokens that are assigned to a user.
-users.authtoken:update | global:users:* | Update authentication tokens that are assigned to a user.
-users.password:update | global:users:* | Update a user’s password.
-users:delete | global:users:* | Delete a user.
-users:create | n/a | Create a user.
-users:enable | global:users:* | Enable a user.
-users:disable | global:users:* | Disable a user.
-users.permissions:update | global:users:* | Update a user’s organization-level permissions.
-users:logout | global:users:* | Log out a user.
-users.quotas:list | global:users:* | List a user’s quotas.
-users.quotas:update | global:users:* | Update a user’s quotas.
-org.users.read | users:* | Get user profiles within an organization.
-org.users.add | users:* | Add a user to an organization.
-org.users.remove | users:* | Remove a user from an organization.
-org.users.role:update | users:* | Update the organization role (`Viewer`, `Editor`, `Admin`) for an organization.
-ldap.user:read | n/a | Get a user via LDAP.
-ldap.user:sync | n/a | Sync a user via LDAP.
-ldap.status:read | n/a | Verify the LDAP servers’ availability.
-status:accesscontrol | service:access-control | Get access-control enabled status.
+`roles:list` | `roles:*` | List available roles without permissions.
+`roles:read` | `roles:*` | Read a specific role with it's permissions.
+`roles:write` | `permissions:delegate` | Create or update a custom role.
+`roles:delete` | `permissions:delegate` | Delete a custom role.
+`roles.builtin:list` | `roles:*` | List built-in role assignments.
+`roles.builtin:add` | `permissions:delegate` | Create a built-in role assignment.
+`roles.builtin:remove` | `permissions:delegate` | Delete a built-in role assignment.
+`reports.admin:create` | `reports:*` | Create reports.
+`reports.admin:write` | `reports:*` | Update reports.
+`reports:delete` | `reports:*` | Delete reports.
+`reports:read` | `reports:*` | List all available reports or get a specific report.
+`reports:send` | `reports:*` | Send a report email.
+`reports.settings:write` | n/a | Update report settings.
+`reports.settings:read` | n/a | Read report settings.
+`provisioning:reload` | `service:accesscontrol` | Reload provisioning files.
+`users:read` | `global:users:*` | Read or search user profiles.
+`users:write` | `global:users:*` | Update a user’s profile.
+`users.teams:read` | `global:users:*` | Read a user’s teams.
+`users.authtoken:list` | `global:users:*` | List authentication tokens that are assigned to a user.
+`users.authtoken:update` | `global:users:*` | Update authentication tokens that are assigned to a user.
+`users.password:update` | `global:users:*` | Update a user’s password.
+`users:delete` | `global:users:*` | Delete a user.
+`users:create` | n/a | Create a user.
+`users:enable` | `global:users:*` | Enable a user.
+`users:disable` | `global:users:*` | Disable a user.
+`users.permissions:update` | `global:users:*` | Update a user’s organization-level permissions.
+`users:logout` | `global:users:*` | Log out a user.
+`users.quotas:list` | `global:users:*` | List a user’s quotas.
+`users.quotas:update` | `global:users:*` | Update a user’s quotas.
+`org.users.read` | `users:*` | Get user profiles within an organization.
+`org.users.add` | `users:*` | Add a user to an organization.
+`org.users.remove` | `users:*` | Remove a user from an organization.
+`org.users.role:update` | `users:*` | Update the organization role (`Viewer`, `Editor`, `Admin`) for an organization.
+`ldap.user:read` | n/a | Get a user via LDAP.
+`ldap.user:sync` | n/a | Sync a user via LDAP.
+`ldap.status:read` | n/a | Verify the LDAP servers’ availability.
+`ldap.config:reload` | n/a | Reload the LDAP configuration.
+`status:accesscontrol` | `service:accesscontrol` | Get access-control enabled status.
+`settings:read` | `settings:**`<br>`settings:auth.saml:*`<br>`settings:auth.saml:enabled` (property level)  | Read settings
+`settings:write` | `settings:**`<br>`settings:auth.saml:*`<br>`settings:auth.saml:enabled` (property level) | Update settings
+`server.stats:read` | n/a | Read server stats
+`datasources:explore` | n/a | Enable explore
 
 ## Scope definitions
 
@@ -69,9 +74,10 @@ The following list contains fine-grained access control scopes.
 
 Scopes | Descriptions
 --- | ---
-roles:* | Restrict an action to a set of roles. For example, `roles:*` matches any role, `roles:randomuid` matches only the role with UID `randomuid` and `roles:custom:reports:{editor,viewer}` matches both `custom:reports:editor` and `custom:reports:viewer` roles.
-permissions:delegate | The scope is only applicable for roles associated with the Access Control itself and indicates that you can delegate your permissions only, or a subset of it, by creating a new role or making an assignment.
-reports:* | Restrict an action to a set of reports. For example, `reports:*` matches any report and `reports:1` matches the report with id `1`.
-service:accesscontrol | Restrict an action to target only the fine-grained access control service. For example, you can use this in conjunction with the `provisioning:reload` or the `status:accesscontrol` actions.
-global:users:* | Restrict an action to a set of global users.
-users:* | Restrict an action to a set of users from an organization.
+`roles:*` | Restrict an action to a set of roles. For example, `roles:*` matches any role, `roles:randomuid` matches only the role with UID `randomuid` and `roles:custom:reports:{editor,viewer}` matches both `custom:reports:editor` and `custom:reports:viewer` roles.
+`permissions:delegate` | The scope is only applicable for roles associated with the Access Control itself and indicates that you can delegate your permissions only, or a subset of it, by creating a new role or making an assignment.
+`reports:*` | Restrict an action to a set of reports. For example, `reports:*` matches any report and `reports:1` matches the report with id `1`.
+`service:accesscontrol` | Restrict an action to target only the fine-grained access control service. For example, you can use this in conjunction with the `provisioning:reload` or the `status:accesscontrol` actions.
+`global:users:*` | Restrict an action to a set of global users.
+`users:*` | Restrict an action to a set of users from an organization.
+`settings:**` | Restrict an action to a subset of settings. For example, `settings:**` matches all settings, `settings:auth.saml:*` matches all SAML settings, and `settings:auth.saml:enabled` matches the enable property on the SAML settings.

docs/sources/enterprise/access-control/provisioning.md

@@ -27,7 +27,7 @@ To create or update custom roles, you can add a list of `roles` in the configura
 
 Every role has a [version]({{< relref "./roles.md#custom-roles" >}}) number. For each role you update, you must remember to increment it, otherwise changes won't be accounted for.
 
-When you update a role, the existing role inside grafana is altered to be exactly what is specified in the YAML file, including permissions.
+When you update a role, the existing role inside Grafana is altered to be exactly what is specified in the YAML file, including permissions.
 
 Here is an example YAML file to create a local role with a set of permissions:
 
@@ -74,7 +74,9 @@ The `orgId` is lost when the role is set to global.
 
 ### Delete roles 
 
-To delete a role, you can add a list of roles under the `deleteRoles` section in the configuration file. Such a deletion is performed after a role is inserted or updated.
+To delete a role, add a list of roles under the `deleteRoles` section in the configuration file. 
+
+> **Note:** Any role in the `deleteRoles` section is deleted before any role in the `roles` section is saved.
 
 Here is an example YAML file to delete a role:
 ```yaml
@@ -92,6 +94,8 @@ deleteRoles:
 
 To assign roles to built-in roles, add said built-in roles to the `builtInRoles` section of your roles. To remove a specific assignment, remove it from the list.
 
+> **Note:** Assignments are updated if the version of the role is greater or equal to the one stored internally. You don’t need to increment the version number of the role to update its assignments.
+
 For example, the following role is assigned to an organization editor or an organization administrator:
 
 ```yaml

docs/sources/enterprise/auditing.md

@@ -15,7 +15,7 @@ Auditing allows you to track important changes to your Grafana instance. By defa
 
 Audit logs are JSON objects representing user actions like:
 
-- Modifications to resources such as dashboards and data sources.
+- Modifications ro resources such as dashboards and data sources.
 - A user failing to log in.
 
 ### Format

docs/sources/enterprise/license/activate-license.md

@@ -68,13 +68,13 @@ In your configuration file:
 
 ```
 [server]
-root_url = https://grafana.example.com/
+root_url = https://grafana.blah.com/
 ```
 
 Or with an environment variable:
 
 ```
-GF_SERVER_ROOT_URL=https://grafana.example.com/
+GF_SERVER_ROOT_URL=https://grafana.blah.com/
 ```
 
 ## Step 4. Restart Grafana

docs/sources/enterprise/query-caching.md

@@ -27,6 +27,23 @@ You can make a panel retrieve fresh data more frequently by increasing the **Max
 - Reduced API costs.
 - Reduced likelihood that APIs will rate-limit or throttle requests.
 
+## Data sources that work with query caching
+
+Query caching works for all [Enterprise data sources](https://grafana.com/grafana/plugins/?type=datasource&enterprise=1), and it works for the following [built-in data sources]({{< relref "../datasources/_index.md" >}}):
+- CloudWatch
+- Google Cloud Monitoring
+- InfluxDB
+- Microsoft SQL Server
+- MySQL
+- Postgres
+- Tempo
+
+Some data sources, such as Elasticsearch, Prometheus, and Loki, cache queries themselves, so Grafana query caching does not improve performance.
+
+Query caching also works for all data sources that include a backend. More specifically, caching works with data sources that extend the `DataSourceWithBackend` class in the plugins SDK.
+
+To tell if a data source works with query caching, follow the instructions below to **Enable and Configure query caching**. If caching is enabled in Grafana but the Caching tab is not visible for the given data source, then query caching is not available for that data source.
+
 ## Enable and configure query caching
 
 You must be an Org admin or Grafana admin to enable query caching for a data source. For more information on Grafana roles and permissions, visit the [Permissions page]({{< relref "../permissions/_index.md" >}}).

docs/sources/explore/_index.md

@@ -18,6 +18,8 @@ If you just want to explore your data and do not want to create a dashboard, the
 
 ## Start exploring
 
+> Refer to [Fine-grained access Control]({{< relref "../enterprise/access-control/_index.md" >}}) in Grafana Enterprise to understand how you can manage Explore with fine-grained permissions.
+
 In order to access Explore, you must have an editor or an administrator role. Refer to [Organization roles]({{< relref "../permissions/organization_roles.md" >}}) for more information on what each role has access to.
 
 To access Explore:

docs/sources/explore/logs-integration.md

@@ -51,7 +51,7 @@ For logs where a **level** label is specified, we use the value of the label to
 
 ### Logs navigation
 
-Logs navigation next to the log lines can be used to request more logs. You can do this by clicking on Older logs button on the bottom of navigation. This is especially useful when you hit the line limit and you want to see more logs. Each request that is run from the navigation is then displayed in the navigation as separate page. Every page is showing from and to timestamp of the incoming log lines. You can re-rerun the same request by clicking on the page.
+Logs navigation next to the log lines can be used to request more logs. You can do this by clicking on Older logs button on the bottom of navigation. This is especially useful when you hit the line limit and you want to see more logs. Each request that is run from the navigation is then displayed in the navigation as separate page. Every page is showing from and to timestamp of the incoming log lines. You can see previous results by clicking on the page. Explore is caching last five requests run from the logs navigation, so you are not re-running the same queries when clicking on the pages.
 
 ![Navigate logs in Explore](/static/img/docs/explore/navigate-logs-8-0.png)
 

docs/sources/getting-started/getting-started-influxdb.md

@@ -106,5 +106,5 @@ In your Grafana instance, go to the [Explore]({{< relref "../explore/_index.md"
 There you go! Use Explore and Data Explorer to experiment with your data, and add the queries that you like to your dashboard as panels. Have fun!
 
 Here are some resources to learn more:
-- Grafana documentation: [InfluxDB data source]({{< relref "../datasources/influxdb/_index.md" >}})
+- Grafana documentation: [InfluxDB data source](../datasources/influxdb/_index.md)
 - InfluxDB documentation: [Comparison of Flux vs InfluxQL](https://docs.influxdata.com/influxdb/v1.8/flux/flux-vs-influxql/)