version 6.7.6 (#32122)

* package.json: Add grafana metadata section

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

* Fix spelling

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

.editorconfig

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

.eslintrc

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

.github/CODEOWNERS

@@ -0,0 +1,21 @@
+# Lines starting with '#' are comments.
+# Each line is a file pattern followed by one or more owners.
+
+# More details are here: https://help.github.com/articles/about-codeowners/
+
+# The '*' pattern is global owners.
+
+# Order is important. The last matching pattern has the most precedence.
+# The folders are ordered as follows:
+
+# In each subsection folders are ordered first by depth, then alphabetically.
+# This should make it easy to add new rules without breaking existing ones.
+
+# Documentation owner: Diana Payton
+/docs/ @oddlittlebird
+/contribute/ @oddlittlebird  @marcusolsson
+
+# Backend code
+*.go @grafana/backend-platform
+go.mod @grafana/backend-platform
+go.sum @grafana/backend-platform

.github/ISSUE_TEMPLATE/4-question.md

@@ -1,14 +0,0 @@
----
-name: Support request
-about: 'Question or support request relating to using Grafana'
-title: ''
-labels: ''
-assignees: ''
----
-
-STOP -- PLEASE READ!
-
-GitHub is not the right place for questions and support requests.
-
-Please ask questions on our community site: [https://community.grafana.com/](https://community.grafana.com/)
-

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Questions & Help
+    url: https://community.grafana.com
+    about: Please ask and answer questions here.

.github/actions/gha-publish-to-git/Dockerfile

@@ -0,0 +1,7 @@
+FROM alpine
+RUN apk update
+RUN apk add rsync git bash
+
+COPY entrypoint.sh /entrypoint.sh
+
+ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]

.github/actions/gha-publish-to-git/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Sean Middleditch
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

.github/actions/gha-publish-to-git/README.md

@@ -0,0 +1,60 @@
+publish-to-git
+==============
+
+[GitHub Action](https://github.com/features/actions) for publishing a directory
+and its contents to another git repository.
+
+This can be especially useful for publishing static website, such as with
+[GitHub Pages](https://pages.github.com/), from built files in other job
+steps, such as [Doxygen](http://www.doxygen.nl/) generated HTML files.
+
+**NOTE**: GitHub currently requires the use of a Personal Access Token for
+pushing to other repositories. Pushing to the current repository should work
+with the always-available GitHub Token (available via
+`{{ secrets.GITHUB_TOKEN }}`. If pushing to another repository, a Personal
+Access Token will need to be [created](https://help.github.com/en/articles/creating-a-personal-access-token-for-the-command-line) and assigned to the
+workflow [secrets](https://help.github.com/en/articles/virtual-environments-for-github-actions#creating-and-using-secrets-encrypted-variables).
+
+Inputs
+------
+
+- `repository`: Destination repository (default: current repository).
+- `branch`: Destination branch (required).
+- `host`: Destination git host (default: `github.com`).
+- `github_token`: GitHub Token (required; use `secrets.GITHUB_TOKEN`).
+- `github_pat`: Personal Access Token or other https credentials.
+- `source_folder`: Source folder in workspace to copy (default: workspace root).
+- `target_folder`: Target folder in destination branch to copy to (default: repository root).
+- `commit_author`: Override commit author (default: `{github.actor}@users.noreply.github.com`).
+- `commit_message`: Set commit message (default: `[workflow] Publish from [repository]:[branch]/[folder]`).
+- `dry_run`: Does not push if non-empty (default: empty).
+- `working_directory`: Location to checkout repository (default: random location in `${HOME}`)
+
+Outputs
+-------
+
+- `commit_hash`: SHA hash of the new commit.
+- `working_directory`: Working directory of git clone of repository.
+
+License
+-------
+
+MIT License. See [LICENSE](LICENSE) for details.
+
+Usage Example
+-------------
+
+```yaml
+jobs:
+  publish:
+    - uses: actions/checkout@master
+    - run: |
+        sh scripts/build-doxygen-html.sh --out static/html
+    - uses: seanmiddleditch/gha-publish-to-git@master
+      with:
+        branch: gh-pages
+        github_token: '${{ secrets.GITHUB_TOKEN  }}'
+        github_pat: '${{ secrets.GH_PAT }}'
+        source_folder: static/html
+      if: success() && github.event == 'push'
+```

.github/actions/gha-publish-to-git/action.yml

@@ -0,0 +1,60 @@
+---
+name: publish-to-git
+description: 'Publish files to a git repository'
+branding:
+  icon: 'git-commit'
+  color: 'blue'
+inputs:
+  repository:
+    description: 'Destination repository (default: current repository)'
+    default: ''
+  branch:
+    description: 'Destination branch'
+    required: true
+  host:
+    description: 'Destination git host'
+    default: 'github.com'
+  github_token:
+    description: 'GitHub Token (use `secrets.GITHUB_TOKEN`)'
+    required: true
+  github_pat:
+    description: 'Personal Access Token or other https credentials'
+    default: ''
+  source_folder:
+    description: 'Source folder in workspace to copy (default: workspace root)'
+    defaault: ''
+  target_folder:
+    description: 'Target folder in destination branch to copy to (default: repository root)'
+    default: ''
+  commit_author:
+    description: 'User Name <email@address> (default: [github.actor]@users.noreply.github.com)'
+    default: ''
+  commit_message:
+    description: 'Commit message (default: [workflow] Publish from [repository]:[branch]/[folder])'
+    default: ''
+  dry_run:
+    description: 'Do not push to repository (set to non-empty string to make dry-run)'
+    default: ''
+  working_directory:
+    description: 'Working directory for clone (default: random location in `${HOME}`)'
+    default: ''
+outputs:
+  commit_hash:
+    description: 'Hash of the new commit'
+  working_directory:
+    description: 'Working directory of temporary repository'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
+  args:
+    - ${{ inputs.repository }}
+    - ${{ inputs.branch }}
+    - ${{ inputs.host }}
+    - ${{ inputs.github_token }}
+    - ${{ inputs.github_pat }}
+    - ${{ inputs.source_folder }}
+    - ${{ inputs.target_folder }}
+    - ${{ inputs.commit_author }}
+    - ${{ inputs.commit_message }}
+    - ${{ inputs.dry_run }}
+    - ${{ inputs.working_directory }}

.github/actions/gha-publish-to-git/entrypoint.sh

@@ -0,0 +1,99 @@
+#/bin/bash
+
+# Name the Docker inputs.
+#
+INPUT_REPOSITORY="$1"
+INPUT_BRANCH="$2"
+INPUT_HOST="$3"
+INPUT_GITHUB_TOKEN="$4"
+INPUT_GITHUB_PAT="$5"
+INPUT_SOURCE_FOLDER="$6"
+INPUT_TARGET_FOLDER="$7"
+INPUT_COMMIT_AUTHOR="$8"
+INPUT_COMMIT_MESSAGE="$9"
+INPUT_DRYRUN="${10}"
+INPUT_WORKDIR="${11}"
+
+# Check for required inputs.
+#
+[ -z "$INPUT_BRANCH" ] && echo >&2 "::error::'branch' is required" && exit 1
+[ -z "$INPUT_GITHUB_TOKEN" -a -z "$INPUT_GITHUB_PAT" ] && echo >&2 "::error::'github_token' or 'github_pat' is required" && exit 1
+
+# Set state from inputs or defaults.
+#
+REPOSITORY="${INPUT_REPOSITORY:-${GITHUB_REPOSITORY}}"
+BRANCH="${INPUT_BRANCH}"
+HOST="${INPUT_GIT_HOST:-github.com}"
+TOKEN="${INPUT_GITHUB_PAT:-${INPUT_GITHUB_TOKEN}}"
+REMOTE="${INPUT_REMOTE:-https://${TOKEN}@${HOST}/${REPOSITORY}.git}"
+
+SOURCE_FOLDER="${INPUT_SOURCE_FOLDER:-.}"
+TARGET_FOLDER="${INPUT_TARGET_FOLDER}"
+
+REF="${GITHUB_BASE_REF:-${GITHUB_REF}}"
+REF_BRANCH=$(echo "${REF}" | rev | cut -d/ -f1 | rev)
+[ -z "$REF_BRANCH" ] && echo 2>&1 "No ref branch" && exit 1
+
+COMMIT_AUTHOR="${INPUT_AUTHOR:-${GITHUB_ACTOR} <${GITHUB_ACTOR}@users.noreply.github.com>}"
+COMMIT_MESSAGE="${INPUT_COMMIT_MESSAGE:-[${GITHUB_WORKFLOW}] Publish from ${GITHUB_REPOSITORY}:${REF_BRANCH}/${SOURCE_FOLDER}}"
+
+# Calculate the real source path.
+#
+SOURCE_PATH="$(realpath "${SOURCE_FOLDER}")"
+[ -z "${SOURCE_PATH}" ] && exit 1
+echo "::debug::SOURCE_PATH=${SOURCE_PATH}"
+
+# Let's start doing stuff.
+echo "Publishing ${SOURCE_FOLDER} to ${REMOTE}:${BRANCH}/${TARGET_FOLDER}"
+
+# Create a working directory; the workspace may be filled with other important
+# files.
+#
+WORK_DIR="${INPUT_WORKDIR:-$(mktemp -d "${HOME}/gitrepo.XXXXXX")}"
+[ -z "${WORK_DIR}" ] && echo >&2 "::error::Failed to create temporary working directory" && exit 1
+cd "${WORK_DIR}"
+
+# Initialize git repo and configure for remote access.
+#
+echo "Initializing repository with remote ${REMOTE}"
+git init || exit 1
+git config --local user.email "${GITHUB_ACTOR}@users.noreply.github.com" || exit 1
+git config --local user.name  "${GITHUB_ACTOR}" || exit 1
+git remote add origin "${REMOTE}" || exit 1
+git remote -v
+
+# Fetch initial (current contents).
+#
+echo "Fetching ${REMOTE}:${BRANCH}"
+git fetch --depth 1 origin "${BRANCH}" || exit 1
+git checkout -b "${BRANCH}" || exit 1
+git pull origin "${BRANCH}" || exit 1
+
+# Create the target directory (if necessary) and copy files from source.
+#
+TARGET_PATH="${WORK_DIR}/${TARGET_FOLDER}"
+echo "Populating ${TARGET_PATH}"
+mkdir -p "${TARGET_PATH}" || exit 1
+rsync -a --quiet --delete "${SOURCE_PATH}/" "${TARGET_PATH}" || exit 1
+
+# Create commit with changes.
+#
+echo "Creating commit"
+git add "${TARGET_PATH}" || exit 1
+git commit -m "${COMMIT_MESSAGE}" --author "${COMMIT_AUTHOR}" || exit 1
+COMMIT_HASH="$(git rev-parse HEAD)"
+echo "Created commit ${COMMIT_HASH}"
+
+# Publish output variables.
+#
+echo "::set-output name=commit_hash::${COMMIT_HASH}"
+echo "::set-output name=working_directory::${WORK_DIR}"
+
+# Push if not a dry-run.
+#
+if [ -z "${INPUT_DRYRUN}" ] ; then
+    echo "Pushing to ${REMOTE}:${BRANCH}"
+    git push origin "${BRANCH}" || exit 1
+else
+    echo "[DRY-RUN] Not pushing to ${REMOTE}:${BRANCH}"
+fi

.github/stale.yml

@@ -0,0 +1,47 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# General configuration
+# Label to use when marking as stale
+staleLabel: stale
+
+# Pull request specific configuration
+pulls:
+  # Number of days of inactivity before an Issue or Pull Request becomes stale
+  daysUntilStale: 14
+  # Number of days of inactivity before a stale Issue or Pull Request is closed.
+  # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+  daysUntilClose: 30
+  # Comment to post when marking as stale. Set to `false` to disable
+  markComment: >
+    This pull request has been automatically marked as stale because it has not had
+    activity in the last 2 weeks. It will be closed in 30 days if no further activity occurs. Please
+    feel free to give a status update now, ping for review, or re-open when it's ready.
+    Thank you for your contributions!
+  # Comment to post when closing a stale Issue or Pull Request.
+  closeComment: >
+     This pull request has been automatically closed because it has not had
+     activity in the last 30 days. Please feel free to give a status update now, ping for review, or re-open when it's ready.
+     Thank you for your contributions!
+  # Limit the number of actions per hour, from 1-30. Default is 30
+  limitPerRun: 1
+
+exemptLabels:
+  - help wanted
+  - type/bug
+  - type/feature-request
+  - Epic
+  - no stalebot
+
+# Issue specific configuration
+issues:
+  limitPerRun: 1
+  daysUntilStale: 100000
+  daysUntilClose: 100000
+  markComment: >
+    This issue has been automatically marked as stale because it has not had activity in the
+    last 100 days. It will be closed in the next 100 days if no activity occurs.
+    Thank you for your contributions.
+  closeComment: >
+    This issue has been automatically closed because it has not had activity in the
+    last month and a half. If this issue is still valid, please ping a maintainer and ask them to check this again.
+    Thank you for your contributions.

.github/workflows/publish.yml

@@ -0,0 +1,30 @@
+name: publish_docs
+
+on:
+  push:
+    branches:
+    - master
+    paths:
+    - 'docs/sources/**'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: publish-to-git
+      uses: ./.github/actions/gha-publish-to-git
+      id: publish
+      with:
+        repository: grafana/website
+        branch: master
+        host: github.com
+        github_pat: '${{ secrets.GH_BOT_ACCESS_TOKEN }}'
+        source_folder: docs/sources
+        target_folder: content/docs/grafana/latest
+    - shell: bash
+      run: |
+        test -n "${{ steps.publish.outputs.commit_hash }}"
+        test -n "${{ steps.publish.outputs.working_directory }}"

.gitignore

@@ -10,13 +10,14 @@ awsconfig
 /public/views/index.html
 /public/views/error.html
 /emails/dist
+/reports
+.yarnrc
+.yarn/
 
 # Enterprise emails
 /emails/templates/enterprise_*
 /public/emails/enterprise_*
 
-/public_gen
-/public/vendor/npm
 /tmp
 tools/phantomjs/phantomjs
 tools/phantomjs/phantomjs.exe
@@ -61,7 +62,8 @@ profile.cov
 /pkg/cmd/grafana-cli/grafana-cli
 /pkg/cmd/grafana-server/grafana-server
 /pkg/cmd/grafana-server/debug
-/pkg/extensions
+/pkg/extensions/*
+!/pkg/extensions/main.go
 /public/app/extensions
 debug.test
 /examples/*/dist
@@ -89,11 +91,18 @@ debug.test
 /packages/**/dist
 /packages/**/compiled
 /packages/**/.rpt2_cache
-
-theOutput/
+/packages/**/tsdoc-metadata.json
 
 # Ignore go local build dependencies
 /scripts/go/bin/**
 
 # Ignore compilation stats from `yarn stats`
 compilation-stats.json
+
+# e2e tests
+/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

CHANGELOG.md

@@ -1,5 +1,248 @@
-# 6.5.0-beta1 (2019-11-14)
+# 6.7.0 (unreleased)
+
+## Breaking changes
+* **Slack**: Removed _Mention_ setting and instead introduce _Mention Users_, _Mention Groups_, and _Mention Channel_. The first two settings require user and group IDs, respectively. This change was necessary because the way of mentioning via the Slack API [changed](https://api.slack.com/changelog/2017-09-the-one-about-usernames) and mentions in Slack notifications no longer worked.
+
+* **Alerting**: Reverts the behavior of `diff` and `percent_diff` to not always be absolute. Something we introduced by mistake in [6.1.0](https://github.com/grafana/grafana/commit/28eaac3a9c7082e8c496005c1cb66b4b70a4f82f). Alerting now support `diff()`, `diff_abs()`, `percent_diff()` and `percent_diff_abs()`. [#21338](https://github.com/grafana/grafana/pull/21338)
+
+### Notice about changes in backendSrv for plugin authors
+
+In our mission to migrate away from AngularJS to React we have removed all AngularJS dependencies in the core data retrieval service `backendSrv`.
+
+Removing the AngularJS dependencies in `backendSrv` has the unfortunate side effect of AngularJS digest no longer being triggered for any request made with `backendSrv`. Because of this, external plugins using `backendSrv` directly may suffer from strange behaviour in the UI.
+
+To remedy this issue, as a plugin author you need to trigger the digest after a direct call to `backendSrv`. 
+
+Example: 
+
+```js
+backendSrv.get(‘http://your.url/api’).then(result => {
+    this.result = result;
+    this.$scope.$digest();
+});
+```
+
+You can test your plugin with the `master` branch version of Grafana.
+
+# 6.6.2 (2020-02-20)
+
+### Features / Enhancements
+* **Data proxy**: Log proxy errors using Grafana logger. [#22174](https://github.com/grafana/grafana/pull/22174), [@bergquist](https://github.com/bergquist)
+* **Metrics**: Add gauge for requests currently in flight. [#22168](https://github.com/grafana/grafana/pull/22168), [@bergquist](https://github.com/bergquist)
+
+### Bug Fixes
+* **@grafana/ui**: Fix displaying of bars in React Graph. [#21968](https://github.com/grafana/grafana/pull/21968), [@ivanahuckova](https://github.com/ivanahuckova)
+* **API**: Fix redirect issue when configured to use a subpath. [#21652](https://github.com/grafana/grafana/pull/21652), [@briangann](https://github.com/briangann)
+* **API**: Improve recovery middleware when response already been written. [#22256](https://github.com/grafana/grafana/pull/22256), [@marefr](https://github.com/marefr)
+* **Auth**: Don't rotate auth token when requests are cancelled by client. [#22106](https://github.com/grafana/grafana/pull/22106), [@bergquist](https://github.com/bergquist)
+* **Docker**: Downgrade to 18.04 LTS base image. [#22313](https://github.com/grafana/grafana/pull/22313), [@aknuds1](https://github.com/aknuds1)
+* **Elasticsearch**: Fix auto interval for date histogram in explore logs mode. [#21937](https://github.com/grafana/grafana/pull/21937), [@ivanahuckova](https://github.com/ivanahuckova)
+* **Image Rendering**: Fix PhantomJS compatibility with es2016 node dependencies. [#21677](https://github.com/grafana/grafana/pull/21677), [@dprokop](https://github.com/dprokop)
+* **Links**: Assure base url when single stat, panel and data links are built. [#21956](https://github.com/grafana/grafana/pull/21956), [@dprokop](https://github.com/dprokop)
+* **Loki, Prometheus**: Fix PromQL and LogQL syntax highlighting. [#21944](https://github.com/grafana/grafana/pull/21944), [@ivanahuckova](https://github.com/ivanahuckova)
+* **OAuth**: Enforce auto_assign_org_id setting when role mapping enabled using Generic OAuth. [#22268](https://github.com/grafana/grafana/pull/22268), [@aknuds1](https://github.com/aknuds1)
+* **Prometheus**: Updates explore query editor to prevent it from throwing error on edit. [#21605](https://github.com/grafana/grafana/pull/21605), [@Estrax](https://github.com/Estrax)
+* **Server**: Reorder cipher suites for better security. [#22101](https://github.com/grafana/grafana/pull/22101), [@tofu-rocketry](https://github.com/tofu-rocketry)
+* **TimePicker**: fixing weird behavior with calendar when switching between months/years . [#22253](https://github.com/grafana/grafana/pull/22253), [@mckn](https://github.com/mckn)
+
+# 6.6.1 (2020-02-06)
+
+### Bug Fixes
+* **Annotations**: Change indices and rewrites annotation find query to improve database query performance. [#21915](https://github.com/grafana/grafana/pull/21915), [@papagian](https://github.com/papagian), [@marefr](https://github.com/marefr), [@kylebrandt](https://github.com/kylebrandt)
+* **Azure Monitor**: Fix Application Insights API key field to allow input. [#21738](https://github.com/grafana/grafana/pull/21738), [@shavonn](https://github.com/shavonn)
+* **BarGauge**: Fix so we properly display the "no result" value when query returns empty result. [#21791](https://github.com/grafana/grafana/pull/21791), [@mckn](https://github.com/mckn)
+* **Datasource**: Show access (Browser/Server) select on the Prometheus datasource. [#21833](https://github.com/grafana/grafana/pull/21833), [@jorgelbg](https://github.com/jorgelbg)
+* **DatasourceSettings**: Fixed issue navigating away from data source settings page. [#21841](https://github.com/grafana/grafana/pull/21841), [@torkelo](https://github.com/torkelo)
+* **Graph Panel**: Fix typo in thresholds form. [#21903](https://github.com/grafana/grafana/pull/21903), [@orendain](https://github.com/orendain)
+* **Graphite**: Fixed issue with functions with multiple required params and no defaults caused params that could not be edited (groupByNodes groupByTags). [#21814](https://github.com/grafana/grafana/pull/21814), [@torkelo](https://github.com/torkelo)
+* **Image Rendering**: Fix render of graph panel legend aligned to the right using Grafana image renderer plugin/service. [#21854](https://github.com/grafana/grafana/pull/21854), [@marefr](https://github.com/marefr)
+* **Metrics**: Adds back missing summary quantiles. [#21858](https://github.com/grafana/grafana/pull/21858), [@kogent](https://github.com/kogent)
+* **OpenTSDB**: Adds back missing ngInject to make it work again. [#21796](https://github.com/grafana/grafana/pull/21796), [@marefr](https://github.com/marefr)
+* **Plugins**: Fix routing in app plugin pages. [#21847](https://github.com/grafana/grafana/pull/21847), [@dprokop](https://github.com/dprokop)
+* **Prometheus**: Fixes default step value for annotation query. [#21934](https://github.com/grafana/grafana/pull/21934), [@hugohaggmark](https://github.com/hugohaggmark)
+* **Quota**: Makes LDAP + Quota work for the first login of a new user. [#21949](https://github.com/grafana/grafana/pull/21949), [@xlson](https://github.com/xlson)
+* **StatPanels**: Fixed change from singlestat to Gauge / BarGauge / Stat where default min & max (0, 100) was copied . [#21820](https://github.com/grafana/grafana/pull/21820), [@torkelo](https://github.com/torkelo)
+* **TimePicker**: Should display in kiosk mode. [#21816](https://github.com/grafana/grafana/pull/21816), [@evgbibko](https://github.com/evgbibko)
+* **grafana/toolkit**: Fix failing linter when there were lint issues. [#21849](https://github.com/grafana/grafana/pull/21849), [@dprokop](https://github.com/dprokop)
+
+# 6.6.0 (2020-01-27)
   
+### Features / Enhancements
+* **CloudWatch**: Add DynamoDB Accelerator (DAX) metrics & dimensions. [#21644](https://github.com/grafana/grafana/pull/21644), [@kenju](https://github.com/kenju)
+* **CloudWatch**: Auto period snap to next higher period. [#21659](https://github.com/grafana/grafana/pull/21659), [@sunker](https://github.com/sunker)
+* **Template variables**: Add error for failed query variable on time range update. [#21731](https://github.com/grafana/grafana/pull/21731), [@tskarhed](https://github.com/tskarhed)
+* **XSS**: Sanitize column link. [#21735](https://github.com/grafana/grafana/pull/21735), [@tskarhed](https://github.com/tskarhed)
+
+### Bug Fixes
+* **Elasticsearch**: Fix adhoc variable filtering for logs query. [#21346](https://github.com/grafana/grafana/pull/21346), [@ceh](https://github.com/ceh)
+* **Explore**: Fix colors for log level when level value is capitalised. [#21646](https://github.com/grafana/grafana/pull/21646), [@ivanahuckova](https://github.com/ivanahuckova)
+* **Explore**: Fix context view in logs, where some rows may have been filtered out.. [#21729](https://github.com/grafana/grafana/pull/21729), [@aocenas](https://github.com/aocenas)
+* **Loki**: Fix Loki with repeated panels and interpolation for Explore. [#21685](https://github.com/grafana/grafana/pull/21685), [@ivanahuckova](https://github.com/ivanahuckova)
+* **SQLStore**: Fix PostgreSQL failure to create organisation for first time. [#21648](https://github.com/grafana/grafana/pull/21648), [@papagian](https://github.com/papagian)
+
+# 6.6.0-beta1 (2020-01-20)
+
+## Breaking changes
+* **PagerDuty**: Change `payload.custom_details` field in PagerDuty notification to be a JSON object instead of a string.
+* **Security**: The `[security]` setting `cookie_samesite` configured to `none` now renders cookies with `SameSite=None` attribute compared to before where no `SameSite` attribute was added to cookies. To get the old behavior, use value `disabled` instead of `none`. Refer to [Upgrade Grafana](https://grafana.com/docs/grafana/latest/installation/upgrading/#upgrading-to-v6-6) for more information.
+
+### Features / Enhancements
+* **Graphite**: Add Metrictank dashboard to Graphite datasource
+* **Admin**: Show name of user in users table view. [#18108](https://github.com/grafana/grafana/pull/18108), [@eleijonmarck](https://github.com/eleijonmarck)
+* **Alerting**: Add configurable severity support for PagerDuty notifier. [#19425](https://github.com/grafana/grafana/pull/19425), [@yemble](https://github.com/yemble)
+* **Alerting**: Add more information to webhook notifications. [#20420](https://github.com/grafana/grafana/pull/20420), [@michael-az](https://github.com/michael-az)
+* **Alerting**: Add support for sending tags in OpsGenie notifier. [#20810](https://github.com/grafana/grafana/pull/20810), [@aSapien](https://github.com/aSapien)
+* **Alerting**: Added fallbackText to Google Chat notifier. [#21464](https://github.com/grafana/grafana/pull/21464), [@alvarolmedo](https://github.com/alvarolmedo)
+* **Alerting**: Adds support for sending a single email to all recipients in email notifier. [#21091](https://github.com/grafana/grafana/pull/21091), [@marefr](https://github.com/marefr)
+* **Alerting**: Enable setting of OpsGenie priority via a tag. [#21298](https://github.com/grafana/grafana/pull/21298), [@zabullet](https://github.com/zabullet)
+* **Alerting**: Use fully qualified status emoji in Threema notifier. [#21305](https://github.com/grafana/grafana/pull/21305), [@dbrgn](https://github.com/dbrgn)
+* **Alerting**: new min_interval_seconds option to enforce a minimum evaluation frequency . [#21188](https://github.com/grafana/grafana/pull/21188), [@papagian](https://github.com/papagian)
+* **CloudWatch**: Calculate period based on time range. [#21471](https://github.com/grafana/grafana/pull/21471), [@sunker](https://github.com/sunker)
+* **CloudWatch**: Display partial result in graph when max DP/call limit is reached . [#21533](https://github.com/grafana/grafana/pull/21533), [@sunker](https://github.com/sunker)
+* **CloudWatch**: ECS/ContainerInsights metrics support. [#21125](https://github.com/grafana/grafana/pull/21125), [@briancurt](https://github.com/briancurt)
+* **CloudWatch**: Upgrade aws-sdk-go. [#20510](https://github.com/grafana/grafana/pull/20510), [@mtanda](https://github.com/mtanda)
+* **DataLinks**: allow using values from other fields in the same row (cells). [#21478](https://github.com/grafana/grafana/pull/21478), [@ryantxu](https://github.com/ryantxu)
+* **Editor**: Ignore closing brace when it was added by editor. [#21172](https://github.com/grafana/grafana/pull/21172), [@davkal](https://github.com/davkal)
+* **Explore**: Context tooltip to copy labels and values from graph. [#21405](https://github.com/grafana/grafana/pull/21405), [@ivanahuckova](https://github.com/ivanahuckova)
+* **Explore**: Log message line wrapping options for logs. [#20360](https://github.com/grafana/grafana/pull/20360), [@ivanahuckova](https://github.com/ivanahuckova)
+* **Forms**: introduce RadioButtonGroup. [#20828](https://github.com/grafana/grafana/pull/20828), [@dprokop](https://github.com/dprokop)
+* **Frontend**: Changes in Redux location should not strip subpath from location url. [#20161](https://github.com/grafana/grafana/pull/20161), [@wybczu](https://github.com/wybczu)
+* **Graph**: Add fill gradient option to series override line fill. [#20941](https://github.com/grafana/grafana/pull/20941), [@hendrikvh](https://github.com/hendrikvh)
+* **Graphite**: Add metrictank dashboard to Graphite datasource. [#20776](https://github.com/grafana/grafana/pull/20776), [@Dieterbe](https://github.com/Dieterbe)
+* **Graphite**: Do not change query when opening the query editor and there is no data. [#21588](https://github.com/grafana/grafana/pull/21588), [@daniellee](https://github.com/daniellee)
+* **Gravatar**: Use HTTPS by default. [#20964](https://github.com/grafana/grafana/pull/20964), [@jiajunhuang](https://github.com/jiajunhuang)
+* **Loki**: Support for template variable queries. [#20697](https://github.com/grafana/grafana/pull/20697), [@ivanahuckova](https://github.com/ivanahuckova)
+* **NewsPanel**: Add news as a builtin panel. [#21128](https://github.com/grafana/grafana/pull/21128), [@ryantxu](https://github.com/ryantxu)
+* **OAuth**: Removes send_client_credentials_via_post setting . [#20044](https://github.com/grafana/grafana/pull/20044), [@LK4D4](https://github.com/LK4D4)
+* **OpenTSDB**: Adding lookup limit to OpenTSDB datasource settings. [#20647](https://github.com/grafana/grafana/pull/20647), [@itamarst](https://github.com/itamarst)
+* **Postgres/MySQL/MSSQL**: Adds support for region annotations. [#20752](https://github.com/grafana/grafana/pull/20752), [@Bercon](https://github.com/Bercon)
+* **Prometheus**: Field to specify step in Explore. [#20195](https://github.com/grafana/grafana/pull/20195), [@Estrax](https://github.com/Estrax)
+* **Prometheus**: User metrics metadata to inform query hints. [#21304](https://github.com/grafana/grafana/pull/21304), [@davkal](https://github.com/davkal)
+* **Renderer**: Add user-agent to remote rendering service requests. [#20956](https://github.com/grafana/grafana/pull/20956), [@kfdm](https://github.com/kfdm)
+* **Security**: Add disabled option for cookie samesite attribute. [#21472](https://github.com/grafana/grafana/pull/21472), [@marefr](https://github.com/marefr)
+* **Stackdriver**: Support meta labels. [#21373](https://github.com/grafana/grafana/pull/21373), [@sunker](https://github.com/sunker)
+* **TablePanel, GraphPanel**: Exclude hidden columns from CSV. [#19925](https://github.com/grafana/grafana/pull/19925), [@literalplus](https://github.com/literalplus)
+* **Templating**: Update variables on location changed. [#21480](https://github.com/grafana/grafana/pull/21480), [@ryantxu](https://github.com/ryantxu)
+* **Tracing**: Support configuring Jaeger client from environment. [#21103](https://github.com/grafana/grafana/pull/21103), [@hairyhenderson](https://github.com/hairyhenderson)
+* **Units**: Add currency and energy units. [#20428](https://github.com/grafana/grafana/pull/20428), [@anirudh-ramesh](https://github.com/anirudh-ramesh)
+* **Units**: Support dynamic count and currency units. [#21279](https://github.com/grafana/grafana/pull/21279), [@ryantxu](https://github.com/ryantxu)
+* **grafana/toolkit**: Add option to override webpack config. [#20872](https://github.com/grafana/grafana/pull/20872), [@sebimarkgraf](https://github.com/sebimarkgraf)
+* **grafana/ui**: ConfirmModal component. [#20965](https://github.com/grafana/grafana/pull/20965), [@alexanderzobnin](https://github.com/alexanderzobnin)
+* **grafana/ui**: Create Tabs component. [#21328](https://github.com/grafana/grafana/pull/21328), [@peterholmberg](https://github.com/peterholmberg)
+* **grafana/ui**: New table component. [#20991](https://github.com/grafana/grafana/pull/20991), [@peterholmberg](https://github.com/peterholmberg)
+* **grafana/ui**: New updated time picker. [#20931](https://github.com/grafana/grafana/pull/20931), [@mckn](https://github.com/mckn)
+* **White-labeling**: Makes it possible to customize the footer and login background (Enterprise)
+
+### Bug Fixes
+* **API**: Optionally list expired API keys. [#20468](https://github.com/grafana/grafana/pull/20468), [@papagian](https://github.com/papagian)
+* **Alerting**: Fix custom_details to be a JSON object instead of a string in PagerDuty notifier. [#21150](https://github.com/grafana/grafana/pull/21150), [@tehGoti](https://github.com/tehGoti)
+* **Alerting**: Fix image rendering and uploading timeout preventing to send alert notifications. [#21536](https://github.com/grafana/grafana/pull/21536), [@marefr](https://github.com/marefr)
+* **Alerting**: Fix panic in dingding notifier . [#20378](https://github.com/grafana/grafana/pull/20378), [@csyangchen](https://github.com/csyangchen)
+* **Alerting**: Fix template query validation logic. [#20721](https://github.com/grafana/grafana/pull/20721), [@okhowang](https://github.com/okhowang)
+* **Alerting**: If no permission to clear history, keep the historical data. [#19007](https://github.com/grafana/grafana/pull/19007), [@lzdw](https://github.com/lzdw)
+* **Alerting**: Unpausing a non-paused alert rule should not change status to Unknown. [#21375](https://github.com/grafana/grafana/pull/21375), [@vikkyomkar](https://github.com/vikkyomkar)
+* **Api**: Fix returned message when enabling, disabling and deleting a non-existing user. [#21391](https://github.com/grafana/grafana/pull/21391), [@dpavlos](https://github.com/dpavlos)
+* **Auth**: Rotate auth tokens at the end of requests. [#21347](https://github.com/grafana/grafana/pull/21347), [@woodsaj](https://github.com/woodsaj)
+* **Azure Monitor**: Fixes error using azure monitor credentials with log analytics and non-default cloud. [#21032](https://github.com/grafana/grafana/pull/21032), [@shavonn](https://github.com/shavonn)
+* **CLI**: Return error and aborts when plugin file extraction fails. [#20849](https://github.com/grafana/grafana/pull/20849), [@marefr](https://github.com/marefr)
+* **CloudWatch**: Multi-valued template variable dimension alias fix. [#21541](https://github.com/grafana/grafana/pull/21541), [@sunker](https://github.com/sunker)
+* **Dashboard**: Disable draggable panels on small devices. [#20629](https://github.com/grafana/grafana/pull/20629), [@peterholmberg](https://github.com/peterholmberg)
+* **DataLinks**: Links with ${__value.time} do not work when clicking on first result . [#20019](https://github.com/grafana/grafana/pull/20019), [@dweineha](https://github.com/dweineha)
+* **Explore**: Fix showing of results in selected timezone (UTC/local). [#20812](https://github.com/grafana/grafana/pull/20812), [@ivanahuckova](https://github.com/ivanahuckova)
+* **Explore**: Fix timepicker when browsing back after switching datasource. [#21454](https://github.com/grafana/grafana/pull/21454), [@ivanahuckova](https://github.com/ivanahuckova)
+* **Explore**: Sync timepicker and logs after live-tailing stops. [#20979](https://github.com/grafana/grafana/pull/20979), [@ivanahuckova](https://github.com/ivanahuckova)
+* **Graph**: Fix when clicking a plot on a touch device we won't display the annotation menu. [#21479](https://github.com/grafana/grafana/pull/21479), [@mckn](https://github.com/mckn)
+* **OAuth**: Fix role mapping from id token. [#20300](https://github.com/grafana/grafana/pull/20300), [@seanson](https://github.com/seanson)
+* **Plugins**: Add appSubUrl string to config pages. [#21414](https://github.com/grafana/grafana/pull/21414), [@Maddin-619](https://github.com/Maddin-619)
+* **Provisioning**: Start provision dashboards after Grafana server have started. [#21564](https://github.com/grafana/grafana/pull/21564), [@marefr](https://github.com/marefr)
+* **Render**: Use https as protocol when rendering if HTTP2 enabled. [#21600](https://github.com/grafana/grafana/pull/21600), [@marefr](https://github.com/marefr)
+* **Security**: Use same cookie settings for all cookies. [#19787](https://github.com/grafana/grafana/pull/19787), [@jeffdesc](https://github.com/jeffdesc)
+* **Singlestat**: Support empty value map texts. [#20952](https://github.com/grafana/grafana/pull/20952), [@hendrikvh](https://github.com/hendrikvh)
+* **Units**: Custom suffix and prefix units can now be specified, for example custom currency & SI & time formats. [#20763](https://github.com/grafana/grafana/pull/20763), [@ryantxu](https://github.com/ryantxu)
+* **grafana/ui**: Do not build grafana/ui in strict mode as it depends on non-strict libs. [#21319](https://github.com/grafana/grafana/pull/21319), [@dprokop](https://github.com/dprokop)
+
+# 6.5.3 (2020-01-15)
+### Features / Enhancements
+* **API**: Validate redirect_to cookie has valid (Grafana) url . [#21057](https://github.com/grafana/grafana/pull/21057), [@papagian](https://github.com/papagian), Thanks Habi S Ravi for reporting this issue. 
+
+### Bug Fixes
+* **AdHocFilter**: Shows SubMenu when filtering directly from table. [#21017](https://github.com/grafana/grafana/pull/21017), [@hugohaggmark](https://github.com/hugohaggmark)
+* **Cloudwatch**: Fixed crash when switching from cloudwatch data source. [#21376](https://github.com/grafana/grafana/pull/21376), [@torkelo](https://github.com/torkelo)
+* **DataLinks**: Sanitize data/panel link URLs. [#21140](https://github.com/grafana/grafana/pull/21140), [@dprokop](https://github.com/dprokop)
+* **Elastic**: Fix multiselect variable interpolation for logs. [#20894](https://github.com/grafana/grafana/pull/20894), [@ivanahuckova](https://github.com/ivanahuckova)
+* **Prometheus**: Fixes so user can change HTTP Method in config settings. [#21055](https://github.com/grafana/grafana/pull/21055), [@hugohaggmark](https://github.com/hugohaggmark)
+* **Prometheus**: Prevents validation of inputs when clicking in them without changing the value. [#21059](https://github.com/grafana/grafana/pull/21059), [@hugohaggmark](https://github.com/hugohaggmark)
+* **Rendering**: Fix panel PNG rendering when using sub url & serve_from_sub_path = true. [#21306](https://github.com/grafana/grafana/pull/21306), [@bgranvea](https://github.com/bgranvea)
+* **Table**: Matches column names with unescaped regex characters. [#21164](https://github.com/grafana/grafana/pull/21164), [@hugohaggmark](https://github.com/hugohaggmark)
+
+# 6.5.2 (2019-12-11)
+
+### Bug Fixes
+  * **Alerting**: Improve alert threshold handle dragging behavior. [#20922](https://github.com/grafana/grafana/pull/20922), [@torkelo](https://github.com/torkelo)
+  * **AngularPanels**: Fixed loading spinner being stuck in some rare cases. [#20878](https://github.com/grafana/grafana/pull/20878), [@torkelo](https://github.com/torkelo)
+  * **CloudWatch**: Fix query editor does not render in Explore. [#20909](https://github.com/grafana/grafana/pull/20909), [@davkal](https://github.com/davkal)
+  * **CloudWatch**: Remove illegal character escaping in inferred expressions. [#20915](https://github.com/grafana/grafana/pull/20915), [@sunker](https://github.com/sunker)
+  * **CloudWatch**: Remove template variable error message. [#20864](https://github.com/grafana/grafana/pull/20864), [@sunker](https://github.com/sunker)
+  * **CloudWatch**: Use datasource template variable in curated dashboards. [#20917](https://github.com/grafana/grafana/pull/20917), [@sunker](https://github.com/sunker)
+  * **Elasticsearch**: Set default port to 9200 in ConfigEditor. [#20948](https://github.com/grafana/grafana/pull/20948), [@papagian](https://github.com/papagian)
+  * **Gauge/BarGauge**: Added support for value mapping of "no data"-state to text/value. [#20842](https://github.com/grafana/grafana/pull/20842), [@mckn](https://github.com/mckn)
+  * **Graph**: Prevent tooltip from being displayed outside of window. [#20874](https://github.com/grafana/grafana/pull/20874), [@mckn](https://github.com/mckn)
+  * **Graphite**: Fixes error with annotation metric queries . [#20857](https://github.com/grafana/grafana/pull/20857), [@dprokop](https://github.com/dprokop)
+  * **Login**: Fix fatal error when navigating from reset password page. [#20747](https://github.com/grafana/grafana/pull/20747), [@peterholmberg](https://github.com/peterholmberg)
+  * **MixedDatasources**: Do not filter out all mixed data sources in add mixed query dropdown. [#20990](https://github.com/grafana/grafana/pull/20990), [@torkelo](https://github.com/torkelo)
+  * **Prometheus**: Fix caching for default labels request. [#20718](https://github.com/grafana/grafana/pull/20718), [@aocenas](https://github.com/aocenas)
+  * **Prometheus**: Run default labels query only once. [#20898](https://github.com/grafana/grafana/pull/20898), [@aocenas](https://github.com/aocenas)
+  * **Security**: Fix invite link still accessible after completion or revocation. [#20863](https://github.com/grafana/grafana/pull/20863), [@aknuds1](https://github.com/aknuds1)
+  * **Server**: Fail when unable to create log directory. [#20804](https://github.com/grafana/grafana/pull/20804), [@aknuds1](https://github.com/aknuds1)
+  * **TeamPicker**: Increase size limit from 10 to 100. [#20882](https://github.com/grafana/grafana/pull/20882), [@hendrikvh](https://github.com/hendrikvh)
+  * **Units**: Remove SI prefix symbol from new milli/microSievert(/h) units. [#20650](https://github.com/grafana/grafana/pull/20650), [@zegelin](https://github.com/zegelin)
+
+# 6.5.1 (2019-11-28)
+
+### Bug Fixes
+* **CloudWatch**: Region template query fix. [#20661](https://github.com/grafana/grafana/pull/20661), [@sunker](https://github.com/sunker)
+* **CloudWatch**: Fix annotations query editor loading. [#20687](https://github.com/grafana/grafana/pull/20687), [@sunker](https://github.com/sunker)
+* **Panel**: Fixes undefined services/dependencies in plugins without `/**@ngInject*/`. [#20696](https://github.com/grafana/grafana/pull/20696), [@hugohaggmark](https://github.com/hugohaggmark)
+* **Server**: Fix failure to start with "bind: address already in use" when using socket as protocol. [#20679](https://github.com/grafana/grafana/pull/20679), [@aknuds1](https://github.com/aknuds1)
+* **Stats**: Fix active admins/editors/viewers stats are counted more than once if the user is part of more than one org. [#20711](https://github.com/grafana/grafana/pull/20711), [@papagian](https://github.com/papagian)
+
+# 6.5.0 (2019-11-25)
+
+### Features / Enhancements
+
+* **CloudWatch**: Add curated dashboards for most popular amazon services. [#20486](https://github.com/grafana/grafana/pull/20486), [@sunker](https://github.com/sunker)
+* **CloudWatch**: Enable Min time interval. [#20260](https://github.com/grafana/grafana/pull/20260), [@mtanda](https://github.com/mtanda)
+* **Explore**: UI improvements for log details. [#20485](https://github.com/grafana/grafana/pull/20485), [@ivanahuckova](https://github.com/ivanahuckova)
+* **Server**: Improve grafana-server diagnostics configuration for profiling and tracing. [#20593](https://github.com/grafana/grafana/pull/20593), [@papagian](https://github.com/papagian)
+
+### Bug Fixes
+
+* **BarGauge/Gauge**: Add back missing title option field display options. [#20616](https://github.com/grafana/grafana/pull/20616), [@torkelo](https://github.com/torkelo)
+* **CloudWatch**: Fix high CPU load. [#20579](https://github.com/grafana/grafana/pull/20579), [@marefr](https://github.com/marefr)
+* **CloudWatch**: Fix high resolution mode without expression. [#20459](https://github.com/grafana/grafana/pull/20459), [@mtanda](https://github.com/mtanda)
+* **CloudWatch**: Make sure period variable is being interpreted correctly. [#20447](https://github.com/grafana/grafana/pull/20447), [@sunker](https://github.com/sunker)
+* **CloudWatch**: Remove HighResolution toggle since it's not being used. [#20440](https://github.com/grafana/grafana/pull/20440), [@sunker](https://github.com/sunker)
+* **Cloudwatch**: Fix LaunchTime attribute tag bug. [#20237](https://github.com/grafana/grafana/pull/20237), [@sunker](https://github.com/sunker)
+* **Data links**: Fix URL field turns read-only for graph panels. [#20381](https://github.com/grafana/grafana/pull/20381), [@dprokop](https://github.com/dprokop)
+* **Explore**: Keep logQL filters when selecting labels in log row details. [#20570](https://github.com/grafana/grafana/pull/20570), [@ivanahuckova](https://github.com/ivanahuckova)
+* **MySQL**: Fix TLS auth settings in config page. [#20501](https://github.com/grafana/grafana/pull/20501), [@peterholmberg](https://github.com/peterholmberg)
+* **Provisioning**: Fix unmarshaling nested jsonData values. [#20399](https://github.com/grafana/grafana/pull/20399), [@aocenas](https://github.com/aocenas)
+* **Server**: Should fail when server is unable to bind port. [#20409](https://github.com/grafana/grafana/pull/20409), [@aknuds1](https://github.com/aknuds1)
+* **Templating**: Prevents crash when $__searchFilter is not a string. [#20526](https://github.com/grafana/grafana/pull/20526), [@hugohaggmark](https://github.com/hugohaggmark)
+* **TextPanel**: Fixes issue with template variable value not properly html escaped [#20588](https://github.com/grafana/grafana/pull/20588), [@torkelo](https://github.com/torkelo)
+* **TimePicker**: Should update after location change. [#20466](https://github.com/grafana/grafana/pull/20466), [@torkelo](https://github.com/torkelo)
+
+## Breaking changes
+* **CloudWatch**: Pre Grafana 6.5.0, the CloudWatch datasource used the GetMetricStatistics API for all queries that did not have an ´id´ and did not have an ´expression´ defined in the query editor. The GetMetricStatistics API has a limit of 400 transactions per second. In this release, all queries use the GetMetricData API. The GetMetricData API has a limit of 50 transactions per second and 100 metrics per transaction. For API pricing information, please refer to the CloudWatch pricing page (https://aws.amazon.com/cloudwatch/pricing/).
+
+* **CloudWatch**: The GetMetricData API does not return metric unit, so unit auto detection in panels is no longer supported.
+
+* **CloudWatch**: The `HighRes` switch has been removed from the query editor. Read more about this in [upgrading to 6.5](https://grafana.com/docs/installation/upgrading/#upgrading-to-v6-5).
+
+* **CloudWatch**: In previous versions of Grafana, there was partial support for using multi-valued template variables as dimension values. When a multi-valued template variable is being used for dimension values in Grafana 6.5, a [search expression](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/using-search-expressions.html) will be generated. In the GetMetricData API, expressions are limited to 1024 characters, so you might reach this limit if you are using a large number of values. Read our [upgrading to 6.5](https://grafana.com/docs/installation/upgrading/#upgrading-to-v6-5) guide to see how you can use the `*` wildcard for this use case.
+
+# 6.5.0-beta1 (2019-11-14)
+
 ### Features / Enhancements
 
   * **API**: Add `createdAt` and `updatedAt` to api/users/lookup. [#19496](https://github.com/grafana/grafana/pull/19496), [@gotjosh](https://github.com/gotjosh)
@@ -43,6 +286,7 @@
   * **Templating**: Made default template variable query editor field a textarea with automatic height. [#20288](https://github.com/grafana/grafana/pull/20288), [@torkelo](https://github.com/torkelo)
   * **Units**: Add milli/microSievert, milli/microSievert/h and pixels. [#20144](https://github.com/grafana/grafana/pull/20144), [@ryantxu](https://github.com/ryantxu)
   * **Units**: Added mega ampere and watt-hour per kg. [#19922](https://github.com/grafana/grafana/pull/19922), [@Karan96Kaushik](https://github.com/Karan96Kaushik)
+  * **Enterprise**: Enterprise without a license behaves like OSS (Enterprise)
   
   ### Bug Fixes
   * **API**: Added dashboardId and slug in response to dashboard import api. [#19692](https://github.com/grafana/grafana/pull/19692), [@jongyllen](https://github.com/jongyllen)
@@ -67,25 +311,36 @@
   * **ReactPanels**: Adds Explore menu item. [#20236](https://github.com/grafana/grafana/pull/20236), [@hugohaggmark](https://github.com/hugohaggmark)
   * **Team Sync**: Fix URL encode Group IDs for external team sync. [#20280](https://github.com/grafana/grafana/pull/20280), [@gotjosh](https://github.com/gotjosh)
 
-
 ## Breaking changes
-* **CloudWatch**: Pre Grafana 6.5.0, the CloudWatch datasource used the GetMetricStatistics API for all queries that did not have an ´id´ and did not have an ´expression´ defined in the query editor. The GetMetricStatistics API has a limit of 400 transactions per second. In this release, all queries use the GetMetricData API. The GetMetricData API has a limit of 50 transactions per second and 100 metrics per transaction. Also the GetMetricData API pricing is different from GetMetricStatistics. While GetMetricStatistics qualified for the CloudWatch API free tier, this is not the case for GetMetricData calls. For more information, please refer to the CloudWatch pricing page (https://aws.amazon.com/cloudwatch/pricing/). Read more about GetMetricData limits in [upgrading to 6.5](https://grafana.com/docs/installation/upgrading/#upgrading-to-v6-5). 
+* **CloudWatch**: Pre Grafana 6.5.0, the CloudWatch datasource used the GetMetricStatistics API for all queries that did not have an ´id´ and did not have an ´expression´ defined in the query editor. The GetMetricStatistics API has a limit of 400 transactions per second. In this release, all queries use the GetMetricData API. The GetMetricData API has a limit of 50 transactions per second and 100 metrics per transaction. For API pricing information, please refer to the CloudWatch pricing page (https://aws.amazon.com/cloudwatch/pricing/).
 
-* **CloudWatch**: The GetMetricData API does not return metric unit, so unit auto detection in panels is no longer supported.  
+* **CloudWatch**: The GetMetricData API does not return metric unit, so unit auto detection in panels is no longer supported.
 
-* **CloudWatch**: The `HighRes` switch has been removed from the query editor. Read more about this in [upgrading to 6.5](https://grafana.com/docs/installation/upgrading/#upgrading-to-v6-5). 
+* **CloudWatch**: The `HighRes` switch has been removed from the query editor. Read more about this in [upgrading to 6.5](https://grafana.com/docs/installation/upgrading/#upgrading-to-v6-5).
 
-* **CloudWatch**: In previous versions of Grafana, there was partial support for using multi template variables as dimension values. When a multi template variable is being used for dimension values in Grafana 6.5, a [search expression](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/using-search-expressions.html) will be generated. In the GetMetricData API, expressions are limited to 1024 characters, so it might be the case that this limit is reached when a multi template variable that has a lot of values is being used. Read about the suggested workaround in [upgrading to 6.5](https://grafana.com/docs/installation/upgrading/#upgrading-to-v6-5). 
+* **CloudWatch**: In previous versions of Grafana, there was partial support for using multi-valued template variables as dimension values. When a multi-valued template variable is being used for dimension values in Grafana 6.5, a [search expression](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/using-search-expressions.html) will be generated. In the GetMetricData API, expressions are limited to 1024 characters, so you might reach this limit if you are using a large number of values. Read our [upgrading to 6.5](https://grafana.com/docs/installation/upgrading/#upgrading-to-v6-5) guide to see how you can use the `*` wildcard for this use case.
+
+# 6.4.5 (2019-11-25)
+
+### Bug Fixes
+
+* **CloudWatch**: Fix high CPU load [#20579](https://github.com/grafana/grafana/pull/20579)
 
 # 6.4.4 (2019-11-06)
 
 ### Bug Fixes
+* **MySQL**: Fix encoding in connection string [#20192](https://github.com/grafana/grafana/pull/20192)
 * **DataLinks**: Fix blur issues. [#19883](https://github.com/grafana/grafana/pull/19883), [@aocenas](https://github.com/aocenas)
 * **Docker**: Makes it possible to parse timezones in the docker image. [#20081](https://github.com/grafana/grafana/pull/20081), [@xlson](https://github.com/xlson)
 * **LDAP**: All LDAP servers should be tried even if one of them returns a connection error. [#20077](https://github.com/grafana/grafana/pull/20077), [@jongyllen](https://github.com/jongyllen)
 * **LDAP**: No longer shows incorrectly matching groups based on role in debug page. [#20018](https://github.com/grafana/grafana/pull/20018), [@xlson](https://github.com/xlson)
 * **Singlestat**: Fix no data / null value mapping . [#19951](https://github.com/grafana/grafana/pull/19951), [@ryantxu](https://github.com/ryantxu)
 
+#### Security vulnerability
+
+The MySQL data source connnection string fix, [#20192](https://github.com/grafana/grafana/pull/20192), that was part of this release
+also fixed a security vulnerability. Thanks Yuriy Dyachenko for discovering and notifying us about this.
+
 # 6.4.3 (2019-10-16)
 
 ### Bug Fixes
@@ -133,6 +388,7 @@
 * **Explore**: Take root_url setting into account when redirecting from dashboard to explore. [#19447](https://github.com/grafana/grafana/pull/19447), [@ivanahuckova](https://github.com/ivanahuckova)
 * **Explore**: Update broken link to logql docs. [#19510](https://github.com/grafana/grafana/pull/19510), [@ivanahuckova](https://github.com/ivanahuckova)
 * **Logs**: Adds Logs Panel as a visualization. [#19504](https://github.com/grafana/grafana/pull/19504), [@davkal](https://github.com/davkal)
+* **Reporting**: Generate and email PDF reports based on Dashboards (Enterprise)
 
 ### Bug Fixes
 * **CLI**: Fix version selection for plugin install. [#19498](https://github.com/grafana/grafana/pull/19498), [@aocenas](https://github.com/aocenas)
@@ -177,7 +433,7 @@
 * **Dashboard**: Adds Logs Panel (alpha) as visualization option for Dashboards. [#18641](https://github.com/grafana/grafana/pull/18641), [@hugohaggmark](https://github.com/hugohaggmark)
 * **Dashboard**: Reuse query results between panels . [#16660](https://github.com/grafana/grafana/pull/16660), [@ryantxu](https://github.com/ryantxu)
 * **Dashboard**: Set time to to 23:59:59 when setting To time using calendar. [#18595](https://github.com/grafana/grafana/pull/18595), [@simPod](https://github.com/simPod)
-* **DataLinks**: Add DataLinks support to Gauge, BarGauge and SingleStat2 panel. [#18605](https://github.com/grafana/grafana/pull/18605), [@ryantxu](https://github.com/ryantxu)
+* **DataLinks**: Add DataLinks support to Gauge, BarGauge and stat panel. [#18605](https://github.com/grafana/grafana/pull/18605), [@ryantxu](https://github.com/ryantxu)
 * **DataLinks**: Enable access to labels & field names. [#18918](https://github.com/grafana/grafana/pull/18918), [@torkelo](https://github.com/torkelo)
 * **DataLinks**: Enable multiple data links per panel. [#18434](https://github.com/grafana/grafana/pull/18434), [@dprokop](https://github.com/dprokop)
 * **Docker**: switch docker image to alpine base with phantomjs support. [#18468](https://github.com/grafana/grafana/pull/18468), [@DanCech](https://github.com/DanCech)
@@ -247,6 +503,11 @@ Grafana is now using Alpine 3.10 as docker base image.
 
 Please consider migrating from PhantomJS to the [Grafana Image Renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer).
 
+# 6.3.7 (2019-11-22)
+
+### Bug Fixes
+* **CloudWatch**: Fix high CPU load [#20579](https://github.com/grafana/grafana/pull/20579)
+
 # 6.3.6 (2019-09-23)
 
 ### Features / Enhancements
@@ -380,6 +641,7 @@ Please consider migrating from PhantomJS to the [Grafana Image Renderer plugin](
 * **Templating**: Support selecting all filtered values of a multi-value variable. [#16873](https://github.com/grafana/grafana/pull/16873), [@r66ad](https://github.com/r66ad)
 * **Tracing**: allow propagation with Zipkin headers. [#17009](https://github.com/grafana/grafana/pull/17009), [@jrockway](https://github.com/jrockway)
 * **Users**: Disable users removed from LDAP. [#16820](https://github.com/grafana/grafana/pull/16820), [@alexanderzobnin](https://github.com/alexanderzobnin)
+* **SAML**: Add SAML as an authentication option (Enterprise)
 
 ### Bug Fixes
 * **AddPanel**: Fix issue when removing moved add panel widget . [#17659](https://github.com/grafana/grafana/pull/17659), [@dehrax](https://github.com/dehrax)
@@ -2896,4 +3158,3 @@ Thanks to everyone who contributed fixes and provided feedback :+1:
 # 1.0.0 (2014-01-19)
 
 First public release
-

Dockerfile

@@ -1,5 +1,5 @@
 # Golang build container
-FROM golang:1.13.1-alpine
+FROM golang:1.13.4-alpine
 
 RUN apk add --no-cache gcc g++
 
@@ -16,7 +16,7 @@ COPY build.go package.json ./
 RUN go run build.go build
 
 # Node build container
-FROM node:10.14.2-alpine
+FROM node:12.13.0-alpine
 
 # PhantomJS
 RUN apk add --no-cache curl &&\
@@ -35,7 +35,7 @@ COPY packages packages
 
 RUN yarn install --pure-lockfile --no-progress
 
-COPY Gruntfile.js tsconfig.json tslint.json .browserslistrc ./
+COPY Gruntfile.js tsconfig.json .eslintrc .editorconfig .browserslistrc ./
 COPY public public
 COPY scripts scripts
 COPY emails emails

Dockerfile.ubuntu

@@ -1,4 +1,4 @@
-FROM golang:1.13.1 AS go-builder
+FROM golang:1.13.4 AS go-builder
 
 WORKDIR /src/grafana
 
@@ -12,7 +12,7 @@ COPY pkg pkg/
 
 RUN go run build.go build
 
-FROM node:10.17 AS js-builder
+FROM node:12.13 AS js-builder
 
 # PhantomJS
 RUN apt-get update && apt-get install -y curl &&\
@@ -26,15 +26,15 @@ COPY packages packages
 
 RUN yarn install --pure-lockfile
 
-COPY Gruntfile.js tsconfig.json tslint.json .browserslistrc ./
-COPY public public 
+COPY Gruntfile.js tsconfig.json .eslintrc .editorconfig .browserslistrc ./
+COPY public public
 COPY scripts scripts
 COPY emails emails
 
 ENV NODE_ENV production
 RUN ./node_modules/.bin/grunt build
 
-FROM ubuntu:18.10
+FROM ubuntu:20.04
 
 LABEL maintainer="Grafana team <hello@grafana.com>"
 EXPOSE 3000

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 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 help
 
 GO = GO111MODULE=on go
 GO_FILES ?= ./pkg/...
@@ -52,6 +52,9 @@ scripts/go/bin/bra: scripts/go/go.mod
 run: scripts/go/bin/bra ## Build and run web server on filesystem changes.
 	@GO111MODULE=on scripts/go/bin/bra run
 
+run-frontend: deps-js ## Fetch js dependencies and watch frontend for rebuild
+	yarn start
+
 ##@ Testing
 
 test-go: ## Run tests for backend.

api-extractor.json

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

conf/defaults.ini

@@ -179,7 +179,7 @@ disable_brute_force_login_protection = false
 # set to true if you host Grafana behind HTTPS. default is false.
 cookie_secure = false
 
-# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict" and "none"
+# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict", "none" and "disabled"
 cookie_samesite = lax
 
 # set to true if you want to allow browsers to render Grafana in a <frame>, <iframe>, <embed> or <object>. default is false.
@@ -230,6 +230,10 @@ snapshot_remove_expired = true
 # Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1
 versions_to_keep = 20
 
+# Minimum dashboard refresh interval. When set, this will restrict users to set the refresh interval of a dashboard lower than given interval. Per default this is not set/unrestricted.
+# 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 =
+
 #################################### Users ###############################
 [users]
 # disable user signup / registration
@@ -318,6 +322,7 @@ scopes = user:email,read:org
 auth_url = https://github.com/login/oauth/authorize
 token_url = https://github.com/login/oauth/access_token
 api_url = https://api.github.com/user
+allowed_domains =
 team_ids =
 allowed_organizations =
 
@@ -331,6 +336,7 @@ scopes = api
 auth_url = https://gitlab.com/oauth/authorize
 token_url = https://gitlab.com/oauth/token
 api_url = https://gitlab.com/api/v4
+allowed_domains =
 allowed_groups =
 
 #################################### Google Auth #########################
@@ -364,6 +370,19 @@ client_secret = some_secret
 scopes = user:email
 allowed_organizations =
 
+#################################### Azure AD OAuth #######################
+[auth.azuread]
+name = Azure AD
+enabled = false
+allow_sign_up = true
+client_id = some_client_id
+client_secret = some_client_secret
+scopes = openid email profile
+auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
+token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
+allowed_domains =
+allowed_groups =
+
 #################################### Generic OAuth #######################
 [auth.generic_oauth]
 name = OAuth
@@ -374,17 +393,17 @@ client_secret = some_secret
 scopes = user:email
 email_attribute_name = email:primary
 email_attribute_path =
-role_attribute_path = 
+role_attribute_path =
 auth_url =
 token_url =
 api_url =
+allowed_domains =
 team_ids =
 allowed_organizations =
 tls_skip_verify_insecure = false
 tls_client_cert =
 tls_client_key =
 tls_client_ca =
-send_client_credentials_via_post = false
 
 #################################### SAML Auth ###########################
 [auth.saml] # Enterprise only
@@ -437,6 +456,7 @@ enabled = false
 header_name = X-WEBAUTH-USER
 header_property = username
 auto_sign_up = true
+# Deprecated, use sync_ttl instead
 ldap_sync_ttl = 60
 sync_ttl = 60
 whitelist =
@@ -590,6 +610,8 @@ notification_timeout_seconds = 30
 # Default setting for max attempts to sending alert notifications. Default value is 3
 max_attempts = 3
 
+# Makes it possible to enforce a minimal interval between evaluations, to reduce load on the backend
+min_interval_seconds = 1
 
 #################################### Explore #############################
 [explore]
@@ -614,6 +636,7 @@ basic_auth_password =
 address =
 prefix = prod.grafana.%(instance_name)s.
 
+#################################### Grafana.com integration  ##########################
 [grafana_net]
 url = https://grafana.com
 
@@ -644,10 +667,13 @@ disable_shared_zipkin_spans = false
 
 #################################### External Image Storage ##############
 [external_image_storage]
+# Used for uploading images to public servers so they can be included in slack/email messages.
 # You can choose between (s3, webdav, gcs, azure_blob, local)
 provider =
 
 [external_image_storage.s3]
+endpoint =
+path_style_access =
 bucket_url =
 bucket =
 region =

conf/sample.ini

@@ -46,7 +46,7 @@
 
 # The full public facing url you use in browser, used for redirects and emails
 # If you use reverse proxy and sub path specify full url (with sub path)
-;root_url = http://localhost:3000
+;root_url = %(protocol)s://%(domain)s:%(http_port)s/
 
 # Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
 ;serve_from_sub_path = false
@@ -87,6 +87,11 @@
 # For "postgres" only, either "disable", "require" or "verify-full"
 ;ssl_mode = disable
 
+;ca_cert_path =
+;client_key_path =
+;client_cert_path =
+;server_cert_name =
+
 # For "sqlite3" only, path relative to data_path setting
 ;path = grafana.db
 
@@ -175,7 +180,7 @@
 # set to true if you host Grafana behind HTTPS. default is false.
 ;cookie_secure = false
 
-# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict" and "none"
+# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict", "none" and "disabled"
 ;cookie_samesite = lax
 
 # set to true if you want to allow browsers to render Grafana in a <frame>, <iframe>, <embed> or <object>. default is false.
@@ -224,6 +229,10 @@
 # Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1
 ;versions_to_keep = 20
 
+# Minimum dashboard refresh interval. When set, this will restrict users to set the refresh interval of a dashboard lower than given interval. Per default this is not set/unrestricted.
+# 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 =
+
 #################################### Users ###############################
 [users]
 # disable user signup / registration
@@ -235,9 +244,15 @@
 # Set to true to automatically assign new users to the default organization (id 1)
 ;auto_assign_org = true
 
+# Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true)
+;auto_assign_org_id = 1
+
 # Default role new users will be automatically assigned (if disabled above is set to true)
 ;auto_assign_org_role = Viewer
 
+# Require email validation before sign up completes
+;verify_email_enabled = false
+
 # Background text for the user field on the login page
 ;login_hint = email or username
 ;password_hint = password
@@ -282,6 +297,9 @@
 # This setting is ignored if multiple OAuth providers are configured.
 ;oauth_auto_login = false
 
+# limit of api_key seconds to live before expiration
+;api_key_max_seconds_to_live = -1
+
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -303,9 +321,23 @@
 ;auth_url = https://github.com/login/oauth/authorize
 ;token_url = https://github.com/login/oauth/access_token
 ;api_url = https://api.github.com/user
+;allowed_domains =
 ;team_ids =
 ;allowed_organizations =
 
+#################################### GitLab Auth #########################
+[auth.gitlab]
+;enabled = false
+;allow_sign_up = true
+;client_id = some_id
+;client_secret = some_secret
+;scopes = api
+;auth_url = https://gitlab.com/oauth/authorize
+;token_url = https://gitlab.com/oauth/token
+;api_url = https://gitlab.com/api/v4
+;allowed_domains =
+;allowed_groups =
+
 #################################### Google Auth ##########################
 [auth.google]
 ;enabled = false
@@ -317,6 +349,29 @@
 ;token_url = https://accounts.google.com/o/oauth2/token
 ;api_url = https://www.googleapis.com/oauth2/v1/userinfo
 ;allowed_domains =
+;hosted_domain =
+
+#################################### Grafana.com Auth ####################
+[auth.grafana_com]
+;enabled = false
+;allow_sign_up = true
+;client_id = some_id
+;client_secret = some_secret
+;scopes = user:email
+;allowed_organizations =
+
+#################################### Azure AD OAuth #######################
+[auth.azuread]
+;name = Azure AD
+;enabled = false
+;allow_sign_up = true
+;client_id = some_client_id
+;client_secret = some_client_secret
+;scopes = openid email profile
+;auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
+;token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
+;allowed_domains =
+;allowed_groups =
 
 #################################### Generic OAuth ##########################
 [auth.generic_oauth]
@@ -331,6 +386,7 @@
 ;auth_url = https://foo.bar/login/oauth/authorize
 ;token_url = https://foo.bar/login/oauth/access_token
 ;api_url = https://foo.bar/user
+;allowed_domains =
 ;team_ids =
 ;allowed_organizations =
 ;role_attribute_path =
@@ -339,10 +395,6 @@
 ;tls_client_key =
 ;tls_client_ca =
 
-; Set to true to enable sending client_id and client_secret via POST body instead of Basic authentication HTTP header
-; This might be required if the OAuth provider is not RFC6749 compliant, only supporting credentials passed via POST payload
-;send_client_credentials_via_post = false
-
 #################################### SAML Auth ###########################
 [auth.saml] # Enterprise only
 # Defaults to false. If true, the feature is enabled.
@@ -384,14 +436,9 @@
 # Friendly name or name of the attribute within the SAML assertion to use as the user's email
 ;assertion_attribute_email = mail
 
-#################################### Grafana.com Auth ####################
-[auth.grafana_com]
-;enabled = false
-;allow_sign_up = true
-;client_id = some_id
-;client_secret = some_secret
-;scopes = user:email
-;allowed_organizations =
+#################################### Basic Auth ##########################
+[auth.basic]
+;enabled = true
 
 #################################### Auth Proxy ##########################
 [auth.proxy]
@@ -405,10 +452,6 @@
 # Read the auth proxy docs for details on what the setting below enables
 ;enable_login_token = false
 
-#################################### Basic Auth ##########################
-[auth.basic]
-;enabled = true
-
 #################################### Auth LDAP ##########################
 [auth.ldap]
 ;enabled = false
@@ -437,6 +480,7 @@
 
 [emails]
 ;welcome_email_on_sign_up = false
+;templates_pattern = emails/*.html
 
 #################################### Logging ##########################
 [log]
@@ -495,6 +539,41 @@
 # Syslog tag. By default, the process' argv[0] is used.
 ;tag =
 
+#################################### Usage Quotas ########################
+[quota]
+; enabled = false
+
+#### set quotas to -1 to make unlimited. ####
+# limit number of users per Org.
+; org_user = 10
+
+# limit number of dashboards per Org.
+; org_dashboard = 100
+
+# limit number of data_sources per Org.
+; org_data_source = 10
+
+# limit number of api_keys per Org.
+; org_api_key = 10
+
+# limit number of orgs a user can create.
+; user_org = 10
+
+# Global limit of users.
+; global_user = -1
+
+# global limit of orgs.
+; global_org = -1
+
+# global limit of dashboards
+; global_dashboard = -1
+
+# global limit of api_keys
+; global_api_key = -1
+
+# global limit on number of logged in users.
+; global_session = -1
+
 #################################### Alerting ############################
 [alerting]
 # Disable alerting engine & UI features
@@ -522,6 +601,9 @@
 # Default setting for max attempts to sending alert notifications. Default value is 3
 ;max_attempts = 3
 
+# Makes it possible to enforce a minimal interval between evaluations, to reduce load on the backend
+;min_interval_seconds = 1
+
 #################################### Explore #############################
 [explore]
 # Enable the Explore section
@@ -532,11 +614,14 @@
 [metrics]
 # Disable / Enable internal metrics
 ;enabled           = true
+# Graphite Publish interval
+;interval_seconds  = 10
 # Disable total stats (stat_totals_*) metrics to be generated
 ;disable_total_stats = false
 
-# Publish interval
-;interval_seconds  = 10
+#If both are set, basic auth will be required for the metrics endpoint.
+; basic_auth_username =
+; basic_auth_password =
 
 # Send internal metrics to Graphite
 [metrics.graphite]
@@ -544,6 +629,11 @@
 ;address =
 ;prefix = prod.grafana.%(instance_name)s.
 
+#################################### Grafana.com integration  ##########################
+# Url used to import dashboards directly from Grafana.com
+[grafana_com]
+;url = https://grafana.com
+
 #################################### Distributed tracing ############
 [tracing.jaeger]
 # Enable by setting the address sending traces to jaeger (ex localhost:6831)
@@ -566,11 +656,6 @@
 # Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
 ;disable_shared_zipkin_spans = false
 
-#################################### Grafana.com integration  ##########################
-# Url used to import dashboards directly from Grafana.com
-[grafana_com]
-;url = https://grafana.com
-
 #################################### External image storage ##########################
 [external_image_storage]
 # Used for uploading images to public servers so they can be included in slack/email messages.
@@ -578,6 +663,8 @@
 ;provider =
 
 [external_image_storage.s3]
+;endpoint =
+;path_style_access =
 ;bucket =
 ;region =
 ;path =
@@ -610,10 +697,6 @@
 # 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 =
 
-[enterprise]
-# Path to a valid Grafana Enterprise license.jwt file
-;license_path =
-
 [panels]
 # If set to true Grafana will allow script tags in text panels. Not recommended as it enable XSS vulnerabilities.
 ;disable_sanitize_html = false
@@ -621,3 +704,11 @@
 [plugins]
 ;enable_alpha = false
 ;app_tls_skip_verify_insecure = false
+
+[enterprise]
+# Path to a valid Grafana Enterprise license.jwt file
+;license_path =
+
+[feature_toggles]
+# enable features, separated by spaces
+;enable =

contribute/architecture/communication.md

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

contribute/architecture/services.md

@@ -32,7 +32,7 @@ The `Init` method is used to initialize and configure the service to make it rea
 
 Every service needs to be registered with the application for it to be included in the service graph.
 
-To register a service, call the `registry.RegisterService` function in a `init` function within your package.
+To register a service, call the `registry.RegisterService` function in an `init` function within your package.
 
 ```go
 func init() {

contribute/developer-guide.md

@@ -10,7 +10,7 @@ Before you begin, you might want to read [How to contribute to Grafana as a juni
 Make sure you have the following dependencies installed before setting up your developer environment:
 
 - [Git](https://git-scm.com/)
-- [Go](https://golang.org/dl/)
+- [Go](https://golang.org/dl/) (see [go.mod](../go.mod#L3) for minimum required version)
 - [Node.js (Long Term Support)](https://nodejs.org)
 - [Yarn](https://yarnpkg.com)
 
@@ -72,6 +72,10 @@ Log in using the default credentials:
 
 When you log in for the first time, Grafana asks you to change your password.
 
+#### Building on Windows
+
+The Grafana backend includes Sqlite3 which requires GCC to compile. So in order to compile Grafana on Windows you need to install GCC. We recommend [TDM-GCC](http://tdm-gcc.tdragon.net/download).
+
 ## Test Grafana
 
 The test suite consists of three types of tests: _Frontend tests_, _backend tests_, and _end-to-end tests_.
@@ -94,7 +98,9 @@ go test -v ./pkg/...
 
 ### Run end-to-end tests
 
-The end-to-end tests in Grafana uses [puppeteer](https://github.com/GoogleChrome/puppeteer) to run automated scripts in a headless Chrome browser. To run the tests:
+The end to end tests in Grafana use [Cypress](https://www.cypress.io/) to run automated scripts in a headless Chromium browser. Read more about our [e2e framework](/contribute/style-guides/e2e.md). 
+
+To run the tests:
 
 ```
 yarn e2e-tests
@@ -106,10 +112,10 @@ By default, the end-to-end tests assumes Grafana is available on `localhost:3000
 BASE_URL=http://localhost:3333 yarn e2e-tests
 ```
 
-To follow the tests in the browser while they're running, add the `BROWSER` and `SLOWMO` environment variables:
+To follow the tests in the browser while they're running, use the `yarn e2e-tests:debug` instead.
 
 ```
-BROWSER=1 SLOWMO=1 yarn e2e-tests
+yarn e2e-tests:debug
 ```
 
 ## Configure Grafana for development

contribute/style-guides/backend.md

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

contribute/style-guides/code-comments.md

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

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

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

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

@@ -2,6 +2,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).
+
 ## 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.
@@ -81,12 +83,44 @@ Always give the reader some idea of what to expect in the reference. Avoid blind
 When possible, use the exact title of the page or section you are linking to as the link text.
 
 **Example**
-* Refer to the [Documentation style guide](documentation-style-guide.md) for information about word usage and capitalization guidelines.
+Refer to the [Documentation style guide](documentation-style-guide.md) for information about word usage and capitalization guidelines.
+
+### Command line examples
+
+* Do not assume everyone is using Linux. Make sure instructions include enough information for Windows and Mac users to successfully complete procedures.
+
+* Do not add `$` before commands. Make it easy for users to copy and paste commands.
+
+  * **Wrong:** `$ sudo yum install grafana`
+  * **Right:** `sudo yum install grafana`
+
+* Include `sudo` before commands that require `sudo` to work.
+
+For terminal examples and Grafana configuration, use a `bash` code block:
+```bash
+sudo yum install grafana
+```
+For HTTP request/response, use an `http` code block:
+```http
+GET /api/dashboards/id/1/permissions HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
 
 ### Word usage
 
 Grafana products has some words, abbreviations, and slang particular to this discourse community.
 
+#### checkout, check out
+
+Two words if used as a verb, one word if used as a noun.
+
+**Examples**
+
+* Check out these new features!
+* Proceed to checkout.
+
 #### data source
 
 Two words, not one
@@ -94,7 +128,6 @@ Two words, not one
 **Exceptions:**
 * "datasource" used as an identifier
 * "datasource" in a URL
-* "Open source" should be hyphenated when used as an adjective, e.g. *open-source software*. The open form should be preferred when used as a noun, e.g. *Grafana is open source*.
 * Use "data source" instead of "datasource" unless used as an identifier, in code, or as part of a URL.
 * Spell out "repository" and avoid the shorter "repo."
 * Use "Unix" as the preferred spelling (as opposed to "UNIX", or "unix") when referring to the family of operating systems.
@@ -106,9 +139,13 @@ Two words, not one
 * Correct, but passive voice: Your list of active alarms is displayed.
 * Incorrect: The list of active alarms displays.
 
+#### metadata
+
+One word, not two.
+
 #### open source, open-source
 
-Hyphenate when used as an adjective. For example: _open-source software._ 
+Do not hyphenate when used as an adjective unless the lack of hyphen would cause confusion. For example: _Open source software design is the most open open-source system I can imagine._ 
 
 Do not hyphenate when it is used as a noun. For example: _Open source is the best way to develop software._
 

contribute/style-guides/e2e.md

@@ -0,0 +1,168 @@
+# 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.
+
+## 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`
+- `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"/>
+</div>
+```
+
+We could define a selector using `JQuery` [type selectors](https://api.jquery.com/category/selectors/) with a string like `'.gf-form-input.login-form-input'` but that would be brittle as style changes occur frequently. Furthermore there is nothing that signals to future developers that this input is part of an e2e test.
+
+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"/>
+</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')
+  },
+});
+```
+
+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.
+```ecmascript 6
+export const Pages = {
+  Login,
+  ...,
+  ...,
+  ...,
+};
+
+```
+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}/>
+</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 `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).
+```ecmascript 6
+describe('Login test', () => {
+  it('Should pass', () => {
+    e2e.pages.Login.visit();
+    // To prevent flaky tests, always do a .should on any selector that you expect to be in the DOM.
+    // Read more here: https://docs.cypress.io/guides/core-concepts/retry-ability.html#Commands-vs-assertions
+    e2e.pages.Login.username().should('be.visible');
+    e2e.pages.Login.username().type('admin');
+  });
+});
+```
+
+## 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
+<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">
+          {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({
+  url: '/datasources',
+  selectors: {
+    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`.
+
+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)}>
+          {dataSource.name}
+        </div>
+      </a>
+    </li>
+  ))}
+</ul>
+```
+
+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
+</div>
+...
+<div class="card-item-name" aria-label="Data source list item B">
+ B
+</div>
+...
+<div class="card-item-name" aria-label="Data source list item C">
+ C
+</div>
+```
+
+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', () => {
+    e2e.pages.DataSources.visit();
+    // To prevent flaky tests, always do a .should on any selector that you expect to be in the DOM.
+    // Read more here: https://docs.cypress.io/guides/core-concepts/retry-ability.html#Commands-vs-assertions
+    e2e.pages.DataSources.dataSources('B').should('be.visible');
+    e2e.pages.DataSources.dataSources('B').click();
+  });
+});
+```
+
+
+## Debugging PhantomJS image rendering
+
+### Common Error
+The most common error with PhantomJs image rendering is when a PR introduces an import that has functionality that's not supported by PhantomJs. To quickly identify which new import causes this you can use a tool like `es-check`.
+   
+1. Run > `npx es-check es5 './public/build/*.js'`
+2. Check the output for files that break es5 compatibility.
+3. Lazy load the failing imports if possible. 
+
+### Debugging
+There is no easy or comprehensive way to debug PhantomJS smoke test (image rendering) failures. However, PhantomJS exposes remote debugging interface which can give you a sense of what is going wrong in the smoke test. Before performing the steps described below make sure your local Grafana instance is running:
+
+1. Go to `tools/phantomjs` directory
+2. Execute `phantomjs` binary against `render.js` file: `./phantomjs --remote-debugger-port=9009 --remote-debugger-autorun=yes ./render.js url="http://localhost:3000"`
+3. In your browser navigate to `http://localhost:9009/`
+4. Select `http://localhost:3000/login` from the list. You will get access to Webkit's inspector to see the console's output from the smoke test.
+
+The method described above is not perfect, but is helpful to evaluate smoke tests breaking due to bundle errors.

contribute/style-guides/frontend.md

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

contribute/style-guides/redux.md

@@ -1,129 +1,15 @@
 # Redux framework
 
-To reduce the amount of boilerplate code used to create a strongly typed redux solution with actions, action creators, reducers and tests we've introduced a small framework around Redux.
+Grafana uses [Redux Toolkit](https://redux-toolkit.js.org/) to handle Redux boilerplate code.
+> Some of our Reducers are used by Angular and therefore state is to be considered as mutable for those reducers.
 
-`+` Much less boilerplate code
-`-` Non Redux standard api
-
-## New core functionality
-
-### actionCreatorFactory
-
-Used to create an action creator with the following signature
-
-```typescript
-{ type: string , (payload: T): {type: string; payload: T;} }
-```
-
-where the `type` string will be ensured to be unique and `T` is the type supplied to the factory.
-
-#### Example
-
-```typescript
-export const someAction = actionCreatorFactory<string>('SOME_ACTION').create();
-
-// later when dispatched
-someAction('this rocks!');
-```
-
-```typescript
-// best practices, always use an interface as type
-interface SomeAction {
-  data: string;
-}
-export const someAction = actionCreatorFactory<SomeAction>('SOME_ACTION').create();
-
-// later when dispatched
-someAction({ data: 'best practices' });
-```
-
-```typescript
-// declaring an action creator with a type string that has already been defined will throw
-export const someAction = actionCreatorFactory<string>('SOME_ACTION').create();
-export const theAction = actionCreatorFactory<string>('SOME_ACTION').create(); // will throw
-```
-
-### reducerFactory
-
-Fluent API used to create a reducer. (same as implementing the standard switch statement in Redux)
-
-#### Example
-
-```typescript
-interface ExampleReducerState {
-  data: string[];
-}
-
-const intialState: ExampleReducerState = { data: [] };
-
-export const someAction = actionCreatorFactory<string>('SOME_ACTION').create();
-export const otherAction = actionCreatorFactory<string[]>('Other_ACTION').create();
-
-export const exampleReducer = reducerFactory<ExampleReducerState>(intialState)
-  // addMapper is the function that ties an action creator to a state change
-  .addMapper({
-    // action creator to filter out which mapper to use
-    filter: someAction,
-    // mapper function where the state change occurs
-    mapper: (state, action) => ({ ...state, data: state.data.concat(action.payload) }),
-  })
-  // a developer can just chain addMapper functions until reducer is done
-  .addMapper({
-    filter: otherAction,
-    mapper: (state, action) => ({ ...state, data: action.payload }),
-  })
-  .create(); // this will return the reducer
-```
-
-#### Typing limitations
-
-There is a challenge left with the mapper function that I can not solve with TypeScript. The signature of a mapper is
-
-```typescript
-<State, Payload>(state: State, action: ActionOf<Payload>) => State;
-```
-
-If you would to return an object that is not of the state type like the following mapper
-
-```typescript
-mapper: (state, action) => ({ nonExistingProperty: ''}),
-```
-
-Then you would receive the following compile error
-
-```shell
-[ts] Property 'data' is missing in type '{ nonExistingProperty: string; }' but required in type 'ExampleReducerState'. [2741]
-```
-
-But if you return an object that is spreading state and add a non existing property type like the following mapper
-
-```typescript
-mapper: (state, action) => ({ ...state, nonExistingProperty: ''}),
-```
-
-Then you would not receive any compile error.
-
-If you want to make sure that never happens you can just supply the State type to the mapper callback like the following mapper:
-
-```typescript
-mapper: (state, action): ExampleReducerState => ({ ...state, nonExistingProperty: 'kalle' }),
-```
-
-Then you would receive the following compile error
-
-```shell
-[ts]
-Type '{ nonExistingProperty: string; data: string[]; }' is not assignable to type 'ExampleReducerState'.
-  Object literal may only specify known properties, and 'nonExistingProperty' does not exist in type 'ExampleReducerState'. [2322]
-```
-
-## New test functionality
+## Test functionality
 
 ### reducerTester
 
 Fluent API that simplifies the testing of reducers
 
-#### Example
+#### Usage
 
 ```typescript
 reducerTester()
@@ -131,3 +17,32 @@ reducerTester()
   .whenActionIsDispatched(someAction('reducer tests'))
   .thenStateShouldEqual({ ...initialState, data: 'reducer tests' });
 ```
+
+#### Complex usage
+Sometimes you encounter a `resulting state` that contains properties that are hard to compare, such as `Dates`, but you still want to compare that other props in state are correct.
+
+Then you can use `thenStatePredicateShouldEqual` function on `reducerTester` that will return the `resulting state` so that you can expect upon individual properties..
+
+```typescript
+reducerTester()
+  .givenReducer(someReducer, initialState)
+  .whenActionIsDispatched(someAction('reducer tests'))
+  .thenStatePredicateShouldEqual(resultingState => {
+    expect(resultingState.data).toEqual('reducer tests');
+    return true;  
+  });
+```
+
+### thunkTester
+
+Fluent API that simplifies the testing of thunks.
+
+#### Usage
+
+```typescript
+const dispatchedActions = await thunkTester(initialState)
+    .givenThunk(someThunk)
+    .whenThunkIsDispatched(arg1, arg2, arg3);
+
+expect(dispatchedActions).toEqual([someAction('reducer tests')]);
+```

contribute/style-guides/storybook.md

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

contribute/style-guides/styling.md

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

contribute/style-guides/themes.md

@@ -2,11 +2,22 @@
 
 ## Overview
 
-**Themes are implemented in Typescript.** That's because our goal is to share variables between Grafana Typescript code and SASS files. Theme definitions are located in `packages/grafana-ui/src/themes/[default|dark|light].ts` files. `default.ts` file holds common variables like typography and spacing definitions, while `[light|dark].ts` primarily specify colors used in themes.
+**Themes are implemented in Typescript.** That's because our goal is to share variables between Grafana TypeScript and [Sass](https://sass-lang.com/) code. Theme definitions are located in the following files:
+
+- [packages/grafana-ui/src/themes/dark.ts](../../packages/grafana-ui/src/themes/dark.ts)
+- [packages/grafana-ui/src/themes/default.ts](../../packages/grafana-ui/src/themes/default.ts)
+- [packages/grafana-ui/src/themes/light.ts](../../packages/grafana-ui/src/themes/light.ts)
+
+The `default.ts` file holds common variables like typography and spacing definitions, while `[light|dark].ts` primarily specify colors used in themes.
 
 ## Usage
+
+This section provides usage guidelines.
+
 ### Using themes in React components
 
+Here's how to use Grafana themes in React components.
+
 #### Using `ThemeContext` directly
 
 ```tsx
@@ -26,12 +37,11 @@ const Foo: React.FunctionComponent<FooProps> = () => {
 
   // Your component has access to the theme variables now
 }
-
 ```
 
 #### Using `withTheme` higher-order component (HOC)
 
-With this method your component will be automatically wrapped in `ThemeContext.Consumer` and provided with current theme via `theme` prop. Component used with `withTheme` must implement `Themeable` interface.
+With this method your component will be automatically wrapped in `ThemeContext.Consumer` and provided with current theme via `theme` prop. Components used with `withTheme` must implement the `Themeable` interface.
 
 ```ts
 import  { ThemeContext, Themeable } from '@grafana/ui';
@@ -43,7 +53,7 @@ const Foo: React.FunctionComponent<FooProps> = () => ...
 export default withTheme(Foo);
 ```
 
-### Test components that use ThemeContext
+### Test components that use `ThemeContext`
 
 When implementing snapshot tests for components that use the `withTheme` HOC, the snapshot will contain the entire theme object. Any change to the theme renders the snapshot outdated.
 
@@ -73,9 +83,11 @@ describe('MyComponent', () => {
 });
 ```
 
-### Using themes in Storybook
+### Using themes in [Storybook](https://storybook.js.org/)
 
-All stories are wrapped with `ThemeContext.Provider` using global decorator. To render `Themeable` component that's not wrapped by `withTheme` HOC you either create a new component in your story:
+All stories are wrapped with `ThemeContext.Provider` using a global decorator. To render a `Themeable` component that isn't wrapped by a `withTheme` HOC, either create a new component in your story, or use the `renderComponentWithTheme` helper.
+
+#### Create a new component:
 
 ```tsx
 // Foo.story.tsx
@@ -86,7 +98,7 @@ FooStories.add('Story' () => {
 });
 ```
 
-or use `renderComponentWithTheme` helper:
+#### Use `renderComponentWithTheme` helper:
 
 ```tsx
 // Bar.story.tsx
@@ -98,29 +110,42 @@ BarStories.add('Story' () => {
 
 ### Using themes in Angular code
 
-There should be very few cases where theme would be used in Angular context. For this purpose there is a function available that retrieves current theme: `import { getCurrentTheme } from app/core/utils/ConfigProvider`. Angular components should be migrated to React, or if that's not possible at the moment, styled using SASS.
+There should be very few cases where a theme would be used in an Angular context. For this purpose, there is a function available that retrieves the current theme:
 
+```ts
+import { getCurrentTheme } from app/core/utils/ConfigProvider
+```
+
+Angular components should be migrated to React, or if that's not possible at the moment, styled using Sass.
 
 ## FAQ
-### How can I modify SASS variable files?
+
+This section provides insight into frequently-asked questions.
+
+### How can I modify Sass variable files?
+
 > For the following to apply you need to run `yarn dev` task.
 
-`[_variables|_variables.dark|_variables.light].generated.scss` files are the ones that are referenced in the main SASS files for SASS variables to be available. **These files are automatically generated and should never be modified by hand!**.
+`[_variables|_variables.dark|_variables.light].generated.scss` files are the ones that are referenced in the main Sass files for Sass variables to be available. **These files are automatically generated and should never be modified by hand!**
 
-#### If you need to modify *SASS variable value* you need to modify corresponding Typescript file that is a source of the variables:
+#### If you need to modify a *Sass variable value* you need to modify the corresponding Typescript file that is the source of the variables:
 - `_variables.generated.scss` - modify `grafana-ui/src/themes/default.ts`
 - `_variables.light.generated.scss` - modify `grafana-ui/src/themes/light.ts`
 - `_variables.dark.generated.scss` - modify `grafana-ui/src/themes/dark.ts`
 
-#### If you need to *add new variable* to SASS variables you need to modify corresponding template file:
+#### If you need to *add new variable* to Sass variables you need to modify corresponding template file:
 - `_variables.generated.scss` - modify `grafana-ui/src/themes/_variables.scss.tmpl.ts`
 - `_variables.light.generated.scss` - modify `grafana-ui/src/themes/_variables.light.scss.tmpl.ts`
 - `_variables.dark.generated.scss` - modify `grafana-ui/src/themes/_variables.dark.scss.tmpl.ts`
 
 
 ## Limitations
-### You must ensure ThemeContext provider is available in a React tree
-  By default all react2angular directives have `ThemeContext.Provider` ensured. But, there are cases where we create another React tree via `ReactDOM.render`. This happens in case of graph legend rendering and `ReactContainer` directive. In such cases theme consumption will fail. To make sure theme context is available in such cases, you need to wrap your rendered component with ThemeContext.Provider using `provideTheme` function:
+
+This section describes limitations with Grafana's theming system.
+
+### You must ensure `ThemeContext` provider is available in a React tree
+
+By default all react2angular directives have `ThemeContext.Provider` ensured. But, there are cases where we create another React tree via `ReactDOM.render`. This happens in the case of graph legend rendering and the `ReactContainer` directive. In such cases theme consumption will fail. To make sure theme context is available in such cases, you need to wrap your rendered component with ThemeContext.Provider using the `provideTheme` function:
 
 ```ts
 // graph.ts

contribute/templates/README.md

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

contribute/templates/doc-concept-template.md

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

contribute/templates/doc-reference-template.md

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

contribute/templates/doc-task-template.md

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

devenv/datasources.yaml

@@ -20,8 +20,8 @@ datasources:
     url: http://localhost:3011
 
   - name: gdev-testdata
-    type: testdata
     isDefault: true
+    type: testdata
 
   - name: gdev-influxdb
     type: influxdb
@@ -227,6 +227,20 @@ datasources:
       authType: credentials
       defaultRegion: eu-west-2
 
+  # Keep to test old /api/prom API
+  - name: gdev-loki-0.3
+    type: loki
+    access: proxy
+    url: http://localhost:3103
+    editable: false
+
+  # First version with new v1 API (remove once v1 is out)
+  - name: gdev-loki-0.4
+    type: loki
+    access: proxy
+    url: http://localhost:3104
+    editable: false
+
   - name: gdev-loki
     type: loki
     access: proxy

devenv/dev-dashboards/alerting/testdata_alerts.json

@@ -15,10 +15,12 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
+  "iteration": 1573479899663,
   "links": [],
   "panels": [
     {
       "alert": {
+        "alertRuleTags": {},
         "conditions": [
           {
             "evaluator": {
@@ -52,12 +54,14 @@
       "editable": true,
       "error": false,
       "fill": 1,
+      "fillGradient": 0,
       "gridPos": {
         "h": 7,
         "w": 10,
         "x": 0,
         "y": 0
       },
+      "hiddenSeries": false,
       "id": 4,
       "isNew": true,
       "legend": {
@@ -73,6 +77,9 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -142,6 +149,7 @@
     },
     {
       "alert": {
+        "alertRuleTags": {},
         "conditions": [
           {
             "evaluator": {
@@ -165,7 +173,7 @@
         "for": "900000h",
         "frequency": "1m",
         "handler": 1,
-        "name": "Always Pending",
+        "name": "TestData - Always Pending",
         "noDataState": "no_data",
         "notifications": []
       },
@@ -177,12 +185,14 @@
       "editable": true,
       "error": false,
       "fill": 1,
+      "fillGradient": 0,
       "gridPos": {
         "h": 7,
         "w": 10,
         "x": 10,
         "y": 0
       },
+      "hiddenSeries": false,
       "id": 7,
       "isNew": true,
       "legend": {
@@ -198,6 +208,9 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -227,7 +240,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Always Alerting with For",
+      "title": "Always Pending with For",
       "tooltip": {
         "msResolution": false,
         "shared": true,
@@ -268,6 +281,7 @@
     {
       "dashboardFilter": "",
       "dashboardTags": [],
+      "datasource": null,
       "folderId": null,
       "gridPos": {
         "h": 20,
@@ -280,6 +294,7 @@
       "links": [],
       "nameFilter": "$namefilter",
       "onlyAlertsOnDashboard": false,
+      "options": {},
       "show": "current",
       "sortOrder": 1,
       "stateFilter": [],
@@ -290,6 +305,7 @@
     },
     {
       "alert": {
+        "alertRuleTags": {},
         "conditions": [
           {
             "evaluator": {
@@ -313,7 +329,7 @@
         "for": "1m",
         "frequency": "1m",
         "handler": 1,
-        "name": "TestData - Always Pending",
+        "name": "TestData - Always Alerting For",
         "noDataState": "no_data",
         "notifications": []
       },
@@ -325,12 +341,14 @@
       "editable": true,
       "error": false,
       "fill": 1,
+      "fillGradient": 0,
       "gridPos": {
         "h": 6,
         "w": 10,
         "x": 0,
         "y": 7
       },
+      "hiddenSeries": false,
       "id": 6,
       "isNew": true,
       "legend": {
@@ -346,6 +364,9 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -446,12 +467,14 @@
       "editable": true,
       "error": false,
       "fill": 1,
+      "fillGradient": 0,
       "gridPos": {
         "h": 6,
         "w": 10,
         "x": 10,
         "y": 7
       },
+      "hiddenSeries": false,
       "id": 3,
       "isNew": true,
       "legend": {
@@ -467,6 +490,9 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -571,12 +597,14 @@
       "editable": true,
       "error": false,
       "fill": 1,
+      "fillGradient": 0,
       "gridPos": {
         "h": 7,
         "w": 10,
         "x": 0,
         "y": 13
       },
+      "hiddenSeries": false,
       "id": 5,
       "isNew": true,
       "legend": {
@@ -592,6 +620,9 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -661,7 +692,7 @@
     }
   ],
   "revision": 2,
-  "schemaVersion": 18,
+  "schemaVersion": 21,
   "style": "dark",
   "tags": ["gdev", "alerting"],
   "templating": {
@@ -711,5 +742,5 @@
   "timezone": "browser",
   "title": "Alerting with TestData",
   "uid": "7MeksYbmk",
-  "version": 1
+  "version": 3
 }

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

@@ -0,0 +1,191 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": null,
+  "links": [],
+  "panels": [
+    {
+      "aliasColors": {},
+      "bars": true,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "gdev-influxdb-telegraf",
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 4,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": false,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "alias": "Count",
+          "groupBy": [
+            {
+              "params": ["1m"],
+              "type": "time"
+            },
+            {
+              "params": ["null"],
+              "type": "fill"
+            }
+          ],
+          "measurement": "logs",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "refId": "A",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": ["message"],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "count"
+              }
+            ]
+          ],
+          "tags": []
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Log messages over time",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "datasource": "gdev-influxdb-telegraf",
+      "gridPos": {
+        "h": 18,
+        "w": 24,
+        "x": 0,
+        "y": 6
+      },
+      "id": 2,
+      "options": {
+        "showLabels": false,
+        "showTime": true,
+        "sortOrder": "Descending",
+        "wrapLogMessage": true
+      },
+      "targets": [
+        {
+          "groupBy": [],
+          "measurement": "logs",
+          "orderByTime": "ASC",
+          "policy": "default",
+          "refId": "A",
+          "resultFormat": "table",
+          "select": [
+            [
+              {
+                "params": ["message"],
+                "type": "field"
+              }
+            ]
+          ],
+          "tags": []
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Logs",
+      "type": "logs"
+    }
+  ],
+  "schemaVersion": 22,
+  "style": "dark",
+  "tags": ["gdev", "influxdb", "datasource-test"],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-1h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
+  },
+  "timezone": "",
+  "title": "Datasource tests - InfluxDB Logs",
+  "uid": "yjRroGsWk",
+  "version": 4
+}

devenv/dev-dashboards/datasource-mssql/mssql_fakedata.json

@@ -4,11 +4,37 @@
       {
         "builtIn": 1,
         "datasource": "-- Grafana --",
-        "enable": true,
+        "enable": false,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
+        "limit": 100,
         "name": "Annotations & Alerts",
+        "showIn": 0,
         "type": "dashboard"
+      },
+      {
+        "datasource": "gdev-mssql",
+        "enable": false,
+        "hide": false,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "limit": 100,
+        "name": "Single",
+        "rawQuery": "SELECT TOP 1\n  createdAt as time,\n  'single' as text,\n hostname as tags\nFROM\n   grafana_metric\nWHERE\n  $__timeFilter(createdAt)\nORDER BY time\n",
+        "showIn": 0,
+        "tags": [],
+        "type": "tags"
+      },
+      {
+        "datasource": "gdev-mssql",
+        "enable": false,
+        "hide": false,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "limit": 100,
+        "name": "Region",
+        "rawQuery": "SELECT TOP 1\n  DATEADD(MINUTE, 1, createdAt) as time,\n  DATEADD(MINUTE, 6, createdAt) as timeend,\n  'region' as text,\n hostname as tags\nFROM\n   grafana_metric\nWHERE\n  $__timeFilter(createdAt)\nORDER BY time",
+        "showIn": 0,
+        "tags": [],
+        "type": "tags"
       }
     ]
   },
@@ -16,7 +42,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1532618661457,
+  "iteration": 1576251075020,
   "links": [],
   "panels": [
     {
@@ -28,12 +54,14 @@
       "dashes": false,
       "datasource": "gdev-mssql",
       "fill": 2,
+      "fillGradient": 0,
       "gridPos": {
         "h": 9,
         "w": 12,
         "x": 0,
         "y": 0
       },
+      "hiddenSeries": false,
       "id": 2,
       "legend": {
         "avg": false,
@@ -48,6 +76,9 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -79,6 +110,7 @@
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "Average logins / $summarize",
       "tooltip": {
@@ -125,12 +157,14 @@
       "dashes": false,
       "datasource": "gdev-mssql",
       "fill": 2,
+      "fillGradient": 0,
       "gridPos": {
         "h": 18,
         "w": 12,
         "x": 12,
         "y": 0
       },
+      "hiddenSeries": false,
       "id": 8,
       "legend": {
         "avg": false,
@@ -145,6 +179,9 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -169,6 +206,7 @@
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "Average payments started/ended / $summarize",
       "tooltip": {
@@ -214,12 +252,14 @@
       "dashes": false,
       "datasource": "gdev-mssql",
       "fill": 2,
+      "fillGradient": 0,
       "gridPos": {
         "h": 9,
         "w": 12,
         "x": 0,
         "y": 9
       },
+      "hiddenSeries": false,
       "id": 6,
       "legend": {
         "avg": false,
@@ -234,6 +274,9 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -252,6 +295,7 @@
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "Max CPU / $summarize",
       "tooltip": {
@@ -302,6 +346,7 @@
       },
       "id": 4,
       "links": [],
+      "options": {},
       "pageSize": null,
       "scroll": true,
       "showHeader": true,
@@ -340,15 +385,19 @@
       "type": "table"
     }
   ],
-  "schemaVersion": 16,
+  "schemaVersion": 21,
   "style": "dark",
   "tags": ["gdev", "mssql", "datasource-test"],
   "templating": {
     "list": [
       {
         "allValue": null,
-        "current": {},
+        "current": {
+          "text": "Africa",
+          "value": "Africa"
+        },
         "datasource": "gdev-mssql",
+        "definition": "",
         "hide": 0,
         "includeAll": false,
         "label": "Datacenter",
@@ -368,8 +417,13 @@
       },
       {
         "allValue": null,
-        "current": {},
+        "current": {
+          "selected": false,
+          "text": "All",
+          "value": "$__all"
+        },
         "datasource": "gdev-mssql",
+        "definition": "",
         "hide": 0,
         "includeAll": true,
         "label": "Hostname",
@@ -392,6 +446,7 @@
         "auto_count": 30,
         "auto_min": "10s",
         "current": {
+          "selected": false,
           "text": "1m",
           "value": "1m"
         },
@@ -488,5 +543,5 @@
   "timezone": "",
   "title": "Datasource tests - MSSQL",
   "uid": "86Js1xRmk",
-  "version": 1
+  "version": 2
 }

devenv/dev-dashboards/datasource-mysql/mysql_fakedata.json

@@ -4,11 +4,35 @@
       {
         "builtIn": 1,
         "datasource": "-- Grafana --",
-        "enable": true,
+        "enable": false,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
         "name": "Annotations & Alerts",
         "type": "dashboard"
+      },
+      {
+        "datasource": "gdev-mysql",
+        "enable": false,
+        "hide": false,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "limit": 100,
+        "name": "Single",
+        "rawQuery": "SELECT\n  createdAt as time,\n  'single' as text,\n hostname as tags\nFROM\n   grafana_metric\nWHERE\n  $__timeFilter(createdAt)\nORDER BY time\nLIMIT 1\n",
+        "showIn": 0,
+        "tags": [],
+        "type": "tags"
+      },
+      {
+        "datasource": "gdev-mysql",
+        "enable": false,
+        "hide": false,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "limit": 100,
+        "name": "Region",
+        "rawQuery": "SELECT\n  ADDTIME(createdAt, '00:01:00') as time,\n  ADDTIME(createdAt, '00:06:00') as timeend,\n  'region' as text,\n hostname as tags\nFROM\n   grafana_metric\nWHERE\n  $__timeFilter(createdAt)\nORDER BY time\nLIMIT 1\n",
+        "showIn": 0,
+        "tags": [],
+        "type": "tags"
       }
     ]
   },
@@ -16,7 +40,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1532620738041,
+  "iteration": 1576250298312,
   "links": [],
   "panels": [
     {
@@ -28,12 +52,14 @@
       "dashes": false,
       "datasource": "gdev-mysql",
       "fill": 2,
+      "fillGradient": 0,
       "gridPos": {
         "h": 9,
         "w": 12,
         "x": 0,
         "y": 0
       },
+      "hiddenSeries": false,
       "id": 2,
       "legend": {
         "avg": false,
@@ -48,6 +74,9 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -81,6 +110,7 @@
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "Average logins / $summarize",
       "tooltip": {
@@ -126,12 +156,14 @@
       "dashes": false,
       "datasource": "gdev-mysql",
       "fill": 2,
+      "fillGradient": 0,
       "gridPos": {
         "h": 18,
         "w": 12,
         "x": 12,
         "y": 0
       },
+      "hiddenSeries": false,
       "id": 4,
       "legend": {
         "avg": false,
@@ -146,6 +178,9 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -171,6 +206,7 @@
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "Average payments started/ended / $summarize",
       "tooltip": {
@@ -216,12 +252,14 @@
       "dashes": false,
       "datasource": "gdev-mysql",
       "fill": 2,
+      "fillGradient": 0,
       "gridPos": {
         "h": 9,
         "w": 12,
         "x": 0,
         "y": 9
       },
+      "hiddenSeries": false,
       "id": 3,
       "legend": {
         "avg": false,
@@ -236,6 +274,9 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -255,6 +296,7 @@
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "Max CPU / $summarize",
       "tooltip": {
@@ -305,6 +347,7 @@
       },
       "id": 6,
       "links": [],
+      "options": {},
       "pageSize": null,
       "scroll": true,
       "showHeader": true,
@@ -346,7 +389,8 @@
       "type": "table"
     }
   ],
-  "schemaVersion": 16,
+  "refresh": false,
+  "schemaVersion": 21,
   "style": "dark",
   "tags": ["gdev", "mysql", "datasource-tags"],
   "templating": {
@@ -358,6 +402,7 @@
           "value": "America"
         },
         "datasource": "gdev-mysql",
+        "definition": "",
         "hide": 0,
         "includeAll": false,
         "label": "Datacenter",
@@ -378,10 +423,12 @@
       {
         "allValue": null,
         "current": {
+          "selected": false,
           "text": "All",
           "value": "$__all"
         },
         "datasource": "gdev-mysql",
+        "definition": "",
         "hide": 0,
         "includeAll": true,
         "label": "Hostname",
@@ -404,6 +451,7 @@
         "auto_count": 5,
         "auto_min": "10s",
         "current": {
+          "selected": false,
           "text": "1m",
           "value": "1m"
         },
@@ -500,5 +548,5 @@
   "timezone": "",
   "title": "Datasource tests - MySQL",
   "uid": "DGsCac3kz",
-  "version": 8
+  "version": 2
 }

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

@@ -0,0 +1,217 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": null,
+  "links": [],
+  "panels": [
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "gdev-opentsdb",
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 2,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "aggregator": "sum",
+          "downsampleAggregator": "avg",
+          "downsampleFillPolicy": "none",
+          "metric": "cpu",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "CPU",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "gdev-opentsdb",
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 12,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 3,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "aggregator": "sum",
+          "downsampleAggregator": "avg",
+          "downsampleFillPolicy": "none",
+          "metric": "logins.count",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Login Count",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    }
+  ],
+  "schemaVersion": 22,
+  "style": "dark",
+  "tags": ["datasource-test", "gdev", "opentsdb"],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-1h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
+  },
+  "timezone": "",
+  "title": "Datasource tests - OpenTSDB",
+  "uid": "tFU1mQyWz",
+  "version": 2
+}

devenv/dev-dashboards/datasource-postgres/postgres_fakedata.json

@@ -4,11 +4,35 @@
       {
         "builtIn": 1,
         "datasource": "-- Grafana --",
-        "enable": true,
+        "enable": false,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
         "name": "Annotations & Alerts",
         "type": "dashboard"
+      },
+      {
+        "datasource": "gdev-postgres",
+        "enable": false,
+        "hide": false,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "limit": 100,
+        "name": "Single",
+        "rawQuery": "SELECT\n  \"createdAt\" as time,\n  'single' as text,\n hostname as tags\nFROM\n   grafana_metric\nWHERE\n  $__timeFilter(\"createdAt\")\nORDER BY time\nLIMIT 1\n",
+        "showIn": 0,
+        "tags": [],
+        "type": "tags"
+      },
+      {
+        "datasource": "gdev-postgres",
+        "enable": false,
+        "hide": false,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "limit": 100,
+        "name": "Region",
+        "rawQuery": "SELECT\n  \"createdAt\" +  (interval '1 minute') as time,\n  \"createdAt\" +  (6 * interval '1 minute') as timeend,\n  'region' as text,\n hostname as tags\nFROM\n   grafana_metric\nWHERE\n  $__timeFilter(\"createdAt\")\nORDER BY time\nLIMIT 1\n",
+        "showIn": 0,
+        "tags": [],
+        "type": "tags"
       }
     ]
   },
@@ -16,7 +40,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1532620601931,
+  "iteration": 1576249087264,
   "links": [],
   "panels": [
     {
@@ -28,12 +52,14 @@
       "dashes": false,
       "datasource": "gdev-postgres",
       "fill": 2,
+      "fillGradient": 0,
       "gridPos": {
         "h": 9,
         "w": 12,
         "x": 0,
         "y": 0
       },
+      "hiddenSeries": false,
       "id": 2,
       "legend": {
         "avg": false,
@@ -48,6 +74,9 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -67,20 +96,59 @@
         {
           "alias": "",
           "format": "time_series",
+          "group": [],
           "hide": false,
+          "metricColumn": "none",
+          "rawQuery": true,
           "rawSql": "SELECT\n  $__timeGroup(\"createdAt\",'$summarize'),\n  avg(value) as \"value\",\n  hostname as \"metric\"\nFROM \n  grafana_metric\nWHERE\n  $__timeFilter(\"createdAt\") AND\n  measurement = 'logins.count' AND\n  hostname IN($host)\nGROUP BY time, metric\nORDER BY time",
           "refId": "A",
-          "target": ""
+          "select": [
+            [
+              {
+                "params": ["value"],
+                "type": "column"
+              }
+            ]
+          ],
+          "target": "",
+          "timeColumn": "time",
+          "where": [
+            {
+              "name": "$__timeFilter",
+              "params": [],
+              "type": "macro"
+            }
+          ]
         },
         {
           "alias": "",
           "format": "time_series",
+          "group": [],
+          "metricColumn": "none",
+          "rawQuery": true,
           "rawSql": "SELECT\n  $__timeGroup(\"createdAt\",'$summarize'),\n  min(value) as \"value\",\n  'total avg' as \"metric\"\nFROM \n  grafana_metric\nWHERE\n  $__timeFilter(\"createdAt\") AND\n  measurement = 'logins.count'\nGROUP BY time\nORDER BY time",
-          "refId": "B"
+          "refId": "B",
+          "select": [
+            [
+              {
+                "params": ["value"],
+                "type": "column"
+              }
+            ]
+          ],
+          "timeColumn": "time",
+          "where": [
+            {
+              "name": "$__timeFilter",
+              "params": [],
+              "type": "macro"
+            }
+          ]
         }
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "Average logins / $summarize",
       "tooltip": {
@@ -126,12 +194,14 @@
       "dashes": false,
       "datasource": "gdev-postgres",
       "fill": 2,
+      "fillGradient": 0,
       "gridPos": {
         "h": 18,
         "w": 12,
         "x": 12,
         "y": 0
       },
+      "hiddenSeries": false,
       "id": 4,
       "legend": {
         "avg": false,
@@ -146,6 +216,9 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -171,6 +244,7 @@
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "Average payments started/ended / $summarize",
       "tooltip": {
@@ -216,12 +290,14 @@
       "dashes": false,
       "datasource": "gdev-postgres",
       "fill": 2,
+      "fillGradient": 0,
       "gridPos": {
         "h": 9,
         "w": 12,
         "x": 0,
         "y": 9
       },
+      "hiddenSeries": false,
       "id": 3,
       "legend": {
         "avg": false,
@@ -236,6 +312,9 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -255,6 +334,7 @@
       ],
       "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
       "title": "Max CPU / $summarize",
       "tooltip": {
@@ -305,6 +385,7 @@
       },
       "id": 6,
       "links": [],
+      "options": {},
       "pageSize": null,
       "scroll": true,
       "showHeader": true,
@@ -345,7 +426,7 @@
       "type": "table"
     }
   ],
-  "schemaVersion": 16,
+  "schemaVersion": 21,
   "style": "dark",
   "tags": ["gdev", "postgres", "datasource-test"],
   "templating": {
@@ -357,6 +438,7 @@
           "value": "America"
         },
         "datasource": "gdev-postgres",
+        "definition": "",
         "hide": 0,
         "includeAll": false,
         "label": "Datacenter",
@@ -377,10 +459,12 @@
       {
         "allValue": null,
         "current": {
+          "selected": false,
           "text": "All",
           "value": "$__all"
         },
         "datasource": "gdev-postgres",
+        "definition": "",
         "hide": 0,
         "includeAll": true,
         "label": "Hostname",
@@ -403,6 +487,7 @@
         "auto_count": 5,
         "auto_min": "10s",
         "current": {
+          "selected": false,
           "text": "1m",
           "value": "1m"
         },
@@ -499,5 +584,5 @@
   "timezone": "",
   "title": "Datasource tests - Postgres",
   "uid": "JYola5qzz",
-  "version": 4
+  "version": 5
 }

devenv/dev-dashboards/datasource-testdata/bar-gauge-demo2.json

@@ -0,0 +1,491 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "links": [],
+  "panels": [
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 32,
+        "w": 9,
+        "x": 0,
+        "y": 0
+      },
+      "id": 4,
+      "options": {
+        "displayMode": "gradient",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "mappings": [],
+            "max": 100,
+            "min": 0,
+            "thresholds": [
+              {
+                "color": "red",
+                "value": null
+              },
+              {
+                "color": "yellow",
+                "value": 50
+              }
+            ],
+            "unit": "percent"
+          },
+          "overrides": [],
+          "values": false
+        },
+        "orientation": "horizontal",
+        "showUnfilled": true
+      },
+      "pluginVersion": "6.5.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "C",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "D",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "E",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "F",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "G",
+          "scenarioId": "random_walk"
+        },
+        {
+          "labels": "",
+          "refId": "H",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "I",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "J",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "K",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "L",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "M",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "N",
+          "scenarioId": "random_walk"
+        },
+        {
+          "labels": "",
+          "refId": "O",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "P",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "Q",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Panel Title",
+      "type": "bargauge"
+    },
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 11,
+        "w": 8,
+        "x": 9,
+        "y": 0
+      },
+      "id": 3,
+      "options": {
+        "displayMode": "gradient",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "mappings": [],
+            "max": 100,
+            "min": 0,
+            "thresholds": [
+              {
+                "color": "blue",
+                "value": null
+              },
+              {
+                "color": "purple",
+                "value": 40
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ],
+            "unit": "percent"
+          },
+          "overrides": [],
+          "values": false
+        },
+        "orientation": "vertical",
+        "showUnfilled": true
+      },
+      "pluginVersion": "6.5.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "C",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "D",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "E",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "F",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "G",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "H",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Panel Title",
+      "type": "bargauge"
+    },
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 33,
+        "w": 7,
+        "x": 17,
+        "y": 0
+      },
+      "id": 6,
+      "options": {
+        "displayMode": "basic",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "mappings": [],
+            "max": 100,
+            "min": 0,
+            "thresholds": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "blue",
+                "value": 50
+              }
+            ],
+            "unit": "percent"
+          },
+          "overrides": [],
+          "values": false
+        },
+        "orientation": "horizontal",
+        "showUnfilled": true
+      },
+      "pluginVersion": "6.5.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "K",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "L",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "M",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "N",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "O",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "P",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "Q",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "R",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "S",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "T",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "U",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "V",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "W",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "X",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Panel Title",
+      "type": "bargauge"
+    },
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 11,
+        "w": 8,
+        "x": 9,
+        "y": 11
+      },
+      "id": 7,
+      "options": {
+        "displayMode": "gradient",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "mappings": [],
+            "max": 100,
+            "min": 0,
+            "thresholds": [
+              {
+                "color": "blue",
+                "value": null
+              },
+              {
+                "color": "purple",
+                "value": 40
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ],
+            "unit": "percent"
+          },
+          "overrides": [],
+          "values": false
+        },
+        "orientation": "vertical",
+        "showUnfilled": true
+      },
+      "pluginVersion": "6.5.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "C",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "D",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "E",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "F",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "G",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "H",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Panel Title",
+      "type": "bargauge"
+    },
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 11,
+        "w": 8,
+        "x": 9,
+        "y": 22
+      },
+      "id": 8,
+      "options": {
+        "displayMode": "gradient",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "mappings": [],
+            "max": 100,
+            "min": 0,
+            "thresholds": [
+              {
+                "color": "blue",
+                "value": null
+              },
+              {
+                "color": "purple",
+                "value": 40
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ],
+            "unit": "percent"
+          },
+          "overrides": [],
+          "values": false
+        },
+        "orientation": "vertical",
+        "showUnfilled": true
+      },
+      "pluginVersion": "6.5.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "C",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "D",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "E",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "F",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "G",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "H",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Panel Title",
+      "type": "bargauge"
+    }
+  ],
+  "schemaVersion": 21,
+  "style": "dark",
+  "tags": ["gdev", "demo"],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
+  },
+  "timezone": "",
+  "title": "Bar Gauge Demo Unfilled",
+  "uid": "xMsQdBfWz",
+  "version": 5
+}

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

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

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

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

devenv/dev-dashboards/panel-bargauge/panel_tests_bar_gauge2.json

@@ -0,0 +1,530 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "links": [],
+  "panels": [
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 10,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 8,
+      "links": [],
+      "options": {
+        "displayMode": "basic",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": null,
+            "mappings": [],
+            "max": 100,
+            "min": 0,
+            "thresholds": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "purple",
+                "value": 50
+              },
+              {
+                "color": "blue",
+                "value": 70
+              }
+            ],
+            "unit": "watt"
+          },
+          "overrides": [],
+          "values": false
+        },
+        "orientation": "vertical",
+        "showUnfilled": false
+      },
+      "pluginVersion": "6.5.0-pre",
+      "targets": [
+        {
+          "refId": "C",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "D",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "I",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "J",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "K",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "L",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "M",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "N",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "O",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "P",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "Q",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Basic vertical ",
+      "type": "bargauge"
+    },
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 10,
+        "w": 12,
+        "x": 12,
+        "y": 0
+      },
+      "id": 22,
+      "links": [],
+      "options": {
+        "displayMode": "basic",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": null,
+            "mappings": [],
+            "max": 100,
+            "min": 0,
+            "thresholds": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "blue",
+                "value": 25
+              },
+              {
+                "color": "orange",
+                "value": 37.5
+              },
+              {
+                "color": "purple",
+                "value": 43.75
+              },
+              {
+                "color": "red",
+                "value": 50
+              }
+            ],
+            "unit": "watt"
+          },
+          "overrides": [],
+          "values": false
+        },
+        "orientation": "vertical",
+        "showUnfilled": true
+      },
+      "pluginVersion": "6.5.0-pre",
+      "targets": [
+        {
+          "refId": "H",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "100,100,100"
+        },
+        {
+          "refId": "J",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "K",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "L",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "M",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "N",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "O",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "P",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "Q",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Basic vertical (Unfilled)",
+      "type": "bargauge"
+    },
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 0,
+        "y": 10
+      },
+      "id": 12,
+      "links": [],
+      "options": {
+        "displayMode": "gradient",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": null,
+            "mappings": [],
+            "max": 100,
+            "min": 0,
+            "thresholds": [
+              {
+                "color": "blue",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 20
+              },
+              {
+                "color": "orange",
+                "value": 40
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ],
+            "unit": "celsius"
+          },
+          "overrides": [],
+          "values": false
+        },
+        "orientation": "horizontal",
+        "showUnfilled": false
+      },
+      "pluginVersion": "6.5.0-pre",
+      "targets": [
+        {
+          "alias": "Inside",
+          "refId": "H",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "100,100,100"
+        },
+        {
+          "alias": "Outhouse",
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "F",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "C",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Gradient ",
+      "type": "bargauge"
+    },
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 12,
+        "y": 10
+      },
+      "id": 23,
+      "links": [],
+      "options": {
+        "displayMode": "gradient",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": null,
+            "mappings": [],
+            "max": 100,
+            "min": 0,
+            "thresholds": [
+              {
+                "color": "blue",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 20
+              },
+              {
+                "color": "orange",
+                "value": 40
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ],
+            "unit": "celsius"
+          },
+          "overrides": [],
+          "values": false
+        },
+        "orientation": "horizontal",
+        "showUnfilled": true
+      },
+      "pluginVersion": "6.5.0-pre",
+      "targets": [
+        {
+          "alias": "Inside",
+          "refId": "H",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "100,100,100"
+        },
+        {
+          "alias": "Outhouse",
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "F",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "C",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Gradient (Unfilled)",
+      "type": "bargauge"
+    },
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 6,
+        "w": 12,
+        "x": 0,
+        "y": 19
+      },
+      "id": 21,
+      "links": [],
+      "options": {
+        "displayMode": "basic",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": null,
+            "mappings": [],
+            "max": 100,
+            "min": 0,
+            "thresholds": [
+              {
+                "color": "blue",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 20
+              },
+              {
+                "color": "orange",
+                "value": 40
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ],
+            "unit": "celsius"
+          },
+          "overrides": [],
+          "values": false
+        },
+        "orientation": "horizontal",
+        "showUnfilled": false
+      },
+      "pluginVersion": "6.5.0-pre",
+      "targets": [
+        {
+          "alias": "Inside",
+          "refId": "H",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "100,100,100"
+        },
+        {
+          "alias": "Outhouse",
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "F",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "C",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Title to left of bar",
+      "type": "bargauge"
+    },
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 6,
+        "w": 12,
+        "x": 12,
+        "y": 19
+      },
+      "id": 24,
+      "links": [],
+      "options": {
+        "displayMode": "basic",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": null,
+            "mappings": [],
+            "max": 100,
+            "min": 0,
+            "thresholds": [
+              {
+                "color": "blue",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 20
+              },
+              {
+                "color": "orange",
+                "value": 40
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ],
+            "unit": "celsius"
+          },
+          "overrides": [],
+          "values": false
+        },
+        "orientation": "horizontal",
+        "showUnfilled": true
+      },
+      "pluginVersion": "6.5.0-pre",
+      "targets": [
+        {
+          "alias": "Inside",
+          "refId": "H",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "100,100,100"
+        },
+        {
+          "alias": "Outhouse",
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "F",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "C",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Title to left of bar (Filled)",
+      "type": "bargauge"
+    }
+  ],
+  "schemaVersion": 21,
+  "style": "dark",
+  "tags": ["gdev", "panel-tests"],
+  "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": "Panel Tests - Bar Gauge 2",
+  "uid": "sRrEibfZk",
+  "version": 5
+}

devenv/dev-dashboards/panel-stat/panel-stat-tests.json

@@ -20,142 +20,352 @@
     {
       "datasource": null,
       "gridPos": {
-        "h": 7,
-        "w": 20,
+        "h": 3,
+        "w": 24,
         "x": 0,
         "y": 0
       },
-      "id": 2,
-      "interval": "10m",
+      "id": 6,
+      "interval": "6m",
       "options": {
-        "colorMode": 0,
-        "displayMode": 2,
+        "colorMode": "background",
         "fieldOptions": {
           "calcs": ["mean"],
           "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
             "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "unit": "percent"
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "blue",
+                  "value": null
+                },
+                {
+                  "color": "green",
+                  "value": 10
+                },
+                {
+                  "color": "purple",
+                  "value": 20
+                },
+                {
+                  "color": "orange",
+                  "value": 40
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "areaM2"
           },
-          "override": {},
+          "overrides": [],
           "values": false
         },
+        "graphMode": "area",
+        "justifyMode": "auto",
         "orientation": "auto",
         "sparkline": {
           "show": true
         }
       },
-      "pluginVersion": "6.5.0-pre",
+      "pluginVersion": "6.6.0-pre",
       "targets": [
         {
+          "alias": "__house_locations",
+          "labels": "",
+          "min": 0,
+          "noise": 5,
           "refId": "A",
-          "scenarioId": "random_walk"
+          "scenarioId": "random_walk",
+          "seriesCount": 6,
+          "spread": 100
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "",
+      "type": "stat"
+    },
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 6,
+        "w": 24,
+        "x": 0,
+        "y": 3
+      },
+      "id": 10,
+      "interval": "7m",
+      "options": {
+        "colorMode": "background",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "blue",
+                  "value": null
+                },
+                {
+                  "color": "green",
+                  "value": 10
+                },
+                {
+                  "color": "purple",
+                  "value": 20
+                },
+                {
+                  "color": "orange",
+                  "value": 40
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "areaM2"
+          },
+          "overrides": [],
+          "values": false
         },
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "sparkline": {
+          "show": true
+        }
+      },
+      "pluginVersion": "6.6.0-pre",
+      "targets": [
         {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "E",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "G",
-          "scenarioId": "random_walk"
+          "alias": "__house_locations",
+          "min": 0,
+          "noise": 10,
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 6,
+          "spread": 10
         }
       ],
       "timeFrom": null,
       "timeShift": null,
       "title": "Panel Title",
-      "type": "singlestat2"
+      "type": "stat"
     },
     {
       "datasource": null,
       "gridPos": {
-        "h": 20,
+        "h": 6,
+        "w": 24,
+        "x": 0,
+        "y": 9
+      },
+      "id": 14,
+      "interval": "7m",
+      "options": {
+        "colorMode": "value",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "blue",
+                  "value": null
+                },
+                {
+                  "color": "green",
+                  "value": 10
+                },
+                {
+                  "color": "purple",
+                  "value": 20
+                },
+                {
+                  "color": "orange",
+                  "value": 40
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "areaM2"
+          },
+          "overrides": [],
+          "values": false
+        },
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "sparkline": {
+          "show": true
+        }
+      },
+      "pluginVersion": "6.6.0-pre",
+      "targets": [
+        {
+          "alias": "__house_locations",
+          "min": 0,
+          "noise": 10,
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 6,
+          "spread": 10
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Panel Title",
+      "type": "stat"
+    },
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 14,
+        "w": 6,
+        "x": 0,
+        "y": 15
+      },
+      "id": 13,
+      "interval": "5m",
+      "options": {
+        "colorMode": "background",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "blue",
+                  "value": null
+                },
+                {
+                  "color": "green",
+                  "value": 10
+                },
+                {
+                  "color": "purple",
+                  "value": 20
+                },
+                {
+                  "color": "orange",
+                  "value": 40
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "areaM2"
+          },
+          "overrides": [],
+          "values": false
+        },
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "sparkline": {
+          "show": true
+        }
+      },
+      "pluginVersion": "6.6.0-pre",
+      "targets": [
+        {
+          "alias": "__server_names",
+          "min": 0,
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 7,
+          "spread": 100
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Panel Title",
+      "type": "stat"
+    },
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 11,
         "w": 4,
-        "x": 20,
-        "y": 0
+        "x": 6,
+        "y": 15
       },
       "id": 8,
       "interval": "10m",
       "options": {
-        "colorMode": 0,
-        "displayMode": 2,
+        "colorMode": "background",
         "fieldOptions": {
           "calcs": ["mean"],
           "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
             "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "unit": "percent"
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "blue",
+                  "value": null
+                },
+                {
+                  "color": "green",
+                  "value": 10
+                },
+                {
+                  "color": "purple",
+                  "value": 20
+                },
+                {
+                  "color": "orange",
+                  "value": 40
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "areaM2"
           },
-          "override": {},
+          "overrides": [],
           "values": false
         },
+        "graphMode": "line",
+        "justifyMode": "auto",
         "orientation": "auto",
         "sparkline": {
           "show": true
         }
       },
-      "pluginVersion": "6.5.0-pre",
+      "pluginVersion": "6.6.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -189,60 +399,65 @@
       "timeFrom": null,
       "timeShift": null,
       "title": "Panel Title",
-      "type": "singlestat2"
+      "type": "stat"
     },
     {
       "datasource": null,
       "gridPos": {
-        "h": 3,
-        "w": 20,
-        "x": 0,
-        "y": 7
+        "h": 9,
+        "w": 8,
+        "x": 10,
+        "y": 15
       },
-      "id": 6,
+      "id": 12,
       "interval": "10m",
       "options": {
-        "colorMode": 0,
-        "displayMode": 2,
+        "colorMode": "background",
         "fieldOptions": {
           "calcs": ["mean"],
           "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
             "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "unit": "percent"
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "blue",
+                  "value": null
+                },
+                {
+                  "color": "green",
+                  "value": 10
+                },
+                {
+                  "color": "purple",
+                  "value": 20
+                },
+                {
+                  "color": "orange",
+                  "value": 40
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "areaM2"
           },
-          "override": {},
+          "overrides": [],
           "values": false
         },
-        "orientation": "auto",
+        "graphMode": "line",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
         "sparkline": {
           "show": true
         }
       },
-      "pluginVersion": "6.5.0-pre",
+      "pluginVersion": "6.6.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -276,358 +491,10 @@
       "timeFrom": null,
       "timeShift": null,
       "title": "Panel Title",
-      "type": "singlestat2"
-    },
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 6,
-        "w": 20,
-        "x": 0,
-        "y": 10
-      },
-      "id": 3,
-      "interval": "10m",
-      "options": {
-        "colorMode": 0,
-        "displayMode": 3,
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "unit": "percent"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "sparkline": {
-          "show": true
-        }
-      },
-      "pluginVersion": "6.5.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "E",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "G",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "type": "singlestat2"
-    },
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 6,
-        "w": 20,
-        "x": 0,
-        "y": 16
-      },
-      "id": 4,
-      "interval": "10m",
-      "options": {
-        "colorMode": 0,
-        "displayMode": 0,
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "unit": "percent"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "sparkline": {
-          "show": true
-        }
-      },
-      "pluginVersion": "6.5.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "E",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "G",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "type": "singlestat2"
-    },
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 21,
-        "w": 4,
-        "x": 20,
-        "y": 20
-      },
-      "id": 9,
-      "interval": "10m",
-      "options": {
-        "colorMode": 0,
-        "displayMode": 0,
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "unit": "percent"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "sparkline": {
-          "show": true
-        }
-      },
-      "pluginVersion": "6.5.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "E",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "G",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "type": "singlestat2"
-    },
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 6,
-        "w": 20,
-        "x": 0,
-        "y": 22
-      },
-      "id": 5,
-      "interval": "10m",
-      "options": {
-        "colorMode": 0,
-        "displayMode": 1,
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "unit": "percent"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "sparkline": {
-          "show": true
-        }
-      },
-      "pluginVersion": "6.5.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "E",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "G",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "type": "singlestat2"
+      "type": "stat"
     }
   ],
-  "schemaVersion": 20,
+  "schemaVersion": 22,
   "style": "dark",
   "tags": ["gdev", "panel-tests"],
   "templating": {
@@ -641,7 +508,5 @@
     "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
   },
   "timezone": "",
-  "title": "Panel Tests - Stat",
-  "uid": "jWWHNJpWz",
-  "version": 6
+  "title": "Panel Tests - Stat"
 }

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

@@ -9,7 +9,7 @@
     image: grafana/fake-data-gen
     links:
       - elasticsearch5
-    # network_mode: bridge
     environment:
+      FD_SERVER: elasticsearch5
       FD_DATASOURCE: elasticsearch
-      FD_PORT: 10200
+      FD_PORT: 9200

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

@@ -9,10 +9,12 @@
 
   fake-elastic6-data:
     image: grafana/fake-data-gen
-    network_mode: bridge
+    links:
+      - elasticsearch6 
     environment:
+      FD_SERVER: elasticsearch6
       FD_DATASOURCE: elasticsearch6
-      FD_PORT: 11200
+      FD_PORT: 9200
 
   filebeat6:
     image: docker.elastic.co/beats/filebeat-oss:6.7.1

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

@@ -9,10 +9,12 @@
 
   fake-elastic7-data:
     image: grafana/fake-data-gen
-    network_mode: bridge
+    links:
+      - elasticsearch7
     environment:
+      FD_SERVER: elasticsearch7
       FD_DATASOURCE: elasticsearch7
-      FD_PORT: 12200
+      FD_PORT: 9200
 
   filebeat7:
     image: docker.elastic.co/beats/filebeat-oss:7.0.0
@@ -24,7 +26,6 @@
 
   metricbeat7:
     image: docker.elastic.co/beats/metricbeat-oss:7.0.0
-    network_mode: host
     command: metricbeat -e -strict.perms=false
     user: root
     volumes:
@@ -35,5 +36,7 @@
     image: docker.elastic.co/kibana/kibana-oss:7.0.0
     ports:
       - "5601:5601"
+    links:
+      - elasticsearch7
     environment:
       ELASTICSEARCH_HOSTS: http://elasticsearch7:9200

devenv/docker/blocks/elastic7/metricbeat.yml

@@ -28,11 +28,11 @@ processors:
   - add_cloud_metadata: ~
 
 output.elasticsearch:
-  hosts: ["localhost:12200"]
+  hosts: ["elasticsearch7:9200"]
   index: "metricbeat-%{+yyyy.MM.dd}"
 
 setup.template.name: "metricbeat"
 setup.template.pattern: "metricbeat-*"
 setup.template.settings:
   index.number_of_shards: 1
-  index.number_of_replicas: 1
+  index.number_of_replicas: 1

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

@@ -1,6 +1,27 @@
   jaeger:
     image: jaegertracing/all-in-one:latest
     ports:
-      - "127.0.0.1:6831:6831/udp"
+      - "6831:6831"
       - "16686:16686"
+  # Additional loki to generate some traces
+  # datasource URL: http://localhost:3100/
+  loki:
+    image: grafana/loki:master
+    ports:
+      - "3100:3100"
+    command: -config.file=/etc/loki/local-config.yaml
+    # Optional jaeger tracing
+    environment:
+      - JAEGER_AGENT_HOST=jaeger
+      - JAEGER_AGENT_PORT=6831
+      - JAEGER_SAMPLER_TYPE=const
+      - JAEGER_SAMPLER_PARAM=1
+  promtail:
+    image: grafana/promtail:master
+    volumes:
+      - ./docker/blocks/loki/config.yaml:/etc/promtail/docker-config.yaml
+      - /var/log:/var/log
+      - ../data/log:/var/log/grafana
+    command:
+      -config.file=/etc/promtail/docker-config.yaml
 

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

@@ -1,9 +1,9 @@
+  # datasource URL: http://localhost:3100/
   loki:
     image: grafana/loki:master
     ports:
       - "3100:3100"
     command: -config.file=/etc/loki/local-config.yaml
-
   promtail:
     image: grafana/promtail:master
     volumes:

devenv/docker/blocks/loki0.3/config.yaml

@@ -0,0 +1,27 @@
+server:
+  http_listen_port: 9080
+  grpc_listen_port: 0
+
+positions:
+  filename: /tmp/positions.yaml
+
+client:
+  url: http://loki0.3:3100/api/prom/push
+
+scrape_configs:
+  - job_name: system
+    entry_parser: raw
+    static_configs:
+      - targets:
+          - localhost
+        labels:
+          job: varlogs
+          __path__: /var/log/*log
+  - job_name: grafana
+    entry_parser: raw
+    static_configs:
+      - targets:
+          - localhost
+        labels:
+          job: grafana
+          __path__: /var/log/grafana/*log

devenv/docker/blocks/loki0.3/docker-compose.yaml

@@ -0,0 +1,15 @@
+  # datasource URL: http://localhost:3103/
+  loki0.3:
+    image: grafana/loki:v0.3.0
+    ports:
+      - "3103:3100"
+    command: -config.file=/etc/loki/local-config.yaml
+
+  promtail0.3:
+    image: grafana/promtail:v0.3.0
+    volumes:
+      - ./docker/blocks/loki0.3/config.yaml:/etc/promtail/docker-config.yaml
+      - /var/log:/var/log
+      - ../data/log:/var/log/grafana
+    command:
+      -config.file=/etc/promtail/docker-config.yaml

devenv/docker/blocks/loki0.4/config.yaml

@@ -0,0 +1,27 @@
+server:
+  http_listen_port: 9080
+  grpc_listen_port: 0
+
+positions:
+  filename: /tmp/positions.yaml
+
+client:
+  url: http://loki0.4:3100/api/prom/push
+
+scrape_configs:
+  - job_name: system
+    entry_parser: raw
+    static_configs:
+      - targets:
+          - localhost
+        labels:
+          job: varlogs
+          __path__: /var/log/*log
+  - job_name: grafana
+    entry_parser: raw
+    static_configs:
+      - targets:
+          - localhost
+        labels:
+          job: grafana
+          __path__: /var/log/grafana/*log

devenv/docker/blocks/loki0.4/docker-compose.yaml

@@ -0,0 +1,15 @@
+  # datasource URL: http://localhost:3104/
+  loki0.4:
+    image: grafana/loki:v0.4.0
+    ports:
+      - "3104:3100"
+    command: -config.file=/etc/loki/local-config.yaml
+
+  promtail0.4:
+    image: grafana/promtail:v0.4.0
+    volumes:
+      - ./docker/blocks/loki0.4/config.yaml:/etc/promtail/docker-config.yaml
+      - /var/log:/var/log
+      - ../data/log:/var/log/grafana
+    command:
+      -config.file=/etc/promtail/docker-config.yaml

devenv/docker/blocks/mssql/build/Dockerfile

@@ -1,4 +1,4 @@
-FROM microsoft/mssql-server-linux:2017-CU4
+FROM mcr.microsoft.com/mssql/server:2017-CU4-ubuntu
 WORKDIR /usr/setup
 COPY . /usr/setup
 RUN chmod +x /usr/setup/setup.sh

devenv/docker/blocks/nginx_proxy_mac/nginx_login_only.conf

@@ -0,0 +1,42 @@
+events { worker_connections 1024; }
+
+http {
+  sendfile on;
+
+  proxy_redirect     off;
+  proxy_set_header   Host $host;
+  proxy_set_header   X-Real-IP $remote_addr;
+  proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+  proxy_set_header   X-Forwarded-Host $server_name;
+
+  server {
+    listen 10080;
+
+    location /grafana/ {
+      ################################################################
+      # Enable these settings to test with basic auth and an auth proxy header
+      # the htpasswd file contains an admin user with password admin and
+      # user1: grafana and user2: grafana
+      ################################################################
+
+
+      ################################################################
+      # To use the auth proxy header, set the following in custom.ini:
+      # [auth.proxy]
+      # enabled = true
+      # header_name = X-WEBAUTH-USER
+      # header_property = username
+      ################################################################
+
+      location /grafana/login {
+        auth_basic "Restricted Content";
+        auth_basic_user_file /etc/nginx/htpasswd;
+        proxy_set_header X-WEBAUTH-USER $remote_user;
+        proxy_pass http://host.docker.internal:3000/login;
+      }
+
+      proxy_set_header Authorization "";
+      proxy_pass http://host.docker.internal:3000/;
+    }
+  }
+}

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

@@ -1,4 +1,4 @@
-  postgrestest:
+  postgres:
     image: postgres:${postgres_version}
     environment:
       POSTGRES_USER: grafana
@@ -7,6 +7,11 @@
     ports:
       - "5432:5432"
     command: postgres -c log_connections=on -c logging_collector=on -c log_destination=stderr -c log_directory=/var/log/postgresql
+    healthcheck:
+      test: [ "CMD", "pg_isready", "-q", "-d", "$$POSTGRES_DATABASE", "-U", "$$POSTGRES_USER" ]
+      timeout: 45s
+      interval: 10s
+      retries: 10
 
   fake-postgres-data:
     image: grafana/fake-data-gen
@@ -14,3 +19,6 @@
     environment:
       FD_DATASOURCE: postgres
       FD_PORT: 5432
+    depends_on:
+      postgres:
+        condition: service_healthy

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.0 AS builder
+FROM golang:1.13.4 AS builder
 # Download prometheus/client_golang/examples/random first
 RUN go get github.com/prometheus/client_golang/examples/random
 WORKDIR /go/src/github.com/prometheus/client_golang

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

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

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

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

devenv/docker/blocks/traefik/traefik.yml

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

devenv/docker/compose_header.yml

@@ -1,2 +1,2 @@
-version: "2"
+version: "2.1"
 services:

devenv/docker/loadtest/README.md

@@ -35,6 +35,12 @@ Run load test for 10 virtual users:
 $ ./run.sh -v 10
 ```
 
+Run auth token slow test (random query latency between 1 and 30 seconds):
+
+```bash
+$ ./run.sh -c auth_token_slow_test -s 30
+```
+
 Run auth proxy test:
 
 ```bash

devenv/docker/loadtest/annotations_by_tag_test.js

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

devenv/docker/loadtest/auth_token_slow_test.js

@@ -0,0 +1,73 @@
+import { sleep, check, group } from 'k6';
+import { createClient, createBasicAuthClient } from './modules/client.js';
+import { createTestOrgIfNotExists, createTestdataDatasourceIfNotExists } from './modules/util.js';
+
+export let options = {
+  noCookiesReset: true
+};
+
+let endpoint = __ENV.URL || 'http://localhost:3000';
+const slowQuery = (__ENV.SLOW_QUERY && __ENV.SLOW_QUERY.length > 0) ? parseInt(__ENV.SLOW_QUERY, 10) : 5;
+const client = createClient(endpoint);
+
+export const setup = () => {
+  const basicAuthClient = createBasicAuthClient(endpoint, 'admin', 'admin');
+  const orgId = createTestOrgIfNotExists(basicAuthClient);
+  const datasourceId = createTestdataDatasourceIfNotExists(basicAuthClient);
+  client.withOrgId(orgId);
+  return {
+    orgId: orgId,
+    datasourceId: datasourceId,
+  };
+}
+
+export default (data) => {
+  group(`user auth token slow test (queries between 1 and ${slowQuery} seconds)`, () => {
+    if (__ITER === 0) {
+      group("user authenticates thru ui with username and password", () => {
+        let res = client.ui.login('admin', 'admin');
+
+        check(res, {
+          'response status is 200': (r) => r.status === 200,
+          'response has cookie \'grafana_session\' with 32 characters': (r) => r.cookies.grafana_session[0].value.length === 32,
+        });
+      });
+    }
+
+    if (__ITER !== 0) {
+      group('batch tsdb requests', () => {
+        const batchCount = 20;
+        const requests = [];
+        const payload = {
+          from: '1547765247624',
+          to: '1547768847624',
+          queries: [{
+            refId: 'A',
+            scenarioId: 'slow_query',
+            stringInput: `${Math.floor(Math.random() * slowQuery) + 1}s`,
+            intervalMs: 10000,
+            maxDataPoints: 433,
+            datasourceId: data.datasourceId,
+          }]
+        };
+
+        requests.push({ method: 'GET', url: '/api/annotations?dashboardId=2074&from=1548078832772&to=1548082432772' });
+
+        for (let n = 0; n < batchCount; n++) {
+          requests.push({ method: 'POST', url: '/api/tsdb/query', body: payload });
+        }
+
+        let responses = client.batch(requests);
+        for (let n = 0; n < batchCount; n++) {
+          check(responses[n], {
+            'response status is 200': (r) => r.status === 200,
+          });
+        }
+      });
+    }
+  });
+
+  sleep(5)
+}
+
+export const teardown = (data) => {}

devenv/docker/loadtest/modules/client.js

@@ -144,6 +144,7 @@ export const BaseClient = class BaseClient {
       let params = requests[n].params || {};
       params.headers = params.headers || {};
       params.headers['Content-Type'] = 'application/json';
+      params.timeout = 120000;
       this.beforeRequest(params);
       this.onBeforeRequest(params);
       requests[n].params = params;

devenv/docker/loadtest/run.sh

@@ -7,8 +7,9 @@ run() {
   url='http://localhost:3000'
   vus='2'
   testcase='auth_token_test'
+  slowQuery=''
 
-  while getopts ":d:u:v:c:" o; do
+  while getopts ":d:u:v:c:s:" o; do
     case "${o}" in
 				d)
             duration=${OPTARG}
@@ -22,11 +23,14 @@ run() {
         c)
             testcase=${OPTARG}
             ;;
+        s)
+            slowQuery=${OPTARG}
+            ;;
     esac
 	done
 	shift $((OPTIND-1))
 
-  docker run -t --network=host -v $PWD:/src -e URL=$url --rm -i loadimpact/k6:master run --vus $vus --duration $duration src/$testcase.js
+  docker run -t --network=host -v $PWD:/src -e URL=$url -e SLOW_QUERY=$slowQuery --rm -i loadimpact/k6:master run --vus $vus --duration $duration src/$testcase.js
 }
 
 run "$@"

devenv/e2e-api-tests/tsconfig.json

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

docs/.gitignore

@@ -0,0 +1 @@
+data/menu.yaml

docs/Dockerfile

@@ -1,14 +0,0 @@
-FROM grafana/docs-base:latest
-
-# to get the git info for this repo
-# COPY config.toml /site
-
-# RUN rm -rf /site/content/*
-
-# COPY ./sources /site/content/docs/
-
-COPY config.toml /site
-COPY awsconfig /site
-COPY versions.json /site/static/js
-
-VOLUME ["/site/content"]

docs/Makefile

@@ -1,38 +1,12 @@
-.PHONY: all default docs docs-build docs-shell shell checkvars
+.PHONY: docs docs-no-pull docs-test
 
-# to allow `make DOCSPORT=9000 docs`
-DOCSPORT := 3004
+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'
 
-DOCKER_DOCS_IMAGE := grafana/grafana-docs
-SOURCES_HOST_DIR := "$(shell pwd)/sources"
+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'
 
-# assuming grafana and grafana.org-repo to be checked out in the same folder
-DEFAULT_LAYOUTS_DIR := "$(shell pwd)/../../../../../../grafana.org/layouts"
-
-# to allow `make DOCSDIR=docs docs-shell` (to create a bind mount in docs)
-LAYOUTS_MOUNT := $(if $(LAYOUTS),-v $(DEFAULT_LAYOUTS_DIR):/site/layouts)
-DOCS_MOUNT := -v $(SOURCES_HOST_DIR):/site/content
-
-DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) $(LAYOUTS_MOUNT) -e NOCACHE -p 3004:3004 -p 3005:3005
-
-VERSION := $(shell head -n 1 VERSION)
-
-default: docs
-
-checkvars:
-ifndef ENV
-	$(error ENV is undefined set via ENV=staging or ENV=prod as argument to make)
-endif
-
-docs: docs-build
-	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs && grunt connect --port=3004"
-
-watch: docs-build
-	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) $(LAYOUTS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs && grunt connect --port=3004 & grunt watch --port=3004 --env=dev-docs"
-
-publish: checkvars docs-build
-	$(info Publishing ENV=${ENV} and VERSION=${VERSION})
-	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh ${ENV}-docs ${VERSION}"
-
-docs-build:
-	docker build -t "$(DOCKER_DOCS_IMAGE)" --no-cache .
+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'

docs/README.md

@@ -1,90 +1,38 @@
-### Note for external contributors
+# Building the docs locally
 
-We are currently working on migrating the docs to a new static website. The `grafana/website` repository will be private during this migration, which unfortunately means the docs site can't be built without access.
+When you contribute to documentation, it is a good practice to build the docs on your local machine to make sure your changes appear as you expect. This README explains the process for doing that.
 
-The Markdown content however, is still public in this repository. We still encourage pull requests to make the docs better, and we will make sure the changed content works well on the current docs site. Include any images in your pull request, and we will move them to the `grafana/website` repository.
+## Requirements
 
-# Building the docs
+Docker >= 2.1.0.3
 
-To build the docs locally, you need to have Docker installed. The docs are built using [Hugo](http://gohugo.io/) - a static site generator.
+## Build the doc site
 
-**Prepare the Docker image**:
+1. In the command line, make sure you are in the docs folder: `cd docs`.
+2. Run `make docs`. This launches a preview of the docs website at `http://localhost:3002/docs/grafana/latest/` which will refresh automatically when changes to content in the `sources` directory are made.
 
-> Due to migration to new static site, the Docker image needs to be built from `old-docs` branch.
+---
 
-Git clone `grafana/website` repo. Run these commands in the root of that repo. **Note** that you may require `sudo`
-when running `make docs-build` depending on how your system's Docker
-service is configured):
+## Content guidelines
 
-```
-git clone https://github.com/grafana/website
-cd website
-make docs-build
-```
+Edit content in the `sources` directory.
 
-**Build the Documentation**:
+### Using `relref` for internal links
 
-Now that the Docker image has been prepared we can build the
-grafana docs and start a docs server.
+Use the Hugo shortcode [relref](https://gohugo.io/content-management/cross-references/#use-ref-and-relref) any time you are linking to other internal docs pages.
 
-If you have not cloned the Grafana repository already then:
+### Edit the side menu
 
-```
-cd ..
-git clone https://github.com/grafana/grafana
-```
+Edit [sources/menu.yaml](sources/menu.yaml) to make changes to the sidebar. Stop and rerun the `make docs` command for changes to take effect.
 
-Switch your working directory to the directory this file
-(README.md) is in.
+### Add images
 
-```
-cd grafana/docs
-```
+Images are currently hosted in the grafana/website repo.
 
-An AWS config file is required to build the docs Docker image and to publish the site to AWS. If you are building locally only and do not have any AWS credentials for docs.grafana.org then create an empty file named `awsconfig` in the current directory.
+---
 
-```
-touch awsconfig
-```
+## Deploy changes to grafana.com
 
-Then run (possibly with `sudo`):
+When a PR is merged to master with changes in the `docs` directory, those changes are automatically synched to the grafana/website repo on the `docs-grafana` branch.
 
-```
-make watch
-```
-
-This command will not return control of the shell to the user. Instead
-the command is now running a new Docker container built from the image
-we created in the previous step.
-
-Open [localhost:3004](http://localhost:3004) to view the docs.
-
-### Images and Content
-
-All markdown files are part of [this repository](https://github.com/grafana/grafana). However, all images are added to the [website repository](https://github.com/grafana/website). Therefore, the process of adding images is not as straightforward. These are the steps:
-
-1. Ensure you create a feature branch within the [website repository](https://github.com/grafana/website) to make the change. This branch needs to be based on the `old-docs` branch.
-1. Ensure the image(s) are compressed and optimised e.g. Using [tinypng](https://tinypng.com/).
-1. Add the image(s) to the `/static/img/docs` directory.
-1. Then, make a commit that adds the image(s).
-1. The Pull Request you create needs to target where you branched off, the branch `old-docs`.
-
-Finally, run:
-
-```
-make docs-build
-```
-
-This will rebuild the docs Docker image.
-
-To be able to use your image(s) you have to quit (Ctrl+C) the `make watch` command (that you run in the same directory as this README). Then simply rerun `make watch`, it will restart the docs server but now with access to your image(s).
-
-### Editing content
-
-Changes to the markdown files should automatically cause a docs rebuild and live reload should reload the page in your browser.
-
-### Troubleshooting
-
-#### Running `make watch` errors out with `Warning: Task "default" not found.`
-
-Ensure that the Docker image from the [website repository](https://github.com/grafana/website) is built using the `old-docs` branch.
+In order to make those changes live, open a PR in the website repo that merges the `docs-grafana` branch into `master`. Then follow the publishing guidelines in that repo.

docs/config.toml

@@ -1,20 +0,0 @@
-
-baseurl = "http://localhost:3002/"
-languageCode = "en-us"
-title = "Grafana Documentation"
-canonifyurls = true
-relativeURLs = false
-verbose = true
-enableRobotsTXT = true
-disableSitemap = false
-disableRSS = false
-preservetaxonomynames = true
-metaDataFormat = "yaml"
-
-[taxonomies]
-tag = "tags"
-category = "categories"
-
-[permalinks]
-  blog = ":year/:month/:day/:title/"
-

docs/logo-swirl.svg

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 85.12 92.46" style="enable-background:new 0 0 85.12 92.46;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:url(#SVGID_1_);}
-</style>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="42.562" y1="113.2595" x2="42.562" y2="28.7828">
-	<stop  offset="0" style="stop-color:#FFF200"/>
-	<stop  offset="1" style="stop-color:#F15A29"/>
-</linearGradient>
-<path class="st0" d="M85.01,40.8c-0.14-1.55-0.41-3.35-0.93-5.32c-0.51-1.97-1.28-4.13-2.39-6.37c-1.12-2.24-2.57-4.57-4.47-6.82
-	c-0.74-0.88-1.54-1.76-2.42-2.6c1.3-5.17-1.59-9.65-1.59-9.65c-4.98-0.31-8.14,1.54-9.31,2.39c-0.2-0.08-0.39-0.17-0.59-0.25
-	c-0.85-0.34-1.72-0.66-2.61-0.95c-0.89-0.28-1.81-0.54-2.74-0.76c-0.94-0.22-1.89-0.4-2.86-0.55c-0.17-0.03-0.34-0.05-0.51-0.07
-	C52.41,2.9,46.18,0,46.18,0c-6.95,4.41-8.27,10.57-8.27,10.57s-0.03,0.14-0.07,0.36c-0.38,0.11-0.77,0.22-1.15,0.34
-	c-0.53,0.16-1.06,0.36-1.59,0.55c-0.53,0.21-1.06,0.41-1.58,0.64c-1.05,0.45-2.09,0.96-3.1,1.53c-0.99,0.55-1.95,1.16-2.9,1.82
-	c-0.14-0.06-0.24-0.11-0.24-0.11c-9.62-3.68-18.17,0.75-18.17,0.75c-0.78,10.24,3.84,16.68,4.76,17.86
-	c-0.23,0.63-0.44,1.27-0.64,1.92c-0.71,2.32-1.24,4.7-1.57,7.16c-0.05,0.35-0.09,0.71-0.13,1.07C2.63,48.84,0,57.84,0,57.84
-	c7.42,8.53,16.07,9.06,16.07,9.06c0.01-0.01,0.02-0.01,0.02-0.02c1.1,1.96,2.37,3.83,3.8,5.57c0.6,0.73,1.23,1.43,1.88,2.11
-	c-2.71,7.74,0.38,14.18,0.38,14.18c8.26,0.31,13.69-3.61,14.83-4.52c0.82,0.28,1.66,0.53,2.5,0.74c2.54,0.65,5.14,1.04,7.74,1.15
-	c0.65,0.03,1.3,0.04,1.95,0.04l0.31,0l0.21-0.01l0.41-0.01l0.4-0.02l0.01,0.01c3.89,5.55,10.74,6.34,10.74,6.34
-	c4.87-5.13,5.15-10.22,5.15-11.33l0,0c0,0,0-0.04,0-0.07c0-0.09,0-0.15,0-0.15s0,0,0,0c0-0.08-0.01-0.15-0.01-0.23
-	c1.02-0.72,2-1.49,2.92-2.31c1.95-1.76,3.65-3.77,5.06-5.93c0.13-0.2,0.26-0.41,0.39-0.62c5.51,0.32,9.39-3.41,9.39-3.41
-	c-0.91-5.74-4.18-8.54-4.87-9.07l0,0c0,0-0.03-0.02-0.07-0.05c-0.04-0.03-0.06-0.05-0.06-0.05l0,0c-0.04-0.02-0.08-0.05-0.12-0.08
-	c0.03-0.35,0.06-0.69,0.08-1.04c0.04-0.62,0.06-1.24,0.06-1.85l0-0.46l0-0.23l0-0.12c0-0.16,0-0.1,0-0.16l-0.02-0.38l-0.03-0.52
-	c-0.01-0.18-0.02-0.34-0.04-0.5c-0.01-0.16-0.03-0.32-0.05-0.48l-0.06-0.48l-0.07-0.47c-0.09-0.63-0.21-1.26-0.36-1.88
-	c-0.58-2.47-1.54-4.82-2.82-6.93c-1.28-2.11-2.86-3.98-4.65-5.56c-1.79-1.58-3.79-2.85-5.9-3.79c-2.1-0.95-4.31-1.55-6.51-1.83
-	c-1.1-0.14-2.2-0.2-3.28-0.19l-0.41,0.01l-0.1,0c-0.03,0-0.15,0-0.14,0l-0.17,0.01l-0.4,0.03c-0.15,0.01-0.31,0.02-0.45,0.04
-	c-0.56,0.05-1.11,0.13-1.66,0.23c-2.18,0.41-4.24,1.2-6.06,2.28c-1.82,1.09-3.39,2.45-4.68,3.98c-1.28,1.54-2.28,3.24-2.96,5
-	c-0.69,1.76-1.07,3.58-1.18,5.35c-0.03,0.44-0.04,0.88-0.03,1.32c0,0.11,0,0.22,0.01,0.33l0.01,0.35c0.02,0.21,0.03,0.42,0.05,0.63
-	c0.09,0.9,0.25,1.75,0.49,2.58c0.48,1.66,1.25,3.15,2.2,4.43c0.95,1.28,2.08,2.33,3.28,3.15c1.2,0.82,2.49,1.41,3.76,1.79
-	c1.27,0.38,2.54,0.54,3.74,0.53c0.15,0,0.3,0,0.44-0.01c0.08,0,0.16-0.01,0.24-0.01c0.08,0,0.16-0.01,0.24-0.01
-	c0.13-0.01,0.25-0.03,0.38-0.04c0.03,0,0.07-0.01,0.11-0.01l0.12-0.02c0.08-0.01,0.15-0.02,0.23-0.03c0.16-0.02,0.29-0.05,0.43-0.08
-	c0.14-0.03,0.28-0.05,0.42-0.09c0.27-0.06,0.54-0.14,0.8-0.22c0.52-0.17,1.01-0.38,1.46-0.61c0.45-0.23,0.87-0.5,1.26-0.77
-	c0.11-0.08,0.22-0.16,0.33-0.25c0.42-0.33,0.48-0.94,0.15-1.35c-0.29-0.36-0.79-0.45-1.19-0.23c-0.1,0.05-0.2,0.11-0.3,0.16
-	c-0.35,0.17-0.71,0.32-1.09,0.45c-0.39,0.12-0.79,0.22-1.2,0.29c-0.21,0.03-0.42,0.06-0.63,0.08c-0.11,0.01-0.21,0.02-0.32,0.02
-	c-0.11,0-0.22,0.01-0.32,0.01c-0.1,0-0.21,0-0.31-0.01c-0.13-0.01-0.26-0.01-0.39-0.02c0,0-0.07,0-0.01,0l-0.04,0L51.4,61.6
-	c-0.06-0.01-0.12-0.01-0.17-0.02c-0.12-0.01-0.23-0.03-0.35-0.04c-0.93-0.13-1.88-0.4-2.79-0.82c-0.91-0.41-1.79-0.98-2.57-1.69
-	c-0.79-0.71-1.48-1.56-2.01-2.52c-0.54-0.96-0.92-2.03-1.09-3.16c-0.09-0.56-0.13-1.14-0.11-1.71c0.01-0.16,0.01-0.31,0.02-0.47
-	c0,0.04,0-0.02,0-0.03l0-0.06l0.01-0.12c0.01-0.08,0.01-0.15,0.02-0.23c0.03-0.31,0.08-0.62,0.13-0.92
-	c0.43-2.45,1.65-4.83,3.55-6.65c0.47-0.45,0.98-0.87,1.53-1.25c0.55-0.37,1.12-0.7,1.73-0.98c0.6-0.28,1.23-0.5,1.88-0.68
-	c0.65-0.17,1.31-0.29,1.98-0.35c0.34-0.03,0.67-0.04,1.01-0.04c0.09,0,0.16,0,0.23,0l0.27,0.01l0.17,0.01c0.07,0,0,0,0.03,0l0.07,0
-	l0.27,0.02c0.73,0.06,1.46,0.16,2.17,0.32c1.43,0.32,2.83,0.85,4.13,1.57c2.6,1.44,4.81,3.69,6.17,6.4c0.69,1.35,1.16,2.81,1.4,4.31
-	c0.06,0.38,0.1,0.76,0.13,1.14l0.02,0.29l0.01,0.29c0.01,0.1,0.01,0.19,0.01,0.29c0,0.09,0.01,0.2,0,0.27l0,0.25l-0.01,0.28
-	c-0.01,0.19-0.02,0.49-0.03,0.67c-0.03,0.42-0.07,0.83-0.12,1.24c-0.05,0.41-0.12,0.82-0.19,1.22c-0.08,0.4-0.17,0.81-0.27,1.21
-	c-0.2,0.8-0.46,1.59-0.76,2.36c-0.61,1.54-1.42,3-2.4,4.36c-1.96,2.7-4.64,4.9-7.69,6.29c-1.52,0.69-3.13,1.19-4.78,1.47
-	c-0.82,0.14-1.66,0.22-2.5,0.25l-0.15,0.01l-0.13,0l-0.27,0l-0.41,0l-0.21,0c0.11,0-0.02,0-0.01,0l-0.08,0
-	c-0.45-0.01-0.9-0.03-1.34-0.07c-1.79-0.13-3.55-0.45-5.27-0.95c-1.71-0.49-3.38-1.16-4.95-2c-3.14-1.68-5.95-3.98-8.15-6.76
-	c-1.11-1.38-2.07-2.87-2.87-4.43c-0.8-1.56-1.42-3.2-1.89-4.88c-0.46-1.68-0.75-3.39-0.86-5.12l-0.02-0.32l-0.01-0.08l0-0.07l0-0.14
-	l-0.01-0.28l0-0.07l0-0.1l0-0.2l-0.01-0.4l0-0.08c0,0.01,0,0.01,0-0.03l0-0.16c0-0.21,0.01-0.42,0.01-0.63
-	c0.03-0.85,0.1-1.73,0.21-2.61c0.11-0.88,0.26-1.76,0.44-2.63c0.18-0.87,0.39-1.74,0.64-2.59c0.49-1.71,1.1-3.36,1.82-4.92
-	c1.44-3.12,3.34-5.88,5.61-8.09c0.57-0.55,1.16-1.08,1.77-1.57c0.61-0.49,1.25-0.95,1.9-1.37c0.65-0.43,1.32-0.82,2.02-1.18
-	c0.34-0.19,0.7-0.35,1.05-0.52c0.18-0.08,0.36-0.16,0.53-0.24c0.18-0.08,0.36-0.16,0.54-0.23c0.72-0.3,1.46-0.56,2.21-0.8
-	c0.19-0.06,0.38-0.11,0.56-0.17c0.19-0.06,0.38-0.1,0.57-0.16c0.38-0.11,0.76-0.2,1.14-0.29c0.19-0.05,0.39-0.08,0.58-0.13
-	c0.19-0.04,0.38-0.08,0.58-0.12c0.19-0.04,0.39-0.07,0.58-0.11l0.29-0.05l0.29-0.04c0.2-0.03,0.39-0.06,0.59-0.09
-	c0.22-0.04,0.44-0.05,0.66-0.09c0.18-0.02,0.48-0.06,0.65-0.08c0.14-0.01,0.28-0.03,0.41-0.04l0.28-0.03l0.14-0.01l0.16-0.01
-	c0.22-0.01,0.44-0.03,0.66-0.04l0.33-0.02c0,0,0.12,0,0.02,0l0.07,0l0.14-0.01c0.19-0.01,0.38-0.02,0.56-0.03
-	c0.75-0.02,1.5-0.02,2.24,0c1.48,0.06,2.93,0.22,4.34,0.48c2.82,0.53,5.49,1.43,7.89,2.62c2.41,1.18,4.57,2.63,6.44,4.2
-	c0.12,0.1,0.23,0.2,0.35,0.3c0.11,0.1,0.23,0.2,0.34,0.3c0.23,0.2,0.44,0.41,0.66,0.61c0.22,0.2,0.43,0.41,0.64,0.62
-	c0.2,0.21,0.41,0.41,0.61,0.63c0.8,0.84,1.53,1.69,2.19,2.55c1.33,1.71,2.39,3.44,3.24,5.07c0.05,0.1,0.11,0.2,0.16,0.3
-	c0.05,0.1,0.1,0.2,0.15,0.3c0.1,0.2,0.2,0.4,0.29,0.6c0.09,0.2,0.19,0.39,0.27,0.59c0.09,0.2,0.17,0.39,0.25,0.58
-	c0.32,0.76,0.61,1.49,0.84,2.18c0.39,1.11,0.67,2.11,0.89,2.98c0.09,0.35,0.42,0.58,0.78,0.55c0.37-0.03,0.66-0.34,0.66-0.71
-	C85.14,43.15,85.11,42.05,85.01,40.8z"/>
-</svg>

docs/publish.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-make publish ENV=prod VERSION=root

docs/s3_website.json

@@ -1,11 +0,0 @@
-{
-  "ErrorDocument": {
-    "Key": "jsearch/index.html"
-  },
-  "IndexDocument": {
-    "Suffix": "index.html"
-  },
-  "RoutingRules": [
-    { "Condition": { "KeyPrefixEquals": "jsearch/index.html" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "jsearch/" } }
-  ]
-}

docs/sources/_index.md

@@ -3,27 +3,31 @@ title = "Grafana documentation"
 description = "Guides, Installation and Feature Documentation"
 keywords = ["grafana", "installation", "documentation"]
 type = "docs"
-aliases = ["/v1.1", "/guides/reference/admin", "/v3.1"]
+aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin", "/docs/grafana/v3.1"]
 +++
 
-# Grafana Documentation
+# Grafana documentation
 
 <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">
+        <h4>Run Docker image</h4>
+        <p>Run Grafana on a Docker image.</p>
     </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,44 +37,41 @@ aliases = ["/v1.1", "/guides/reference/admin", "/v3.1"]
     <a href="https://grafana.com/grafana/download" class="nav-cards__item nav-cards__item--install">
         <div class="nav-cards__icon fa fa-moon-o">
         </div>
-        <h5>Nightly Builds</h5>
+        <h5>Nightly builds</h5>
     </a>
-    <div class="nav-cards__item nav-cards__item--install">
-        <h5>For other platforms read the <a href="{{< relref "project/building_from_source.md" >}}">build from source</a>
-        instructions for more information.</h5>
-    </div>
 </div>
 
 <h2>Guides</h2>
 
 <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 "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>
+    <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/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>
         <p>Learn how to automate your Grafana configuration.</p>
     </a>
-    <a href="{{< relref "guides/whats-new-in-v6-4.md" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>What's new in v6.4</h4>
+    <a href="{{< relref "guides/whats-new-in-v6-6.md" >}}" class="nav-cards__item nav-cards__item--guide">
+        <h4>What's new in v6.6</h4>
         <p>Explore the features and enhancements in the latest release.</p>
     </a>
-    <a href="{{< relref "tutorials/screencasts.md" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>Screencasts</h4>
-        <p>Watch Grafana video tutorials and guides.</p>
-    </a>
+
 </div>
 
-<h2>Data Source Guides</h2>
+<h2>Data source guides</h2>
 <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

@@ -10,41 +10,215 @@ weight = 8
 
 # Grafana CLI
 
-Grafana cli is a small executable that is bundled with Grafana-server and is supposed to be executed on the same machine Grafana-server is running on.
+Grafana CLI is a small executable that is bundled with Grafana server and is supposed to be executed on the same machine Grafana server is running on.
 
-## Plugins
+Grafana CLI has `plugins` and `admin` commands, as well as global options.
 
-The CLI allows you to install, upgrade and manage your plugins on the machine it is running on.
-You can find more information about how to install and manage your plugins in the
-[plugins page]({{< relref "../plugins/installation.md" >}}).
+To list all commands and options:
+```
+grafana-cli -h
+```
 
-## Admin
+**Linux users**
+Some commands, such as installing or removing plugins, require `sudo` in order to run.
 
-> This feature is only available in Grafana 4.1 and above.
+**Windows users**
+Some commands, such as installing or removing plugins, require you to run Windows PowerShell as Administrator. 
 
-To show all admin commands:
-`grafana-cli admin`
+Before you enter commands, `cd` into the Grafana bin directory. The default path is:
+```
+cd "C:\Program Files\GrafanaLabs\grafana\bin"
+```
+
+## Grafana CLI command syntax
+
+The general syntax for commands in Grafana CLI is:
+```bash
+grafana-cli [global options] command [command options] [arguments...]
+```
+
+## Global options
+
+Grafana CLI allows you to temporarily override certain Grafana default settings. Except for `--help` and `--version`, most global options are only used by developers.
+
+Each global option applies only to the command in which it is used. For example, `--pluginsDir value` does not permanently change where Grafana saves plugins. It only changes it for command in which you apply the option.
+
+### Display Grafana CLI help
+
+`--help` or `-h` displays the help, including default paths and Docker configuration information.
+
+**Example:**
+```bash
+grafana-cli -h
+```
+
+### Display Grafana CLI version
+
+`--version` or `-v` prints the version of Grafana CLI currently running.
+
+**Example:**
+```bash
+grafana-cli -v
+```
+
+### Override default plugin directory
+
+`--pluginsDir value` overrides the path to where your local Grafana instance stores plugins. Use this option if you want to install, update, or remove a plugin somewhere other than the default directory ("/var/lib/grafana/plugins") [$GF_PLUGIN_DIR].
+
+**Example:**
+```bash
+grafana-cli --pluginsDir "/var/lib/grafana/devplugins" plugins install <plugin-id>
+```
+
+### Override default plugin repo URL
+
+`--repo value` allows you to download and install or update plugins from a repository other than the default Grafana repo.
+
+**Example:**
+```bash
+grafana-cli --repo "https://example.com/plugins" plugins install <plugin-id>
+```
+
+### Override default plugin .zip URL
+
+`--pluginUrl value` allows you to download a .zip file containing a plugin from a local URL instead of downloading it from the default Grafana source.
+
+**Example:**
+```bash
+grafana-cli --pluginUrl https://company.com/grafana/plugins/<plugin-id>-<plugin-version>.zip plugins install <plugin-id>
+```
+
+### Override Transport Layer Security
+
+**Warning:** Turning off TLS is a significant security risk. We do not recommend using this option.
+
+`--insecure` allows you to turn off Transport Layer Security (TLS) verification (insecure). You might want to do this if you are downloading a plugin from a non-default source.
+
+**Example:**
+```bash
+grafana-cli --insecure --pluginUrl https://company.com/grafana/plugins/<plugin-id>-<plugin-version>.zip plugins install <plugin-id>
+```
+
+### Enable debug logging
+
+`--debug` or `-d` enables debug logging. Debug output is returned and shown in the terminal.  
+
+**Example:**
+```bash
+grafana-cli --debug plugins install <plugin-id>
+```
+
+### Override a configuration setting  
+
+`--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).
+
+**Example:**
+```bash
+grafana-cli --configOverrides cfg:default.paths.log=/dev/null plugins install <plugin-id>
+```
+
+### Override homepath value  
+
+Sets the path for the Grafana install/home path, defaults to working directory. You do not need to use this if you are in the Grafana installation directory when using the CLI.
+ 
+**Example:**
+```bash
+grafana-cli --homepath "c:\Program Files\grafana" admin reset-admin-password mynewpassword
+```
+
+### Override config file         
+
+`--config value` overrides the default location where Grafana expects the configuration file. Refer to [Configuration]({{< relref "../installation/configuration.md" >}}) for more information about configuring Grafana and default configuration file locations.
+
+**Example:**
+```bash
+grafana-cli admin reset-admin-password --config "/etc/configuration/" mynewpassword
+```
+
+## Plugins commands
+
+Grafana CLI allows you to install, upgrade, and manage your Grafana plugins. For more information about installing plugins, refer to [plugins page]({{< relref "../plugins/installation.md" >}}).
+
+All listed commands apply to the Grafana default repositories and directories. You can override the defaults with [Global Options](#global-options).
+
+### List available plugins
+
+```bash
+grafana-cli plugins list-remote
+```
+
+### Install the latest version of a plugin
+
+```bash
+grafana-cli plugins install <plugin-id>
+```
+
+### Install a specific version of a plugin
+
+```bash
+grafana-cli plugins install <plugin-id> <version>
+```
+
+### List installed plugins
+
+```bash
+grafana-cli plugins ls
+```
+
+### Update all installed plugins
+```bash
+grafana-cli plugins update-all
+```
+
+### Update one plugin
+
+```bash
+grafana-cli plugins update <plugin-id>
+```
+
+### Remove one plugin
+
+```bash
+grafana-cli plugins remove <plugin-id>
+```
+
+## Admin commands
+
+Admin commands are only available in Grafana 4.1 and later.
+
+### Show all admin commands
+
+```bash
+grafana-cli admin
+```
 
 ### Reset admin password
 
-You can reset the password for the admin user using the CLI. The use case for this command is when you have lost the admin password.
+`grafana-cli admin reset-admin-password <new password>` resets the password for the admin user using the CLI. You might need to do this if you lose the admin password.
 
-`grafana-cli admin reset-admin-password ...`
+If there are two flags being used to set the homepath and the config file path, then running the command returns this error:
 
-If running the command returns this error:
+> Could not find config defaults, make sure homepath command line parameter is set or working directory is homepath 
 
-> Could not find config defaults, make sure homepath command line parameter is set or working directory is homepath
-
-then there are two flags that can be used to set homepath and the config file path.
-
-`grafana-cli --homepath "/usr/share/grafana" admin reset-admin-password newpass`
-
-If you have not lost the admin password then it is better to set in the Grafana UI. If you need to set the password in a script then the [Grafana API](http://docs.grafana.org/http_api/user/#change-password) can be used. Here is an example using curl with basic auth:
+To correct this, use the `--homepath` global option to specify the Grafana default homepath for this command:
 
 ```bash
-curl -X PUT -H "Content-Type: application/json" -d '{
-  "oldPassword": "admin",
-  "newPassword": "newpass",
-  "confirmNew": "newpass"
-}' http://admin:admin@<your_grafana_host>:3000/api/user/password
+grafana-cli --homepath "/usr/share/grafana" admin reset-admin-password <new password>
+```
+
+If you have not lost the admin password, we recommend that you change the user password either in the User Preferences or in the Server Admin > User tab.
+
+If you need to set the password in a script, then you can use the [Grafana User API]({{< relref "../http_api/user.md#change-password" >}}).
+
+### Migrate data and encrypt passwords
+
+`data-migration` runs a script that migrates or cleans up data in your database.
+
+`encrypt-datasource-passwords` migrates passwords from unsecured fields to secure_json_data field. Returns `ok` unless there is an error. Safe to execute multiple times.
+
+**Example:**
+```bash
+grafana-cli admin data-migration encrypt-datasource-passwords
 ```

docs/sources/administration/image_rendering.md

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

docs/sources/administration/provisioning.md

@@ -3,7 +3,7 @@ title = "Provisioning"
 description = ""
 keywords = ["grafana", "provisioning"]
 type = "docs"
-aliases = ["/installation/provisioning"]
+aliases = ["/docs/grafana/latest/installation/provisioning"]
 [menu.docs]
 parent = "admin"
 weight = 8
@@ -15,7 +15,7 @@ In previous versions of Grafana, you could only use the API for provisioning dat
 
 ## Config File
 
-Checkout the [configuration](/installation/configuration) page for more information on what you can configure in `grafana.ini`
+Check out the [configuration]({{< relref "../installation/configuration" >}}) page for more information on what you can configure in `grafana.ini`
 
 ### Config File Locations
 
@@ -171,7 +171,7 @@ Since not all datasources have the same configuration settings we only have the
 
 `{"authType":"keys","defaultRegion":"us-west-2","timeField":"@timestamp"}`
 
-Secure json data is a map of settings that will be encrypted with [secret key](/installation/configuration/#secret-key) from the Grafana config. The purpose of this is only to hide content from the users of the application. This should be used for storing TLS Cert and password that Grafana will append to the request on the server side. All of these settings are optional.
+Secure json data is a map of settings that will be encrypted with [secret key]({{< relref "../installation/configuration/#secret-key" >}}) from the Grafana config. The purpose of this is only to hide content from the users of the application. This should be used for storing TLS Cert and password that Grafana will append to the request on the server side. All of these settings are optional.
 
 | Name | Type | Datasource | Description |
 | ----| ---- | ---- | --- |
@@ -253,9 +253,9 @@ Note: The JSON definition in the input field when using `Copy JSON to Clipboard`
                                                                                                                                                                  
 {{< docs-imagebox img="/img/docs/v51/provisioning_cannot_save_dashboard.png" max-width="500px" class="docs-image--no-shadow" >}}
 
-### Reusable Dashboard Urls
+### Reusable Dashboard URLs
 
-If the dashboard in the json file contains an [uid](/reference/dashboard/#json-fields), Grafana will force insert/update on that uid. This allows you to migrate dashboards betweens Grafana instances and provisioning Grafana from configuration without breaking the urls given since the new dashboard url uses the uid as identifier.
+If the dashboard in the json file contains an [uid](/reference/dashboard/#json-fields), Grafana will force insert/update on that uid. This allows you to migrate dashboards betweens Grafana instances and provisioning Grafana from configuration without breaking the URLs given since the new dashboard URL uses the uid as identifier.
 When Grafana starts, it will update/insert all dashboards available in the configured folders. If you modify the file, the dashboard will also be updated.
 By default Grafana will delete dashboards in the database if the file is removed. You can disable this behavior using the `disableDeletion` setting.
 
@@ -270,7 +270,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.
 
@@ -348,10 +348,12 @@ The following sections detail the supported settings for each alert notification
 | url |
 | recipient |
 | username |
-| iconEmoji |
-| iconUrl |
+| icon_emoji |
+| icon_url |
 | uploadImage |
-| mention |
+| mentionUsers |
+| mentionGroups |
+| mentionChannel |
 | token |
 
 #### Alert notification `victorops`
@@ -430,6 +432,7 @@ The following sections detail the supported settings for each alert notification
 | apiKey |
 | apiUrl |
 | autoClose |
+| overridePriority |
 
 #### Alert notification `telegram`
 
@@ -437,6 +440,7 @@ The following sections detail the supported settings for each alert notification
 | ---- |
 | bottoken |
 | chatid |
+| uploadImage |
 
 #### Alert notification `threema`
 

docs/sources/alerting/metrics.md

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

docs/sources/alerting/notifications.md

@@ -40,7 +40,7 @@ When checked, this option will notify for all alert rules - existing and new.
 When this option is checked additional notifications (reminders) will be sent for triggered alerts. You can specify how often reminders
 should be sent using number of seconds (s), minutes (m) or hours (h), for example `30s`, `3m`, `5m` or `1h` etc.
 
-**Important:** Alert reminders are sent after rules are evaluated. Therefore a reminder can never be sent more frequently than a configured [alert rule evaluation interval](/alerting/rules/#name-evaluation-interval).
+**Important:** Alert reminders are sent after rules are evaluated. Therefore a reminder can never be sent more frequently than a configured [alert rule evaluation interval]({{< relref "rules/#name-evaluation-interval" >}}).
 
 These examples show how often and when reminders are sent for a triggered alert.
 
@@ -65,7 +65,7 @@ Grafana ships with the following set of notification types:
 
 ### Email
 
-To enable email notifications you have to setup [SMTP settings](/installation/configuration/#smtp)
+To enable email notifications you have to setup [SMTP settings]({{< relref "../installation/configuration/#smtp" >}})
 in the Grafana config. Email notifications will upload an image of the alert graph to an
 external image destination if available or fallback to attaching the image to the email.
 Be aware that if you use the `local` image storage email servers and clients might not be
@@ -75,33 +75,38 @@ able to access the image.
 
 {{< imgbox max-width="40%" img="/img/docs/v4/slack_notification.png" caption="Alerting Slack Notification" >}}
 
-To set up slack you need to configure an incoming webhook url at slack. You can follow their guide on how
-to do that [here](https://api.slack.com/incoming-webhooks). If you want to include screenshots of the firing alerts
-in the Slack messages you have to configure either the [external image destination](#external-image-store) in Grafana,
-or a bot integration via Slack Apps. Follow Slack's guide to set up a bot integration and use the token provided
-(https://api.slack.com/bot-users), which starts with "xoxb".
+To set up Slack, you need to configure an incoming Slack webhook URL. You can follow 
+[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 
+provided (https://api.slack.com/bot-users), which starts with "xoxb".
 
 Setting | Description
 ---------- | -----------
-Url | Slack incoming webhook url.
+Url | Slack incoming webhook URL.
 Username | Set the username for the bot's message.
-Recipient | Allows you to override the Slack recipient.
+Recipient | Allows you to override the Slack recipient. You must either provide a channel Slack ID, a user Slack ID, a username reference (@&lt;user&gt;, all lowercase, no whitespace), or a channel reference (#&lt;channel&gt;, all lowercase, no whitespace).
 Icon emoji | Provide an emoji to use as the icon for the bot's message. Ex :smile:
-Icon URL | Provide a url to an image to use as the icon for the bot's message.
-Mention | make it possible to include a mention in the Slack notification sent by Grafana. Ex @here or @channel
+Icon URL | Provide a URL to an image to use as the icon for the bot's message.
+Mention Users | Optionally mention one or more users in the Slack notification sent by Grafana. You have to refer to users, comma-separated, via their corresponding Slack IDs (which you can find by clicking the overflow button on each user's Slack profile).
+Mention Groups | Optionally mention one or more groups in the Slack notification sent by Grafana. You have to refer to groups, comma-separated, via their corresponding Slack IDs (which you can get from each group's Slack profile URL).
+Mention Channel | Optionally mention either all channel members or just active ones.
 Token | If provided, Grafana will upload the generated image via Slack's file.upload API method, not the external image destination.
 
 If you are using the token for a slack bot, then you have to invite the bot to the channel you want to send notifications and add the channel to the recipient field.
 
 ### PagerDuty
 
-To set up PagerDuty, all you have to do is to provide an API key.
+To set up PagerDuty, all you have to do is to provide an integration key.
 
 Setting | Description
 ---------- | -----------
 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.
+
 ### Webhook
 
 The webhook notification is a simple way to send information about a state change over HTTP to a custom endpoint.
@@ -111,20 +116,26 @@ Example json body:
 
 ```json
 {
-  "title": "My alert",
-  "ruleId": 1,
-  "ruleName": "Load peaking!",
-  "ruleUrl": "http://url.to.grafana/db/dashboard/my_dashboard?panelId=2",
-  "state": "alerting",
-  "imageUrl": "http://s3.image.url",
-  "message": "Load is peaking. Make sure the traffic is real and spin up more webfronts",
-  "evalMatches": [
+  "dashboardId":1,
+  "evalMatches":[
     {
-      "metric": "requests",
-      "tags": {},
-      "value": 122
+      "value":1,
+      "metric":"Count",
+      "tags":{}
     }
-  ]
+  ],
+  "imageUrl":"https://grafana.com/assets/img/blog/mixed_styles.png",
+  "message":"Notification Message",
+  "orgId":1,
+  "panelId":2,
+  "ruleId":1,
+  "ruleName":"Panel Title alert",
+  "ruleUrl":"http://localhost:3000/d/hZ7BuVbWz/test-dashboard?fullscreen\u0026edit\u0026tab=alert\u0026panelId=2\u0026orgId=1",
+  "state":"alerting",
+  "tags":{
+    "tag name":"tag value"
+  },
+  "title":"[Alerting] Panel Title alert"
 }
 ```
 
@@ -165,6 +176,10 @@ Once these two properties are set, you can send the alerts to Kafka for further
 
 Notifications can be sent by setting up an incoming webhook in Google Hangouts chat. Configuring such a webhook is described [here](https://developers.google.com/hangouts/chat/how-tos/webhooks).
 
+### Squadcast
+
+Squadcast helps you get alerted via Phone call, SMS, Email and Push notifications and lets you take actions on those alerts. Grafana notifications can be sent to Squadcast via a simple incoming webhook. Refer the official [Squadcast support documentation](https://support.squadcast.com/docs/grafana) for configuring these webhooks.
+
 ### All supported notifiers
 
 Name | Type | Supports images | Support alert rule tags
@@ -177,12 +192,13 @@ Hipchat | `hipchat` | yes, external only | no
 Kafka | `kafka` | yes, external only | no
 Line | `line` | yes, external only | no
 Microsoft Teams | `teams` | yes, external only | no
-OpsGenie | `opsgenie` | yes, external only | no
-Pagerduty | `pagerduty` | yes, external only | no
+OpsGenie | `opsgenie` | yes, external only | yes
+Pagerduty | `pagerduty` | yes, external only | yes
 Prometheus Alertmanager | `prometheus-alertmanager` | yes, external only | yes
 Pushover | `pushover` | yes | no
 Sensu | `sensu` | yes, external only | no
 Slack | `slack` | yes | no
+Squadcast | `webhook` | no | no
 Telegram | `telegram` | yes | no
 Threema | `threema` | yes, external only | no
 VictorOps | `victorops` | yes, external only | no
@@ -190,10 +206,11 @@ Webhook | `webhook` | yes, external only | yes
 
 # Enable images in notifications {#external-image-store}
 
-Grafana can render the panel associated with the alert rule as a PNG image and include that in the notification. Read more about the requirements and how to configure image rendering [here](/administration/image_rendering/).
+Grafana can render the panel associated with the alert rule as a PNG image and include that in the notification. Read more about the requirements and how to configure 
+[image rendering]({{< relref "../administration/image_rendering/" >}}).
 
 Most Notification Channels require that this image be publicly accessible (Slack and PagerDuty for example). In order to include images in alert notifications, Grafana can upload the image to an image store. It currently supports
-Amazon S3, Webdav, Google Cloud Storage and Azure Blob Storage. So to set that up you need to configure the [external image uploader](/installation/configuration/#external-image-storage) in your grafana-server ini config file.
+Amazon S3, Webdav, Google Cloud Storage and Azure Blob Storage. So to set that up you need to configure the [external image uploader]({{< relref "../installation/configuration/#external-image-storage" >}}) in your grafana-server ini config file.
 
 Be aware that some notifiers requires public access to the image to be able to include it in the notification. So make sure to enable public access to the images. If you're using local image uploader, your Grafana instance need to be accessible by the internet.
 
@@ -212,4 +229,4 @@ It currently supports only the Prometheus Alertmanager notifier.
 # 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](/installation/configuration/#domain) setting in Grafana.
+This URL is based on the [domain]({{< relref "../installation/configuration/#domain" >}}) setting in Grafana.

docs/sources/alerting/rules.md

@@ -11,15 +11,11 @@ weight = 1
 
 # Alerting Engine and Rules Guide
 
-> Alerting is only available in Grafana v4.0 and above.
-
-## Introduction
-
-{{< imgbox max-width="40%" img="/img/docs/v4/drag_handles_gif.gif" caption="Alerting overview" >}}
-
 Alerting in Grafana allows you to attach rules to your dashboard panels. When you save the dashboard
 Grafana will extract the alert rules into a separate alert rule storage and schedule them for evaluation.
 
+{{< imgbox max-width="40%" img="/img/docs/v4/drag_handles_gif.gif" caption="Alerting overview" >}}
+
 In the alert tab of the graph panel you can configure how often the alert rule should be evaluated
 and the conditions that need to be met for the alert to change state and trigger its
 [notifications]({{< relref "notifications.md" >}}).
@@ -28,11 +24,9 @@ and the conditions that need to be met for the alert to change state and trigger
 
 The alert rules are evaluated in the Grafana backend in a scheduler and query execution engine that is part
 of core Grafana. Only some data sources are supported right now. They include `Graphite`, `Prometheus`, `InfluxDB`, `Elasticsearch`,
-`Stackdriver`, `Cloudwatch`, `Azure Monitor`, `MySQL`, `PostgreSQL`, `MSSQL`, `OpenTSDB`, `Oracle` and `Azure Data Explorer`.
+`Stackdriver`, `Cloudwatch`, `Azure Monitor`, `MySQL`, `PostgreSQL`, `MSSQL`, `OpenTSDB`, `Oracle`, and `Azure Data Explorer`.
 
-> Alerting support for Azure Monitor is only available in Grafana v6.0 and above.
-
-### Clustering
+## Clustering
 
 Currently alerting supports a limited form of high availability. Since v4.2.0 of Grafana, alert notifications are deduped when running multiple servers. This means all alerts are executed on every server but no duplicate alert notifications are sent due to the deduping logic. Proper load balancing of alerts will be introduced in the future.
 
@@ -40,14 +34,12 @@ Currently alerting supports a limited form of high availability. Since v4.2.0 of
 
 ## Rule Config
 
-
-
-Currently only the graph panel supports alert rules but this will be added to the **Singlestat** and **Table**
-panels as well in a future release.
+Currently only the graph panel supports alert rules.
 
 ### Name and Evaluation interval
 
 Here you can specify the name of the alert rule and how often the scheduler should evaluate the alert rule.
+**Note:** You can set a minimum interval in the `alerting.min_interval_seconds` config field, to set a minimum time between evaluations. Check out the [[configuration]]({{< relref "../installation/configuration.md" >}}#min-interval-seconds) page for more information.
 
 ### For
 
@@ -69,7 +61,6 @@ Below you can see an example timeline of an alert using the `For` setting. At ~1
 Currently the only condition type that exists is a `Query` condition that allows you to
 specify a query letter, time range and an aggregation function.
 
-
 ### Query condition example
 
 ```sql
@@ -107,7 +98,7 @@ we plan to track state **per series** in a future release.
 > Starting with Grafana v5.3 you can configure reminders to be sent for triggered alerts. This will send additional notifications
 > when an alert continues to fire. If other series (like server2 in the example above) also cause the alert rule to fire they will
 > be included in the reminder notification. Depending on what notification channel you're using you may be able to take advantage
-> of this feature for identifying new/existing series causing alert to fire. [Read more about notification reminders here](/alerting/notifications/#send-reminders).
+> of this feature for identifying new/existing series causing alert to fire. [Read more about notification reminders here]({{< relref "notifications/#send-reminders" >}}).
 
 ### No Data / Null values
 

docs/sources/archive.md

@@ -12,12 +12,10 @@ weight = 200
 Here you can find links to older versions of the documentation that might be better suited for your version
 of Grafana.
 
-- [Latest](http://docs.grafana.org)
-- [Version 4.5](http://docs.grafana.org/v4.5)
-- [Version 4.4](http://docs.grafana.org/v4.4)
-- [Version 4.3](http://docs.grafana.org/v4.3)
-- [Version 4.2](http://docs.grafana.org/v4.2)
-- [Version 4.1](http://docs.grafana.org/v4.1)
-- [Version 4.0](http://docs.grafana.org/v4.0)
-- [Version 3.1](http://docs.grafana.org/v3.1)
-- [Version 3.0](http://docs.grafana.org/v3.0)
+- [Latest](/docs/grafana/latest/)
+- [Version 4.5](/docs/grafana/v4.5)
+- [Version 4.4](/docs/grafana/v4.4)
+- [Version 4.3](/docs/grafana/v4.3)
+- [Version 4.2](/docs/grafana/v4.2)
+- [Version 4.1](/docs/grafana/v4.1)
+- [Version 3.1](/docs/grafana/v3.1)

docs/sources/auth/auth-proxy.md

@@ -3,7 +3,7 @@ title = "Auth Proxy"
 description = "Grafana Auth Proxy Guide "
 keywords = ["grafana", "configuration", "documentation", "proxy"]
 type = "docs"
-aliases = ["/tutorials/authproxy/"]
+aliases = ["/docs/grafana/latest/tutorials/authproxy/"]
 [menu.docs]
 name = "Auth Proxy"
 identifier = "auth-proxy"
@@ -37,7 +37,7 @@ whitelist =
 # Optionally define more headers to sync other user attributes
 # Example `headers = Name:X-WEBAUTH-NAME Email:X-WEBAUTH-EMAIL Groups:X-WEBAUTH-GROUPS`
 headers =
-# Checkout docs on this for more details on the below setting
+# Check out docs on this for more details on the below setting
 enable_login_token = false
 ```
 
@@ -238,7 +238,7 @@ headers = "Groups:X-WEBAUTH-GROUPS"
 
 You use the `X-WEBAUTH-GROUPS` header to send the team information for each user. Specifically, the set of Grafana's group IDs that the user belongs to.
 
-First, we need to set up the mapping between your authentication provider and Grafana. Follow [these instructions]({{< relref "auth/team-sync.md#enable-synchronization-for-a-team" >}}) to add groups to a team within Grafana.
+First, we need to set up the mapping between your authentication provider and Grafana. Follow [these instructions]({{< relref "team-sync.md#enable-synchronization-for-a-team" >}}) to add groups to a team within Grafana.
 
 Once that's done. You can verify your mappings by querying the API.
 
@@ -296,7 +296,7 @@ curl -H "X-WEBAUTH-USER: leonard" -H "X-WEBAUTH-GROUPS: lokiteamOnExternalSystem
 
 With this, the user `leonard` will be automatically placed into the Loki team as part of Grafana authentication.
 
-[Learn more about Team Sync]({{< relref "auth/team-sync.md" >}})
+[Learn more about Team Sync]({{< relref "team-sync.md" >}})
 
 
 ## Login token and session cookie
@@ -306,4 +306,4 @@ a login token and cookie. You only have to configure your auth proxy to provide
 Requests via other routes will be authenticated using the cookie.
 
 Use settings `login_maximum_inactive_lifetime_days` and `login_maximum_lifetime_days` under `[auth]` to control session
-lifetime. [Read more about login tokens](/auth/overview/#login-and-short-lived-tokens)
+lifetime. [Read more about login tokens]({{< relref "overview/#login-and-short-lived-tokens" >}})

docs/sources/auth/azuread.md

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

docs/sources/auth/enhanced_ldap.md

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

docs/sources/auth/generic-oauth.md

@@ -50,7 +50,7 @@ Grafana will also attempt to do role mapping through OAuth as described below.
 
 > Only available in Grafana v6.5+.
 
-Check for the presence of an role using the [JMESPath](http://jmespath.org/examples.html) specified via the `role_attribute_path` configuration option. The JSON used for the path lookup is the HTTP response obtained from querying the UserInfo endpoint specified via the `api_url` configuration option. The result after evaluating the `role_attribute_path` JMESPath expression needs to be a valid Grafana role, i.e. `Viewer`, `Editor` or `Admin`.
+Check for the presence of a role using the [JMESPath](http://jmespath.org/examples.html) specified via the `role_attribute_path` configuration option. The JSON used for the path lookup is the HTTP response obtained from querying the UserInfo endpoint specified via the `api_url` configuration option. The result after evaluating the `role_attribute_path` JMESPath expression needs to be a valid Grafana role, i.e. `Viewer`, `Editor` or `Admin`.
 
 See [JMESPath examples](#jmespath-examples) for more information.
 
@@ -105,7 +105,7 @@ allowed_organizations =
     then:
 3.  Under the SSO tab on the Grafana App details page you'll find the Client ID and Client Secret.
 
-    Your OneLogin Domain will match the url you use to access OneLogin.
+    Your OneLogin Domain will match the URL you use to access OneLogin.
 
     Configure Grafana as follows:
 
@@ -188,7 +188,7 @@ allowed_organizations =
     allowed_organizations =
     ```
 
-> Note: It's important to ensure that the [root_url](/installation/configuration/#root-url) in Grafana is set in your Azure Application Reply URLs (App -> Settings -> Reply URLs)
+> 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
 
@@ -221,22 +221,9 @@ allowed_organizations =
     api_url = https://<your domain>.my.centrify.com/OAuth2/UserInfo/<Application ID>
     ```
 
-## Set up OAuth2 with non-compliant providers
-
-> Only available in Grafana v6.0 and above.
-
-Some OAuth2 providers might not support `client_id` and `client_secret` passed via Basic Authentication HTTP header, which
-results in `invalid_client` error. To allow Grafana to authenticate via these type of providers, the client identifiers must be
-send via POST body, which can be enabled via the following settings:
-
-```bash
-[auth.generic_oauth]
-send_client_credentials_via_post = true
-```
-
 ## JMESPath examples
 
-To ease configuring a proper JMESPath expression you can test/evaluate expression with a custom payload at http://jmespath.org/.
+To ease configuration of a proper JMESPath expression, you can test/evaluate expressions with custom payloads at http://jmespath.org/.
 
 ### Role mapping
 

docs/sources/auth/github.md

@@ -16,7 +16,7 @@ To enable the GitHub OAuth2 you must register your application with GitHub. GitH
 
 ## Configure GitHub OAuth application
 
-You need to create a GitHub OAuth application (you find this under the GitHub
+You need to create a GitHub OAuth application (you  will find this under the GitHub
 settings page). When you create the application you will need to specify
 a callback URL. Specify this as callback:
 
@@ -113,4 +113,4 @@ Your GitHub teams can be referenced in two ways:
 
 Example: `@grafana/developers`
 
-[Learn more about Team Sync]({{< relref "auth/team-sync.md" >}})
+[Learn more about Team Sync]({{< relref "team-sync.md" >}})

docs/sources/auth/gitlab.md

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

docs/sources/auth/google.md

@@ -18,8 +18,8 @@ To enable the Google OAuth2 you must register your application with Google. Goog
 
 First, you need to create a Google OAuth Client:
 
-1. Go to https://console.developers.google.com/apis/credentials
-2. Click the 'Create Credentials' button, then click 'OAuth Client ID' in the menu that drops down
+1. Go to https://console.developers.google.com/apis/credentials.
+2. Click **Create Credentials**, then click **OAuth Client ID** in the drop-down menu
 3. Enter the following:
    - Application Type: Web Application
    - Name: Grafana
@@ -31,7 +31,7 @@ First, you need to create a Google OAuth Client:
 
 ## Enable Google OAuth in Grafana
 
-Specify the Client ID and Secret in the [Grafana configuration file]({{< relref "installation/configuration.md#config-file-locations" >}}). For example:
+Specify the Client ID and Secret in the [Grafana configuration file]({{< relref "../installation/configuration.md#config-file-locations" >}}). For example:
 
 ```bash
 [auth.google]

docs/sources/auth/ldap.md

@@ -3,7 +3,7 @@ title = "LDAP Authentication"
 description = "Grafana LDAP Authentication Guide "
 keywords = ["grafana", "configuration", "documentation", "ldap", "active directory"]
 type = "docs"
-aliases = ["/installation/ldap/"]
+aliases = ["/docs/grafana/latest/installation/ldap/"]
 [menu.docs]
 name = "LDAP"
 identifier = "ldap"
@@ -16,6 +16,8 @@ weight = 2
 The LDAP integration in Grafana allows your Grafana users to login with their LDAP credentials. You can also specify mappings between LDAP
 group memberships and Grafana Organization user roles.
 
+> [Enhanced LDAP authentication]({{< relref "../enterprise/enhanced_ldap.md" >}}) is available in [Grafana Enterprise]({{< relref "../enterprise" >}}).
+
 ## Supported LDAP Servers
 
 Grafana uses a [third-party LDAP library](https://github.com/go-ldap/ldap) under the hood that supports basic LDAP v3 functionality.
@@ -24,7 +26,7 @@ This means that you should be able to configure LDAP integration using any compl
 
 ## Enable LDAP
 
-In order to use LDAP integration you'll first need to enable LDAP in the [main config file]({{< relref "installation/configuration.md" >}}) as well as specify the path to the LDAP
+In order to use LDAP integration you'll first need to enable LDAP in the [main config file]({{< relref "../installation/configuration.md" >}}) as well as specify the path to the LDAP
 specific configuration file (default: `/etc/grafana/ldap.toml`).
 
 ```bash
@@ -189,16 +191,27 @@ Setting | Required | Description | Default
 Users with nested/recursive group membership must have an LDAP server that supports `LDAP_MATCHING_RULE_IN_CHAIN`
 and configure `group_search_filter` in a way that it returns the groups the submitted username is a member of.
 
+To configure `group_search_filter`:
+* You can set `group_search_base_dns` to specify where the matching groups are defined.
+* If you do not use `group_search_base_dns`, then the previously defined `search_base_dns` is used.
+
 **Active Directory example:**
 
 Active Directory groups store the Distinguished Names (DNs) of members, so your filter will need to know the DN for the user based only on the submitted username.
-Multiple DN templates can be searched by combining filters with the LDAP OR-operator. Examples:
+Multiple DN templates can be searched by combining filters with the LDAP OR-operator. Two examples:
+
+```bash
+group_search_filter = "(member:1.2.840.113556.1.4.1941:=%s)"
+group_search_base_dns = ["DC=mycorp,DC=mytld"]
+group_search_filter_user_attribute = "dn"
+```
 
 ```bash
 group_search_filter = "(member:1.2.840.113556.1.4.1941:=CN=%s,[user container/OU])"
 group_search_filter = "(|(member:1.2.840.113556.1.4.1941:=CN=%s,[user container/OU])(member:1.2.840.113556.1.4.1941:=CN=%s,[another user container/OU]))"
 group_search_filter_user_attribute = "cn"
 ```
+
 For more information on AD searches see [Microsoft's Search Filter Syntax](https://docs.microsoft.com/en-us/windows/desktop/adsi/search-filter-syntax) documentation.
 
 For troubleshooting, by changing `member_of` in `[servers.attributes]` to "dn" it will show you more accurate group memberships when [debug is enabled](#troubleshooting).
@@ -334,7 +347,7 @@ Please inspect your Active Directory configuration and documentation to find the
 
 ## Troubleshooting
 
-To troubleshoot and get more log info enable ldap debug logging in the [main config file]({{< relref "installation/configuration.md" >}}).
+To troubleshoot and get more log info enable ldap debug logging in the [main config file]({{< relref "../installation/configuration.md" >}}).
 
 ```bash
 [log]

docs/sources/auth/overview.md

@@ -16,18 +16,18 @@ permissions and org memberships.
 
 ## OAuth Integrations
 
-- [Google OAuth]({{< relref "auth/google.md" >}})
-- [GitHub OAuth]({{< relref "auth/github.md" >}})
-- [Gitlab OAuth]({{< relref "auth/gitlab.md" >}})
-- [Generic OAuth]({{< relref "auth/generic-oauth.md" >}}) (Okta2, BitBucket, Azure, OneLogin, Auth0)
+- [Google OAuth]({{< relref "google.md" >}})
+- [GitHub OAuth]({{< relref "github.md" >}})
+- [Gitlab OAuth]({{< relref "gitlab.md" >}})
+- [Generic OAuth]({{< relref "generic-oauth.md" >}}) (Okta2, BitBucket, Azure, OneLogin, Auth0)
 
 ## LDAP integrations
 
-- [LDAP Authentication]({{< relref "auth/ldap.md" >}}) (OpenLDAP, ActiveDirectory, etc)
+- [LDAP Authentication]({{< relref "ldap.md" >}}) (OpenLDAP, ActiveDirectory, etc)
 
 ## Auth proxy
 
-- [Auth Proxy]({{< relref "auth/auth-proxy.md" >}}) If you want to handle authentication outside Grafana using a reverse
+- [Auth Proxy]({{< relref "auth-proxy.md" >}}) If you want to handle authentication outside Grafana using a reverse
     proxy.
 
 ## Grafana Auth
@@ -128,7 +128,7 @@ oauth_auto_login = true
 
 ### Hide sign-out menu
 
-Set to the option detailed below to true to hide sign-out menu link. Useful if you use an auth proxy.
+Set the option detailed below to true to hide sign-out menu link. Useful if you use an auth proxy.
 
 ```bash
 [auth]

docs/sources/auth/saml.md

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