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"]
 ]

.github/CODEOWNERS

@@ -14,8 +14,10 @@
 # Documentation owner: Diana Payton
 /docs/ @oddlittlebird
 /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
+go.sum @grafana/backend-platform

.gitignore

@@ -11,8 +11,10 @@ awsconfig
 /public/views/error.html
 /emails/dist
 /reports
+/e2e/tmp
 .yarnrc
 .yarn/
+vendor/
 
 # Enterprise emails
 /emails/templates/enterprise_*
@@ -83,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
@@ -103,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 .eslintrc .editorconfig .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 .eslintrc .editorconfig .browserslistrc ./
+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:19.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

@@ -23,6 +23,10 @@
     "extractorMessageReporting": {
       "default": {
         "logLevel": "warning"
+      },
+      "ae-internal-missing-underscore": {
+        "logLevel": "none",
+        "addToApiReportFile": false
       }
     },
     "tsdocMessageReporting": {

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,9 +230,9 @@ 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 not set/unrestricted.
+# 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 =
+min_refresh_interval = 5s
 
 #################################### Users ###############################
 [users]
@@ -298,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
 
@@ -383,6 +386,21 @@ 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
@@ -405,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
@@ -706,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
@@ -716,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,9 +229,9 @@
 # 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 not set/unrestricted.
+# 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 =
+;min_refresh_interval = 5s
 
 #################################### Users ###############################
 [users]
@@ -297,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
 
@@ -373,6 +376,21 @@
 ;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
@@ -395,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
@@ -696,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.
@@ -705,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/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/documentation-style-guide.md

@@ -4,6 +4,8 @@ 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.
@@ -139,6 +141,10 @@ 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.

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,17 +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. 
+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/storybook.md

@@ -10,7 +10,7 @@ Storybook is:
 
 ## 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`.
+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
 
@@ -101,7 +101,10 @@ import { MyComponent } from "./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. Something that is required when the MDX file has no relation to a component is a `Meta` tag that says where in the hierarchy the component will live. It can look like this:
+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"/>

contribute/templates/README.md

@@ -23,7 +23,7 @@ Try to *chunk* your content. This means you should organize the document so that
 
 ### Chunking example
 
-If I was writing a topic called *Doggie handbook*, I might organize it like this. 
+If I was writing content for a site called *Doggie handbook*, I might organize it like this. 
 
 **Concept**
 * What a dog is

contribute/templates/doc-task-template.md

@@ -26,7 +26,7 @@ In the case of a long task, then you probably won't need any headings except for
 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 quite the program.
+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.

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/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/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/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,12 +1,9 @@
-.PHONY: docs docs-no-pull docs-test
+.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 && make docs-menu && hugo server -p 3002 -D --ignoreCache --baseUrl http://localhost:3002 --bind 0.0.0.0'
-
-docs-no-pull:
-	docker run -v $(PWD)/sources:/hugo/content/docs/grafana/latest -p 3002:3002 --rm -it grafana/docs-base:latest /bin/bash -c 'make docs-menu && 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,24 +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>
 
-<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>
@@ -63,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

docs/sources/administration/image_rendering.md

@@ -10,11 +10,11 @@ weight = 8
 
 # Image rendering
 
-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" >}}).
+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 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 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.
+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.
 
 You can also render a PNG by clicking the dropdown arrow next to a panel title, then clicking **Share > Direct link rendered image**.
 
@@ -22,7 +22,7 @@ You can also render a PNG by clicking the dropdown arrow next to a panel title,
 
 Minimum free memory recommendation is 16GB on the system doing the rendering.
 
-Rendering images can require a lot of memory, mainly because Grafama 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.
+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.
 
 ## Alerting and render limits
 
@@ -36,9 +36,9 @@ To install the plugin, refer to the [Grafana Image Renderer Installation instruc
 
 ## Run in custom Grafana Docker image
 
- We recommend setting up another Docker container for rendering and using remote rendering. Refer to [Remote rendering service](#remote-rendering-service) for instructions.
+ We recommend setting up another Docker container for rendering and using remote rendering. Refer to [Remote rendering service]({{< relref "#remote-rendering-service" >}}) for instructions.
 
-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, refer to [Build with Grafana Image Renderer plugin pre-installed]({{< relref "../installation/docker/#build-with-grafana-image-renderer-plugin-pre-installed" >}}).
 
 ## Remote rendering service
 
@@ -108,7 +108,7 @@ The following example describes how to build and run the remote HTTP rendering s
 
 ## PhantomJS
 
-> PhantomJS is deprecated since Grafana v6.4 and will be removed in a future release. Please migrate to the Grafana Image Renderer plugin or remote rendering service.
+> Starting from Grafana v7.0.0, all PhantomJS support has been removed. Please use the Grafana Image Renderer plugin or remote rendering service.
 
 ## Troubleshoot image rendering
 

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,7 +255,7 @@ 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
@@ -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.
 
@@ -398,6 +403,8 @@ The following sections detail the supported settings for each alert notification
 | Name |
 | ---- |
 | url |
+| basicAuthUser |
+| basicAuthPassword |
 
 #### Alert notification `teams`
 
@@ -415,6 +422,7 @@ The following sections detail the supported settings for each alert notification
 
 | Name |
 | ---- |
+| singleEmail |
 | addresses |
 
 #### Alert notification `hipchat`
@@ -463,4 +471,3 @@ The following sections detail the supported settings for each alert notification
 | Name |
 | ---- |
 | url |
-

docs/sources/alerting/metrics.md

@@ -11,7 +11,7 @@ weight = 2
 
 # Metrics from the alert engine
 
-The alert engine publishes some internal metrics about itself. You can read more about how Grafana publishes [internal metrics]({{ < "../administration/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,14 +71,19 @@ 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 Slack webhook URL. You can follow 
-[their guide](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 
+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
@@ -97,7 +102,7 @@ If you are using the token for a slack bot, then you have to invite the bot to t
 
 ### 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
 ---------- | -----------
@@ -105,7 +110,7 @@ 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 `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 they will be transposed to the root of the event sent to Pagerduty.  This means they will be available within the Pagerduty UI and Filtering tools.
+**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
 
@@ -198,15 +203,14 @@ 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 
+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
@@ -216,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+.
 
@@ -226,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.

docs/sources/auth/azuread.md

@@ -12,6 +12,8 @@ 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
@@ -120,6 +122,12 @@ only give access to members of the group `example` which has Id `8bab1c86-8fba-3
 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
@@ -131,7 +139,7 @@ allowed_domains = mycompany.com mycompany.org
 >  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. 
+the correct teams.
 
 Azure AD groups can be referenced by group Object Id, like `8bab1c86-8fba-33e5-2089-1d1c80ec267d`.
 

docs/sources/auth/generic-oauth.md

@@ -54,24 +54,6 @@ Check for the presence of a role using the [JMESPath](http://jmespath.org/exampl
 
 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
@@ -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.

docs/sources/auth/ldap.md

@@ -92,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+

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/enterprise/_index.md

@@ -6,75 +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
-
-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" >}})
-* [GitLab OAuth]({{< relref "../auth/gitlab.md#team-sync-enterprise-only" >}})
-* [Auth Proxy]({{< relref "../auth/auth-proxy.md#team-sync-enterprise-only">}})
-
-### White labeling
-
-White labeling makes it possible to customize the logos and footer links of Grafana. [Learn More]({{< relref "white-labeling.md" >}}).
+## Enhanced security features
 
+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.
 
@@ -85,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

@@ -7,31 +7,29 @@ type = "docs"
 name = "Datasource"
 identifier = "datasource-permissions"
 parent = "enterprise"
-weight = 4
+weight = 200
 +++
 
 # Data source permissions
 
-> Only available in Grafana Enterprise.
-
 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**.
 
-## Restricting Access - Enable Permissions
+> 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, permissions are disabled for data sources and a data source in an organization can be queried by any user in
-that organization. For example a user with `Viewer` role can still issue any possible query to a data source, not just
-those queries that exist on dashboards he/she has access to.
+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 will restrict admin and query access for that
-data source to [admin users]({{< relref "../permissions/organization_roles/#admin-role" >}}) in that organization.
+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.
 
-**To enable permissions for a data source:**
+**Enable permissions for a data source:**
 
-1. Navigate to Configuration / Data Sources.
+1. Navigate to **Configuration > Data Sources**.
 2. Select the data source you want to enable permissions for.
-3. Select the Permissions tab and click on the `Enable` button.
+3. On the Permissions tab, click **Enable**.
 
 <div class="clearfix"></div>
 
@@ -39,31 +37,30 @@ data source to [admin users]({{< relref "../permissions/organization_roles/#admi
 
 {{< 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](#restricting-access-enable-permissions) for a data source you can assign query
-permissions to users and teams which will allow access to query the data source.
+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.
+1. Navigate to **Configuration > Data Sources**.
 2. Select the data source you want to assign query permissions for.
-3. Select the Permissions tab.
-4. click on the `Add Permission` button.
-5. Select Team/User and find the team/user you want to allow query access and click on the `Save` button.
+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>
 
-## Restore Default Access - Disable Permissions
+## 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, i.e.
-data source can be queried by any user in that organization, you can disable permissions with a click of a button.
-Note that all existing permissions created for data source will be deleted.
+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.
+1. Navigate to **Configuration > Data Sources**.
 2. Select the data source you want to disable permissions for.
-3. Select the Permissions tab and click on the `Disable Permissions` button.
+3. On the Permissions tab, click **Disable Permissions**.
 
 <div class="clearfix"></div>

docs/sources/enterprise/enhanced_ldap.md

@@ -7,40 +7,39 @@ type = "docs"
 name = "Enhanced LDAP"
 identifier = "enhanced-ldap"
 parent = "enterprise"
-weight = 3
+weight = 300
 +++
 
 # Enhanced LDAP integration
 
-> Only available in Grafana Enterprise.
+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.
 
-The enhanced LDAP integration adds additional functionality on top of the existing [LDAP integration]({{< relref "../auth/ldap.md" >}}).
+> Enhanced LDAP integration is only available in Grafana Enterprise.
 
-## LDAP Group Synchronization for Teams
+## 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 v6.3 (or later) is used with active background synchronization enabled.
+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 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.
+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">}})
+[Learn more about team sync.]({{< relref "team-sync.md">}})
 
 <div class="clearfix"></div>
 
-## Active LDAP Synchronization
+## Active LDAP synchronization
 
-> Only available in Grafana Enterprise v6.3+
+In the open source version of Grafana, user data from LDAP is synchronized only during the login process when authenticating using LDAP.
 
-In the open source version of Grafana, user data from LDAP will be 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.
 
-With this feature you can configure Grafana to actively sync users with LDAP servers in the background. Only users that have logged into Grafana at least once will be synchronized.
 Users with updated role and team membership will need to refresh the page to get access to the new features.
-Removed users will be automatically logged out and their account disabled. They will be displayed in the Server Admin / Users page with a `disabled` label. Disabled users will keep their custom permissions on dashboards, folders and datasources so if you add them back in your LDAP database, they will have access to the application with the same custom permissions as before.
+
+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]
@@ -61,6 +60,4 @@ sync_cron = "0 0 1 * * *" # This is default value (At 1 am every day)
 active_sync_enabled = true # enabled by default
 ```
 
-### Not compatible with Single Bind
-
-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.
+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

@@ -14,7 +14,7 @@ If your license has expired most of Grafana keeps working as normal. Some enterp
 
 > Replace your license as soon as possible. Running Grafana Enterprise with an expired license is unsupported and can lead to unexpected consequences.
 
-## Replacing your license
+## 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/)
 ```
@@ -31,19 +31,19 @@ The configuration file's location may also be overridden by the `GF_ENTERPRISE_L
 
 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.
 
-## Reporting
+## LDAP authentication
 
-- You're unable to configure new reports or generate previews.
-- Scheduled reports are not generated or sent.
+* LDAP synchronization is not affected by an expired license.
+* Enhanced LDAP debugging is unavailable.
 
 ## SAML authentication
 
-SAML is not affected by an expired license.
+SAML authentication is not affected by an expired license.
 
-## LDAP authentication
+## Reporting
 
-- LDAP synchronization is not affected by an expired license.
-- Enhanced LDAP debugging is unavailable.
+* You're unable to configure new reports or generate previews.
+* Scheduled reports are not generated or sent.
 
 ## Enterprise plugins
 

docs/sources/enterprise/reporting.md

@@ -6,47 +6,59 @@ type = "docs"
 aliases = ["/docs/grafana/latest/administration/reports"]
 [menu.docs]
 parent = "enterprise"
-weight = 8
+weight = 400
 +++
 
 # Reporting
 
-> Only available in Grafana Enterprise v6.4+.
+Reporting allows you to automatically generate PDFs from any of your dashboards and have Grafana email them to interested parties on a schedule.
 
-Reporting allows you to generate PDFs from any of your Dashboards and have them sent out 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" >}}
 
-## Dashboard as a Report
+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.
 
-With Reports there are a few things to keep in mind, most importantly, any changes you make to the Dashboard used in a report will be reflected in the report. If you change the time range in the Dashboard the time range will be the same in the report as well.
+## Requirements
 
-## Setup
+* 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.
 
-> SMTP must be configured for reports to be sent
+## Create or update a report
 
+Currently only Organization Admins can create reports.
 
-### Rendering
-
-> Reporting requires the [rendering plugin]({{< relref "../administration/image_rendering.md#grafana-image-renderer-plugin" >}}).
-
-Reporting with the built-in image rendering is not supported. We recommend installing the image renderer plugin.
-
-## Usage
+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" >}}
 
-Currently only Organisation Admins can create reports. To get to report click on the reports icon in the side menu. This will allow you to list, create and update your reports.
+## Rendering configuration
 
-| Setting       | Description                                                       |
-| --------------|------------------------------------------------------------------ |
-| Name          | name of the Report                                                |
-| Dashboard     | what dashboard to generate the report from                        |
-| Recipients    | emails of the people who will receive this report                 |
-| ReplyTo       | your email address, so that the recipient can respond             |
-| Message       | message body in the email with the report                         |
-| Schedule      | how often do you want the report generated and sent               |
+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.
 
-## Debugging errors
+```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
+```
 
-If you have problems with the reporting feature you can enable debug logging by switching the logger to debug (`filters = report:debug`). Learn more about making configuration changes [here]({{< relref "../installation/configuration.md#filters" >}}).
+## 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

@@ -7,90 +7,109 @@ type = "docs"
 [menu.docs]
 name = "SAML"
 parent = "authentication"
-weight = 5
+weight = 500
 +++
 
 # SAML authentication
 
-> Only available in Grafana Enterprise 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
+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.
 
-> Should you encounter any problems with our implementation, please don't hesitate to contact us.
+> Only available in Grafana Enterprise v6.3+. If you encounter any problems with our implementation, please don't hesitate to contact us.
 
-Grafana supports:
+## Supported SAML
 
-* From the Service Provider (SP) to the Identity Provider (IdP)
+Grafana supports the following SAML 2.0 bindings:
 
-    - `HTTP-POST` binding
-    - `HTTP-Redirect` binding
+* 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)
+* From the Identity Provider (IdP) to the Service Provider (SP):
+  - `HTTP-POST` binding
 
-    - `HTTP-POST` binding
+In terms of security:
+* Grafana supports signed and encrypted assertions. 
+* Grafana does not support signed or encrypted requests.
 
-* In terms of security, we currently support signed and encrypted Assertions. However, signed or encrypted requests are not supported.
-
-* In terms of initiation, only SP-initiated requests are supported. There's no support for IdP-initiated request.
+In terms of initiation: 
+* Grafana supports SP-initiated requests.
+* Grafana does not support 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" >}}).
+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" >}}).
 
-```bash
-[auth.saml]
-# Defaults to false. If true, the feature is enabled
-enabled = true
+| 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`        |
 
-# Base64-encoded public X.509 certificate. Used to sign requests to the IdP
-certificate =
+### Enable SAML authentication
 
-# Path to the public X.509 certificate. Used to sign requests to the IdP
-certificate_path =
+To use the SAML integration, in the `auth.saml` section of in the Grafana custom configuration file, set `enabled` to `true`. 
 
-# Base64-encoded private key. Used to decrypt assertions from the IdP
-private_key =
+Refer to [Configuration]({{< relref "../installation/configuration.md" >}}) for more information about configuring Grafana.
 
-# Path to the private key. Used to decrypt assertions from the IdP
-private_key_path =
+### Certificate and private key
 
-# Base64-encoded IdP SAML metadata XML. Used to verify and obtain binding locations from the IdP
-idp_metadata =
+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.
 
-# Path to the SAML metadata XML. Used to verify and obtain binding locations from the IdP
-idp_metadata_path =
+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.
 
-# URL to fetch SAML IdP metadata. Used to verify and obtain binding locations from the IdP
-idp_metadata_url =
+You can only use one form of each configuration option. Using multiple forms, such as both `certificate` and `certificate_path`, results in an error.
 
-# Duration, since the IdP issued a response and the SP is allowed to process it. Defaults to 90 seconds
-max_issue_delay =
+### IdP metadata
 
-# Duration, for how long the SP's metadata should be valid. Defaults to 48 hours
-metadata_valid_duration =
+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.
 
-# Friendly name or name of the attribute within the SAML assertion to use as the user's name
-assertion_attribute_name = displayName
+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.
 
-# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
-assertion_attribute_login = mail
+### Maximum issue delay
 
-# Friendly name or name of the attribute within the SAML assertion to use as the user's email
-assertion_attribute_email = mail
-```
+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.
 
-Important to note:
+The configuration options is specified as a duration, such as `max_issue_delay = 90s` or `max_issue_delay = 1h`.
 
-- 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
+### Metadata valid duration
 
-## Grafana configuration
+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.
 
-Example working configuration:
+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]
@@ -105,67 +124,9 @@ assertion_attribute_login = mail
 assertion_attribute_email = mail
 ```
 
-Available options:
+## Troubleshoot SAML authentication
 
-| 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" >}}).
+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]

docs/sources/enterprise/team-sync.md

@@ -7,41 +7,46 @@ type = "docs"
 [menu.docs]
 name = "Team sync"
 parent = "enterprise"
-weight = 5
+weight = 600
 +++
 
 # Team sync
 
-> Only available in Grafana Enterprise.
-
 {{< docs-imagebox img="/img/docs/enterprise/team_members_ldap.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" >}}
 
-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.
+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.
 
-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.
+> 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>
 
-### Enable synchronization for a team
+## 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. 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`.
+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:
 
-    - 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.
+    - 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.
 
-5. Click on `Add group` button to save.
+1. Click `Add group` to save.
 
-### Supported Providers
+## Supported providers
 
-* [LDAP]({{< relref "enhanced_ldap.md#ldap-group-synchronization-for-teams" >}})
+* [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" >}})
-* [Auth Proxy]({{< relref "../auth/auth-proxy.md#team-sync-enterprise-only">}})
+* [LDAP]({{< relref "enhanced_ldap.md#ldap-group-synchronization-for-teams" >}})

docs/sources/enterprise/white-labeling.md

@@ -7,27 +7,31 @@ type = "docs"
 [menu.docs]
 name = "White-labeling"
 parent = "enterprise"
-weight = 5
+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+.
 
-{{< docs-imagebox img="/img/docs/v66/whitelabeling_1.png" max-width="800px" caption="White labeling example" >}}
-
-Grafana Enterprise has white labeling options in the `grafana.ini` file (can also be set via ENV variables).
+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
+- Application title
+- Login background
+- Login logo
 - Side menu top logo
-- Footer & Help menu links
+- 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.
+> 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
@@ -50,21 +54,24 @@ You can change the following elements:
 
 # Set to complete URL to override apple/ios icon
 ;apple_touch_icon =
-
-# Below is an example for how to replace the default footer & help links with 2 custom links
-;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
 ```
 
+Below is an example for how to replace the default footer and help links with two custom links.
 
-ENV Variables:
+```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
 ```
-- 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 
+
+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/dashboard/dashboards.md

@@ -18,7 +18,7 @@ A *dashboard* is a set of one or more panels organized and arranged into one or
 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. You edit panels by clicking the panel title.
+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
@@ -30,7 +30,7 @@ Click the new Dashboard link on the right side of the Dashboard picker. You now
 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.
+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.

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
+```

docs/sources/features/datasources/cloudwatch.md

@@ -43,7 +43,7 @@ server is running on AWS you can use IAM Roles and authentication will be handle
 
 See the AWS documentation on [IAM Roles](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html)
 
-> NOTE: AWS Role Switching as described [here](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-cli.html) it not supported at the moment.
+> NOTE: AWS Role Switching as described [here](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-cli.html) is not supported at the moment.
 
 ## IAM Policies
 
@@ -62,6 +62,8 @@ Here is a minimal policy example:
       "Effect": "Allow",
       "Action": [
         "cloudwatch:DescribeAlarmsForMetric",
+        "cloudwatch:DescribeAlarmHistory",
+        "cloudwatch:DescribeAlarms",
         "cloudwatch:ListMetrics",
         "cloudwatch:GetMetricStatistics",
         "cloudwatch:GetMetricData"
@@ -180,7 +182,7 @@ To import the pre-configured dashboards, go to the configuration page of your Cl
 
 ## Templated queries
 
-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 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 make it easy to change the data being displayed in your dashboard.
 
 See the [Templating]({{< relref "../../reference/templating.md" >}}) documentation for an introduction to the templating feature and the different types of template variables.
 

docs/sources/features/datasources/data-sources.md

@@ -11,7 +11,7 @@ weight = 1
 
 # Data sources
 
-Grafana can visualize, explore, and alert on data from many different databases and cloud services. Each database or service type is accessed from a *data source*. 
+Grafana can visualize, explore, and alert on data from many different databases and cloud services. Each database or service type is accessed from a *data source*. Before you can create visualizations in Grafana, you must [add a data source]({{< relref "add-a-data-source.md" >}}).
 
 Each data source has a specific query editor that is customized for the features and capabilities that the particular data source exposes. The query language and capabilities of each data source are obviously very different. You can combine data from multiple data sources into a single dashboard, but each panel is connected to a specific data source that belongs to a particular organization.
 

docs/sources/features/datasources/elasticsearch.md

@@ -116,8 +116,8 @@ Some metric aggregations are called Pipeline aggregations, for example, *Moving
 
 ## Templating
 
-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
+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.
 
 Check out the [Templating]({{< relref "../../reference/templating.md" >}}) documentation for an introduction to the templating feature and the different
@@ -172,7 +172,7 @@ Example dashboard:
 
 ## Annotations
 
-[Annotations]({{< relref "../../reference/annotations.md" >}}) allows you to overlay rich event information on top of graphs. You add annotation
+[Annotations]({{< relref "../../reference/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation
 queries via the Dashboard menu / Annotations view. Grafana can query any Elasticsearch index
 for annotation events.
 

docs/sources/features/datasources/graphite.md

@@ -47,7 +47,7 @@ All requests will be made from the browser directly to the data source and may b
 
 ### Navigate metric segments
 
-Click the ``Select metric`` link to start navigating the metric space. One you start you can continue using the mouse
+Click the ``Select metric`` link to start navigating the metric space. Once you start you can continue using the mouse
 or keyboard arrow keys. You can select a wildcard and still continue.
 
 {{< docs-imagebox img="/img/docs/v45/graphite_query1_still.png"
@@ -87,8 +87,8 @@ this consolidation is done using `avg` function. You can control how Graphite co
 
 ## Templating
 
-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
+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.
 
 Check out the [Templating]({{< relref "../../reference/templating.md" >}}) documentation for an introduction to the templating feature and the different
@@ -132,7 +132,6 @@ TagValues
 tag_values(server, server=~${__searchFilter:regex})
 ```
 
-
 ### Variable Usage
 
 You can use a variable in a metric node path or as a parameter to a function.
@@ -163,12 +162,16 @@ Check out the [Advanced Formatting Options section in the Variables]({{< relref
 
 ## Annotations
 
-[Annotations]({{< relref "../../reference/annotations.md" >}}) allows you to overlay rich event information on top of graphs. You add annotation
+[Annotations]({{< relref "../../reference/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation
 queries via the Dashboard menu / Annotations view.
 
 Graphite supports two ways to query annotations. A regular metric query, for this you use the `Graphite query` textbox. A Graphite events query, use the `Graphite event tags` textbox,
 specify a tag or wildcard (leave empty should also work)
 
+## Getting Grafana metrics into Graphite
+
+Grafana exposes metrics for Graphite on the `/metrics` endpoint. For detailed instructions, refer to [Internal Grafana metrics]({{< relref "../../administration/metrics.md">}}).
+
 ## 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" >}})

docs/sources/features/datasources/influxdb.md

@@ -140,8 +140,8 @@ To add a filter click the plus icon to the right of the `Measurements/Fields` bu
 
 ## Templating
 
-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
+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.
 
 Check out the [Templating]({{< relref "../../reference/templating.md" >}}) documentation for an introduction to the templating feature and the different

docs/sources/features/datasources/loki.md

@@ -39,14 +39,16 @@ Just add it as a data source and you are ready to query your log data in [Explor
 ### Derived fields
 
 The Derived Fields configuration allows you to: 
+
 * Add fields parsed from the log message. 
 * Add a link that uses the value of the field. 
 
-You can use this functionality to link to your tracing backend directly from your logs, or link to a user profile page if a userId is present in the log line. These links will be shown in the [log details](/features/explore/#labels-and-parsed-fields).
+You can use this functionality to link to your tracing backend directly from your logs, or link to a user profile page if a userId is present in the log line. These links appear in the [log details](/features/explore/#labels-and-parsed-fields).
 {{< docs-imagebox img="/img/docs/v65/loki_derived_fields.png" class="docs-image--no-shadow" caption="Screenshot of the derived fields configuration" >}}
 Each derived field consists of:
+
 - **Name:** Shown in the log details as a label.
-- **Regex:** A Regex pattern that runs on the log message and captures part of it to as the value of the new field. Can only contain capture a single group.
+- **Regex:** A Regex pattern that runs on the log message and captures part of it as the value of the new field. Can only contain a single capture group.
 - **URL**: A URL template used to construct a link next to the field value in log details. Use special `${__value.raw}` value in your template to interpolate the real field value into your URL template.
 
 You can use a debug section to see what your fields extract and how the URL is interpolated. Click **Show example log message** to show the text area where you can enter a log message.
@@ -69,7 +71,7 @@ Once the result is returned, the log panel shows a list of log rows and a bar ch
 
 <div class="medium-6 columns">
   <video width="800" height="500" controls>
-    <source src="https://grafana.com/static/assets/videos/explore_loki.mp4" type="video/mp4">
+    <source src="/assets/videos/explore_loki.mp4" type="video/mp4">
     Your browser does not support the video tag.
   </video>
 </div>
@@ -96,7 +98,7 @@ Examples:
 
 The [same rules that apply for Prometheus Label Selectors](https://prometheus.io/docs/prometheus/latest/querying/basics/#instant-vector-selectors) apply for Loki Log Stream Selectors.
 
-Another way to add a label selector, is in the table section, clicking on the **Filter** button beside a label will add the label to the query expression. This even works for multiple queries and will the label selector to each query.
+Another way to add a label selector is in the table section. Click **Filter** beside a label to add the label to the query expression. This even works for multiple queries and will add the label selector to each query.
 
 ### Search Expression
 
@@ -125,7 +127,7 @@ The following filter types are currently supported:
 
 ## Live tailing
 
-Loki supports Live tailing which displays logs in real-time. This feature is supported in [Explore]({{< relref "../explore/#loki-specific-features" >}}) and in dashboards with a Live toggle in the query editor.
+Loki supports Live tailing which displays logs in real-time. This feature is supported in [Explore]({{< relref "../explore/#loki-specific-features" >}}).
 
 Note that Live Tailing relies on two Websocket connections: one between the browser and the Grafana server, and another between the Grafana server and the Loki server. If you run any reverse proxies, please configure them accordingly.
 
@@ -187,8 +189,15 @@ datasources:
     jsonData:
       maxLines: 1000
       derivedFields:
-        - datasourceName: Jaeger
+        # Field with internal link pointing to datasource in Grafana
+        - datasourceUid: my_jaeger_uid
           matcherRegex: "traceID=(\\w+)"
+          name: TraceID
+          # url will be interpreted as query for the datasource
+          url: "$${__value.raw}"
+
+        # Field with external link
+        - matcherRegex: "traceID=(\\w+)"
           name: TraceID
           url: "http://localhost:16686/trace/$${__value.raw}"
 ```

docs/sources/features/datasources/mssql.md

@@ -80,7 +80,7 @@ If possible, we recommend you to use the latest service pack available for optim
 
 {{< docs-imagebox img="/img/docs/v51/mssql_query_editor.png" class="docs-image--no-shadow" >}}
 
-You find the MSSQL query editor in the metrics tab in Graph, Singlestat or Table panel's edit mode. You enter edit mode by clicking the
+You will find the MSSQL query editor in the metrics tab in Graph, Singlestat or Table panel's edit mode. You enter edit mode by clicking the
 panel title, then edit. The editor allows you to define a SQL query to select data to be visualized.
 
 1. Select *Format as* `Time series` (for use in Graph or Singlestat panel's among others) or `Table` (for use in Table panel among others).
@@ -97,24 +97,24 @@ To simplify syntax and to allow for dynamic parts, like date range filters, the
 
 Macro example | Description
 ------------ | -------------
-*$__time(dateColumn)* | Will be replaced by an expression to rename the column to *time*. For example, *dateColumn as time*
-*$__timeEpoch(dateColumn)* | Will be replaced by an expression to convert a DATETIME column type to Unix timestamp and rename it to *time*. <br/>For example, *DATEDIFF(second, '1970-01-01', dateColumn) AS time*
-*$__timeFilter(dateColumn)* | Will be replaced by a time range filter using the specified column name. <br/>For example, *dateColumn BETWEEN '2017-04-21T05:01:17Z' AND '2017-04-21T05:06:17Z'*
-*$__timeFrom()* | Will be replaced by the start of the currently active time selection. For example, *'2017-04-21T05:01:17Z'*
-*$__timeTo()* | Will be replaced by the end of the currently active time selection. For example, *'2017-04-21T05:06:17Z'*
-*$__timeGroup(dateColumn,'5m'[, fillvalue])* | Will be replaced by an expression usable in GROUP BY clause. Providing a *fillValue* of *NULL* or *floating value* will automatically fill empty series in timerange with that value. <br/>For example, *CAST(ROUND(DATEDIFF(second, '1970-01-01', time_column)/300.0, 0) as bigint)\*300*.
-*$__timeGroup(dateColumn,'5m', 0)* | Same as above but with a fill parameter so missing points in that series will be added by grafana and 0 will be used as value.
-*$__timeGroup(dateColumn,'5m', NULL)* | Same as above but NULL will be used as value for missing points.
-*$__timeGroup(dateColumn,'5m', previous)* | Same as above but the previous value in that series will be used as fill value if no value has been seen yet NULL will be used (only available in Grafana 5.3+).
-*$__timeGroupAlias(dateColumn,'5m')* | Will be replaced identical to $__timeGroup but with an added column alias (only available in Grafana 5.3+).
-*$__unixEpochFilter(dateColumn)* | Will be replaced by a time range filter using the specified column name with times represented as Unix timestamp. For example, *dateColumn > 1494410783 AND dateColumn < 1494497183*
-*$__unixEpochFrom()* | Will be replaced by the start of the currently active time selection as Unix timestamp. For example, *1494410783*
-*$__unixEpochTo()* | Will be replaced by the end of the currently active time selection as Unix timestamp. For example, *1494497183*
-*$__unixEpochNanoFilter(dateColumn)* | Will be replaced by a time range filter using the specified column name with times represented as nanosecond timestamp. For example, *dateColumn > 1494410783152415214 AND dateColumn < 1494497183142514872*
-*$__unixEpochNanoFrom()* | Will be replaced by the start of the currently active time selection as nanosecond timestamp. For example, *1494410783152415214*
-*$__unixEpochNanoTo()* | Will be replaced by the end of the currently active time selection as nanosecond timestamp. For example, *1494497183142514872*
-*$__unixEpochGroup(dateColumn,'5m', [fillmode])* | Same as $__timeGroup but for times stored as Unix timestamp (only available in Grafana 5.3+).
-*$__unixEpochGroupAlias(dateColumn,'5m', [fillmode])* | Same as above but also adds a column alias (only available in Grafana 5.3+).
+*`$__time(dateColumn)`* | Will be replaced by an expression to rename the column to *time*. For example, *dateColumn as time*
+*`$__timeEpoch(dateColumn)`* | Will be replaced by an expression to convert a DATETIME column type to Unix timestamp and rename it to *time*. <br/>For example, *DATEDIFF(second, '1970-01-01', dateColumn) AS time*
+*`$__timeFilter(dateColumn)`* | Will be replaced by a time range filter using the specified column name. <br/>For example, *dateColumn BETWEEN '2017-04-21T05:01:17Z' AND '2017-04-21T05:06:17Z'*
+*`$__timeFrom()`* | Will be replaced by the start of the currently active time selection. For example, *'2017-04-21T05:01:17Z'*
+*`$__timeTo()`* | Will be replaced by the end of the currently active time selection. For example, *'2017-04-21T05:06:17Z'*
+*`$__timeGroup(dateColumn,'5m'[, fillvalue])`* | Will be replaced by an expression usable in GROUP BY clause. Providing a *fillValue* of *NULL* or *floating value* will automatically fill empty series in timerange with that value. <br/>For example, *CAST(ROUND(DATEDIFF(second, '1970-01-01', time_column)/300.0, 0) as bigint)\*300*.
+*`$__timeGroup(dateColumn,'5m', 0)`* | Same as above but with a fill parameter so missing points in that series will be added by grafana and 0 will be used as value.
+*`$__timeGroup(dateColumn,'5m', NULL)`* | Same as above but NULL will be used as value for missing points.
+*`$__timeGroup(dateColumn,'5m', previous)`* | Same as above but the previous value in that series will be used as fill value if no value has been seen yet NULL will be used (only available in Grafana 5.3+).
+*`$__timeGroupAlias(dateColumn,'5m')`* | Will be replaced identical to $__timeGroup but with an added column alias (only available in Grafana 5.3+).
+*`$__unixEpochFilter(dateColumn)`* | Will be replaced by a time range filter using the specified column name with times represented as Unix timestamp. For example, *dateColumn > 1494410783 AND dateColumn < 1494497183*
+*`$__unixEpochFrom()`* | Will be replaced by the start of the currently active time selection as Unix timestamp. For example, *1494410783*
+*`$__unixEpochTo()`* | Will be replaced by the end of the currently active time selection as Unix timestamp. For example, *1494497183*
+*`$__unixEpochNanoFilter(dateColumn)`* | Will be replaced by a time range filter using the specified column name with times represented as nanosecond timestamp. For example, *dateColumn > 1494410783152415214 AND dateColumn < 1494497183142514872*
+*`$__unixEpochNanoFrom()`* | Will be replaced by the start of the currently active time selection as nanosecond timestamp. For example, *1494410783152415214*
+*`$__unixEpochNanoTo()`* | Will be replaced by the end of the currently active time selection as nanosecond timestamp. For example, *1494497183142514872*
+*`$__unixEpochGroup(dateColumn,'5m', [fillmode])`* | Same as $__timeGroup but for times stored as Unix timestamp (only available in Grafana 5.3+).
+*`$__unixEpochGroupAlias(dateColumn,'5m', [fillmode])`* | Same as above but also adds a column alias (only available in Grafana 5.3+).
 
 We plan to add many more macros. If you have suggestions for what macros you would like to see, please [open an issue](https://github.com/grafana/grafana) in our GitHub repo.
 
@@ -293,12 +293,12 @@ GROUP BY
 ORDER BY 1
 ```
 
-When above query are used in a graph panel the result will be two series named `Metric A` and `Metric B` with a sum of `valueTwo` plotted over `time`.
+When the above query is used in a graph panel, the result is two series named `Metric A` and `Metric B` with a sum of `valueTwo` plotted over `time`.
 Any series lacking a value in a 3 minute window will have a value of zero which you'll see rendered in the graph to the right.
 
 ## Templating
 
-Instead of hard-coding things like server, application and sensor name in 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.
 
 Check out the [Templating]({{< relref "../../reference/templating.md" >}}) documentation for an introduction to the templating feature and the different types of template variables.
 
@@ -319,7 +319,7 @@ A query can return multiple columns and Grafana will automatically create a list
 SELECT [host].[hostname], [other_host].[hostname2] FROM host JOIN other_host ON [host].[city] = [other_host].[city]
 ```
 
-Another option is a query that can create a key/value variable. The query should return two columns that are named `__text` and `__value`. The `__text` column value should be unique (if it is not unique then the first value is used). The options in the dropdown will have a text and value that allows you to have a friendly name as text and an id as the value. An example query with `hostname` as the text and `id` as the value:
+Another option is a query that can create a key/value variable. The query should return two columns that are named `__text` and `__value`. The `__text` column value should be unique (if it is not unique then the first value is used). The options in the dropdown will have a text and value that allow you to have a friendly name as text and an id as the value. An example query with `hostname` as the text and `id` as the value:
 
 ```sql
 SELECT hostname __text, id __value FROM host
@@ -374,14 +374,14 @@ Read more about variable formatting options in the [Variables]({{< relref "../..
 
 ## Annotations
 
-[Annotations]({{< relref "../../reference/annotations.md" >}}) allows you to overlay rich event information on top of graphs. You add annotation queries via the Dashboard menu / Annotations view.
+[Annotations]({{< relref "../../reference/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation queries via the Dashboard menu / Annotations view.
 
 **Columns:**
 
 Name | Description
 ------------ | -------------
 time | The name of the date/time field. Could be a column with a native SQL date/time data type or epoch value.
-timeend | Optional name of the end date/time field. Could be a column with a native SQL date/time data type or epoch value.
+timeend | Optional name of the end date/time field. Could be a column with a native SQL date/time data type or epoch value. (Grafana v6.6+)
 text | Event description field.
 tags | Optional field name to use for event tags as a comma separated string.
 
@@ -411,6 +411,23 @@ WHERE
 ORDER BY 1
 ```
 
+**Example region query using time and timeend columns with epoch values:**
+
+> Only available in Grafana v6.6+.
+
+```sql
+SELECT
+  time_sec as time,
+  time_end_sec as timeend,
+  description as [text],
+  tags
+FROM
+  [events]
+WHERE
+  $__unixEpochFilter(time_sec)
+ORDER BY 1
+```
+
 **Example query using time column of native SQL date/time data type:**
 
 ```sql
@@ -427,7 +444,7 @@ ORDER BY 1
 
 ## Stored procedure support
 
-Stored procedures have been verified to work. However, please note that we haven't done anything special to support this why there may exist edge cases where it won't work as you would expect.
+Stored procedures have been verified to work. However, please note that we haven't done anything special to support this, so there might be edge cases where it won't work as you would expect.
 Stored procedures should be supported in table, time series and annotation queries as long as you use the same naming of columns and return data in the same format as describe above under respective section.
 
 Please note that any macro function will not work inside a stored procedure.
@@ -474,7 +491,7 @@ We can define a stored procedure that will return all data we need to render 4 s
 In this case the stored procedure accepts two parameters `@from` and `@to` of `int` data types which should be a timerange (from-to) in epoch format
 which will be used to filter the data to return from the stored procedure.
 
-We're mimicking the `$__timeGroup(time, '5m')` in the select and group by expressions and that's why there's a lot of lengthy expressions needed -
+We're mimicking the `$__timeGroup(time, '5m')` in the select and group by expressions, and that's why there are a lot of lengthy expressions needed -
 these could be extracted to MSSQL functions, if wanted.
 
 ```sql

docs/sources/features/datasources/mysql.md

@@ -15,7 +15,7 @@ weight = 7
 >
 > Starting from Grafana v5.1 you can name the time column *time* in addition to earlier supported *time_sec*. Usage of *time_sec*  will eventually be deprecated.
 
-Grafana ships with a built-in MySQL data source plugin that allow you to query any visualize
+Grafana ships with a built-in MySQL data source plugin that allows you to query and visualize
 data from a MySQL compatible database.
 
 ## Adding the data source
@@ -131,28 +131,28 @@ To simplify syntax and to allow for dynamic parts, like date range filters, the
 
 Macro example | Description
 ------------ | -------------
-*$__time(dateColumn)* | Will be replaced by an expression to convert to a UNIX timestamp and rename the column to `time_sec`. For example, *UNIX_TIMESTAMP(dateColumn) as time_sec*
-*$__timeEpoch(dateColumn)* | Will be replaced by an expression to convert to a UNIX timestamp and rename the column to `time_sec`. For example, *UNIX_TIMESTAMP(dateColumn) as time_sec*
-*$__timeFilter(dateColumn)* | Will be replaced by a time range filter using the specified column name. For example, *dateColumn BETWEEN FROM_UNIXTIME(1494410783) AND FROM_UNIXTIME(1494410983)*
-*$__timeFrom()* | Will be replaced by the start of the currently active time selection. For example, *FROM_UNIXTIME(1494410783)*
-*$__timeTo()* | Will be replaced by the end of the currently active time selection. For example, *FROM_UNIXTIME(1494410983)*
-*$__timeGroup(dateColumn,'5m')* | Will be replaced by an expression usable in GROUP BY clause. For example, *cast(cast(UNIX_TIMESTAMP(dateColumn)/(300) as signed)*300 as signed),*
-*$__timeGroup(dateColumn,'5m', 0)* | Same as above but with a fill parameter so missing points in that series will be added by grafana and 0 will be used as value.
-*$__timeGroup(dateColumn,'5m', NULL)* | Same as above but NULL will be used as value for missing points.
-*$__timeGroup(dateColumn,'5m', previous)* | Same as above but the previous value in that series will be used as fill value if no value has been seen yet NULL will be used (only available in Grafana 5.3+).
-*$__timeGroupAlias(dateColumn,'5m')* | Will be replaced identical to $__timeGroup but with an added column alias (only available in Grafana 5.3+).
-*$__unixEpochFilter(dateColumn)* | Will be replaced by a time range filter using the specified column name with times represented as Unix timestamp. For example, *dateColumn > 1494410783 AND dateColumn < 1494497183*
-*$__unixEpochFrom()* | Will be replaced by the start of the currently active time selection as Unix timestamp. For example, *1494410783*
-*$__unixEpochTo()* | Will be replaced by the end of the currently active time selection as Unix timestamp. For example, *1494497183*
-*$__unixEpochNanoFilter(dateColumn)* | Will be replaced by a time range filter using the specified column name with times represented as nanosecond timestamp. For example, *dateColumn > 1494410783152415214 AND dateColumn < 1494497183142514872*
-*$__unixEpochNanoFrom()* | Will be replaced by the start of the currently active time selection as nanosecond timestamp. For example, *1494410783152415214*
-*$__unixEpochNanoTo()* | Will be replaced by the end of the currently active time selection as nanosecond timestamp. For example, *1494497183142514872*
-*$__unixEpochGroup(dateColumn,'5m', [fillmode])* | Same as $__timeGroup but for times stored as Unix timestamp (only available in Grafana 5.3+).
-*$__unixEpochGroupAlias(dateColumn,'5m', [fillmode])* | Same as above but also adds a column alias (only available in Grafana 5.3+).
+*`$__time(dateColumn)`* | Will be replaced by an expression to convert to a UNIX timestamp and rename the column to `time_sec`. For example, *UNIX_TIMESTAMP(dateColumn) as time_sec*
+*`$__timeEpoch(dateColumn)`* | Will be replaced by an expression to convert to a UNIX timestamp and rename the column to `time_sec`. For example, *UNIX_TIMESTAMP(dateColumn) as time_sec*
+*`$__timeFilter(dateColumn)`* | Will be replaced by a time range filter using the specified column name. For example, *dateColumn BETWEEN FROM_UNIXTIME(1494410783) AND FROM_UNIXTIME(1494410983)*
+*`$__timeFrom()`* | Will be replaced by the start of the currently active time selection. For example, *FROM_UNIXTIME(1494410783)*
+*`$__timeTo()`* | Will be replaced by the end of the currently active time selection. For example, *FROM_UNIXTIME(1494410983)*
+*`$__timeGroup(dateColumn,'5m')`* | Will be replaced by an expression usable in GROUP BY clause. For example, *cast(cast(UNIX_TIMESTAMP(dateColumn)/(300) as signed)*300 as signed),*
+*`$__timeGroup(dateColumn,'5m', 0)`* | Same as above but with a fill parameter so missing points in that series will be added by grafana and 0 will be used as value.
+*`$__timeGroup(dateColumn,'5m', NULL)`* | Same as above but NULL will be used as value for missing points.
+*`$__timeGroup(dateColumn,'5m', previous)`* | Same as above but the previous value in that series will be used as fill value if no value has been seen yet NULL will be used (only available in Grafana 5.3+).
+*`$__timeGroupAlias(dateColumn,'5m')`* | Will be replaced identical to $__timeGroup but with an added column alias (only available in Grafana 5.3+).
+*`$__unixEpochFilter(dateColumn)`* | Will be replaced by a time range filter using the specified column name with times represented as Unix timestamp. For example, *dateColumn > 1494410783 AND dateColumn < 1494497183*
+*`$__unixEpochFrom()`* | Will be replaced by the start of the currently active time selection as Unix timestamp. For example, *1494410783*
+*`$__unixEpochTo()`* | Will be replaced by the end of the currently active time selection as Unix timestamp. For example, *1494497183*
+*`$__unixEpochNanoFilter(dateColumn)`* | Will be replaced by a time range filter using the specified column name with times represented as nanosecond timestamp. For example, *dateColumn > 1494410783152415214 AND dateColumn < 1494497183142514872*
+*`$__unixEpochNanoFrom()`* | Will be replaced by the start of the currently active time selection as nanosecond timestamp. For example, *1494410783152415214*
+*`$__unixEpochNanoTo()`* | Will be replaced by the end of the currently active time selection as nanosecond timestamp. For example, *1494497183142514872*
+*`$__unixEpochGroup(dateColumn,'5m', [fillmode])`* | Same as $__timeGroup but for times stored as Unix timestamp (only available in Grafana 5.3+).
+*`$__unixEpochGroupAlias(dateColumn,'5m', [fillmode])`* | Same as above but also adds a column alias (only available in Grafana 5.3+).
 
 We plan to add many more macros. If you have suggestions for what macros you would like to see, please [open an issue](https://github.com/grafana/grafana) in our GitHub repo.
 
-The query editor has a link named `Generated SQL` that show up after a query as been executed, while in panel edit mode. Click on it and it will expand and show the raw interpolated SQL string that was executed.
+The query editor has a link named `Generated SQL` that shows up after a query has been executed, while in panel edit mode. Click on it and it will expand and show the raw interpolated SQL string that was executed.
 
 ## Table queries
 
@@ -236,7 +236,7 @@ This is something we plan to add.
 
 This feature is currently available in the nightly builds and will be included in the 5.0.0 release.
 
-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.
 
 Check out the [Templating]({{< relref "../../reference/templating.md" >}}) documentation for an introduction to the templating feature and the different types of template variables.
 
@@ -251,7 +251,7 @@ For example, you can have a variable that contains all values for the `hostname`
 SELECT hostname FROM my_host
 ```
 
-A query can returns multiple columns and Grafana will automatically create a list from them. For example, the query below will return a list with values from `hostname` and `hostname2`.
+A query can return multiple columns and Grafana will automatically create a list from them. For example, the query below will return a list with values from `hostname` and `hostname2`.
 
 ```sql
 SELECT my_host.hostname, my_other_host.hostname2 FROM my_host JOIN my_other_host ON my_host.city = my_other_host.city
@@ -350,6 +350,22 @@ WHERE
   $__unixEpochFilter(epoch_time)
 ```
 
+**Example region query using time and timeend columns with epoch values:**
+
+> Only available in Grafana v6.6+.
+
+```sql
+SELECT
+  epoch_time as time,
+  epoch_timeend as timeend,
+  metric1 as text,
+  CONCAT(tag1, ',', tag2) as tags
+FROM
+  public.test_data
+WHERE
+  $__unixEpochFilter(epoch_time)
+```
+
 **Example query using time column of native SQL date/time data type:**
 
 ```sql
@@ -366,13 +382,13 @@ WHERE
 Name | Description
 ------------ | -------------
 time | The name of the date/time field. Could be a column with a native SQL date/time data type or epoch value.
-timeend | Optional name of the end date/time field. Could be a column with a native SQL date/time data type or epoch value.
+timeend | Optional name of the end date/time field. Could be a column with a native SQL date/time data type or epoch value. (Grafana v6.6+)
 text | Event description field.
 tags | Optional field name to use for event tags as a comma separated string.
 
 ## Alerting
 
-Time series queries should work in alerting conditions. Table formatted queries is not yet supported in alert rule conditions.
+Time series queries should work in alerting conditions. Table formatted queries are not yet supported in alert rule conditions.
 
 ## Configure the data source with provisioning
 

docs/sources/features/datasources/opentsdb.md

@@ -49,8 +49,8 @@ The autocomplete only works if the OpenTSDB suggest api is enabled.
 
 ## Templating queries
 
-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
+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.
 
 Check out the [Templating]({{< relref "../../reference/templating.md" >}}) documentation for an introduction to the templating feature and the different
@@ -66,10 +66,10 @@ When using OpenTSDB with a template variable of `query` type you can use followi
 Query | Description
 ------------ | -------------
 *metrics(prefix)* | Returns metric names with specific prefix (can be empty)
-*tag_names(cpu)* | Return tag names (i.e. keys) for a specific cpu metric
-*tag_values(cpu, hostname)* | Return tag values for metric cpu and tag key hostname
-*suggest_tagk(prefix)* | Return tag names (i.e. keys) for all metrics with specific prefix (can be empty)
-*suggest_tagv(prefix)* | Return tag values for all metrics with specific prefix (can be empty)
+*tag_names(cpu)* | Returns tag names (i.e. keys) for a specific cpu metric
+*tag_values(cpu, hostname)* | Returns tag values for metric cpu and tag key hostname
+*suggest_tagk(prefix)* | Returns tag names (i.e. keys) for all metrics with specific prefix (can be empty)
+*suggest_tagv(prefix)* | Returns tag values for all metrics with specific prefix (can be empty)
 
 If you do not see template variables being populated in `Preview of values` section, you need to enable
 `tsd.core.meta.enable_realtime_ts` in the OpenTSDB server settings. Also, to populate metadata of

docs/sources/features/datasources/postgres.md

@@ -11,8 +11,6 @@ weight = 7
 
 # Using PostgreSQL in Grafana
 
-> NOTE: In **9.5.18, 9.4.23, 9.6.14, 10.9, 11.4, 12-beta2** versions of PostgreSQL has a [bug](https://www.postgresql.org/message-id/flat/28827.1561082086%40sss.pgh.pa.us#df2287bd7481153984bef6bab40af0db) which prevents execution of multiple column modifications via `ALTER TABLE` statement. Because Grafana uses it during initial database set up and since PostgreSQL has [fixed](https://github.com/postgres/postgres/commit/f946a409143d01951411382fbc3c91c7eb640094) this issue, Grafana **does not support these versions**
-
 Grafana ships with a built-in PostgreSQL data source plugin that allows you to query and visualize data from a PostgreSQL compatible database.
 
 ## Adding the data source
@@ -143,24 +141,24 @@ Macros can be used within a query to simplify syntax and allow for dynamic parts
 
 Macro example | Description
 ------------ | -------------
-*$__time(dateColumn)* | Will be replaced by an expression to rename the column to `time`. For example, *dateColumn as time*
-*$__timeSec(dateColumn)* | Will be replaced by an expression to rename the column to `time` and converting the value to Unix timestamp. For example, *extract(epoch from dateColumn) as time*
-*$__timeFilter(dateColumn)* | Will be replaced by a time range filter using the specified column name. For example, *dateColumn BETWEEN '2017-04-21T05:01:17Z' AND '2017-04-21T05:06:17Z'*
-*$__timeFrom()* | Will be replaced by the start of the currently active time selection. For example, *'2017-04-21T05:01:17Z'*
-*$__timeTo()* | Will be replaced by the end of the currently active time selection. For example, *'2017-04-21T05:06:17Z'*
-*$__timeGroup(dateColumn,'5m')* | Will be replaced by an expression usable in a GROUP BY clause. For example, *(extract(epoch from dateColumn)/300)::bigint*300*
-*$__timeGroup(dateColumn,'5m', 0)* | Same as above but with a fill parameter so missing points in that series will be added by Grafana and 0 will be used as the value.
-*$__timeGroup(dateColumn,'5m', NULL)* | Same as above but NULL will be used as value for missing points.
-*$__timeGroup(dateColumn,'5m', previous)* | Same as above but the previous value in that series will be used as fill value. If no value has been seen yet, NULL will be used (only available in Grafana 5.3+).
-*$__timeGroupAlias(dateColumn,'5m')* | Will be replaced with an expression identical to $__timeGroup, but with an added column alias (only available in Grafana 5.3+).
-*$__unixEpochFilter(dateColumn)* | Will be replaced by a time range filter using the specified column name with times represented as Unix timestamps. For example, *dateColumn >= 1494410783 AND dateColumn <= 1494497183*
-*$__unixEpochFrom()* | Will be replaced by the start of the currently active time selection as Unix timestamp. For example, *1494410783*
-*$__unixEpochTo()* | Will be replaced by the end of the currently active time selection as Unix timestamp. For example, *1494497183*
-*$__unixEpochNanoFilter(dateColumn)* | Will be replaced by a time range filter using the specified column name with times represented as nanosecond timestamps. For example, *dateColumn >= 1494410783152415214 AND dateColumn <= 1494497183142514872*
-*$__unixEpochNanoFrom()* | Will be replaced by the start of the currently active time selection as nanosecond timestamp. For example, *1494410783152415214*
-*$__unixEpochNanoTo()* | Will be replaced by the end of the currently active time selection as Unix timestamp. For example, *1494497183142514872*
-*$__unixEpochGroup(dateColumn,'5m', [fillmode])* | Same as $__timeGroup, but for times stored as Unix timestamp (only available in Grafana 5.3+).
-*$__unixEpochGroupAlias(dateColumn,'5m', [fillmode])* | Same as above, but also adds a column alias (only available in Grafana 5.3+).
+*`$__time(dateColumn)`* | Will be replaced by an expression to rename the column to `time`. For example, *dateColumn as time*
+*`$__timeSec(dateColumn)`* | Will be replaced by an expression to rename the column to `time` and converting the value to Unix timestamp. For example, *extract(epoch from dateColumn) as time*
+*`$__timeFilter(dateColumn)`* | Will be replaced by a time range filter using the specified column name. For example, *dateColumn BETWEEN '2017-04-21T05:01:17Z' AND '2017-04-21T05:06:17Z'*
+*`$__timeFrom()`* | Will be replaced by the start of the currently active time selection. For example, *'2017-04-21T05:01:17Z'*
+*`$__timeTo()`* | Will be replaced by the end of the currently active time selection. For example, *'2017-04-21T05:06:17Z'*
+*`$__timeGroup(dateColumn,'5m')`* | Will be replaced by an expression usable in a GROUP BY clause. For example, *(extract(epoch from dateColumn)/300)::bigint*300*
+*`$__timeGroup(dateColumn,'5m', 0)`* | Same as above but with a fill parameter so missing points in that series will be added by Grafana and 0 will be used as the value.
+*`$__timeGroup(dateColumn,'5m', NULL)`* | Same as above but NULL will be used as value for missing points.
+*`$__timeGroup(dateColumn,'5m', previous)`* | Same as above but the previous value in that series will be used as fill value. If no value has been seen yet, NULL will be used (only available in Grafana 5.3+).
+*`$__timeGroupAlias(dateColumn,'5m')`* | Will be replaced with an expression identical to $__timeGroup, but with an added column alias (only available in Grafana 5.3+).
+*`$__unixEpochFilter(dateColumn)`* | Will be replaced by a time range filter using the specified column name with times represented as Unix timestamps. For example, *dateColumn >= 1494410783 AND dateColumn <= 1494497183*
+*`$__unixEpochFrom()`* | Will be replaced by the start of the currently active time selection as Unix timestamp. For example, *1494410783*
+*`$__unixEpochTo()`* | Will be replaced by the end of the currently active time selection as Unix timestamp. For example, *1494497183*
+*`$__unixEpochNanoFilter(dateColumn)`* | Will be replaced by a time range filter using the specified column name with times represented as nanosecond timestamps. For example, *dateColumn >= 1494410783152415214 AND dateColumn <= 1494497183142514872*
+*`$__unixEpochNanoFrom()`* | Will be replaced by the start of the currently active time selection as nanosecond timestamp. For example, *1494410783152415214*
+*`$__unixEpochNanoTo()`* | Will be replaced by the end of the currently active time selection as Unix timestamp. For example, *1494497183142514872*
+*`$__unixEpochGroup(dateColumn,'5m', [fillmode])`* | Same as $__timeGroup, but for times stored as Unix timestamp (only available in Grafana 5.3+).
+*`$__unixEpochGroupAlias(dateColumn,'5m', [fillmode])`* | Same as above, but also adds a column alias (only available in Grafana 5.3+).
 
 We plan to add many more macros. If you have suggestions for what macros you would like to see, please [open an issue](https://github.com/grafana/grafana) in our GitHub repo.
 
@@ -242,7 +240,7 @@ ORDER BY time
 
 ## Templating
 
-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.
 
 Check out the [Templating]({{< relref "../../reference/templating.md" >}}) documentation for an introduction to the templating feature and the different types of template variables.
 
@@ -354,6 +352,22 @@ WHERE
   $__unixEpochFilter(epoch_time)
 ```
 
+**Example region query using time and timeend columns with epoch values:**
+
+> Only available in Grafana v6.6+.
+
+```sql
+SELECT
+  epoch_time as time,
+  epoch_time_end as timeend,
+  metric1 as text,
+  concat_ws(', ', metric1::text, metric2::text) as tags
+FROM
+  public.test_data
+WHERE
+  $__unixEpochFilter(epoch_time)
+```
+
 **Example query using time column of native SQL date/time data type:**
 
 ```sql
@@ -370,7 +384,7 @@ WHERE
 Name | Description
 ------------ | -------------
 time | The name of the date/time field. Could be a column with a native SQL date/time data type or epoch value.
-timeend | Optional name of the time end field, needs to be date/time data type. If set, then annotations are marked as regions between time and time-end.
+timeend | Optional name of the time end field, needs to be date/time data type. If set, then annotations are marked as regions between time and time-end. (Grafana v6.6+)
 text | Event description field.
 tags | Optional field name to use for event tags as a comma separated string.
 

docs/sources/features/datasources/prometheus.md

@@ -10,20 +10,13 @@ parent = "datasources"
 weight = 1
 +++
 
-# Using Prometheus in Grafana
+# Prometheus data source
 
-Grafana includes built-in support for Prometheus.
+Grafana includes built-in support for Prometheus. This topic explains options, variables, querying, and other options specific to the Prometheus data source. Refer to [Add a data source]({{< relref "add-a-data-source.md" >}}) for instructions on how to add a data source to Grafana.
 
-## Adding the data source
+## Prometheus settings
 
-1. Open the side menu by clicking the Grafana icon in the top header.
-2. In the side menu under the `Dashboards` link you should find a link named `Data Sources`.
-3. Click the `+ Add data source` button in the top header.
-4. Select `Prometheus` from the _Type_ dropdown.
-
-> NOTE: If you're not seeing the `Data Sources` link in your side menu it means that your current user does not have the `Admin` role for the current organization.
-
-## Data source options
+To access Prometheus settings, click the **Configuration** (gear) icon, then click **Data Sources**, and then click **Prometheus**.
 
 | Name                      | Description                                                                                                                           |
 | ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- |
@@ -35,9 +28,9 @@ Grafana includes built-in support for Prometheus.
 | _User_                    | User name for basic authentication.                                                                                                   |
 | _Password_                | Password for basic authentication.                                                                                                    |
 | _Scrape interval_         | Set this to the typical scrape and evaluation interval configured in Prometheus. Defaults to 15s.                                     |
-| _Custom Query Parameters_ | Add custom parameters to the Prometheus query URL. For example `timeout`, `partial_response`, `dedup` or `max_source_resolution`. Multiple parameters should be concatenated together with an '&amp;'. |
+| _Custom Query Parameters_ | Add custom parameters to the Prometheus query URL. For example `timeout`, `partial_response`, `dedup`, or `max_source_resolution`. Multiple parameters should be concatenated together with an '&amp;'. |
 
-## Query editor
+## Prometheus query editor
 
 Open a graph in edit mode by click the title > Edit (or by pressing `e` key while hovering over panel).
 
@@ -47,7 +40,7 @@ Open a graph in edit mode by click the title > Edit (or by pressing `e` key whil
 | Name               | Description                                                                                                                                                                                                                                                                                                                         |
 | ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | _Query expression_ | Prometheus query expression, check out the [Prometheus documentation](http://prometheus.io/docs/querying/basics/).                                                                                                                                                                                                                  |
-| _Legend format_    | Controls the name of the time series, using name or pattern. For example `{{hostname}}` will be replaced with label value for the label `hostname`.                                                                                                                                                                                 |
+| _Legend format_    | Controls the name of the time series, using name or pattern. For example `{{hostname}}` is replaced with the label value for the label `hostname`.                                                                                                                                                                                 |
 | _Min step_         | An additional lower limit for the [`step` parameter of Prometheus range queries](https://prometheus.io/docs/prometheus/latest/querying/api/#range-queries) and for the `$__interval` variable. The limit is absolute and not modified by the _Resolution_ setting.                                                                  |
 | _Resolution_       | `1/1` sets both the `$__interval` variable and the [`step` parameter of Prometheus range queries](https://prometheus.io/docs/prometheus/latest/querying/api/#range-queries) such that each pixel corresponds to one data point. For better performance, lower resolutions can be picked. `1/2` only retrieves a data point for every other pixel, and `1/10` retrieves one data point per 10 pixels. Note that both _Min time interval_ and _Min step_ limit the final value of `$__interval` and `step`. |
 | _Metric lookup_    | Search for metric names in this input field.                                                                                                                                                                                                                                                                                        |
@@ -55,15 +48,14 @@ Open a graph in edit mode by click the title > Edit (or by pressing `e` key whil
 | _Instant_          | Perform an "instant" query, to return only the latest value that Prometheus has scraped for the requested time series. Instant queries return results much faster than normal range queries. Use them to look up label sets.                                                                                                        |
 | _Min time interval_| This value multiplied by the denominator from the _Resolution_ setting sets a lower limit to both the `$__interval` variable and the [`step` parameter of Prometheus range queries](https://prometheus.io/docs/prometheus/latest/querying/api/#range-queries). Defaults to _Scrape interval_ as set in the data source options.     |
 
-> NOTE: Grafana slightly modifies the request dates for queries to align them with the dynamically calculated step.
-> This ensures consistent display of metrics data but can result in a small gap of data at the right edge of a graph.
+> **Note:** Grafana modifies the request dates for queries to align them with the dynamically calculated step. This ensures consistent display of metrics data, but it can result in a small gap of data at the right edge of a graph.
 
 ### Instant queries
 
-The Prometheus datasource allows you to run "instant" queries, which queries only the latest value.
+The Prometheus data source allows you to run "instant" queries, which query only the latest value.
 You can visualize the results in a table panel to see all available labels of a timeseries.
 
-Instant query results are made up only of one datapoint per series but can be shown in the graph panel with the help of [series overrides]({{< relref "../panels/graph/#series-overrides" >}}).
+Instant query results are made up only of one data point per series but can be shown in the graph panel with the help of [series overrides]({{< relref "../panels/graph/#series-overrides" >}}).
 To show them in the graph as a latest value point, add a series override and select `Points > true`.
 To show a horizontal line across the whole graph, add a series override and select `Transform > constant`.
 
@@ -72,7 +64,7 @@ To show a horizontal line across the whole graph, add a series override and sele
 ## Templating
 
 Instead of hard-coding things like server, application and sensor name in your metric queries, you can use variables in their place.
-Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns makes it easy to change the data
+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.
 
 Check out the [Templating]({{< relref "../../reference/templating.md" >}}) documentation for an introduction to the templating feature and the different
@@ -91,20 +83,20 @@ provides the following functions you can use in the `Query` input field.
 | _metrics(metric)_                | Returns a list of metrics matching the specified `metric` regex.        |
 | _query_\__result(query)_         | Returns a list of Prometheus query result for the `query`.              |
 
-For details of _metric names_, _label names_ and _label values_ are please refer to the [Prometheus documentation](http://prometheus.io/docs/concepts/data_model/#metric-names-and-labels).
+For details of what _metric names_, _label names_ and _label values_ are please refer to the [Prometheus documentation](http://prometheus.io/docs/concepts/data_model/#metric-names-and-labels).
 
 #### Using interval and range variables
 
 > Support for `$__range`, `$__range_s` and `$__range_ms` only available from Grafana v5.3
 
-It's possible to use some global built-in variables in query variables; `$__interval`, `$__interval_ms`, `$__range`, `$__range_s` and `$__range_ms`, see [Global built-in variables]({{< relref "../../reference/templating/#global-built-in-variables" >}}) for more information. These can be convenient to use in conjunction with the `query_result` function when you need to filter variable queries since
+You can use some global built-in variables in query variables; `$__interval`, `$__interval_ms`, `$__range`, `$__range_s` and `$__range_ms`, see [Global built-in variables]({{< relref "../../reference/templating/#global-built-in-variables" >}}) for more information. These can be convenient to use in conjunction with the `query_result` function when you need to filter variable queries since
 `label_values` function doesn't support queries.
 
 Make sure to set the variable's `refresh` trigger to be `On Time Range Change` to get the correct instances when changing the time range on the dashboard.
 
 **Example usage:**
 
-Populate a variable with the the busiest 5 request instances based on average QPS over the time range shown in the dashboard:
+Populate a variable with the busiest 5 request instances based on average QPS over the time range shown in the dashboard:
 
 ```
 Query: query_result(topk(5, sum(rate(http_requests_total[$__range])) by (instance)))
@@ -130,7 +122,7 @@ options are enabled, Grafana converts the labels from plain text to a regex comp
 
 ## Annotations
 
-[Annotations]({{< relref "../../reference/annotations.md" >}}) allows you to overlay rich event information on top of graphs. You add annotation
+[Annotations]({{< relref "../../reference/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation
 queries via the Dashboard menu / Annotations view.
 
 Prometheus supports two ways to query annotations.
@@ -140,15 +132,17 @@ Prometheus supports two ways to query annotations.
 
 The step option is useful to limit the number of events returned from your query.
 
-## Getting Grafana metrics into Prometheus
+## Get Grafana metrics into Prometheus
 
-Since 4.6.0 Grafana exposes metrics for Prometheus on the `/metrics` endpoint. We also bundle a dashboard within Grafana so you can get started viewing your metrics faster. You can import the bundled dashboard by going to the data source edit page and click the dashboard tab. There you can find a dashboard for Grafana and one for Prometheus. Import and start viewing all the metrics!
+Grafana exposes metrics for Prometheus on the `/metrics` endpoint. We also bundle a dashboard within Grafana so you can get started viewing your metrics faster. You can import the bundled dashboard by going to the data source edit page and click the dashboard tab. There you can find a dashboard for Grafana and one for Prometheus. Import and start viewing all the metrics!
 
-## Configure the data source with provisioning
+For detailed instructions, refer to [Internal Grafana metrics]({{< relref "../../administration/metrics.md">}}).
 
-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" >}})
+## Provision the Prometheus data source
 
-Here are some provisioning examples for this data source.
+You can configure data sources using config files with Grafana's provisioning system. 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
 apiVersion: 1

docs/sources/features/datasources/stackdriver.md

@@ -27,11 +27,11 @@ Grafana ships with built-in support for Google Stackdriver. Just add it as a dat
 
 > NOTE: If you're not seeing the `Data Sources` link in your side menu it means that your current user does not have the `Admin` role for the current organization.
 
-| Name                  | Description                                                                         |
-| --------------------- | ----------------------------------------------------------------------------------- |
-| _Name_                | The data source name. This is how you refer to the data source in panels and queries.   |
-| _Default_             | Default data source means that it will be pre-selected for new panels.               |
-| _Service Account Key_ | Service Account Key File for a GCP Project. Instructions below on how to create it. |
+| Name                  | Description                                                                           |
+| --------------------- | ------------------------------------------------------------------------------------- |
+| _Name_                | The data source name. This is how you refer to the data source in panels and queries. |
+| _Default_             | Default data source means that it will be pre-selected for new panels.                |
+| _Service Account Key_ | Service Account Key File for a GCP Project. Instructions below on how to create it.   |
 
 ## Authentication
 
@@ -45,8 +45,8 @@ To authenticate with the Stackdriver API, you need to create a Google Cloud Plat
 
 The following APIs need to be enabled first:
 
-* [Monitoring API](https://console.cloud.google.com/apis/library/monitoring.googleapis.com)
-* [Cloud Resource Manager API](https://console.cloud.google.com/apis/library/cloudresourcemanager.googleapis.com)
+- [Monitoring API](https://console.cloud.google.com/apis/library/monitoring.googleapis.com)
+- [Cloud Resource Manager API](https://console.cloud.google.com/apis/library/cloudresourcemanager.googleapis.com)
 
 Click on the links above and click the `Enable` button:
 
@@ -57,24 +57,24 @@ Click on the links above and click the `Enable` button:
 1. Navigate to the [APIs and Services Credentials page](https://console.cloud.google.com/apis/credentials).
 2. Click on the `Create credentials` dropdown/button and choose the `Service account key` option.
 
-    {{< docs-imagebox img="/img/docs/v53/stackdriver_create_service_account_button.png" class="docs-image--no-shadow" caption="Create service account button" >}}
+   {{< docs-imagebox img="/img/docs/v53/stackdriver_create_service_account_button.png" class="docs-image--no-shadow" caption="Create service account button" >}}
 
 3. On the `Create service account key` page, choose key type `JSON`. Then in the `Service Account` dropdown, choose the `New service account` option:
 
-    {{< docs-imagebox img="/img/docs/v53/stackdriver_create_service_account_key.png" class="docs-image--no-shadow" caption="Create service account key" >}}
+   {{< docs-imagebox img="/img/docs/v53/stackdriver_create_service_account_key.png" class="docs-image--no-shadow" caption="Create service account key" >}}
 
 4. Some new fields will appear. Fill in a name for the service account in the `Service account name` field and then choose the `Monitoring Viewer` role from the `Role` dropdown:
 
-    {{< docs-imagebox img="/img/docs/v53/stackdriver_service_account_choose_role.png" class="docs-image--no-shadow" caption="Choose role" >}}
+   {{< docs-imagebox img="/img/docs/v53/stackdriver_service_account_choose_role.png" class="docs-image--no-shadow" caption="Choose role" >}}
 
 5. Click the Create button. A JSON key file will be created and downloaded to your computer. Store this file in a secure place as it allows access to your Stackdriver data.
 6. Upload it to Grafana on the data source Configuration page. You can either upload the file or paste in the contents of the file.
 
-    {{< docs-imagebox img="/img/docs/v53/stackdriver_grafana_upload_key.png" class="docs-image--no-shadow" caption="Upload service key file to Grafana" >}}
+   {{< docs-imagebox img="/img/docs/v53/stackdriver_grafana_upload_key.png" class="docs-image--no-shadow" caption="Upload service key file to Grafana" >}}
 
 7. The file contents will be encrypted and saved in the Grafana database. Don't forget to save after uploading the file!
 
-    {{< docs-imagebox img="/img/docs/v53/stackdriver_grafana_key_uploaded.png" class="docs-image--no-shadow" caption="Service key file is uploaded to Grafana" >}}
+   {{< docs-imagebox img="/img/docs/v53/stackdriver_grafana_key_uploaded.png" class="docs-image--no-shadow" caption="Service key file is uploaded to Grafana" >}}
 
 ### Using GCE Default Service Account
 
@@ -86,58 +86,68 @@ If Grafana is running on a Google Compute Engine (GCE) virtual machine, it is po
 
 Read more about creating and enabling service accounts for GCE VM instances [here](https://cloud.google.com/compute/docs/access/create-enable-service-accounts-for-instances).
 
-## Metric Query Editor
+## Using the Query Editor
 
-{{< docs-imagebox img="/img/docs/v53/stackdriver_query_editor.png" max-width= "400px" class="docs-image--right" >}}
+The Stackdriver query editor allows you to build two types of queries - **Metric** and **Service Level Objective (SLO)**. Both types return time series data.
 
-The Stackdriver query editor allows you to select metrics, group/aggregate by labels and by time, and use filters to specify which time series you want in the results.
+### Metric Queries
 
-Begin by choosing a `Service` and then a metric from the `Metric` dropdown. Use the plus and minus icons in the filter and group by sections to add/remove filters or group by clauses.
+{{< docs-imagebox img="/img/docs/v70/metric-query-builder.png" max-width= "400px" class="docs-image--right" >}}
+
+The metric query editor allows you to select metrics, group/aggregate by labels and by time, and use filters to specify which time series you want in the results.
+
+To create a metric query, follow these steps:
+
+1. Choose the option **Metrics** in the **Query Type** dropdown
+2. Choose a project from the **Project** dropdown
+3. Choose a Google Cloud Platform service from the **Service** dropdown
+4. Choose a metric from the **Metric** dropdown.
+5. Use the plus and minus icons in the filter and group by sections to add/remove filters or group by clauses. This step is optional.
 
 Stackdriver metrics can be of different kinds (GAUGE, DELTA, CUMULATIVE) and these kinds have support for different aggregation options (reducers and aligners). The Grafana query editor shows the list of available aggregation methods for a selected metric and sets a default reducer and aligner when you select the metric. Units for the Y-axis are also automatically selected by the query editor.
 
-### Filter
+#### Filter
 
 To add a filter, click the plus icon and choose a field to filter by and enter a filter value e.g. `instance_name = grafana-1`. You can remove the filter by clicking on the filter name and select `--remove filter--`.
 
-#### Simple wildcards
+##### Simple wildcards
 
 When the operator is set to `=` or `!=` it is possible to add wildcards to the filter value field. E.g `us-*` will capture all values that starts with "us-" and `*central-a` will capture all values that ends with "central-a". `*-central-*` captures all values that has the substring of -central-. Simple wildcards are less expensive than regular expressions.
 
-#### Regular expressions
+##### Regular expressions
 
 When the operator is set to `=~` or `!=~` it is possible to add regular expressions to the filter value field. E.g `us-central[1-3]-[af]` would match all values that starts with "us-central", is followed by a number in the range of 1 to 3, a dash and then either an "a" or an "f". Leading and trailing slashes are not needed when creating regular expressions.
 
-### Aggregation
+#### Aggregation
 
 The aggregation field lets you combine time series based on common statistics. Read more about this option [here](https://cloud.google.com/monitoring/charts/metrics-selector#aggregation-options).
 
 The `Aligner` field allows you to align multiple time series after the same group by time interval. Read more about how it works [here](https://cloud.google.com/monitoring/charts/metrics-selector#alignment).
 
-#### Alignment Period/Group by Time
+##### Alignment Period/Group by Time
 
 The `Alignment Period` groups a metric by time if an aggregation is chosen. The default is to use the GCP Stackdriver default groupings (which allows you to compare graphs in Grafana with graphs in the Stackdriver UI).
 The option is called `Stackdriver auto` and the defaults are:
 
-* 1m for time ranges < 23 hours
-* 5m for time ranges >= 23 hours and < 6 days
-* 1h for time ranges >= 6 days
+- 1m for time ranges < 23 hours
+- 5m for time ranges >= 23 hours and < 6 days
+- 1h for time ranges >= 6 days
 
 The other automatic option is `Grafana auto`. This will automatically set the group by time depending on the time range chosen and the width of the graph panel. Read more about the details [here](http://docs.grafana.org/reference/templating/#the-interval-variable).
 
 It is also possible to choose fixed time intervals to group by, like `1h` or `1d`.
 
-### Group By
+#### Group By
 
 Group by resource or metric labels to reduce the number of time series and to aggregate the results by a group by. E.g. Group by instance_name to see an aggregated metric for a Compute instance.
 
-#### Metadata labels
+##### Metadata labels
 
-Resource metadata labels contains information to uniquely identify a resource in Google cloud. Metadata labels are only returned in the time series response if they're part of the **Group By** segment in the time series request. There's no API for retrieving metadata labels, so it's not possible to populate the group by dropdown with the metadata labels that are available for the selected service and metric. However, the **Group By** field dropdown comes with a pre-defined list of common system labels. 
+Resource metadata labels contain information to uniquely identify a resource in Google Cloud. Metadata labels are only returned in the time series response if they're part of the **Group By** segment in the time series request. There's no API for retrieving metadata labels, so it's not possible to populate the group by dropdown with the metadata labels that are available for the selected service and metric. However, the **Group By** field dropdown comes with a pre-defined list of common system labels.
 
 User labels cannot be pre-defined, but it's possible to enter them manually in the **Group By** field. If a metadata label, user label or system label is included in the **Group By** segment, then you can create filters based on it and expand its value on the **Alias** field.
 
-### Alias Patterns
+#### Alias patterns
 
 The Alias By field allows you to control the format of the legend keys. The default is to show the metric name and labels. This can be long and hard to read. Using the following patterns in the alias field, you can format the legend key the way you want it.
 
@@ -153,10 +163,10 @@ The Alias By field allows you to control the format of the legend keys. The defa
 
 In the Group By dropdown, you can see a list of metric and resource labels for a metric. These can be included in the legend key using alias patterns.
 
-| Alias Pattern Format     | Description                      | Alias Pattern Example            | Example Result   |
-| ------------------------ | -------------------------------- | -------------------------------- | ---------------- |
-| `{{metric.label.xxx}}`   | returns the metric label value   | `{{metric.label.instance_name}}` | `grafana-1-prod` |
-| `{{resource.label.xxx}}` | returns the resource label value | `{{resource.label.zone}}`        | `us-east1-b`     |
+| Alias Pattern Format             | Description                              | Alias Pattern Example             | Example Result   |
+| -------------------------------- | ---------------------------------------- | --------------------------------- | ---------------- |
+| `{{metric.label.xxx}}`           | returns the metric label value           | `{{metric.label.instance_name}}`  | `grafana-1-prod` |
+| `{{resource.label.xxx}}`         | returns the resource label value         | `{{resource.label.zone}}`         | `us-east1-b`     |
 | `{{metadata.system_labels.xxx}}` | returns the meta data system label value | `{{metadata.system_labels.name}}` | `grafana`        |
 | `{{metadata.user_labels.xxx}}`   | returns the meta data user label value   | `{{metadata.user_labels.tag}}`    | `production`     |
 
@@ -174,10 +184,51 @@ Example Alias By: `{{resource.type}} - {{metric.type}}`
 
 Example Result: `gce_instance - compute.googleapis.com/instance/cpu/usage_time`
 
+### SLO (Service Level Objective) queries
+
+> Only available in Grafana v7.0+
+
+{{< docs-imagebox img="/img/docs/v70/slo-query-builder.png" max-width= "400px" class="docs-image--right" >}}
+
+The SLO query builder in the Stackdriver data source allows you to display SLO data in time series format. To get an understanding of the basic concepts in service monitoring, please refer to Google Stackdriver's [official docs](https://cloud.google.com/monitoring/service-monitoring).
+
+#### How to create an SLO query
+
+To create an SLO query, follow these steps:
+
+1. Choose the option **Service Level Objectives (SLO)** in the **Query Type** dropdown.
+2. Choose a project from the **Project** dropdown.
+3. Choose an [SLO service](https://cloud.google.com/monitoring/api/ref_v3/rest/v3/services) from the **Service** dropdown.
+4. Choose an [SLO](https://cloud.google.com/monitoring/api/ref_v3/rest/v3/services.serviceLevelObjectives) from the **SLO** dropdown.
+5. Choose a [time series selector](https://cloud.google.com/monitoring/service-monitoring/timeseries-selectors#ts-selector-list) from the **Selector** dropdown.
+
+The friendly names for the time series selectors are shown in Grafana. Here is the mapping from the friendly name to the system name that is used in the Service Monitoring documentation:
+
+| Selector dropdown value    | Corresponding time series selector used |
+| -------------------------- | --------------------------------------- |
+| SLI Value                  | select_slo_health                       |
+| SLO Compliance             | select_slo_compliance                   |
+| SLO Error Budget Remaining | select_slo_budget_fraction              |
+
+#### Alias Patterns for SLO queries
+
+The Alias By field allows you to control the format of the legend keys for SLO queries too.
+
+| Alias Pattern  | Description                  | Example Result      |
+| -------------- | ---------------------------- | ------------------- |
+| `{{project}}`  | returns the GCP project name | `myProject`         |
+| `{{service}}`  | returns the service name     | `myService`         |
+| `{{slo}}`      | returns the SLO              | `latency-slo`       |
+| `{{selector}}` | returns the selector         | `select_slo_health` |
+
+#### Alignment Period/Group by Time for SLO queries
+
+SLO queries use the same [alignment period functionality as metric queries]({{< relref "#metric-queries" >}}).
+
 ## Templating
 
 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
+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.
 
 Check out the [Templating]({{< relref "../../reference/templating.md" >}}) documentation for an introduction to the templating feature and the different
@@ -185,24 +236,27 @@ types of template variables.
 
 ### Query Variable
 
-Variable of the type *Query* allows you to query Stackdriver for various types of data. The Stackdriver data source plugin provides the following `Query Types`.
+Variable of the type _Query_ allows you to query Stackdriver for various types of data. The Stackdriver data source plugin provides the following `Query Types`.
 
-| Name                | Description                                                                                       |
-| ------------------- | ------------------------------------------------------------------------------------------------- |
-| *Metric Types*      | Returns a list of metric type names that are available for the specified service.                 |
-| *Labels Keys*       | Returns a list of keys for `metric label` and `resource label` in the specified metric.           |
-| *Labels Values*     | Returns a list of values for the label in the specified metric.                                   |
-| *Resource Types*    | Returns a list of resource types for the the specified metric.                                    |
-| *Aggregations*      | Returns a list of aggregations (cross series reducers) for the the specified metric.              |
-| *Aligners*          | Returns a list of aligners (per series aligners) for the the specified metric.                    |
-| *Alignment periods* | Returns a list of all alignment periods that are available in Stackdriver query editor in Grafana |
+| Name                             | Description                                                                                       |
+| -------------------------------- | ------------------------------------------------------------------------------------------------- |
+| _Metric Types_                   | Returns a list of metric type names that are available for the specified service.                 |
+| _Labels Keys_                    | Returns a list of keys for `metric label` and `resource label` in the specified metric.           |
+| _Labels Values_                  | Returns a list of values for the label in the specified metric.                                   |
+| _Resource Types_                 | Returns a list of resource types for the the specified metric.                                    |
+| _Aggregations_                   | Returns a list of aggregations (cross series reducers) for the the specified metric.              |
+| _Aligners_                       | Returns a list of aligners (per series aligners) for the the specified metric.                    |
+| _Alignment periods_              | Returns a list of all alignment periods that are available in Stackdriver query editor in Grafana |
+| _Selectors_                      | Returns a list of selectors that can be used in SLO (Service Level Objectives) queries            |
+| _SLO Services_                   | Returns a list of Service Monitoring services that can be used in SLO queries                     |
+| _Service Level Objectives (SLO)_ | Returns a list of SLO's for the specified SLO service                                             |
 
 ### Using variables in queries
 
 There are two syntaxes:
 
-* `$<varname>` Example: `metric.label.$metric_label`
-* `[[varname]]` Example: `metric.label.[[metric_label]]`
+- `$<varname>` Example: `metric.label.$metric_label`
+- `[[varname]]` Example: `metric.label.[[metric_label]]`
 
 Why two ways? The first syntax is easier to read and write but does not allow you to use a variable in the middle of a word. When the _Multi-value_ or _Include all value_ options are enabled, Grafana converts the labels from plain text to a regex compatible string, which means you have to use `=~` instead of `=`.
 
@@ -210,7 +264,7 @@ Why two ways? The first syntax is easier to read and write but does not allow yo
 
 {{< docs-imagebox img="/img/docs/v53/stackdriver_annotations_query_editor.png" max-width= "400px" class="docs-image--right" >}}
 
-[Annotations]({{< relref "../../reference/annotations.md" >}}) allows you to overlay rich event information on top of graphs. You add annotation
+[Annotations]({{< relref "../../reference/annotations.md" >}}) allow you to overlay rich event information on top of graphs. You add annotation
 queries via the Dashboard menu / Annotations view. Annotation rendering is expensive so it is important to limit the number of rows returned. There is no support for showing Stackdriver annotations and events yet but it works well with [custom metrics](https://cloud.google.com/monitoring/custom-metrics/) in Stackdriver.
 
 With the query editor for annotations, you can select a metric and filters. The `Title` and `Text` fields support templating and can use data returned from the query. For example, the Title field could have the following text:

docs/sources/features/datasources/testdata.md

@@ -13,7 +13,7 @@ weight = 20
 
 The purpose of this data source is to make it easier to create fake data for any panel.
 Using `TestData DB` you can build your own time series and have any panel render it.
-This make is much easier to verify functionally since the data can be shared very easily.
+This makes it much easier to verify functionality since the data can be shared very easily.
 
 ## Enable
 

docs/sources/features/explore/index.md

@@ -11,25 +11,23 @@ weight = 5
 
 # Explore
 
-> Explore is only available in Grafana 6.0 and above.
-
-## Introduction
-
-One of the major new features of Grafana 6.0 is the new query-focused Explore workflow for troubleshooting and/or for data exploration.
-
 Grafana's dashboard UI is all about building dashboards for visualization. Explore strips away all the dashboard and panel options so that you can focus on the query. Iterate until you have a working query and then think about building a dashboard.
 
+> Explore is only available in Grafana 6.0 and above.
+
 For infrastructure monitoring and incident response, you no longer need to switch to other tools to debug what went wrong. Explore allows you to dig deeper into your metrics and logs to find the cause. Grafana's new logging data source, [Loki](https://github.com/grafana/loki) is tightly integrated into Explore and allows you to correlate metrics and logs by viewing them side-by-side. This creates a new debugging workflow where you can:
 
 1. Receive an alert
-2. Drill down and examine metrics
-3. Drill down again and search logs related to the metric and time interval (and in the future, distributed traces).
+1. Drill down and examine metrics
+1. Drill down again and search logs related to the metric and time interval (and in the future, distributed traces).
 
 If you just want to explore your data and do not want to create a dashboard then Explore makes this much easier. Explore will show the results as both a graph and a table enabling you to see trends in the data and more detail at the same time (if the data source supports both graph and table data).
 
-## How to Start Exploring
+## Start exploring
 
-There is a new Explore icon on the menu bar to the left. This opens a new empty Explore tab.
+> **Note:** By default, users with the Viewer role cannot edit and do not have access to Explore. Refer to [Organization roles](https://grafana.com/docs/grafana/latest/permissions/organization_roles/) for more information about what each role has access to.
+
+There is an Explore icon on the menu bar to the left. This opens an empty Explore tab.
 
 {{< docs-imagebox img="/img/docs/v65/explore_menu.png" class="docs-image--no-shadow" caption="Screenshot of the new Explore Icon" >}}
 
@@ -41,7 +39,7 @@ Choose your data source in the dropdown in the top left. Prometheus has a custom
 
 The query field is where you can write your query and explore your data. There are three buttons beside the query field, a clear button (X), an add query button (+) and the remove query button (-). Just like the normal query editor, you can add and remove multiple queries.
 
-## Split and Compare
+## Split and compare
 
 The Split feature is an easy way to compare graphs and tables side-by-side or to look at related data together on one page. Click the split button to duplicate the current query and split the page into two side-by-side queries. It is possible to select another data source for the new query which for example, allows you to compare the same query for two different servers or to compare the staging environment to the production environment.
 
@@ -51,17 +49,78 @@ In split view, timepickers for both panels can be linked (if you change one, the
 
 You can close the newly created query by clicking on the Close Split button.
 
+## Query history
+
+> BETA: Query history is a beta feature.
+
+Query history is a list of queries that you have used in Explore. The history is local to your browser and is not shared with others. To open and interact with your history, click the **Query history** button in Explore.
+
+### View query history
+
+Query history lets you view the history of your querying. For each individual query, you can:
+
+- Run a query.
+- Create and/or edit a comment.
+- Copy a query to the clipboard.
+- Copy a URL link with the query to the clipboard.
+- Star a query.
+
+### Manage favorite queries
+
+All queries that have been starred in the Query history tab are displayed in the Starred. This allows you to access your favorite queries faster and to reuse these queries without typing them from scratch.
+
+### Sort query history
+
+By default, query history shows you the most recent queries. You can sort your history by date or by data source name in ascending or descending order.
+
+1. Click the **Sort queries by** field.
+2. Select one of the following options:
+   - Newest first
+   - Oldest first
+   - Data source A-Z
+   - Data source Z-A
+
+> Note: If you are in split mode, then the chosen sorting mode applies only to the active panel.
+
+### Filter query history
+
+Filter query history in Query history and Starred tab by data source name:
+
+1. Click the **Filter queries for specific data source(s)** field
+2. Select the data source for which you would like to filter your history. You can select multiple data sources.
+
+In **Query history** tab it is also possible to filter queries by date using the slider:
+
+- Use vertical slider to filter queries by date.
+- By dragging top handle, adjust start date.
+- By dragging top handle, adjust end date.
+
+> Note: If you are in split mode, filters are applied only to your currently active panel.
+
+### Query history settings
+
+You can customize the query history in the Settings tab. Options are described in the table below.
+
+| Setting                                                       | Default value                           |
+| ------------------------------------------------------------- | --------------------------------------- |
+| Period of time for which Grafana will save your query history | 1 week                                  |
+| Change the default active tab                                 | Query history tab                       |
+| Only show queries for datasource currently active in Explore  | False                                   |
+| Clear query history                                           | Permanently deletes all stored queries. |
+
+> Note: Query history settings are global, and applied to both panels in split mode.
+
 ## Prometheus-specific Features
 
 The first version of Explore features a custom querying experience for Prometheus. When a query is executed, it actually executes two queries, a normal Prometheus query for the graph and an Instant Query for the table. An Instant Query returns the last value for each time series which shows a good summary of the data shown in the graph.
 
-### Metrics Explorer
+### Metrics explorer
 
 On the left-hand side of the query field is a `Metrics` button, clicking on this opens the Metric Explorer. This shows a hierarchical menu with metrics grouped by their prefix. For example, all the Alert Manager metrics will be grouped under the `alertmanager` prefix. This is a good starting point if you just want to explore which metrics are available.
 
 {{< docs-imagebox img="/img/docs/v65/explore_metric_explorer.png" class="docs-image--no-shadow" caption="Screenshot of the new Explore option in the panel menu" >}}
 
-### Query Field
+### Query field
 
 The Query field supports autocomplete for metric names, function and works mostly the same way as the standard Prometheus query editor. Press the enter key to execute a query.
 
@@ -69,17 +128,18 @@ The autocomplete menu can be trigger by pressing Ctrl+Space. The Autocomplete me
 
 Suggestions can appear under the query field - click on them to update your query with the suggested change.
 
-* For counters (monotonically increasing metrics), a rate function will be suggested.
-* For buckets, a histogram function will be suggested.
-* For recording rules, possible to expand the rules.
+- For counters (monotonically increasing metrics), a rate function will be suggested.
+- For buckets, a histogram function will be suggested.
+- For recording rules, possible to expand the rules.
 
-### Table Filters
+### Table filters
 
 Click on the filter button <span title="Filter for label" class="logs-label__icon fa fa-search-plus"></span> in a labels column in the Table panel to add filters to the query expression. This works with multiple queries too - the filter will be added for all the queries.
 
-## Logs Integration
+## Logs integration
 
 Along with metrics, Explore allows you to investigate your logs with the following data sources:
+
 - [Loki](../datasources/loki)
 - [InfluxDB](../datasources/influxdb)
 - [Elasticsearch](../datasources/elasticsearch)
@@ -92,9 +152,9 @@ You can customize how logs are displayed and select which columns are shown.
 
 Log data can be very repetitive and Explore can help by hiding duplicate log lines. There are a few different deduplication algorithms that you can use:
 
-* `exact` Exact matches are done on the whole line, except for date fields.
-* `numbers` Matches on the line after stripping out numbers (durations, IP addresses etc.).
-* `signature` The most aggressive deduping - strips all letters and numbers, and matches on the remaining whitespace and punctuation.
+- `exact` Exact matches are done on the whole line, except for date fields.
+- `numbers` Matches on the line after stripping out numbers (durations, IP addresses etc.).
+- `signature` The most aggressive deduping - strips all letters and numbers, and matches on the remaining whitespace and punctuation.
 
 #### Time
 
@@ -108,7 +168,7 @@ Shows or hides the unique labels column that includes only non-common labels. Al
 
 Set this to True if you want the display to use line wrapping. If set to False, it will result in horizontal scrolling.
 
-### Labels and Parsed fields
+### Labels and parsed fields
 
 Each log row has an extendable area with its labels and parsed fields, for more robust interaction. For all labels we have added the ability to filter for (positive filter) and filter out (negative filter) selected labels. Each field or label also has a stats icon to display ad-hoc statistics in relation to all displayed logs.
 
@@ -118,7 +178,7 @@ As mentioned, one of the log integrations is for the new open source log aggrega
 
 See [Loki's data source documentation](../datasources/loki) on how to query for log data.
 
-#### Switching from Metrics to Logs
+#### Switch from metrics to logs
 
 If you switch from a Prometheus query to a logs query (you can do a split first to have your metrics and logs side by side) then it will keep the labels from your query that exist in the logs and use those to query the log streams. For example, the following Prometheus query:
 

docs/sources/features/navigation-links.md

@@ -14,7 +14,7 @@ You can use links to navigate between commonly used dashboards. Links let you cr
 
 Grafana supports three types of links: Dashboard Links, Panel Links, and Data Links. They are all available from your dashboard.
 
-{{< docs-imagebox img="/static/assets/img/blog/dashboard_links.png" max-width="800px" caption="Links Supported in Grafana" >}}
+{{< docs-imagebox img="/assets/img/blog/dashboard_links.png" max-width="800px" caption="Links Supported in Grafana" >}}
 
 ## Which link should you use?
 
@@ -38,7 +38,7 @@ Once you've added a dashboard link, it appears in the upper right corner of your
 
 ### Add links to dashboards
 
-Add a links to other dashboards at the top of your current dashboard.
+Add links to other dashboards at the top of your current dashboard.
 
 1. While viewing the dashboard you want to link, click the gear at the top of the screen to open **Dashboard settings**.
 1. Click **Links** and then click **Add Dashboard Link** or **New**.

docs/sources/features/panels/gauge.md

@@ -21,8 +21,8 @@ The Gauge is a single value panel that can repeat a gauge for every series, colu
 * Calc
   * Specify calculation / reducer function. Since this panel is designed to only show a single value Grafana needs to
     know how to reduce a fields many values to a single value.
-** Labels - Controls if thresholds values are shown.
-** Markers - Controls if a thresholds band is shown outside the inner gauge value band.
+* Labels - Controls if thresholds values are shown.
+* Markers - Controls if a thresholds band is shown outside the inner gauge value band.
 
 ## Field
 
@@ -37,7 +37,7 @@ The Gauge is a single value panel that can repeat a gauge for every series, colu
 ### Thresholds
 
 Define thresholds that will set the color of either the value or the background depending on your `Color` display option. The
-thresholds are automatically sorted from lowerst value to highest. The `Base` value represents minus infinity.
+thresholds are automatically sorted from lowest value to highest. The `Base` value represents minus infinity.
 
 
 ### Value mappings

docs/sources/features/panels/graph.md

@@ -97,11 +97,11 @@ For **Mode** there are three options:
 
 Additional values can be shown along-side the legend names:
 
-- **Min** - Minimum of all values returned from metric query
+- **Min** - Minimum of all values returned from the metric query
 - **Max** - Maximum of all values returned from the metric query
-- **Avg** - Average of all values returned from metric query
+- **Avg** - Average of all values returned from the metric query
 - **Current** - Last value returned from the metric query
-- **Total** - Sum of all values returned from metric query
+- **Total** - Sum of all values returned from the metric query
 - **Decimals** - Controls how many decimals are displayed for legend values (and graph hover tooltips)
 
 The legend values are calculated client side by Grafana and depend on what type of

docs/sources/features/panels/heatmap.md

@@ -15,7 +15,7 @@ weight = 4
 
 > New panel only available in Grafana v4.3+
 
-The Heatmap panel allows you to view histograms over time. To fully understand and use this panel you need
+The Heatmap panel allows you to view histograms over time. To fully understand and use this panel you need to 
 understand what Histograms are and how they are created. Read on below to for a quick introduction to the
 term Histogram.
 
@@ -74,7 +74,7 @@ the time range `1h`. This will make the cells 1h wide on the X-axis.
 ### Pre-bucketed data
 
 If you have a data that is already organized into buckets you can use the `Time series buckets` data format. This format
-requires that your metric query return regular time series and that each time series has a numeric name that represent
+requires that your metric query returns regular time series and that each time series has a numeric name that represents
 the upper or lower bound of the interval.
 
 There are a number of data sources supporting histogram over time like Elasticsearch (by using a Histogram bucket
@@ -108,7 +108,7 @@ change with the bucket count.
 ## Raw data vs aggregated
 
 If you use the heatmap with regular time series data (not pre-bucketed). Then it's important to keep in mind that your data
-is often already by aggregated by your time series backend. Most time series queries do not return raw sample data
+is often already aggregated by your time series backend. Most time series queries do not return raw sample data
 but include a group by time interval or maxDataPoints limit coupled with an aggregation function (usually average).
 
 This all depends on the time range of your query of course. But the important point is to know that the Histogram bucketing

docs/sources/features/panels/singlestat.md

@@ -33,7 +33,7 @@ The singlestat panel has a normal query editor to allow you define your exact me
    * **diff** - The difference between 'current' (last value) and 'first'.
    * **range** - The difference between 'min' and 'max'. Useful the show the range of change for a gauge.
 2. **Prefix/Postfix**: The Prefix/Postfix fields let you define a custom label to appear *before/after* the value. The `$__name` variable can be used here to use the series name or alias from the metric query.
-3. **Units**: Units are appended to the the Singlestat  within the panel, and will respect the color and threshold settings for the value.
+3. **Units**: Units are appended to the Singlestat  within the panel, and will respect the color and threshold settings for the value.
 4. **Decimals**: The Decimal field allows you to override the automatic decimal precision, and set it explicitly.
 5. **Font Size**: You can use this section to select the font size of the different texts in the Singlestat Panel, i.e. prefix, value and postfix.
 

docs/sources/features/panels/stat.md

@@ -11,7 +11,7 @@ type = "docs"
 
 {{< docs-imagebox img="/img/docs/v66/stat_panel_dark3.png" max-width="1025px" caption="Stat panel" >}}
 
-The stat panel is designed to show a big single stat values with an optional graph sparkline. You can control
+The stat panel is designed to show a big single stat value with an optional graph sparkline. You can control
 background or value color using thresholds.
 
 ## Display options
@@ -21,7 +21,7 @@ background or value color using thresholds.
   * `All values` - Show a separate stat for every row.
 * Calc
   * Specify calculation / reducer function. Since this panel is designed to only show a single value Grafana needs to
-    know how to reduce a fields many values to a single value.
+    know how to reduce a field's many values to a single value.
 * Orientation
   * If your query returns multiple series or you have set **Show** to `All values` then the visualization will repeat for every series or row. This orientation option will control in what direction it will repeat.
 * Color
@@ -39,7 +39,7 @@ background or value color using thresholds.
 ### Auto layout
 
 The panel will try to auto adjust layout depending on width & height. The graph will also hide if the panel becomes
-to small.
+too small.
 
 Example of stacked layout where graph is automatically hidden due to each stat being too small:
 
@@ -66,7 +66,7 @@ Example of value color mode:
 ### Thresholds
 
 Define thresholds that will set the color of either the value or the background depending on your `Color` display option. The
-thresholds are automatically sorted from lowerst value to highest. The `Base` value represents minus infinity.
+thresholds are automatically sorted from lowest value to highest. The `Base` value represents minus infinity.
 
 
 ### Value mappings

docs/sources/guides/getting_started.md

@@ -13,7 +13,7 @@ weight = 100
 
 # Getting started
 
-This guide will help you get started and acquainted with Grafana.
+This guide will help you get started and acquainted with Grafana. To learn more about Grafana in general, refer to [What is Grafana?]({{< relref "what-is-grafana.md" >}}).
 
 ## Install Grafana
 
@@ -35,29 +35,9 @@ This step varies according to your computer operating system. Refer to the instr
 
  Congratulations, you have gotten started with Grafana! You have a dashboard and are displaying results. Feel free to experiment with what you have built, continue on to add another data source, or explore [Next steps](#next-steps).
 
-## Add a data source
-
-{{< docs-imagebox img="/img/docs/v52/sidemenu-datasource.png" max-width="250px" class="docs-image--right docs-image--no-shadow">}}
-
-Before you create your first real dashboard, you need to add your data source.
-
-First 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. The first item on the configuration menu is data sources, click on that and you'll be taken to the data sources page where you can add and edit data sources. You can also simply click the cog.
-
-
-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">}}
-
-First, give the data source a Name and then select which Type of data source you'll want to create, see [Supported data sources]({{< relref "../features/datasources/#supported-data-sources/" >}}) for more information and how to configure your data source.
-
-
-{{< docs-imagebox img="/img/docs/v52/datasource-settings.png" max-width="700px" class="docs-image--no-shadow">}}
-
-After you have configured your data source you are ready to save and test.
-
 ## Next steps
 
-There is so much you can do in Grafana, it can be hard to know where to begin. Your next steps will be different depending on whether you are using Grafana just for yourself or if you are an administrating Grafana for an organization.
+Different user types will have different interests. Some suggestions are listed below, or refer to [What is Grafana?]({{< relref "what-is-grafana.md" >}}) for a general overview of Grafana features.
 
 ### All users
 
@@ -65,6 +45,7 @@ All users might want to learn about:
 
 * [Panels]({{< relref "../features/panels/panels.md" >}})
 * [Dashboards]({{< relref "../features/dashboard/dashboards.md" >}})
+* [Data sources]({{< relref "../features/datasources/data-sources.md" >}}) and [Add a data source]({{< relref "../features/datasources/add-a-data-source.md" >}})
 * [Keyboard shortcuts]({{< relref "../features/shortcuts.md" >}})
 * [Explore workflow]({{< relref "../features/explore/index.md" >}})
 * [Plugins](https://grafana.com/grafana/plugins?orderBy=weight&direction=asc)

docs/sources/guides/timeseries.md

@@ -96,15 +96,15 @@ Here are some of the TSDBs supported by Grafana:
 - [InfluxDB](https://www.influxdata.com/products/influxdb-overview/)
 - [Prometheus](https://prometheus.io/)
 
-```
-weather,location=us-midwest temperature=82 1465839830100400200
-  |    -------------------- --------------  |
-  |             |             |             |
-  |             |             |             |
-+-----------+--------+-+---------+-+---------+
-|measurement|,tag_set| |field_set| |timestamp|
-+-----------+--------+-+---------+-+---------+
-```
+    ```
+    weather,location=us-midwest temperature=82 1465839830100400200
+      |    -------------------- --------------  |
+      |             |             |             |
+      |             |             |             |
+    +-----------+--------+-+---------+-+---------+
+    |measurement|,tag_set| |field_set| |timestamp|
+    +-----------+--------+-+---------+-+---------+
+    ```
 
 ### Collecting time series data
 

docs/sources/guides/what-is-grafana.md

@@ -0,0 +1,93 @@
++++
+title = "What is Grafana?"
+description = "Overview of Grafana and features"
+keywords = ["grafana", "intro", "guide", "started"]
+type = "docs"
+[menu.docs]
+name = "What is Grafana?"
+identifier = "what_is_grafana"
+parent = "guides"
+weight = 200
++++
+
+# What is Grafana?
+
+This topic provides a high-level look at Grafana, the Grafana process, and Grafana features. It's a good place to start if you want to learn more about Grafana software. To jump right in, refer to [Getting started]({{< relref "getting_started.md" >}}).
+
+Grafana is open source visualization and analytics software. It allows you to query, visualize, alert on, and explore your metrics no matter where they are stored. In plain English, it provides you with tools to turn your time-series database (TSDB) data into beautiful graphs and visualizations.
+
+After creating a dashboard like you do in [Getting started]({{< relref "getting_started.md" >}}), there are many possible things you might do next. It all depends on your needs and your use case. 
+
+For example, if you want to view weather data and statistics about your smart home, then you might create a playlist. If you are the administrator for a corporation and are managing Grafana for multiple teams, then you might need to set up provisioning and authentication.
+
+The following sections provide an overview of things you might want to do with your Grafana database and links so you can learn more. For more guidance and ideas, check out the [Grafana Community forums](https://community.grafana.com/).
+
+## Explore metrics and logs
+
+Explore your data through ad-hoc queries and dynamic drilldown. Split view and compare different time ranges, queries and data sources side by side. 
+
+Refer to [Explore]({{< relref "../features/explore/index.md" >}}) for more information.
+
+## Alerts
+
+If you're using Grafana alerting, then you can have alerts sent through a number of different [alert notifiers]({{< relref "../alerting/notifications.md" >}}), including PagerDuty, SMS, email, VictorOps, OpsGenie, or Slack. 
+
+Alert hooks allow you to create different notifiers with a bit of code if you prefer some other channels of communication. Visually define [alert rules]({{< relref "../alerting/rules.md" >}}) for your most important metrics.
+
+## Annotations
+
+Annotate graphs with rich events from different data sources. Hover over events to see the full event metadata and tags.
+
+This feature, which shows up as a graph marker in Grafana, is useful for correlating data in case something goes wrong. You can create the annotations manually—just control-click on a graph and input some text—or you can fetch data from any data source.
+
+Refer to [Annotations]({{< relref "../reference/annotations.md" >}}) for more information.
+
+## Dashboard variables
+
+[Template variables]({{< relref "../reference/templating.md" >}}) allow you to create dashboards that can be reused for lots of different use cases. Values aren't hard-coded with these templates, so for instance, if you have a production server and a test server, you can use the same dashboard for both. 
+
+Templating allows you to drill down into your data, say, from all data to North America data, down to Texas data, and beyond. You can also share these dashboards across teams within your organization—or if you create a great dashboard template for a popular data source, you can contribute it to the whole community to customize and use.
+
+## Configure Grafana
+
+If you're a Grafana administrator, then you'll want to thoroughly familiarize yourself with [Grafana configuration options]({{< relref "../installation/configuration.md" >}}) and the [Grafana CLI]({{< relref "../administration/cli.md" >}}).
+
+Configuration covers both config files and environment variables. You can set up default ports, logging levels, email IP addresses, security, and more.
+
+## Import dashboards and plugins
+
+Discover hundreds of [dashboards](https://grafana.com/grafana/dashboards) and [plugins](https://grafana.com/grafana/plugins) in the official library. Thanks to the passion and momentum of community members, new ones are added every week.
+
+## Authentication
+
+Grafana supports different authentication methods, such as LDAP and OAuth, and allows you to map users to organizations. Refer to the [User authentication overview]({{< relref "../auth/overview.md" >}}) for more information.
+
+In Grafana Enterprise, you can also map users to teams: If your company has its own authentication system, Grafana allows you to map the teams in your internal systems to teams in Grafana. That way, you can automatically give people access to the dashboards designated for their teams.
+
+Refer to [Grafana Enterprise]({{< relref "../enterprise/_index.md" >}}) for more information.
+
+## Provisioning
+
+While it's easy to click, drag, and drop to create a single dashboard, power users in need of many dashboards will want to automate the setup with a script. You can script anything in Grafana. 
+
+For example, if you're spinning up a new Kubernetes cluster, you can also spin up a Grafana automatically with a script that would have the right server, IP address, and data sources preset and locked in so users cannot change them. It's also a way of getting control over a lot of dashboards.
+
+Refer to [Provisioning]({{< relref "../administration/provisioning.md" >}}) for more information.
+
+## Permissions
+
+When organizations have one Grafana and multiple teams, they often want the ability to both keep things separate and share dashboards. You can create a team of users and then set [permissions]({{< relref "../permissions/overview.md" >}}) on folders, dashboards, and down to the [data source level]({{< relref "../enterprise/datasource_permissions.md" >}}) if you're using [Grafana Enterprise]({{< relref "../enterprise/_index.md" >}}).
+
+## Grafana Cloud
+
+Grafana Cloud is a highly available, fast, fully managed OpenSaaS logging and metrics platform. Everything you love about Grafana, but Grafana Labs hosts it for you and handles all the headaches.
+
+[Learn more about Grafana Cloud.](https://grafana.com/cloud/)
+
+## Grafana Enterprise
+
+[Grafana Enterprise]({{< relref "../enterprise/_index.md" >}}) 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.
+
+[Learn more about Grafana Enterprise](https://grafana.com/enterprise). To purchase Enterprise or obtain a trial license, contact the Grafana Labs [Sales Team](https://grafana.com/contact?about=support&topic=Grafana%20Enterprise).

docs/sources/guides/whats-new-in-v5.md

@@ -115,7 +115,7 @@ We also deprecated the `[dashboard.json]` in favor of our new dashboard provisio
 in sync with dashboards in Grafana's database. The dashboard provisioner has multiple advantages over the old
 `[dashboard.json]` feature. Instead of storing the dashboard in memory we now insert the dashboard into the database,
 which makes it possible to star them, use one as the home dashboard, set permissions and other features in Grafana that
-expects the dashboards to exist in the database. More info in the [dashboard provisioning docs](/administration/provisioning/#dashboards)
+expects the dashboards to exist in the database. More info in the [dashboard provisioning docs]({{< relref "../administration/provisioning.md" >}})
 
 
 ## Graphite Tags and Integrated Function Docs

docs/sources/guides/whats-new-in-v6-7.md

@@ -0,0 +1,96 @@
++++
+title = "What's New in Grafana v6.7"
+description = "Feature and improvement highlights for Grafana v6.7"
+keywords = ["grafana", "new", "documentation", "6.7", "release notes"]
+type = "docs"
+[menu.docs]
+name = "Version 6.7"
+identifier = "v6.7"
+parent = "whatsnew"
+weight = -16
++++
+
+# What's new in Grafana v6.7
+
+This topic includes the release notes for the Grafana v6.7, which is currently in beta. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md).
+
+Grafana 6.7 comes with a lot of new features and enhancements:
+
+- [**Dashboard:** Enforce minimum refresh interval]({{< relref "#enforce-minimum-dashboard-refresh-interval" >}})
+- **Data source:** Google Sheets data source 
+- [**Explore:** Query history]({{< relref "#query-history" >}})
+- [**Authorization:** Azure OAuth]({{< relref "#azure-oauth" >}})
+- [**Stackdriver:** Project Selector]({{< relref "#stackdriver-project-selector" >}})
+- [**Enterprise:** White Labeling for application title]({{< relref "#white-labeling-for-application-title" >}})
+- [**Enterprise:** Reporting configuration for timeout and concurrency]({{< relref "#reporting-configuration-for-timeout-and-concurrency" >}})
+- [**Enterprise:** Export dashboard as pdf]({{< relref "#export-dashboard-as-pdf" >}})
+- [**Enterprise:** Report landscape mode]({{< relref "#report-landscape-mode" >}})
+- [**Enterprise:** Azure OAuth Team Sync support]({{< relref "#azure-oauth-team-sync-support" >}})
+
+## General features
+
+General features are included in all Grafana editions.
+
+### Query history
+> BETA: Query history is a beta feature. It is local to your browser and is not shared with others.
+
+Query history is a new feature that lets you view and interact with the queries that you have previously run in Explore. You can add queries to the Explore query editor,  write comments, create and share URL links, star your favorite queries, and much more. Starred queries are displayed in Starred tab, so it is easier to reuse queries that you run often without typing them from scratch.
+
+Learn more about query history in [Explore]({{< relref "../features/explore" >}}).
+
+{{< docs-imagebox img="/img/docs/v67/rich-history.gif" max-width="1024px" caption="Query history" >}}
+
+### Azure OAuth
+Grafana v6.7 comes with a new OAuth integration for Microsoft Azure Active Directory. You can now assign users and groups to Grafana roles from the Azure Portal. Learn how to enable and configure it in [Azure AD OAuth2 authentication]({{< relref "../auth/azuread/" >}}).
+
+### Enforce minimum dashboard refresh interval
+
+Allowing a low dashboard refresh interval can cause severe load on data sources and Grafana. Grafana v6.7 allows you to restrict the dashboard refresh interval so it cannot be set lower than a given interval. This provides a way for administrators to control dashboard refresh behavior on a global level.
+
+Refer to min_refresh_interval in [Configuration]({{< relref "../installation/configuration#min-refresh-interval" >}}) for more information and how to enable this feature.
+
+### Stackdriver project selector
+
+A Stackdriver data source in Grafana is configured for one service account only. That service account is always associated with a default project in Google Cloud Platform (GCP). Depending on your setup in GCP, the service account might be granted access to more projects than just the default project. 
+
+In Grafana 6.7, the query editor has been enhanced with a project selector that makes it possible to query different projects without changing datasource. Many thanks [Eraac](https://github.com/Eraac), [eliaslaouiti](https://github.com/eliaslaouiti), and [NaurisSadovskis](https://github.com/NaurisSadovskis) for making this happen! 
+
+## Grafana Enterprise features
+
+General features are included in the Grafana Enterprise edition software.
+
+### White labeling customizes application title
+This release adds a new white labeling option to customize the application title. Learn how to configure it in [White labeling]({{< relref "../enterprise/white-labeling/" >}}).
+
+```
+[white_labeling]
+# Set to your company name to override application title
+app_title = Your Company
+```
+
+### Configure reporting for timeout and concurrency
+
+This release adds more configuration for the reporting feature rendering requests. You can set the panel rendering request timeout and the maximum number of concurrent calls to the rendering service in your configuration. Learn how to do it in [Reporting]({{< relref "../enterprise/reporting/" >}}).
+
+```
+[reporting]
+# Set timeout for each panel rendering request
+rendering_timeout = 10s
+# Set maximum number of concurrent calls to the rendering service
+concurrent_render_limit = 10
+```
+
+### Export dashboard as PDF
+
+This feature allows you to export a dashboard as a PDF document. All dashboard panels will be rendered as images and added into the PDF document. Learn more in [Export dashboard as PDF]({{< relref "../enterprise/export-pdf/" >}}).
+
+### Report landscape mode
+
+You can now use either portrait or landscape mode in your reports. Portrait will render three panels per page and landscape two.
+{{< docs-imagebox img="/img/docs/enterprise/reports_create_new.png" max-width="1024px" caption="New report" >}}
+
+[Reporting]({{< relref "../enterprise/reporting/" >}}) has been updated as a result of this change.
+
+### Azure OAuth Team Sync support
+When setting up OAuth with Microsoft Azure AD, you can now sync Azure groups with Teams in Grafana.
+Learn more in [Team sync]({{< relref "../enterprise/team-sync/" >}}).

docs/sources/http_api/admin.md

@@ -224,10 +224,13 @@ Content-Type: application/json
 **Example Response**:
 
 ```http
-
+HTTP/1.1 200
+Content-Type: application/json
 
 ```
 
+## Logout User
+
 `POST /api/admin/users/:id/logout`
 
 Logout user revokes all auth tokens (devices) for the user. User of issued auth tokens (devices) will no longer be logged in

docs/sources/http_api/folder.md

@@ -28,7 +28,7 @@ that you cannot use this API for retrieving information about the General folder
 
 `GET /api/folders`
 
-Returns all folders that the authenticated user has permission to view.
+Returns all folders that the authenticated user has permission to view. You can control the maximum number of folders returned through the `limit` query parameter, the default is 1000.
 
 **Example Request**:
 

docs/sources/http_api/user.md

@@ -38,14 +38,22 @@ Content-Type: application/json
 
 `GET /api/users/search?perpage=10&page=1&query=mygraf`
 
-**Example Request**:
+**Example Request**:
+
+```http
+GET /api/users/search?perpage=10&page=1&query=mygraf HTTP/1.1
+Accept: application/json
 Content-Type: application/json
 Authorization: Basic YWRtaW46YWRtaW4=
 ```
 
 Default value for the `perpage` parameter is `1000` and for the `page` parameter is `1`. The `totalCount` field in the response can be used for pagination of the user list E.g. if `totalCount` is equal to 100 users and the `perpage` parameter is set to 10 then there are 10 pages of users. The `query` parameter is optional and it will return results where the query value is contained in one of the `name`, `login` or `email` fields. Query values with spaces need to be URL encoded e.g. `query=Jane%20Doe`.
 
-```
+Requires basic authentication and that the authenticated user is a Grafana Admin.
+
+**Example Response**:
+
+```http
 HTTP/1.1 200
 Content-Type: application/json
 {
@@ -80,14 +88,22 @@ Content-Type: application/json
 **Example Request using the email as option**:
 
 ```http
-
+GET /api/users/lookup?loginOrEmail=user@mygraf.com HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
 
 **Example Request using the username as option**:
 
 ```http
 GET /api/users/lookup?loginOrEmail=admin HTTP/1.1
 Accept: application/json
-```http
+Content-Type: application/json
+Authorization: Basic YWRtaW46YWRtaW4=
+```
+
+Requires basic authentication and that the authenticated user is a Grafana Admin.
 
 **Example Response**:
 
@@ -127,7 +143,8 @@ Content-Type: application/json
 
 **Example Request**:
 
-Requires basic authentication and that the authenticated user is a Grafana Admin.
+```http
+GET /api/users/1/orgs HTTP/1.1
 Accept: application/json
 Content-Type: application/json
 Authorization: Basic YWRtaW46YWRtaW4=
@@ -173,7 +190,8 @@ Content-Type: application/json
 
 `GET /api/user`
 
-Requires basic authentication and that the authenticated user is a Grafana Admin.
+**Example Request**:
+
 ```http
 GET /api/user HTTP/1.1
 Accept: application/json
@@ -294,12 +312,19 @@ HTTP/1.1 200
 
 ## Teams that the actual User is member of
 
+`GET /api/user/teams`
 
 Return a list of all teams that the current user is member of.
 
 **Example Request**:
 
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```http
+GET /api/user/teams HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
 **Example Response**:
 
 ```http

docs/sources/installation/behind_proxy.md

@@ -1,166 +0,0 @@
-+++
-title = "Running Grafana behind a reverse proxy"
-description = "Guide for running Grafana behind a reverse proxy"
-keywords = ["grafana", "nginx", "documentation", "haproxy", "reverse"]
-type = "docs"
-[menu.docs]
-name = "Running Grafana behind a reverse proxy"
-parent = "tutorials"
-weight = 1
-+++
-
-
-# Running Grafana behind a reverse proxy
-
-It should be straight forward to get Grafana up and running behind a reverse proxy. But here are some things that you might run into.
-
-Links and redirects will not be rendered correctly unless you set the server.domain setting.
-```bash
-[server]
-domain = foo.bar
-```
-
-To use sub *path* ex `http://foo.bar/grafana` make sure to include `/grafana` in the end of root_url.
-Otherwise Grafana will not behave correctly. See example below.
-
-## Examples
-Here are some example configurations for running Grafana behind a reverse proxy.
-
-### Grafana configuration (ex http://foo.bar)
-
-```bash
-[server]
-domain = foo.bar
-```
-
-### Nginx configuration
-
-Nginx is a high performance load balancer, web server and reverse proxy: https://www.nginx.com/
-
-#### Nginx configuration with HTTP and Reverse Proxy enabled
-```bash
-server {
-  listen 80;
-  root /usr/share/nginx/html;
-  index index.html index.htm;
-
-  location / {
-   proxy_pass http://localhost:3000/;
-  }
-}
-```
-
-### Grafana configuration with hosting HTTPS in Nginx (ex https://foo.bar)
-
-```bash
-[server]
-domain = foo.bar
-root_url = https://foo.bar
-```
-
-#### Nginx configuration with HTTPS, Reverse Proxy, HTTP to HTTPS redirect and URL re-writes enabled
-
-Instead of http://foo.bar:3000/?orgId=1, this configuration will redirect all HTTP requests to HTTPS and re-write the URL so that port 3000 isn't visible and will result in https://foo.bar/?orgId=1
-
-```bash
-server {
-  listen 80;
-  server_name foo.bar;
-  return 301 https://foo.bar$request_uri;
-}
-
-server {
-  listen 443 ssl http2;
-  server_name foo.bar;
-  root /usr/share/nginx/html;
-  index index.html index.htm;
-  ssl_certificate /etc/nginx/certs/foo_bar.crt;
-  ssl_certificate_key /etc/nginx/certs/foo_bar_decrypted.key;
-  ssl_protocols TLSv1.2;
-  ssl_ciphers HIGH:!aNULL:!MD5;
-
-  location / {
-   rewrite /(.*) /$1  break;
-   proxy_pass http://localhost:3000/;
-   proxy_redirect off;
-   proxy_set_header Host $host;
-  }
-}
-```
-
-### Examples with **sub path** (ex http://foo.bar/grafana)
-
-#### Grafana configuration with sub path
-```bash
-[server]
-domain = foo.bar
-root_url = %(protocol)s://%(domain)s/grafana/
-```
-
-#### Nginx configuration with sub path
-```bash
-server {
-  listen 80;
-  root /usr/share/nginx/www;
-  index index.html index.htm;
-
-  location /grafana/ {
-   proxy_pass http://localhost:3000/;
-  }
-}
-```
-
-#### HAProxy configuration with sub path
-```bash
-frontend http-in
-  bind *:80
-  use_backend grafana_backend if { path /grafana } or { path_beg /grafana/ }
-
-backend grafana_backend
-  # Requires haproxy >= 1.6
-  http-request set-path %[path,regsub(^/grafana/?,/)]
-
-  # Works for haproxy < 1.6
-  # reqrep ^([^\ ]*\ /)grafana[/]?(.*) \1\2
-
-  server grafana localhost:3000
-```
-
-### IIS URL Rewrite Rule (Windows) with Subpath
-
-IIS requires that the URL Rewrite module is installed.
-
-Given:
-
-- subpath `grafana`
-- Grafana installed on `http://localhost:3000`
-- server config:
-
-    ```bash
-    [server]
-    domain = localhost:8080
-    root_url = %(protocol)s://%(domain)s/grafana/
-    ```
-
-Create an Inbound Rule for the parent website (localhost:8080 in this example) in IIS Manager with the following settings:
-
-- pattern: `grafana(/)?(.*)`
-- check the `Ignore case` checkbox
-- rewrite URL set to `http://localhost:3000/{R:2}`
-- check the `Append query string` checkbox
-- check the `Stop processing of subsequent rules` checkbox
-
-This is the rewrite rule that is generated in the `web.config`:
-
-```xml
-  <rewrite>
-      <rules>
-          <rule name="Grafana" enabled="true" stopProcessing="true">
-              <match url="grafana(/)?(.*)" />
-              <action type="Rewrite" url="http://localhost:3000/{R:2}" logRewrittenUrl="false" />
-          </rule>
-      </rules>
-  </rewrite>
-```
-
-See the [tutorial on IIS URL Rewrites](http://docs.grafana.org/tutorials/iis/) for more in-depth instructions.

docs/sources/installation/configuration.md

@@ -81,8 +81,7 @@ export GF_AUTH_GOOGLE_CLIENT_SECRET=newS3cretKey
 
 ## instance_name
 
-Set the name of the grafana-server instance. Used in logging and internal metrics and in
-clustering info. Defaults to: `${HOSTNAME}`, which will be replaced with
+Set the name of the grafana-server instance. Used in logging, internal metrics, and clustering info. Defaults to: `${HOSTNAME}`, which will be replaced with
 environment variable `HOSTNAME`, if that is empty or does not exist Grafana will try to use
 system calls to get the machine name.
 
@@ -450,6 +449,11 @@ Text used as placeholder text on login page for password input.
 Grafana provides many ways to authenticate users. The docs for authentication has been split in to many different pages
 below.
 
+### oauth_state_cookie_max_age
+
+How long the OAuth state cookie lives before being deleted. Default is `60` (seconds)
+Administrators can increase it if they experience OAuth login state mismatch errors.
+
 - [Authentication Overview]({{< relref "../auth/overview.md" >}}) (anonymous access options, hide login and more)
 - [Google OAuth]({{< relref "../auth/google.md" >}}) (auth.google)
 - [GitHub OAuth]({{< relref "../auth/github.md" >}}) (auth.github)
@@ -506,7 +510,7 @@ Number dashboard versions to keep (per dashboard). Default: `20`, Minimum: `1`.
 
 > Only available in Grafana v6.7+.
 
-When set, this will restrict users to set the refresh interval of a dashboard lower than given interval. Per default this is not set/unrestricted.
+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`.
 
 ## [dashboards.json]
@@ -639,6 +643,8 @@ Syslog tag. By default, the process's `argv[0]` is used.
 
 ## [metrics]
 
+For detailed instructions, refer to [Internal Grafana metrics]({{< relref "../administration/metrics.md" >}}).
+
 ### enabled
 Enable metrics reporting. defaults true. Available via HTTP API `/metrics`.
 
@@ -816,6 +822,11 @@ URL to a remote HTTP image renderer service, e.g. http://localhost:8081/render,
 
 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/.
 
+### concurrent_render_request_limit
+
+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.
+
 ## [panels]
 
 ### disable_sanitize_html
@@ -844,7 +855,7 @@ for the full list. Environment variables will override any settings provided her
 
 ### address
 
-The host:port destination for reporting spans. (ex: `localhost:6381`)
+The host:port destination for reporting spans. (ex: `localhost:6831`)
 
 Can be set with the environment variables `JAEGER_AGENT_HOST` and `JAEGER_AGENT_PORT`.
 

docs/sources/installation/requirements.md

@@ -54,6 +54,8 @@ Grafana supports the following databases:
 
 By default, Grafana installs with and uses SQLite, which is an embedded database stored in the Grafana installation location.
 
+> NOTE: PostgreSQL versions 9.5.18, 9.4.23, 9.6.14, 10.9, 11.4, and 12-beta2 are affected by a bug (tracked by the PostgreSQL project as [bug #15865](https://www.postgresql.org/message-id/flat/15865-17940eacc8f8b081%40postgresql.org)) which prevents those versions from being used with Grafana. The bug has been fixed in more recent versions of PostgreSQL.
+
 ## Supported web browsers
 
 Grafana is supported in the current version of the following browsers. Older versions of these browsers might not be supported, so you should always upgrade to the latest version when using Grafana.

docs/sources/installation/upgrading.md

@@ -13,7 +13,7 @@ weight = 800
 # Upgrade Grafana
 
 We recommend that you upgrade Grafana often to stay up to date with the latest fixes and enhancements.
-In order make this a reality, Grafana upgrades are backward compatible and the upgrade process is simple and quick.
+In order to make this a reality, Grafana upgrades are backward compatible and the upgrade process is simple and quick.
 
 Upgrading is generally safe (between many minor and one major version) and dashboards and graphs will look the same. There may be minor breaking changes in some edge cases, which are outlined in the [Release Notes](https://community.grafana.com/c/releases) and [Changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md)
 
@@ -81,6 +81,7 @@ If you installed Grafana from our APT repository, then Grafana will automaticall
 
 ```bash
 sudo apt-get update
+sudo apt-get upgrade
 ```
 
 #### Upgrade from binary .tar file
@@ -237,3 +238,13 @@ Due to this change in Chrome, the `[security]` setting `cookie_samesite` configu
 
 This version of Chrome also rejects insecure `SameSite=None` cookies. See https://www.chromestatus.com/feature/5633521622188032 for more information. Make sure that you
 change the `[security]` setting `cookie_secure` to `true` and use HTTPS when `cookie_samesite` is configured to `none`, otherwise authentication in Grafana won't work properly.
+
+## Upgrading to v7.0
+
+### PhantomJS removed
+
+PhantomJS was deprecated in [Grafana v6.4](https://grafana.com/docs/grafana/latest/guides/whats-new-in-v6-4/#phantomjs-deprecation) and starting from Grafana v7.0.0, all PhantomJS support has been removed. This means that Grafana no longer ships with a built-in image renderer, and we adwise you to install the [Grafana Image Renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer).
+
+### Dashboard minimum refresh interval enforced
+
+A global minimum dashboard refresh interval is now enforced and defaults to 5 seconds. Read more [here]({{< relref "configuration/#min-refresh-interval" >}}) about this setting.

docs/sources/menu.yaml

@@ -1,6 +1,8 @@
 - name: Getting started
   link: /guides/
   children:
+  - name: What is Grafana?
+    link: /guides/what-is-grafana/
   - name: Getting started
     link: /guides/getting_started/
   - name: Intro to time series
@@ -12,15 +14,15 @@
   children:
   - name: Requirements
     link: /installation/requirements/
-  - name: Install on Ubuntu / Debian
+  - name: Install on Ubuntu/Debian
     link: /installation/debian/
-  - name: Install on Centos / Redhat
+  - name: Install on Centos/RedHat/SUSE
     link: /installation/rpm/
   - name: Install on Windows
     link: /installation/windows/
   - name: Install on macOS
     link: /installation/mac/
-  - name: Install using Docker
+  - name: Run Docker image
     link: /installation/docker/
   - name: Upgrade Grafana
     link: /installation/upgrading/
@@ -54,6 +56,8 @@
       name: GitHub
     - link: /auth/gitlab/
       name: GitLab
+    - link: /auth/okta/
+      name: Okta
     - link: /auth/saml/
       name: SAML
     - link: /auth/team-sync/
@@ -68,13 +72,15 @@
     - link: /permissions/dashboard_folder_permissions/
       name: Dashboard and Folder
     - link: /permissions/datasource_permissions/
-      name: Datasource
+      name: Data source
   - name: Grafana CLI
     link: /administration/cli/
   - name: Internal metrics
     link: /administration/metrics/
   - name: Provisioning
     link: /administration/provisioning/
+  - name: Set up Grafana for high availability
+    link: /tutorials/ha_setup/
   - name: Troubleshooting
     link: /installation/troubleshooting/
 - name: Features
@@ -107,7 +113,7 @@
       name: Dashboard list
     - link: /features/panels/text/
       name: Text
-  - name: Dashboard Features
+  - name: Dashboard features
     link: /features/dashboard/
     children:
     - link: /features/dashboard/dashboards/
@@ -138,9 +144,11 @@
       name: JSON Model
     - link: /reference/scripting/
       name: Scripted dashboards
-  - name: Data Sources
+  - name: Data sources
     link: /features/datasources/
     children:
+    - link: /features/datasources/add-a-data-source/
+      name: Add data source
     - link: /features/datasources/cloudwatch/
       name: AWS Cloudwatch
     - link: /features/datasources/azuremonitor/
@@ -168,7 +176,7 @@
     - link: /features/datasources/prometheus/
       name: Prometheus
     - link: /features/datasources/testdata/
-      name: Testdata
+      name: TestData DB
   - name: Explore
     link: /features/explore/
   - name: Alerting
@@ -188,9 +196,11 @@
     link: /features/reporting/
   - name: Navigation links
     link: /features/navigation-links/
-- name: What's New In Grafana
+- name: What's new in Grafana
   link: /whatsnew/
   children:
+  - name: Version 6.7
+    link: /guides/whats-new-in-v6-7/
   - name: Version 6.6
     link: /guides/whats-new-in-v6-6/
   - name: Version 6.5
@@ -205,19 +215,19 @@
     link: /guides/whats-new-in-v6-1/
   - name: Version 6.0
     link: /guides/whats-new-in-v6-0/
-  - name: Version 5.4
-    link: /guides/whats-new-in-v5-4/
-  - name: Version 5.3
-    link: /guides/whats-new-in-v5-3/
-  - name: Version 5.2
-    link: /guides/whats-new-in-v5-2/
-  - name: Version 5.1
-    link: /guides/whats-new-in-v5-1/
-  - name: Version 5.0
-    link: /guides/whats-new-in-v5/
   - name: Old versions
     link: /whatsnew/
     children:
+    - name: Version 5.4
+      link: /guides/whats-new-in-v5-4/
+    - name: Version 5.3
+      link: /guides/whats-new-in-v5-3/
+    - name: Version 5.2
+      link: /guides/whats-new-in-v5-2/
+    - name: Version 5.1
+      link: /guides/whats-new-in-v5-1/
+    - name: Version 5.0
+      link: /guides/whats-new-in-v5/
     - name: Version 4.6
       link: /guides/whats-new-in-v4-6/
     - name: Version 4.5
@@ -241,12 +251,12 @@
   children:
   - name: Overview
     link: /enterprise/
-  - name: Reporting
-    link: /enterprise/reporting/
   - name: Data source permissions
     link: /enterprise/datasource_permissions/
   - name: Enhanced LDAP
     link: /enterprise/enhanced_ldap/
+  - name: Reporting
+    link: /enterprise/reporting/
   - name: SAML authentication
     link: /enterprise/saml/
   - name: Team sync
@@ -255,19 +265,8 @@
     link: /enterprise/white-labeling/
   - name: License expiration
     link: /enterprise/license-expiration/
-- name: Tutorials
-  link: /tutorials/
-  children:
-  - name: Run Grafana behind a reverse proxy
-    link: /installation/behind_proxy/
-  - name: 'API Tutorial: How To Create API Tokens And Dashboards For A Specific Organization'
-    link: /tutorials/api_org_token_howto/
-  - name: Run Grafana with IIS Reverse Proxy on Windows
-    link: /tutorials/iis/
-  - name: Integrate Hubot and Grafana
-    link: /tutorials/hubot_howto/
-  - name: Set up Grafana for High availability
-    link: /tutorials/ha_setup/
+  - name: Export dashboard as PDF
+    link: /enterprise/export-pdf/
 - name: Plugins
   link: /plugins/
   children:
@@ -298,56 +297,60 @@
       name: Snapshot Mode
     - link: /plugins/developing/plugin.json/
       name: plugin.json Schema
-- name: HTTP API
+- name: HTTP APIs
   link: /http_api/
   children:
   - name: API Authentication
     link: /http_api/auth/
-  - name: Admin
+  - name: Create API Tokens and Dashboards for a Specific Organization
+    link: /tutorials/api_org_token_howto/
+  - name: Admin API
     link: /http_api/admin/
-  - name: Alerting
+  - name: Alerting API
     link: /http_api/alerting/
-  - name: Alerting Notification Channels
+  - name: Alerting Notifications API
     link: /http_api/alerting_notification_channels/
-  - name: Annotations
+  - name: Annotations API
     link: /http_api/annotations/
-  - name: Dashboard
+  - name: Dashboard API
     link: /http_api/dashboard/
-  - name: Dashboard Permissions
+  - name: Dashboard Permissions API
     link: /http_api/dashboard_permissions/
-  - name: Dashboard Versions
+  - name: Dashboard Versions API
     link: /http_api/dashboard_versions/
-  - name: Data source
+  - name: Data Source API
     link: /http_api/data_source/
-  - name: Datasource Permissions
+  - name: Data source Permissions API
     link: /http_api/datasource_permissions/
-  - name: External Group Sync
+  - name: External Group Sync API
     link: /http_api/external_group_sync/
-  - name: Folder
+  - name: Folder API
     link: /http_api/folder/
-  - name: Folder Permissions
+  - name: Folder Permissions API
     link: /http_api/folder_permissions/
-  - name: Folder/dashboard search
+  - name: Folder/Dashboard Search API
     link: /http_api/folder_dashboard_search/
-  - name: Organization
+  - name: Organization API
     link: /http_api/org/
-  - name: Other
+  - name: Other APIs
     link: /http_api/other/
-  - name: Playlist
+  - name: Playlist API
     link: /http_api/playlist/
-  - name: Preferences
+  - name: Preferences API
     link: /http_api/preferences/
-  - name: Snapshot
+  - name: Snapshot API
     link: /http_api/snapshot/
-  - name: Teams
+  - name: Teams API
     link: /http_api/team/
-  - name: Users
+  - name: Users API
     link: /http_api/user/
 - name: Developers
   link: /developers/
   children:
   - name: Developer resources
     link: /developers/developer-resources/
+  - name: Packages reference
+    link: /packages_api/
   - name: Contributor License Agreement (CLA)
     link: /developers/cla/
 - name: Docs Archive

docs/sources/packages_api/_index.md

@@ -5,7 +5,6 @@
 title = "API Reference"
 keywords = ["grafana","documentation","sdk"]
 type = "docs"
-draft = true
 +++
 
 ## API Reference
@@ -16,6 +15,7 @@ draft = true
 |  --- | --- |
 |  [@grafana/data](./data/) | A library containing most of the core functionality and data types used in Grafana. |
 |  [@grafana/e2e](./e2e/) | A library for writing end-to-end tests for Grafana and its ecosystem. |
+|  [@grafana/e2e-selectors](./e2e-selectors/) | A library containing the different design components of the Grafana ecosystem. |
 |  [@grafana/runtime](./runtime/) | A library containing services, configurations etc. used to interact with the Grafana engine. |
 |  [@grafana/ui](./ui/) | A library containing the different design components of the Grafana ecosystem. |
 

docs/sources/packages_api/data/_index.md

@@ -5,7 +5,6 @@
 title = "@grafana/data"
 keywords = ["grafana","documentation","sdk","@grafana/data"]
 type = "docs"
-draft = true
 +++
 
 ## @grafana/data package
@@ -27,9 +26,12 @@ A library containing most of the core functionality and data types used in Grafa
 |  [DataSourceApi](./datasourceapi/) | The main data source abstraction interface, represents an instance of a data source<!-- -->Although this is a class, datasource implementations do not \*yet\* need to extend it. As such, we can not yet add functions with default implementations. |
 |  [DataSourcePlugin](./datasourceplugin/) |  |
 |  [FieldCache](./fieldcache/) |  |
+|  [FieldConfigEditorBuilder](./fieldconfigeditorbuilder/) | Fluent API for declarative creation of field config option editors |
+|  [FieldConfigOptionsRegistry](./fieldconfigoptionsregistry/) |  |
 |  [GrafanaPlugin](./grafanaplugin/) |  |
 |  [LanguageProvider](./languageprovider/) |  |
 |  [MutableDataFrame](./mutabledataframe/) |  |
+|  [PanelOptionsEditorBuilder](./paneloptionseditorbuilder/) | Fluent API for declarative creation of panel options |
 |  [PanelPlugin](./panelplugin/) |  |
 |  [Registry](./registry/) |  |
 |  [ScaledVector](./scaledvector/) |  |
@@ -46,11 +48,12 @@ A library containing most of the core functionality and data types used in Grafa
 |  [DataTransformerID](./datatransformerid/) |  |
 |  [ExploreMode](./exploremode/) |  |
 |  [FieldColorMode](./fieldcolormode/) |  |
+|  [FieldConfigProperty](./fieldconfigproperty/) |  |
 |  [FieldMatcherID](./fieldmatcherid/) |  |
 |  [FieldType](./fieldtype/) |  |
 |  [FrameMatcherID](./framematcherid/) | Field name matchers |
 |  [GrafanaThemeType](./grafanathemetype/) |  |
-|  [LoadingState](./loadingstate/) |  |
+|  [LoadingState](./loadingstate/) | Represent panel data loading state. |
 |  [LogLevel](./loglevel/) | Mapping of log level abbreviation to canonical log level. Supported levels are reduce to limit color variation. |
 |  [LogsDedupDescription](./logsdedupdescription/) |  |
 |  [LogsDedupStrategy](./logsdedupstrategy/) |  |
@@ -60,10 +63,11 @@ A library containing most of the core functionality and data types used in Grafa
 |  [NullValueMode](./nullvaluemode/) |  |
 |  [OrgRole](./orgrole/) |  |
 |  [PluginIncludeType](./pluginincludetype/) |  |
+|  [PluginSignatureStatus](./pluginsignaturestatus/) |  |
 |  [PluginState](./pluginstate/) |  |
 |  [PluginType](./plugintype/) |  |
 |  [ReducerID](./reducerid/) |  |
-|  [ThresholdsMode](./thresholdsmode/) |  |
+|  [ThresholdsMode](./thresholdsmode/) | Display mode |
 |  [VariableOrigin](./variableorigin/) |  |
 |  [VariableSuggestionsScope](./variablesuggestionsscope/) |  |
 |  [VizOrientation](./vizorientation/) |  |
@@ -79,6 +83,7 @@ A library containing most of the core functionality and data types used in Grafa
 |  [calculateFieldStats(rows, extractor)](./calculatefieldstats/) |  |
 |  [calculateLogsLabelStats(rows, label)](./calculatelogslabelstats/) |  |
 |  [calculateStats(values)](./calculatestats/) |  |
+|  [doStandardCalcs(field, ignoreNulls, nullAsZero)](./dostandardcalcs/) |  |
 |  [eventFactory(name)](./eventfactory/) |  |
 |  [findCommonLabels(labelsSets)](./findcommonlabels/) | Returns a map labels that are common to the given label sets. |
 |  [findHighlightChunksInText({ searchWords, textToHighlight, })](./findhighlightchunksintext/) | Adapt findMatchesInText for react-highlight-words findChunks handler. See https://github.com/bvaughn/react-highlight-words\#props |
@@ -104,6 +109,7 @@ A library containing most of the core functionality and data types used in Grafa
 |  [getValueFormatterIndex()](./getvalueformatterindex/) |  |
 |  [grafanaDataFrameToArrowTable(data)](./grafanadataframetoarrowtable/) |  |
 |  [guessFieldTypeForField(field)](./guessfieldtypeforfield/) | Looks at the data to guess the column type. This ignores any existing setting |
+|  [guessFieldTypeFromNameAndValue(name, v)](./guessfieldtypefromnameandvalue/) | Given a name and value, this will pick a reasonable field type |
 |  [guessFieldTypeFromValue(v)](./guessfieldtypefromvalue/) | Given a value this will guess the best column type<!-- -->TODO: better Date/Time support! Look for standard date strings? |
 |  [locale(value, decimals)](./locale/) |  |
 |  [parseFlags(text)](./parseflags/) | Converts any mode modifiers in the text to the Javascript equivalent flag |
@@ -131,35 +137,41 @@ A library containing most of the core functionality and data types used in Grafa
 |  [toNumberString(value)](./tonumberstring/) |  |
 |  [transformDataFrame(options, data)](./transformdataframe/) | Apply configured transformations to the input data |
 |  [updateDatasourcePluginOption(props, key, val)](./updatedatasourcepluginoption/) |  |
-|  [updateDatasourcePluginResetOption(props, key)](./updatedatasourcepluginresetoption/) |  |
 |  [validateFieldConfig(config)](./validatefieldconfig/) | This checks that all options on FieldConfig make sense. It mutates any value that needs fixed. In particular this makes sure that the first threshold value is -Infinity (not valid in JSON) |
+|  [vectorator(vector)](./vectorator/) | Use functional programming with your vector |
 
 ## Interfaces
 
 |  Interface | Description |
 |  --- | --- |
 |  [AbsoluteTimeRange](./absolutetimerange/) |  |
-|  [AngularPanelMenuItem](./angularpanelmenuitem/) |  |
 |  [AnnotationEvent](./annotationevent/) |  |
 |  [AnnotationQueryRequest](./annotationqueryrequest/) | Options passed to the datasource.annotationQuery method. See docs/plugins/developing/datasource.md |
 |  [AppEvent](./appevent/) |  |
+|  [ApplyFieldOverrideOptions](./applyfieldoverrideoptions/) |  |
 |  [AppPluginMeta](./apppluginmeta/) |  |
 |  [AppRootProps](./approotprops/) |  |
 |  [ArrowDataFrame](./arrowdataframe/) |  |
+|  [BuildInfo](./buildinfo/) | Describes the build information that will be available via the Grafana configuration. |
+|  [CalculateFieldTransformerOptions](./calculatefieldtransformeroptions/) |  |
+|  [ColorFieldConfigSettings](./colorfieldconfigsettings/) |  |
 |  [Column](./column/) |  |
 |  [ConfigOverrideRule](./configoverriderule/) |  |
 |  [CreatePlotOverlay](./createplotoverlay/) |  |
 |  [CSVConfig](./csvconfig/) |  |
 |  [CSVOptions](./csvoptions/) |  |
 |  [CSVParseCallbacks](./csvparsecallbacks/) |  |
+|  [DataConfigSource](./dataconfigsource/) | Describes and API for exposing panel specific data configurations. |
 |  [DataFrame](./dataframe/) |  |
 |  [DataFrameDTO](./dataframedto/) | Like a DataFrame, but fields may be a FieldDTO |
 |  [DataLink](./datalink/) | Link configuration. The values may contain variables that need to be processed before running |
 |  [DataLinkClickEvent](./datalinkclickevent/) | Callback info for DataLink click events |
-|  [DataQuery](./dataquery/) |  |
+|  [DataLinksFieldConfigSettings](./datalinksfieldconfigsettings/) |  |
+|  [DataQuery](./dataquery/) | These are the common properties available to all queries in all datasources Specific implementations will extend this interface adding the required properties for the given context |
 |  [DataQueryError](./dataqueryerror/) |  |
 |  [DataQueryRequest](./dataqueryrequest/) |  |
 |  [DataQueryResponse](./dataqueryresponse/) |  |
+|  [DataQueryTimings](./dataquerytimings/) |  |
 |  [DataSourceConstructor](./datasourceconstructor/) |  |
 |  [DataSourceInstanceSettings](./datasourceinstancesettings/) | Frontend settings model that is passed to Datasource constructor. This differs a bit from the model above as this data model is available to every user who has access to a data source (Viewers+). This is loaded in bootData (on page load), or from: /api/frontend/settings |
 |  [DataSourceJsonData](./datasourcejsondata/) |  |
@@ -174,6 +186,9 @@ A library containing most of the core functionality and data types used in Grafa
 |  [DateTimeBuiltinFormat](./datetimebuiltinformat/) |  |
 |  [DateTimeDuration](./datetimeduration/) |  |
 |  [DateTimeLocale](./datetimelocale/) |  |
+|  [DateTimeOptions](./datetimeoptions/) |  |
+|  [DateTimeOptionsWhenParsing](./datetimeoptionswhenparsing/) |  |
+|  [DateTimeOptionsWithFormat](./datetimeoptionswithformat/) |  |
 |  [DecimalInfo](./decimalinfo/) |  |
 |  [Dimension](./dimension/) |  |
 |  [DisplayValue](./displayvalue/) |  |
@@ -181,19 +196,20 @@ A library containing most of the core functionality and data types used in Grafa
 |  [DynamicConfigValue](./dynamicconfigvalue/) |  |
 |  [ExploreQueryFieldProps](./explorequeryfieldprops/) |  |
 |  [ExploreStartPageProps](./explorestartpageprops/) |  |
+|  [FeatureToggles](./featuretoggles/) | Describes available feature toggles in Grafana. These can be configured via the <code>conf/custom.ini</code> to enable features under development or not yet available in stable version. |
 |  [Field](./field/) |  |
 |  [FieldCalcs](./fieldcalcs/) |  |
 |  [FieldColor](./fieldcolor/) |  |
 |  [FieldConfig](./fieldconfig/) | Every property is optional<!-- -->Plugins may extend this with additional properties. Something like series overrides |
+|  [FieldConfigEditorConfig](./fieldconfigeditorconfig/) |  |
 |  [FieldConfigEditorProps](./fieldconfigeditorprops/) |  |
+|  [FieldConfigPropertyItem](./fieldconfigpropertyitem/) |  |
 |  [FieldConfigSource](./fieldconfigsource/) |  |
 |  [FieldDisplay](./fielddisplay/) |  |
-|  [FieldDisplayOptions](./fielddisplayoptions/) |  |
 |  [FieldDTO](./fielddto/) | Like a field, but properties are optional and values may be a simple array |
 |  [FieldMatcherInfo](./fieldmatcherinfo/) |  |
 |  [FieldOverrideContext](./fieldoverridecontext/) |  |
 |  [FieldOverrideEditorProps](./fieldoverrideeditorprops/) |  |
-|  [FieldPropertyEditorItem](./fieldpropertyeditoritem/) |  |
 |  [FieldReducerInfo](./fieldreducerinfo/) |  |
 |  [FieldWithIndex](./fieldwithindex/) |  |
 |  [FilterFieldsByNameTransformerOptions](./filterfieldsbynametransformeroptions/) |  |
@@ -202,12 +218,14 @@ A library containing most of the core functionality and data types used in Grafa
 |  [FormattedValue](./formattedvalue/) |  |
 |  [FrameMatcherInfo](./framematcherinfo/) |  |
 |  [GetFieldDisplayValuesOptions](./getfielddisplayvaluesoptions/) |  |
+|  [GrafanaConfig](./grafanaconfig/) | Describes all the different Grafana configuration values available for an instance. |
 |  [GrafanaTheme](./grafanatheme/) |  |
 |  [GrafanaThemeCommons](./grafanathemecommons/) |  |
 |  [GraphSeriesXY](./graphseriesxy/) | View model projection of a series |
 |  [HistoryItem](./historyitem/) |  |
 |  [IntervalValues](./intervalvalues/) |  |
 |  [Labels](./labels/) |  |
+|  [LicenseInfo](./licenseinfo/) | Describes the license information about the current running instance of Grafana. |
 |  [LinkModel](./linkmodel/) | Processed Link Model. The values are ready to use |
 |  [LinkModelSupplier](./linkmodelsupplier/) | Provides a way to produce links on demand<!-- -->TODO: ScopedVars in in GrafanaUI package! |
 |  [LogLabelStatsModel](./loglabelstatsmodel/) |  |
@@ -220,13 +238,17 @@ A library containing most of the core functionality and data types used in Grafa
 |  [MetadataInspectorProps](./metadatainspectorprops/) |  |
 |  [MetricFindValue](./metricfindvalue/) |  |
 |  [MutableVector](./mutablevector/) | Vector with standard manipulation functions |
-|  [NavModel](./navmodel/) |  |
+|  [NavModel](./navmodel/) | Interface used to describe different kinds of page titles and page navigation. Navmodels are usually generated in the backend and stored in Redux. |
 |  [NavModelBreadcrumb](./navmodelbreadcrumb/) |  |
 |  [NavModelItem](./navmodelitem/) |  |
+|  [NumberFieldConfigSettings](./numberfieldconfigsettings/) |  |
+|  [OrganizeFieldsTransformerOptions](./organizefieldstransformeroptions/) |  |
 |  [PanelData](./paneldata/) |  |
 |  [PanelEditorProps](./paneleditorprops/) |  |
-|  [PanelMenuItem](./panelmenuitem/) |  |
 |  [PanelModel](./panelmodel/) |  |
+|  [PanelOptionsEditorConfig](./paneloptionseditorconfig/) |  |
+|  [PanelOptionsEditorItem](./paneloptionseditoritem/) |  |
+|  [PanelOptionsEditorProps](./paneloptionseditorprops/) |  |
 |  [PanelPluginMeta](./panelpluginmeta/) |  |
 |  [PanelProps](./panelprops/) |  |
 |  [PluginBuildInfo](./pluginbuildinfo/) |  |
@@ -242,9 +264,12 @@ A library containing most of the core functionality and data types used in Grafa
 |  [QueryHint](./queryhint/) |  |
 |  [QueryResultBase](./queryresultbase/) |  |
 |  [QueryResultMeta](./queryresultmeta/) |  |
+|  [QueryResultMetaNotice](./queryresultmetanotice/) | QueryResultMetaNotice is a structure that provides user notices for query result data |
+|  [QueryResultMetaStat](./queryresultmetastat/) |  |
 |  [RangeMap](./rangemap/) |  |
 |  [RawTimeRange](./rawtimerange/) |  |
 |  [ReadWriteVector](./readwritevector/) | Apache arrow vectors are Read/Write |
+|  [ReduceDataOptions](./reducedataoptions/) | Options for how to turn DataFrames into an array of display values |
 |  [ReduceTransformerOptions](./reducetransformeroptions/) |  |
 |  [RegistryItem](./registryitem/) |  |
 |  [RegistryItemWithOptions](./registryitemwithoptions/) |  |
@@ -253,18 +278,30 @@ A library containing most of the core functionality and data types used in Grafa
 |  [ScopedVars](./scopedvars/) |  |
 |  [ScreenshotInfo](./screenshotinfo/) |  |
 |  [SelectableValue](./selectablevalue/) | Used in select elements |
+|  [SelectFieldConfigSettings](./selectfieldconfigsettings/) |  |
+|  [SeriesToColumnsOptions](./seriestocolumnsoptions/) |  |
+|  [StandardEditorProps](./standardeditorprops/) |  |
+|  [StandardEditorsRegistryItem](./standardeditorsregistryitem/) |  |
+|  [StringFieldConfigSettings](./stringfieldconfigsettings/) |  |
 |  [TableData](./tabledata/) |  |
 |  [TextMatch](./textmatch/) |  |
 |  [Threshold](./threshold/) |  |
-|  [ThresholdsConfig](./thresholdsconfig/) |  |
+|  [ThresholdsConfig](./thresholdsconfig/) | Config that is passed to the ThresholdsEditor |
+|  [ThresholdsFieldConfigSettings](./thresholdsfieldconfigsettings/) |  |
 |  [TimeOption](./timeoption/) |  |
 |  [TimeOptions](./timeoptions/) |  |
 |  [TimeRange](./timerange/) |  |
 |  [TimeSeries](./timeseries/) |  |
+|  [TransformerRegistyItem](./transformerregistyitem/) |  |
+|  [TransformerUIProps](./transformeruiprops/) |  |
+|  [UnitFieldConfigSettings](./unitfieldconfigsettings/) |  |
 |  [UserOrgDTO](./userorgdto/) |  |
 |  [ValueFormat](./valueformat/) |  |
 |  [ValueFormatCategory](./valueformatcategory/) |  |
+|  [ValueLinkConfig](./valuelinkconfig/) |  |
 |  [ValueMap](./valuemap/) |  |
+|  [ValueMappingFieldConfigSettings](./valuemappingfieldconfigsettings/) |  |
+|  [VariableModel](./variablemodel/) |  |
 |  [VariableSuggestion](./variablesuggestion/) |  |
 |  [Vector](./vector/) |  |
 |  [YAxis](./yaxis/) |  |
@@ -282,10 +319,19 @@ A library containing most of the core functionality and data types used in Grafa
 
 |  Variable | Description |
 |  --- | --- |
+|  [booleanOverrideProcessor](./booleanoverrideprocessor/) |  |
 |  [createDimension](./createdimension/) |  |
+|  [createOrderFieldsComparer](./createorderfieldscomparer/) |  |
+|  [DataLinkBuiltInVars](./datalinkbuiltinvars/) |  |
+|  [dataLinksOverrideProcessor](./datalinksoverrideprocessor/) |  |
 |  [dateTime](./datetime/) |  |
 |  [dateTimeAsMoment](./datetimeasmoment/) |  |
+|  [dateTimeFormat](./datetimeformat/) |  |
+|  [dateTimeFormatISO](./datetimeformatiso/) |  |
+|  [dateTimeFormatTimeAgo](./datetimeformattimeago/) |  |
+|  [dateTimeFormatWithAbbrevation](./datetimeformatwithabbrevation/) |  |
 |  [dateTimeForTimeZone](./datetimefortimezone/) |  |
+|  [dateTimeParse](./datetimeparse/) |  |
 |  [DEFAULT\_DATE\_TIME\_FORMAT](./default_date_time_format/) |  |
 |  [DEFAULT\_FIELD\_DISPLAY\_VALUES\_LIMIT](./default_field_display_values_limit/) |  |
 |  [DefaultTimeRange](./defaulttimerange/) |  |
@@ -315,31 +361,48 @@ A library containing most of the core functionality and data types used in Grafa
 |  [getValueFromDimension](./getvaluefromdimension/) |  |
 |  [guessFieldTypes](./guessfieldtypes/) |  |
 |  [hasMsResolution](./hasmsresolution/) | Checks if series time field has ms resolution |
+|  [identityOverrideProcessor](./identityoverrideprocessor/) |  |
 |  [isDataFrame](./isdataframe/) |  |
 |  [isDateTime](./isdatetime/) |  |
 |  [ISO\_8601](./iso_8601/) |  |
 |  [isTableData](./istabledata/) |  |
+|  [locationUtil](./locationutil/) |  |
 |  [LogsParsers](./logsparsers/) |  |
 |  [MISSING\_VALUE](./missing_value/) |  |
 |  [MS\_DATE\_TIME\_FORMAT](./ms_date_time_format/) |  |
+|  [numberOverrideProcessor](./numberoverrideprocessor/) |  |
 |  [objRemoveUndefined](./objremoveundefined/) |  |
 |  [onUpdateDatasourceJsonDataOption](./onupdatedatasourcejsondataoption/) |  |
+|  [onUpdateDatasourceJsonDataOptionChecked](./onupdatedatasourcejsondataoptionchecked/) |  |
 |  [onUpdateDatasourceJsonDataOptionSelect](./onupdatedatasourcejsondataoptionselect/) |  |
 |  [onUpdateDatasourceOption](./onupdatedatasourceoption/) |  |
 |  [onUpdateDatasourceResetOption](./onupdatedatasourceresetoption/) |  |
 |  [onUpdateDatasourceSecureJsonDataOption](./onupdatedatasourcesecurejsondataoption/) |  |
 |  [onUpdateDatasourceSecureJsonDataOptionSelect](./onupdatedatasourcesecurejsondataoptionselect/) |  |
+|  [selectOverrideProcessor](./selectoverrideprocessor/) |  |
 |  [setLocale](./setlocale/) |  |
+|  [setTimeZoneResolver](./settimezoneresolver/) |  |
+|  [standardEditorsRegistry](./standardeditorsregistry/) |  |
 |  [standardFieldConfigEditorRegistry](./standardfieldconfigeditorregistry/) |  |
+|  [standardTransformers](./standardtransformers/) |  |
+|  [standardTransformersRegistry](./standardtransformersregistry/) | Registry of transformation options that can be driven by stored configuration files. |
+|  [stringOverrideProcessor](./stringoverrideprocessor/) |  |
+|  [textUtil](./textutil/) |  |
+|  [thresholdsOverrideProcessor](./thresholdsoverrideprocessor/) |  |
 |  [TIME\_FORMAT](./time_format/) |  |
+|  [timeZoneAbbrevation](./timezoneabbrevation/) |  |
 |  [toDataFrame](./todataframe/) |  |
 |  [toDuration](./toduration/) |  |
 |  [toLegacyResponseData](./tolegacyresponsedata/) |  |
+|  [toPascalCase](./topascalcase/) |  |
 |  [toUtc](./toutc/) |  |
-|  [transformersRegistry](./transformersregistry/) |  |
 |  [unEscapeStringFromRegex](./unescapestringfromregex/) |  |
+|  [unitOverrideProcessor](./unitoverrideprocessor/) |  |
 |  [updateDatasourcePluginJsonDataOption](./updatedatasourcepluginjsondataoption/) |  |
+|  [updateDatasourcePluginResetOption](./updatedatasourcepluginresetoption/) |  |
 |  [updateDatasourcePluginSecureJsonDataOption](./updatedatasourcepluginsecurejsondataoption/) |  |
+|  [urlUtil](./urlutil/) |  |
+|  [valueMappingsOverrideProcessor](./valuemappingsoverrideprocessor/) |  |
 |  [VAR\_CALC](./var_calc/) |  |
 |  [VAR\_CELL\_PREFIX](./var_cell_prefix/) |  |
 |  [VAR\_FIELD\_NAME](./var_field_name/) |  |
@@ -354,14 +417,15 @@ A library containing most of the core functionality and data types used in Grafa
 |  [DataQueryResponseData](./dataqueryresponsedata/) |  |
 |  [DataSourceOptionsType](./datasourceoptionstype/) |  |
 |  [DataSourceQueryType](./datasourcequerytype/) |  |
-|  [DataTransformer](./datatransformer/) | Immutable data transformation |
+|  [DataTransformer](./datatransformer/) | Function that transform data frames (AKA transformer) |
+|  [DateTimeFormatter](./datetimeformatter/) |  |
 |  [DateTimeInput](./datetimeinput/) |  |
+|  [DateTimeParser](./datetimeparser/) |  |
 |  [DecimalCount](./decimalcount/) |  |
 |  [Dimensions](./dimensions/) |  |
 |  [DisplayProcessor](./displayprocessor/) |  |
 |  [DurationInput](./durationinput/) |  |
 |  [DurationUnit](./durationunit/) |  |
-|  [FieldConfigEditorRegistry](./fieldconfigeditorregistry/) |  |
 |  [FieldMatcher](./fieldmatcher/) |  |
 |  [FormatInput](./formatinput/) |  |
 |  [FrameMatcher](./framematcher/) |  |
@@ -372,9 +436,10 @@ A library containing most of the core functionality and data types used in Grafa
 |  [LinkTarget](./linktarget/) |  |
 |  [MutableField](./mutablefield/) |  |
 |  [NavIndex](./navindex/) |  |
-|  [Omit](./omit/) |  |
+|  [Omit\_2](./omit_2/) |  |
 |  [PanelMigrationHandler](./panelmigrationhandler/) | Called when a panel is first loaded with current panel model |
-|  [PanelTypeChangedHandler](./paneltypechangedhandler/) | Called before a panel is initialized |
+|  [PanelOptionEditorsRegistry](./paneloptioneditorsregistry/) |  |
+|  [PanelTypeChangedHandler](./paneltypechangedhandler/) | Called before a panel is initialized. Allows panel inspection for any updates before changing the panel type. |
 |  [ScaleCalculator](./scalecalculator/) |  |
 |  [Subtract](./subtract/) |  |
 |  [TimeFragment](./timefragment/) |  |
@@ -382,7 +447,12 @@ A library containing most of the core functionality and data types used in Grafa
 |  [TimeSeriesValue](./timeseriesvalue/) |  |
 |  [TimeZone](./timezone/) |  |
 |  [TimeZoneBrowser](./timezonebrowser/) |  |
+|  [TimeZoneResolver](./timezoneresolver/) |  |
 |  [TimeZoneUtc](./timezoneutc/) |  |
+|  [UrlQueryMap](./urlquerymap/) | Type to represent the values parsed from the query string. |
+|  [UrlQueryValue](./urlqueryvalue/) | Type to represent the value of a single query variable. |
+|  [ValueConverter](./valueconverter/) |  |
 |  [ValueFormatter](./valueformatter/) |  |
 |  [ValueMapping](./valuemapping/) |  |
+|  [VariableType](./variabletype/) |  |