CircleCI: Update grabpl

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

.bra.toml

@@ -1,19 +1,19 @@
 [run]
 init_cmds = [
-  ["go", "run", "-mod=vendor", "build.go", "-dev", "build-cli"],
-	["go", "run", "-mod=vendor", "build.go", "-dev", "build-server"],
-	["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
+  ["go", "run", "build.go", "-dev", "build-cli"],
+  ["go", "run", "build.go", "-dev", "build-server"],
+  ["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
 ]
 watch_all = true
 follow_symlinks = true
 watch_dirs = [
-	"$WORKDIR/pkg",
-	"$WORKDIR/public/views",
-	"$WORKDIR/conf",
+  "$WORKDIR/pkg",
+  "$WORKDIR/public/views",
+  "$WORKDIR/conf",
 ]
 watch_exts = [".go", ".ini", ".toml", ".template.html"]
 build_delay = 1500
 cmds = [
-  ["go", "run", "-mod=vendor", "build.go", "-dev", "build-server"],
-	["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
+  ["go", "run", "build.go", "-dev", "build-server"],
+  ["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
 ]

.editorconfig

@@ -16,6 +16,9 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[*.{js,ts,tsx,scss}]
+quote_type = single
+
 [*.md]
 trim_trailing_whitespace = false
 

.eslintrc

@@ -0,0 +1,4 @@
+{
+  "extends": ["@grafana/eslint-config"],
+  "root": true
+}

.github/CODEOWNERS

@@ -13,4 +13,11 @@
 
 # Documentation owner: Diana Payton
 /docs/ @oddlittlebird
-/contribute/ @oddlittlebird  @marcusolsson
+/contribute/ @oddlittlebird  @marcusolsson
+# @grafana/ui component documentation
+*.mdx @marcusolsson @jessover9000
+
+# Backend code
+*.go @grafana/backend-platform
+go.mod @grafana/backend-platform
+go.sum @grafana/backend-platform

.github/workflows/publish.yml

@@ -19,7 +19,7 @@ jobs:
       id: publish
       with:
         repository: grafana/website
-        branch: docs-grafana
+        branch: master
         host: github.com
         github_pat: '${{ secrets.GH_BOT_ACCESS_TOKEN }}'
         source_folder: docs/sources

.gitignore

@@ -11,6 +11,10 @@ awsconfig
 /public/views/error.html
 /emails/dist
 /reports
+/e2e/tmp
+.yarnrc
+.yarn/
+vendor/
 
 # Enterprise emails
 /emails/templates/enterprise_*
@@ -81,6 +85,8 @@ debug.test
 
 /devenv/bulk-dashboards/*.json
 /devenv/bulk_alerting_dashboards/*.json
+/devenv/datasources_bulk.yaml
+/devenv/bulk_alerting_dashboards/bulk_alerting_datasources.yaml
 
 /scripts/build/release_publisher/release_publisher
 *.patch
@@ -89,6 +95,7 @@ debug.test
 /packages/**/dist
 /packages/**/compiled
 /packages/**/.rpt2_cache
+/packages/**/tsdoc-metadata.json
 
 # Ignore go local build dependencies
 /scripts/go/bin/**
@@ -100,6 +107,10 @@ compilation-stats.json
 /packages/grafana-e2e/cypress/screenshots
 /packages/grafana-e2e/cypress/videos
 /packages/grafana-e2e/cypress/logs
-/public/e2e-test/screenShots/theOutput
-/public/e2e-tests/screenShots/theOutput/*.png
-/public/e2e-tests/videos
+/e2e/server.log
+/e2e/suite1/screenshots
+!/e2e/suite1/screenshots/expeced/*
+/e2e/suite1/videos/*
+
+# report dumping the whole system env
+/report.*.json

.prettierrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+  ...require('@grafana/toolkit/src/config/prettier.plugin.config.json'),
+};

Dockerfile

@@ -1,12 +1,11 @@
 # Golang build container
-FROM golang:1.13.4-alpine
+FROM golang:1.14.1-alpine
 
 RUN apk add --no-cache gcc g++
 
 WORKDIR $GOPATH/src/github.com/grafana/grafana
 
 COPY go.mod go.sum ./
-COPY vendor vendor
 
 RUN go mod verify
 
@@ -18,16 +17,6 @@ RUN go run build.go build
 # Node build container
 FROM node:12.13.0-alpine
 
-# PhantomJS
-RUN apk add --no-cache curl &&\
-    cd /tmp && curl -Ls https://github.com/dustinblackman/phantomized/releases/download/2.1.1/dockerized-phantomjs.tar.gz | tar xz &&\
-    cp -R lib lib64 / &&\
-    cp -R usr/lib/x86_64-linux-gnu /usr/lib &&\
-    cp -R usr/share /usr/share &&\
-    cp -R etc/fonts /etc &&\
-    curl -k -Ls https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 | tar -jxf - &&\
-    cp phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs
-
 WORKDIR /usr/src/app/
 
 COPY package.json yarn.lock ./
@@ -35,8 +24,9 @@ COPY packages packages
 
 RUN yarn install --pure-lockfile --no-progress
 
-COPY Gruntfile.js tsconfig.json tslint.json .browserslistrc ./
+COPY Gruntfile.js tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./
 COPY public public
+COPY tools tools
 COPY scripts scripts
 COPY emails emails
 
@@ -80,18 +70,9 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
     chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
     chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
 
-# PhantomJS
-COPY --from=1 /tmp/lib /lib
-COPY --from=1 /tmp/lib64 /lib64
-COPY --from=1 /tmp/usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu
-COPY --from=1 /tmp/usr/share /usr/share
-COPY --from=1 /tmp/etc/fonts /etc/fonts
-COPY --from=1 /usr/local/bin/phantomjs /usr/local/bin
-
 COPY --from=0 /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-server /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-cli ./bin/
 COPY --from=1 /usr/src/app/public ./public
 COPY --from=1 /usr/src/app/tools ./tools
-COPY tools/phantomjs/render.js ./tools/phantomjs/render.js
 
 EXPOSE 3000
 

Dockerfile.ubuntu

@@ -1,9 +1,8 @@
-FROM golang:1.13.4 AS go-builder
+FROM golang:1.14.1 AS go-builder
 
 WORKDIR /src/grafana
 
 COPY go.mod go.sum ./
-COPY vendor vendor/
 
 RUN go mod verify
 
@@ -14,11 +13,6 @@ RUN go run build.go build
 
 FROM node:12.13 AS js-builder
 
-# PhantomJS
-RUN apt-get update && apt-get install -y curl &&\
-    curl -L https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 | tar xj &&\
-    cp phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs
-
 WORKDIR /usr/src/app/
 
 COPY package.json yarn.lock ./
@@ -26,15 +20,16 @@ COPY packages packages
 
 RUN yarn install --pure-lockfile
 
-COPY Gruntfile.js tsconfig.json tslint.json .browserslistrc ./
-COPY public public 
+COPY Gruntfile.js tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./
+COPY public public
+COPY tools tools
 COPY scripts scripts
 COPY emails emails
 
 ENV NODE_ENV production
 RUN ./node_modules/.bin/grunt build
 
-FROM ubuntu:18.10
+FROM ubuntu:20.04
 
 LABEL maintainer="Grafana team <hello@grafana.com>"
 EXPOSE 3000
@@ -54,8 +49,8 @@ WORKDIR $GF_PATHS_HOME
 
 COPY conf conf
 
-# We need font libs for phantomjs, and curl should be part of the image
-RUN apt-get update && apt-get upgrade -y && apt-get install -y ca-certificates libfontconfig1 curl
+# curl should be part of the image
+RUN apt-get update && apt-get upgrade -y && apt-get install -y ca-certificates curl
 
 RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
   addgroup --system --gid $GF_GID grafana && \
@@ -71,14 +66,11 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
     chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
     chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
 
-# PhantomJS
-COPY --from=js-builder /usr/local/bin/phantomjs /usr/local/bin/
 
 COPY --from=go-builder /src/grafana/bin/linux-amd64/grafana-server /src/grafana/bin/linux-amd64/grafana-cli bin/
 COPY --from=js-builder /usr/src/app/public public
 COPY --from=js-builder /usr/src/app/tools tools
 
-COPY tools/phantomjs/render.js tools/phantomjs/
 COPY packaging/docker/run.sh /
 
 USER grafana

Gruntfile.js

@@ -35,7 +35,6 @@ module.exports = function (grunt) {
     config.libc = grunt.option('libc');
   }
 
-  config.phjs = grunt.option('phjsToRelease');
   config.pkg.version = grunt.option('pkgVer') || config.pkg.version;
 
   console.log('Version', config.pkg.version);

Makefile

@@ -4,7 +4,7 @@
 
 -include local/Makefile
 
-.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go gosec revive golangci-lint go-vet test-go test-js test run run-frontend clean devenv devenv-down revive-alerting 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 gosec revive golangci-lint go-vet test-go test-js test run run-frontend clean devenv devenv-down revive-alerting protobuf help
 
 GO = GO111MODULE=on go
 GO_FILES ?= ./pkg/...
@@ -84,7 +84,10 @@ revive-alerting: scripts/go/bin/revive
 	@echo "lint alerting via revive"
 	@scripts/go/bin/revive \
 		-formatter stylish \
-		./pkg/services/alerting/...
+		-config ./scripts/go/configs/revive-strict.toml \
+		./pkg/services/alerting/... \
+		./pkg/services/provisioning/datasources/... \
+		./pkg/services/provisioning/dashboards/...
 
 scripts/go/bin/golangci-lint: scripts/go/go.mod
 	@cd scripts/go; \
@@ -158,6 +161,16 @@ devenv-down: ## Stop optional services.
 
 ##@ Helpers
 
+# We separate the protobuf generation because most development tasks on
+# Grafana do not involve changing protobuf files and protoc is not a
+# go-gettable dependency and so getting it installed can be inconvenient.
+#
+# If you are working on changes to protobuf interfaces you may either use
+# this target or run the individual scripts below directly.
+protobuf: ## Compile protobuf definitions
+	bash scripts/protobuf-check.sh
+	bash pkg/plugins/backendplugin/pluginextensionv2/generate.sh
+
 clean: ## Clean up intermediate build artifacts.
 	@echo "cleaning"
 	rm -rf node_modules

UPGRADING_DEPENDENCIES.md

@@ -20,8 +20,6 @@ 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.
 
-All dependencies are vendored in the `vendor/` directory.
-
 _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:
@@ -35,16 +33,14 @@ GO111MODULE=on go get example.com/some/module/pkg
 GO111MODULE=on go get example.com/some/module/pkg@vX.Y.Z
 ```
 
-Tidy up the `go.mod` and `go.sum` files and copy the new/updated dependency to the `vendor/` directory:
+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
-
-GO111MODULE=on go mod vendor
 ```
 
-You have to commit the changes to `go.mod`, `go.sum` and the `vendor/` directory before submitting the pull request.
+You have to commit the changes to `go.mod` and `go.sum` before submitting the pull request.
 
 ## Node.js dependencies
 

api-extractor.json

@@ -0,0 +1,38 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
+  "mainEntryPointFilePath": "<projectFolder>/dist/index.d.ts",
+  "bundledPackages": [],
+  "compiler": {},
+  "apiReport": {
+    "enabled": false
+  },
+  "docModel": {
+    "enabled": true,
+    "apiJsonFilePath": "<projectFolder>/../../reports/docs/<unscopedPackageName>.api.json"
+  },
+  "dtsRollup": {
+    "enabled": false
+  },
+  "tsdocMetadata": {},
+  "messages": {
+    "compilerMessageReporting": {
+      "default": {
+        "logLevel": "warning"
+      }
+    },
+    "extractorMessageReporting": {
+      "default": {
+        "logLevel": "warning"
+      },
+      "ae-internal-missing-underscore": {
+        "logLevel": "none",
+        "addToApiReportFile": false
+      }
+    },
+    "tsdocMessageReporting": {
+      "default": {
+        "logLevel": "warning"
+      }
+    }
+  }
+}

build.go

@@ -40,7 +40,6 @@ var (
 	linuxPackageVersion   string = "v1"
 	linuxPackageIteration string = ""
 	race                  bool
-	phjsToRelease         string
 	workingDir            string
 	includeBuildId        bool     = true
 	buildId               string   = "0"
@@ -52,7 +51,6 @@ var (
 	skipRpmGen            bool     = false
 	skipDebGen            bool     = false
 	printGenVersion       bool     = false
-	modVendor             bool     = true
 )
 
 func main() {
@@ -69,9 +67,7 @@ func main() {
 	flag.StringVar(&libc, "libc", "", "LIBC")
 	flag.BoolVar(&cgo, "cgo-enabled", cgo, "Enable cgo")
 	flag.StringVar(&pkgArch, "pkg-arch", "", "PKG ARCH")
-	flag.StringVar(&phjsToRelease, "phjs", "", "PhantomJS binary")
 	flag.BoolVar(&race, "race", race, "Use race detector")
-	flag.BoolVar(&modVendor, "modVendor", modVendor, "Go modules use vendor folder")
 	flag.BoolVar(&includeBuildId, "includeBuildId", includeBuildId, "IncludeBuildId in package name")
 	flag.BoolVar(&enterprise, "enterprise", enterprise, "Build enterprise version of Grafana")
 	flag.StringVar(&buildIdRaw, "buildId", "0", "Build ID from CI system")
@@ -389,7 +385,6 @@ func createPackage(options linuxPackageOptions) {
 	if enterprise {
 		description += " Enterprise"
 	}
-	args = append(args, "--vendor", description)
 
 	if !enterprise {
 		args = append(args, "--license", "\"Apache 2.0\"")
@@ -459,9 +454,6 @@ func gruntBuildArg(task string) []string {
 	if libc != "" {
 		args = append(args, fmt.Sprintf("--libc=%s", libc))
 	}
-	if phjsToRelease != "" {
-		args = append(args, fmt.Sprintf("--phjsToRelease=%v", phjsToRelease))
-	}
 	if enterprise {
 		args = append(args, "--enterprise")
 	}
@@ -509,9 +501,6 @@ func build(binaryName, pkg string, tags []string) {
 	if race {
 		args = append(args, "-race")
 	}
-	if modVendor {
-		args = append(args, "-mod=vendor")
-	}
 
 	args = append(args, "-o", binary)
 	args = append(args, pkg)

conf/defaults.ini

@@ -230,6 +230,10 @@ snapshot_remove_expired = true
 # Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1
 versions_to_keep = 20
 
+# Minimum dashboard refresh interval. When set, this will restrict users to set the refresh interval of a dashboard lower than given interval. Per default this is 5 seconds.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+min_refresh_interval = 5s
+
 #################################### Users ###############################
 [users]
 # disable user signup / registration
@@ -294,6 +298,9 @@ signout_redirect_url =
 # This setting is ignored if multiple OAuth providers are configured.
 oauth_auto_login = false
 
+# OAuth state max age cookie duration. Defaults to 60 seconds.
+oauth_state_cookie_max_age = 60
+
 # limit of api_key seconds to live before expiration
 api_key_max_seconds_to_live = -1
 
@@ -366,6 +373,34 @@ client_secret = some_secret
 scopes = user:email
 allowed_organizations =
 
+#################################### Azure AD OAuth #######################
+[auth.azuread]
+name = Azure AD
+enabled = false
+allow_sign_up = true
+client_id = some_client_id
+client_secret = some_client_secret
+scopes = openid email profile
+auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
+token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
+allowed_domains =
+allowed_groups =
+
+#################################### Okta OAuth #######################
+[auth.okta]
+name = Okta
+enabled = false
+allow_sign_up = true
+client_id = some_id
+client_secret = some_secret
+scopes = openid profile email groups
+auth_url = https://<tenant-id>.okta.com/oauth2/v1/authorize
+token_url = https://<tenant-id>.okta.com/oauth2/v1/token
+api_url = https://<tenant-id>.okta.com/oauth2/v1/userinfo
+allowed_domains =
+allowed_groups =
+role_attribute_path =
+
 #################################### Generic OAuth #######################
 [auth.generic_oauth]
 name = OAuth
@@ -388,47 +423,6 @@ tls_client_cert =
 tls_client_key =
 tls_client_ca =
 
-#################################### SAML Auth ###########################
-[auth.saml] # Enterprise only
-# Defaults to false. If true, the feature is enabled
-enabled = false
-
-# Base64-encoded public X.509 certificate. Used to sign requests to the IdP
-certificate =
-
-# Path to the public X.509 certificate. Used to sign requests to the IdP
-certificate_path =
-
-# Base64-encoded private key. Used to decrypt assertions from the IdP
-private_key =
-
-# Path to the private key. Used to decrypt assertions from the IdP
-private_key_path =
-
-# Base64-encoded IdP SAML metadata XML. Used to verify and obtain binding locations from the IdP
-idp_metadata =
-
-# Path to the SAML metadata XML. Used to verify and obtain binding locations from the IdP
-idp_metadata_path =
-
-# URL to fetch SAML IdP metadata. Used to verify and obtain binding locations from the IdP
-idp_metadata_url =
-
-# Duration, since the IdP issued a response and the SP is allowed to process it. Defaults to 90 seconds
-max_issue_delay = 90s
-
-# Duration, for how long the SP's metadata should be valid. Defaults to 48 hours
-metadata_valid_duration = 48h
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's name
-assertion_attribute_name = displayName
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
-assertion_attribute_login = mail
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's email
-assertion_attribute_email = mail
-
 #################################### Basic Auth ##########################
 [auth.basic]
 enabled = true
@@ -689,6 +683,9 @@ container_name =
 server_url =
 # If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
 callback_url =
+# Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
+# which this setting can help protect against by only allowing a certain amount of concurrent requests.
+concurrent_render_request_limit = 30
 
 [panels]
 # here for to support old env variables, can remove after a few months
@@ -699,6 +696,66 @@ disable_sanitize_html = false
 enable_alpha = false
 app_tls_skip_verify_insecure = false
 
+#################################### 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.
+# See ICU’s metaZones.txt (https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt) for a list of supported
+# timezone IDs. Fallbacks to TZ environment variable if not set.
+rendering_timezone =
+
+# Instruct headless browser instance to use a default language when not provided by Grafana, e.g. when rendering panel image of alert.
+# Please refer to the HTTP header Accept-Language to understand how to format this value, e.g. 'fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5'.
+rendering_language =
+
+# Instruct headless browser instance to use a default device scale factor when not provided by Grafana, e.g. when rendering panel image of alert.
+# Default is 1. Using a higher value will produce more detailed images (higher DPI), but will require more disk space to store an image.
+rendering_viewport_device_scale_factor =
+
+# Instruct headless browser instance whether to ignore HTTPS errors during navigation. Per default HTTPS errors are not ignored. Due to
+# the security risk it's not recommended to ignore HTTPS errors.
+rendering_ignore_https_errors =
+
+# Instruct headless browser instance whether to capture and log verbose information when rendering an image. Default is false and will
+# only capture and log error messages. When enabled, debug messages are captured and logged as well.
+# For the verbose information to be included in the Grafana server log you have to adjust the rendering log level to debug, configure
+# [log].filter = rendering:debug.
+rendering_verbose_logging =
+
+# Instruct headless browser instance whether to output its debug and error messages into running process of remote rendering service.
+# Default is false. This can be useful to enable (true) when troubleshooting.
+rendering_dumpio =
+
+# Additional arguments to pass to the headless browser instance. Default is --no-sandbox. The list of Chromium flags can be found
+# here (https://peter.sh/experiments/chromium-command-line-switches/). Multiple arguments is separated with comma-character.
+rendering_args =
+
+# You can configure the plugin to use a different browser binary instead of the pre-packaged version of Chromium.
+# Please note that this is not recommended, since you may encounter problems if the installed version of Chrome/Chromium is not
+# compatible with the plugin.
+rendering_chrome_bin =
+
+# Instruct how headless browser instances are created. Default is 'default' and will create a new browser instance on each request.
+# Mode 'clustered' will make sure that only a maximum of browsers/incognito pages can execute concurrently.
+# Mode 'reusable' will have one browser instance and will create a new incognito page on each request.
+rendering_mode =
+
+# When rendering_mode = clustered you can instruct how many browsers or incognito pages can execute concurrently. Default is 'browser'
+# and will cluster using browser instances.
+# Mode 'context' will cluster using incognito pages.
+rendering_clustering_mode =
+# When rendering_mode = clustered you can define maximum number of browser instances/incognito pages that can execute concurrently..
+rendering_clustering_max_concurrency =
+
+# Limit the maxiumum viewport width, height and device scale factor that can be requested.
+rendering_viewport_max_width =
+rendering_viewport_max_height =
+rendering_viewport_max_device_scale_factor =
+
+# Change the listening host and port of the gRPC server. Default host is 127.0.0.1 and default port is 0 and will automatically assign
+# a port not in use.
+grpc_host =
+grpc_port =
+
 [enterprise]
 license_path =
 

conf/sample.ini

@@ -229,6 +229,10 @@
 # Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1
 ;versions_to_keep = 20
 
+# Minimum dashboard refresh interval. When set, this will restrict users to set the refresh interval of a dashboard lower than given interval. Per default this is 5 seconds.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;min_refresh_interval = 5s
+
 #################################### Users ###############################
 [users]
 # disable user signup / registration
@@ -293,6 +297,9 @@
 # This setting is ignored if multiple OAuth providers are configured.
 ;oauth_auto_login = false
 
+# OAuth state max age cookie duration. Defaults to 60 seconds.
+;oauth_state_cookie_max_age = 60
+
 # limit of api_key seconds to live before expiration
 ;api_key_max_seconds_to_live = -1
 
@@ -356,6 +363,34 @@
 ;scopes = user:email
 ;allowed_organizations =
 
+#################################### Azure AD OAuth #######################
+[auth.azuread]
+;name = Azure AD
+;enabled = false
+;allow_sign_up = true
+;client_id = some_client_id
+;client_secret = some_client_secret
+;scopes = openid email profile
+;auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
+;token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
+;allowed_domains =
+;allowed_groups =
+
+#################################### Okta OAuth #######################
+[auth.okta]
+;name = Okta
+;enabled = false
+;allow_sign_up = true
+;client_id = some_id
+;client_secret = some_secret
+;scopes = openid profile email groups
+;auth_url = https://<tenant-id>.okta.com/oauth2/v1/authorize
+;token_url = https://<tenant-id>.okta.com/oauth2/v1/token
+;api_url = https://<tenant-id>.okta.com/oauth2/v1/userinfo
+;allowed_domains =
+;allowed_groups =
+;role_attribute_path =
+
 #################################### Generic OAuth ##########################
 [auth.generic_oauth]
 ;enabled = false
@@ -378,47 +413,6 @@
 ;tls_client_key =
 ;tls_client_ca =
 
-#################################### SAML Auth ###########################
-[auth.saml] # Enterprise only
-# Defaults to false. If true, the feature is enabled.
-;enabled = false
-
-# Base64-encoded public X.509 certificate. Used to sign requests to the IdP
-;certificate =
-
-# Path to the public X.509 certificate. Used to sign requests to the IdP
-;certificate_path =
-
-# Base64-encoded private key. Used to decrypt assertions from the IdP
-;private_key =
-
-;# Path to the private key. Used to decrypt assertions from the IdP
-;private_key_path =
-
-# Base64-encoded IdP SAML metadata XML. Used to verify and obtain binding locations from the IdP
-;idp_metadata =
-
-# Path to the SAML metadata XML. Used to verify and obtain binding locations from the IdP
-;idp_metadata_path =
-
-# URL to fetch SAML IdP metadata. Used to verify and obtain binding locations from the IdP
-;idp_metadata_url =
-
-# Duration, since the IdP issued a response and the SP is allowed to process it. Defaults to 90 seconds.
-;max_issue_delay = 90s
-
-# Duration, for how long the SP's metadata should be valid. Defaults to 48 hours.
-;metadata_valid_duration = 48h
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's name
-;assertion_attribute_name = displayName
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
-;assertion_attribute_login = mail
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's email
-;assertion_attribute_email = mail
-
 #################################### Basic Auth ##########################
 [auth.basic]
 ;enabled = true
@@ -679,6 +673,9 @@
 ;server_url =
 # If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
 ;callback_url =
+# Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
+# which this setting can help protect against by only allowing a certain amount of concurrent requests.
+;concurrent_render_request_limit = 30
 
 [panels]
 # If set to true Grafana will allow script tags in text panels. Not recommended as it enable XSS vulnerabilities.
@@ -688,6 +685,66 @@
 ;enable_alpha = false
 ;app_tls_skip_verify_insecure = false
 
+#################################### 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.
+# See ICU’s metaZones.txt (https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt) for a list of supported
+# timezone IDs. Fallbacks to TZ environment variable if not set.
+;rendering_timezone =
+
+# Instruct headless browser instance to use a default language when not provided by Grafana, e.g. when rendering panel image of alert.
+# Please refer to the HTTP header Accept-Language to understand how to format this value, e.g. 'fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5'.
+;rendering_language =
+
+# Instruct headless browser instance to use a default device scale factor when not provided by Grafana, e.g. when rendering panel image of alert.
+# Default is 1. Using a higher value will produce more detailed images (higher DPI), but will require more disk space to store an image.
+;rendering_viewport_device_scale_factor =
+
+# Instruct headless browser instance whether to ignore HTTPS errors during navigation. Per default HTTPS errors are not ignored. Due to
+# the security risk it's not recommended to ignore HTTPS errors.
+;rendering_ignore_https_errors =
+
+# Instruct headless browser instance whether to capture and log verbose information when rendering an image. Default is false and will
+# only capture and log error messages. When enabled, debug messages are captured and logged as well.
+# For the verbose information to be included in the Grafana server log you have to adjust the rendering log level to debug, configure
+# [log].filter = rendering:debug.
+;rendering_verbose_logging =
+
+# Instruct headless browser instance whether to output its debug and error messages into running process of remote rendering service.
+# Default is false. This can be useful to enable (true) when troubleshooting.
+;rendering_dumpio =
+
+# Additional arguments to pass to the headless browser instance. Default is --no-sandbox. The list of Chromium flags can be found
+# here (https://peter.sh/experiments/chromium-command-line-switches/). Multiple arguments is separated with comma-character.
+;rendering_args =
+
+# You can configure the plugin to use a different browser binary instead of the pre-packaged version of Chromium.
+# Please note that this is not recommended, since you may encounter problems if the installed version of Chrome/Chromium is not
+# compatible with the plugin.
+;rendering_chrome_bin =
+
+# Instruct how headless browser instances are created. Default is 'default' and will create a new browser instance on each request.
+# Mode 'clustered' will make sure that only a maximum of browsers/incognito pages can execute concurrently.
+# Mode 'reusable' will have one browser instance and will create a new incognito page on each request.
+;rendering_mode =
+
+# When rendering_mode = clustered you can instruct how many browsers or incognito pages can execute concurrently. Default is 'browser'
+# and will cluster using browser instances.
+# Mode 'context' will cluster using incognito pages.
+;rendering_clustering_mode =
+# When rendering_mode = clustered you can define maximum number of browser instances/incognito pages that can execute concurrently..
+;rendering_clustering_max_concurrency =
+
+# Limit the maxiumum viewport width, height and device scale factor that can be requested.
+;rendering_viewport_max_width =
+;rendering_viewport_max_height =
+;rendering_viewport_max_device_scale_factor =
+
+# Change the listening host and port of the gRPC server. Default host is 127.0.0.1 and default port is 0 and will automatically assign
+# a port not in use.
+;grpc_host =
+;grpc_port =
+
 [enterprise]
 # Path to a valid Grafana Enterprise license.jwt file
 ;license_path =

contribute/architecture/communication.md

@@ -72,7 +72,7 @@ if err := s.bus.Dispatch(cmd); err != nil {
 
 ### Handle commands
 
-Let others parts of the application dispatch commands to a service, by registering a _command handler_:
+Let other parts of the application dispatch commands to a service, by registering a _command handler_:
 
 To handle a command, register a command handler in the `Init` function.
 
@@ -91,7 +91,7 @@ func (s *MyService) SendStickers(cmd *models.SendStickersCommand) error {
 
 ## Queries
 
-A command handler can optionally populate the command sent it. This pattern is commonly used to implement _queries_.
+A command handler can optionally populate the command sent to it. This pattern is commonly used to implement _queries_.
 
 ### Making a query
 

contribute/developer-guide.md

@@ -4,7 +4,6 @@ This guide helps you get started developing Grafana.
 
 Before you begin, you might want to read [How to contribute to Grafana as a junior dev](https://medium.com/@ivanahuckova/how-to-contribute-to-grafana-as-junior-dev-c01fe3064502) by [Ivana Huckova](https://medium.com/@ivanahuckova).
 
-
 ## Dependencies
 
 Make sure you have the following dependencies installed before setting up your developer environment:
@@ -21,7 +20,7 @@ We recommend using [Homebrew](https://brew.sh/) for installing any missing depen
 ```
 brew install git
 brew install go
-brew install node
+brew install node@12
 
 npm install -g yarn
 ```
@@ -52,7 +51,7 @@ After the command has finished, we can start building our source code:
 yarn start
 ```
 
-Once `yarn start` has built the assets, it will continue to do so whenever any of the files change. This means you don't have to manually build the assets whenever every time you change the code.
+Once `yarn start` has built the assets, it will continue to do so whenever any of the files change. This means you don't have to manually build the assets every time you change the code.
 
 Next, we'll build the web server that will serve the frontend assets we just built.
 
@@ -106,7 +105,7 @@ To run the tests:
 yarn e2e-tests
 ```
 
-By default, the end-to-end tests assumes Grafana is available on `localhost:3000`. To use a specific URL, set the `BASE_URL` environment variable:
+By default, the end-to-end tests assume Grafana is available on `localhost:3000`. To use a specific URL, set the `BASE_URL` environment variable:
 
 ```
 BASE_URL=http://localhost:3333 yarn e2e-tests
@@ -130,7 +129,6 @@ Enable the development mode, by adding the following line in your `custom.ini`:
 app_mode = development
 ```
 
-
 ### Add data sources
 
 By now, you should be able to build and test a change you've made to the Grafana source code. In most cases, you need to add at least one data source to verify the change.
@@ -172,7 +170,7 @@ The resulting image will be tagged as grafana/grafana:dev.
 1. Build the frontend: `go run build.go build-frontend`.
 1. Build the Docker image: `make build-docker-dev`.
 
-**Note:** If you are using Docker for macOS, be sure to set the memory limit to be larger than 2 GiB. Otherwise `grunt build` may fail. The memory limit settings are available under **Docker Desktop** -> **Preferences** -> **Advanced**.
+**Note:** If you are using Docker for macOS, be sure to set the memory limit to be larger than 2 GiB. Otherwise, `grunt build` may fail. The memory limit settings are available under **Docker Desktop** -> **Preferences** -> **Advanced**.
 
 ## Troubleshooting
 
@@ -180,7 +178,7 @@ Are you having issues with setting up your environment? Here are some tips that
 
 ### Too many open files when running `make run`
 
-Depending on your environment, you may have to increase the maximum number of open files allowed.
+Depending on your environment, you may have to increase the maximum number of open files allowed. For the rest of this section, we will assume you are on a Unix like OS (e.g. Linux/MacOS), where you can control the maximum number of open files through the [ulimit](https://ss64.com/bash/ulimit.html) shell command.
 
 To see how many open files are allowed, run:
 
@@ -202,6 +200,27 @@ find ./conf ./pkg ./public/views | wc -l
 
 Another alternative is to limit the files being watched. The directories that are watched for changes are listed in the `.bra.toml` file in the root directory. 
 
+To retain your `ulimit` configuration, i.e. so it will be remembered for future sessions, you need to commit it to your command line shell initialization file. Which file this will be depends on the shell you are using, here are some examples:
+
+* zsh -> ~/.zshrc
+* bash -> ~/.bashrc
+
+Commit your ulimit configuration to your shell initialization file as follows ($LIMIT being your chosen limit and $INIT_FILE being the initialization file for your shell): 
+
+```
+echo ulimit -S -n $LIMIT >> $INIT_FILE
+```
+
+Your command shell should read the initialization file in question every time it gets started, and apply your `ulimit` command.
+
+For some people, typically using the bash shell, ulimit fails with an error similar to the following:
+
+```
+ulimit: open files: cannot modify limit: Operation not permitted
+```
+
+If that happens to you, chances are you've already set a lower limit and your shell won't let you set a higher one. Try looking in your shell initalization files (~/.bashrc typically), if there's already a ulimit command that you can tweak.
+
 ## Next steps
 
 - Read our [style guides](/contribute/style-guides).

contribute/style-guides/backend.md

@@ -39,7 +39,3 @@ Tests must use the standard library, `testing`. For assertions, prefer using [te
 The majority of our tests uses [GoConvey](http://goconvey.co/) but that's something we want to avoid going forward.
 
 In the `sqlstore` package we do database operations in tests and while some might say that's not suited for unit tests. We think they are fast enough and provide a lot of value.
-
-## General guidelines
-
-- Avoid using import aliases, e.g. `import m "github.com/grafana/grafana/pkg/models"`.

contribute/style-guides/code-comments.md

@@ -0,0 +1,209 @@
+# Guidelines for code comments in grafana-* packages
+
+This document aims to give you some recommendation on how to add code comments to the exported code in the grafana packages.
+
+## Table of Contents
+
+1. [Add package description](#add-package-description)
+1. [Set stability of an API](#set-stability-of-an-api)
+1. [Deprecate an API](#deprecate-an-api)
+1. [Specify parameters](#specify-parameters)
+1. [Set return values](#set-return-values)
+____
+
+ ## Add package description
+
+Each package has an overview explaining the overall responsibility and usage of the package. 
+
+You can document this description with [`@packageDocumentation`](https://api-extractor.com/pages/tsdoc/tag_packagedocumentation/) tag.
+
+Add this tag to the `<packageRoot>/src/index.ts` entry file to have one place for the package description.
+
+## Set stability of an API
+
+All `exported` apis from the package should have a release tag to indicate its stability.
+
+- [`@alpha`](https://api-extractor.com/pages/tsdoc/tag_alpha/) - early draft of api and will probably change.
+- [`@beta`](https://api-extractor.com/pages/tsdoc/tag_beta/) - close to being stable but might change.
+- [`@public`](https://api-extractor.com/pages/tsdoc/tag_public/) - ready for useage in production.
+- [`@internal`](https://api-extractor.com/pages/tsdoc/tag_internal/) - for internal use only.
+
+### Main stability of APIs
+
+Add a tag to mark the stability of the whole exported `class/interface/function/type` etc.
+
+Please place the `release tag` at the bottom of the comment to make it consistent among files and easier to read. 
+
+**Do:**
+
+```typescript
+/**
+ * Will help to create DataFrame objects and handle 
+ * the heavy lifting of creating a complex object.
+ * 
+ * @example
+ * ```typescript
+ * const dataFrame = factory.create();
+ * ```
+ * 
+ * @public
+ **/
+export class DataFrameFactory {
+    create(): DataFrame { }
+}
+```
+
+**Don't**
+```typescript
+/**
+ * Will help to create DataFrame objects and handle 
+ * the heavy lifting of creating a complex object.
+ * 
+ * @public
+ * @example
+ * ```typescript
+ * const dataFrame = factory.create();
+ * ```
+ **/
+export class DataFrameFactory {
+    create(): DataFrame { }
+}
+```
+
+### Partial stability of APIs
+
+Add the main stability of the API at the top according to [Main stability of API](#main-stability-of-api).
+
+Then override the non-stable parts of the API with the proper [release tag](#release-tags). This should also be place at the bottom of the comment block.
+
+**Do:**
+
+```typescript
+/**
+ * Will help to create DataFrame objects and handle 
+ * the heavy lifting of creating a complex object.
+ * 
+ * @example
+ * ```typescript
+ * const dataFrame = factory.create();
+ * ```
+ * 
+ * @public
+ **/
+export class DataFrameFactory {
+    create(): DataFrame { }
+
+    /**
+     * @beta
+     **/
+    createMany(): DataFrames[] {}
+}
+```
+
+**Don't**
+
+```typescript
+/**
+ * Will help to create DataFrame objects and handle 
+ * the heavy lifting of creating a complex object.
+ * 
+ * @example
+ * ```typescript
+ * const dataFrame = factory.create();
+ * ```
+ **/
+export class DataFrameFactory {
+    /**
+     * @public
+     **/
+    create(): DataFrame { }
+
+    /**
+     * @beta
+     **/
+    createMany(): DataFrame[] {}
+}
+```
+
+## Deprecate an API
+If you want to mark an API as deprecated to signal that this API will be removed in the future, then add the [`@deprecated`](https://api-extractor.com/pages/tsdoc/tag_deprecated/) tag.
+
+If applicable add a reason why the API is deprecated directly after the `@deprecated tag`.
+
+## Specify parameters
+If you want to specify the possible parameters that can be passed to an API, then add the [`@param`](https://api-extractor.com/pages/tsdoc/tag_param/) tag.
+
+This attribute can be skipped if the type provided by `typescript` and the function comment or the function name is enough to explain what the parameters are.
+
+**Do:**
+
+```typescript
+/**
+ * Will help to create a resource resovler depending
+ * on the current execution context.
+ * 
+ * @param context - The current execution context.
+ * @returns FileResolver if executed on the server otherwise a HttpResolver.
+ * @public
+ **/
+export const factory = (context: Context): IResolver => {
+    if (context.isServer) {
+        return new FileResolver();
+    }
+    return new HttpResolver();
+}
+```
+
+**Don't**
+
+```typescript
+/**
+ * Will compare two numbers to see if they are equal to each others.
+ * 
+ * @param x - The first number
+ * @param y - The second number
+ * @public
+ **/
+export const isEqual = (x: number, y: number): boolean => {
+    return x === y;
+}
+```
+
+
+## Set return values
+If you want to specify the return value from a function you can use the [`@returns`](https://api-extractor.com/pages/tsdoc/tag_returns/) tag.
+
+This attribute can be skipped if the type provided by `typescript` and the function comment or the function name is enough to explain what the function returns.
+
+**Do:**
+
+```typescript
+/**
+ * Will help to create a resource resovler depending
+ * on the current execution context.
+ * 
+ * @param context - The current execution context.
+ * @returns FileResolver if executed on the server otherwise a HttpResolver.
+ * @public
+ **/
+export const factory = (context: Context): IResolver => {
+    if (context.isServer) {
+        return new FileResolver();
+    }
+    return new HttpResolver();
+}
+```
+
+**Don't**
+
+```typescript
+/**
+ * Will compare two numbers to see if they are equal to each others.
+ * 
+ * @returns true if values are equal
+ * @public
+ **/
+export const isEqual = (x: number, y: number): boolean => {
+    return x === y;
+}
+```

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

@@ -0,0 +1,144 @@
+# Markdown style guide
+
+This guide for Markdown style helps keep contributions consistent across all documentation
+created for Grafana products. Refer to the guide and update its sections as needed when a
+Subject Matter Expert answers a question on Markdown style, or a decision is made about
+how to apply Markdown.
+
+## Headers
+
+In Markdown, the number of "#" symbols creates different heading levels, similar to
+HTML heading levels:
+
+**Example**
+
+* \# is \<h1>.
+* \#\# is \<h2>.
+* \#\#\# is \<h3>.
+
+Start your document with a single ``#`` for the title of the page. Add the sub-headings with two ``##``.
+
+## Bold and emphasis
+
+* Make text **bold** using two asterisks.
+
+**Example:** It is ``**important**`` to use Github Flavored Markdown emoji consistently.
+
+* Make text ``*emphasized*`` using single `` _underscores_`` or a single asterisk.
+
+**Example:** Github Flavored Markdown emoji should _only_ appear in specific cases.
+
+
+## Links and references
+
+Create links to other website by wrapping the display text in square brackets, and
+the web URL in curved brackets.
+
+\[text to display](www.website.com)
+
+**Example:** For more information on including emoji in Github flavored Markdown, refer to the [webfx page on emoji](https://www.webfx.com/tools/emoji-cheat-sheet/) for a list of emoji.
+
+## Block quotes
+
+Include Block quotes inside text using right-facing arrows:
+
+**Example**
+
+> Any important information
+> about emoji can be separated into
+> a blockquote.
+
+## Code blocks
+
+Code blocks written with markdown can show off syntax highlighting specific
+to different languages. Use three back tics to create a code block:
+
+```
+function testNum(a) {
+  if (a > 0) {
+    return "positive";
+  } else {
+    return "NOT positive";
+  }
+}
+```
+
+Write the name of the language after the first set of back tics, no spaces,
+to show specific syntax highlighting. For example; "\```javascript" produces the following:
+
+```javascript
+function testNum(a) {
+  if (a > 0) {
+    return "positive";
+  } else {
+    return "NOT positive";
+  }
+}
+```
+## Tables
+
+Construct a table by typing the table headings, and separating them with
+a "|" character. Then, add a second line of dashes ("-") separated by
+another "|" character. When constructing the table cells, separate each cell data with another
+"|".
+
+**Example**
+
+Heading one | Heading two
+
+\------------|------------
+
+Cell one data| Cell two data
+
+Will publish as:
+
+Heading one | Heading two
+------------|------------
+Cell one data| Cell two data
+
+## Lists
+
+### Numbered lists
+
+To avoid inconsistent list numbering, use repetitive list numbering:
+
+\1. First
+
+\1. Second
+
+\1. Third
+
+The list above will always display as:
+
+1. First
+2. Second
+3. Third
+
+### Unordered lists
+
+Build a list of points - an unordered or unnumbered list - by
+using "\*" characters.
+
+**Example**
+
+* First
+* Another item
+* The last list item
+
+## Images
+
+Include images in a document using the following syntax:
+
+**Example** \!\[Grafana Logo](/link/to/grafanalogo/logo.png)
+
+This follows the format of "!", alt text wrapped in "[]" and the link URL wrapped in "()".
+
+## Comments
+
+You can include comments that will not appear in published markdown using the
+following syntax:
+
+\[comment]: <> (Comment text to display)
+
+The word "comment" wrapped in "[]" followed by a ":", a space, "<>", and then
+the comment itself wrapped in "()".

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

@@ -2,6 +2,10 @@
 
 This style guide applies to all documentation created for Grafana products.
 
+For information about how to write technical documentation, we suggest reviewing the content of the [Google Technical Writing courses](https://developers.google.com/tech-writing).
+
+The [Divio documentation system](https://documentation.divio.com/) site is also a good resource.
+
 ## Contributing
 
 The *Documentation style guide* is a living document. Add to it whenever a style decision is made or a question is answered regarding style, grammar, or word choice.
@@ -137,6 +141,14 @@ Two words, not one
 * Correct, but passive voice: Your list of active alarms is displayed.
 * Incorrect: The list of active alarms displays.
 
+#### intro, introduction
+
+"Introduction" is the preferred word. Use "intro" if there are space constraints (like on the side menu) or you are specifically trying for a less formal, more conversational tone.
+
+#### metadata
+
+One word, not two.
+
 #### open source, open-source
 
 Do not hyphenate when used as an adjective unless the lack of hyphen would cause confusion. For example: _Open source software design is the most open open-source system I can imagine._ 

contribute/style-guides/e2e.md

@@ -1,19 +1,44 @@
 # End to end test framework
+
 Grafana Labs uses a minimal home grown solution built on top of Cypress for our end to end (e2e) tests.
 
+## Commands
+
+- `yarn e2e` Creates an isolated grafana-server home under `<repo-root>/e2e/tmp` with provisioned data sources and dashboards. This
+  copies locally build binary and frontned assets from your repo root so you need to have a built backend and frontend
+  for this to run locally. The server starts on port 3001 so it does not conflict with your normal dev server.
+- `yarn e2e:debug` Same as above but runs the tests in chrome and does not shutdown after completion.
+- `yarn e2e:dev` Same as above but does not run any tests on startup. It lets you pick a test first.
+
+The above commands use some utils scripts under `<repo-root>/e2e` that can also be used for more control.
+
+- `./e2e/start-server` This creates a fresh new grafana server working dir, setup's config and starts the server. It
+  will also kill any previously started server that is still running using pid file at `<repo-root>/e2e/tmp/pid`.
+- `./e2e/run-suite <debug|dev|noarg>` Starts cypress in different modes.
+
+## Test Suites
+
+All the integration tests are located at `e2e/suite<x>/specs`. The page objects and reusable flows are in the
+`packages/grafana-e2e` package.
+
 ## Basic concepts
+
 Here is a good introduction to e2e best practices: https://martinfowler.com/bliki/PageObject.html.
+
 - `Selector`: A unique identifier that is used from the e2e framework to retrieve an element from the Browser
-- `Page`: An abstraction for an object that contains one or more `Selectors`
+- `Page`: An abstraction for an object that contains one or more `Selectors` with `visit` function to navigate to the page.
+- `Component`: An abstraction for an object that contains one or more `Selectors` but without `visit` function
 - `Flow`: An abstraction that contains a sequence of actions on one or more `Pages` that can be reused and shared between tests
 
 ## Basic example
+
 Let's start with a simple example with a single selector. For simplicity, all examples are in JSX.
 
 In our example app, we have an input that we want to type some text into during our e2e test.
+
 ```jsx harmony
 <div>
-    <input type="text" className="gf-form-input login-form-input"/>
+  <input type="text" className="gf-form-input login-form-input" />
 </div>
 ```
 
@@ -21,25 +46,26 @@ We could define a selector using `JQuery` [type selectors](https://api.jquery.co
 
 At Grafana, we use `aria-label` as our preferred way of defining selectors instead of `data-*` attributes. This also aids in accessibility.
 Let's add a descriptive `aria-label` to our simple example.
+
 ```jsx harmony
 <div>
-    <input type="text" className="gf-form-input login-form-input" aria-label="Username input field"/>
+  <input type="text" className="gf-form-input login-form-input" aria-label="Username input field" />
 </div>
 ```
 
 Now that we added the `aria-label` we suddenly get more information about this particular field. It's an input field that represents a username, but there it's still not really signaling that it's part of an e2e test.
 
 The next step is to create a `Page` representation in our e2e test framework to glue the test with the real implementation using the `pageFactory` function. For that function we can supply a `url` and `selectors` like in the example below:
+
 ```typescript
-export const Login = pageFactory({
-  url: '/login', // used when called from Login.visit()
-  selectors: {
-    username: 'Username input field', // used when called from Login.username().type('Hello World')
-  },
-});
+export const Login = {
+  url: "/login", // used when called from Login.visit()
+  username: "Username input field", // used when called from Login.username().type('Hello World')
+};
 ```
 
-The next step is to add the `Login` page to the exported const `Pages` in `packages/grafana-e2e/src/pages/index.ts` so that it appears when we type `e2e.pages` in our IDE.
+The next step is to add the `Login` page to the exported const `Pages` in `packages/grafana-e2e-selectors/src/selectors/pages.ts` so that it appears when we type `e2e.pages` in our IDE.
+
 ```ecmascript 6
 export const Pages = {
   Login,
@@ -49,17 +75,21 @@ export const Pages = {
 };
 
 ```
+
 Now that we have a `Page` called `Login` in our `Pages` const we can use that to add a selector in our html like shown below and now this really signals to future developers that it is part of an e2e test.
+
 ```jsx harmony
 <div>
-    <input type="text" className="gf-form-input login-form-input" aria-label={e2e.pages.Login.selectors.username}/>
+  <input type="text" className="gf-form-input login-form-input" aria-label={selectors.pages.Login.username} />
 </div>
 ```
 
-The last step in our example is to use our `Login` page as part of a test. The `pageFactory` function we used before gives us two things:
+The last step in our example is to use our `Login` page as part of a test.
+
 - The `url` property is used whenever we call the `visit` function and is equivalent to the Cypress function [cy.visit()](https://docs.cypress.io/api/commands/visit.html#Syntax).
-> Best practice after calling `visit` is to always call `should` on a selector to prevent flaky tests when you try to access an element that isn't ready. For more information, refer to [Commands vs. assertions](https://docs.cypress.io/guides/core-concepts/retry-ability.html#Commands-vs-assertions).
-- Any defined selector in the `selectors` property can be accessed from the `Login` page by invoking it. This is equivalent to the result of the Cypress function [cy.get(...)](https://docs.cypress.io/api/commands/get.html#Syntax).
+  > Best practice after calling `visit` is to always call `should` on a selector to prevent flaky tests when you try to access an element that isn't ready. For more information, refer to [Commands vs. assertions](https://docs.cypress.io/guides/core-concepts/retry-ability.html#Commands-vs-assertions).
+- Any defined selector can be accessed from the `Login` page by invoking it. This is equivalent to the result of the Cypress function [cy.get(...)](https://docs.cypress.io/api/commands/get.html#Syntax).
+
 ```ecmascript 6
 describe('Login test', () => {
   it('Should pass', () => {
@@ -73,6 +103,7 @@ describe('Login test', () => {
 ```
 
 ## Advanced example
+
 Let's take a look at an example that uses the same `selector` for multiple items in a list for instance. In this example app we have a list of data sources that we want to click on during an e2e test.
 
 ```jsx harmony
@@ -80,36 +111,35 @@ Let's take a look at an example that uses the same `selector` for multiple items
   {dataSources.map(dataSource => (
     <li className="card-item-wrapper" key={dataSource.id}>
       <a className="card-item" href={`datasources/edit/${dataSource.id}`}>
-        <div className="card-item-name">
-          {dataSource.name}
-        </div>
+        <div className="card-item-name">{dataSource.name}</div>
       </a>
     </li>
   ))}
 </ul>
 ```
-```
+
+````
 
 Just as before in the basic example we'll start by creating a page abstraction using the `pageFactory` function:
 ```typescript
-export const DataSources = pageFactory({
+export const DataSources = {
   url: '/datasources',
-  selectors: {
-    dataSources: (dataSourceName: string) => `Data source list item ${dataSourceName}`,
-  },
-});
-```
+  dataSources: (dataSourceName: string) => `Data source list item ${dataSourceName}`,
+};
+````
+
 You might have noticed that instead of a simple `string` as the `selector`, we're using a `function` that takes a string parameter as an argument and returns a formatted string using the argument.
 
-Just as before we need to add the `DataSources` page to the exported const `Pages` in `packages/grafana-e2e/src/pages/index.ts`.
+Just as before we need to add the `DataSources` page to the exported const `Pages` in `packages/grafana-e2e-selectors/src/selectors/pages.ts`.
 
 The next step is to use the `dataSources` selector function as in our example below:
+
 ```jsx harmony
 <ul>
   {dataSources.map(dataSource => (
     <li className="card-item-wrapper" key={dataSource.id}>
       <a className="card-item" href={`datasources/edit/${dataSource.id}`}>
-        <div className="card-item-name" aria-label={e2e.pages.DataSources.selectors.dataSources(dataSource.name)}>
+        <div className="card-item-name" aria-label={selectors.pages.DataSources.dataSources(dataSource.name)}>
           {dataSource.name}
         </div>
       </a>
@@ -119,6 +149,7 @@ The next step is to use the `dataSources` selector function as in our example be
 ```
 
 When this list is rendered with the data sources with names `A`, `B`, `C` the resulting html would become:
+
 ```jsx harmony
 <div class="card-item-name" aria-label="Data source list item A">
  A
@@ -134,7 +165,9 @@ When this list is rendered with the data sources with names `A`, `B`, `C` the re
 ```
 
 Now we can write our test. The one thing that differs from the `Basic example` is that we pass in which data source we want to click on as an argument to the selector function:
+
 > Best practice after calling `visit` is to always call `should` on a selector to prevent flaky tests when you try to access an element that isn't ready. For more information, refer to [Commands vs. assertions](https://docs.cypress.io/guides/core-concepts/retry-ability.html#Commands-vs-assertions).
+
 ```ecmascript 6
 describe('List test', () => {
   it('Clicking on data source named B', () => {
@@ -147,9 +180,18 @@ describe('List test', () => {
 });
 ```
 
-
 ## Debugging PhantomJS image rendering
 
+### Common Error
+
+The most common error with PhantomJs image rendering is when a PR introduces an import that has functionality that's not supported by PhantomJs. To quickly identify which new import causes this you can use a tool like `es-check`.
+
+1. Run > `npx es-check es5 './public/build/*.js'`
+2. Check the output for files that break es5 compatibility.
+3. Lazy load the failing imports if possible.
+
+### Debugging
+
 There is no easy or comprehensive way to debug PhantomJS smoke test (image rendering) failures. However, PhantomJS exposes remote debugging interface which can give you a sense of what is going wrong in the smoke test. Before performing the steps described below make sure your local Grafana instance is running:
 
 1. Go to `tools/phantomjs` directory

contribute/style-guides/frontend.md

@@ -7,31 +7,239 @@ Generally we follow the Airbnb [React Style Guide](https://github.com/airbnb/jav
 - [Frontend Style Guide](#frontend-style-guide)
   - [Table of Contents](#table-of-contents)
   - [Basic rules](#basic-rules)
-  - [Organization](#organization)
-  - [Props](#props)
+  - [Naming conventions](#naming-conventions)
+  - [Files and directories naming conventions](#files-and-directories-naming-conventions)
+  - [Code organization](#code-organization)
+    - [Exports](#exports)
+  - [Comments](#comments)
+  - [React](#react)
+    - [Props](#props)
   - [State management](#state-management)
 
 ## Basic rules
 
 - Try to keep files small and focused.
 - Break large components up into sub-components.
+- Use spaces for indentation.
 
-## Organization
+### Naming conventions
 
-- Components and types that needs to be used by external plugins needs to go into @grafana/ui
-- Components should get their own folder under features/xxx/components
-  - Sub components can live in that component folders, so small component do not need their own folder
-  - Place test next to their component file (same dir)
-  - Component sass should live in the same folder as component code
-- State logic & domain models should live in features/xxx/state
-- Containers (pages) can live in feature root features/xxx
-  - up for debate?
+#### Use `PascalCase` for:
 
-## Props
+##### Typescript class names
 
-- Name callback props and handlers with an "on" prefix.
+```typescript
+// bad
+class dataLink {
+  //...
+}
+
+// good
+class DataLink {
+  //...
+}
+```
+
+##### Types and interfaces
+
+```
+// bad
+interface buttonProps {
+  //...
+}
+// bad
+interface button_props {
+  //...
+}
+// bad
+interface IButtonProps {
+  //...
+}
+
+// good
+interface ButtonProps {
+  //...
+}
+
+// bad
+type requestInfo = ...
+// bad
+type request_info = ...
+
+// good
+type RequestInfo = ...
+```
+
+##### Enums
+
+```
+// bad
+enum buttonVariant {
+ //...
+}
+
+// good
+enum ButtonVariant {
+ //...
+}
+```
+
+#### Use `camelCase` for:
+
+##### Functions
+
+```typescript
+// bad
+const CalculatePercentage = () => { ... }
+// bad
+const calculate_percentage = () => { ... }
+
+// good
+const calculatePercentage = () => { ... }
+```
+
+##### Methods
+
+```typescript
+class DateCalculator {
+  // bad
+  CalculateTimeRange () {...}
+}
+class DateCalculator {
+  // bad
+  calculate_timee_range () {...}
+}
+
+class DateCalculator {
+  // good
+  calculateTimeRange () {...}
+}
+```
+
+##### Variables
+
+```typescript
+// bad
+const QueryTargets = [];
+// bad
+const query_targets = [];
+
+// good
+const queryTargets = [];
+```
+
+##### React state and properties
+
+```typescript
+interface ModalState {
+  // bad
+  IsActive: boolean;
+  // bad
+  is_active: boolean;
+
+  // good
+  isActive: boolean;
+}
+```
+
+##### Emotion class names
+
+```typescript
+const getStyles  = = () => ({
+  // bad
+  ElementWraper: css`...`,
+  // bad
+  ["element-wrapper"]: css`...`,
+
+  // good
+  elementWrapper: css`...`,
+});
+```
+
+#### Use `ALL_CAPS` for constants.
+
+```typescript
+// bad
+const constantValue = "This string won't change";
+// bad
+const constant_value = "This string won't change";
+
+// good
+const CONSTANT_VALUE = "This string won't change";
+```
+
+#### Use [BEM](http://getbem.com/) convention for SASS styles.
+
+_SASS styles are deprecated. Please migrate to Emotion whenever you need to modify SASS styles._
+
+### File and directory naming conventions
+
+Name files according to the primary export:
+
+- When the primary export is a class or React component, use PascalCase.
+- When the primary export is a function, use camelCase.
+
+For files exporting multiple utility functions, use the name that describes the responsibility of grouped utilities. For example, a file exporting math utilities should be named `math.ts`.
+
+- Use `constants.ts` for files exporting constants.
+- Use `actions.ts` for files exporting Redux actions.
+- Use `reducers.ts` Redux reducers.
+- Use `*.test.ts(x)` for test files.
+
+### Code organization
+
+Organize your code in a directory that encloses feature code:
+
+- Put Redux state and domain logic code in `state` directory (i.e. `features/my-feature/state/actions.ts`).
+- Put React components in `components` directory (i.e. `features/my-feature/components/ButtonPeopleDreamOf.tsx`).
+- Put test files next to the test subject.
+- Put containers (pages) in feature root (i.e. `features/my-feature/DashboardPage.tsx`).
+- Subcomponents can live in the component folders. Small component do not need their own folder.
+- Component SASS styles should live in the same folder as component code.
+
+For code that needs to be used by external plugin:
+
+- Put components and types in `@grafana/ui`.
+- Put data models and data utilities in `@grafana/data`.
+- Put runtime services interfaces in `@grafana/runtime`.
+
+#### Exports
+
+- Use named exports for all code you want to export from a file.
+- Use declaration exports (i.e. `export const foo = ...`).
+- Export only the code that is meant to be used outside the module.
+
+### Comments
+
+- Use [TSDoc](https://github.com/microsoft/tsdoc) comments to document your code.
+- Use [react-docgen](https://github.com/reactjs/react-docgen) comments (`/** ... */`) for props documentation.
+- Use inline comments for comments inside functions, classes etc.
+- Please try to follow the [code comment guidelines](./code-comments.md) when adding comments.
+
+### Linting
+
+Linting is performed using [@grafana/eslint-config](https://github.com/grafana/eslint-config-grafana).
+
+## React
+
+Use the following conventions when implementing React components:
+
+### Props
+
+##### Name callback props and handlers with an "on" prefix.
 
 ```tsx
+// bad
+handleChange = () => {
+
+};
+
+render() {
+  return (
+    <MyComponent changed={this.handleChange} />
+  );
+}
+
 // good
 onChange = () => {
 
@@ -43,46 +251,36 @@ render() {
   );
 }
 
-// bad
-handleChange = () => {
-
-};
-
-render() {
-  return (
-    <MyComponent changed={this.handleChange} />
-  );
-}
 ```
 
-- React Component definitions
+##### React Component definitions
 
 ```jsx
-// good
-export class YourClass extends PureComponent<{},{}> { ... }
-
 // bad
 export class YourClass extends PureComponent { ... }
+
+// good
+export class YourClass extends PureComponent<{},{}> { ... }
 ```
 
-- React Component constructor
+##### React Component constructor
 
 ```typescript
-// good
-constructor(props:Props) {...}
-
 // bad
 constructor(props) {...}
+
+// good
+constructor(props: Props) {...}
 ```
 
-- React Component defaultProps
+##### React Component defaultProps
 
 ```typescript
-// good
-static defaultProps: Partial<Props> = { ... }
-
 // bad
 static defaultProps = { ... }
+
+// good
+static defaultProps: Partial<Props> = { ... }
 ```
 
 ## State management

contribute/style-guides/storybook.md

@@ -0,0 +1,182 @@
+# Storybook
+
+[Storybook](https://storybook.js.org/) is a tool which we use to manage our design system and the components which are a part of it. Storybook consists of _stories:_ each story represents a component and a case in which it is used. To show a wide variety of use cases is good both documentation wise and for troubleshooting -- it might be possible to reproduce a bug for an edge case in a story.
+
+Storybook is:
+
+- A good way to publish our design system with its implementations
+- Used as a tool for documentation
+- Used for debugging and displaying edge cases
+
+## How to create stories
+
+Stories for a component should be placed next to the component file. The Storybook file requires the same name as the component file. For example, a story for `SomeComponent.tsx` will have the file name `SomeComponent.story.tsx`. If a story should be internal, not visible in production, name the file `SomeComponent.story.internal.tsx`.
+
+### Writing stories
+
+When writing stories, we use the [CSF format](https://storybook.js.org/docs/formats/component-story-format/). For more in-depth information on writing stories, see [Storybook’s documentation on writing stories](https://storybook.js.org/docs/basics/writing-stories/).
+
+With the CSF format, the default export defines some general information about the stories in the file:
+
+- `title`: Where the component is going to live in the hierarchy
+- `decorators`: A list which can contain wrappers or provide context, such as theming
+
+```jsx
+// In MyComponent.story.tsx
+
+import MyComponent from './MyComponent';
+
+export default {
+  title: 'General/MyComponent',
+  component: MyComponent,
+  decorators: [ ... ],
+}
+
+```
+
+When it comes to writing the actual stories, you continue in the same file with named exports. The exports are turned into the story name.
+
+```jsx
+// Will produce a story name “some story”
+export const someStory = () => <MyComponent />;
+```
+
+If you want to write cover cases with different values for props, then using knobs is usually enough. You don’t need to create a new story. This will be covered further down.
+
+### Categorization
+
+We currently have these categories:
+
+- **Docs Overview** - Guidelines and information regarding the design system
+- **Forms** - Components commonly used in forms such as different kind of inputs
+- **General** - Components which can be used in a lot of different places
+- **Visualizations** - Data visualizations
+- **Panel** - Components belonging to panels and panel editors
+
+## Writing MDX documentation
+
+An MDX file is basically a markdown file with the possibility to add jsx. These files are used by Storybook to create a “docs” tab.
+
+### Link the MDX file to a component’s stories
+
+To link a component’s stories with an MDX file you have to do this:
+
+```jsx
+// In TabsBar.story.tsx
+
+import { TabsBar } from "./TabsBar";
+
+// Import the MDX file
+import mdx from "./TabsBar.mdx";
+
+export default {
+  title: "General/Tabs/TabsBar",
+  component: TabsBar,
+  parameters: {
+    docs: {
+      // This is the reference required for the MDX file
+      page: mdx,
+    },
+  },
+};
+```
+
+### MDX file structure
+
+There are some things that the MDX file should contain:
+
+- When and why the component should be used
+- Best practices - dos and don’ts for the component
+- Usage examples with code. It is possible to use the `Preview` element to show live examples in MDX
+- Props table. This can be generated by doing the following:
+
+```jsx
+// In MyComponent.mdx
+
+import { Props } from "@storybook/addon-docs/blocks";
+import { MyComponent } from "./MyComponent";
+
+<Props of={MyComponent} />;
+```
+
+### MDX file without a relationship to a component
+
+An MDX file can exist by itself without any connection to a story. This can be good for writing things such as a general guidelines page. Two things are required for this to work:
+
+- The file needs to be named `*.story.mdx`
+- A `Meta` tag must exist that says where in the hierarchy the component lives. It can look like this:
+
+```jsx
+<Meta title="Docs Overview/Color Palettes"/>
+
+# Guidelines for using colors
+
+...
+
+```
+
+You can add parameters to the Meta tag. This example shows how to hide the tools:
+
+```jsx
+<Meta title="Docs Overview/Color Palettes" parameters={{ options: { isToolshown: false }}}/>
+
+# Guidelines for using colors
+
+...
+
+```
+
+## Documenting component properties
+
+A quick way to get an overview of what a component does is by looking at its properties. That's why it is important that we document these in a good way.
+
+### Comments
+
+When writing the props interface for a component, it is possible to add a comment to that specific property, which will end up in the Props table in the MDX file. The comments are generated by [react-docgen](https://github.com/reactjs/react-docgen) and are formatted by writing `/** */`.
+
+```jsx
+interface MyProps {
+  /** Sets the initial values, which are overridden when the query returns a value*/
+  defaultValues: Array<T>;
+}
+```
+
+### Knobs
+
+Knobs is an [addon to Storybook](https://github.com/storybookjs/storybook/tree/master/addons/knobs) which can be used to easily switch values in the UI. A good use case for it is to try different props for the component. Using knobs is easy. Grafana is set up so knobs can be used straight out of the box. Here is an example of how you might use it.
+
+```jsx
+// In MyComponent.story.tsx
+
+import { number, text } from "@storybook/addon-knobs";
+
+export const basicStory = () => (
+  <MyComponent
+    max={number("Max value", 10)}
+    min={number("Min value", -10)}
+    title={text("Title", "Look at the value!")}
+  />
+);
+```
+
+The general convention is that the first parameter of the knob is its name and the second is the default value. There are some more types:
+
+| Knob      | Description                                                                                                                          |
+| --------- | ------------------------------------------------------------------------------------------------------------------------------------ |
+| `text`    | Any text field                                                                                                                       |
+| `number`  | Any number input. Also [available as range](https://github.com/storybookjs/storybook/tree/master/addons/knobs#number-bound-by-range) |
+| `boolean` | A switch between true/false                                                                                                          |
+| `color`   | Color picker                                                                                                                         |
+| `object`  | JSON input or array. Good to use if the property requires more complex data structures.                                              |
+| `array`   | Array of strings separated by a comma                                                                                                |
+| `select`  | Select a value from an options object. Good for trying different test cases.                                                         |
+| `options` | Configurable UI for selecting a range of options                                                                                     |
+| `files`   | File selector                                                                                                                        |
+| `date`    | Select date as stringified Unix timestamp                                                                                            |
+| `button`  | Has a handler which is called when clicked                                                                                           |
+
+## Best practices
+
+- When creating a new component or writing documentation for an existing one, always cover the basic use case it was intended for with a code example.
+- Use stories and knobs to create edge cases. If you are trying to solve a bug, try to reproduce it with a story.
+- Do not create stories in the MDX, always create them in the `*.story.tsx` file.

contribute/style-guides/styling.md

@@ -1,48 +1,55 @@
 # Styling Grafana
 
-## Emotion
-
 [Emotion](https://emotion.sh/docs/introduction) is our default-to-be approach to styling React components. It provides a way for styles to be a consequence of properties and state of a component.
 
-### Usage
+## Usage
 
-#### Basic styling
+### Basic styling
 
-For styling components use Emotion's `css` function
+For styling components, use [Emotion's `css` function](https://emotion.sh/docs/emotion#css).
 
 ```tsx
-import { css }  from 'emotion';
+import React from 'react';
+import { css } from 'emotion';
 
-
-const ComponentA = () => {
-  return (
-    <div className={css`background: red;`}>
-      As red as you can ge
-    </div>
-  );
-}
+const ComponentA = () => (
+  <div
+    className={css`
+      background: red;
+    `}
+  >
+    As red as you can get
+  </div>
+);
 ```
 
-#### Styling complex components
+### Styling complex components
 
-In more complex cases, especially when you need to style multiple DOM elements in one component or when your styles that depend on properties and/or state, you should create a helper function that returns an object with desired stylesheet. This function should also be wrapped in `stylesFactory` helper function that will provide basic memoization.
+In more complex cases, especially when you need to style multiple DOM elements in one component, or when using styles that depend on properties and/or state, you should create a helper function that returns an object of styles. This function should also be wrapped in the `stylesFactory` helper function, which will provide basic memoization.
 
-Let's say you need to style a component that has different background depending on the theme:
+Let's say you need to style a component that has a different background depending on the theme:
 
 ```tsx
-import { css, cx }  from 'emotion';
-import { GrafanaTheme, useTheme, selectThemeVariant, stylesFactory } from '@grafana/ui';
+import React from 'react';
+import { css } from 'emotion';
+import { GrafanaTheme } from '@grafana/data';
+import { selectThemeVariant, stylesFactory, useTheme } from '@grafana/ui';
 
 const getStyles = stylesFactory((theme: GrafanaTheme) => {
-  const backgroundColor = selectThemeVariant({ light: theme.colors.red, dark: theme.colors.blue }, theme.type);
+  const backgroundColor = selectThemeVariant(
+    { light: theme.colors.red, dark: theme.colors.blue },
+    theme.type
+  );
 
   return {
     wrapper: css`
       background: ${backgroundColor};
     `,
-    icon: css`font-size:${theme.typography.size.sm}`;
+    icon: css`
+      font-size: ${theme.typography.size.sm};
+    `,
   };
-}
+});
 
 const ComponentA = () => {
   const theme = useTheme();
@@ -54,18 +61,18 @@ const ComponentA = () => {
       <i className={styles.icon} />
     </div>
   );
-});
+};
 ```
 
-For more information about themes at Grafana please see [themes guide](./themes.md)
+For more information about themes at Grafana please see the [themes guide](./themes.md).
 
-#### Composing class names
+### Composing class names
 
-For class composition use Emotion's `cx` function
+For class composition, use [Emotion's `cx` function](https://emotion.sh/docs/emotion#cx).
 
 ```tsx
-import { css, cx }  from 'emotion';
-
+import React from 'react';
+import { css, cx } from 'emotion';
 
 interface Props {
   className?: string;
@@ -74,13 +81,11 @@ interface Props {
 const ComponentA: React.FC<Props> = ({ className }) => {
   const finalClassName = cx(
     className,
-    css`background: red`,
-  )
-
-  return (
-    <div className={finalClassName}>
-      As red as you can ge
-    </div>
+    css`
+      background: red;
+    `
   );
-}
+
+  return <div className={finalClassName}>As red as you can ge</div>;
+};
 ```

contribute/style-guides/themes.md

@@ -2,11 +2,22 @@
 
 ## Overview
 
-**Themes are implemented in Typescript.** That's because our goal is to share variables between Grafana Typescript code and SASS files. Theme definitions are located in `packages/grafana-ui/src/themes/[default|dark|light].ts` files. `default.ts` file holds common variables like typography and spacing definitions, while `[light|dark].ts` primarily specify colors used in themes.
+**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.
 
 ## Usage
+
+This section provides usage guidelines.
+
 ### Using themes in React components
 
+Here's how to use Grafana themes in React components.
+
 #### Using `ThemeContext` directly
 
 ```tsx
@@ -26,12 +37,11 @@ const Foo: React.FunctionComponent<FooProps> = () => {
 
   // Your component has access to the theme variables now
 }
-
 ```
 
 #### Using `withTheme` higher-order component (HOC)
 
-With this method your component will be automatically wrapped in `ThemeContext.Consumer` and provided with current theme via `theme` prop. Component used with `withTheme` must implement `Themeable` interface.
+With this method your component will be automatically wrapped in `ThemeContext.Consumer` and provided with current theme via `theme` prop. Components used with `withTheme` must implement the `Themeable` interface.
 
 ```ts
 import  { ThemeContext, Themeable } from '@grafana/ui';
@@ -43,7 +53,7 @@ const Foo: React.FunctionComponent<FooProps> = () => ...
 export default withTheme(Foo);
 ```
 
-### Test components that use ThemeContext
+### Test components that use `ThemeContext`
 
 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.
 
@@ -73,9 +83,11 @@ describe('MyComponent', () => {
 });
 ```
 
-### Using themes in Storybook
+### Using themes in [Storybook](https://storybook.js.org/)
 
-All stories are wrapped with `ThemeContext.Provider` using global decorator. To render `Themeable` component that's not wrapped by `withTheme` HOC you either create a new component in your story:
+All stories are wrapped with `ThemeContext.Provider` using a global decorator. To render a `Themeable` component that isn't wrapped by a `withTheme` HOC, either create a new component in your story, or use the `renderComponentWithTheme` helper.
+
+#### Create a new component:
 
 ```tsx
 // Foo.story.tsx
@@ -86,7 +98,7 @@ FooStories.add('Story' () => {
 });
 ```
 
-or use `renderComponentWithTheme` helper:
+#### Use `renderComponentWithTheme` helper:
 
 ```tsx
 // Bar.story.tsx
@@ -98,29 +110,42 @@ BarStories.add('Story' () => {
 
 ### Using themes in Angular code
 
-There should be very few cases where theme would be used in Angular context. For this purpose there is a function available that retrieves current theme: `import { getCurrentTheme } from app/core/utils/ConfigProvider`. Angular components should be migrated to React, or if that's not possible at the moment, styled using SASS.
+There should be very few cases where a theme would be used in an Angular context. For this purpose, there is a function available that retrieves the current theme:
 
+```ts
+import { getCurrentTheme } from app/core/utils/ConfigProvider
+```
+
+Angular components should be migrated to React, or if that's not possible at the moment, styled using Sass.
 
 ## FAQ
-### How can I modify SASS variable files?
+
+This section provides insight into frequently-asked questions.
+
+### How can I modify Sass variable files?
+
 > For the following to apply you need to run `yarn dev` task.
 
-`[_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!**.
+`[_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 *SASS variable value* you need to modify corresponding Typescript file that is a source of the variables:
+#### 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:
+#### 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
-### 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 case of graph legend rendering and `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 `provideTheme` function:
+
+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

contribute/templates/README.md

@@ -0,0 +1,57 @@
+# Templates
+
+Templates are both a starting point and an instruction manual for writing something new. They are intended to make life easier by providing a jumping-off point, something besides a blank page to start from. They are not intended to be a limitation. If the template does not work perfectly for your use case, you can adjust or change it. We will work it out in code review.
+
+## Create a template
+
+Feel free to add templates to the `templates` folder. Try to make them as generic as possible and include clear instructions for when and how to use the template. Assume that the template user is a brand new contributor and write accordingly.
+
+## Use a template
+
+1. Read the template. Make sure you understand what it is for and how it is intended to be used.
+1. Copy and rename the template. Move it to where you actually need it.
+   You might also want to copy the content of the template and paste it into a different file. This is acceptable use.
+1. Replace the template content with your own. Delete whatever is unnecessary.
+
+## Documentation templates
+
+In an ideal world, each topic will correspond to an information *type* ([task](doc-task-template.md), [reference](doc-reference-template.md), [concept](doc-concept-template.md)) and contain only that type of information.
+
+However, this is not always practical. For example, you have a series of short topics, you can group them into one topic.
+
+Try to *chunk* your content. This means you should organize the document so that the same kinds of content are grouped together.
+
+### Chunking example
+
+If I was writing content for a site called *Doggie handbook*, I might organize it like this. 
+
+**Concept**
+* What a dog is
+* Brief history of dogs
+* Why you might want a dog
+* Tasks dogs can be trained to do
+  
+**Tasks**
+* Feed the dog
+* Groom the dog
+* Train the dog
+
+**Reference**
+* List of dog equipment you will need
+* Table of breeds that includes breed name, size range, short or long hair, and type of dog
+
+### Audience
+
+Write for an audience that is computer literate and has general technical knowledge, but is not necessarily familiar with Grafana or the finer points of observability. 
+
+Pretend you are explaining your topic to a brand new Grafana user or developer.
+
+### Self-contained
+
+Thanks to search engines, every page in the documentation might be a reader's entry point. This means that each page needs to be self-contained and make sense on its own. The reader should not need to read other topics in order to perform the task or understand the concept.
+
+However, try to be helpful and link to related information. Using the *Doggie handbook* example, the concept topic that explains what dogs can be trained to do might link to the Train the dog task.
+
+## Code templates
+
+This is a placeholder for future templates.

contribute/templates/doc-concept-template.md

@@ -0,0 +1,42 @@
+DELETE THIS LINE: If draft = false, then the document will not be built in the doc site. If the date is earlier than the build date, than the document will not show in the build site. Use these settings to control whether future content is shown in the doc site.
++++
+draft = "false"
+date = "yyyy-mm-dd"
+title = "Title in sentence case"
+description = "Description in title case"
+keywords = ["grafana", "enter", "keywords", "here"]
+type = "docs"
+[menu.docs]
+name = "Name of topic"
+identifier = "identifier"
+parent = "menu parent"
+weight = 100
++++
+
+# Concept
+
+The title of the concept topic will generally be a noun or a gerund. Examples include Templates, Templating, Dashboards, and panels.
+
+Concepts are topic types for any information that doesn't involve task lists or reference information. Ideally you use concept elements to explain concepts, ideas, overviews, workflows, and the like. In the intro section, this first paragraph or two, you should explain to the user what to expect in this topic or section.
+
+[Permissions overview](https://grafana.com/docs/grafana/latest/permissions/overview/) is an example of a concept topic.
+
+## Idea
+
+Concept topics or sections explain *what* and *why*. They do not explain *how*. If you are a new user, you might look for concept information to learn about what Grafana is, why it might be useful to you, and what the general workflow is. 
+
+## Workflow
+
+Continuing the example in the previous section, here is a sample Grafana workflow. 
+
+1. Install Grafana. <link to task for installing Grafana>
+2. Set up data sources. <link to data sources concept topic, which links to data source task topics>
+3. Create panels. <link to panel concept topic, which links to tasks>
+4. Create dashboards.  <link to panel concept topic, which links to tasks>
+5. Enter queries. <link to query editor concept topic>
+6. Add users. <link to user management concept topic, which links to tasks>
+7. Create playlists. <link to Playlist topic that contains concept information and tasks>
+
+## Next steps
+
+Concept tasks often link to related information, including *tasks* related to the concept and *reference* topics related to the concept.

contribute/templates/doc-reference-template.md

@@ -0,0 +1,75 @@
+DELETE THIS LINE: If draft = false, then the document will not be built in the doc site. If the date is earlier than the build date, than the document will not show in the build site. Use these settings to control whether future content is shown in the doc site.
++++
+draft = "false"
+date = "yyyy-mm-dd"
+title = "Title in sentence case"
+description = "Description in title case"
+keywords = ["grafana", "enter", "keywords", "here"]
+type = "docs"
+[menu.docs]
+name = "Name of topic"
+identifier = "identifier"
+parent = "menu parent"
+weight = 100
++++
+
+# Reference
+
+The *reference* topic type is for storing reference information, such as extensive tables, lists, or other information that is used as support for a task. Reference topics are also designed for API information.
+
+Often reference topics are linked from *task* topics, because they contain information the user needs in order to perform a task.
+
+[Grafana CLI](https://grafana.com/docs/grafana/latest/administration/cli/) is one example of a reference topic.
+
+## Lists
+
+Lists of commands or parameters are often organized in reference topics. The information you need to present will dictate the format.
+
+* They might
+* be in
+* unordered lists.
+
+[Configuration](https://grafana.com/docs/grafana/latest/installation/configuration/) is an example of lists.
+
+## Tables
+
+If you have a large list of things to store in a table, then you are probably dealing with reference information. Hugo accepts either tables in Markdown or in HTML format, so use whichever is easier for you.
+
+The [Glossary](https://grafana.com/docs/grafana/latest/guides/glossary/) provides an example of reference data in a table.
+
+### Empty markdown table
+
+While you might not need a heading for each table, headings are a good way to chunk information if you have several tables. They also make the content easy to skim. Use headings or intro paragraphs like this one to explain to the reader what the information in the table is used for.
+
+|    |    |    |    |    |    |
+|:---|:---|:--:|:--:|---:|---:|
+|    |    |    |    |    |    |
+|    |    |    |    |    |    |
+|    |    |    |    |    |    |
+|    |    |    |    |    |    |
+
+### Empty HTML table
+
+And here is intro text, similar to the paragraph in the previous section. Do not add local styling to the table. The website CSS will take care of that for you.
+
+<table>
+  <tr>
+    <th>Firstname</th>
+    <th>Lastname</th> 
+    <th>Age</th>
+  </tr>
+  <tr>
+    <td>Jill</td>
+    <td>Smith</td> 
+    <td>50</td>
+  </tr>
+  <tr>
+    <td>Eve</td>
+    <td>Jackson</td> 
+    <td>94</td>
+  </tr>
+</table>
+
+## API documentation
+
+API documentation is always a reference topic rather than a task topic, but it has its own rules.

contribute/templates/doc-task-template.md

@@ -0,0 +1,57 @@
++++
+draft = "false"
+date = "yyyy-mm-dd"
+title = "Title in sentence case"
+description = "Description in title case"
+keywords = ["grafana", "enter", "keywords", "here"]
+type = "docs"
+[menu.docs]
+name = "Name of topic"
+identifier = "identifier"
+parent = "menu parent"
+weight = 100
++++
+
+# Task
+
+A *task* topic is intended for a procedure that describes how to accomplish a task. It lists a series of steps that users follow to produce an intended outcome. It tells the reader *how* to do something. [Install Grafana plugins](https://grafana.com/docs/grafana/latest/plugins/installation/) and [Playlist](https://grafana.com/docs/grafana/latest/reference/playlist/) are examples of task topics. Playlist includes a small amount of concept information in the introduction, which is appropriate.
+
+Always include an introduction of a short paragraph or two to explain what the task is for, perhaps give the reader an idea of what the outcome will be.
+
+In most cases, each topic should only contain one task. If you have several very short, related tasks, then you might combine them into one topic.
+
+In the case of a long task, then you probably won't need any headings except for the h1 at the top of the page.
+
+1. Start with step one.
+1. Use second-person imperative tense.
+1. Basically, "You, do this" with every sentence.
+1. Do not use the third-person "user" for steps you want the reader ("you") to perform.
+1. Write steps that contain one action, possibly two related actions, such as copy and paste a thing or save and quit the program.
+   If a sentence is not telling the reader to do something, then it is not a step. You can use nested images or paragraphs like this one to add information if necessary.
+
+In many cases, you should tell the reader what the outcome should be so that they know when they are done.
+
+## One-step task
+
+Some tasks are so short, they only contain one step.
+
+Write one-step tasks as simple sentences, not as unordered lists or numbered lists.
+
+## Short task
+
+Short tasks can be grouped. How short constitutes "short" is a judgment call based on number of steps and how long individual steps are.
+
+1. Use your judgment.
+2. Ask your coworkers or someone on the Comm team for advice if you aren't sure.
+
+## Next steps
+
+If the task you are writing leads naturally to one or more other tasks, then include links after the task to help the reader figure out where to go next.
+
+Thanks to internet search engines, every page in the documentation could be page one. Pretend you are explaining your task to a new Grafana user who just walked in off the street.
+
+## Testing
+
+It is a good practice to have someone else test the task you have written. If they can successfully complete the task using *only* what the steps you have written, not guessing or using their inherent knowledge, then your task has passed the test. However, it is very common to find you have skipped steps, because *you* are very familiar with Grafana and the topic you are explaining.
+
+New users or people from other teams are very helpful for these tests.

devenv/README.md

@@ -36,5 +36,7 @@ make devenv sources=influxdb,prometheus2,elastic5
 Some of the blocks support dynamic change of the image version used in the Docker file. The signature looks like this: 
 
 ```bash
-make devenv sources=postgres,openldap postgres_version=9.2
+make devenv sources=postgres,openldap,grafana postgres_version=9.2 grafana_version=6.7.0-beta1
 ```
+
+Note: The grafana block is pre-configured with the dev-datasources and dashboards.

devenv/bulk_alerting_dashboards/bulkdash_alerting.jsonnet

@@ -1,168 +0,0 @@
-{
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "id": null,
-  "links": [],
-  "panels": [
-    {
-      "alert": {
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                65
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "A",
-                "5m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "frequency": "10s",
-        "handler": 1,
-        "name": "bulk alerting",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-prometheus",
-      "fill": 1,
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "$$hashKey": "object:117",
-          "expr": "go_goroutines",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A"
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 50
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "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
-        }
-      ]
-    }
-  ],
-  "schemaVersion": 16,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "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"
-    ]
-  },
-  "timezone": "",
-  "title": "New dashboard",
-  "uid": null,
-  "version": 0
-}

devenv/bulk_alerting_dashboards/dashboard.libsonnet

@@ -0,0 +1,170 @@
+{
+  alertingDashboard(dashboardCounter, datasourceCounter):: {
+    title: "alerting-title-" + dashboardCounter,
+    editable: true,
+    gnetId: null,
+    graphTooltip: 0,
+    id: null,
+    links: [],
+    panels: [
+      {
+        alert: {
+          conditions: [
+            {
+              evaluator: {
+                params: [
+                  65
+                ],
+                type: "gt"
+              },
+              operator: {
+                type: "and"
+              },
+              query: {
+                params: [
+                  "A",
+                  "5m",
+                  "now"
+                ]
+              },
+              reducer: {
+                params: [],
+                type: "avg"
+              },
+              type: "query"
+            }
+          ],
+          executionErrorState: "alerting",
+          frequency: "24h",
+          handler: 1,
+          name: "bulk alerting " + dashboardCounter,
+          noDataState: "no_data",
+          notifications: []
+        },
+        aliasColors: {},
+        bars: false,
+        dashLength: 10,
+        dashes: false,
+        datasource: "gfdev-bulkalerting-" + datasourceCounter,
+        fill: 1,
+        gridPos: {
+          h: 9,
+          w: 12,
+          x: 0,
+          y: 0
+        },
+        id: 1,
+        legend: {
+          avg: false,
+          current: false,
+          max: false,
+          min: false,
+          show: true,
+          total: false,
+          values: false
+        },
+        lines: true,
+        linewidth: 1,
+        nullPointMode: "null",
+        percentage: false,
+        pointradius: 5,
+        points: false,
+        renderer: "flot",
+        seriesOverrides: [],
+        spaceLength: 10,
+        stack: false,
+        steppedLine: false,
+        targets: [
+          {
+            expr: "go_goroutines",
+            format: "time_series",
+            intervalFactor: 1,
+            refId: "A"
+          }
+        ],
+        thresholds: [
+          {
+            colorMode: "critical",
+            fill: true,
+            line: true,
+            op: "gt",
+            value: 50
+          }
+        ],
+        timeFrom: null,
+        timeShift: null,
+        title: "Panel Title",
+        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
+          }
+        ]
+      }
+    ],
+    schemaVersion: 16,
+    style: "dark",
+    tags: [],
+    templating: {
+      list: []
+    },
+    time: {
+      from: "now-6h",
+      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"
+      ]
+    },
+    timezone: "",
+    uid: null,
+    version: 0
+  },
+}
+

devenv/bulk_alerting_dashboards/datasources.jsonnet

@@ -0,0 +1,14 @@
+local arr = std.range(1, 100);
+
+{
+    "apiVersion": 1,
+    "datasources": [
+        {
+            "name": 'gfdev-bulkalerting-' + counter,
+            "type": "prometheus",
+            "access": "proxy",
+            "url": "http://localhost:9090"
+        }
+        for counter in arr
+    ],
+}

devenv/datasources_docker.yaml

@@ -0,0 +1,248 @@
+
+apiVersion: 1
+
+datasources:
+  - name: gdev-graphite
+    type: graphite
+    access: proxy
+    url: http://graphite11:80
+    jsonData:
+      graphiteVersion: "1.1"
+
+  - name: gdev-prometheus
+    type: prometheus
+    access: proxy
+    url: http://prometheus:9090
+
+  - name: gdev-slow-prometheus
+    type: prometheus
+    access: proxy
+    url: http://prometheus:3011
+
+  - name: gdev-testdata
+    isDefault: true
+    type: testdata
+
+  - name: gdev-influxdb
+    type: influxdb
+    access: proxy
+    database: site
+    user: grafana
+    url: http://influxdb:8086
+    jsonData:
+      timeInterval: "15s"
+    secureJsonData:
+      password: grafana
+
+  - name: gdev-influxdb-telegraf
+    type: influxdb
+    access: proxy
+    database: telegraf
+    user: grafana
+    url: http://telegraf:8086
+    jsonData:
+      timeInterval: "10s"
+    secureJsonData:
+      password: grafana
+
+  - name: gdev-opentsdb
+    type: opentsdb
+    access: proxy
+    url: http://opentsdb:4242
+    jsonData:
+      tsdbResolution: 1
+      tsdbVersion: 1
+
+  - name: gdev-elasticsearch-v2-metrics
+    type: elasticsearch
+    access: proxy
+    database: "[metrics-]YYYY.MM.DD"
+    url: http://elasticsearch:9200
+    jsonData:
+      interval: Daily
+      timeField: "@timestamp"
+      esVersion: 2
+
+  - name: gdev-elasticsearch-v2-logs
+    type: elasticsearch
+    access: proxy
+    database: "[logs-]YYYY.MM.DD"
+    url: http://elasticsearch:9200
+    jsonData:
+      interval: Daily
+      timeField: "@timestamp"
+      esVersion: 2
+
+  - name: gdev-elasticsearch-v5-metrics
+    type: elasticsearch
+    access: proxy
+    database: "[metrics-]YYYY.MM.DD"
+    url: http://elasticsearch5:10200
+    jsonData:
+      interval: Daily
+      timeField: "@timestamp"
+      esVersion: 5
+
+  - name: gdev-elasticsearch-v5-logs
+    type: elasticsearch
+    access: proxy
+    database: "[logs-]YYYY.MM.DD"
+    url: http://elasticsearch5:9200
+    jsonData:
+      interval: Daily
+      timeField: "@timestamp"
+      esVersion: 5
+
+  - name: gdev-elasticsearch-v6-metrics
+    type: elasticsearch
+    access: proxy
+    database: "[metrics-]YYYY.MM.DD"
+    url: http://elasticsearch6:9200
+    jsonData:
+      interval: Daily
+      timeField: "@timestamp"
+      esVersion: 60
+
+  - name: gdev-elasticsearch-v6-logs
+    type: elasticsearch
+    access: proxy
+    database: "[logs-]YYYY.MM.DD"
+    url: http://elasticsearch6:9200
+    jsonData:
+      interval: Daily
+      timeField: "@timestamp"
+      esVersion: 60
+
+  - name: gdev-elasticsearch-v6-filebeat
+    type: elasticsearch
+    access: proxy
+    database: "[filebeat-]YYYY.MM.DD"
+    url: http://elasticsearch6:9200
+    jsonData:
+      interval: Daily
+      timeField: "@timestamp"
+      esVersion: 60
+
+  - name: gdev-elasticsearch-v7-metrics
+    type: elasticsearch
+    access: proxy
+    database: "[metrics-]YYYY.MM.DD"
+    url: http://elasticsearch7:9200
+    jsonData:
+      timeInterval: 10s
+      interval: Daily
+      timeField: "@timestamp"
+      esVersion: 70
+
+  - name: gdev-elasticsearch-v7-logs
+    type: elasticsearch
+    access: proxy
+    database: "[logs-]YYYY.MM.DD"
+    url: http://elasticsearch7:9200
+    jsonData:
+      interval: Daily
+      timeField: "@timestamp"
+      esVersion: 70
+
+  - name: gdev-elasticsearch-v7-filebeat
+    type: elasticsearch
+    access: proxy
+    database: "[filebeat-]YYYY.MM.DD"
+    url: http://elasticsearch7:9200
+    jsonData:
+      interval: Daily
+      timeField: "@timestamp"
+      esVersion: 70
+      timeInterval: "10s"
+      logMessageField: message
+      logLevelField: fields.level
+
+  - name: gdev-elasticsearch-v7-metricbeat
+    type: elasticsearch
+    access: proxy
+    database: "[metricbeat-]YYYY.MM.DD"
+    url: http://elasticsearch7:9200
+    jsonData:
+      interval: Daily
+      timeField: "@timestamp"
+      esVersion: 70
+      timeInterval: "10s"
+
+  - name: gdev-mysql
+    type: mysql
+    url: mysql:3306
+    database: grafana
+    user: grafana
+    secureJsonData:
+      password: password
+
+  - name: gdev-mysql-ds-tests
+    type: mysql
+    url: mysqltests:3306
+    database: grafana_ds_tests
+    user: grafana
+    secureJsonData:
+      password: password
+
+  - name: gdev-mssql
+    type: mssql
+    url: mssql:1433
+    database: grafana
+    user: grafana
+    secureJsonData:
+      password: Password!
+
+  - name: gdev-mssql-ds-tests
+    type: mssql
+    url: mssqltests:1433
+    database: grafanatest
+    user: grafana
+    secureJsonData:
+      password: Password!
+
+  - name: gdev-postgres
+    type: postgres
+    url: postgres:5432
+    database: grafana
+    user: grafana
+    secureJsonData:
+      password: password
+    jsonData:
+      sslmode: "disable"
+
+  - name: gdev-postgres-ds-tests
+    type: postgres
+    url: postgrestest:5432
+    database: grafanadstest
+    user: grafanatest
+    secureJsonData:
+      password: grafanatest
+    jsonData:
+      sslmode: "disable"
+
+  - name: gdev-cloudwatch
+    type: cloudwatch
+    editable: true
+    jsonData:
+      authType: credentials
+      defaultRegion: eu-west-2
+
+  # Keep to test old /api/prom API
+  - name: gdev-loki-0.3
+    type: loki
+    access: proxy
+    url: http://loki0.3:3100
+    editable: false
+
+  # First version with new v1 API (remove once v1 is out)
+  - name: gdev-loki-0.4
+    type: loki
+    access: proxy
+    url: http://loki0.4:3100
+    editable: false
+
+  - name: gdev-loki
+    type: loki
+    access: proxy
+    url: http://loki:3100
+    editable: false

devenv/dev-dashboards/datasource-influxdb/influxdb-logs.json

@@ -0,0 +1,191 @@
+{
+  "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": null,
+  "links": [],
+  "panels": [
+    {
+      "aliasColors": {},
+      "bars": true,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "gdev-influxdb-telegraf",
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 4,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": false,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "alias": "Count",
+          "groupBy": [
+            {
+              "params": ["1m"],
+              "type": "time"
+            },
+            {
+              "params": ["null"],
+              "type": "fill"
+            }
+          ],
+          "measurement": "logs",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "refId": "A",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": ["message"],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "count"
+              }
+            ]
+          ],
+          "tags": []
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Log messages over time",
+      "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
+      }
+    },
+    {
+      "datasource": "gdev-influxdb-telegraf",
+      "gridPos": {
+        "h": 18,
+        "w": 24,
+        "x": 0,
+        "y": 6
+      },
+      "id": 2,
+      "options": {
+        "showLabels": false,
+        "showTime": true,
+        "sortOrder": "Descending",
+        "wrapLogMessage": true
+      },
+      "targets": [
+        {
+          "groupBy": [],
+          "measurement": "logs",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "refId": "A",
+          "resultFormat": "table",
+          "select": [
+            [
+              {
+                "params": ["message"],
+                "type": "field"
+              }
+            ]
+          ],
+          "tags": []
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Logs",
+      "type": "logs"
+    }
+  ],
+  "schemaVersion": 22,
+  "style": "dark",
+  "tags": ["gdev", "influxdb", "datasource-test"],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-1h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
+  },
+  "timezone": "",
+  "title": "Datasource tests - InfluxDB Logs",
+  "uid": "yjRroGsWk",
+  "version": 4
+}

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

@@ -0,0 +1,217 @@
+{
+  "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": null,
+  "links": [],
+  "panels": [
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "gdev-opentsdb",
+      "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": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "aggregator": "sum",
+          "downsampleAggregator": "avg",
+          "downsampleFillPolicy": "none",
+          "metric": "cpu",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "CPU",
+      "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",
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 12,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 3,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "aggregator": "sum",
+          "downsampleAggregator": "avg",
+          "downsampleFillPolicy": "none",
+          "metric": "logins.count",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Login Count",
+      "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": 22,
+  "style": "dark",
+  "tags": ["datasource-test", "gdev", "opentsdb"],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-1h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
+  },
+  "timezone": "",
+  "title": "Datasource tests - OpenTSDB",
+  "uid": "tFU1mQyWz",
+  "version": 2
+}

devenv/dev-dashboards/feature-templating/testdata-datalinks.json

@@ -66,7 +66,7 @@
           {
             "targetBlank": false,
             "title": "Drill it down",
-            "url": "http://localhost:3000/d/wfTJJL5Wz/datalinks-source?var-seriesName=${__series.name}&var-labelDatacenter=${__series.labels.datacenter}&var-labelDatacenterRegion=${__series.labels[\"datacenter.region\"]}&var-valueTime=${__value.time}&var-valueNumeric=${__value.numeric}&var-valueText=${__value.text}"
+            "url": "/d/wfTJJL5Wz/datalinks-source?var-seriesName=${__series.name}&var-labelDatacenter=${__series.labels.datacenter}&var-labelDatacenterRegion=${__series.labels[\"datacenter.region\"]}&var-valueTime=${__value.time}&var-valueNumeric=${__value.numeric}&var-valueText=${__value.text}"
           }
         ]
       },
@@ -164,7 +164,7 @@
           {
             "targetBlank": false,
             "title": "Drill it down",
-            "url": "http://localhost:3000/d/wfTJJL5Wz/datalinks-source?var-seriesName=${__series.name}&var-valueTime=${__value.time}&var-valueNumeric=${__value.numeric}&var-valueText=${__value.text}&var-fieldName=${__field.name}"
+            "url": "/d/wfTJJL5Wz/datalinks-source?var-seriesName=${__series.name}&var-valueTime=${__value.time}&var-valueNumeric=${__value.numeric}&var-valueText=${__value.text}&var-fieldName=${__field.name}"
           }
         ]
       },
@@ -246,7 +246,7 @@
               {
                 "targetBlank": true,
                 "title": "Drill it down!",
-                "url": "http://localhost:3000/d/wfTJJL5Wz/datalinks-source\n?var-fieldName=${__field.name}\n&var-labelDatacenter=${__series.labels.datacenter}\n&var-labelDatacenterRegion=${__series.labels[\"datacenter.region\"]}\n&var-valueNumeric=${__value.numeric}\n&var-valueText=${__value.text}\n&var-valueCalc=${__value.calc}"
+                "url": "/d/wfTJJL5Wz/datalinks-source\n?var-fieldName=${__field.name}\n&var-labelDatacenter=${__series.labels.datacenter}\n&var-labelDatacenterRegion=${__series.labels[\"datacenter.region\"]}\n&var-valueNumeric=${__value.numeric}\n&var-valueText=${__value.text}\n&var-valueCalc=${__value.calc}"
               }
             ],
             "mappings": [
@@ -307,7 +307,7 @@
             "links": [
               {
                 "title": "Drill it down",
-                "url": "http://localhost:3000/d/wfTJJL5Wz/datalinks-source?var-fieldName=${__field.name}&var-labelDatacenter=${__series.labels.datacenter}&var-labelDatacenterRegion=${__series.labels[\"datacenter.region\"]}&var-valueNumeric=${__value.numeric}&var-valueText=${__value.text}&var-valueCalc=${__value.calc}"
+                "url": "/d/wfTJJL5Wz/datalinks-source?var-fieldName=${__field.name}&var-labelDatacenter=${__series.labels.datacenter}&var-labelDatacenterRegion=${__series.labels[\"datacenter.region\"]}&var-valueNumeric=${__value.numeric}&var-valueText=${__value.text}&var-valueCalc=${__value.calc}"
               }
             ],
             "mappings": [],

devenv/dev-dashboards/feature-templating/testdata-nested-variables-drilldown.json

@@ -222,7 +222,7 @@
           "text": "A",
           "value": ["A"]
         },
-        "datasource": "TestData DB-1",
+        "datasource": "gdev-testdata",
         "definition": "*",
         "hide": 0,
         "includeAll": true,
@@ -247,7 +247,7 @@
           "text": "AA",
           "value": ["AA"]
         },
-        "datasource": "TestData DB-1",
+        "datasource": "gdev-testdata",
         "definition": "$datacenter.*",
         "hide": 0,
         "includeAll": true,

devenv/dev-dashboards/feature-templating/testdata-variables-that-update-on-time-change.json

@@ -0,0 +1,195 @@
+{
+  "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,
+  "iteration": 1584435937931,
+  "links": [],
+  "panels": [
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 14,
+        "w": 19,
+        "x": 0,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 2,
+      "legend": {
+        "alignAsTable": true,
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": true,
+        "rightSide": true,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "alias": "updatesOnTime: $updatesOnTime",
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "dependsOnFirst: $dependsOnFirst",
+          "refId": "B",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Panel Title",
+      "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": 22,
+  "style": "dark",
+  "tags": ["gdev", "templating"],
+  "templating": {
+    "list": [
+      {
+        "allValue": null,
+        "current": {
+          "text": "value.1584434137814",
+          "value": "value.1584434137814"
+        },
+        "datasource": "gdev-testdata",
+        "definition": "value.$__from",
+        "hide": 0,
+        "includeAll": false,
+        "index": -1,
+        "label": null,
+        "multi": false,
+        "name": "updatesOnTime",
+        "options": [],
+        "query": "value.$__from",
+        "refresh": 2,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      },
+      {
+        "allValue": null,
+        "current": {
+          "text": "value.value.1584434072074",
+          "value": "value.value.1584434072074"
+        },
+        "datasource": "gdev-testdata",
+        "definition": "value.$updatesOnTime",
+        "hide": 0,
+        "includeAll": false,
+        "index": -1,
+        "label": null,
+        "multi": false,
+        "name": "dependsOnFirst",
+        "options": [
+          {
+            "selected": true,
+            "text": "value.value.1584434072074",
+            "value": "value.value.1584434072074"
+          }
+        ],
+        "query": "value.$updatesOnTime",
+        "refresh": 0,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      }
+    ]
+  },
+  "time": {
+    "from": "now-30m",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
+  },
+  "timezone": "",
+  "title": "Templating - Variables That Refresh On Time Change",
+  "uid": "HeUnbEuZk",
+  "variables": {
+    "list": []
+  },
+  "version": 13
+}

devenv/docker/blocks/grafana/.env

@@ -0,0 +1 @@
+grafana_version=6.6.2

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

@@ -0,0 +1,8 @@
+  grafana:
+    image: grafana/grafana:${grafana_version}
+    ports:
+      - "3001:3000"
+    volumes:
+      - "./dashboards.yaml:/etc/grafana/provisioning/dashboards/dashboards.yaml"
+      - "./dev-dashboards:/usr/share/grafana/devenv/dev-dashboards"
+      - "./datasources_docker.yaml:/etc/grafana/provisioning/datasources/datasources.yaml"

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

@@ -1,18 +1,15 @@
   prometheus:
     build: docker/blocks/prometheus
-    network_mode: host
     ports:
       - "9090:9090"
 
   node_exporter:
     image: prom/node-exporter
-    network_mode: host
     ports:
       - "9100:9100"
 
   fake-prometheus-data:
     image: grafana/fake-data-gen
-    network_mode: host
     ports:
       - "9091:9091"
     environment:
@@ -20,12 +17,10 @@
 
   alertmanager:
     image: quay.io/prometheus/alertmanager
-    network_mode: host
     ports:
       - "9093:9093"
 
   prometheus-random-data:
     build: docker/blocks/prometheus_random_data
-    network_mode: host
     ports:
       - "8081:8080"

devenv/docker/blocks/prometheus/prometheus.yml

@@ -15,7 +15,7 @@ alerting:
   - scheme: http
     static_configs:
     - targets:
-      - "127.0.0.1:9093"
+      - "alertmanager:9093"
 
 scrape_configs:
   - job_name: 'prometheus'
@@ -24,16 +24,16 @@ scrape_configs:
 
   - job_name: 'node_exporter'
     static_configs:
-      - targets: ['127.0.0.1:9100']
+      - targets: ['node_exporter:9100']
 
   - job_name: 'fake-data-gen'
     static_configs:
-      - targets: ['127.0.0.1:9091']
+      - targets: ['fake-prometheus-data:9091']
 
   - job_name: 'grafana'
     static_configs:
-      - targets: ['127.0.0.1:3000']
+      - targets: ['grafana:3000']
 
   - job_name: 'prometheus-random-data'
     static_configs:
-      - targets: ['127.0.0.1:8081']
+      - targets: ['prometheus-random-data:8080']

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

@@ -1,18 +1,15 @@
   prometheus:
     build: docker/blocks/prometheus2
-    network_mode: host
     ports:
       - "9090:9090"
 
   node_exporter:
     image: prom/node-exporter
-    network_mode: host
     ports:
       - "9100:9100"
 
   fake-prometheus-data:
     image: grafana/fake-data-gen
-    network_mode: host
     ports:
       - "9091:9091"
     environment:
@@ -20,12 +17,10 @@
 
   alertmanager:
     image: quay.io/prometheus/alertmanager
-    network_mode: host
     ports:
       - "9093:9093"
 
   prometheus-random-data:
     build: docker/blocks/prometheus_random_data
-    network_mode: host
     ports:
       - "8081:8080"

devenv/docker/blocks/prometheus2/prometheus.yml

@@ -24,16 +24,16 @@ scrape_configs:
 
   - job_name: 'node_exporter'
     static_configs:
-      - targets: ['127.0.0.1:9100']
+      - targets: ['node_exporter:9100']
 
   - job_name: 'fake-data-gen'
     static_configs:
-      - targets: ['127.0.0.1:9091']
+      - targets: ['fake-prometheus-data:9091']
 
   - job_name: 'grafana'
     static_configs:
-      - targets: ['127.0.0.1:3000']
+      - targets: ['grafana:3000']
 
   - job_name: 'prometheus-random-data'
     static_configs:
-      - targets: ['127.0.0.1:8081']
+      - targets: ['prometheus-random-data:8080']

devenv/docker/blocks/prometheus_mac/Dockerfile

@@ -1,3 +0,0 @@
-FROM prom/prometheus:v1.8.2
-ADD prometheus.yml /etc/prometheus/
-ADD alert.rules /etc/prometheus/

devenv/docker/blocks/prometheus_mac/alert.rules

@@ -1,10 +0,0 @@
-# Alert Rules
-
-ALERT AppCrash
-  IF process_open_fds > 0
-  FOR 15s
-  LABELS { severity="critical" }
-  ANNOTATIONS {
-   summary = "Number of open fds > 0",
-   description = "Just testing"
-  }

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

@@ -1,26 +0,0 @@
-  prometheus:
-    build: docker/blocks/prometheus_mac
-    ports:
-      - "9090:9090"
-
-  node_exporter:
-    image: prom/node-exporter
-    ports:
-      - "9100:9100"
-
-  fake-prometheus-data:
-    image: grafana/fake-data-gen
-    ports:
-      - "9091:9091"
-    environment:
-      FD_DATASOURCE: prom
-
-  alertmanager:
-    image: quay.io/prometheus/alertmanager
-    ports:
-      - "9093:9093"
-
-  prometheus-random-data:
-    build: docker/blocks/prometheus_random_data
-    ports:
-      - "8081:8080"

devenv/docker/blocks/prometheus_mac/prometheus.yml

@@ -1,39 +0,0 @@
-# my global config
-global:
-  scrape_interval:     10s # By default, scrape targets every 15 seconds.
-  evaluation_interval: 10s # By default, scrape targets every 15 seconds.
-  # scrape_timeout is set to the global default (10s).
-
-# Load and evaluate rules in this file every 'evaluation_interval' seconds.
-rule_files:
-  - "alert.rules"
-  # - "first.rules"
-  # - "second.rules"
-
-alerting:
-  alertmanagers:
-  - scheme: http
-    static_configs:
-    - targets:
-      - "alertmanager:9093"
-
-scrape_configs:
-  - job_name: 'prometheus'
-    static_configs:
-      - targets: ['localhost:9090']
-
-  - job_name: 'node_exporter'
-    static_configs:
-      - targets: ['node_exporter:9100']
-
-  - job_name: 'fake-data-gen'
-    static_configs:
-      - targets: ['fake-prometheus-data:9091']
-
-  - job_name: 'grafana'
-    static_configs:
-      - targets: ['host.docker.internal:3000']
-
-  - job_name: 'prometheus-random-data'
-    static_configs:
-      - targets: ['prometheus-random-data:8080']

devenv/docker/blocks/prometheus_random_data/Dockerfile

@@ -1,7 +1,7 @@
 # This Dockerfile builds an image for a client_golang example.
 
 # Builder image, where we build the example.
-FROM golang:1.13.4 AS builder
+FROM golang:1.14.1 AS builder
 # Download prometheus/client_golang/examples/random first
 RUN go get github.com/prometheus/client_golang/examples/random
 WORKDIR /go/src/github.com/prometheus/client_golang

devenv/docker/blocks/traefik/configs/subpath_no_rewrite.yml

@@ -0,0 +1,19 @@
+http:
+  middlewares:
+    compress-response:
+      compress: {}
+
+  services:
+    grafana-subpath:
+      loadBalancer:
+        servers:
+          - url: 'http://grafana-subpath:3000/'
+
+  routers:
+    grafana-subpath:
+      entryPoints:
+        - web
+      middlewares:
+        - compress-response
+      rule: 'Path(`/grafana`) || PathPrefix(`/grafana/`)'
+      service: grafana-subpath

devenv/docker/blocks/traefik/docker-compose.yml

@@ -0,0 +1,19 @@
+version: '3'
+
+services:
+  traefik:
+    image: traefik:v2.1
+    volumes:
+      - './traefik.yml:/etc/traefik/traefik.yml'
+      - './configs:/etc/traefik/configs'
+    ports:
+      - '80:80'
+      - '8080:8080'
+    links:
+      - grafana-subpath
+
+  grafana-subpath:
+    image: grafana/grafana:latest
+    environment:
+      - GF_SERVER_ROOT_URL=/grafana
+      - GF_SERVER_SERVE_FROM_SUB_PATH=true

devenv/docker/blocks/traefik/traefik.yml

@@ -0,0 +1,18 @@
+## traefik.yml
+
+# Entrypoints enabled
+entryPoints:
+  web:
+    address: ':80'
+
+# API and dashboard configuration
+api:
+  insecure: true
+
+# Loggings
+log: {}
+
+# File configurations folder
+providers:
+  file:
+    directory: /etc/traefik/configs

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

@@ -0,0 +1,6 @@
+# There is no data generator for this so easiest way to get some data here is run this example app
+# https://github.com/openzipkin/zipkin-js-example/tree/master/web
+  zipkin:
+    image: openzipkin/zipkin:latest
+    ports:
+      - "9411:9411"

devenv/docker/loadtest/annotations_by_tag_test.js

@@ -0,0 +1,71 @@
+import { sleep, check, group } from 'k6';
+import { createClient, createBasicAuthClient } from './modules/client.js';
+import { createTestOrgIfNotExists, createTestdataDatasourceIfNotExists } from './modules/util.js';
+
+export let options = {
+  noCookiesReset: true
+};
+
+let endpoint = __ENV.URL || 'http://localhost:3000';
+const client = createClient(endpoint);
+
+export const setup = () => {
+  const basicAuthClient = createBasicAuthClient(endpoint, 'admin', 'admin');
+  const orgId = createTestOrgIfNotExists(basicAuthClient);
+  const datasourceId = createTestdataDatasourceIfNotExists(basicAuthClient);
+  client.withOrgId(orgId);
+  return {
+    orgId: orgId,
+    datasourceId: datasourceId,
+  };
+}
+
+export default (data) => {
+  group("annotation by tag test", () => {
+    if (__ITER === 0) {
+      group("user authenticates thru ui with username and password", () => {
+        let res = client.ui.login('admin', 'admin');
+
+        check(res, {
+          'response status is 200': (r) => r.status === 200,
+          'response has cookie \'grafana_session\' with 32 characters': (r) => r.cookies.grafana_session[0].value.length === 32,
+        });
+      });
+    }
+
+    if (__ITER !== 0) {
+      group("batch tsdb requests with annotations by tag", () => {
+        const batchCount = 20;
+        const requests = [];
+        const payload = {
+          from: '1547765247624',
+          to: '1547768847624',
+          queries: [{
+            refId: 'A',
+            scenarioId: 'random_walk',
+            intervalMs: 10000,
+            maxDataPoints: 433,
+            datasourceId: data.datasourceId,
+          }]
+        };
+
+        requests.push({ method: 'GET', url: '/api/annotations?from=1580825186534&to=1580846786535' });
+
+        for (let n = 0; n < batchCount; n++) {
+          requests.push({ method: 'POST', url: '/api/tsdb/query', body: payload });
+        }
+
+        let responses = client.batch(requests);
+        for (let n = 0; n < batchCount; n++) {
+          check(responses[n], {
+            'response status is 200': (r) => r.status === 200,
+          });
+        }
+      });
+    }
+  });
+
+  sleep(5)
+}
+
+export const teardown = (data) => {}

devenv/e2e-api-tests/tsconfig.json

@@ -1,24 +1,21 @@
 {
-    "compilerOptions": {
-      "moduleResolution": "node",
-      "target": "es6",
-      "lib": ["es6"],
-      "module": "commonjs",
-      "declaration": false,
-      "allowSyntheticDefaultImports": true,
-      "inlineSourceMap": false,
-      "sourceMap": true,
-      "noEmitOnError": false,
-      "emitDecoratorMetadata": false,
-      "experimentalDecorators": true,
-      "noImplicitReturns": true,
-      "noImplicitThis": false,
-      "noImplicitUseStrict":false,
-      "noImplicitAny": false,
-      "noUnusedLocals": true
-    },
-    "include": [
-      "*.ts",
-      "**/*.ts"
-    ]
+  "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
+    "declaration": false,
+    "emitDecoratorMetadata": false,
+    "experimentalDecorators": true,
+    "inlineSourceMap": false,
+    "lib": ["es6"],
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "noEmitOnError": false,
+    "noImplicitAny": false,
+    "noImplicitReturns": true,
+    "noImplicitThis": false,
+    "noImplicitUseStrict": false,
+    "noUnusedLocals": true,
+    "sourceMap": true,
+    "target": "es6"
+  },
+  "include": ["*.ts", "**/*.ts"]
 }

devenv/setup.sh

@@ -18,14 +18,21 @@ bulkAlertingDashboard() {
 
 		requiresJsonnet
 
-		COUNTER=0
-		MAX=100
+		jsonnet -o "bulk_alerting_dashboards/bulk_alerting_datasources.yaml" ./bulk_alerting_dashboards/datasources.jsonnet
+
+		COUNTER=1
+		DS=1
+		MAX=1000
 		while [  $COUNTER -lt $MAX ]; do
-				jsonnet -o "bulk_alerting_dashboards/alerting_dashboard${COUNTER}.json" -e "local bulkDash = import 'bulk_alerting_dashboards/bulkdash_alerting.jsonnet'; bulkDash + {  uid: 'bd-${COUNTER}',  title: 'alerting-title-${COUNTER}' }"
+				jsonnet -o "bulk_alerting_dashboards/alerting_dashboard${COUNTER}.json" \
+					-e "local bulkDash = import 'bulk_alerting_dashboards/dashboard.libsonnet'; bulkDash.alertingDashboard(${COUNTER}, ${DS})"
 				let COUNTER=COUNTER+1
+				let DS=COUNTER/10
+				let DS=DS+1
 		done
 
 		ln -s -f ../../../devenv/bulk_alerting_dashboards/bulk_alerting_dashboards.yaml ../conf/provisioning/dashboards/custom.yaml
+		ln -s -f ../../../devenv/bulk_alerting_dashboards/bulk_alerting_datasources.yaml ../conf/provisioning/datasources/custom.yaml
 }
 
 requiresJsonnet() {

docs/Makefile

@@ -1,9 +1,9 @@
 .PHONY: docs docs-test
 
+IMAGE = grafana/docs-base@sha256:63758b74e3990ab61e274f5e98da092d5c38378829dad0488aa97c59f0144f34
+
 docs:
-	docker pull grafana/docs-base:latest
-	docker run -v $(PWD)/sources:/hugo/content/docs/grafana/latest -p 3002:3002 --rm -it grafana/docs-base:latest /bin/bash -c 'npm i && make webpack && hugo server -p 3002 -D --ignoreCache --baseUrl http://localhost:3002 --bind 0.0.0.0'
+	docker run -v $(shell pwd)/sources:/hugo/content/docs/grafana/latest -p 3002:3002 --rm -it $(IMAGE) /bin/bash -c 'make server'
 
 docs-test:
-	docker pull grafana/docs-base:latest
-	docker run -v $(PWD)/sources:/hugo/content/docs/grafana/latest --rm -it grafana/docs-base:latest /bin/bash -c 'npm i && make prod'
+	docker run -v $(shell pwd)/sources:/hugo/content/docs/grafana/latest --rm -it $(IMAGE) /bin/bash -c 'make prod'

docs/sources/_index.md

@@ -6,24 +6,29 @@ type = "docs"
 aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin", "/docs/grafana/v3.1"]
 +++
 
-# Grafana Documentation
+# Grafana documentation
+
+## Installing Grafana
 
-<h2>Installing Grafana</h2>
 <div class="nav-cards">
     <a href="{{< relref "installation/debian.md" >}}" class="nav-cards__item nav-cards__item--install">
         <div class="nav-cards__icon fa fa-linux">
         </div>
-        <h5>Installing on Linux</h5>
+        <h5>Install on Linux</h5>
     </a>
     <a href="{{< relref "installation/mac.md" >}}" class="nav-cards__item nav-cards__item--install">
         <div class="nav-cards__icon fa fa-apple">
         </div>
-        <h5>Installing on macOS</h5>
+        <h5>Install on macOS</h5>
     </a>
-      <a href="{{< relref "installation/windows.md" >}}" class="nav-cards__item nav-cards__item--install">
+    <a href="{{< relref "installation/windows.md" >}}" class="nav-cards__item nav-cards__item--install">
         <div class="nav-cards__icon fa fa-windows">
         </div>
-        <h5>Installing on Windows</h5>
+        <h5>Install on Windows</h5>
+    </a>
+    <a href="{{< relref "installation/docker.md" >}}" class="nav-cards__item nav-cards__item--install">
+        <img src="/static/img/logos/logo-docker.svg">
+        <h5>Run Docker image</h5>
     </a>
     <a href="https://grafana.com/cloud/grafana" class="nav-cards__item nav-cards__item--install">
         <div class="nav-cards__icon fa fa-cloud">
@@ -33,28 +38,28 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
     <a href="https://grafana.com/grafana/download" class="nav-cards__item nav-cards__item--install">
         <div class="nav-cards__icon fa fa-moon-o">
         </div>
-        <h5>Nightly Builds</h5>
+        <h5>Nightly builds</h5>
     </a>
-    <div class="nav-cards__item nav-cards__item--install">
-        <h5>For other platforms read the <a href="{{< relref "project/building_from_source.md" >}}">build from source</a>
-        instructions for more information.</h5>
-    </div>
 </div>
 
-<h2>Guides</h2>
+## Guides
 
 <div class="nav-cards">
-    <a href="https://grafana.com/grafana" class="nav-cards__item nav-cards__item--guide">
+    <a href="{{< relref "guides/what-is-grafana.md" >}}" class="nav-cards__item nav-cards__item--guide">
         <h4>What is Grafana?</h4>
         <p>Get an overview of Grafana's key features.</p>
     </a>
+    <a href="{{< relref "guides/getting_started.md" >}}" class="nav-cards__item nav-cards__item--guide">
+        <h4>Getting started</h4>
+        <p>Learn the basics of using Grafana.</p>
+    </a>
     <a href="{{< relref "installation/configuration.md" >}}" class="nav-cards__item nav-cards__item--guide">
         <h4>Configure Grafana</h4>
         <p>Review the configuration and setup options.</p>
     </a>
-    <a href="{{< relref "guides/getting_started.md" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>Getting started</h4>
-        <p>Learn the basics of using Grafana.</p>
+    <a href="{{< relref "guides/timeseries.md" >}}" class="nav-cards__item nav-cards__item--guide">
+        <h4>Intro to time series</h4>
+        <p>Learn about time series data.</p>
     </a>
     <a href="{{< relref "administration/provisioning.md" >}}" class="nav-cards__item nav-cards__item--guide">
         <h4>Provisioning</h4>
@@ -67,7 +72,8 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
 
 </div>
 
-<h2>Data Source Guides</h2>
+## Data source guides
+
 <div class="nav-cards">
     <a href="{{< relref "features/datasources/graphite.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_graphite.svg" >

docs/sources/administration/cli.md

@@ -112,7 +112,7 @@ grafana-cli --debug plugins install <plugin-id>
 
 `--configOverrides` is a command line argument that acts like an environmental variable override.
 
-For example, you can use it to redirect logging to another file (maybe to log plugin installs in a service like Hosted Grafana) or when resetting the admin password and you have non-default values for some important config value (like where the database is located).
+For example, you can use it to redirect logging to another file (maybe to log plugin installations in a service like Hosted Grafana) or when resetting the admin password and you have non-default values for some important config value (like where the database is located).
 
 **Example:**
 ```bash
@@ -125,7 +125,7 @@ Sets the path for the Grafana install/home path, defaults to working directory.
  
 **Example:**
 ```bash
-grafana-cli admin reset-admin-password --homepath "c:\Program Files\grafana" mynewpassword
+grafana-cli --homepath "c:\Program Files\grafana" admin reset-admin-password mynewpassword
 ```
 
 ### Override config file         

docs/sources/administration/image_rendering.md

@@ -1,66 +1,58 @@
 +++
-title = "Image Rendering"
+title = "Image rendering"
 description = ""
-keywords = ["grafana", "image", "rendering", "phantomjs"]
+keywords = ["grafana", "image", "rendering", "plugin"]
 type = "docs"
-aliases = ["/docs/grafana/latest/installation/image-rendering"]
 [menu.docs]
-parent = "admin"
+parent = "features"
 weight = 8
 +++
 
-# Image Rendering
+# Image rendering
 
-Grafana supports rendering of panels and dashboards as PNG-images.
+Grafana supports automatic rendering of panels and dashboards as PNG images. This allows Grafana to automatically generate images of your panels to include in [alert notifications]({{< relref "../alerting/notifications.md" >}}).
 
-When an image is being rendered the PNG-image is temporary written to the filesystem, i.e. a sub-directory of Grafana's [data](/installation/configuration/#data) directory named `png`.
+When an image is being rendered the PNG-image is temporarily written to the file system. When an image is rendered, the PNG image is temporary written to the `png` folder in the Grafana `data` folder.
 
-A background job runs each 10 minutes and will remove temporary images. You can configure how long time an image should be stored before being removed by configuring the [temp-data-lifetime](/installation/configuration/#temp-data-lifetime) setting.
+A background job runs every 10 minutes and removes temporary images. You can configure how long an image should be stored before being removed by configuring the [temp-data-lifetime]({{< relref "../installation/configuration/#temp-data-lifetime" >}}) setting.
 
-## Requirements
+You can also render a PNG by clicking the dropdown arrow next to a panel title, then clicking **Share > Direct link rendered image**.
 
-Rendering images may require quite a lot of memory, mainly because there are "browser instances" started in the
-background responsible for the actual rendering. Further, if multiple images are being rendered in parallel it most
-certainly has a bigger memory footprint. Minimum free memory recommendation is 1GB.
+## Memory requirements
 
-Depending on [rendering method](#rendering-methods) you would need that memory available in the system where the
-rendering process is running. For [Grafana Image renderer plugin](#grafana-image-renderer-plugin) and [PhantomJS](#phantomjs)
-it's the system which Grafana is installed on. For [Remote rendering service](#remote-rendering-service) it is the system where
-that's installed.
+Minimum free memory recommendation is 16GB on the system doing the rendering.
 
-## Rendering methods
+Rendering images can require a lot of memory, mainly because Grafana creates browser instances in the background for the actual rendering. If multiple images are rendered in parallel, then the rendering has a bigger memory footprint. One advantage of using the remote rendering service is that the rendering will be done on the remote system, so your local system resources will not be affected by rendering.
 
-### Grafana image renderer plugin
+## Alerting and render limits
 
-> This plugin currently does not work if it is installed in the Grafana docker image. See [Install in Grafana docker image](#install-in-grafana-docker-image).
+Alert notifications can include images, but rendering many images at the same time can overload the server where the renderer is running. For instructions of how to configure this, see [concurrent_render_limit]({{< relref "../installation/configuration/#concurrent_render_limit" >}}).
 
-The [Grafana image renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) is a plugin that runs on the backend and handles rendering panels and dashboards as PNG-images using headless chrome.
+## Install Grafana Image Renderer plugin
 
-You can install it using grafana-cli:
+The [Grafana image renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) is a plugin that runs on the backend and handles rendering panels and dashboards as PNG images using headless Chrome.
 
-```bash
-grafana-cli plugins install grafana-image-renderer
-```
+To install the plugin, refer to the [Grafana Image Renderer Installation instructions](https://grafana.com/grafana/plugins/grafana-image-renderer/installation).
 
-For further information and instructions refer to [troubleshooting](#troubleshooting) and the [plugin details](https://grafana.com/grafana/plugins/grafana-image-renderer).
+## Run in custom Grafana Docker image
 
-#### Install in Grafana docker image
+ We recommend setting up another Docker container for rendering and using remote rendering. Refer to [Remote rendering service]({{< relref "#remote-rendering-service" >}}) for instructions.
 
-This plugin is not compatible with the current Grafana Docker image without installing further system-level dependencies. We recommend setting up another Docker container for rendering and using remote rendering, see [Remote rendering service](#remote-rendering-service) for reference.
+If you still want to install the plugin in the Grafana Docker image, refer to [Build with Grafana Image Renderer plugin pre-installed]({{< relref "../installation/docker/#build-with-grafana-image-renderer-plugin-pre-installed" >}}).
 
-If you still want to install the plugin in the Grafana docker image we provide instructions for how to build a custom Grafana image, see [Installing using Docker](/installation/docker/#custom-image-with-grafana-image-renderer-plugin-pre-installed).
+## Remote rendering service
 
-### Remote rendering service
+> Requires an internet connection.
 
-The [Grafana image renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) can also be run as a remote HTTP rendering service. In this setup Grafana will render an image by making a HTTP request to the remote rendering service, which in turn render the image and returns it back in the HTTP response to Grafana.
+The [Grafana Image Renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) can also be run as a remote HTTP rendering service. In this setup, Grafana renders an image by making a HTTP request to the remote rendering service, which in turn renders the image and returns it back in the HTTP response to Grafana.
 
 You can run the remote HTTP rendering service using Docker or as a standalone Node.js application.
 
-**Using Docker:**
+### Run in Docker
 
-The following example describes how to run Grafana and the remote HTTP rendering service in two separate docker containers using Docker Compose.
+The following example shows how to run Grafana and the remote HTTP rendering service in two separate Docker containers using Docker Compose.
 
-Create a `docker-compose.yml` with the following content.
+Create a `docker-compose.yml` with the following content:
 
 ```yaml
 version: '2'
@@ -80,54 +72,45 @@ services:
       - 8081
 ```
 
-and finally run:
+And then run:
 
 ```bash
 docker-compose up
 ```
 
-**Running as standalone Node.js application:**
+## Run as standalone Node.js application
 
-The following example describes how to build and run the remote HTTP rendering service as a standalone node.js application and configure Grafana appropriately.
+The following example describes how to build and run the remote HTTP rendering service as a standalone Node.js application and configure Grafana appropriately.
 
-1. Git clone the [Grafana image renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) repository.
+1. Clone the [Grafana image renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) Git repository.
 2. Install dependencies and build:
 
-```bash
-yarn install --pure-lockfile
-yarn run build
-```
-3. Run the server
+    ```bash
+    yarn install --pure-lockfile
+    yarn run build
+    ```
 
-```bash
-node build/app.js server --port=8081
-```
-3. Update Grafana configuration:
+3. Run the server:
 
-```
-[rendering]
-server_url = http://localhost:8081/render
-callback_url = http://localhost:3000/
-```
-4. Restart Grafana
+    ```bash
+    node build/app.js server --port=8081
+    ```
 
-For further information and instructions refer to [troubleshooting](#troubleshooting) and the [plugin details](https://grafana.com/grafana/plugins/grafana-image-renderer).
+4. Update Grafana configuration:
 
-### PhantomJS
+    ```
+    [rendering]
+    server_url = http://localhost:8081/render
+    callback_url = http://localhost:3000/
+    ```
 
-> PhantomJS is deprecated since Grafana v6.4 and will be removed in a future release. Please migrate to Grafana image renderer plugin or remote rendering service.
+5. Restart Grafana.
 
-[PhantomJS](https://phantomjs.org/) have been the only supported and default image renderer since Grafana v2.x and is shipped with Grafana.
+## PhantomJS
 
-PhantomJS binaries are included for Linux (x64), Windows (x64) and Darwin (x64). For Linux you should ensure that any required libraries, e.g. libfontconfig1, are available.
+> Starting from Grafana v7.0.0, all PhantomJS support has been removed. Please use the Grafana Image Renderer plugin or remote rendering service.
 
-Please note that PhantomJS binaries are not included for ARM. To support this you will need to ensure that a phantomjs binary is available under tools/phantomjs/phantomjs.
-
-## Alerting and render limits
-
-Alert notifications can include images, but rendering many images at the same time can overload the server where the renderer is running. For instructions of how to configure this, see [concurrent_render_limit]({{< relref "../installation/configuration/#concurrent_render_limit" >}}).
-
-## Troubleshooting
+## Troubleshoot image rendering
 
 Enable debug log messages for rendering in the Grafana configuration file and inspect the Grafana server log.
 
@@ -147,19 +130,19 @@ error while loading shared libraries: libX11.so.6: cannot open shared object fil
 ```
 
 In general you can use the [`ldd`](https://en.wikipedia.org/wiki/Ldd_(Unix)) utility to figure out what shared libraries
-are missing/not installed in your system:
+are not installed in your system:
 
 ```bash
-$ cd <grafana-image-render plugin directiry>
-$ ldd chrome-linux/chrome
-        linux-vdso.so.1 (0x00007fff1bf65000)
-        libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x00007f2047945000)
-        libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x00007f2047924000)
-        librt.so.1 => /lib/x86_64-linux-gnu/librt.so.1 (0x00007f204791a000)
-        libX11.so.6 => not found
-        libX11-xcb.so.1 => not found
-        libxcb.so.1 => not found
-        libXcomposite.so.1 => not found
+cd <grafana-image-render plugin directory>
+ldd chrome-linux/chrome
+      linux-vdso.so.1 (0x00007fff1bf65000)
+      libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x00007f2047945000)
+      libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x00007f2047924000)
+      librt.so.1 => /lib/x86_64-linux-gnu/librt.so.1 (0x00007f204791a000)
+      libX11.so.6 => not found
+      libX11-xcb.so.1 => not found
+      libxcb.so.1 => not found
+      libXcomposite.so.1 => not found
         ...
 ```
 
@@ -173,23 +156,43 @@ libx11-6 libx11-xcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3
 
 **Centos:**
 
-On a minimal Centos install the following dependencies have been confirmed as needed for the image rendering to function.
+On a minimal Centos install the following dependencies have been confirmed as needed for the image rendering to function:
 
 ```bash
 libXcomposite libXdamage libXtst cups libXScrnSaver pango atk adwaita-cursor-theme adwaita-icon-theme at at-spi2-atk at-spi2-core cairo-gobject colord-libs dconf desktop-file-utils ed emacs-filesystem gdk-pixbuf2 glib-networking gnutls gsettings-desktop-schemas gtk-update-icon-cache gtk3 hicolor-icon-theme jasper-libs json-glib libappindicator-gtk3 libdbusmenu libdbusmenu-gtk3 libepoxy liberation-fonts liberation-narrow-fonts liberation-sans-fonts liberation-serif-fonts libgusb libindicator-gtk3 libmodman libproxy libsoup libwayland-cursor libwayland-egl libxkbcommon m4 mailx nettle patch psmisc redhat-lsb-core redhat-lsb-submod-security rest spax time trousers xdg-utils xkeyboard-config
 ```
 
-#### Using custom Chrome/Chromium
+### Certificate signed by internal certificate authorities
+
+In many cases Grafana, runs on internal servers and uses certificates that have not been signed by a CA ([Certificate Authority](https://en.wikipedia.org/wiki/Certificate_authority)) known to Chrome, and therefore cannot be validated. Chrome internally uses NSS ([Network Security Services](https://en.wikipedia.org/wiki/Network_Security_Services)) for cryptogtraphic operations such as the validation of certificates.
+
+If you are using the Grafana Image Renderer with a Grafana server that uses a certificate signed by such a custom CA (for example a company-internal CA), rendering images will fail and you will see messages like this in the Grafana log:
+
+```
+t=2019-12-04T12:39:22+0000 lvl=error msg="Render request failed" logger=rendering error=map[] url="https://192.168.106.101:3443/d-solo/zxDJxNaZk/graphite-metrics?orgId=1&refresh=1m&from=1575438321300&to=1575459921300&var-Host=master1&panelId=4&width=1000&height=500&tz=Europe%2FBerlin&render=1" timestamp=0001-01-01T00:00:00.000Z
+t=2019-12-04T12:39:22+0000 lvl=error msg="Rendering failed." logger=context userId=1 orgId=1 uname=admin error="Rendering failed: Error: net::ERR_CERT_AUTHORITY_INVALID at https://192.168.106.101:3443/d-solo/zxDJxNaZk/graphite-metrics?orgId=1&refresh=1m&from=1575438321300&to=1575459921300&var-Host=master1&panelId=4&width=1000&height=500&tz=Europe%2FBerlin&render=1"
+t=2019-12-04T12:39:22+0000 lvl=error msg="Request Completed" logger=context userId=1 orgId=1 uname=admin method=GET path=/render/d-solo/zxDJxNaZk/graphite-metrics status=500 remote_addr=192.168.106.101 time_ms=310 size=1722 referer="https://grafana.xxx-xxx/d/zxDJxNaZk/graphite-metrics?orgId=1&refresh=1m"
+```
+
+(The severity-level `error` in the above messages might be misspelled with a single `r`)
+
+If this happens, then you have to add the certificate to the trust store. If you have the certificate file for the internal root CA in the file `internal-root-ca.crt.pem`, then use these commands to create a user specific NSS trust store for the Grafana user (`grafana` for the purpose of this example) and execute the following steps:
+
+```[root@server ~]# [ -d /usr/share/grafana/.pki/nssdb ] || mkdir -p /usr/share/grafana/.pki/nssdb
+[root@merver ~]# certutil -d sql:/usr/share/grafana/.pki/nssdb -A -n internal-root-ca -t C -i /etc/pki/tls/certs/internal-root-ca.crt.pem
+[root@server ~]# chown -R grafana: /usr/share/grafana/.pki/nssdb
+```
+
+### Custom Chrome/Chromium
 
 As a last resort, if you already have [Chrome](https://www.google.com/chrome/) or [Chromium](https://www.chromium.org/)
-installed on your system you can configure [Grafana Image renderer plugin](#grafana-image-renderer-plugin) to use this
+installed on your system, then you can configure [Grafana Image renderer plugin](#grafana-image-renderer-plugin) to use this
 instead of the pre-packaged version of Chromium.
 
-> Please note that this is not recommended since you may encounter problems if the installed version of Chrome/Chromium is not
-> is compatible with the [Grafana Image renderer plugin](#grafana-image-renderer-plugin).
+> Please note that this is not recommended, since you may encounter problems if the installed version of Chrome/Chromium is not
+> compatible with the [Grafana Image renderer plugin](#grafana-image-renderer-plugin).
 
-To override the path to the Chrome/Chromium executable you can set an environment variable and make sure that
-it's available for the Grafana process, e.g.
+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"

docs/sources/administration/metrics.md

@@ -1,5 +1,5 @@
 +++
-title = "Internal metrics"
+title = "Internal Grafana metrics"
 description = "Internal metrics exposed by Grafana"
 keywords = ["grafana", "metrics", "internal metrics"]
 type = "docs"
@@ -8,8 +8,87 @@ parent = "admin"
 weight = 8
 +++
 
-# Internal metrics
+# Internal Grafana metrics
 
-Grafana collects some metrics about itself internally. Currently, Grafana supports pushing metrics to Graphite or exposing them to be scraped by Prometheus.
+Grafana collects some metrics about itself internally. Grafana supports pushing metrics to Graphite or exposing them to be scraped by Prometheus.
 
-To emit internal metrics you have to enable the option under the [metrics] section in your [grafana.ini](http://docs.grafana.org/installation/configuration/#enabled-6) config file. If you want to push metrics to Graphite, you must also configure the [metrics.graphite](http://docs.grafana.org/installation/configuration/#metrics-graphite) section.
+For more information about configuration options related to Grafana metrics, refer to [metrics]({{< relref "../installation/configuration/#metrics" >}}) and [metrics.graphite]({{< relref "../installation/configuration/#metrics-graphite" >}}) in [Configuration]({{< relref "../installation/configuration.md" >}}).
+
+## Available metrics
+
+When enabled, Grafana exposes a number of metrics, including:
+
+* Active Grafana instances
+* Number of dashboards, users, and playlists
+* HTTP status codes
+* Requests by routing group
+* Grafana active alerts
+* Grafana performance
+
+## Pull metrics from Grafana into Prometheus
+
+These instructions assume you have already added Prometheus as a data source in Grafana.
+
+1. Enable Prometheus to scrape metrics from Grafana. In your configuration file (`grafana.ini` or `custom.ini` depending on your operating system) remove the semicolon to enable the following configuration options: 
+
+   ```
+   # Metrics available at HTTP API Url /metrics
+   [metrics]
+   # Disable / Enable internal metrics
+   enabled           = true
+
+   # Disable total stats (stat_totals_*) metrics to be generated
+   disable_total_stats = false
+   ```
+
+1. (optional) If you want to require authorization to view the metrics endpoint, then uncomment and set the following options:
+
+   ```
+   basic_auth_username =
+   basic_auth_password =
+   ```
+
+1. Restart Grafana. Grafana now exposes metrics at http://localhost:3000/metrics.
+1. Add the job to your prometheus.yml file.
+   Example:
+
+   ```
+   - job_name: 'grafana_metrics'
+
+      scrape_interval: 15s
+      scrape_timeout: 5s
+  
+      static_configs:
+        - targets: ['localhost:3000']
+   ```
+1. Restart Prometheus. Your new job should appear on the Targets tab.
+1. In Grafana, hover your mouse over the **Configuration** (gear) icon on the left sidebar and then click **Data Sources**.
+1. Select the **Prometheus** data source.
+1. On the Dashboards tab, **Import** the Grafana metrics dashboard. All scraped Grafana metrics are available in the dashboard.
+
+## View Grafana metrics in Graphite
+
+These instructions assume you have already added Graphite as a data source in Grafana.
+
+1. Enable sending metrics to Graphite. In your configuration file (`grafana.ini` or `custom.ini` depending on your operating system) remove the semicolon to enable the following configuration options: 
+
+   ```
+   # Metrics available at HTTP API Url /metrics
+   [metrics]
+   # Disable / Enable internal metrics
+   enabled           = true
+
+   # Disable total stats (stat_totals_*) metrics to be generated
+   disable_total_stats = false
+   ```
+
+1. Enable [metrics.graphite] options:
+   ```
+   # Send internal metrics to Graphite
+   [metrics.graphite]
+   # Enable by setting the address setting (ex localhost:2003)
+   address = <hostname or ip>:<port#>
+   prefix = prod.grafana.%(instance_name)s.
+   ```
+
+1. Restart Grafana. Grafana now exposes metrics at http://localhost:3000/metrics and sends them to the Graphite location you specified.

docs/sources/administration/provisioning.md

@@ -93,6 +93,8 @@ datasources:
   access: proxy
   # <int> org id. will default to orgId 1 if not specified
   orgId: 1
+  # <string> custom UID which can be used to reference this datasource in other parts of the configuration, if not specified will be generated automatically
+  uid: my_unique_uid
   # <string> url
   url: http://localhost:8080
   # <string> Deprecated, use secureJsonData.password
@@ -160,6 +162,9 @@ Since not all datasources have the same configuration settings we only have the
 | tsdbVersion | string | OpenTSDB | Version |
 | tsdbResolution | string | OpenTSDB | Resolution |
 | sslmode | string | PostgreSQL | SSLmode. 'disable', 'require', 'verify-ca' or 'verify-full' |
+| sslRootCertFile | string | PostgreSQL | SSL server root certificate file, must be readable by the Grafana user |
+| sslCertFile | string | PostgreSQL | SSL client certificate file, must be readable by the Grafana user |
+| sslKeyFile | string | PostgreSQL | SSL client key file, must be readable by *only* the Grafana user |
 | encrypt | string | MSSQL | Connection SSL encryption handling. 'disable', 'false' or 'true' |
 | postgresVersion | number | PostgreSQL | Postgres version as a number (903/904/905/906/1000) meaning v9.3, v9.4, ..., v10 |
 | timescaledb | boolean | PostgreSQL | Enable usage of TimescaleDB extension |
@@ -203,7 +208,7 @@ datasources:
 
 ### Dashboards
 
-It's possible to manage dashboards in Grafana by adding one or more yaml config files in the [`provisioning/dashboards`](/installation/configuration/#provisioning) directory. Each config file can contain a list of `dashboards providers` that will load dashboards into Grafana from the local filesystem.
+It's possible to manage dashboards in Grafana by adding one or more yaml config files in the [`provisioning/dashboards`]({{< relref "../installation/configuration.md" >}}) directory. Each config file can contain a list of `dashboards providers` that will load dashboards into Grafana from the local filesystem.
 
 The dashboard provider config file looks somewhat like this:
 
@@ -240,9 +245,9 @@ When Grafana starts, it will update/insert all dashboards available in the confi
 It's possible to make changes to a provisioned dashboard in the Grafana UI. However, it is not possible to automatically save the changes back to the provisioning source.
 If `allowUiUpdates` is set to `true` and you make changes to a provisioned dashboard, you can `Save` the dashboard then changes will be persisted to the Grafana database.
 
-> **Note.** 
+> **Note:**
 > If a provisioned dashboard is saved from the UI and then later updated from the source, the dashboard stored in the database will always be overwritten. The `version` property in the JSON file will not affect this, even if it is lower than the existing dashboard.
-> 
+>
 > If a provisioned dashboard is saved from the UI and the source is removed, the dashboard stored in the database will be deleted unless the configuration option `disableDeletion` is set to true.
 
 If `allowUiUpdates` is configured to `false`, you are not able to make changes to a provisioned dashboard. When you click `Save`, Grafana brings up a *Cannot save provisioned dashboard* dialog. The screenshot below illustrates this behavior.
@@ -250,12 +255,12 @@ If `allowUiUpdates` is configured to `false`, you are not able to make changes t
 Grafana offers options to export the JSON definition of a dashboard. Either `Copy JSON to Clipboard` or `Save JSON to file` can help you synchronize your dashboard changes back to the provisioning source.
 
 Note: The JSON definition in the input field when using `Copy JSON to Clipboard` or `Save JSON to file` will have the `id` field automatically removed to aid the provisioning workflow.
-                                                                                                                                                                 
+
 {{< docs-imagebox img="/img/docs/v51/provisioning_cannot_save_dashboard.png" max-width="500px" class="docs-image--no-shadow" >}}
 
-### Reusable Dashboard Urls
+### Reusable Dashboard URLs
 
-If the dashboard in the json file contains an [uid](/reference/dashboard/#json-fields), Grafana will force insert/update on that uid. This allows you to migrate dashboards betweens Grafana instances and provisioning Grafana from configuration without breaking the urls given since the new dashboard url uses the uid as identifier.
+If the dashboard in the json file contains an [uid](/reference/dashboard/#json-fields), Grafana will force insert/update on that uid. This allows you to migrate dashboards betweens Grafana instances and provisioning Grafana from configuration without breaking the URLs given since the new dashboard URL uses the uid as identifier.
 When Grafana starts, it will update/insert all dashboards available in the configured folders. If you modify the file, the dashboard will also be updated.
 By default Grafana will delete dashboards in the database if the file is removed. You can disable this behavior using the `disableDeletion` setting.
 
@@ -270,7 +275,7 @@ Alert Notification Channels can be provisioned by adding one or more yaml config
 
 Each config file can contain the following top-level fields:
 - `notifiers`, a list of alert notifications that will be added or updated during start up. If the notification channel already exists, Grafana will update it to match the configuration file.
-- `delete_notifiers`, a list of alert notifications to be deleted before before inserting/updating those in the `notifiers` list.
+- `delete_notifiers`, a list of alert notifications to be deleted before inserting/updating those in the `notifiers` list.
 
 Provisioning looks up alert notifications by uid, and will update any existing notification with the provided uid.
 
@@ -351,7 +356,9 @@ The following sections detail the supported settings for each alert notification
 | icon_emoji |
 | icon_url |
 | uploadImage |
-| mention |
+| mentionUsers |
+| mentionGroups |
+| mentionChannel |
 | token |
 
 #### Alert notification `victorops`
@@ -396,6 +403,8 @@ The following sections detail the supported settings for each alert notification
 | Name |
 | ---- |
 | url |
+| basicAuthUser |
+| basicAuthPassword |
 
 #### Alert notification `teams`
 
@@ -413,6 +422,7 @@ The following sections detail the supported settings for each alert notification
 
 | Name |
 | ---- |
+| singleEmail |
 | addresses |
 
 #### Alert notification `hipchat`
@@ -461,4 +471,3 @@ The following sections detail the supported settings for each alert notification
 | Name |
 | ---- |
 | url |
-

docs/sources/alerting/metrics.md

@@ -11,9 +11,7 @@ weight = 2
 
 # Metrics from the alert engine
 
-> Alerting is only available in Grafana v4.0 and above.
-
-The alert engine publishes some internal metrics about itself. You can read more about how Grafana publishes [internal metrics](/installation/configuration/#metrics).
+The alert engine publishes some internal metrics about itself. You can read more about how Grafana publishes [internal metrics]({{< relref "../administration/metrics/" >}}).
 
 Description | Type | Metric name
 ---------- | ----------- | ----------

docs/sources/alerting/notifications.md

@@ -71,31 +71,38 @@ external image destination if available or fallback to attaching the image to th
 Be aware that if you use the `local` image storage email servers and clients might not be
 able to access the image.
 
+Setting | Description
+---------- | -----------
+Single email | Send a single email to all recipients. Disabled per default.
+Addresses | Email addresses to recipients. You can enter multiple email addresses using a ";" separator.
+
 ### Slack
 
 {{< imgbox max-width="40%" img="/img/docs/v4/slack_notification.png" caption="Alerting Slack Notification" >}}
 
-To set up slack you need to configure an incoming webhook url at slack. You can follow their guide on how
-to do that [here](https://api.slack.com/incoming-webhooks). If you want to include screenshots of the firing alerts
-in the Slack messages you have to configure either the [external image destination](#external-image-store) in Grafana,
-or a bot integration via Slack Apps. Follow Slack's guide to set up a bot integration and use the token provided
-(https://api.slack.com/bot-users), which starts with "xoxb".
+To set up Slack, you need to configure an incoming Slack webhook URL. You can follow
+[Sending messages using Incoming Webhooks](https://api.slack.com/incoming-webhooks) on how to do that. If you want to include screenshots of the
+firing alerts in the Slack messages you have to configure either the [external image destination](#external-image-store)
+in Grafana or a bot integration via Slack Apps. Follow Slack's guide to set up a bot integration and use the token
+provided (https://api.slack.com/bot-users), which starts with "xoxb".
 
 Setting | Description
 ---------- | -----------
-Url | Slack incoming webhook url.
+Url | Slack incoming webhook URL.
 Username | Set the username for the bot's message.
-Recipient | Allows you to override the Slack recipient.
+Recipient | Allows you to override the Slack recipient. You must either provide a channel Slack ID, a user Slack ID, a username reference (@&lt;user&gt;, all lowercase, no whitespace), or a channel reference (#&lt;channel&gt;, all lowercase, no whitespace).
 Icon emoji | Provide an emoji to use as the icon for the bot's message. Ex :smile:
-Icon URL | Provide a url to an image to use as the icon for the bot's message.
-Mention | make it possible to include a mention in the Slack notification sent by Grafana. Ex @here or @channel
+Icon URL | Provide a URL to an image to use as the icon for the bot's message.
+Mention Users | Optionally mention one or more users in the Slack notification sent by Grafana. You have to refer to users, comma-separated, via their corresponding Slack IDs (which you can find by clicking the overflow button on each user's Slack profile).
+Mention Groups | Optionally mention one or more groups in the Slack notification sent by Grafana. You have to refer to groups, comma-separated, via their corresponding Slack IDs (which you can get from each group's Slack profile URL).
+Mention Channel | Optionally mention either all channel members or just active ones.
 Token | If provided, Grafana will upload the generated image via Slack's file.upload API method, not the external image destination.
 
 If you are using the token for a slack bot, then you have to invite the bot to the channel you want to send notifications and add the channel to the recipient field.
 
 ### PagerDuty
 
-To set up PagerDuty, all you have to do is to provide an API key.
+To set up PagerDuty, all you have to do is to provide an integration key.
 
 Setting | Description
 ---------- | -----------
@@ -103,6 +110,8 @@ Integration Key | Integration key for PagerDuty.
 Severity | Level for dynamic notifications, default is `critical`
 Auto resolve incidents | Resolve incidents in PagerDuty once the alert goes back to ok
 
+**Note:** The tags `Severity`, `Class`, `Group`, and `Component` have special meaning in the [Pagerduty Common Event Format - PD-CEF](https://support.pagerduty.com/docs/pd-cef). If an alert panel defines these tag keys, then they are transposed to the root of the event sent to Pagerduty. This means they will be available within the Pagerduty UI and Filtering tools. A Severity tag set on an alert overrides the global Severity set on the notification channel if it's a valid level.
+
 ### Webhook
 
 The webhook notification is a simple way to send information about a state change over HTTP to a custom endpoint.
@@ -132,7 +141,8 @@ Example json body:
     "tag name":"tag value"
   },
   "title":"[Alerting] Panel Title alert"
-}```
+}
+```
 
 - **state** - The possible values for alert state are: `ok`, `paused`, `alerting`, `pending`, `no_data`.
 
@@ -188,20 +198,20 @@ Kafka | `kafka` | yes, external only | no
 Line | `line` | yes, external only | no
 Microsoft Teams | `teams` | yes, external only | no
 OpsGenie | `opsgenie` | yes, external only | yes
-Pagerduty | `pagerduty` | yes, external only | no
+Pagerduty | `pagerduty` | yes, external only | yes
 Prometheus Alertmanager | `prometheus-alertmanager` | yes, external only | yes
 Pushover | `pushover` | yes | no
 Sensu | `sensu` | yes, external only | no
 Slack | `slack` | yes | no
-Squadcast | `webhook` | no | no
 Telegram | `telegram` | yes | no
 Threema | `threema` | yes, external only | no
 VictorOps | `victorops` | yes, external only | no
 Webhook | `webhook` | yes, external only | yes
 
-# Enable images in notifications {#external-image-store}
+## Enable images in notifications {#external-image-store}
 
-Grafana can render the panel associated with the alert rule as a PNG image and include that in the notification. Read more about the requirements and how to configure image rendering [here]({{< relref "../administration/image_rendering/" >}}).
+Grafana can render the panel associated with the alert rule as a PNG image and include that in the notification. Read more about the requirements and how to configure
+[image rendering]({{< relref "../administration/image_rendering/" >}}).
 
 Most Notification Channels require that this image be publicly accessible (Slack and PagerDuty for example). In order to include images in alert notifications, Grafana can upload the image to an image store. It currently supports
 Amazon S3, Webdav, Google Cloud Storage and Azure Blob Storage. So to set that up you need to configure the [external image uploader]({{< relref "../installation/configuration/#external-image-storage" >}}) in your grafana-server ini config file.
@@ -210,7 +220,7 @@ Be aware that some notifiers requires public access to the image to be able to i
 
 Notification services which need public image access are marked as 'external only'.
 
-# Use alert rule tags in notifications {#alert-rule-tags}
+## Use alert rule tags in notifications {#alert-rule-tags}
 
 > Only available in Grafana v6.3+.
 
@@ -220,7 +230,7 @@ It currently supports only the Prometheus Alertmanager notifier.
 
  This is an optional feature. You can get notifications without using alert rule tags.
 
-# Configure the link back to Grafana from alert notifications
+## Configure the link back to Grafana from alert notifications
 
 All alert notifications contain a link back to the triggered alert in the Grafana instance.
-This url is based on the [domain]({{< relref "../installation/configuration/#domain" >}}) setting in Grafana.
+This URL is based on the [domain]({{< relref "../installation/configuration/#domain" >}}) setting in Grafana.

docs/sources/alerting/rules.md

@@ -11,15 +11,11 @@ weight = 1
 
 # Alerting Engine and Rules Guide
 
-> Alerting is only available in Grafana v4.0 and above.
-
-## Introduction
-
-{{< imgbox max-width="40%" img="/img/docs/v4/drag_handles_gif.gif" caption="Alerting overview" >}}
-
 Alerting in Grafana allows you to attach rules to your dashboard panels. When you save the dashboard
 Grafana will extract the alert rules into a separate alert rule storage and schedule them for evaluation.
 
+{{< imgbox max-width="40%" img="/img/docs/v4/drag_handles_gif.gif" caption="Alerting overview" >}}
+
 In the alert tab of the graph panel you can configure how often the alert rule should be evaluated
 and the conditions that need to be met for the alert to change state and trigger its
 [notifications]({{< relref "notifications.md" >}}).
@@ -28,11 +24,9 @@ and the conditions that need to be met for the alert to change state and trigger
 
 The alert rules are evaluated in the Grafana backend in a scheduler and query execution engine that is part
 of core Grafana. Only some data sources are supported right now. They include `Graphite`, `Prometheus`, `InfluxDB`, `Elasticsearch`,
-`Stackdriver`, `Cloudwatch`, `Azure Monitor`, `MySQL`, `PostgreSQL`, `MSSQL`, `OpenTSDB`, `Oracle` and `Azure Data Explorer`.
+`Stackdriver`, `Cloudwatch`, `Azure Monitor`, `MySQL`, `PostgreSQL`, `MSSQL`, `OpenTSDB`, `Oracle`, and `Azure Data Explorer`.
 
-> Alerting support for Azure Monitor is only available in Grafana v6.0 and above.
-
-### Clustering
+## Clustering
 
 Currently alerting supports a limited form of high availability. Since v4.2.0 of Grafana, alert notifications are deduped when running multiple servers. This means all alerts are executed on every server but no duplicate alert notifications are sent due to the deduping logic. Proper load balancing of alerts will be introduced in the future.
 
@@ -67,7 +61,6 @@ Below you can see an example timeline of an alert using the `For` setting. At ~1
 Currently the only condition type that exists is a `Query` condition that allows you to
 specify a query letter, time range and an aggregation function.
 
-
 ### Query condition example
 
 ```sql

docs/sources/auth/azuread.md

@@ -0,0 +1,146 @@
++++
+title = "Azure AD OAuth2 authentication"
+description = "Grafana Azure AD OAuth Guide "
+keywords = ["grafana", "configuration", "documentation", "oauth"]
+type = "docs"
+[menu.docs]
+name = "Azure AD"
+identifier = "azuread_oauth2"
+parent = "authentication"
+weight = 3
++++
+
+# Azure AD OAuth2 authentication
+
+> 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.
+
+## Create the Azure AD application
+
+To enable the Azure AD OAuth2 you must register your application with Azure AD.
+
+1. Log in to [Azure Portal](https://portal.azure.com) and click **Azure Active Directory** in the side menu.
+
+1. Click **App Registrations** and add a new application registration:
+   - Name: Grafana
+   - Application type: Web app / API
+   - Sign-on URL: `https://<grafana domain>/login/azuread`
+
+1. Click the name of the new application to open the application details page.
+
+1. Click **Endpoints**.
+   - Note down the **OAuth 2.0 authorization endpoint (v2)**, this will be the auth url.
+   - Note down the **OAuth 2.0 token endpoint (v2)**, this will be the token url.
+
+1. Close the Endpoints page to come back to the application details page.
+
+1. Note down the "Application ID", this will be the OAuth client id.
+
+1. Click **Certificates & secrets** and add a new entry under Client secrets.
+    - Description: Grafana OAuth
+    - Expires: Never
+
+1. Click **Add** then copy the key value, this will be 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 to the Viewer role.
+   - Every role has to have a unique id. On Linux this can be created with `uuidgen` for instance.
+
+        ```json
+        "appRoles": [
+        		{
+        			"allowedMemberTypes": [
+        				"User"
+        			],
+        			"description": "Grafana admin Users",
+        			"displayName": "Grafana Admin",
+        			"id": "SOME_UNIQUE_ID",
+        			"isEnabled": true,
+        			"lang": null,
+        			"origin": "Application",
+        			"value": "Admin"
+        		},
+        		{
+        			"allowedMemberTypes": [
+        				"User"
+        			],
+        			"description": "Grafana read only Users",
+        			"displayName": "Grafana Viewer",
+        			"id": "SOME_UNIQUE_ID",
+        			"isEnabled": true,
+        			"lang": null,
+        			"origin": "Application",
+        			"value": "Viewer"
+        		},
+        		{
+        			"allowedMemberTypes": [
+        				"User"
+        			],
+        			"description": "Grafana Editor Users",
+        			"displayName": "Grafana Editor",
+        			"id": "SOME_UNIQUE_ID",
+        			"isEnabled": true,
+        			"lang": null,
+        			"origin": "Application",
+        			"value": "Editor"
+        		}
+        	],
+        ```
+
+1. Click Overview and then on **Managed application in local directory** to show the Enterprise Application details.
+
+1. Click on **Users and groups** and add Users/Groups to the Grafana roles by using **Add User**.
+
+## Enable Azure AD Oauth in Grafana
+
+1. Add the following to the [Grafana configuration file]({{< relref "../installation/configuration.md#config-file-locations" >}}):
+
+```ini
+[auth.azuread]
+name = Azure AD
+enabled = true
+allow_sign_up = true
+client_id = APPLICATION_ID
+client_secret = CLIENT_SECRET
+scopes = openid email profile
+auth_url = https://login.microsoftonline.com/TENANT_ID/oauth2/v2.0/authorize
+token_url = https://login.microsoftonline.com/TENANT_ID/oauth2/v2.0/token
+allowed_domains =
+allowed_groups =
+```
+
+> Note: Ensure that the [root_url]({{< relref "../installation/configuration/#root-url" >}}) in Grafana is set in your Azure Application Reply URLs (App -> Settings -> Reply URLs)
+
+### Configure allowed groups and domains
+
+To limit access to authenticated users that are members of one or more groups, set `allowed_groups`
+to a comma- or space-separated list of group Object Ids. Object Id for a specific group can be found on the Azure portal: go to Azure Active Directory -> Groups. For instance, if you want to
+only give access to members of the group `example` which has Id `8bab1c86-8fba-33e5-2089-1d1c80ec267d`, set
+
+```ini
+allowed_groups = 8bab1c86-8fba-33e5-2089-1d1c80ec267d
+```
+
+You'll need to ensure that you've [enabled group attributes](https://docs.microsoft.com/en-us/azure/active-directory/hybrid/how-to-connect-fed-group-claims#configure-the-azure-ad-application-registration-for-group-attributes) in your Azure AD Application Registration manifest file (Azure Portal -> Azure Active Directory -> Application Registrations -> Select Application -> Manifest)
+
+```json
+"groupMembershipClaims": "ApplicationGroup"
+```
+
+The `allowed_domains` option limits access to the users belonging to the specific domains. Domains should be separated by space or comma.
+
+```ini
+allowed_domains = mycompany.com mycompany.org
+```
+
+### Team Sync (Enterprise only)
+
+>  Only available in Grafana Enterprise v6.7+
+
+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`.
+
+[Learn more about Team Sync]({{< relref "team-sync.md" >}})

docs/sources/auth/enhanced_ldap.md

@@ -10,51 +10,8 @@ parent = "authentication"
 weight = 3
 +++
 
-# Enhanced LDAP Integration
+# Enhanced LDAP integration
 
-> Enhanced LDAP Integration is only available in Grafana Enterprise. Read more about [Grafana Enterprise]({{< relref "../enterprise" >}}).
+The enhanced LDAP integration adds additional functionality on top of the existing {LDAP integration]({{< relref "ldap.md" >}}).
 
-The enhanced LDAP integration adds additional functionality on top of the [existing LDAP integration]({{< relref "ldap.md" >}}).
-
-## LDAP Group Synchronization for Teams
-
-{{< docs-imagebox img="/img/docs/enterprise/team_members_ldap.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" >}}
-
-With the enhanced LDAP integration it's possible to setup synchronization between LDAP groups and teams. This enables LDAP users which are members
-of certain LDAP groups to automatically be added/removed as members to certain teams in Grafana. Currently the synchronization will only happen every
-time a user logs in, unless Grafana 6.3 (or later) is used with active background synchronization enabled.
-
-Grafana keeps track of all synchronized users in teams and you can see which users have been synchronized from LDAP in the team members list, see `LDAP` label in screenshot.
-This mechanism allows Grafana to remove an existing synchronized user from a team when its LDAP group membership changes. This mechanism also enables you to manually add
-a user as member of a team and it will not be removed when the user signs in. This gives you flexibility to combine LDAP group memberships and Grafana team memberships.
-
-[Learn more about Team Sync]({{< relref "team-sync.md">}})
-
-<div class="clearfix"></div>
-
-## Active LDAP Synchronization
-
-> Only available in Grafana Enterprise v6.3+
-
-In the open source version of Grafana, user data from LDAP will be synchronized only during the login process when authenticating using LDAP.
-
-With this feature you can configure Grafana to actively sync users with LDAP server(s) in the background. Role and team membership will be updated, removed users will be disabled and logged out. Only users that have logged into Grafana at least once will be synchronized.
-
-```bash
-[auth.ldap]
-...
-
-# You can use the Cron syntax or several predefined schedulers -
-# @yearly (or @annually) | Run once a year, midnight, Jan. 1st        | 0 0 0 1 1 *
-# @monthly               | Run once a month, midnight, first of month | 0 0 0 1 * *
-# @weekly                | Run once a week, midnight between Sat/Sun  | 0 0 0 * * 0
-# @daily (or @midnight)  | Run once a day, midnight                   | 0 0 0 * * *
-# @hourly                | Run once an hour, beginning of hour        | 0 0 * * * *
-sync_cron = "0 0 1 * * *" # This is default value (At 1 am every day)
-# This cron expression format uses 6 space-separated fields (including seconds), for example
-# sync_cron = "* */10 * * * *"
-# This will run the LDAP Synchronization every 10th minute, which is also the minimal interval between the grafana sync times i.e. you cannot set it for every 9th minute
-
-# You can also disable active LDAP synchronization
-active_sync_enabled = true # enabled by default
-```
+> Enhanced LDAP integration is only available in Grafana Enterprise. For more information, refer to [Enhanced LDAP integration]({{< relref "../enterprise/enhanced_ldap.md" >}}) in [Grafana Enterprise]({{< relref "../enterprise" >}}).

docs/sources/auth/generic-oauth.md

@@ -50,28 +50,10 @@ Grafana will also attempt to do role mapping through OAuth as described below.
 
 > Only available in Grafana v6.5+.
 
-Check for the presence of an 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`.
+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`.
 
 See [JMESPath examples](#jmespath-examples) for more information.
 
-## Set up OAuth2 with Okta
-
-First set up Grafana as an OpenId client "webapplication" in Okta. Then set the Base URIs to `https://<grafana domain>/` and set the Login redirect URIs to `https://<grafana domain>/login/generic_oauth`.
-
-Finally set up the generic oauth module like this:
-
-```bash
-[auth.generic_oauth]
-name = Okta
-enabled = true
-scopes = openid profile email
-client_id = <okta application Client ID>
-client_secret = <okta application Client Secret>
-auth_url = https://<okta domain>/oauth2/v1/authorize
-token_url = https://<okta domain>/oauth2/v1/token
-api_url = https://<okta domain>/oauth2/v1/userinfo
-```
-
 ## Set up OAuth2 with Bitbucket
 
 ```bash
@@ -105,7 +87,7 @@ allowed_organizations =
     then:
 3.  Under the SSO tab on the Grafana App details page you'll find the Client ID and Client Secret.
 
-    Your OneLogin Domain will match the url you use to access OneLogin.
+    Your OneLogin Domain will match the URL you use to access OneLogin.
 
     Configure Grafana as follows:
 
@@ -150,46 +132,6 @@ allowed_organizations =
     api_url = https://<domain>/userinfo
     ```
 
-## Set up OAuth2 with Azure Active Directory
-
-1.  Log in to portal.azure.com and click "Azure Active Directory" in the side menu, then click the "Properties" sub-menu item.
-
-2.  Copy the "Directory ID", this is needed for setting URLs later
-
-3.  Click "App Registrations" and add a new application registration:
-    - Name: Grafana
-    - Application type: Web app / API
-    - Sign-on URL: `https://<grafana domain>/login/generic_oauth`
-
-4.  Click the name of the new application to open the application details page.
-
-5.  Note down the "Application ID", this will be the OAuth client id.
-
-6.  Click "Certificates & secrets" and add a new entry under Client secrets
-    - Description: Grafana OAuth
-    - Expires: Never
-
-7.  Click Add then copy the key value, this will be the OAuth client secret.
-
-8.  Configure Grafana as follows:
-
-    ```bash
-    [auth.generic_oauth]
-    name = Azure AD
-    enabled = true
-    allow_sign_up = true
-    client_id = <application id>
-    client_secret = <key value>
-    scopes = openid email name
-    auth_url = https://login.microsoftonline.com/<directory id>/oauth2/authorize
-    token_url = https://login.microsoftonline.com/<directory id>/oauth2/token
-    api_url =
-    team_ids =
-    allowed_organizations =
-    ```
-
-> Note: It's important to ensure that the [root_url]({{< relref "../installation/configuration/#root-url" >}}) in Grafana is set in your Azure Application Reply URLs (App -> Settings -> Reply URLs)
-
 ## Set up OAuth2 with Centrify
 
 1.  Create a new Custom OpenID Connect application configuration in the Centrify dashboard.
@@ -223,7 +165,7 @@ allowed_organizations =
 
 ## JMESPath examples
 
-To ease configuring a proper JMESPath expression you can test/evaluate expression with a custom payload at http://jmespath.org/.
+To ease configuration of a proper JMESPath expression, you can test/evaluate expressions with custom payloads at http://jmespath.org/.
 
 ### Role mapping
 

docs/sources/auth/github.md

@@ -16,7 +16,7 @@ To enable the GitHub OAuth2 you must register your application with GitHub. GitH
 
 ## Configure GitHub OAuth application
 
-You need to create a GitHub OAuth application (you find this under the GitHub
+You need to create a GitHub OAuth application (you  will find this under the GitHub
 settings page). When you create the application you will need to specify
 a callback URL. Specify this as callback:
 

docs/sources/auth/gitlab.md

@@ -12,7 +12,7 @@ weight = 5
 
 # GitLab OAuth2 Authentication
 
-To enable the GitLab OAuth2 you must register an application in GitLab. GitLab will generate a client ID and secret key for you to use.
+To enable GitLab OAuth2 you must register the application in GitLab. GitLab will generate a client ID and secret key for you to use.
 
 ## Create GitLab OAuth keys
 
@@ -73,7 +73,7 @@ who can authenticate on GitLab will be able to login on your Grafana instance;
 if you use the public `gitlab.com`, it means anyone in the world would be able
 to login on your Grafana instance.
 
-You can can however limit access to only members of a given group or list of
+You can limit access to only members of a given group or list of
 groups by setting the `allowed_groups` option.
 
 ### allowed_groups
@@ -125,5 +125,4 @@ the correct teams.
 
 Your GitLab groups can be referenced in the same way as `allowed_groups`, like `example` or `foo/bar`.
 
-[Learn more about Team Sync]({{< relref "enhanced_ldap.md" >}})
-
+[Learn more about Team Sync]({{< relref "team-sync.md" >}})

docs/sources/auth/google.md

@@ -18,8 +18,8 @@ To enable the Google OAuth2 you must register your application with Google. Goog
 
 First, you need to create a Google OAuth Client:
 
-1. Go to https://console.developers.google.com/apis/credentials
-2. Click the 'Create Credentials' button, then click 'OAuth Client ID' in the menu that drops down
+1. Go to https://console.developers.google.com/apis/credentials.
+2. Click **Create Credentials**, then click **OAuth Client ID** in the drop-down menu
 3. Enter the following:
    - Application Type: Web Application
    - Name: Grafana

docs/sources/auth/ldap.md

@@ -16,6 +16,8 @@ weight = 2
 The LDAP integration in Grafana allows your Grafana users to login with their LDAP credentials. You can also specify mappings between LDAP
 group memberships and Grafana Organization user roles.
 
+> [Enhanced LDAP authentication]({{< relref "../enterprise/enhanced_ldap.md" >}}) is available in [Grafana Enterprise]({{< relref "../enterprise" >}}).
+
 ## Supported LDAP Servers
 
 Grafana uses a [third-party LDAP library](https://github.com/go-ldap/ldap) under the hood that supports basic LDAP v3 functionality.
@@ -90,6 +92,14 @@ member_of = "memberOf"
 email =  "email"
 ```
 
+### Using environment variables
+
+You can interpolate variables in the TOML config from environment variables. For instance, you could externalize your `bind_password` that way:
+
+```bash
+bind_password = "${LDAP_ADMIN_PASSWORD}"
+```
+
 ## LDAP Debug View
 
 > Only available in Grafana v6.4+
@@ -189,16 +199,27 @@ Setting | Required | Description | Default
 Users with nested/recursive group membership must have an LDAP server that supports `LDAP_MATCHING_RULE_IN_CHAIN`
 and configure `group_search_filter` in a way that it returns the groups the submitted username is a member of.
 
+To configure `group_search_filter`:
+* You can set `group_search_base_dns` to specify where the matching groups are defined.
+* If you do not use `group_search_base_dns`, then the previously defined `search_base_dns` is used.
+
 **Active Directory example:**
 
 Active Directory groups store the Distinguished Names (DNs) of members, so your filter will need to know the DN for the user based only on the submitted username.
-Multiple DN templates can be searched by combining filters with the LDAP OR-operator. Examples:
+Multiple DN templates can be searched by combining filters with the LDAP OR-operator. Two examples:
+
+```bash
+group_search_filter = "(member:1.2.840.113556.1.4.1941:=%s)"
+group_search_base_dns = ["DC=mycorp,DC=mytld"]
+group_search_filter_user_attribute = "dn"
+```
 
 ```bash
 group_search_filter = "(member:1.2.840.113556.1.4.1941:=CN=%s,[user container/OU])"
 group_search_filter = "(|(member:1.2.840.113556.1.4.1941:=CN=%s,[user container/OU])(member:1.2.840.113556.1.4.1941:=CN=%s,[another user container/OU]))"
 group_search_filter_user_attribute = "cn"
 ```
+
 For more information on AD searches see [Microsoft's Search Filter Syntax](https://docs.microsoft.com/en-us/windows/desktop/adsi/search-filter-syntax) documentation.
 
 For troubleshooting, by changing `member_of` in `[servers.attributes]` to "dn" it will show you more accurate group memberships when [debug is enabled](#troubleshooting).

docs/sources/auth/okta.md

@@ -0,0 +1,89 @@
++++
+title = "Okta OAuth2 authentication"
+description = "Grafana Okta OAuth Guide "
+keywords = ["grafana", "configuration", "documentation", "oauth"]
+type = "docs"
+[menu.docs]
+name = "Okta"
+identifier = "okta_oauth2"
+parent = "authentication"
+weight = 3
++++
+
+# Okta OAuth2 authentication
+
+> Only available in Grafana v7.0+
+
+The Okta authentication allows your Grafana users to log in by using an external Okta authorization server.
+
+## Create an Okta application
+
+Before you can sign a user in, you need to create an Okta application from the Okta Developer Console.
+
+1. Log in to the [Okta portal](https://login.okta.com/).
+
+1. Go to Admin and then select **Developer Console**.
+
+1. Select **Applications**, then **Add Application**.
+
+1. Pick **Web** as the platform.
+
+1. Enter a name for your application (or leave the default value).
+
+1. Add the **Base URI** of your application, such as https://grafana.example.com.
+
+1. Enter values for the **Login redirect URI**. Use **Base URI** and append it with `/login/okta`, for example: https://grafana.example.com/login/okta.
+
+1. Click **Done** to finish creating the Okta application.
+
+## Enable Okta Oauth in Grafana
+
+1. Add the following to the [Grafana configuration file]({{< relref "../installation/configuration.md#config-file-locations" >}}):
+
+```ini
+[auth.okta]
+name = Okta
+enabled = true
+allow_sign_up = true
+client_id = some_id
+client_secret = some_secret
+scopes = openid profile email groups
+auth_url = https://<tenant-id>.okta.com/oauth2/v1/authorize
+token_url = https://<tenant-id>.okta.com/oauth2/v1/token
+api_url = https://<tenant-id>.okta.com/oauth2/v1/userinfo
+allowed_domains =
+allowed_groups =
+role_attribute_path =
+```
+
+### Configure allowed groups and domains
+
+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 Okta groups.
+
+```ini
+allowed_groups = Developers, Admins
+```
+
+The `allowed_domains` option limits access to the users belonging to the specific domains. Domains should be separated by space or comma.
+
+```ini
+allowed_domains = mycompany.com mycompany.org
+```
+
+### Map roles
+
+Grafana can attempt to do role mapping through Okta OAuth. In order to achieve this, Grafana checks for the presence of a role using the [JMESPath](http://jmespath.org/examples.html) specified via the `role_attribute_path` configuration option.
+
+Grafana uses JSON obtained from querying the `/userinfo` endpoint for the path lookup. The result after evaluating the `role_attribute_path` JMESPath expression needs to be a valid Grafana role, i.e. `Viewer`, `Editor` or `Admin`. Refer to [Organization roles]({{< relref "../permissions/organization_roles.md" >}}) for more information about roles and permissions in Grafana.
+
+Read about how to [add custom claims](https://developer.okta.com/docs/guides/customize-tokens-returned-from-okta/add-custom-claim/) to the user info in Okta. Also, check Generic OAuth page for [JMESPath examples]({{< relref "generic-oauth.md/#jmespath-examples" >}}).
+
+### Team Sync (Enterprise only)
+
+Map your Okta groups to teams in Grafana so that your users will automatically be added to
+the correct teams.
+
+Okta groups can be referenced by group name, like `Admins`.
+
+[Learn more about Team Sync]({{< relref "../enterprise/team-sync.md" >}})

docs/sources/auth/overview.md

@@ -128,7 +128,7 @@ oauth_auto_login = true
 
 ### Hide sign-out menu
 
-Set to the option detailed below to true to hide sign-out menu link. Useful if you use an auth proxy.
+Set the option detailed below to true to hide sign-out menu link. Useful if you use an auth proxy.
 
 ```bash
 [auth]

docs/sources/auth/saml.md

@@ -10,169 +10,8 @@ parent = "authentication"
 weight = 5
 +++
 
-# SAML Authentication
+# SAML authentication
 
-> SAML Authentication integration is only available in Grafana Enterprise. Read more about [Grafana Enterprise]({{< relref "../enterprise" >}}).
+The SAML authentication integration allows your Grafana users to log in by using an external SAML Identity Provider (IdP). To enable this, Grafana becomes a Service Provider (SP) in the authentication flow, interacting with the IdP to exchange user information.
 
-> Only available in Grafana v6.3+
-
-The SAML authentication integration allows your Grafana users to log in by
-using an external SAML Identity Provider (IdP). To enable this, Grafana becomes
-a Service Provider (SP) in the authentication flow, interacting with the IdP to
-exchange user information.
-
-## Supported SAML
-
-The SAML single-sign-on (SSO) standard is varied and flexible. Our implementation contains the subset of features needed to provide a smooth authentication experience into Grafana.
-
-> Should you encounter any problems with our implementation, please don't hesitate to contact us.
-
-At the moment of writing, Grafana supports:
-
-1. From the Service Provider (SP) to the Identity Provider (IdP)
-
-    - `HTTP-POST` binding
-    - `HTTP-Redirect` binding
-
-2. From the Identity Provider (IdP) to the Service Provider (SP)
-
-    - `HTTP-POST` binding
-
-3. In terms of security, we currently support signed and encrypted Assertions. However, signed or encrypted requests are not supported.
-
-4. In terms of initiation, only SP-initiated requests are supported. There's no support for IdP-initiated request.
-
-## Set up SAML Authentication
-
-To use the SAML integration, you need to enable SAML in the [main config file]({{< relref "../installation/configuration.md" >}}).
-
-```bash
-[auth.saml]
-# Defaults to false. If true, the feature is enabled
-enabled = true
-
-# Base64-encoded public X.509 certificate. Used to sign requests to the IdP
-certificate =
-
-# Path to the public X.509 certificate. Used to sign requests to the IdP
-certificate_path =
-
-# Base64-encoded private key. Used to decrypt assertions from the IdP
-private_key =
-
-# Path to the private key. Used to decrypt assertions from the IdP
-private_key_path =
-
-# Base64-encoded IdP SAML metadata XML. Used to verify and obtain binding locations from the IdP
-idp_metadata =
-
-# Path to the SAML metadata XML. Used to verify and obtain binding locations from the IdP
-idp_metadata_path =
-
-# URL to fetch SAML IdP metadata. Used to verify and obtain binding locations from the IdP
-idp_metadata_url =
-
-# Duration, since the IdP issued a response and the SP is allowed to process it. Defaults to 90 seconds
-max_issue_delay =
-
-# Duration, for how long the SP's metadata should be valid. Defaults to 48 hours
-metadata_valid_duration =
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's name
-assertion_attribute_name = displayName
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
-assertion_attribute_login = mail
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's email
-assertion_attribute_email = mail
-```
-
-Important to note:
-
-- like any other Grafana configuration, use of [environment variables for these options is supported]({{< relref "../installation/configuration.md#using-environment-variables" >}})
-- only one form of configuration option is required. Using multiple forms, e.g. both `certificate` and `certificate_path` will result in an error
-
-## Grafana Configuration
-
-An example working configuration example looks like:
-
-```bash
-[auth.saml]
-enabled = true
-certificate_path = "/path/to/certificate.cert"
-private_key_path = "/path/to/private_key.pem"
-metadata_path = "/my/metadata.xml"
-max_issue_delay = 90s
-metadata_valid_duration = 48h
-assertion_attribute_name = displayName
-assertion_attribute_login = mail
-assertion_attribute_email = mail
-```
-
-And here is a comprehensive list of the options:
-
-| Setting                                                     | Required | Description                                                                                        | Default       |
-| ----------------------------------------------------------- | -------- | -------------------------------------------------------------------------------------------------- | ------------- |
-| `enabled`                                                   | No       | Whenever SAML authentication is allowed                                                            | `false`       |
-| `certificate` or `certificate_path`                         | Yes      | Base64-encoded string or Path for the SP X.509 certificate                                         |               |
-| `private_key` or `private_key_path`                         | Yes      | Base64-encoded string or Path for the SP private key                                               |               |
-| `idp_metadata` or `idp_metadata_path` or `idp_metadata_url` | Yes      | Base64-encoded string, Path or URL for the IdP SAML metadata XML                                   |               |
-| `max_issue_delay`                                           | No       | Duration, since the IdP issued a response and the SP is allowed to process it                      | `90s`         |
-| `metadata_valid_duration`                                   | No       | Duration, for how long the SP's metadata should be valid                                           | `48h`         |
-| `assertion_attribute_name`                                  | No       | Friendly name or name of the attribute within the SAML assertion to use as the user's name         | `displayName` |
-| `assertion_attribute_login`                                 | No       | Friendly name or name of the attribute within the SAML assertion to use as the user's login handle | `mail`        |
-| `assertion_attribute_email`                                 | No       | Friendly name or name of the attribute within the SAML assertion to use as the user's email        | `mail`        |
-
-### Cert and Private Key
-
-The SAML SSO standard uses asymmetric encryption to exchange information between the SP (Grafana) and the IdP. To perform such encryption, you need a public part and a private part. In this case, the X.509 certificate provides the public part, while the private key provides the private part.
-
-Grafana supports two ways of specifying both the `certificate` and `private_key`. Without a suffix (e.g. `certificate=`), the configuration assumes you've supplied the base64-encoded file contents. However, if specified with the `_path` suffix (e.g. `certificate_path=`) Grafana will treat it as a file path and attempt to read the file from the file system.
-
-### IdP Metadata
-
-Expanding on the above, we'll also need the public part from our IdP for message verification. The SAML IdP metadata XML tells us where and how we should exchange the user information.
-
-Currently, we support three ways of specifying the IdP metadata. Without a suffix `idp_metadata=` Grafana assumes base64-encoded XML file contents, with the `_path` suffix assumes a file path and attempts to read the file from the file system and with the `_url` suffix assumes an URL and attempts to load the metadata from the given location.
-
-### Max Issue Delay
-
-Prevention of SAML response replay attacks and internal clock skews between the SP (Grafana), and the IdP is covered. You can set a maximum amount of time between the IdP issuing a response and the SP (Grafana) processing it.
-
-The configuration options is specified as a duration e.g. `max_issue_delay = 90s` or `max_issue_delay = 1h`
-
-### Metadata valid duration
-
-As an SP, our metadata is likely to expire at some point, e.g. due to a certificate rotation or change of location binding. Grafana allows you to specify for how long the metadata should be valid. Leveraging the standard's `validUntil` field, you can tell consumers until when your metadata is going to be valid. The duration is computed by adding the duration to the current time.
-
-The configuration option is specified as a duration e.g. `metadata_valid_duration = 48h`
-
-## Identity Provider (IdP) registration
-
-For the SAML integration to work correctly, you need to make the IdP aware of the SP.
-
-The integration provides two key endpoints as part of Grafana:
-
-- The `/saml/metadata` endpoint. Which contains the SP's metadata. You can either download and upload it manually or make the IdP request it directly from the endpoint. Some providers name it Identifier or Entity ID.
-
-- The `/saml/acs` endpoint. Which is intended to receive the ACS (Assertion Customer Service) callback. Some providers name it SSO URL or Reply URL.
-
-## Assertion mapping
-
-During the SAML SSO authentication flow, we receive the ACS (Assertion Customer Service) callback. The callback contains all the relevant information of the user under authentication embedded in the SAML response. Grafana parses the response to create (or update) the user within its internal database.
-
-For Grafana to map the user information, it looks at the individual attributes within the assertion. You can think of these attributes as Key/Value pairs (although, they contain more information than that).
-
-Grafana provides configuration options that let you modify which keys to look at for these values. The data we need to create the user in Grafana is Name, Login handle, and email.
-
-An example is `assertion_attribute_name = "givenName"` where Grafana looks within the assertion for an attribute with a friendly name or name of `givenName`. Both, the friendly name (e.g. `givenName`) or the name (e.g. `urn:oid:2.5.4.42`) can be used interchangeably as the value for the configuration option.
-
-## Troubleshooting
-
-To troubleshoot and get more log info enable saml debug logging in the [main config file]({{< relref "../installation/configuration.md" >}}).
-
-```bash
-[log]
-filters = saml.auth:debug
-```
+> SAML authentication integration is only available in Grafana Enterprise v6.3 or later. For more information, refer to [SAML authentication]({{< relref "../enterprise/saml.md" >}}) in [Grafana Enterprise]({{< relref "../enterprise" >}}).

docs/sources/auth/team-sync.md

@@ -10,38 +10,17 @@ parent = "authentication"
 weight = 5
 +++
 
-# Team Sync
-
-> Team Sync is only available in Grafana Enterprise. Read more about [Grafana Enterprise]({{< relref "../enterprise" >}}).
-
-{{< docs-imagebox img="/img/docs/enterprise/team_members_ldap.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" >}}
+# Team sync
 
 With the Team Sync it's possible to setup synchronization between your auth providers teams and teams in Grafana. This enables LDAP or GitHub OAuth users which are members
 of certain teams/groups to automatically be added/removed as members to certain teams in Grafana. Currently the synchronization will only happen every
 time a user logs in, unless LDAP is used together with active background synchronization that was added in Grafana 6.3.
 
+{{< docs-imagebox img="/img/docs/enterprise/team_members_ldap.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" >}}
+
 Grafana keeps track of all synchronized users in teams and you can see which users have been synchronized in the team members list, see `LDAP` label in screenshot.
-This mechanism allows Grafana to remove an existing synchronized user from a team when its LDAP group membership (for example) changes. This mechanism also enables you to manually add
-a user as member of a team and it will not be removed when the user signs in. This gives you flexibility to combine LDAP group memberships and Grafana team memberships.
+This mechanism allows Grafana to remove an existing synchronized user from a team when its LDAP group membership (for example) changes. This mechanism also enables you to manually add a user as member of a team and it will not be removed when the user signs in. This gives you flexibility to combine LDAP group memberships and Grafana team memberships.
 
 <div class="clearfix"></div>
 
-### Enable synchronization for a team
-
-{{< docs-imagebox img="/img/docs/enterprise/team_add_external_group.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" >}}
-
-1. Navigate to Configuration / Teams.
-2. Select a team.
-3. Select the External group sync tab and click on the `Add group` button.
-4. Insert the value of the group you want to sync with. This becomes what Grafana denominates as a `GroupID`.
-
-    - Using LDAP as an example, this is the LDAP distinguished name (DN) of LDAP group you want to synchronize with the team.
-    - Using Auth Proxy as an example, this is the value we receive as part of the custom `Groups` header.
-
-5. Click on `Add group` button to save.
-
-### Supported Providers
-
-* [LDAP]({{< relref "enhanced_ldap.md#ldap-group-synchronization-for-teams" >}})
-* [GitHub OAuth]({{< relref "github.md#team-sync-enterprise-only" >}})
-* [Auth Proxy]({{< relref "auth-proxy.md#team-sync-enterprise-only">}})
+> Team Sync is only available in Grafana Enterprise.  For more information, refer to [Team sync]({{< relref "../enterprise/team-sync.md" >}}) in [Grafana Enterprise]({{< relref "../enterprise" >}}).

docs/sources/contribute/_index.md

@@ -1,12 +0,0 @@
-+++
-title = "Contribute"
-description = "Contribute"
-type = "docs"
-[menu.docs]
-name = "Contribute"
-identifier = "contribute"
-weight = 20
-+++
-
-### Contribute info
-

docs/sources/developers/_index.md

@@ -0,0 +1,9 @@
++++
+title = "Contribute"
+description = "Contribute"
+type = "docs"
+[menu.docs]
+name = "Contribute"
+identifier = "contribute"
+weight = 20
++++

docs/sources/developers/developer-resources.md

@@ -0,0 +1,48 @@
++++
+title = "Developer resources"
+description = "Resources for Grafana developers"
+keywords = ["grafana", "documentation", "developers", "resources"]
+type = "docs"
+[menu.docs]
+name = "Grafana resources"
+identifier = "Developer resources"
+weight = 30
++++
+
+# Developer resources
+
+This page lists resources for developers who want to contribute to the Grafana software ecosystem or build plugins for Grafana.
+
+## 
+General resources
+These resources are useful for all developers.
+
+* [Contributing to Grafana](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md): Start here to learn how you can contribute your skills to make Grafana even better.
+
+* [Developer guide](https://github.com/grafana/grafana/blob/master/contribute/developer-guide.md): A guide to help you get started developing Grafana software, includes instructions for how to configure Grafana for development.
+
+* [Contributing to documentation](https://github.com/grafana/grafana/blob/master/contribute/documentation.md): A guide to help you contribute to Grafana documentation, includes links to beginner-friendly issues.
+
+* [Architecture guides](https://github.com/grafana/grafana/tree/master/contribute/architecture): These guides explain Grafana’s background architecture.
+
+* [Create a pull request](https://github.com/grafana/grafana/blob/master/contribute/create-pull-request.md): A guide for new contributors about how to create your first Grafana pull request.
+
+* [REST APIs](https://grafana.com/docs/grafana/latest/http_api/) allow you to interact programmatically with the Grafana backend.
+
+## Best practices and style
+
+Our [style guides](https://github.com/grafana/grafana/tree/master/contribute/style-guides) outline Grafana style for frontend, backend, documentation, and more, including best practices. Please read through them before you start editing or coding!
+
+* [Backend style guide](https://github.com/grafana/grafana/blob/master/contribute/style-guides/backend.md) explains how we want to write Go code in the future.
+
+* [Documentation style guide](https://github.com/grafana/grafana/blob/master/contribute/style-guides/documentation-style-guide.md) applies to all documentation created for Grafana products.
+
+* [End to end test framework](https://github.com/grafana/grafana/blob/master/contribute/style-guides/e2e.md) provides guidance for Grafana e2e tests.
+
+* [Frontend style guide](https://github.com/grafana/grafana/blob/master/contribute/style-guides/frontend.md) provides rules and guidance on developing in React for Grafana.
+
+* [Redux framework](https://github.com/grafana/grafana/blob/master/contribute/style-guides/redux.md) explains how Grafana handles Redux boilerplate code.
+
+* [Styling Grafana](https://github.com/grafana/grafana/blob/master/contribute/style-guides/styling.md) expands on styling React components with Emotion.
+
+* [Theming Grafana](https://github.com/grafana/grafana/blob/master/contribute/style-guides/themes.md) explains how to use themes and ThemeContext in Grafana code.

docs/sources/enterprise/_index.md

@@ -6,69 +6,78 @@ type = "docs"
 [menu.docs]
 name = "Grafana Enterprise"
 identifier = "enterprise"
-weight = 30
+weight = 100
 +++
 
 # Grafana Enterprise
 
-Grafana Enterprise is a commercial edition of Grafana that includes additional features not found in the open source
-version.
+Grafana Enterprise is a commercial edition of Grafana that includes additional features not found in the open source version.
 
-Building on everything you already know and love about Grafana, Grafana Enterprise adds enterprise data sources,
-advanced authentication options, more permission controls, 24x7x365 support, and training from the core Grafana team.
+Building on everything you already know and love about Grafana, Grafana Enterprise adds enterprise data sources, advanced authentication options, more permission controls, 24x7x365 support, and training from the core Grafana team.
 
 Grafana Enterprise includes all of the features found in the open source edition and more.
 
-___
+[Learn more about Grafana Enterprise.](https://grafana.com/enterprise)
 
-### Enhanced LDAP Integration
+## Enhanced security features
 
-With Grafana Enterprise you can set up synchronization between LDAP Groups and Teams. [Learn More]({{< relref "../auth/enhanced_ldap.md" >}}).
-
-### SAML Authentication
-
-Enables your Grafana Enterprise users to authenticate with SAML. [Learn More]({{< relref "../auth/saml.md" >}}).
-
-### Team Sync
-
-Team Sync allows you to setup synchronization between teams in Grafana and teams in your auth provider so that your users automatically end up in the right team. [Learn More]({{< relref "../auth/team-sync.md" >}}).
-
-Supported auth providers:
-
-* [LDAP]({{< relref "../auth/enhanced_ldap.md#ldap-group-synchronization-for-teams" >}})
-* [GitHub OAuth]({{< relref "../auth/github.md#team-sync-enterprise-only" >}})
-* [Auth Proxy]({{< relref "../auth/auth-proxy.md#team-sync-enterprise-only">}})
+Grafana Enterprise includes integrations with more ways to authenticate your users and enhanced authorization capabilities.
 
 ### Data source permissions
 
-Data source permissions allow you to restrict query access to only specific Teams and Users. [Learn More]({{< relref "../permissions/datasource_permissions.md" >}}).
+[Data source permissions]({{< relref "datasource_permissions.md" >}}) allow you to restrict query access to only specific teams and users.
 
-### Reporting
+### Enhanced LDAP integration
 
-Reporting makes it possible to take any dashboard, generate a PDF report, and set up a schedule to have it delivered. [Learn More]({{< relref "../features/reporting.md" >}}).
+With Grafana Enterprise [enhanced LDAP]({{< relref "enhanced_ldap.md" >}}), you can set up synchronization between LDAP groups and Grafana teams.
 
-### Enterprise Plugins
+### SAML authentication
 
-With a Grafana Enterprise license you will get access to enterprise plugins, including:
+[SAML authentication]({{< relref "saml.md" >}}) enables your Grafana Enterprise users to authenticate with SAML.
 
-* [Splunk](https://grafana.com/plugins/grafana-splunk-datasource)
+### Team sync
+
+[Team sync]({{< relref "team-sync.md" >}}) allows you to set up synchronization between teams in Grafana and teams in your auth provider so that your users automatically end up in the right team.
+
+Supported auth providers:
+
+* [Auth Proxy]({{< relref "../auth/auth-proxy.md#team-sync-enterprise-only">}})
+* [GitHub OAuth]({{< relref "../auth/github.md#team-sync-enterprise-only" >}})
+* [GitLab OAuth]({{< relref "../auth/gitlab.md#team-sync-enterprise-only" >}})
+* [LDAP]({{< relref "enhanced_ldap.md#ldap-group-synchronization-for-teams" >}})
+
+## Reporting
+
+[Reporting]({{< relref "reporting.md" >}}) allows you to take any dashboard, generate a PDF report, and set up a schedule to have it emailed to whoever you choose.
+
+## Export dashboard as PDF
+
+[Export dashboard as PDF]({{< relref "export-pdf.md" >}}) allows you to export a dashboard as a PDF document.
+
+## White labeling
+
+[White labeling]({{< relref "white-labeling.md" >}}) allows you to replace the Grafana brand and logo with your own corporate brand and logo. You can also change footer links to point to your custom resources.
+
+## Enterprise plugins
+
+With a Grafana Enterprise license, you get access to premium plugins, including:
+
+* [Amazon Timestream](https://grafana.com/plugins/grafana-timestream-datasource)
 * [AppDynamics](https://grafana.com/plugins/dlopes7-appdynamics-datasource)
 * [DataDog](https://grafana.com/plugins/grafana-datadog-datasource)
 * [Dynatrace](https://grafana.com/plugins/grafana-dynatrace-datasource)
 * [New Relic](https://grafana.com/plugins/grafana-newrelic-datasource)
-* [Amazon Timestream](https://grafana.com/plugins/grafana-timestream-datasource)
 * [Oracle Database](https://grafana.com/plugins/grafana-oracle-datasource)
+* [ServiceNow](https://grafana.com/grafana/plugins/grafana-servicenow-datasource)
+* [Splunk](https://grafana.com/plugins/grafana-splunk-datasource)
 
 ## Try Grafana Enterprise
 
-You can learn more about Grafana Enterprise [here](https://grafana.com/enterprise). To purchase or obtain a trial license contact
-the Grafana Labs [Sales Team](https://grafana.com/contact?about=support&topic=Grafana%20Enterprise).
+To purchase or obtain a trial license contact the Grafana Labs [Sales Team](https://grafana.com/contact?about=support&topic=Grafana%20Enterprise).
 
 ## License file management
 
-To download your Grafana Enterprise license log in to your [Grafana.com](https://grafana.com) account and go to your **Org
-Profile**. In the side menu there is a section for Grafana Enterprise licenses. At the bottom of the license
-details page there is **Download Token** link that will download the *license.jwt* file containing your license.
+To download your Grafana Enterprise license log in to your [Grafana.com](https://grafana.com) account and go to your **Org Profile**. In the side menu there is a section for Grafana Enterprise licenses. At the bottom of the license details page there is **Download Token** link that will download the *license.jwt* file containing your license.
 
 Place the *license.jwt* file in Grafana's data folder. This is usually located at `/var/lib/grafana/data` on Linux systems.
 
@@ -79,7 +88,4 @@ You can also configure a custom location for the license file via the ini settin
 license_path = /company/secrets/license.jwt
 ```
 
-This setting can also be set via ENV variable which is useful if you're running Grafana via docker and have a custom
-volume where you have placed the license file. In this case set the ENV variable `GF_ENTERPRISE_LICENSE_PATH` to point
-to the location of your license file.
-
+This setting can also be set with an environment variable, which is useful if you're running Grafana with Docker and have a custom volume where you have placed the license file. In this case, set the environment variable `GF_ENTERPRISE_LICENSE_PATH` to point to the location of your license file.

docs/sources/enterprise/datasource_permissions.md

@@ -0,0 +1,66 @@
++++
+title = "Data source permissions"
+description = "Grafana Datasource Permissions Guide "
+keywords = ["grafana", "configuration", "documentation", "datasource", "permissions", "users", "teams", "enterprise"]
+type = "docs"
+[menu.docs]
+name = "Datasource"
+identifier = "datasource-permissions"
+parent = "enterprise"
+weight = 200
++++
+
+# Data source permissions
+
+Data source permissions allow you to restrict access for users to query a data source. For each data source there is a permission page that allows you to enable permissions and restrict query permissions to specific **Users** and **Teams**.
+
+> Only available in Grafana Enterprise.
+
+## Enable data source permissions
+
+{{< docs-imagebox img="/img/docs/enterprise/datasource_permissions_enable_still.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" animated-gif="/img/docs/enterprise/datasource_permissions_enable.gif" >}}
+
+By default, data sources in an organization can be queried by any user in that organization. For example, a user with the `Viewer` role can issue any possible query to a data source, not just
+queries that exist on dashboards they have access to.
+
+When permissions are enabled for a data source in an organization, you restrict admin and query access for that data source to [admin users]({{< relref "../permissions/organization_roles/#admin-role" >}}) in that organization.
+
+**Enable permissions for a data source:**
+
+1. Navigate to **Configuration > Data Sources**.
+2. Select the data source you want to enable permissions for.
+3. On the Permissions tab, click **Enable**.
+
+<div class="clearfix"></div>
+
+## Allow users and teams to query a data source
+
+{{< docs-imagebox img="/img/docs/enterprise/datasource_permissions_add_still.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" animated-gif="/img/docs/enterprise/datasource_permissions_add.gif" >}}
+
+After you have enabled permissions for a data source you can assign query permissions to users and teams which will allow access to query the data source.
+
+**Assign query permission to users and teams:**
+
+1. Navigate to **Configuration > Data Sources**.
+2. Select the data source you want to assign query permissions for.
+3. On the Permissions tab, click **Add Permission**.
+4. Select **Team** or **User**.
+5. Select the entity you want to allow query access and then click **Save**.
+
+<div class="clearfix"></div>
+
+## Disable data source permissions
+
+{{< docs-imagebox img="/img/docs/enterprise/datasource_permissions_disable_still.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" animated-gif="/img/docs/enterprise/datasource_permissions_disable.gif" >}}
+
+If you have enabled permissions for a data source and want to return data source permissions to the default, then you can disable permissions with a click of a button.
+
+Note that *all* existing permissions created for the data source will be deleted.
+
+**Disable permissions for a data source:**
+
+1. Navigate to **Configuration > Data Sources**.
+2. Select the data source you want to disable permissions for.
+3. On the Permissions tab, click **Disable Permissions**.
+
+<div class="clearfix"></div>

docs/sources/enterprise/enhanced_ldap.md

@@ -0,0 +1,63 @@
++++
+title = "Enhanced LDAP Integration"
+description = "Grafana Enhanced LDAP Integration Guide "
+keywords = ["grafana", "configuration", "documentation", "ldap", "active directory", "enterprise"]
+type = "docs"
+[menu.docs]
+name = "Enhanced LDAP"
+identifier = "enhanced-ldap"
+parent = "enterprise"
+weight = 300
++++
+
+# Enhanced LDAP integration
+
+The enhanced LDAP integration adds additional functionality on top of the [LDAP integration]({{< relref "../auth/ldap.md" >}}) available in the open source edition of Grafana.
+
+> Enhanced LDAP integration is only available in Grafana Enterprise.
+
+## LDAP group synchronization for teams
+
+{{< docs-imagebox img="/img/docs/enterprise/team_members_ldap.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" >}}
+
+With enhanced LDAP integration, you can set up synchronization between LDAP groups and teams. This enables LDAP users that are members
+of certain LDAP groups to automatically be added or removed as members to certain teams in Grafana.
+
+Grafana keeps track of all synchronized users in teams, and you can see which users have been synchronized from LDAP in the team members list, see `LDAP` label in screenshot.
+This mechanism allows Grafana to remove an existing synchronized user from a team when its LDAP group membership changes. This mechanism also allows you to manually add
+a user as member of a team, and it will not be removed when the user signs in. This gives you flexibility to combine LDAP group memberships and Grafana team memberships.
+
+[Learn more about team sync.]({{< relref "team-sync.md">}})
+
+<div class="clearfix"></div>
+
+## Active LDAP synchronization
+
+In the open source version of Grafana, user data from LDAP is synchronized only during the login process when authenticating using LDAP.
+
+With active LDAP synchronization, available in Grafana Enterprise v6.3+, you can configure Grafana to actively sync users with LDAP servers in the background. Only users that have logged into Grafana at least once are synchronized.
+
+Users with updated role and team membership will need to refresh the page to get access to the new features.
+
+Removed users are automatically logged out and their account disabled. These accounts are displayed in the Server Admin > Users page with a `disabled` label. Disabled users keep their custom permissions on dashboards, folders, and data sources, so if you add them back in your LDAP database, they have access to the application with the same custom permissions as before.
+
+```bash
+[auth.ldap]
+...
+
+# You can use the Cron syntax or several predefined schedulers -
+# @yearly (or @annually) | Run once a year, midnight, Jan. 1st        | 0 0 0 1 1 *
+# @monthly               | Run once a month, midnight, first of month | 0 0 0 1 * *
+# @weekly                | Run once a week, midnight between Sat/Sun  | 0 0 0 * * 0
+# @daily (or @midnight)  | Run once a day, midnight                   | 0 0 0 * * *
+# @hourly                | Run once an hour, beginning of hour        | 0 0 * * * *
+sync_cron = "0 0 1 * * *" # This is default value (At 1 am every day)
+# This cron expression format uses 6 space-separated fields (including seconds), for example
+# sync_cron = "* */10 * * * *"
+# This will run the LDAP Synchronization every 10th minute, which is also the minimal interval between the Grafana sync times i.e. you cannot set it for every 9th minute
+
+# You can also disable active LDAP synchronization
+active_sync_enabled = true # enabled by default
+```
+
+Single bind configuration (as in the [Single bind example]({{< relref "../auth/ldap.md#single-bind-example">}})) is not supported with active LDAP synchronization because Grafana needs user information to perform LDAP searches.

docs/sources/enterprise/export-pdf.md

@@ -0,0 +1,20 @@
++++
+title = "Export dashboard as PDF"
+description = ""
+keywords = ["grafana", "export", "pdf", "share"]
+type = "docs"
+[menu.docs]
+parent = "enterprise"
+weight = 900
++++
+
+# Export dashboard as PDF
+
+You can generate PDFs from any of your dashboards and save it to file.
+
+> Only available in Grafana Enterprise v6.7+.
+
+1. In the upper right corner of the dashboard that you want to export as PDF, click the **Share dashboard** icon.
+1. On the PDF tab, select the layout option for exported dashboard: **Portrait** or **Landscape**.
+1. Click **Save as PDF** to render dashboard as a PDF document.
+   Grafana opens the PDF in a new window or browser tab.

docs/sources/enterprise/license-expiration.md

@@ -0,0 +1,54 @@
++++
+title = "License Expiration"
+description = ""
+keywords = ["grafana", "licensing"]
+type = "docs"
+[menu.docs]
+parent = "enterprise"
+weight = 8
++++
+
+# License expiration 
+
+If your license has expired most of Grafana keeps working as normal. Some enterprise functionality stops or runs with reduced functionality and Grafana displays a banner informing the users that Grafana is running on an expired license. Your Grafana admin needs to upload a new license file to restore full functionality.
+
+> Replace your license as soon as possible. Running Grafana Enterprise with an expired license is unsupported and can lead to unexpected consequences.
+
+## Update your license
+
+1. Locate your current `license.jwt` file. In a standard installation it is stored inside Grafana's data directory, which on a typical Linux installation is in `/var/lib/grafana/data`. This location might be overridden in the ini file [Configuration](https://grafana.com/docs/grafana/latest/installation/configuration/)
+```
+[enterprise]
+license_path = /path/to/your/license.jwt
+```
+The configuration file's location may also be overridden by the `GF_ENTERPRISE_LICENSE_PATH` environment variable.
+2. Log in to your [Grafana.com](https://grafana.com/login) user and make sure you're in the correct organization in the dropdown at the top of the page.
+3. Under the **Grafana Enterprise** section in the menu bar to the left, choose licenses and download the currently valid license with which you want to run Grafana. If you cannot see a valid license on Grafana.com, please contact your account manager at Grafana Labs to renew your subscription.
+4. Replace the current `license.jwt`-file with the one you've just downloaded.
+5. Restart Grafana.
+
+## Data source permissions
+
+Your current data source permissions will keep working as expected, but you'll be unable to add new data source permissions until the license has been renewed.
+
+## LDAP authentication
+
+* LDAP synchronization is not affected by an expired license.
+* Enhanced LDAP debugging is unavailable.
+
+## SAML authentication
+
+SAML authentication is not affected by an expired license.
+
+## Reporting
+
+* You're unable to configure new reports or generate previews.
+* Scheduled reports are not generated or sent.
+
+## Enterprise plugins
+
+Enterprise plugins might stop working.
+
+## White labeling
+
+The white labeling feature is turned off, meaning that any white labeling options will not have any effect.

docs/sources/enterprise/reporting.md

@@ -0,0 +1,64 @@
++++
+title = "Reporting"
+description = ""
+keywords = ["grafana", "reporting"]
+type = "docs"
+aliases = ["/docs/grafana/latest/administration/reports"]
+[menu.docs]
+parent = "enterprise"
+weight = 400
++++
+
+# Reporting
+
+Reporting allows you to automatically generate PDFs from any of your dashboards and have Grafana email them to interested parties on a schedule.
+
+> Only available in Grafana Enterprise v6.4+.
+
+{{< docs-imagebox img="/img/docs/enterprise/reports_list.png" max-width="500px" class="docs-image--no-shadow" >}}
+
+Any changes you make to a dashboard used in a report are reflected the next time the report is sent. For example, if you change the time range in the dashboard, then the time range in the report changes as well.
+
+## Requirements
+
+* SMTP must be configured for reports to be sent. Refer to [SMTP]({{< relref "../installation/configuration.md#smtp" >}}) in [Configuration]({{< relref "../installation/configuration.md" >}}) for more information.
+* The Image Renderer plugin must be installed or the remote rendering service must be set up. Refer to [Image rendering]({{< relref "../administration/image_rendering.md" >}}) for more information.
+
+## Create or update a report
+
+Currently only Organization Admins can create reports.
+
+1. Click on the reports icon in the side menu. The Reports tab allows you to view, create, and update your reports.
+1. Enter report information. All fields are required unless otherwise indicated.
+   * **Name -** Name of the report as you want it to appear in the Reports list.
+   * **Choose dashboard -** Select the dashboard to generate the report from.
+   * **Recipients -** Enter the emails of the people or teams that you want to receive the report.
+   * **Reply to -** (optional) The address that will appear in the **Reply to** field of the email. 
+   * **Custom message -** (optional) Message body in the email with the report.
+1. **Preview** the report to make sure it appears as you expect. Update if necessary
+1. Select the layout option for generated report: **Portrait** or **Landscape**.  
+1. Enter scheduling information. Options vary depending on the frequency you select.
+1. **Save** the report.
+
+{{< docs-imagebox img="/img/docs/enterprise/reports_create_new.png" max-width="500px" class="docs-image--no-shadow" >}}
+
+## Rendering configuration
+
+When Grafana generates a report, it will render each panel separately and then put them together in a PDF file. You can configure the per-panel rendering request timeout and the maximum number of concurrent calls to the rendering service. These options are available in the [configuration]({{< relref "../installation/configuration.md">}}) file.
+
+```ini
+[reporting]
+# Set timeout for each panel rendering request
+rendering_timeout = 10s
+# Set maximum number of concurrent calls to the rendering service
+concurrent_render_limit = 4
+```
+
+## Troubleshoot reporting
+
+To troubleshoot and get more log information, enable debug logging in the configuration file. Refer to [Configuration]({{< relref "../installation/configuration.md#filters" >}}) for more information.
+
+```bash
+[log]
+filters = report:debug
+```

docs/sources/enterprise/saml.md

@@ -0,0 +1,134 @@
++++
+title = "SAML Authentication"
+description = "Grafana SAML Authentication"
+keywords = ["grafana", "saml", "documentation", "saml-auth"]
+aliases = ["/docs/grafana/latest/auth/saml/"]
+type = "docs"
+[menu.docs]
+name = "SAML"
+parent = "authentication"
+weight = 500
++++
+
+# SAML authentication
+
+SAML authentication integration allows your Grafana users to log in by using an external SAML 2.0 Identity Provider (IdP). To enable this, Grafana becomes a Service Provider (SP) in the authentication flow, interacting with the IdP to exchange user information.
+
+The SAML single-sign-on (SSO) standard is varied and flexible. Our implementation contains the subset of features needed to provide a smooth authentication experience into Grafana.
+
+> Only available in Grafana Enterprise v6.3+. If you encounter any problems with our implementation, please don't hesitate to contact us.
+
+## Supported SAML
+
+Grafana supports the following SAML 2.0 bindings:
+
+* From the Service Provider (SP) to the Identity Provider (IdP):
+  - `HTTP-POST` binding
+  - `HTTP-Redirect` binding
+
+* From the Identity Provider (IdP) to the Service Provider (SP):
+  - `HTTP-POST` binding
+
+In terms of security:
+* Grafana supports signed and encrypted assertions. 
+* Grafana does not support signed or encrypted requests.
+
+In terms of initiation: 
+* Grafana supports SP-initiated requests.
+* Grafana does not support IdP-initiated request.
+
+## Set up SAML authentication
+
+The table below describes all SAML configuration options. Continue reading below for details on specific options. Like any other Grafana configuration, you can apply these options as [environment variables]({{< relref "../installation/configuration.md#configure-with-environment-variables" >}}).
+
+| Setting                                                     | Required | Description                                                                                        | Default       |
+| ----------------------------------------------------------- | -------- | -------------------------------------------------------------------------------------------------- | ------------- |
+| `enabled`                                                   | No       | Whether SAML authentication is allowed                                                             | `false`       |
+| `certificate` or `certificate_path`                         | Yes      | Base64-encoded string or Path for the SP X.509 certificate                                         |               |
+| `private_key` or `private_key_path`                         | Yes      | Base64-encoded string or Path for the SP private key                                               |               |
+| `idp_metadata`, `idp_metadata_path`, or `idp_metadata_url` | Yes      | Base64-encoded string, Path or URL for the IdP SAML metadata XML                                   |               |
+| `max_issue_delay`                                           | No       | Duration, since the IdP issued a response and the SP is allowed to process it                      | `90s`         |
+| `metadata_valid_duration`                                   | No       | Duration, for how long the SP metadata is valid                                                  | `48h`         |
+| `assertion_attribute_name`                                  | No       | Friendly name or name of the attribute within the SAML assertion to use as the user name         | `displayName` |
+| `assertion_attribute_login`                                 | No       | Friendly name or name of the attribute within the SAML assertion to use as the user login handle | `mail`        |
+| `assertion_attribute_email`                                 | No       | Friendly name or name of the attribute within the SAML assertion to use as the user email        | `mail`        |
+
+### Enable SAML authentication
+
+To use the SAML integration, in the `auth.saml` section of in the Grafana custom configuration file, set `enabled` to `true`. 
+
+Refer to [Configuration]({{< relref "../installation/configuration.md" >}}) for more information about configuring Grafana.
+
+### Certificate and private key
+
+The SAML SSO standard uses asymmetric encryption to exchange information between the SP (Grafana) and the IdP. To perform such encryption, you need a public part and a private part. In this case, the X.509 certificate provides the public part, while the private key provides the private part.
+
+Grafana supports two ways of specifying both the `certificate` and `private_key`. 
+* Without a suffix (`certificate` or `private_key`), the configuration assumes you've supplied the base64-encoded file contents. 
+* With the `_path` suffix (`certificate_path` or `private_key_path`), then Grafana treats the value entered as a file path and attempt to read the file from the file system.
+
+You can only use one form of each configuration option. Using multiple forms, such as both `certificate` and `certificate_path`, results in an error.
+
+### IdP metadata
+
+You also need to define the public part of the IdP for message verification. The SAML IdP metadata XML defines where and how Grafana exchanges user information.
+
+Grafana supports three ways of specifying the IdP metadata. 
+* Without a suffix `idp_metadata`, Grafana assumes base64-encoded XML file contents.
+* With the `_path` suffix, Grafana assumes a file path and attempts to read the file from the file system.
+* With the `_url` suffix, Grafana assumes a URL and attempts to load the metadata from the given location.
+
+### Maximum issue delay
+
+Prevents SAML response replay attacks and internal clock skews between the SP (Grafana) and the IdP. You can set a maximum amount of time between the IdP issuing a response and the SP (Grafana) processing it.
+
+The configuration options is specified as a duration, such as `max_issue_delay = 90s` or `max_issue_delay = 1h`.
+
+### Metadata valid duration
+
+SP metadata is likely to expire at some point, perhaps due to a certificate rotation or change of location binding. Grafana allows you to specify for how long the metadata should be valid. Leveraging the `validUntil` field, you can tell consumers until when your metadata is going to be valid. The duration is computed by adding the duration to the current time.
+
+The configuration option is specified as a duration, such as `metadata_valid_duration = 48h`.
+
+### Identity provider (IdP) registration
+
+For the SAML integration to work correctly, you need to make the IdP aware of the SP.
+
+The integration provides two key endpoints as part of Grafana:
+
+* The `/saml/metadata` endpoint, which contains the SP metadata. You can either download and upload it manually, or youmake the IdP request it directly from the endpoint. Some providers name it Identifier or Entity ID.
+* The `/saml/acs` endpoint, which is intended to receive the ACS (Assertion Customer Service) callback. Some providers name it SSO URL or Reply URL.
+
+### Assertion mapping
+
+During the SAML SSO authentication flow, Grafana receives the ACS callback. The callback contains all the relevant information of the user under authentication embedded in the SAML response. Grafana parses the response to create (or update) the user within its internal database.
+
+For Grafana to map the user information, it looks at the individual attributes within the assertion. You can think of these attributes as Key/Value pairs (although, they contain more information than that).
+
+Grafana provides configuration options that let you modify which keys to look at for these values. The data we need to create the user in Grafana is Name, Login handle, and email.
+
+An example is `assertion_attribute_name = "givenName"` where Grafana looks within the assertion for an attribute with a friendly name or name of `givenName`. Both, the friendly name (e.g. `givenName`) or the name (e.g. `urn:oid:2.5.4.42`) can be used interchangeably as the value for the configuration option.
+
+## Example SAML configuration
+
+```bash
+[auth.saml]
+enabled = true
+certificate_path = "/path/to/certificate.cert"
+private_key_path = "/path/to/private_key.pem"
+metadata_path = "/my/metadata.xml"
+max_issue_delay = 90s
+metadata_valid_duration = 48h
+assertion_attribute_name = displayName
+assertion_attribute_login = mail
+assertion_attribute_email = mail
+```
+
+## Troubleshoot SAML authentication
+
+To troubleshoot and get more log information, enable SAML debug logging in the configuration file. Refer to [Configuration]({{< relref "../installation/configuration.md#filters" >}}) for more information.
+
+```bash
+[log]
+filters = saml.auth:debug
+```

docs/sources/enterprise/team-sync.md

@@ -0,0 +1,52 @@
++++
+title = "Team sync"
+description = "Grafana Team Sync"
+keywords = ["grafana", "auth", "documentation"]
+aliases = ["/docs/grafana/latest/auth/saml/"]
+type = "docs"
+[menu.docs]
+name = "Team sync"
+parent = "enterprise"
+weight = 600
++++
+
+# Team sync
+
+{{< docs-imagebox img="/img/docs/enterprise/team_members_ldap.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" >}}
+
+Team sync lets you set up synchronization between your auth providers teams and teams in Grafana. This enables LDAP or GitHub OAuth users who are members
+of certain teams or groups to automatically be added or removed as members of certain teams in Grafana.
+
+> Only available in Grafana Enterprise.
+
+Grafana keeps track of all synchronized users in teams, and you can see which users have been synchronized in the team members list, see `LDAP` label in screenshot.
+This mechanism allows Grafana to remove an existing synchronized user from a team when its group membership changes. This mechanism also enables you to manually add a user as member of a team, and it will not be removed when the user signs in. This gives you flexibility to combine LDAP group memberships and Grafana team memberships.
+
+> Currently the synchronization only happens when a user logs in, unless LDAP is used with the active background synchronization that was added in Grafana 6.3.
+
+<div class="clearfix"></div>
+
+## Synchronize a Grafana team with an external group
+
+If you have already grouped some users into a team, then you can synchronize that team with an external group.
+
+{{< docs-imagebox img="/img/docs/enterprise/team_add_external_group.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" >}}
+
+1. In Grafana, navigate to **Configuration > Teams**.
+1. Select a team.
+1. On the External group sync tab, and click **Add group**.
+1. Insert the value of the group you want to sync with. This becomes the Grafana `GroupID`.
+   Examples:
+
+    - For LDAP, this is the LDAP distinguished name (DN) of LDAP group you want to synchronize with the team.
+    - For Auth Proxy, this is the value we receive as part of the custom `Groups` header.
+
+1. Click `Add group` to save.
+
+## Supported providers
+
+* [Auth Proxy]({{< relref "../auth/auth-proxy.md#team-sync-enterprise-only">}})
+* [Azure AD]({{< relref "../auth/azuread.md#team-sync-enterprise-only" >}})
+* [GitHub OAuth]({{< relref "../auth/github.md#team-sync-enterprise-only" >}})
+* [GitLab OAuth]({{< relref "../auth/gitlab.md#team-sync-enterprise-only" >}})
+* [LDAP]({{< relref "enhanced_ldap.md#ldap-group-synchronization-for-teams" >}})

docs/sources/enterprise/white-labeling.md

@@ -0,0 +1,77 @@
++++
+title = "White-labeling"
+description = "White-labeling"
+keywords = ["grafana", "white-labeling", "enterprise"]
+aliases = ["/docs/grafana/latest/enterprise/white-labeling/"]
+type = "docs"
+[menu.docs]
+name = "White-labeling"
+parent = "enterprise"
+weight = 700
++++
+
+# White labeling
+
+White labeling allows you to replace the Grafana brand and logo with your own corporate brand and logo.
+
+> Only available in Grafana Enterprise v6.6+.
+
+Grafana Enterprise has white labeling options in the `grafana.ini` file. As with all configuration options, you can also be set set them with environment variables.
+
+You can change the following elements:
+
+- Application title
+- Login background
+- Login logo
+- Side menu top logo
+- Footer and help menu links
+- Fav icon (shown in browser tab)
+
+> You will have to host your logo and other images used by the white labeling feature separately. Make sure Grafana can access the URL where the assets are stored.
+
+{{< docs-imagebox img="/img/docs/v66/whitelabeling_1.png" max-width="800px" caption="White labeling example" >}}
+
+The configuration file in Grafana Enterprise contains the following options. Each option is defined in the file. For more information about configuring Grafana, refer to [Configuration]({{< relref "../installation/configuration.md">}}).
+
+```ini
+# Enterprise only
+[white_labeling]
+# Set to your company name to override application title
+;app_title =
+
+# Set to complete URL to override login logo
+;login_logo =
+
+# Set to complete css background expression to override login background
+# example: login_background = url(http://www.bhmpics.com/wallpapers/starfield-1920x1080.jpg)
+;login_background =
+
+# Set to complete URL to override menu logo
+;menu_logo =
+
+# Set to complete URL to override fav icon (icon shown in browser tab)
+;fav_icon =
+
+# Set to complete URL to override apple/ios icon
+;apple_touch_icon =
+```
+
+Below is an example for how to replace the default footer and help links with two custom links.
+
+```ini
+footer_links = support guides
+footer_links_support_text = Support
+footer_links_support_url = http://your.support.site
+footer_links_guides_text = Guides
+footer_links_guides_url = http://your.guides.site
+```
+
+Here is the same example using environment variables instead of the custom.ini or grafana.ini file.
+
+```
+GF_WHITE_LABELING_FOOTER_LINKS=support guides
+GF_WHITE_LABELING_FOOTER_LINKS_SUPPORT_TEXT=Support
+GF_WHITE_LABELING_FOOTER_LINKS_SUPPORT_URL=http://your.support.site
+GF_WHITE_LABELING_FOOTER_LINKS_GUIDES_TEXT=Guides
+GF_WHITE_LABELING_FOOTER_LINKS_GUIDES_URL=http://your.guides.site 
+```

docs/sources/features/_index.md

@@ -1,6 +1,6 @@
 +++
-title = "Beginner Guides"
-description = "Beginner guides"
+title = "Features"
+description = "List of features"
 type = "docs"
 [menu.docs]
 name = "Features"

docs/sources/features/dashboard/dashboards.md

@@ -0,0 +1,64 @@
++++
+title = "Dashboard overview"
+type = "docs"
+[menu.docs]
+identifier = "dashboards"
+parent = "features"
+weight = 1
++++
+
+# Dashboard overview
+
+A *dashboard* is a set of one or more panels organized and arranged into one or more rows. Grafana ships with a variety of Panels. Grafana makes it easy to construct the right queries, and customize the display properties so that you can create the perfect dashboard for your need. Each panel can interact with data from any configured Grafana Data Source (currently Graphite, Prometheus, Elasticsearch, InfluxDB, OpenTSDB, MySQL, PostgreSQL, Microsoft SQL Server and AWS Cloudwatch).
+
+## Dashboard UI
+
+<img src="/img/docs/v50/dashboard_annotated.png" class="no-shadow" width="700px">
+
+1. Zoom out time range
+2. Time picker dropdown. Here you can access relative time range options, auto refresh options and set custom absolute time ranges.
+3. Manual refresh button. Will cause all panels to refresh (fetch new data).
+4. Dashboard panel. Click the panel title to edit panels.
+5. Graph legend. You can change series colors, y-axis and series visibility directly from the legend.
+
+## Dashboard header
+
+Click the new Dashboard link on the right side of the Dashboard picker. You now have a blank Dashboard.
+
+<img class="no-shadow" src="/img/docs/v50/top_nav_annotated.png" width="580px">
+
+The image above shows you the top header for a Dashboard.
+
+1. Side menubar toggle: This toggles the side menu, allowing you to focus on the data presented in the dashboard. The side menu provides access to features unrelated to a Dashboard such as Users, Organizations, and Data Sources.
+2. Dashboard dropdown: This dropdown shows you which Dashboard you are currently viewing, and allows you to easily switch to a new Dashboard. From here you can also create a new Dashboard or folder, import existing Dashboards, and manage Dashboard playlists.
+3. Add Panel: Adds a new panel to the current Dashboard
+4. Star Dashboard: Star (or unstar) the current Dashboard. Starred Dashboards will show up on your own Home Dashboard by default, and are a convenient way to mark Dashboards that you're interested in.
+5. Share Dashboard: Share the current dashboard by creating a link or create a static Snapshot of it. Make sure the Dashboard is saved before sharing.
+6. Save dashboard: The current Dashboard will be saved with the current Dashboard name.
+7. Settings: Manage Dashboard settings and features such as Templating and Annotations.
+
+## Manage dashboards
+
+The time period for the dashboard can be controlled by the [Time range controls]({{< relref "../../reference/timerange.md" >}}) in the upper right of the dashboard.
+
+Dashboards can use [templating]({{< relref "../../reference/templating.md" >}}) to make them more dynamic and interactive.
+
+Dashboards can use [annotations]({{< relref "../../reference/annotations.md" >}}) to display event data across panels. This can help correlate the time series data in the panel with other events.
+
+Dashboards can be [shared]({{< relref "../../reference/share_dashboard.md" >}}) easily in a variety of ways.
+
+Dashboards can be tagged, and the dashboard picker provides quick, searchable access to all dashboards in a particular organization.
+
+## Rows
+
+A *row* is a logical divider within a dashboard. It is used to group panels together.
+
+Rows are always 12 “units” wide. These units are automatically scaled dependent on the horizontal resolution of your browser. You can control the relative width of panels within a row by setting their specific width.
+
+We use a unit abstraction so that Grafana looks great on all screens sizes.
+
+ > Note: With MaxDataPoint functionality, Grafana can show you the perfect number of data points, regardless of resolution or time range.
+
+Collapse a row by clicking on the row title. If you save a dashboard with a row collapsed, then it saves in that state and does not load those graphs until you expand the row.
+
+Use the [repeating rows]({{< relref "../../reference/templating.md#repeating-rows" >}}) functionality to dynamically create or remove entire rows, which can be filled with panels, based on the template variables selected.

docs/sources/features/datasources/_index.md

@@ -38,4 +38,4 @@ The following data sources are officially supported:
 
 ## Data source plugins
 
-Since Grafana 3.0 you can install data sources as plugins. Check out [Grafana.net](https://grafana.com/plugins) for more data sources.
+Since Grafana 3.0 you can install data sources as plugins. Check out [Grafana.com/plugins](https://grafana.com/plugins) for more data sources.

docs/sources/features/datasources/add-a-data-source.md

@@ -0,0 +1,31 @@
++++
+title = "Add a data source"
+type = "docs"
+[menu.docs]
+name = "Add a data source"
+identifier = "add_data_source"
+parent = "features"
+weight = 2
++++
+
+# Add a data source
+
+Before you create your first dashboard, you need to add your data source. Following are the list of instructions to create one.
+
+> Only users with the Admin role can add data sources.
+
+1. Move your cursor to the cog on the side menu which will show you the configuration menu. If the side menu is not visible click the Grafana icon in the upper left corner. Click on **Configuration** > **Data Sources** in the side menu and you'll be taken to the data sources page
+   where you can add and edit data sources. You can also click the cog.
+{{< docs-imagebox img="/img/docs/v52/sidemenu-datasource.png" max-width="250px" class="docs-image--no-shadow">}}
+
+1. Click **Add data source** and you will come to the settings page of your new data source.
+
+    {{< docs-imagebox img="/img/docs/v52/add-datasource.png" max-width="700px" class="docs-image--no-shadow">}}
+
+1. In the **Name** box, enter a name for this data source. 
+
+    {{< docs-imagebox img="/img/docs/v52/datasource-settings.png" max-width="700px" class="docs-image--no-shadow">}}
+
+1. In the **Type**, select the type of data source. See [Supported data sources]({{< relref "../../features/datasources/#supported-data-sources/" >}}) for more information and how to configure your data source settings.
+
+1. Click **Save & Test**.

docs/sources/features/datasources/azuremonitor.md

@@ -117,7 +117,7 @@ Azure Monitor Examples:
 
 ### Templating with Variables for the Azure Monitor Service
 
-Instead of hard-coding things like server, application and sensor name in you metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns makes it easy to change the data being displayed in your dashboard.
+Instead of hard-coding things like server, application and sensor name in your metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard.
 
 Note that the Azure Monitor service does not support multiple values yet. If you want to visualize multiple time series (for example, metrics for server1 and server2) then you have to add multiple queries to able to view them on the same graph or in the same table.
 
@@ -274,6 +274,45 @@ There are also some Grafana variables that can be used in Azure Log Analytics qu
 
 - `$__interval` - Grafana calculates the minimum time grain that can be used to group by time in queries. More details on how it works [here]({{< relref "../../reference/templating.md#interval-variables" >}}). It returns a time grain like `5m` or `1h` that can be used in the bin function. E.g. `summarize count() by bin(TimeGenerated, $__interval)`
 
+### Templating with Variables for Azure Log Analytics
+
+Any Log Analytics query that returns a list of values can be used in the `Query` field in the Variable edit view. There is also one Grafana function for Log Analytics that returns a list of workspaces.
+
+Refer to the [Variables]({{< relref "../../reference/templating.md" >}}) documentation for an introduction to the templating feature and the different
+types of template variables.
+
+| Name                                               | Description                                                                                            |
+| -------------------------------------------------- | ------------------------------------------------------------------------------------------------------ |
+| _workspaces()_                                     | Returns a list of workspaces for the default subscription.                                             |
+| _workspaces(12345678-aaaa-bbbb-cccc-123456789aaa)_ | Returns a list of workspaces for the specified subscription (the parameter can be quoted or unquoted). |
+
+Example variable queries:
+
+<!-- prettier-ignore-start -->
+| Query                                                                                   | Description                                               |
+| --------------------------------------------------------------------------------------- | --------------------------------------------------------- |
+| _subscriptions()_                                                                       | Returns a list of Azure subscriptions                     |
+| _workspaces()_                                                                          | Returns a list of workspaces for default subscription     |
+| _workspaces("12345678-aaaa-bbbb-cccc-123456789aaa")_                                    | Returns a list of workspaces for a specified subscription |
+| _workspaces("$subscription")_                                                           | With template variable for the subscription parameter     |
+| _workspace("myWorkspace").Heartbeat \| distinct Computer_                               | Returns a list of Virtual Machines                        |
+| _workspace("$workspace").Heartbeat \| distinct Computer_                                | Returns a list of Virtual Machines with template variable |
+| _workspace("$workspace").Perf \| distinct ObjectName_                                   | Returns a list of objects from the Perf table             |
+| _workspace("$workspace").Perf \| where ObjectName == "$object" \| distinct CounterName_ | Returns a list of metric names from the Perf table        |
+
+<!-- prettier-ignore-end -->
+
+Example of a time series query using variables:
+
+```
+Perf
+| where ObjectName == "$object" and CounterName == "$metric"
+| where TimeGenerated >= $__timeFrom() and TimeGenerated <= $__timeTo()
+| where  $__contains(Computer, $computer)
+| summarize avg(CounterValue) by bin(TimeGenerated, $__interval), Computer
+| order by TimeGenerated asc
+```
+
 ### Azure Log Analytics Alerting
 
 Not implemented yet.
@@ -293,3 +332,34 @@ There are some important caveats to remember:
 - Currently, four default dashboard variables are supported: `$__timeFilter()`, `$__from`, `$__to`, and `$__interval`. If you're searching in timestamped data, replace the beginning of your where clause to `where $__timeFilter()`. Dashboard changes by time region are handled as you'd expect, as long as you leave the name of the `timestamp` column alone. Likewise, `$__interval` will automatically change based on the dashboard's time region _and_ the width of the chart being displayed. Use it in bins, so `bin(timestamp,$__interval)` changes into something like `bin(timestamp,1s)`. Use `$__from` and `$__to` if you just want the formatted dates to be inserted.
 
 - Templated dashboard variables are not yet supported! They will come in a future version.
+
+## Configure the data source with provisioning
+
+It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../../administration/provisioning/#datasources" >}})
+
+Here are some provisioning examples for this data source.
+
+```yaml
+# config file version
+apiVersion: 1
+
+datasources:
+  - name: Azure Monitor
+    type: grafana-azure-monitor-datasource
+    access: proxy
+    jsonData:
+      appInsightsAppId: <app-insights-app-id>
+      clientId: <client-id>
+      cloudName: azuremonitor
+      subscriptionId: <subscription-id>
+      tenantId: <tenant-id>
+      logAnalyticsClientId: <log-analytics-client-id>
+      logAnalyticsDefaultWorkspace: <log-analytics-default-workspace>
+      logAnalyticsSubscriptionId: <log-analytics-subscription-id>
+      logAnalyticsTenantId: <log-analytics-tenant-id>
+    secureJsonData:
+      clientSecret: <client-secret>
+      appInsightsApiKey: <app-insights-api-key>
+      logAnalyticsClientSecret: <log-analytics-client-secret>
+    version: 1
+```