Release 6.4.3

(cherry picked from commit 09a599900c)

.bra.toml

@@ -1,7 +1,7 @@
 [run]
 init_cmds = [
-  ["go", "run", "-mod=vendor", "build.go", "-dev", "build-cli"],
-	["go", "run", "-mod=vendor", "build.go", "-dev", "build-server"],
+  ["go", "run", "build.go", "-dev", "build-cli"],
+	["go", "run", "build.go", "-dev", "build-server"],
 	["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
 ]
 watch_all = true
@@ -14,6 +14,6 @@ watch_dirs = [
 watch_exts = [".go", ".ini", ".toml", ".template.html"]
 build_delay = 1500
 cmds = [
-  ["go", "run", "-mod=vendor", "build.go", "-dev", "build-server"],
+  ["go", "run", "build.go", "-dev", "build-server"],
 	["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
 ]

.github/CODEOWNERS

@@ -1,16 +0,0 @@
-# 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

.github/ISSUE_TEMPLATE/4-question.md

@@ -0,0 +1,14 @@
+---
+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

@@ -1,5 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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

@@ -1,60 +0,0 @@
-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

@@ -1,60 +0,0 @@
----
-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

@@ -1,99 +0,0 @@
-#/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

@@ -1,47 +0,0 @@
-# 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

@@ -1,30 +0,0 @@
-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: docs-grafana
-        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,12 +10,13 @@ awsconfig
 /public/views/index.html
 /public/views/error.html
 /emails/dist
-/reports
 
 # Enterprise emails
 /emails/templates/enterprise_*
 /public/emails/enterprise_*
 
+/public_gen
+/public/vendor/npm
 /tmp
 tools/phantomjs/phantomjs
 tools/phantomjs/phantomjs.exe
@@ -60,8 +61,7 @@ profile.cov
 /pkg/cmd/grafana-cli/grafana-cli
 /pkg/cmd/grafana-server/grafana-server
 /pkg/cmd/grafana-server/debug
-/pkg/extensions/*
-!/pkg/extensions/main.go
+/pkg/extensions
 /public/app/extensions
 debug.test
 /examples/*/dist
@@ -90,16 +90,10 @@ debug.test
 /packages/**/compiled
 /packages/**/.rpt2_cache
 
+theOutput/
+
 # 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,323 +1,4 @@
-# 6.6.0 (unreleased)
-
-### Features / Enhancements
-
-* **Graphite**: Add Metrictank dashboard to Graphite datasource
-
-## 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.
-
-# 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)
-
-### 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)
-  * **API**: Add createdAt field to /api/users/:id. [#19475](https://github.com/grafana/grafana/pull/19475), [@cored](https://github.com/cored)
-  * **Admin**: Adds setting to disable creating initial admin user. [#19505](https://github.com/grafana/grafana/pull/19505), [@shavonn](https://github.com/shavonn)
-  * **Alerting**: Include alert_state in Kafka notifier payload. [#20099](https://github.com/grafana/grafana/pull/20099), [@arnaudlemaignen](https://github.com/arnaudlemaignen)
-  * **AuthProxy**: Can now login with auth proxy and get a login token. [#20175](https://github.com/grafana/grafana/pull/20175), [@torkelo](https://github.com/torkelo)
-  * **AuthProxy**: replaces setting ldap_sync_ttl with sync_ttl. [#20191](https://github.com/grafana/grafana/pull/20191), [@jongyllen](https://github.com/jongyllen)
-  * **AzureMonitor**: Alerting for Azure Application Insights. [#19381](https://github.com/grafana/grafana/pull/19381), [@ChadNedzlek](https://github.com/ChadNedzlek)
-  * **Build**: Upgrade to Go 1.13. [#19502](https://github.com/grafana/grafana/pull/19502), [@aknuds1](https://github.com/aknuds1)
-  * **CLI**: Reduce memory usage for plugin installation. [#19639](https://github.com/grafana/grafana/pull/19639), [@olivierlemasle](https://github.com/olivierlemasle)
-  * **CloudWatch**: Add ap-east-1 to hard-coded region lists. [#19523](https://github.com/grafana/grafana/pull/19523), [@Nessworthy](https://github.com/Nessworthy)
-  * **CloudWatch**: ContainerInsights metrics support. [#18971](https://github.com/grafana/grafana/pull/18971), [@francopeapea](https://github.com/francopeapea)
-  * **CloudWatch**: Support dynamic queries using dimension wildcards [#20058](https://github.com/grafana/grafana/issues/20058), [@sunker](https://github.com/sunker)
-  * **CloudWatch**: Stop using GetMetricStatistics and use GetMetricData for all time series requests [#20057](https://github.com/grafana/grafana/issues/20057), [@sunker](https://github.com/sunker)
-  * **CloudWatch**: Convert query editor from Angular to React [#19880](https://github.com/grafana/grafana/issues/19880), [@sunker](https://github.com/sunker)
-  * **CloudWatch**: Convert config editor from Angular to React [#19881](https://github.com/grafana/grafana/issues/19881), [@shavonn](https://github.com/shavonn)
-  * **CloudWatch**: Improved error handling when throttling occurs [#20348](https://github.com/grafana/grafana/issues/20348), [@sunker](https://github.com/sunker)
-  * **CloudWatch**: Deep linking from Grafana panel to CloudWatch console [#20279](https://github.com/grafana/grafana/issues/20279), [@sunker](https://github.com/sunker)
-  * **CloudWatch**: Add Grafana user agent to GMD calls [#20277](https://github.com/grafana/grafana/issues/20277), [@sunker](https://github.com/sunker)
-  * **Dashboard**: Allows the d-solo route to be used without slug. [#19640](https://github.com/grafana/grafana/pull/19640), [@97amarnathk](https://github.com/97amarnathk)
-  * **Docker**: Build and publish an additional Ubuntu based docker image. [#20196](https://github.com/grafana/grafana/pull/20196), [@aknuds1](https://github.com/aknuds1)
-  * **Elasticsearch**: Adds support for region annotations. [#17602](https://github.com/grafana/grafana/pull/17602), [@fangel](https://github.com/fangel)
-  * **Explore**: Add custom DataLinks on datasource level (like tracing links). [#20060](https://github.com/grafana/grafana/pull/20060), [@aocenas](https://github.com/aocenas)
-  * **Explore**: Add functionality to show/hide query row results. [#19794](https://github.com/grafana/grafana/pull/19794), [@ivanahuckova](https://github.com/ivanahuckova)
-  * **Explore**: Synchronise time ranges in split mode. [#19274](https://github.com/grafana/grafana/pull/19274), [@ivanahuckova](https://github.com/ivanahuckova)
-  * **Explore**: UI change for log row details . [#20034](https://github.com/grafana/grafana/pull/20034), [@ivanahuckova](https://github.com/ivanahuckova)
-  * **Frontend**: Migrate DataSource HTTP Settings to React. [#19452](https://github.com/grafana/grafana/pull/19452), [@dprokop](https://github.com/dprokop)
-  * **Frontend**: Show browser not supported notification. [#19904](https://github.com/grafana/grafana/pull/19904), [@peterholmberg](https://github.com/peterholmberg)
-  * **Graph**: Added series override option to have hidden series be persisted on save. [#20124](https://github.com/grafana/grafana/pull/20124), [@Gauravshah](https://github.com/Gauravshah)
-  * **Graphite**: Add Metrictank option to settings to view Metrictank request processing info in new inspect feature. [#20138](https://github.com/grafana/grafana/pull/20138), [@ryantxu](https://github.com/ryantxu)
-  * **LDAP**: Enable single user sync. [#19446](https://github.com/grafana/grafana/pull/19446), [@gotjosh](https://github.com/gotjosh)
-  * **LDAP**: Last org admin can login but wont be removed. [#20326](https://github.com/grafana/grafana/pull/20326), [@xlson](https://github.com/xlson)
-  * **LDAP**: Support env variable expressions in ldap.toml file. [#20173](https://github.com/grafana/grafana/pull/20173), [@torkelo](https://github.com/torkelo)
-  * **OAuth**: Generic OAuth role mapping support. [#17149](https://github.com/grafana/grafana/pull/17149), [@hypery2k](https://github.com/hypery2k)
-  * **Prometheus**: Custom query parameters string for Thanos downsampling. [#19121](https://github.com/grafana/grafana/pull/19121), [@seuf](https://github.com/seuf)
-  * **Provisioning**: Allow saving of provisioned dashboards. [#19820](https://github.com/grafana/grafana/pull/19820), [@jongyllen](https://github.com/jongyllen)
-  * **Security**: Minor XSS issue resolved by angularjs upgrade from 1.6.6 -> 1.6.9. [#19849](https://github.com/grafana/grafana/pull/19849), [@peterholmberg](https://github.com/peterholmberg)
-  * **TablePanel**: Prevents crash when data contains mixed data formats. [#20202](https://github.com/grafana/grafana/pull/20202), [@hugohaggmark](https://github.com/hugohaggmark)
-  * **Templating**: Introduces $__searchFilter to Query Variables. [#19858](https://github.com/grafana/grafana/pull/19858), [@hugohaggmark](https://github.com/hugohaggmark)
-  * **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)
-
-  ### 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)
-  * **API**: Fix logging of dynamic listening port. [#19644](https://github.com/grafana/grafana/pull/19644), [@oleggator](https://github.com/oleggator)
-  * **BarGauge**: Fix so that default thresholds not keeps resetting. [#20190](https://github.com/grafana/grafana/pull/20190), [@lzdw](https://github.com/lzdw)
-  * **CloudWatch**: Fix incorrect casing of Redshift dimension entry for service class and stage. [#19897](https://github.com/grafana/grafana/pull/19897), [@nlsdfnbch](https://github.com/nlsdfnbch)
-  * **CloudWatch**: Fixing AWS Kafka dimension names. [#19986](https://github.com/grafana/grafana/pull/19986), [@skuxy](https://github.com/skuxy)
-  * **CloudWatch**: Metric math broken when using multi template variables [#18337](https://github.com/grafana/grafana/issues/18337), [@sunker](https://github.com/sunker)
-  * **CloudWatch**: Graphs with multiple multi-value dimension variables don't work [#17949](https://github.com/grafana/grafana/issues/17949), [@sunker](https://github.com/sunker)
-  * **CloudWatch**: Variables' values surrounded with braces in request sent to AWS [#14451](https://github.com/grafana/grafana/issues/14451), [@sunker](https://github.com/sunker)
-  * **CloudWatch**: Cloudwatch Query for a list of instances for which data is available in the selected time interval [#12784](https://github.com/grafana/grafana/issues/12784), [@sunker](https://github.com/sunker)
-  * **CloudWatch**: Dimension's positioning/order should be stored in the json dashboard [#11062](https://github.com/grafana/grafana/issues/11062), [@sunker](https://github.com/sunker)
-  * **CloudWatch**: Batch CloudWatch API call support in backend [#7991](https://github.com/grafana/grafana/issues/7991), [@sunker](https://github.com/sunker)
-  * **ColorPicker**: Fixes issue with ColorPicker disappearing too quickly . [#20289](https://github.com/grafana/grafana/pull/20289), [@dprokop](https://github.com/dprokop)
-  * **Datasource**: Add custom headers on alerting queries. [#19508](https://github.com/grafana/grafana/pull/19508), [@weeco](https://github.com/weeco)
-  * **Docker**: Add additional glibc dependencies to support certain backend plugins in alpine. [#20214](https://github.com/grafana/grafana/pull/20214), [@briangann](https://github.com/briangann)
-  * **Docker**: Build and use musl-based binaries in alpine images to resolve glibc incompatibility issues. [#19798](https://github.com/grafana/grafana/pull/19798), [@aknuds1](https://github.com/aknuds1)
-  * **Elasticsearch**: Fix template variables interpolation when redirecting to Explore. [#20314](https://github.com/grafana/grafana/pull/20314), [@ivanahuckova](https://github.com/ivanahuckova)
-  * **Elasticsearch**: Support rendering in logs panel. [#20229](https://github.com/grafana/grafana/pull/20229), [@davkal](https://github.com/davkal)
-  * **Explore**: Expand template variables when redirecting from dashboard panel. [#19582](https://github.com/grafana/grafana/pull/19582), [@ivanahuckova](https://github.com/ivanahuckova)
-  * **OAuth**: Make the login button display name of custom OAuth provider. [#20209](https://github.com/grafana/grafana/pull/20209), [@dprokop](https://github.com/dprokop)
-  * **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. 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.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
-* **Alerting**: All notification channels should send even if one fails to send. [#19807](https://github.com/grafana/grafana/pull/19807), [@jan25](https://github.com/jan25)
-* **AzureMonitor**: Fix slate interference with dropdowns. [#19799](https://github.com/grafana/grafana/pull/19799), [@aocenas](https://github.com/aocenas)
-* **ContextMenu**: make ContextMenu positioning aware of the viewport width. [#19699](https://github.com/grafana/grafana/pull/19699), [@krvajal](https://github.com/krvajal)
-* **DataLinks**: Fix context menu not showing in singlestat-ish visualisations. [#19809](https://github.com/grafana/grafana/pull/19809), [@dprokop](https://github.com/dprokop)
-* **DataLinks**: Fix url field not releasing focus. [#19804](https://github.com/grafana/grafana/pull/19804), [@aocenas](https://github.com/aocenas)
-* **Datasource**: Fixes clicking outside of some query editors required 2 clicks. [#19822](https://github.com/grafana/grafana/pull/19822), [@aocenas](https://github.com/aocenas)
-* **Panels**: Fixes default tab for visualizations without Queries Tab. [#19803](https://github.com/grafana/grafana/pull/19803), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Singlestat**: Fixed issue with mapping null to text. [#19689](https://github.com/grafana/grafana/pull/19689), [@torkelo](https://github.com/torkelo)
-* **@grafana/toolkit**: Don't fail plugin creation when git user.name config is not set. [#19821](https://github.com/grafana/grafana/pull/19821), [@dprokop](https://github.com/dprokop)
-* **@grafana/toolkit**: TSLint line number off by 1. [#19782](https://github.com/grafana/grafana/pull/19782), [@fredwangwang](https://github.com/fredwangwang)
-
-# 6.4.2 (2019-10-08)
-
-### Bug Fixes
-* **CloudWatch**: Changes incorrect dimension wmlid to wlmid . [#19679](https://github.com/grafana/grafana/pull/19679), [@ATTron](https://github.com/ATTron)
-* **Grafana Image Renderer**: Fixes plugin page. [#19664](https://github.com/grafana/grafana/pull/19664), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Graph**: Fixes auto decimals logic for y axis ticks that results in too many decimals for high values. [#19618](https://github.com/grafana/grafana/pull/19618), [@torkelo](https://github.com/torkelo)
-* **Graph**: Switching to series mode should re-render graph. [#19623](https://github.com/grafana/grafana/pull/19623), [@torkelo](https://github.com/torkelo)
-* **Loki**: Fix autocomplete on label values. [#19579](https://github.com/grafana/grafana/pull/19579), [@aocenas](https://github.com/aocenas)
-* **Loki**: Removes live option for logs panel. [#19533](https://github.com/grafana/grafana/pull/19533), [@davkal](https://github.com/davkal)
-* **Profile**: Fix issue with user profile not showing more than sessions sessions in some cases. [#19578](https://github.com/grafana/grafana/pull/19578), [@huynhsamha](https://github.com/huynhsamha)
-* **Prometheus**: Fixes so results in Panel always are sorted by query order. [#19597](https://github.com/grafana/grafana/pull/19597), [@hugohaggmark](https://github.com/hugohaggmark)
-* **ShareQuery**: Fixed issue when using -- Dashboard -- datasource (to share query result) when dashboard had rows. [#19610](https://github.com/grafana/grafana/pull/19610), [@torkelo](https://github.com/torkelo)
-* **Show SAML login button if SAML is enabled**. [#19591](https://github.com/grafana/grafana/pull/19591), [@papagian](https://github.com/papagian)
-* **SingleStat**: Fixes $__name postfix/prefix usage. [#19687](https://github.com/grafana/grafana/pull/19687), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Table**: Proper handling of json data with dataframes. [#19596](https://github.com/grafana/grafana/pull/19596), [@marefr](https://github.com/marefr)
-* **Units**: Fixed wrong id for Terabits/sec. [#19611](https://github.com/grafana/grafana/pull/19611), [@andreaslangnevyjel](https://github.com/andreaslangnevyjel)
-
-# 6.4.1 (2019-10-02)
-
-### Bug Fixes
-
-* **Provisioning**: Fixed issue where empty nested keys in YAML provisioning caused server crash, [#19547](https://github.com/grafana/grafana/pull/19547)
-* **ImageRendering**: Fixed issue with image rendering in enterprise build (Enterprise)
-* **Reporting**: Fixed issue with reporting service when STMP disabled (Enterprise).
-
-# 6.4.0 (2019-10-01)
-
-### Features / Enhancements
-* **Build**: Upgrade go to 1.12.10. [#19499](https://github.com/grafana/grafana/pull/19499), [@marefr](https://github.com/marefr)
-* **DataLinks**: Suggestions menu improvements. [#19396](https://github.com/grafana/grafana/pull/19396), [@dprokop](https://github.com/dprokop)
-* **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)
-
-### Bug Fixes
-* **CLI**: Fix version selection for plugin install. [#19498](https://github.com/grafana/grafana/pull/19498), [@aocenas](https://github.com/aocenas)
-* **Graph**: Fixes minor issue with series override color picker and custom color . [#19516](https://github.com/grafana/grafana/pull/19516), [@torkelo](https://github.com/torkelo)
-
-## Plugins that need updating when upgrading from 6.3 to 6.4
-
-* [Splunk](https://grafana.com/grafana/plugins/grafana-splunk-datasource)
-
-# 6.4.0-beta2 (2019-09-25)
-
-### Features / Enhancements
-* **Azure Monitor**: Remove support for cross resource queries (#19115)". [#19346](https://github.com/grafana/grafana/pull/19346), [@sunker](https://github.com/sunker)
-* **Docker**: Upgrade packages to resolve reported vulnerabilities. [#19188](https://github.com/grafana/grafana/pull/19188), [@marefr](https://github.com/marefr)
-* **Graphite**: Time range expansion reduced from 1 minute to 1 second. [#19246](https://github.com/grafana/grafana/pull/19246), [@torkelo](https://github.com/torkelo)
-* **grafana/toolkit**: Add plugin creation task. [#19207](https://github.com/grafana/grafana/pull/19207), [@dprokop](https://github.com/dprokop)
-
-### Bug Fixes
-* **Alerting**: Prevents creating alerts from unsupported queries. [#19250](https://github.com/grafana/grafana/pull/19250), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Alerting**: Truncate PagerDuty summary when greater than 1024 characters. [#18730](https://github.com/grafana/grafana/pull/18730), [@nvllsvm](https://github.com/nvllsvm)
-* **Cloudwatch**: Fix autocomplete for Gamelift dimensions. [#19146](https://github.com/grafana/grafana/pull/19146), [@kevinpz](https://github.com/kevinpz)
-* **Dashboard**: Fix export for sharing when panels use default data source. [#19315](https://github.com/grafana/grafana/pull/19315), [@torkelo](https://github.com/torkelo)
-* **Database**: Rewrite system statistics query to perform better. [#19178](https://github.com/grafana/grafana/pull/19178), [@papagian](https://github.com/papagian)
-* **Gauge/BarGauge**: Fix issue with [object Object] in titles  . [#19217](https://github.com/grafana/grafana/pull/19217), [@ryantxu](https://github.com/ryantxu)
-* **MSSQL**: Revert usage of new connectionstring format introduced by #18384. [#19203](https://github.com/grafana/grafana/pull/19203), [@marefr](https://github.com/marefr)
-* **Multi-LDAP**: Do not fail-fast on invalid credentials. [#19261](https://github.com/grafana/grafana/pull/19261), [@gotjosh](https://github.com/gotjosh)
-* **MySQL, Postgres, MSSQL**: Fix validating query with template variables in alert . [#19237](https://github.com/grafana/grafana/pull/19237), [@marefr](https://github.com/marefr)
-* **MySQL, Postgres**: Update raw sql when query builder updates. [#19209](https://github.com/grafana/grafana/pull/19209), [@marefr](https://github.com/marefr)
-* **MySQL**: Limit datasource error details returned from the backend. [#19373](https://github.com/grafana/grafana/pull/19373), [@marefr](https://github.com/marefr)
-
-# 6.4.0-beta1 (2019-09-17)
-
-### Features / Enhancements
-* **Reporting**: Created scheduled PDF reports for any dashboard (Enterprise).
-* **API**: Readonly datasources should not be created via the API. [#19006](https://github.com/grafana/grafana/pull/19006), [@papagian](https://github.com/papagian)
-* **Alerting**: Include configured AlertRuleTags in Webhooks notifier. [#18233](https://github.com/grafana/grafana/pull/18233), [@dominic-miglar](https://github.com/dominic-miglar)
-* **Annotations**: Add annotations support to Loki. [#18949](https://github.com/grafana/grafana/pull/18949), [@aocenas](https://github.com/aocenas)
-* **Annotations**: Use a single row to represent a region. [#17673](https://github.com/grafana/grafana/pull/17673), [@ryantxu](https://github.com/ryantxu)
-* **Auth**: Allow inviting existing users when login form is disabled. [#19048](https://github.com/grafana/grafana/pull/19048), [@548017](https://github.com/548017)
-* **Azure Monitor**: Add support for cross resource queries. [#19115](https://github.com/grafana/grafana/pull/19115), [@sunker](https://github.com/sunker)
-* **CLI**: Allow installing custom binary plugins. [#17551](https://github.com/grafana/grafana/pull/17551), [@aocenas](https://github.com/aocenas)
-* **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 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)
-* **Elasticsearch**: allow templating queries to order by doc_count. [#18870](https://github.com/grafana/grafana/pull/18870), [@hackery](https://github.com/hackery)
-* **Explore**: Add throttling when doing live queries. [#19085](https://github.com/grafana/grafana/pull/19085), [@aocenas](https://github.com/aocenas)
-* **Explore**: Adds ability to go back to dashboard, optionally with query changes. [#17982](https://github.com/grafana/grafana/pull/17982), [@kaydelaney](https://github.com/kaydelaney)
-* **Explore**: Reduce default time range to last hour. [#18212](https://github.com/grafana/grafana/pull/18212), [@davkal](https://github.com/davkal)
-* **Gauge/BarGauge**: Support decimals for min/max. [#18368](https://github.com/grafana/grafana/pull/18368), [@ryantxu](https://github.com/ryantxu)
-* **Graph**: New series override transform constant that renders a single point as a line across the whole graph. [#19102](https://github.com/grafana/grafana/pull/19102), [@davkal](https://github.com/davkal)
-* **Image rendering**: Add deprecation warning when PhantomJS is used for rendering images. [#18933](https://github.com/grafana/grafana/pull/18933), [@papagian](https://github.com/papagian)
-* **InfluxDB**: Enable interpolation within ad-hoc filter values. [#18077](https://github.com/grafana/grafana/pull/18077), [@kvc-code](https://github.com/kvc-code)
-* **LDAP**: Allow an user to be synchronized against LDAP. [#18976](https://github.com/grafana/grafana/pull/18976), [@gotjosh](https://github.com/gotjosh)
-* **Ldap**: Add ldap debug page. [#18759](https://github.com/grafana/grafana/pull/18759), [@peterholmberg](https://github.com/peterholmberg)
-* **Loki**: Remove prefetching of default label values. [#18213](https://github.com/grafana/grafana/pull/18213), [@davkal](https://github.com/davkal)
-* **Metrics**: Add failed alert notifications metric. [#18089](https://github.com/grafana/grafana/pull/18089), [@koorgoo](https://github.com/koorgoo)
-* **OAuth**: Support JMES path lookup when retrieving user email. [#14683](https://github.com/grafana/grafana/pull/14683), [@bobmshannon](https://github.com/bobmshannon)
-* **OAuth**: return GitLab groups as a part of user info (enable team sync). [#18388](https://github.com/grafana/grafana/pull/18388), [@alexanderzobnin](https://github.com/alexanderzobnin)
-* **Panels**: Add unit for electrical charge - ampere-hour. [#18950](https://github.com/grafana/grafana/pull/18950), [@anirudh-ramesh](https://github.com/anirudh-ramesh)
-* **Plugin**: AzureMonitor - Reapply MetricNamespace support. [#17282](https://github.com/grafana/grafana/pull/17282), [@raphaelquati](https://github.com/raphaelquati)
-* **Plugins**: better warning when plugins fail to load. [#18671](https://github.com/grafana/grafana/pull/18671), [@ryantxu](https://github.com/ryantxu)
-* **Postgres**: Add support for scram sha 256 authentication. [#18397](https://github.com/grafana/grafana/pull/18397), [@nonamef](https://github.com/nonamef)
-* **RemoteCache**: Support SSL with Redis. [#18511](https://github.com/grafana/grafana/pull/18511), [@kylebrandt](https://github.com/kylebrandt)
-* **SingleStat**: The gauge option in now disabled/hidden (unless it's an old panel with it already enabled) . [#18610](https://github.com/grafana/grafana/pull/18610), [@ryantxu](https://github.com/ryantxu)
-* **Stackdriver**: Add extra alignment period options. [#18909](https://github.com/grafana/grafana/pull/18909), [@sunker](https://github.com/sunker)
-* **Units**: Add South African Rand (ZAR) to currencies. [#18893](https://github.com/grafana/grafana/pull/18893), [@jeteon](https://github.com/jeteon)
-* **Units**: Adding T,P,E,Z,and Y bytes. [#18706](https://github.com/grafana/grafana/pull/18706), [@chiqomar](https://github.com/chiqomar)
-
-### Bug Fixes
-* **Alerting**: Notification is sent when state changes from no_data to ok. [#18920](https://github.com/grafana/grafana/pull/18920), [@papagian](https://github.com/papagian)
-* **Alerting**: fix duplicate alert states when the alert fails to save to the database. [#18216](https://github.com/grafana/grafana/pull/18216), [@kylebrandt](https://github.com/kylebrandt)
-* **Alerting**: fix response popover prompt when add notification channels. [#18967](https://github.com/grafana/grafana/pull/18967), [@lzdw](https://github.com/lzdw)
-* **CloudWatch**: Fix alerting for queries with Id (using GetMetricData). [#17899](https://github.com/grafana/grafana/pull/17899), [@alex-berger](https://github.com/alex-berger)
-* **Explore**: Fix auto completion on label values for Loki. [#18988](https://github.com/grafana/grafana/pull/18988), [@aocenas](https://github.com/aocenas)
-* **Explore**: Fixes crash using back button with a zoomed in graph. [#19122](https://github.com/grafana/grafana/pull/19122), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Explore**: Fixes so queries in Explore are only run if Graph/Table is shown. [#19000](https://github.com/grafana/grafana/pull/19000), [@hugohaggmark](https://github.com/hugohaggmark)
-* **MSSQL**: Change connectionstring to URL format to fix using passwords with semicolon. [#18384](https://github.com/grafana/grafana/pull/18384), [@Russiancold](https://github.com/Russiancold)
-* **MSSQL**: Fix memory leak when debug enabled. [#19049](https://github.com/grafana/grafana/pull/19049), [@briangann](https://github.com/briangann)
-* **Provisioning**: Allow escaping literal '$' with '$$' in configs to avoid interpolation. [#18045](https://github.com/grafana/grafana/pull/18045), [@kylebrandt](https://github.com/kylebrandt)
-* **TimePicker**: Fixes hiding time picker dropdown in FireFox. [#19154](https://github.com/grafana/grafana/pull/19154), [@hugohaggmark](https://github.com/hugohaggmark)
+# 6.4.0 (unreleased)
 
 ## Breaking changes
 
@@ -348,20 +29,6 @@ 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
-* **Metrics**: Adds setting for turning off total stats metrics. [#19142](https://github.com/grafana/grafana/pull/19142), [@marefr](https://github.com/marefr)
-
-### Bug Fixes
-* **Database**: Rewrite system statistics query to perform better. [#19178](https://github.com/grafana/grafana/pull/19178), [@papagian](https://github.com/papagian)
-* **Explore**: Fixes error when switching from prometheus to loki data sources. [#18599](https://github.com/grafana/grafana/pull/18599), [@kaydelaney](https://github.com/kaydelaney)
-
 # 6.3.5 (2019-09-02)
 
 ### Upgrades
@@ -373,7 +40,7 @@ Please consider migrating from PhantomJS to the [Grafana Image Renderer plugin](
 * **Explore**: Fixes query field layout in splitted view for Safari browsers. [#18654](https://github.com/grafana/grafana/pull/18654), [@hugohaggmark](https://github.com/hugohaggmark)
 * **LDAP**: multildap + ldap integration. [#18588](https://github.com/grafana/grafana/pull/18588), [@markelog](https://github.com/markelog)
 * **Profile/UserAdmin**: Fix for user agent parser crashes grafana-server on 32-bit builds. [#18788](https://github.com/grafana/grafana/pull/18788), [@marcusolsson](https://github.com/marcusolsson)
-* **Prometheus**: Prevents panel editor crash when switching to Prometheus data source. [#18616](https://github.com/grafana/grafana/pull/18616), [@hugohaggmark](https://github.com/hugohaggmark)
+* **Prometheus**: Prevents panel editor crash when switching to Prometheus datasource. [#18616](https://github.com/grafana/grafana/pull/18616), [@hugohaggmark](https://github.com/hugohaggmark)
 * **Prometheus**: Changes brace-insertion behavior to be less annoying. [#18698](https://github.com/grafana/grafana/pull/18698), [@kaydelaney](https://github.com/kaydelaney)
 
 # 6.3.4 (2019-08-29)
@@ -454,7 +121,7 @@ Please consider migrating from PhantomJS to the [Grafana Image Renderer plugin](
 * **Data links**. [#17267](https://github.com/grafana/grafana/pull/17267), [@torkelo](https://github.com/torkelo)
 * **Docker**: Switch base image to ubuntu:latest from debian:stretch to avoid security issues.. [#17066](https://github.com/grafana/grafana/pull/17066), [@bergquist](https://github.com/bergquist)
 * **Elasticsearch**: Support for visualizing logs in Explore . [#17605](https://github.com/grafana/grafana/pull/17605), [@marefr](https://github.com/marefr)
-* **Explore**: Adds Live option for supported data sources. [#17062](https://github.com/grafana/grafana/pull/17062), [@hugohaggmark](https://github.com/hugohaggmark)
+* **Explore**: Adds Live option for supported datasources. [#17062](https://github.com/grafana/grafana/pull/17062), [@hugohaggmark](https://github.com/hugohaggmark)
 * **Explore**: Adds orgId to URL for sharing purposes. [#17895](https://github.com/grafana/grafana/pull/17895), [@kaydelaney](https://github.com/kaydelaney)
 * **Explore**: Adds support for new loki 'start' and 'end' params for labels endpoint. [#17512](https://github.com/grafana/grafana/pull/17512), [@kaydelaney](https://github.com/kaydelaney)
 * **Explore**: Adds support for toggling raw query mode in explore. [#17870](https://github.com/grafana/grafana/pull/17870), [@kaydelaney](https://github.com/kaydelaney)
@@ -556,7 +223,7 @@ More details in bug report: https://github.com/grafana/grafana/issues/17613
 # 6.2.1 (2019-05-27)
 
 ### Features / Enhancements
-  * **CLI**: Add command to migrate all data sources to use encrypted password fields . [#17118](https://github.com/grafana/grafana/pull/17118), [@aocenas](https://github.com/aocenas)
+  * **CLI**: Add command to migrate all datasources to use encrypted password fields . [#17118](https://github.com/grafana/grafana/pull/17118), [@aocenas](https://github.com/aocenas)
   * **Gauge/BarGauge**: Improvements to auto value font size . [#17292](https://github.com/grafana/grafana/pull/17292), [@torkelo](https://github.com/torkelo)
 
 ### Bug Fixes
@@ -593,7 +260,7 @@ repo on July 1st. Make sure you have switched to the new repo by then. The new r
   * **Dashboard**: Fixes lazy loading & expanding collapsed rows on mobile. [#17055](https://github.com/grafana/grafana/pull/17055), [@torkelo](https://github.com/torkelo)
   * **Dashboard**: Fixes scrolling issues for Edge browser. [#17033](https://github.com/grafana/grafana/pull/17033), [@jschill](https://github.com/jschill)
   * **Dashboard**: Show refresh button in first kiosk(tv) mode. [#17032](https://github.com/grafana/grafana/pull/17032), [@torkelo](https://github.com/torkelo)
-  * **Explore**: Fix empty result from data source should render logs container. [#16999](https://github.com/grafana/grafana/pull/16999), [@marefr](https://github.com/marefr)
+  * **Explore**: Fix empty result from datasource should render logs container. [#16999](https://github.com/grafana/grafana/pull/16999), [@marefr](https://github.com/marefr)
   * **Explore**: Fixes so clicking in a Prometheus Table the query is filtered by clicked value. [#17083](https://github.com/grafana/grafana/pull/17083), [@hugohaggmark](https://github.com/hugohaggmark)
   * **Explore**: Makes it possible to zoom in Explore/Loki/Graph without exception. [#16991](https://github.com/grafana/grafana/pull/16991), [@hugohaggmark](https://github.com/hugohaggmark)
   * **Gauge**: Fixes orientation issue after switching from BarGauge to Gauge. [#17064](https://github.com/grafana/grafana/pull/17064), [@torkelo](https://github.com/torkelo)
@@ -618,7 +285,7 @@ repo on July 1st. Make sure you have switched to the new repo by then. The new r
   * **Alerting**: No notification when going from no data to pending. [#16905](https://github.com/grafana/grafana/pull/16905), [@bergquist](https://github.com/bergquist)
   * **Alerting**: Pushover alert, support for different sound for OK. [#16525](https://github.com/grafana/grafana/pull/16525), [@Hofls](https://github.com/Hofls)
   * **Auth**: Enable retries and transaction for some db calls for auth tokens . [#16785](https://github.com/grafana/grafana/pull/16785), [@bergquist](https://github.com/bergquist)
-  * **AzureMonitor**: Adds support for multiple subscriptions per data source. [#16922](https://github.com/grafana/grafana/pull/16922), [@daniellee](https://github.com/daniellee)
+  * **AzureMonitor**: Adds support for multiple subscriptions per datasource. [#16922](https://github.com/grafana/grafana/pull/16922), [@daniellee](https://github.com/daniellee)
   * **Bar Gauge**: New multi series enabled gauge like panel with horizontal and vertical layouts and 3 display modes. [#16918](https://github.com/grafana/grafana/pull/16918), [@torkelo](https://github.com/torkelo)
   * **Build**: Upgrades to golang 1.12.4. [#16545](https://github.com/grafana/grafana/pull/16545), [@bergquist](https://github.com/bergquist)
   * **CloudWatch**: Update AWS/IoT metric and dimensions. [#16337](https://github.com/grafana/grafana/pull/16337), [@nonamef](https://github.com/nonamef)
@@ -626,21 +293,21 @@ repo on July 1st. Make sure you have switched to the new repo by then. The new r
   * **Dashboard**: Enable filtering dashboards in search by current folder. [#16790](https://github.com/grafana/grafana/pull/16790), [@dprokop](https://github.com/dprokop)
   * **Dashboard**: Lazy load out of view panels . [#15554](https://github.com/grafana/grafana/pull/15554), [@ryantxu](https://github.com/ryantxu)
   * **DataProxy**: Restore Set-Cookie header after proxy request. [#16838](https://github.com/grafana/grafana/pull/16838), [@marefr](https://github.com/marefr)
-  * **Data Sources**: Add pattern validation for time input on data source config pages. [#16837](https://github.com/grafana/grafana/pull/16837), [@aocenas](https://github.com/aocenas)
+  * **Datasources**: Add pattern validation for time input on datasource config pages. [#16837](https://github.com/grafana/grafana/pull/16837), [@aocenas](https://github.com/aocenas)
   * **Elasticsearch**: Add 7.x version support. [#16646](https://github.com/grafana/grafana/pull/16646), [@alcidesv](https://github.com/alcidesv)
-  * **Explore**: Adds reconnect for failing data source. [#16226](https://github.com/grafana/grafana/pull/16226), [@hugohaggmark](https://github.com/hugohaggmark)
+  * **Explore**: Adds reconnect for failing datasource. [#16226](https://github.com/grafana/grafana/pull/16226), [@hugohaggmark](https://github.com/hugohaggmark)
   * **Explore**: Support user timezone. [#16469](https://github.com/grafana/grafana/pull/16469), [@marefr](https://github.com/marefr)
   * **InfluxDB**: Add support for POST HTTP verb. [#16690](https://github.com/grafana/grafana/pull/16690), [@StephenSorriaux](https://github.com/StephenSorriaux)
   * **Loki**: Search is now case insensitive. [#15948](https://github.com/grafana/grafana/pull/15948), [@steven-sheehy](https://github.com/steven-sheehy)
   * **OAuth**: Update jwt regexp to include `=`. [#16521](https://github.com/grafana/grafana/pull/16521), [@DanCech](https://github.com/DanCech)
   * **Panels**: No title will no longer make panel header take up space. [#16884](https://github.com/grafana/grafana/pull/16884), [@torkelo](https://github.com/torkelo)
-  * **Prometheus**: Adds tracing headers for Prometheus datas ource. [#16724](https://github.com/grafana/grafana/pull/16724), [@svagner](https://github.com/svagner)
+  * **Prometheus**: Adds tracing headers for Prometheus datasource. [#16724](https://github.com/grafana/grafana/pull/16724), [@svagner](https://github.com/svagner)
   * **Provisioning**: Add API endpoint to reload provisioning configs. [#16579](https://github.com/grafana/grafana/pull/16579), [@aocenas](https://github.com/aocenas)
   * **Provisioning**: Do not allow deletion of provisioned dashboards. [#16211](https://github.com/grafana/grafana/pull/16211), [@aocenas](https://github.com/aocenas)
   * **Provisioning**: Interpolate env vars in provisioning files. [#16499](https://github.com/grafana/grafana/pull/16499), [@aocenas](https://github.com/aocenas)
   * **Provisioning**: Support FolderUid in Dashboard Provisioning Config. [#16559](https://github.com/grafana/grafana/pull/16559), [@swtch1](https://github.com/swtch1)
   * **Security**: Add new setting allow_embedding. [#16853](https://github.com/grafana/grafana/pull/16853), [@marefr](https://github.com/marefr)
-  * **Security**: Store data source passwords encrypted in secureJsonData. [#16175](https://github.com/grafana/grafana/pull/16175), [@aocenas](https://github.com/aocenas)
+  * **Security**: Store datasource passwords encrypted in secureJsonData. [#16175](https://github.com/grafana/grafana/pull/16175), [@aocenas](https://github.com/aocenas)
   * **UX**: Improve Grafana usage for smaller screens. [#16783](https://github.com/grafana/grafana/pull/16783), [@torkelo](https://github.com/torkelo)
   * **Units**: Add angle units, Arc Minutes and Seconds. [#16271](https://github.com/grafana/grafana/pull/16271), [@Dripoul](https://github.com/Dripoul)
 
@@ -652,7 +319,7 @@ repo on July 1st. Make sure you have switched to the new repo by then. The new r
   * **Elasticsearch**: Fix view percentiles metric in table without date histogram. [#15686](https://github.com/grafana/grafana/pull/15686), [@Igor-Ratsuk](https://github.com/Igor-Ratsuk)
   * **Explore**: Prevents histogram loading from killing Prometheus instance. [#16768](https://github.com/grafana/grafana/pull/16768), [@hugohaggmark](https://github.com/hugohaggmark)
   * **Graph**: Allow override decimals to fully override. [#16414](https://github.com/grafana/grafana/pull/16414), [@torkelo](https://github.com/torkelo)
-  * **Mixed Data Source**: Fix error when one query is disabled. [#16409](https://github.com/grafana/grafana/pull/16409), [@marefr](https://github.com/marefr)
+  * **Mixed Datasource**: Fix error when one query is disabled. [#16409](https://github.com/grafana/grafana/pull/16409), [@marefr](https://github.com/marefr)
   * **Search**: Fixes search limits and adds a page parameter. [#16458](https://github.com/grafana/grafana/pull/16458), [@torkelo](https://github.com/torkelo)
   * **Security**: Responses from backend should not be cached. [#16848](https://github.com/grafana/grafana/pull/16848), [@marefr](https://github.com/marefr)
 
@@ -730,10 +397,10 @@ repo on July 1st. Make sure you have switched to the new repo by then. The new r
 * **Cloudwatch**: Add AWS RDS MaximumUsedTransactionIDs metric [#15077](https://github.com/grafana/grafana/pull/15077), thx [@activeshadow](https://github.com/activeshadow)
 * **Cache**: Adds support for using out of proc caching in the backend [#10816](https://github.com/grafana/grafana/issues/10816)
 * **Dashboard**: New keyboard shortcut `d l` toggles all Graph legends in a dashboard. [#15770](https://github.com/grafana/grafana/pull/15770), [@jsferrei](https://github.com/jsferrei)
-* **Data Source**: Only log connection string in dev environment [#16001](https://github.com/grafana/grafana/issues/16001)
+* **Datasource**: Only log connection string in dev environment [#16001](https://github.com/grafana/grafana/issues/16001)
 * **DataProxy**: Add custom header (X-Grafana-User) to data source requests with the current username. [#15998](https://github.com/grafana/grafana/pull/15998), [@aocenas](https://github.com/aocenas)
 * **DataProxy**: Make it possible to add user details to requests sent to the dataproxy [#6359](https://github.com/grafana/grafana/issues/6359) and [#15931](https://github.com/grafana/grafana/issues/15931)
-* **DataProxy**: Adds oauth pass-through option for data sources. [#15205](https://github.com/grafana/grafana/pull/15205), [@seanlaff](https://github.com/seanlaff)
+* **DataProxy**: Adds oauth pass-through option for datasources. [#15205](https://github.com/grafana/grafana/pull/15205), [@seanlaff](https://github.com/seanlaff)
 * **Explore**: Hide empty duplicates column in logs viewer. [#15982](https://github.com/grafana/grafana/pull/15982), [@steven-sheehy](https://github.com/steven-sheehy)
 * **Explore**: Make it possible to close left pane of split view. [#16155](https://github.com/grafana/grafana/pull/16155), [@dprokop](https://github.com/dprokop)
 * **Explore**: Move back / forward with browser buttons now works. [#16150](https://github.com/grafana/grafana/pull/16150), [@hugohaggmark](https://github.com/hugohaggmark)
@@ -755,8 +422,8 @@ repo on July 1st. Make sure you have switched to the new repo by then. The new r
 * **Api**: Invalid org invite code [#10506](https://github.com/grafana/grafana/issues/10506)
 * **Annotations**: Fix for native annotations filtered by template variable with pipe. [#15515](https://github.com/grafana/grafana/pull/15515), [@marefr](https://github.com/marefr)
 * **Dashboard**: Fix for time regions spanning across midnight. [#16201](https://github.com/grafana/grafana/pull/16201), [@marefr](https://github.com/marefr)
-* **Data Source**: Handles nil jsondata field gracefully [#14239](https://github.com/grafana/grafana/issues/14239)
-* **Data Source**: Empty user/password was not updated when updating data sources [#15608](https://github.com/grafana/grafana/pull/15608), thx [@Maddin-619](https://github.com/Maddin-619)
+* **Datasource**: Handles nil jsondata field gracefully [#14239](https://github.com/grafana/grafana/issues/14239)
+* **Datasource**: Empty user/password was not updated when updating datasources [#15608](https://github.com/grafana/grafana/pull/15608), thx [@Maddin-619](https://github.com/Maddin-619)
 * **Elasticsearch**:  Fixes using template variables in the alias field. [#16229](https://github.com/grafana/grafana/pull/16229), [@daniellee](https://github.com/daniellee)
 * **Elasticsearch**: Fix incorrect index pattern padding in alerting queries. [#15892](https://github.com/grafana/grafana/pull/15892), [@sandlis](https://github.com/sandlis)
 * **Explore**: Fix for Prometheus autocomplete not working in Firefox. [#16192](https://github.com/grafana/grafana/pull/16192), [@hugohaggmark](https://github.com/hugohaggmark)
@@ -782,7 +449,7 @@ repo on July 1st. Make sure you have switched to the new repo by then. The new r
 * **LDAP**: Fix allow anonymous server bind for ldap search. [#15872](https://github.com/grafana/grafana/pull/15872), [@marefr](https://github.com/marefr)
 * **Discord**: Fix discord notifier so it doesn't crash when there are no image generated. [#15833](https://github.com/grafana/grafana/pull/15833), [@marefr](https://github.com/marefr)
 * **Panel Edit**: Prevent search in VizPicker from stealing focus. [#15802](https://github.com/grafana/grafana/pull/15802), [@peterholmberg](https://github.com/peterholmberg)
-* **Data Source admin**: Fixed url of back button in data source edit page, when root_url configured. [#15759](https://github.com/grafana/grafana/pull/15759), [@dprokop](https://github.com/dprokop)
+* **Datasource admin**: Fixed url of back button in datasource edit page, when root_url configured. [#15759](https://github.com/grafana/grafana/pull/15759), [@dprokop](https://github.com/dprokop)
 
 # 6.0.1 (2019-03-06)
 
@@ -794,7 +461,7 @@ repo on July 1st. Make sure you have switched to the new repo by then. The new r
 * **Dashboard**: Fix only users that can edit a dashboard should be able to update panel json. [#15805](https://github.com/grafana/grafana/pull/15805), [@marefr](https://github.com/marefr)
 * **LDAP**: fix allow anonymous initial bind for ldap search. [#15803](https://github.com/grafana/grafana/pull/15803), [@marefr](https://github.com/marefr)
 * **UX**: Fixed scrollbar not visible initially (only after manual scroll). [#15798](https://github.com/grafana/grafana/pull/15798), [@torkelo](https://github.com/torkelo)
-* **Data Source admin** TestData   [#15793](https://github.com/grafana/grafana/pull/15793), [@hugohaggmark](https://github.com/hugohaggmark)
+* **Datasource admin** TestData   [#15793](https://github.com/grafana/grafana/pull/15793), [@hugohaggmark](https://github.com/hugohaggmark)
 * **Dashboard**: Fixed scrolling issue that caused scroll to be locked to bottom. [#15792](https://github.com/grafana/grafana/pull/15792), [@torkelo](https://github.com/torkelo)
 * **Explore**: Viewers with viewers_can_edit should be able to access /explore. [#15787](https://github.com/grafana/grafana/pull/15787), [@jschill](https://github.com/jschill)
 * **Security** fix: limit access to org admin and alerting pages. [#15761](https://github.com/grafana/grafana/pull/15761), [@marefr](https://github.com/marefr)
@@ -833,7 +500,7 @@ repo on July 1st. Make sure you have switched to the new repo by then. The new r
 * **Cloudwatch**: Add AWS/Neptune metrics [#14231](https://github.com/grafana/grafana/issues/14231), thx [@tcpatterson](https://github.com/tcpatterson)
 * **Cloudwatch**: Add AWS/EC2/API metrics [#14233](https://github.com/grafana/grafana/issues/14233), thx [@tcpatterson](https://github.com/tcpatterson)
 * **Cloudwatch**: Add AWS RDS ServerlessDatabaseCapacity metric [#15265](https://github.com/grafana/grafana/pull/15265), thx [@larsjoergensen](https://github.com/larsjoergensen)
-* **MySQL**: Adds data source SSL CA/client certificates support [#8570](https://github.com/grafana/grafana/issues/8570), thx [@bugficks](https://github.com/bugficks)
+* **MySQL**: Adds datasource SSL CA/client certificates support [#8570](https://github.com/grafana/grafana/issues/8570), thx [@bugficks](https://github.com/bugficks)
 * **MSSQL**: Timerange are now passed for template variable queries [#13324](https://github.com/grafana/grafana/issues/13324), thx [@thatsparesh](https://github.com/thatsparesh)
 * **Annotations**: Support PATCH verb in annotations http api [#12546](https://github.com/grafana/grafana/issues/12546), thx [@SamuelToh](https://github.com/SamuelToh)
 * **Templating**: Add json formatting to variable interpolation [#15291](https://github.com/grafana/grafana/issues/15291), thx [@mtanda](https://github.com/mtanda)
@@ -893,8 +560,8 @@ repo on July 1st. Make sure you have switched to the new repo by then. The new r
 * **Units**: Add Floating Point Operations per Second units [#14558](https://github.com/grafana/grafana/pull/14558), thx [@hahnjo](https://github.com/hahnjo)
 * **Table**: Renders epoch string as date if date column style [#14484](https://github.com/grafana/grafana/issues/14484)
 * **Dataproxy**: Override incoming Authorization header [#13815](https://github.com/grafana/grafana/issues/13815), thx [@kornholi](https://github.com/kornholi)
-* **Dataproxy**: Add global data source proxy timeout setting [#5699](https://github.com/grafana/grafana/issues/5699), thx [@RangerRick](https://github.com/RangerRick)
-* **Database**: Support specifying database host using IPV6 for backend database and sql data sources [#13711](https://github.com/grafana/grafana/issues/13711), thx [@ellisvlad](https://github.com/ellisvlad)
+* **Dataproxy**: Add global datasource proxy timeout setting [#5699](https://github.com/grafana/grafana/issues/5699), thx [@RangerRick](https://github.com/RangerRick)
+* **Database**: Support specifying database host using IPV6 for backend database and sql datasources [#13711](https://github.com/grafana/grafana/issues/13711), thx [@ellisvlad](https://github.com/ellisvlad)
 * **Database**: Support defining additonal database connection string args when using `url` property in database settings [#14709](https://github.com/grafana/grafana/pull/14709), thx [@tpetr](https://github.com/tpetr)
 * **Stackdriver**: crossSeriesAggregation not being sent with the query [#15129](https://github.com/grafana/grafana/issues/15129), thx [@Legogris](https://github.com/Legogris)
 
@@ -909,7 +576,7 @@ repo on July 1st. Make sure you have switched to the new repo by then. The new r
 * **Dashboard**: Fix having a long query in prometheus dashboard query editor blocks 30% of the query field when on OSX and having native scrollbars [#15122](https://github.com/grafana/grafana/issues/15122)
 * **Explore**: Fix issue with wrapping on long queries [#15222](https://github.com/grafana/grafana/issues/15222)
 * **Explore**: Fix cut & paste adds newline before and after selection [#15223](https://github.com/grafana/grafana/issues/15223)
-* **Dataproxy**: Fix global data source proxy timeout not added to correct http client [#15258](https://github.com/grafana/grafana/issues/15258) [#5699](https://github.com/grafana/grafana/issues/5699)
+* **Dataproxy**: Fix global datasource proxy timeout not added to correct http client [#15258](https://github.com/grafana/grafana/issues/15258) [#5699](https://github.com/grafana/grafana/issues/5699)
 
 ### Breaking changes
 * **Text Panel**: The text panel does no longer by default allow unsantizied HTML. [#4117](https://github.com/grafana/grafana/issues/4117). This means that if you have text panels with scripts tags they will no longer work as before. To enable unsafe javascript execution in text panels enable the settings `disable_sanitize_html` under the section `[panels]` in your Grafana ini file, or set env variable  `GF_PANELS_DISABLE_SANITIZE_HTML=true`.
@@ -934,13 +601,13 @@ repo on July 1st. Make sure you have switched to the new repo by then. The new r
 ### Bug fixes
 * **Alerting** Invalid frequency causes division by zero in alert scheduler [#14810](https://github.com/grafana/grafana/issues/14810)
 * **Dashboard** Dashboard links do not update when time range changes [#14493](https://github.com/grafana/grafana/issues/14493)
-* **Limits** Support more than 1000 data sources per org [#13883](https://github.com/grafana/grafana/issues/13883)
+* **Limits** Support more than 1000 datasources per org [#13883](https://github.com/grafana/grafana/issues/13883)
 * **Backend** fix signed in user for orgId=0 result should return active org id [#14574](https://github.com/grafana/grafana/pull/14574)
 * **Provisioning** Adds orgId to user dto for provisioned dashboards [#14678](https://github.com/grafana/grafana/pull/14678)
 
 # 5.4.2 (2018-12-13)
 
-* **Data Source admin**: Fix for issue creating new data source when same name exists [#14467](https://github.com/grafana/grafana/issues/14467)
+* **Datasource admin**: Fix for issue creating new data source when same name exists [#14467](https://github.com/grafana/grafana/issues/14467)
 * **OAuth**: Fix for oauth auto login setting, can now be set using env variable [#14435](https://github.com/grafana/grafana/issues/14435)
 * **Dashboard search**: Fix for searching tags in tags filter dropdown.
 
@@ -970,7 +637,7 @@ https://github.com/grafana/grafana/pull/14313)
 
 ### 5.4.0-beta1 fixes
 * **Graph**: Fix legend always visible even if configured to be hidden [#14144](https://github.com/grafana/grafana/issues/14144)
-* **Elasticsearch**: Fix regression when using data source version 6.0+ and alerting [#14175](https://github.com/grafana/grafana/pull/14175)
+* **Elasticsearch**: Fix regression when using datasource version 6.0+ and alerting [#14175](https://github.com/grafana/grafana/pull/14175)
 
 # 5.4.0-beta1 (2018-11-20)
 
@@ -980,7 +647,7 @@ https://github.com/grafana/grafana/pull/14313)
 * **Alerting**: Option to disable OK alert notifications [#12330](https://github.com/grafana/grafana/issues/12330) & [#6696](https://github.com/grafana/grafana/issues/6696), thx [@davewat](https://github.com/davewat)
 * **Postgres/MySQL/MSSQL**: Adds support for configuration of max open/idle connections and connection max lifetime. Also, panels with multiple SQL queries will now be executed concurrently [#11711](https://github.com/grafana/grafana/issues/11711), thx [@connection-reset](https://github.com/connection-reset)
 * **MySQL**: Graphical query builder [#13762](https://github.com/grafana/grafana/issues/13762), thx [svenklemm](https://github.com/svenklemm)
-* **MySQL**: Support connecting thru Unix socket for MySQL data source [#12342](https://github.com/grafana/grafana/issues/12342), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino)
+* **MySQL**: Support connecting thru Unix socket for MySQL datasource [#12342](https://github.com/grafana/grafana/issues/12342), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino)
 * **MSSQL**: Add encrypt setting to allow configuration of how data sent between client and server are encrypted [#13629](https://github.com/grafana/grafana/issues/13629), thx [@ramiro](https://github.com/ramiro)
 * **Stackdriver**: Not possible to authenticate using GCE metadata server [#13669](https://github.com/grafana/grafana/issues/13669)
 * **Teams**: Team preferences (theme, home dashboard, timezone) support [#12550](https://github.com/grafana/grafana/issues/12550)
@@ -1007,7 +674,7 @@ https://github.com/grafana/grafana/pull/14313)
 * **Alerting**: Can't receive DingDing alert when alert is triggered [#13723](https://github.com/grafana/grafana/issues/13723), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino)
 * **Alerting**: Increase Telegram captions length limit [#13876](https://github.com/grafana/grafana/pull/13876), thx [@skgsergio](https://github.com/skgsergio)
 * **Internal metrics**: Renamed `grafana_info` to `grafana_build_info` and added branch, goversion and revision [#13876](https://github.com/grafana/grafana/pull/13876)
-* **Data Source Proxy**: Keep trailing slash for data source proxy requests [#13326](https://github.com/grafana/grafana/pull/13326), thx [@ryantxu](https://github.com/ryantxu)
+* **Datasource Proxy**: Keep trailing slash for datasource proxy requests [#13326](https://github.com/grafana/grafana/pull/13326), thx [@ryantxu](https://github.com/ryantxu)
 * **OAuth**: Fix Google OAuth relies on email, not google account id [#13924](https://github.com/grafana/grafana/issues/13924), thx [@vinicyusmacedo](https://github.com/vinicyusmacedo)
 * **Dashboard**: Toggle legend using keyboard shortcut [#13655](https://github.com/grafana/grafana/issues/13655), thx [@davewat](https://github.com/davewat)
 * **Dashboard**: Fix render dashboard row drag handle only in edit mode [#13555](https://github.com/grafana/grafana/issues/13555), thx [@praveensastry](https://github.com/praveensastry)
@@ -1018,13 +685,13 @@ https://github.com/grafana/grafana/pull/14313)
 
 ### Breaking changes
 
-* Postgres/MySQL/MSSQL data sources now per default uses `max open connections` = `unlimited` (earlier 10), `max idle connections` = `2` (earlier 10) and `connection max lifetime` = `4` hours (earlier unlimited).
+* Postgres/MySQL/MSSQL datasources now per default uses `max open connections` = `unlimited` (earlier 10), `max idle connections` = `2` (earlier 10) and `connection max lifetime` = `4` hours (earlier unlimited).
 
 # 5.3.4 (2018-11-13)
 
 * **Alerting**: Delete alerts when parent folder was deleted [#13322](https://github.com/grafana/grafana/issues/13322)
 * **MySQL**: Fix `$__timeFilter()` should respect local time zone [#13769](https://github.com/grafana/grafana/issues/13769)
-* **Dashboard**: Fix data source selection in panel by enter key [#13932](https://github.com/grafana/grafana/issues/13932)
+* **Dashboard**: Fix datasource selection in panel by enter key [#13932](https://github.com/grafana/grafana/issues/13932)
 * **Graph**: Fix table legend height when positioned below graph and using Internet Explorer 11 [#13903](https://github.com/grafana/grafana/issues/13903)
 * **Dataproxy**: Drop origin and referer http headers [#13328](https://github.com/grafana/grafana/issues/13328) [#13949](https://github.com/grafana/grafana/issues/13949), thx [@roidelapluie](https://github.com/roidelapluie)
 
@@ -1040,7 +707,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-3-3-and-4-
 * **Postgres**: Fix template variables error [#13692](https://github.com/grafana/grafana/issues/13692), thx [@svenklemm](https://github.com/svenklemm)
 * **Cloudwatch**: Fix service panic because of race conditions [#13674](https://github.com/grafana/grafana/issues/13674), thx [@mtanda](https://github.com/mtanda)
 * **Cloudwatch**: Fix check for invalid percentile statistics [#13633](https://github.com/grafana/grafana/issues/13633), thx [@apalaniuk](https://github.com/apalaniuk)
-* **Stackdriver/Cloudwatch**: Allow user to change unit in graph panel if cloudwatch/stackdriver data source response doesn't include unit [#13718](https://github.com/grafana/grafana/issues/13718), thx [@mtanda](https://github.com/mtanda)
+* **Stackdriver/Cloudwatch**: Allow user to change unit in graph panel if cloudwatch/stackdriver datasource response doesn't include unit [#13718](https://github.com/grafana/grafana/issues/13718), thx [@mtanda](https://github.com/mtanda)
 * **Stackdriver**: stackdriver user-metrics duplicated response when multiple resource types [#13691](https://github.com/grafana/grafana/issues/13691)
 * **Variables**: Fix text box template variable doesn't work properly without a default value [#13666](https://github.com/grafana/grafana/issues/13666)
 * **Variables**: Fix variable dependency check when using `${var}` format [#13600](https://github.com/grafana/grafana/issues/13600)
@@ -1081,7 +748,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-3-3-and-4-
 ### New Features
 
 * **Annotations**: Enable template variables in tagged annotations queries [#9735](https://github.com/grafana/grafana/issues/9735)
-* **Stackdriver**: Support for Google Stackdriver data source [#13289](https://github.com/grafana/grafana/pull/13289)
+* **Stackdriver**: Support for Google Stackdriver Datasource [#13289](https://github.com/grafana/grafana/pull/13289)
 
 ### Minor
 
@@ -1114,7 +781,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-3-3-and-4-
 * **LDAP**: Client certificates support [#12805](https://github.com/grafana/grafana/issues/12805), thx [@nyxi](https://github.com/nyxi)
 * **Profile**: List teams that the user is member of in current/active organization [#12476](https://github.com/grafana/grafana/issues/12476)
 * **Configuration**: Allow auto-assigning users to specific organization (other than Main. Org) [#1823](https://github.com/grafana/grafana/issues/1823) [#12801](https://github.com/grafana/grafana/issues/12801), thx [@gzzo](https://github.com/gzzo) and [@ofosos](https://github.com/ofosos)
-* **Dataproxy**: Pass configured/auth headers to a data source [#10971](https://github.com/grafana/grafana/issues/10971), thx [@mrsiano](https://github.com/mrsiano)
+* **Dataproxy**: Pass configured/auth headers to a Datasource [#10971](https://github.com/grafana/grafana/issues/10971), thx [@mrsiano](https://github.com/mrsiano)
 * **CloudWatch**: GetMetricData support [#11487](https://github.com/grafana/grafana/issues/11487), thx [@mtanda](https://github.com/mtanda)
 * **Postgres**: TimescaleDB support, e.g. use `time_bucket` for grouping by time when option enabled [#12680](https://github.com/grafana/grafana/pull/12680), thx [svenklemm](https://github.com/svenklemm)
 * **Cleanup**: Make temp file time to live configurable [#11607](https://github.com/grafana/grafana/issues/11607), thx [@xapon](https://github.com/xapon)
@@ -1126,7 +793,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-3-3-and-4-
 * **Alerting**: Fix rendering timeout which could cause notifications to not be sent due to rendering timing out [#12151](https://github.com/grafana/grafana/issues/12151)
 * **Docker**: Make it possible to set a specific plugin url [#12861](https://github.com/grafana/grafana/pull/12861), thx [ClementGautier](https://github.com/ClementGautier)
 * **GrafanaCli**: Fixed issue with grafana-cli install plugin resulting in corrupt http response from source error. Fixes [#13079](https://github.com/grafana/grafana/issues/13079)
-* **Provisioning**: Should allow one default data source per organization [#12229](https://github.com/grafana/grafana/issues/12229)
+* **Provisioning**: Should allow one default datasource per organization [#12229](https://github.com/grafana/grafana/issues/12229)
 * **Github OAuth**: Allow changes of user info at Github to be synched to Grafana when signing in [#11818](https://github.com/grafana/grafana/issues/11818), thx [@rwaweber](https://github.com/rwaweber)
 * **OAuth**: Fix overriding tls_skip_verify_insecure using environment variable [#12747](https://github.com/grafana/grafana/issues/12747), thx [@jangaraj](https://github.com/jangaraj)
 * **Prometheus**: Fix graph panel bar width issue in aligned prometheus queries [#12379](https://github.com/grafana/grafana/issues/12379)
@@ -1158,7 +825,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-3-3-and-4-
 * **Table**: Fix for useless horizontal scrollbar for table panel [#9964](https://github.com/grafana/grafana/issues/9964)
 * **Table**: Make table sorting stable when null values exist [#12362](https://github.com/grafana/grafana/pull/12362), thx [@bz2](https://github.com/bz2)
 * **Heatmap**: Fix broken tooltip and crosshair on Firefox [#12486](https://github.com/grafana/grafana/issues/12486)
-* **Data Source**: Fix UI issue with secret fields after updating data source [#11270](https://github.com/grafana/grafana/issues/11270)
+* **Datasource**: Fix UI issue with secret fields after updating datasource [#11270](https://github.com/grafana/grafana/issues/11270)
 * **Variables**: Skip unneeded extra query request when de-selecting variable values used for repeated panels [#8186](https://github.com/grafana/grafana/issues/8186), thx [@mtanda](https://github.com/mtanda)
 * **Variables**: Limit amount of queries executed when updating variable that other variable(s) are dependent on [#11890](https://github.com/grafana/grafana/issues/11890)
 * **Variables**: Support query variable refresh when another variable referenced in `Regex` field change its value [#12952](https://github.com/grafana/grafana/issues/12952), thx [@franciscocpg](https://github.com/franciscocpg)
@@ -1166,7 +833,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-3-3-and-4-
 * **Units**: Change units to include characters for power of 2 and 3 [#12744](https://github.com/grafana/grafana/pull/12744), thx [@Worty](https://github.com/Worty)
 * **Units**: Polish złoty currency [#12691](https://github.com/grafana/grafana/pull/12691), thx [@mwegrzynek](https://github.com/mwegrzynek)
 * **Units**: Adds bitcoin axes unit. [#13125](https://github.com/grafana/grafana/pull/13125)
-* **Api**: Delete nonexistent data source should return 404 [#12313](https://github.com/grafana/grafana/issues/12313), thx [@AustinWinstanley](https://github.com/AustinWinstanley)
+* **Api**: Delete nonexistent datasource should return 404 [#12313](https://github.com/grafana/grafana/issues/12313), thx [@AustinWinstanley](https://github.com/AustinWinstanley)
 * **Logging**: Reopen log files after receiving a SIGHUP signal [#13112](https://github.com/grafana/grafana/pull/13112), thx [@filewalkwithme](https://github.com/filewalkwithme)
 * **Login**: Show loading animation while waiting for authentication response on login [#12865](https://github.com/grafana/grafana/issues/12865)
 * **UI**: Fix iOS home screen "app" icon and Windows 10 app experience [#12752](https://github.com/grafana/grafana/issues/12752), thx [@andig](https://github.com/andig)
@@ -1174,7 +841,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-3-3-and-4-
 
 ### Breaking changes
 
-* Postgres data source no longer automatically adds time column alias when using the $__timeGroup alias. However, there's code in place which should make this change backward compatible and shouldn't create any issues.
+* Postgres datasource no longer automatically adds time column alias when using the $__timeGroup alias. However, there's code in place which should make this change backward compatible and shouldn't create any issues.
 * Kiosk mode now also hides submenu (variables)
 * ?inactive url parameter no longer supported, replaced with kiosk=tv url parameter
 
@@ -1222,7 +889,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-
 
 ### Minor
 
-* **Plugins**: Handle errors correctly when loading data source plugin [#12383](https://github.com/grafana/grafana/pull/12383) thx [@rozetko](https://github.com/rozetko)
+* **Plugins**: Handle errors correctly when loading datasource plugin [#12383](https://github.com/grafana/grafana/pull/12383) thx [@rozetko](https://github.com/rozetko)
 * **Render**: Enhance error message if phantomjs executable is not found [#11868](https://github.com/grafana/grafana/issues/11868)
 * **Dashboard**: Set correct text in drop down when variable is present in url [#11968](https://github.com/grafana/grafana/issues/11968)
 
@@ -1376,10 +1043,10 @@ See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-
 * **Prometheus**: Escape backslash in labels correctly. [#10555](https://github.com/grafana/grafana/issues/10555), thx [@roidelapluie](https://github.com/roidelapluie)
 * **Variables**: Case-insensitive sorting for template values [#11128](https://github.com/grafana/grafana/issues/11128) thx [@cross](https://github.com/cross)
 * **Annotations (native)**: Change default limit from 10 to 100 when querying api [#11569](https://github.com/grafana/grafana/issues/11569), thx [@flopp999](https://github.com/flopp999)
-* **MySQL/Postgres/MSSQL**: PostgreSQL data source generates invalid query with dates before 1970 [#11530](https://github.com/grafana/grafana/issues/11530) thx [@ryantxu](https://github.com/ryantxu)
+* **MySQL/Postgres/MSSQL**: PostgreSQL datasource generates invalid query with dates before 1970 [#11530](https://github.com/grafana/grafana/issues/11530) thx [@ryantxu](https://github.com/ryantxu)
 * **Kiosk**: Adds url parameter for starting a dashboard in inactive mode [#11228](https://github.com/grafana/grafana/issues/11228), thx [@towolf](https://github.com/towolf)
 * **Dashboard**: Enable closing timepicker using escape key [#11332](https://github.com/grafana/grafana/issues/11332)
-* **Data Sources**: Rename direct access mode in the data source settings [#11391](https://github.com/grafana/grafana/issues/11391)
+* **Datasources**: Rename direct access mode in the data source settings [#11391](https://github.com/grafana/grafana/issues/11391)
 * **Search**: Display dashboards in folder indented [#11073](https://github.com/grafana/grafana/issues/11073)
 * **Units**: Use B/s instead Bps for Bytes per second [#9342](https://github.com/grafana/grafana/pull/9342), thx [@mayli](https://github.com/mayli)
 * **Units**: Radiation units [#11001](https://github.com/grafana/grafana/issues/11001), thx [@victorclaessen](https://github.com/victorclaessen)
@@ -1503,7 +1170,7 @@ Grafana v5.0 is going to be the biggest and most foundational release Grafana ha
 ## Breaking changes
 
 * **[dashboard.json]** have been replaced with [dashboard provisioning](http://docs.grafana.org/administration/provisioning/).
-Config files for provisioning data sources as configuration have changed from `/conf/datasources` to `/conf/provisioning/datasources`.
+Config files for provisioning datasources as configuration have changed from `/conf/datasources` to `/conf/provisioning/datasources`.
 From `/etc/grafana/datasources` to `/etc/grafana/provisioning/datasources` when installed with deb/rpm packages.
 
 * **Pagerduty** The notifier now defaults to not auto resolve incidents. More details at [#10222](https://github.com/grafana/grafana/issues/10222)
@@ -1523,7 +1190,7 @@ Dashboard panels and rows are positioned using a gridPos object `{x: 0, y: 0, w:
 * **Postgres/MySQL**: add __timeGroup macro for mysql [#9596](https://github.com/grafana/grafana/pull/9596), thanks [@svenklemm](https://github.com/svenklemm)
 * **Text**: Text panel are now edited in the ace editor. [#9698](https://github.com/grafana/grafana/pull/9698), thx [@mtanda](https://github.com/mtanda)
 * **Teams**: Add Microsoft Teams notifier as  [#8523](https://github.com/grafana/grafana/issues/8523), thx [@anthu](https://github.com/anthu)
-* **Data Sources**: Its now possible to configure data sources with config files [#1789](https://github.com/grafana/grafana/issues/1789)
+* **Datasources**: Its now possible to configure datasources with config files [#1789](https://github.com/grafana/grafana/issues/1789)
 * **Graphite**: Query editor updated to support new query by tag features [#9230](https://github.com/grafana/grafana/issues/9230)
 * **Dashboard history**: New config file option versions_to_keep sets how many versions per dashboard to store, [#9671](https://github.com/grafana/grafana/issues/9671)
 * **Dashboard as cfg**: Load dashboards from file into Grafana on startup/change [#9654](https://github.com/grafana/grafana/issues/9654) [#5269](https://github.com/grafana/grafana/issues/5269)
@@ -1621,7 +1288,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-
 ## Fixes
 * **ColorPicker**: Fix for color picker not showing [#9549](https://github.com/grafana/grafana/issues/9549)
 * **Alerting**: Fix for broken test rule button in alert tab [#9539](https://github.com/grafana/grafana/issues/9539)
-* **Cloudwatch**: Provide error message when failing to add cloudwatch data source [#9534](https://github.com/grafana/grafana/pull/9534), thx [@mtanda](https://github.com/mtanda)
+* **Cloudwatch**: Provide error message when failing to add cloudwatch datasource [#9534](https://github.com/grafana/grafana/pull/9534), thx [@mtanda](https://github.com/mtanda)
 * **Cloudwatch**: Fix unused period parameter [#9536](https://github.com/grafana/grafana/pull/9536), thx [@mtanda](https://github.com/mtanda)
 * **CSV Export**: Fix for broken CSV export [#9525](https://github.com/grafana/grafana/issues/9525)
 * **Text panel**: Fix for issue with break lines in Firefox [#9491](https://github.com/grafana/grafana/issues/9491)
@@ -1639,13 +1306,13 @@ See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-
 * **Unit types**: New date & time unit types added, useful in singlestat to show dates & times. [#3678](https://github.com/grafana/grafana/issues/3678), [#6710](https://github.com/grafana/grafana/issues/6710), [#2764](https://github.com/grafana/grafana/issues/2764)
 * **CLI**: Make it possible to install plugins from any url [#5873](https://github.com/grafana/grafana/issues/5873)
 * **Prometheus**: Add support for instant queries [#5765](https://github.com/grafana/grafana/issues/5765), thx [@mtanda](https://github.com/mtanda)
-* **Cloudwatch**: Add support for alerting using the cloudwatch data source [#8050](https://github.com/grafana/grafana/pull/8050), thx [@mtanda](https://github.com/mtanda)
+* **Cloudwatch**: Add support for alerting using the cloudwatch datasource [#8050](https://github.com/grafana/grafana/pull/8050), thx [@mtanda](https://github.com/mtanda)
 * **Pagerduty**: Include triggering series in pagerduty notification [#8479](https://github.com/grafana/grafana/issues/8479), thx [@rickymoorhouse](https://github.com/rickymoorhouse)
 * **Timezone**: Time ranges like Today & Yesterday now work correctly when timezone setting is set to UTC [#8916](https://github.com/grafana/grafana/issues/8916), thx [@ctide](https://github.com/ctide)
 * **Prometheus**: Align $__interval with the step parameters. [#9226](https://github.com/grafana/grafana/pull/9226), thx [@alin-amana](https://github.com/alin-amana)
 * **Prometheus**: Autocomplete for label name and label value [#9208](https://github.com/grafana/grafana/pull/9208), thx [@mtanda](https://github.com/mtanda)
 * **Postgres**: New Postgres data source [#9209](https://github.com/grafana/grafana/pull/9209), thx [@svenklemm](https://github.com/svenklemm)
-* **Data sources**: Make data source HTTP requests verify TLS by default. closes [#9371](https://github.com/grafana/grafana/issues/9371), [#5334](https://github.com/grafana/grafana/issues/5334), [#8812](https://github.com/grafana/grafana/issues/8812), thx [@mattbostock](https://github.com/mattbostock)
+* **Datasources**: Make datasource HTTP requests verify TLS by default. closes [#9371](https://github.com/grafana/grafana/issues/9371), [#5334](https://github.com/grafana/grafana/issues/5334), [#8812](https://github.com/grafana/grafana/issues/8812), thx [@mattbostock](https://github.com/mattbostock)
 * **OAuth**: Verify TLS during OAuth callback [#9373](https://github.com/grafana/grafana/issues/9373), thx [@mattbostock](https://github.com/mattbostock)
 
 ## Minor
@@ -1840,7 +1507,7 @@ Pull Request: [#8472](https://github.com/grafana/grafana/pull/8472)
 * **Alerting**: Better error when SMTP is not configured [#8093](https://github.com/grafana/grafana/issues/8093)
 * **Pushover**: Add an option to attach graph image link in Pushover notification [#8043](https://github.com/grafana/grafana/issues/8043) thx [@devkid](https://github.com/devkid)
 * **WebDAV**: Allow to set different ImageBaseUrl for WebDAV upload and image link [#7914](https://github.com/grafana/grafana/issues/7914)
-* **Panels**: type-ahead mixed data source selection [#7697](https://github.com/grafana/grafana/issues/7697) thx [@mtanda](https://github.com/mtanda)
+* **Panels**: type-ahead mixed datasource selection [#7697](https://github.com/grafana/grafana/issues/7697) thx [@mtanda](https://github.com/mtanda)
 * **Security**:User enumeration problem [#7619](https://github.com/grafana/grafana/issues/7619)
 * **InfluxDB**: Register new queries available in InfluxDB - Holt Winters [#5619](https://github.com/grafana/grafana/issues/5619) thx [@rikkuness](https://github.com/rikkuness)
 * **Server**: Support listening on a UNIX socket [#4030](https://github.com/grafana/grafana/issues/4030), thx [@mitjaziv](https://github.com/mitjaziv)
@@ -1863,7 +1530,7 @@ Pull Request: [#8472](https://github.com/grafana/grafana/pull/8472)
 * **MySQL**: 4-byte UTF8 not supported when using MySQL database (allows Emojis) [#7958](https://github.com/grafana/grafana/issues/7958)
 * **Alerting**: api/alerts and api/alert/:id hold previous data for "message" and "Message" field when field value is changed from "some string" to empty string. [#7927](https://github.com/grafana/grafana/issues/7927)
 * **Graph**: Cannot add fill below to series override [#7916](https://github.com/grafana/grafana/issues/7916)
-* **InfluxDB**: Influxb Data source test passes even if the Database doesn't exist [#7864](https://github.com/grafana/grafana/issues/7864)
+* **InfluxDB**: Influxb Datasource test passes even if the Database doesn't exist [#7864](https://github.com/grafana/grafana/issues/7864)
 * **Prometheus**: Displaying Prometheus annotations is incredibly slow [#7750](https://github.com/grafana/grafana/issues/7750), thx [@mtanda](https://github.com/mtanda)
 * **Graphite**: grafana generates empty find query to graphite -> 422 Unprocessable Entity [#7740](https://github.com/grafana/grafana/issues/7740)
 * **Admin**: make organization filter case insensitive [#8194](https://github.com/grafana/grafana/issues/8194), thx [@Alexander-N](https://github.com/Alexander-N)
@@ -1904,7 +1571,7 @@ Pull Request: [#8472](https://github.com/grafana/grafana/pull/8472)
 
 ## Enhancements
 * **Telegram**: Added Telegram alert notifier [#7098](https://github.com/grafana/grafana/pull/7098), thx [@leonoff](https://github.com/leonoff)
-* **Templating**: Make $__interval and $__interval_ms global built in variables that can be used in by any data source (in panel queries), closes [#7190](https://github.com/grafana/grafana/issues/7190), closes [#6582](https://github.com/grafana/grafana/issues/6582)
+* **Templating**: Make $__interval and $__interval_ms global built in variables that can be used in by any datasource (in panel queries), closes [#7190](https://github.com/grafana/grafana/issues/7190), closes [#6582](https://github.com/grafana/grafana/issues/6582)
 * **S3 Image Store**: External s3 image store (used in alert notifications) now support AWS IAM Roles, closes [#6985](https://github.com/grafana/grafana/issues/6985), [#7058](https://github.com/grafana/grafana/issues/7058) thx [@mtanda](https://github.com/mtanda)
 * **SingleStat**: Implements diff aggregation method for singlestat [#7234](https://github.com/grafana/grafana/issues/7234), thx [@oliverpool](https://github.com/oliverpool)
 * **Dataproxy**: Added setting to enable more verbose logging in dataproxy [#7209](https://github.com/grafana/grafana/pull/7209), thx [@Ricky-N](https://github.com/Ricky-N)
@@ -1929,7 +1596,7 @@ Pull Request: [#8472](https://github.com/grafana/grafana/pull/8472)
 * **Table**: Add a message when queries returns no data. [#6109](https://github.com/grafana/grafana/issues/6109), thx [@xginn8](https://github.com/xginn8)
 * **Graph**: Set max width for series names in legend tables. [#2385](https://github.com/grafana/grafana/issues/2385), thx [@kolobaev](https://github.com/kolobaev)
 * **Database**: Allow max db connection pool configuration [#7427](https://github.com/grafana/grafana/issues/7427), thx [@huydx](https://github.com/huydx)
-* **Data Sources** Delete datsource by name [#7476](https://github.com/grafana/grafana/issues/7476), thx [@huydx](https://github.com/huydx)
+* **Datasources** Delete datsource by name [#7476](https://github.com/grafana/grafana/issues/7476), thx [@huydx](https://github.com/huydx)
 * **Dataproxy**: Only allow get that begins with api/ to access Prometheus [#7459](https://github.com/grafana/grafana/pull/7459), thx [@mtanda](https://github.com/mtanda)
 * **Snapshot**: Make timeout for snapshot creation configurable [#7449](https://github.com/grafana/grafana/pull/7449) thx [@ryu1-sakai](https://github.com/ryu1-sakai)
 * **Panels**: Add more physics units [#7554](https://github.com/grafana/grafana/pull/7554) thx [@ryantxu](https://github.com/ryantxu)
@@ -2029,7 +1696,7 @@ due to too many connections/file handles on the data source backend. This proble
 
 ### Bugfixes
 * **Metrics**: Fixes nil pointer dereference on my arm build [#6749](https://github.com/grafana/grafana/issues/6749)
-* **Data proxy**: Fixes a tcp pooling issue in the data source reverse proxy [#6759](https://github.com/grafana/grafana/issues/6759)
+* **Data proxy**: Fixes a tcp pooling issue in the datasource reverse proxy [#6759](https://github.com/grafana/grafana/issues/6759)
 
 # 4.0-stable (2016-11-29)
 
@@ -2037,7 +1704,7 @@ due to too many connections/file handles on the data source backend. This proble
 * **Server-side rendering**: Fixed address used when rendering panel via phantomjs and using non default http_addr config [#6660](https://github.com/grafana/grafana/issues/6660)
 * **Graph panel**: Fixed graph panel tooltip sort order issue [#6648](https://github.com/grafana/grafana/issues/6648)
 * **Unsaved changes**: You now navigate to the intended page after saving in the unsaved changes dialog [#6675](https://github.com/grafana/grafana/issues/6675)
-* **TLS Client Auth**: Support for TLS client authentication for data source proxies [#2316](https://github.com/grafana/grafana/issues/2316)
+* **TLS Client Auth**: Support for TLS client authentication for datasource proxies [#2316](https://github.com/grafana/grafana/issues/2316)
 * **Alerts out of sync**: Saving dashboards with broken alerts causes sync problem[#6576](https://github.com/grafana/grafana/issues/6576)
 * **Alerting**: Saving an alert with condition "HAS NO DATA" throws an error[#6701](https://github.com/grafana/grafana/issues/6701)
 * **Config**: Improve error message when parsing broken config file [#6731](https://github.com/grafana/grafana/issues/6731)
@@ -2049,7 +1716,7 @@ due to too many connections/file handles on the data source backend. This proble
 * **Graph Panel**: Log base scale on right Y-axis had no effect, max value calc was not applied, [#6534](https://github.com/grafana/grafana/issues/6534)
 * **Graph Panel**: Bar width if bars was only used in series override, [#6528](https://github.com/grafana/grafana/issues/6528)
 * **UI/Browser**: Fixed issue with page/view header gradient border not showing in Safari, [#6530](https://github.com/grafana/grafana/issues/6530)
-* **Cloudwatch**: Fixed cloudwatch data source requesting to many datapoints, [#6544](https://github.com/grafana/grafana/issues/6544)
+* **Cloudwatch**: Fixed cloudwatch datasource requesting to many datapoints, [#6544](https://github.com/grafana/grafana/issues/6544)
 * **UX**: Panel Drop zone visible after duplicating panel, and when entering fullscreen/edit view, [#6598](https://github.com/grafana/grafana/issues/6598)
 * **Templating**: Newly added variable was not visible directly only after dashboard reload, [#6622](https://github.com/grafana/grafana/issues/6622)
 
@@ -2086,7 +1753,7 @@ due to too many connections/file handles on the data source backend. This proble
 * **lodash upgrade**: Upgraded lodash from 2.4.2 to 4.15.0, this contains a number of breaking changes that could effect plugins. closes [#6021](https://github.com/grafana/grafana/pull/6021)
 
 ### Bug fixes
-* **Table Panel**: Fixed problem when switching to Mixed data source in metrics tab, fixes [#5999](https://github.com/grafana/grafana/pull/5999)
+* **Table Panel**: Fixed problem when switching to Mixed datasource in metrics tab, fixes [#5999](https://github.com/grafana/grafana/pull/5999)
 * **Playlist**: Fixed problem with play order not matching order defined in playlist, fixes [#5467](https://github.com/grafana/grafana/pull/5467)
 * **Graph panel**: Fixed problem with auto decimals on y axis when datamin=datamax, fixes [#6070](https://github.com/grafana/grafana/pull/6070)
 * **Snapshot**: Can view embedded panels/png rendered panels in snapshots without login, fixes [#3769](https://github.com/grafana/grafana/pull/3769)
@@ -2133,7 +1800,7 @@ due to too many connections/file handles on the data source backend. This proble
 * **Scripts**: Use restart instead of start for deb package script, closes [#5282](https://github.com/grafana/grafana/pull/5282)
 * **Logging**: Moved to structured logging lib, and moved to component specific level filters via config file, closes [#4590](https://github.com/grafana/grafana/issues/4590)
 * **OpenTSDB**: Support nested template variables in tag_values function, closes [#4398](https://github.com/grafana/grafana/issues/4398)
-* **Data Source**: Pending data source requests are canceled before new ones are issues (Graphite & Prometheus), closes [#5321](https://github.com/grafana/grafana/issues/5321)
+* **Datasource**: Pending data source requests are canceled before new ones are issues (Graphite & Prometheus), closes [#5321](https://github.com/grafana/grafana/issues/5321)
 
 ### Breaking changes
 * **Logging** : Changed default logging output format (now structured into message, and key value pairs, with logger key acting as component). You can also no change in config to json log output.
@@ -2257,8 +1924,8 @@ slack channel (link to slack channel in readme).
 ### Bug fixes
 * **Dashboard**: Fixed dashboard panel layout for mobile devices, fixes [#4529](https://github.com/grafana/grafana/issues/4529)
 * **Table Panel**: Fixed issue with table panel sort, fixes [#4532](https://github.com/grafana/grafana/issues/4532)
-* **Page Load Crash**: A data source with null jsonData would make Grafana fail to load page, fixes [#4536](https://github.com/grafana/grafana/issues/4536)
-* **Metrics tab**: Fix for missing data source name in data source selector, fixes [#4541](https://github.com/grafana/grafana/issues/4540)
+* **Page Load Crash**: A Datasource with null jsonData would make Grafana fail to load page, fixes [#4536](https://github.com/grafana/grafana/issues/4536)
+* **Metrics tab**: Fix for missing datasource name in datasource selector, fixes [#4541](https://github.com/grafana/grafana/issues/4540)
 * **Graph**: Fix legend in table mode with series on right-y axis, fixes [#4551](https://github.com/grafana/grafana/issues/4551), [#1145](https://github.com/grafana/grafana/issues/1145)
 
 # 3.0.0-beta1 (2016-03-31)
@@ -2274,7 +1941,7 @@ slack channel (link to slack channel in readme).
 * **Opentsdb**: Opentsdb 2.2 filters support, closes[#3077](https://github.com/grafana/grafana/issues/3077)
 
 ### Breaking changes
-* **Plugin API**: Both data source and panel plugin api (and plugin.json schema) have been updated, requiring an update to plugins. See [plugin api](https://github.com/grafana/grafana/blob/master/public/app/plugins/plugin_api.md) for more info.
+* **Plugin API**: Both datasource and panel plugin api (and plugin.json schema) have been updated, requiring an update to plugins. See [plugin api](https://github.com/grafana/grafana/blob/master/public/app/plugins/plugin_api.md) for more info.
 * **InfluxDB 0.8.x** The data source for the old version of influxdb (0.8.x) is no longer included in default builds, but can easily be installed via improved plugin system, closes [#3523](https://github.com/grafana/grafana/issues/3523)
 * **KairosDB** The data source is no longer included in default builds, but can easily be installed via improved plugin system, closes [#3524](https://github.com/grafana/grafana/issues/3524)
 * **Templating**: Templating value formats (glob/regex/pipe etc) are now handled automatically and not specified by the user, this makes variable values possible to reuse in many contexts. It can in some edge cases break existing dashboards that have template variables that do not reload on dashboard load. To fix any issue just go into template variable options and update the variable (so it's values are reloaded.).
@@ -2289,7 +1956,7 @@ slack channel (link to slack channel in readme).
 * **Table**: All content in table panel is now html escaped, closes [#3673](https://github.com/grafana/grafana/issues/3673)
 * **graph**: Template variables can now be used in TimeShift and TimeFrom, closes[#1960](https://github.com/grafana/grafana/issues/1960)
 * **Tooltip**: Optionally add milliseconds to timestamp in tool tip, closes[#2248](https://github.com/grafana/grafana/issues/2248)
-* **Opentsdb**: Support milliseconds when using openTSDB data source, closes [#2865](https://github.com/grafana/grafana/issues/2865)
+* **Opentsdb**: Support milliseconds when using openTSDB datasource, closes [#2865](https://github.com/grafana/grafana/issues/2865)
 * **Opentsdb**: Add support for annotations, closes[#664](https://github.com/grafana/grafana/issues/664)
 
 ### Bug fixes
@@ -2468,7 +2135,7 @@ Grunt & Watch tasks:
 - [Issue #1928](https://github.com/grafana/grafana/issues/1928). HTTP API: GET /api/dashboards/db/:slug response changed property `model` to `dashboard` to match the POST request nameing
 - Backend render URL changed from `/render/dashboard/solo` `render/dashboard-solo/` (in order to have consistent dashboard url `/dashboard/:type/:slug`)
 - Search HTTP API response has changed (simplified), tags list moved to separate HTTP resource URI
-- Data source HTTP api breaking change, ADD data source is now POST /api/datasources/, update is now PUT /api/datasources/:id
+- Datasource HTTP api breaking change, ADD datasource is now POST /api/datasources/, update is now PUT /api/datasources/:id
 
 **Fixes**
 - [Issue #2185](https://github.com/grafana/grafana/issues/2185). Graph: fixed PNG rendering of panels with legend table to the right
@@ -2526,7 +2193,7 @@ Grunt & Watch tasks:
 
 **Fixes**
 - [Issue #1649](https://github.com/grafana/grafana/issues/1649). HTTP API: grafana /render calls nows with api keys
-- [Issue #1667](https://github.com/grafana/grafana/issues/1667). Data source proxy & session timeout fix (caused 401 Unauthorized error after a while)
+- [Issue #1667](https://github.com/grafana/grafana/issues/1667). Datasource proxy & session timeout fix (caused 401 Unauthorized error after a while)
 - [Issue #1707](https://github.com/grafana/grafana/issues/1707). Unsaved changes: Do not show for snapshots, scripted and file based dashboards
 - [Issue #1703](https://github.com/grafana/grafana/issues/1703). Unsaved changes: Do not show for users with role `Viewer`
 - [Issue #1675](https://github.com/grafana/grafana/issues/1675). Data source proxy: Fixed issue with Gzip enabled and data source proxy
@@ -2630,7 +2297,7 @@ Grafana 2.x is fundamentally different from 1.x; it now ships with an integrated
 - [Issue #864](https://github.com/grafana/grafana/issues/846). Panel: Share panel feature, get a link to panel with the current time range
 - [Issue #938](https://github.com/grafana/grafana/issues/938). Panel: Plugin panels now reside outside of app/panels directory
 - [Issue #952](https://github.com/grafana/grafana/issues/952). Help: Shortcut "?" to open help modal with list of all shortcuts
-- [Issue #991](https://github.com/grafana/grafana/issues/991). ScriptedDashboard: data source services are now available in scripted dashboards, you can query data source for metric keys, generate dashboards, and even save them in a scripted dashboard (see scripted_gen_and_save.js for example)
+- [Issue #991](https://github.com/grafana/grafana/issues/991). ScriptedDashboard: datasource services are now available in scripted dashboards, you can query datasource for metric keys, generate dashboards, and even save them in a scripted dashboard (see scripted_gen_and_save.js for example)
 - [Issue #1041](https://github.com/grafana/grafana/issues/1041). Panel: All panels can now have links to other dashboards or absolute links, these links are available in the panel menu.
 
 **Changes**
@@ -2665,7 +2332,7 @@ Grafana 2.x is fundamentally different from 1.x; it now ships with an integrated
 Read this [blog post](https://grafana.com/blog/2014/09/11/grafana-1.8.0-rc1-released) for an overview of all improvements.
 
 **Fixes**
-- [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB data source
+- [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource
 - [Issue #795](https://github.com/grafana/grafana/issues/795). Chrome: Fix for display issue in chrome beta & chrome canary when entering edit mode
 - [Issue #818](https://github.com/grafana/grafana/issues/818). Graph: Added percent y-axis format
 - [Issue #828](https://github.com/grafana/grafana/issues/828). Elasticsearch: saving new dashboard with title equal to slugified url would cause it to deleted.
@@ -2767,8 +2434,8 @@ Read this [blog post](https://grafana.com/blog/2014/09/11/grafana-1.8.0-rc1-rele
 - [Issue #525](https://github.com/grafana/grafana/issues/525). InfluxDB: Enhanced series aliasing (legend names) with pattern replacements
 - [Issue #266](https://github.com/grafana/grafana/issues/266). Graphite: New option cacheTimeout to override graphite default memcache timeout
 - [Issue #606](https://github.com/grafana/grafana/issues/606). General: New global option in config.js to specify admin password (useful to hinder users from accidentally make changes)
-- [Issue #201](https://github.com/grafana/grafana/issues/201). Annotations: Elasticsearch data source support for events
-- [Issue #344](https://github.com/grafana/grafana/issues/344). Annotations: Annotations can now be fetched from non default data sources
+- [Issue #201](https://github.com/grafana/grafana/issues/201). Annotations: Elasticsearch datasource support for events
+- [Issue #344](https://github.com/grafana/grafana/issues/344). Annotations: Annotations can now be fetched from non default datasources
 - [Issue #631](https://github.com/grafana/grafana/issues/631). Search: max_results config.js option & scroll in search results (To show more or all dashboards)
 - [Issue #511](https://github.com/grafana/grafana/issues/511). Text panel: Allow [[..]] filter notation in all text panels (markdown/html/text)
 - [Issue #136](https://github.com/grafana/grafana/issues/136). Graph: New legend display option "Align as table"
@@ -2803,25 +2470,25 @@ Read this [blog post](https://grafana.com/blog/2014/09/11/grafana-1.8.0-rc1-rele
 - [Issue #506](https://github.com/grafana/grafana/issues/506). Bug in when using % sign in legends (aliases), fixed by removing url decoding of metric names
 - [Issue #522](https://github.com/grafana/grafana/issues/522). Series names and column name typeahead cache fix
 - [Issue #504](https://github.com/grafana/grafana/issues/504). Fixed influxdb issue with raw query that caused wrong value column detection
-- [Issue #526](https://github.com/grafana/grafana/issues/526). Default property that marks which data source is default in config.js is now optional
+- [Issue #526](https://github.com/grafana/grafana/issues/526). Default property that marks which datasource is default in config.js is now optional
 - [Issue #342](https://github.com/grafana/grafana/issues/342). Auto-refresh caused 2 refreshes (and hence multiple queries) each time (at least in firefox)
 
 # 1.6.0 (2014-06-16)
 
 #### New features or improvements
 - [Issue #427](https://github.com/grafana/grafana/issues/427). New Y-axis formater for metric values that represent seconds, Thanks @jippi
-- [Issue #390](https://github.com/grafana/grafana/issues/390). Allow special characters in series names (influxdb data source), Thanks @majst01
+- [Issue #390](https://github.com/grafana/grafana/issues/390). Allow special characters in series names (influxdb datasource), Thanks @majst01
 - [Issue #428](https://github.com/grafana/grafana/issues/428). Refactoring of filterSrv, Thanks @Tetha
 - [Issue #445](https://github.com/grafana/grafana/issues/445). New config for playlist feature. Set playlist_timespan to set default playlist interval, Thanks @rmca
 - [Issue #461](https://github.com/grafana/grafana/issues/461). New graphite function definition added isNonNull,  Thanks @tmonk42
 - [Issue #455](https://github.com/grafana/grafana/issues/455). New InfluxDB function difference add to function dropdown
 - [Issue #459](https://github.com/grafana/grafana/issues/459). Added parameter to keepLastValue graphite function definition (default 100)
   [Issue #418](https://github.com/grafana/grafana/issues/418). to the browser cache when upgrading grafana and improve load performance
-- [Issue #327](https://github.com/grafana/grafana/issues/327). Partial support for url encoded metrics when using Graphite data source. Thanks @axe-felix
+- [Issue #327](https://github.com/grafana/grafana/issues/327). Partial support for url encoded metrics when using Graphite datasource. Thanks @axe-felix
 - [Issue #473](https://github.com/grafana/grafana/issues/473). Improvement to InfluxDB query editor and function/value column selection
 - [Issue #375](https://github.com/grafana/grafana/issues/375). Initial support for filtering (templated queries) for InfluxDB. Thanks @mavimo
 - [Issue #475](https://github.com/grafana/grafana/issues/475). Row editing and adding new panel is now a lot quicker and easier with the new row menu
-- [Issue #211](https://github.com/grafana/grafana/issues/211). New data source! Initial support for OpenTSDB, Thanks @mpage
+- [Issue #211](https://github.com/grafana/grafana/issues/211). New datasource! Initial support for OpenTSDB, Thanks @mpage
 - [Issue #492](https://github.com/grafana/grafana/issues/492). Improvement and polish to the OpenTSDB query editor
 - [Issue #441](https://github.com/grafana/grafana/issues/441). Influxdb group by support, Thanks @piis3
 - improved asset (css/js) build pipeline, added revision to css and js. Will remove issues related
@@ -2832,7 +2499,7 @@ Read this [blog post](https://grafana.com/blog/2014/09/11/grafana-1.8.0-rc1-rele
 - New graphs now have a default empty query
 - Add Row button now creates a row with default height of 250px (no longer opens dashboard settings modal)
 - Clean up of config.sample.js, graphiteUrl removed (still works, but deprecated, removed in future)
-  Use data sources config instead. panel_names removed from config.js. Use plugins.panels to add custom panels
+  Use datasources config instead. panel_names removed from config.js. Use plugins.panels to add custom panels
 - Graphite panel is now renamed graph (Existing dashboards will still work)
 
 #### Fixes
@@ -2852,7 +2519,7 @@ Read this [blog post](https://grafana.com/blog/2014/09/11/grafana-1.8.0-rc1-rele
   for very short absolute ranges ([Issue #320](https://github.com/grafana/grafana/issues/320))
 - Increased resolution for graphite datapoints (maxDataPoints), now equal to panel pixel width. ([Issue #5](https://github.com/grafana/grafana/issues/5))
 - Improvement to influxdb query editor, can now add where clause and alias ([Issue #331](https://github.com/grafana/grafana/issues/331), thanks @mavimo)
-- New config setting for graphite data source to control if json render request is POST or GET ([Issue #345](https://github.com/grafana/grafana/issues/345))
+- New config setting for graphite datasource to control if json render request is POST or GET ([Issue #345](https://github.com/grafana/grafana/issues/345))
 - Unsaved changes warning feature ([Issue #324](https://github.com/grafana/grafana/issues/324))
 - Improvement to series toggling, CTRL+MouseClick on series name will now hide all others ([Issue #350](https://github.com/grafana/grafana/issues/350))
 
@@ -2904,7 +2571,7 @@ Read this for more info:
 - New function editor [video demo](http://youtu.be/I90WHRwE1ZM) ([Issue #178](https://github.com/grafana/grafana/issues/178))
 - Links to function documentation from function editor ([Issue #3](https://github.com/grafana/grafana/issues/3))
 - Reorder functions ([Issue #130](https://github.com/grafana/grafana/issues/130))
-- [Initial support for InfluxDB](https://github.com/torkelo/grafana/wiki/InfluxDB) as metric data source (#103), need feedback!
+- [Initial support for InfluxDB](https://github.com/torkelo/grafana/wiki/InfluxDB) as metric datasource (#103), need feedback!
 - [Dashboard playlist](https://github.com/torkelo/grafana/wiki/Dashboard-playlist) ([Issue #36](https://github.com/grafana/grafana/issues/36))
 - When adding aliasByNode smartly set node number ([Issue #175](https://github.com/grafana/grafana/issues/175))
 - Support graphite identifiers with embedded colons ([Issue #173](https://github.com/grafana/grafana/issues/173))
@@ -3002,3 +2669,4 @@ Thanks to everyone who contributed fixes and provided feedback :+1:
 # 1.0.0 (2014-01-19)
 
 First public release
+

CONTRIBUTING.md

@@ -1,67 +1,98 @@
-# Contributing to Grafana
+# Contributing
 
-Thank you for your interest in contributing to Grafana! We welcome all people who want to contribute in a healthy and constructive manner within our community. To help us create a safe and positive community experience for all, we require all participants to adhere to the [Code of Conduct](CODE_OF_CONDUCT.md).
+Grafana uses GitHub to manage contributions.
+Contributions take the form of pull requests that will be reviewed by the core team.
 
-This document is a guide to help you through the process of contributing to Grafana.
+- If you are a new contributor see: [Steps to Contribute](#steps-to-contribute).
 
-## Become a contributor
+- If you have a trivial fix or improvement, go ahead and create a pull request.
 
-You can contribute to Grafana in several ways. Here are some examples:
+- If you plan to do something more involved, discuss your idea on the respective [issue](https://github.com/grafana/grafana/issues) or create a [new issue](https://github.com/grafana/grafana/issues/new) if it does not exist. This will avoid unnecessary work and surely give you and us a good deal of inspiration.
 
-- Contribute to the Grafana codebase.
-- Report and triage bugs.
-- Develop community plugins and dashboards.
-- Write technical documentation and blog posts, for users and contributors.
-- Organize meetups and user groups in your local area.
-- Help others by answering questions about Grafana.
+- Sign our [CLA](http://docs.grafana.org/contribute/cla/).
 
-For more ways to contribute, check out the [Open Source Guides](https://opensource.guide/how-to-contribute/).
+- Make sure to follow the code style guides:
+  - [Backend](https://github.com/grafana/grafana/tree/master/pkg)
+  - [Frontend](https://github.com/grafana/grafana/tree/master/style_guides)
 
-### Report bugs
+## Steps to contribute
 
-Report a bug by submitting a [bug report](https://github.com/grafana/grafana/issues/new?labels=type%3A+bug&template=1-bug_report.md). Make sure that you provide as much information as possible on how to reproduce the bug.
+Should you wish to work on a GitHub issue, check first if it is not already assigned to someone. If it is free, you claim it by commenting on the issue that you want to work on it. This is to prevent duplicated efforts from contributors on the same issue.
 
-Before submitting a new issue, try to make sure someone hasn't already reported the problem. Look through the [existing issues](https://github.com/grafana/grafana/issues) for similar issues.
+Please check the [`beginner friendly`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) and [`help wanted`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) labels to find issues that are good for getting started. If you have questions about one of the issues, with or without the tag, please comment on them and one of the core team or the original poster will clarify it.
 
-#### Security issues
+To setup a local development environment we recommend reading [Building Grafana from source](http://docs.grafana.org/project/building_from_source/).
 
-If you believe you've found a security vulnerability, please read our [security policy](https://github.com/grafana/grafana/security/policy) for more details.
+## Pull request checklist
 
-### Suggest enhancements
+Whether you are contributing or doing code review, first read and understand https://google.github.io/eng-practices/review/reviewer/ for general engineering practices around code reviews that we also use.
 
-If you have an idea of how to improve Grafana, submit an [enhancement request](https://github.com/grafana/grafana/issues/new?labels=type%3A+feature+request&template=2-feature_request.md).
+- Branch from the master branch and, if needed, rebase to the current master branch before submitting your pull request. If it doesn't merge cleanly with master you may be asked to rebase your changes.
 
-We want to make Grafana accessible to even more people. Submit an [accessibility issue](https://github.com/grafana/grafana/issues/new?labels=type%3A+accessibility&template=3-accessibility.md) to help us understand what we can improve.
+- If your patch is not getting reviewed or you need a specific person to review it, you can @-reply a reviewer asking for a review in the pull request or a comment.
 
-### Triage issues
+- Add tests relevant to the fixed bug or new feature.
 
-If you don't have the knowledge or time to code, consider helping with _issue triage_. The community will thank you for saving them time by spending some of yours.
+### High-level checks
 
-Read more about the ways you can [Triage issues](/contribute/triage-issues.md).
+- [ ] The pull request adds value and the impact of the change is in line with [Backend](https://github.com/grafana/grafana/tree/master/pkg) or [Frontend](https://github.com/grafana/grafana/tree/master/style_guides).
+- [ ] The pull request works the way it says it should do.
+- [ ] The pull request closes one issue if possible and does not fix unrelated issues within the same pull request.
+- [ ] The pull request contains necessary tests.
 
-### Answering questions
+### Low-level checks
 
-If you have a question and you can't find the answer in the [documentation](https://grafana.com/docs/), the next step is to ask it on the [community site](https://community.grafana.com/).
+- [ ] The pull request contains a title that explains it. It follows [PR and commit messages guidelines](#Pull-Requests-titles-and-message).
+- [ ] The pull request contains necessary links to issues.
+- [ ] The pull request contains commits with messages that are small and understandable. It follows [PR and commit messages guidelines](#Pull-Requests-titles-and-message).
+- [ ] The pull request does not contain magic strings or numbers that could be replaced with an `Enum` or `const` instead.
 
-It's important to us to help these users, and we'd love your help. Sign up to our [community site](https://community.grafana.com/), and start helping other Grafana users by answering their questions.
+#### Bug-specific checks
 
-### Your first contribution
+- [ ] The pull request contains `Closes: #Issue` or `Fixes: #Issue` in pull request description.
+- [ ] The Pull Request adds tests that replicate the fixed bug and helps avoid regressions.
 
-Unsure where to begin contributing to Grafana? Start by browsing issues labeled `beginner friendly` or `help wanted`.
+### Frontend-specific checks
 
-- [Beginner-friendly](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) issues are generally straightforward to complete.
-- [Help wanted](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) issues are problems we would like the community to help us with regardless of complexity.
+- [ ] The pull request does not increase the Angular code base.
+  > We are in the process of migrating to React so any increment of Angular code is generally discouraged.
+- [ ] The pull request does not contain uses of `any` or `{}` without comments describing why.
+- [ ] The pull request does not contain large React components that could easily be split into several smaller components.
+- [ ] The pull request does not contain back end calls directly from components, use actions and Redux instead.
+- [ ] The pull request follows our [styling with Emotion convention](./style_guides/styling.md)
+  > We still use a lot of SASS, but any new CSS work should be using or migrating existing code to Emotion
 
-If you're looking to make a code change, see how to set up your environment for [local development](contribute/developer-guide.md).
+#### Redux specific checks (skip if your pull request does not contain Redux changes)
 
-When you're ready to contribute, it's time to [Create a pull request](/contribute/create-pull-request.md).
+- [ ] The pull request does not contain code that mutates state in reducers or thunks.
+- [ ] The pull request uses helpers `actionCreatorFactory` and `reducerFactory` instead of traditional `switch statement` reducers in Redux. See [Redux framework](https://github.com/grafana/grafana/tree/master/style_guides/redux.md) for more details.
+- [ ] The pull request uses `reducerTester` to test reducers. See [Redux framework](https://github.com/grafana/grafana/tree/master/style_guides/redux.md) for more details.
+- [ ] The pull request does not contain code that accesses the reducers state slice directly, instead, the code uses state selectors to access state.
 
-#### Contributor License Agreement (CLA)
+### Pull request titles and message
 
-Before we can accept your pull request, you need to [sign our CLA](https://grafana.com/docs/contribute/cla/). If you haven't, our CLA assistant prompts you to when you create your pull request.
+Pull request titles should follow this format: `Area: Name of the change`.
+Titles are used to generate the changelog so they should be as descriptive as possible in one line.
 
-## Where do I go from here?
+Good examples:
 
-- Set up your [development environment](contribute/developer-guide.md).
-- Learn how to [contribute documentation](contribute/documentation.md).
-- Get started [developing plugins](https://grafana.com/docs/plugins/developing/development/) for Grafana.
+- `Explore: Adds Live option for supported datasources`
+- `GraphPanel: Don't sort series when legend table & sort column is not visible`
+- `Build: Support publishing MSI to grafana.com`
+
+The message in the Pull requests should contain a reference so the issue if there is one. Ex `Closes #<issue number>`, `Fixes #<issue number>`, or `Ref #<issue number>` if the change is related to an issue but does not close it. Make sure to explain what problem the pull request is solving and why its implemented this way. As a new contributor its often better to overcommunicate to avoid back and forth communication, as it consumes time and energy.
+
+### GIT commit formating.
+
+Grafana Squash Pull requests when merging them into master. This means the maintainer will be responsible for the title in the git commit message.
+The commit message of the commits in the Pull Request can still be part of the git commit body. So it's always encouraged to write informative commit messages.
+
+The Git commit title should be short, descriptive and include the Pull Request ID.
+
+Good examples:
+
+- `Explore: Live supprt in datasources (#12345)`
+- `GraphPanel: Fix legend sorting issues (#12345)`
+- `Build: Support publishing MSI to grafana.com (#12345)`
+
+Its also good practice to include a reference to the issue in the git commit body when possible.

Dockerfile

@@ -1,5 +1,5 @@
 # Golang build container
-FROM golang:1.13.4-alpine
+FROM golang:1.12.10-alpine
 
 RUN apk add --no-cache gcc g++
 
@@ -11,12 +11,13 @@ COPY vendor vendor
 RUN go mod verify
 
 COPY pkg pkg
-COPY build.go package.json ./
+COPY build.go build.go
+COPY package.json package.json
 
 RUN go run build.go build
 
 # Node build container
-FROM node:12.13.0-alpine
+FROM node:10.14.2-alpine
 
 # PhantomJS
 RUN apk add --no-cache curl &&\
@@ -51,7 +52,7 @@ LABEL maintainer="Grafana team <hello@grafana.com>"
 ARG GF_UID="472"
 ARG GF_GID="472"
 
-ENV PATH="/usr/share/grafana/bin:$PATH" \
+ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
     GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
     GF_PATHS_DATA="/var/lib/grafana" \
     GF_PATHS_HOME="/usr/share/grafana" \
@@ -61,7 +62,7 @@ ENV PATH="/usr/share/grafana/bin:$PATH" \
 
 WORKDIR $GF_PATHS_HOME
 
-RUN apk add --no-cache ca-certificates bash tzdata && \
+RUN apk add --no-cache ca-certificates bash && \
     apk add --no-cache --upgrade --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main openssl musl-utils
 
 COPY conf ./conf

Dockerfile.ubuntu

@@ -1,85 +0,0 @@
-FROM golang:1.13.4 AS go-builder
-
-WORKDIR /src/grafana
-
-COPY go.mod go.sum ./
-COPY vendor vendor/
-
-RUN go mod verify
-
-COPY build.go package.json ./
-COPY pkg pkg/
-
-RUN go run build.go build
-
-FROM node:12.13 AS js-builder
-
-# PhantomJS
-RUN apt-get update && apt-get install -y curl &&\
-    curl -L https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 | tar xj &&\
-    cp phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs
-
-WORKDIR /usr/src/app/
-
-COPY package.json yarn.lock ./
-COPY packages packages
-
-RUN yarn install --pure-lockfile
-
-COPY Gruntfile.js tsconfig.json tslint.json .browserslistrc ./
-COPY public public 
-COPY scripts scripts
-COPY emails emails
-
-ENV NODE_ENV production
-RUN ./node_modules/.bin/grunt build
-
-FROM ubuntu:18.10
-
-LABEL maintainer="Grafana team <hello@grafana.com>"
-EXPOSE 3000
-
-ARG GF_UID="472"
-ARG GF_GID="472"
-
-ENV PATH="/usr/share/grafana/bin:$PATH" \
-    GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
-    GF_PATHS_DATA="/var/lib/grafana" \
-    GF_PATHS_HOME="/usr/share/grafana" \
-    GF_PATHS_LOGS="/var/log/grafana" \
-    GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
-    GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
-
-WORKDIR $GF_PATHS_HOME
-
-COPY conf conf
-
-# We need font libs for phantomjs, and curl should be part of the image
-RUN apt-get update && apt-get upgrade -y && apt-get install -y ca-certificates libfontconfig1 curl
-
-RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
-  addgroup --system --gid $GF_GID grafana && \
-  adduser --uid $GF_UID --system --ingroup grafana grafana && \
-  mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
-             "$GF_PATHS_PROVISIONING/dashboards" \
-             "$GF_PATHS_PROVISIONING/notifiers" \
-             "$GF_PATHS_LOGS" \
-             "$GF_PATHS_PLUGINS" \
-             "$GF_PATHS_DATA" && \
-    cp conf/sample.ini "$GF_PATHS_CONFIG" && \
-    cp conf/ldap.toml /etc/grafana/ldap.toml && \
-    chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
-    chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
-
-# PhantomJS
-COPY --from=js-builder /usr/local/bin/phantomjs /usr/local/bin/
-
-COPY --from=go-builder /src/grafana/bin/linux-amd64/grafana-server /src/grafana/bin/linux-amd64/grafana-cli bin/
-COPY --from=js-builder /usr/src/app/public public
-COPY --from=js-builder /usr/src/app/tools tools
-
-COPY tools/phantomjs/render.js tools/phantomjs/
-COPY packaging/docker/run.sh /
-
-USER grafana
-ENTRYPOINT [ "/run.sh" ]

Gruntfile.js

@@ -10,7 +10,6 @@ module.exports = function (grunt) {
     tempDir: 'tmp',
     platform: process.platform.replace('win32', 'windows'),
     enterprise: false,
-    libc: null,
   };
 
   if (grunt.option('platform')) {
@@ -31,10 +30,6 @@ module.exports = function (grunt) {
     }
   }
 
-  if (grunt.option('libc')) {
-    config.libc = grunt.option('libc');
-  }
-
   config.phjs = grunt.option('phjsToRelease');
   config.pkg.version = grunt.option('pkgVer') || config.pkg.version;
 
@@ -47,7 +42,7 @@ module.exports = function (grunt) {
   grunt.loadTasks('./scripts/grunt');
 
   // Utility function to load plugin settings into config
-  function loadConfig(config, path) {
+  function loadConfig(config,path) {
     require('glob').sync('*', {cwd: path}).forEach(function(option) {
       var key = option.replace(/\.js$/,'');
       // If key already exists, extend it. It is your responsibility to avoid naming collisions

ISSUE_TRIAGE.md

@@ -1,22 +1,17 @@
-# Triage issues
+Triaging of issues
+------------------
 
-The main goal of issue triage is to categorize all incoming Grafana issues and make sure each issue has all basic information needed for anyone else to understand and be able to start working on it.
+Grafana being a popular open source project there are a lot of incoming issues. The main goal of issue triage is to categorize all incoming issues and make sure it has all basic information needed for anyone else to understand and/or being able to start working with it.
 
-**Note:** This information is for Grafana project Maintainers, Owners, and Admins. If you are a Contributor, then you will not be able to perform most of the tasks in this topic.
+The core maintainers of the Grafana project is responsible for categorizing all incoming issues and delegate any critical and/or important issue to other maintainers. Currently there's one maintainer each week responsible. Besides that part, triage provides an important way to contribute to an open source project. Triage helps ensure issues resolve quickly by:
 
-The core maintainers of the Grafana project are responsible for categorizing all incoming issues and delegating any critical or important issue to other maintainers. Currently one maintainer each week is responsible. Besides that part, triage provides an important way to contribute to an open source project. 
-
-Triage helps ensure issues resolve quickly by:
-
-* Ensuring the issue's intent and purpose is conveyed precisely. This is necessary because it can be difficult for an issue to explain how an end user experiences a problem and what actions they took.
+* Describing the issue's intent and purpose is conveyed precisely. This is necessary because it can be difficult for an issue to explain how an end user experiences a problem and what actions they took.
 * Giving a contributor the information they need before they commit to resolving an issue.
 * Lowering the issue count by preventing duplicate issues.
 * Streamlining the development process by preventing duplicate discussions.
+* If you don't have the knowledge or time to code, consider helping with triage. The community will thank you for saving them time by spending some of yours.
 
-If you don't have the knowledge or time to code, consider helping with triage. The community will thank you for saving them time by spending some of yours.
-
-## Simplified flowchart diagram of the issue triage process
-
+**Simplified flowchart diagram of the issue triage process:**
 <!-- https://textik.com/#610afa78553def29 -->
 ```
                         +--------------------------+
@@ -58,6 +53,66 @@ If you don't have the knowledge or time to code, consider helping with triage. T
                                                      +------------------+          +--------------+
 ```
 
+## How you can help
+
+There are multiple ways that you can help with the Grafana project, especially without writing a single line of code. Everyone in the Grafana community will be greatly thankful you for helping out with any of the below tasks.
+
+### Answer/ask questions
+
+The [community site](https://community.grafana.com/) is the main channel to be used for asking and answering questions related to the Grafana project. This may be the first place a new or existing Grafana user look/ask for help after they found that the [documentation](https://grafana.com/docs) wasn't answering their questions. It's very important to help new and existing users so that these new users can find proper answers and eventually help out other users and by that keep growing the Grafana community.
+
+Please signup to the Grafana [community site](https://community.grafana.com/) and start help other Grafana users by answering their questions and/or ask for help.
+
+### Report documentation enhancements
+
+If you visit the [documentation site](https://grafana.com/docs) and find typos/error/lack of information please report these by clicking on the `Request doc changes` link found on every page and/or contribute the changes yourself by clicking on `Edit this page` and open a pull request. Everyone in the community will greatly thank you for.
+
+Please read about how documentation issues is triaged [below](#documentation-issue) to understand what kind of documentation may be suitable to request/add.
+
+### Report a security vulnerability
+
+Please review the [security policy](https://github.com/grafana/grafana/security/policy) for more details.
+
+### Report bugs
+
+Report a bug you found when using Grafana by [opening a new bug report](https://github.com/grafana/grafana/issues/new?labels=type%3A+bug&template=1-bug_report.md).
+
+### Request enhancements/new features
+
+Suggest an enhancement or new feature for the Grafana project by [opening a new enhancement issue](https://github.com/grafana/grafana/issues/new?labels=type%3A+feature+request&template=2-feature_request.md).
+
+Alternatively, help make Grafana be better at being accessible to all by [opening a new accessibility issue](https://github.com/grafana/grafana/issues/new?labels=type%3A+accessibility&template=3-accessibility.md).
+
+### Report inaccurate issue information
+
+If you find an issue that have a badly formatted title and/or description, bad language/grammar and/or wrong labels it's important to let the issue author or maintainers know so it can be fixed. See [good practices](#good-practices) regarding basic information for issues below.
+
+### Request closing of issues
+
+The Grafana project have a lot of open issues and the main goal is to only have issues open if their still relevant. If you find an issue that you think already have been resolved or no longer is relevant please report by adding a comment and explain why you think it should be closed including related issues (`#<issue number>`), if applicable, and optionally mention one of the maintainers.
+
+### Investigate issues
+
+See [investigation of issues](#investigation-of-issues).
+
+### Vote on enhancements/bugs
+
+Helping the Grafana project to know which issues are most important by users and the community is crucial for the success of the project. Read more about [prioritizing issues](#4-prioritization-of-issues) for details about how issues are being prioritized. The Grafana project use GitGub issues and reactions for collecting votes on enhancement and bugs.
+
+**Please don't add `+1` issue comments or similar since that will notify everyone that have subscribed to an issue and it doesn't add any useful update, rather it creates a bad habit.**
+
+If you want to show your interest or importance of an issue, please use [GitHub's reactions](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments).
+
+### Report duplicates
+
+If you find two issues describing the same bug/enhancement/feature please add a comment in one of the issue and explain which issues (`#<issue number>`) you think is a duplicate of another issue (`#<issue number>`).
+
+### Suggest ideas for resolving bugs/enhancements
+
+Related to how [issues are being prioritized](#4-prioritization-of-issues) it's important to help anyone that's interested in contributing code for resolving a bug or enhancement. This can be anything from getting started and setup the development environment to reference code and files where changes probably needs to be made and/or suggest ideas on how enhancements may function/be implemented.
+
+Please read about how [help from the community](#5-requesting-help-from-the-community) may be requested when issues being triaged.
+
 ## 1. Find uncategorized issues
 
 To get started with issue triage and finding issues that haven't been triaged you have two alternatives.
@@ -135,7 +190,7 @@ If you receive a notification with additional information provided but you are n
 An issue can have multiple of the following labels. Typically, a properly categorized issue should at least have:
 
 - One label identifying its type (`type/*`).
-- One or multiple labels identifying the functional areas of interest or component (`area/*`) and/or data source (`datasource/*`), if applicable.
+- One or multiple labels identifying the functional areas of interest or component (`area/*`) and/or datasource (`datasource/*`), if applicable.
 
 Label | Description
 ------- | --------
@@ -148,7 +203,7 @@ Label | Description
 `type/works-as-intended` | A reported bug works as intended/by design.
 `type/build-packaging` | Build or packaging problem or enhancement.
 `area/*` | Subject is related to a functional area of interest or component.
-`datasource/*` | Subject is related to a core data source plugin.
+`datasource/*` | Subject is related to a core datasource plugin.
 
 ### Duplicate issue?
 
@@ -294,7 +349,7 @@ In many cases the issue author or community as a whole is more suitable to contr
 
 When an issue has all basic information provided, but the triage responsible haven't been able to reproduce the reported problem at a first glance, the issue is labeled [Needs investigation](https://github.com/grafana/grafana/labels/needs%20investigation). Depending of the perceived severity and/or number of [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments), the investigation will either be delegated to another maintainer for further investigation or either put on hold until someone else (maintainer or contributor) picks it up and eventually start investigating it.
 
-Investigating issues can be a very time consuming task, especially for the maintainers given the huge number of combinations of plugins, data sources, platforms, databases, browsers, tools, hardware, integrations, versions and cloud services etc that are being used with Grafana. There are a certain amount of combinations that are more common than others and these are in general easier for maintainers to investigate.
+Investigating issues can be a very time consuming task, especially for the maintainers given the huge number of combinations of plugins, datasources, platforms, databases, browsers, tools, hardware, integrations, versions and cloud services etc that are being used with Grafana. There are a certain amount of combinations that are more common than others and these are in general easier for maintainers to investigate.
 
 For some other combinations there may not be possible at all for a maintainer to setup a proper test environment for being able to investigate. In these cases we really appreciate any help we can get from the community. Otherwise the issue is highly likely to be closed.
 

Makefile

@@ -1,10 +1,6 @@
-## This is a self-documented Makefile. For usage information, run `make help`:
-##
-## For more information, refer to https://suva.sh/posts/well-documented-makefiles/
-
 -include local/Makefile
 
-.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go gosec revive golangci-lint go-vet test-go test-js test run run-frontend clean devenv devenv-down revive-alerting help
+.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go gosec revive golangci-lint go-vet test-go test-js test run clean devenv devenv-down revive-alerting
 
 GO = GO111MODULE=on go
 GO_FILES ?= ./pkg/...
@@ -12,66 +8,76 @@ SH_FILES ?= $(shell find ./scripts -name *.sh)
 
 all: deps build
 
-##@ Dependencies
-
-deps-go: ## Install backend dependencies.
+deps-go:
 	$(GO) run build.go setup
 
-deps-js: node_modules ## Install frontend dependencies.
+deps-js: node_modules
 
-deps: deps-js ## Install all dependencies.
+deps: deps-js
 
-node_modules: package.json yarn.lock ## Install node modules.
-	@echo "install frontend dependencies"
-	yarn install --pure-lockfile --no-progress
-
-##@ Building
-
-build-go: ## Build all Go binaries.
+build-go:
 	@echo "build go files"
 	$(GO) run build.go build
 
-build-server: ## Build Grafana server.
+build-server:
 	@echo "build server"
 	$(GO) run build.go build-server
 
-build-cli: ## Build Grafana CLI application.
+build-cli:
 	@echo "build in CI environment"
 	$(GO) run build.go build-cli
 
-build-js: ## Build frontend assets.
+build-js:
 	@echo "build frontend"
 	yarn run build
 
-build: build-go build-js ## Build backend and frontend.
+build: build-go build-js
+
+build-docker-dev:
+	@echo "build development container"
+	@echo "\033[92mInfo:\033[0m the frontend code is expected to be built already."
+	$(GO) run build.go -goos linux -pkg-arch amd64 ${OPT} build pkg-archive latest
+	cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
+	cd packaging/docker && docker build --tag grafana/grafana:dev .
+
+build-docker-full:
+	@echo "build docker container"
+	docker build --tag grafana/grafana:dev .
+
+test-go:
+	@echo "test backend"
+	$(GO) test -v ./pkg/...
+
+test-js:
+	@echo "test frontend"
+	yarn test
+
+test: test-go test-js
+
+clean:
+	@echo "cleaning"
+	rm -rf node_modules
+	rm -rf public/build
+
+node_modules: package.json yarn.lock
+	@echo "install frontend dependencies"
+	yarn install --pure-lockfile --no-progress
+
+scripts/go/bin/revive: scripts/go/go.mod
+	@cd scripts/go; \
+	$(GO) build -o ./bin/revive github.com/mgechev/revive
+
+scripts/go/bin/gosec: scripts/go/go.mod
+	@cd scripts/go; \
+	$(GO) build -o ./bin/gosec github.com/securego/gosec/cmd/gosec
 
 scripts/go/bin/bra: scripts/go/go.mod
 	@cd scripts/go; \
 	$(GO) build -o ./bin/bra github.com/unknwon/bra
 
-run: scripts/go/bin/bra ## Build and run web server on filesystem changes.
-	@GO111MODULE=on scripts/go/bin/bra run
-
-run-frontend: deps-js ## Fetch js dependencies and watch frontend for rebuild
-	yarn start
-
-##@ Testing
-
-test-go: ## Run tests for backend.
-	@echo "test backend"
-	$(GO) test -v ./pkg/...
-
-test-js: ## Run tests for frontend.
-	@echo "test frontend"
-	yarn test
-
-test: test-go test-js ## Run all tests.
-
-##@ Linting
-
-scripts/go/bin/revive: scripts/go/go.mod
+scripts/go/bin/golangci-lint: scripts/go/go.mod
 	@cd scripts/go; \
-	$(GO) build -o ./bin/revive github.com/mgechev/revive
+	$(GO) build -o ./bin/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
 
 revive: scripts/go/bin/revive
 	@echo "lint via revive"
@@ -86,9 +92,13 @@ revive-alerting: scripts/go/bin/revive
 		-formatter stylish \
 		./pkg/services/alerting/...
 
-scripts/go/bin/golangci-lint: scripts/go/go.mod
-	@cd scripts/go; \
-	$(GO) build -o ./bin/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
+# TODO recheck the rules and leave only necessary exclusions
+gosec: scripts/go/bin/gosec
+	@echo "lint via gosec"
+	@scripts/go/bin/gosec -quiet \
+		-exclude=G104,G107,G201,G202,G204,G301,G304,G401,G402,G501 \
+		-conf=./scripts/go/configs/gosec.json \
+		$(GO_FILES)
 
 golangci-lint: scripts/go/bin/golangci-lint
 	@echo "lint via golangci-lint"
@@ -96,43 +106,19 @@ golangci-lint: scripts/go/bin/golangci-lint
 		--config ./scripts/go/configs/.golangci.yml \
 		$(GO_FILES)
 
-scripts/go/bin/gosec: scripts/go/go.mod
-	@cd scripts/go; \
-	$(GO) build -o ./bin/gosec github.com/securego/gosec/cmd/gosec
-
-# TODO recheck the rules and leave only necessary exclusions
-gosec: scripts/go/bin/gosec
-	@echo "lint via gosec"
-	@scripts/go/bin/gosec -quiet \
-		-exclude=G104,G107,G108,G201,G202,G204,G301,G304,G401,G402,G501 \
-		-conf=./scripts/go/configs/gosec.json \
-		$(GO_FILES)
-
 go-vet:
 	@echo "lint via go vet"
 	@$(GO) vet $(GO_FILES)
 
-lint-go: go-vet golangci-lint revive revive-alerting gosec ## Run all code checks for backend.
+lint-go: go-vet golangci-lint revive revive-alerting gosec
 
 # with disabled SC1071 we are ignored some TCL,Expect `/usr/bin/env expect` scripts
-shellcheck: $(SH_FILES) ## Run checks for shell scripts.
+shellcheck: $(SH_FILES)
 	@docker run --rm -v "$$PWD:/mnt" koalaman/shellcheck:stable \
-	$(SH_FILES) -e SC1071 -e SC2162
+	$(SH_FILES) -e SC1071
 
-##@ Docker
-
-build-docker-dev: ## Build Docker image for development (fast).
-	@echo "build development container"
-	@echo "\033[92mInfo:\033[0m the frontend code is expected to be built already."
-	$(GO) run build.go -goos linux -pkg-arch amd64 ${OPT} build pkg-archive latest
-	cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
-	cd packaging/docker && docker build --tag grafana/grafana:dev .
-
-build-docker-full: ## Build Docker image for development.
-	@echo "build docker container"
-	docker build --tag grafana/grafana:dev .
-
-##@ Services
+run: scripts/go/bin/bra
+	@scripts/go/bin/bra run
 
 # create docker-compose file with provided sources and start them
 # example: make devenv sources=postgres,openldap
@@ -140,7 +126,7 @@ ifeq ($(sources),)
 devenv:
 	@printf 'You have to define sources for this command \nexample: make devenv sources=postgres,openldap\n'
 else
-devenv: devenv-down ## Start optional services, e.g. postgres, prometheus, and elasticsearch.
+devenv: devenv-down
 	$(eval targets := $(shell echo '$(sources)' | tr "," " "))
 
 	@cd devenv; \
@@ -151,17 +137,8 @@ devenv: devenv-down ## Start optional services, e.g. postgres, prometheus, and e
 	docker-compose up -d --build
 endif
 
-devenv-down: ## Stop optional services.
+# drop down the envs
+devenv-down:
 	@cd devenv; \
 	test -f docker-compose.yaml && \
 	docker-compose down || exit 0;
-
-##@ Helpers
-
-clean: ## Clean up intermediate build artifacts.
-	@echo "cleaning"
-	rm -rf node_modules
-	rm -rf public/build
-
-help: ## Display this help.
-	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)

PLUGIN_DEV.md

@@ -1,19 +1,20 @@
-# Plugin development 
+# Plugin Development 
 
 This document is not meant as a complete guide for developing plugins but more as a changelog for changes in
 Grafana that can impact plugin development. Whenever you as a plugin author encounter an issue with your plugin after
 upgrading Grafana please check here before creating an issue. 
 
-## Plugin development resources
+## Links
 
-- [Grafana plugin developer guide](http://docs.grafana.org/plugins/developing/development/)
-- [Webpack Grafana plugin template project](https://github.com/CorpGlory/grafana-plugin-template-webpack)
+- [Datasource plugin written in TypeScript](https://github.com/grafana/typescript-template-datasource)
 - [Simple JSON datasource plugin](https://github.com/grafana/simple-json-datasource)
+- [Plugin development guide](http://docs.grafana.org/plugins/developing/development/)
+- [Webpack Grafana plugin template project](https://github.com/CorpGlory/grafana-plugin-template-webpack)
 
-## Changes in Grafana v4.6
+## Changes in v4.6
 
 This version of Grafana has big changes that will impact a limited set of plugins. We moved from systemjs to webpack
-for built-in plugins and everything internal. External plugins still use systemjs but now with a limited 
+for built-in plugins & everything internal. External plugins still use systemjs but now with a limited 
 set of Grafana components they can import. Plugins can depend on libs like lodash & moment and internal components 
 like before using the same import paths. However since everything in Grafana is no longer accessible, a few plugins could encounter issues when importing a Grafana dependency. 
 
@@ -24,10 +25,10 @@ If you think we missed exposing a crucial lib or Grafana component let us know b
 ### Deprecated components 
 
 The angular directive `<spectrum-picker>` is now deprecated (will still work for a version more) but we recommend plugin authors
-upgrade to new `<color-picker color="ctrl.color" onChange="ctrl.onSparklineColorChange"></color-picker>`
+to upgrade to new `<color-picker color="ctrl.color" onChange="ctrl.onSparklineColorChange"></color-picker>`
 
-## Changes in Grafana v6.0
+## Changes in v6.0
 
 ### DashboardSrv.ts
 
-If you utilize [DashboardSrv](https://github.com/grafana/grafana/commit/8574dca081002f36e482b572517d8f05fd44453f#diff-1ab99561f9f6a10e1fafcddc39bc1d65) in your plugin code, `dash` was renamed to `dashboard`.
+If you utilize [DashboardSrv](https://github.com/grafana/grafana/commit/8574dca081002f36e482b572517d8f05fd44453f#diff-1ab99561f9f6a10e1fafcddc39bc1d65) in your plugin code, `dash` was renamed to `dashboard` 

README.md

@@ -1,46 +1,223 @@
-![Grafana](docs/logo-horizontal.png)
+# [Grafana](https://grafana.com) [![Circle CI](https://circleci.com/gh/grafana/grafana.svg?style=svg)](https://circleci.com/gh/grafana/grafana) [![Go Report Card](https://goreportcard.com/badge/github.com/grafana/grafana)](https://goreportcard.com/report/github.com/grafana/grafana) 
 
-The open-source platform for monitoring and observability.
+[Website](https://grafana.com) |
+[Twitter](https://twitter.com/grafana) |
+[Community & Forum](https://community.grafana.com)
 
-[![License](https://img.shields.io/github/license/grafana/grafana)](LICENSE)
-[![Circle CI](https://img.shields.io/circleci/build/gh/grafana/grafana)](https://circleci.com/gh/grafana/grafana)
-[![Go Report Card](https://goreportcard.com/badge/github.com/grafana/grafana)](https://goreportcard.com/report/github.com/grafana/grafana)
+Grafana is an open source, feature rich metrics dashboard and graph editor for
+Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB.
 
-Grafana allows you to query, visualize, alert on and understand your metrics no matter where they are stored. Create, explore, and share dashboards with your team and foster a data driven culture:
+<!---
+![](http://docs.grafana.org/assets/img/features/dashboard_ex1.png)
+-->
 
-- **Visualize:** Fast and flexible client side graphs with a multitude of options. Panel plugins for many different way to visualize metrics and logs.
-- **Dynamic Dashboards:** Create dynamic & reusable dashboards with template variables that appear as dropdowns at the top of the dashboard.
-- **Explore Metrics:** Explore your data through ad-hoc queries and dynamic drilldown. Split view and compare different time ranges, queries and data sources side by side.
-- **Explore Logs:** Experience the magic of switching from metrics to logs with preserved label filters. Quickly search through all your logs or streaming them live.
-- **Alerting:** Visually define alert rules for your most important metrics. Grafana will continuously evaluate and send notifications to systems like Slack, PagerDuty, VictorOps, OpsGenie.
-- **Mixed Data Sources:** Mix different data sources in the same graph! You can specify a data source on a per-query basis. This works for even custom datasources.
+## Installation
 
-## Get started
+Head to [docs.grafana.org](http://docs.grafana.org/installation/) for documentation or [download](https://grafana.com/get) to get the latest release.
 
-- [Get Grafana](https://grafana.com/get)
-- [Installation guides](http://docs.grafana.org/installation/)
+## Documentation & Support
 
-Unsure if Grafana is for you? Watch Grafana in action on [play.grafana.org](https://play.grafana.org/)!
+Be sure to read the [getting started guide](http://docs.grafana.org/guides/gettingstarted/) and the other feature guides.
 
-## Documentation
+## Run from master
 
-The Grafana documentation is available at [grafana.com/docs](https://grafana.com/docs/).
+If you want to build a package yourself, or contribute - here is a guide for how to do that. You can always find
+the latest master builds [here](https://grafana.com/grafana/download).
 
-## Contributing
+### Dependencies
 
-If you're interested in contributing to the Grafana project:
+- Go (Latest Stable)
+- Node.js LTS
+  - yarn [`npm install -g yarn`]
 
-- Start by reading the [Contributing guide](/CONTRIBUTING.md).
-- Learn how to set up your local environment, in our [Developer guide](/contribute/developer-guide.md).
-- Explore our [beginner-friendly issues](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22).
+### Get the project
 
-## Get involved
+**The project located in the go-path will be your working directory.**
 
-- Follow [@grafana on Twitter](https://twitter.com/grafana/)
-- Read and subscribe to the [Grafana blog](https://grafana.com/blog/)
-- If you have a specific question, check out our [discussion forums](https://community.grafana.com/).
-- For general discussions, join us on the [official Slack](http://slack.raintank.io/) team.
+```bash
+go get github.com/grafana/grafana
+cd $GOPATH/src/github.com/grafana/grafana
+```
+
+### Run and rebuild on source change
+
+#### Backend
+
+To run the backend and rebuild on source change:
+
+```bash
+make run
+```
+
+#### Frontend
+Install front-end dependencies first:
+
+```bash
+yarn install --pure-lockfile
+```
+
+Rebuild on file change, and serve them by Grafana's webserver (http://localhost:3000):
+
+```bash
+yarn start
+```
+
+Build the assets, rebuild on file change with Hot Module Replacement (HMR), and serve them by webpack-dev-server (http://localhost:3333):
+
+```bash
+yarn start:hot
+# OR set a theme
+env GRAFANA_THEME=light yarn start:hot
+```
+
+_Note: HMR for Angular is not supported. If you edit files in the Angular part of the app, the whole page will reload._
+
+Run tests and rebuild on source change:
+
+```bash
+yarn jest
+```
+
+**Open grafana in your browser (default: e.g. `http://localhost:3000`) and login with admin user (default: `user/pass = admin/admin`).**
+
+### Building
+
+#### The backend
+
+```bash
+go run build.go setup
+go run build.go build
+```
+
+#### Frontend assets
+
+_For this you need Node.js (LTS version)._
+
+```bash
+yarn install --pure-lockfile
+```
+
+### Building a Docker image
+
+There are two different ways to build a Grafana docker image. If your machine is setup for Grafana development and you run linux/amd64 you can build just the image. Otherwise, there is the option to build Grafana completely within Docker.
+
+Run the image you have built using: `docker run --rm -p 3000:3000 grafana/grafana:dev`
+
+#### Building on linux/amd64 (fast)
+
+1. Build the frontend `go run build.go build-frontend`.
+2. Build the docker image `make build-docker-dev`.
+
+The resulting image will be tagged as `grafana/grafana:dev`.
+
+#### Building anywhere (slower)
+
+Choose this option to build on platforms other than linux/amd64 and/or not have to setup the Grafana development environment.
+
+1. `make build-docker-full` or `docker build -t grafana/grafana:dev`.
+
+The resulting image will be tagged as `grafana/grafana:dev`.
+
+Notice: If you are using Docker for MacOS, be sure to set the memory limit to be larger than 2 GiB (at docker -> Preferences -> Advanced), otherwise `grunt build` may fail.
+
+## Development
+
+### Dev config
+
+Create a custom.ini in the conf directory to override default configuration options.
+You only need to add the options you want to override. Config files are applied in the order of:
+
+1. grafana.ini
+1. custom.ini
+
+In your custom.ini uncomment (remove the leading `;`) sign. And set `app_mode = development`.
+
+### Running tests
+
+#### Frontend
+
+Execute all frontend tests:
+
+```bash
+yarn test
+```
+
+Write and watch frontend tests:
+
+- Start watcher: `yarn jest`.
+- Jest runs all test files that end with the name ".test.ts".
+
+#### Backend
+
+```bash
+# Run Golang tests using sqlite3 as database (default)
+go test ./pkg/...
+```
+
+##### Running the MySQL or Postgres backend tests:
+
+Run these by setting `GRAFANA_TEST_DB` in your environment.
+
+- `GRAFANA_TEST_DB=mysql` to test MySQL
+- `GRAFANA_TEST_DB=postgres` to test Postgres
+
+Follow the instructions in `./devenv` to spin up test containers running the appropriate databases with `docker-compose`
+- Use `docker/blocks/mysql_tests` or `docker/blocks/postgres_tests` as appropriate.
+
+```bash
+# MySQL
+# Tests can only be ran in one Go package at a time due to clashing db queries. To run MySQL tests for the "pkg/services/sqlstore" package, run:
+GRAFANA_TEST_DB=mysql go test ./pkg/services/sqlstore/...
+
+# Or run all the packages using the circle CI scripts. This method will be slower as the scripts will run all the tests, including the integration tests.
+./scripts/circle-test-mysql.sh
+```
+
+```bash
+# Postgres
+# Tests can only be ran in one Go package at a time due to clashing db queries. To run Postgres tests for the "pkg/services/sqlstore" package, run:
+GRAFANA_TEST_DB=postgres go test ./pkg/services/sqlstore/...
+
+# Or run all the packages using the circle CI scripts. This method will be slower as the scripts will run all the tests, including the integration tests.
+./scripts/circle-test-postgres.sh
+```
+
+#### End-to-end
+
+Execute all end-to-end tests:
+
+```bash
+yarn e2e-tests
+```
+
+Execute all end-to-end tests using using a specific url:
+
+```bash
+ENV BASE_URL=http://localhost:3333 yarn e2e-tests
+```
+
+Debugging all end-to-end tests (BROWSER=1 starts the browser and SLOWMO=1 delays each puppeteer operation by 100ms):
+
+```bash
+ENV BROWSER=1 SLOWMO=1 yarn e2e-tests
+```
+
+### Datasource and dashboard provisioning
+
+[Here](https://github.com/grafana/grafana/tree/master/devenv) you can find helpful scripts and docker-compose setup
+that will populate your dev environment for quicker testing and experimenting.
+
+## Contribute
+
+If you have any ideas for improvement or have found a bug, do not hesitate to open an issue.
+And if you have time, clone this repo and submit a pull request to help me make Grafana the kickass metrics and devops dashboard we all dream about!
+
+Read the [contributing](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md) guide then check the [`beginner friendly`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) label to find issues that are easy and that we would like help with.
+
+## Plugin development
+
+Checkout the [Plugin Development Guide](http://docs.grafana.org/plugins/developing/development/) and checkout the [PLUGIN_DEV.md](https://github.com/grafana/grafana/blob/master/PLUGIN_DEV.md) file for changes in Grafana that relate to plugin development.
 
 ## License
 
-Grafana is distributed under the [Apache 2.0 License](https://github.com/grafana/grafana/blob/master/LICENSE).
+Grafana is distributed under [Apache 2.0 License](https://github.com/grafana/grafana/blob/master/LICENSE).

ROADMAP.md

@@ -1,5 +1,4 @@
-# Roadmap
-
-The roadmap is a tentative plan for the core development team. Things change constantly as pull requests come in and priorities change, but it will give you an idea of our current vision and plan. 
+This roadmap is a tentative plan for the core development team. Things change constantly as PRs come in and priorities change. 
+But it will give you an idea of our current vision and plan. 
   
-To view the Roadmap, go to the Issues tab on GitHub. There you will find three roadmap issues pinned at the top.
+Go to the Issues tab on GitHub. There you will find, at the top, 3 pinned roadmap issues.

SECURITY.md

@@ -1,8 +1,7 @@
-# Reporting security issues
+Reporting Security Issues
+------------------
 
-If you think you have found a security vulnerability, please send a report to [security@grafana.com](mailto:security@grafana.com). This address can be used for all of Grafana Labs's open source and commercial products (including but not limited to Grafana, Grafana Cloud, Grafana Enterprise, and grafana.com). We can accept only vulnerability reports at this address. 
-
-Please encrypt your message to us; please use our PGP key. The key fingerprint is:
+If you think you have found a security vulnerability, please send a report to [security@grafana.com](mailto:security@grafana.com). This address can be used for all of Grafana Labs's open source and commercial products (including but not limited to Grafana, Grafana Cloud, Grafana Enterprise, and grafana.com). We can accept only vulnerability reports at this address. We would prefer that you encrypt your message to us; please use our PGP key. The key fingerprint is:
 
 F988 7BEA 027A 049F AE8E  5CAA D125 8932 BE24 C5CA
 
@@ -10,11 +9,9 @@ The key is available from [pgp.mit.edu](https://pgp.mit.edu/pks/lookup?op=get&se
 
 Grafana Labs will send you a response indicating the next steps in handling your report. After the initial reply to your report, the security team will keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.
 
-**Important:** We ask you to not disclose the vulnerability before it have been fixed and announced, unless you received a response from the Grafana Labs security team that you can do so.
+**Important:** We ask you to not disclose the vulnerability before it have been fixed and announced, unless you have got a response from the Grafana Labs security team that you can do that.
 
-## Security announcements
+### Security Announcements
 
 We maintain a category on the community site called [Security Announcements](https://community.grafana.com/c/security-announcements),
-where we will post a summary, remediation, and mitigation details for any patch containing security fixes. 
-
-You can also subscribe to email updates to this category if you have a grafana.com account and sign on to the community site or track updates via an [RSS feed](https://community.grafana.com/c/security-announcements.rss).
+where we will post a summary, remediation, and mitigation details for any patch containing security fixes. You can also subscribe to email updates to this category if you have a grafana.com account and sign on to the community site or track updates via an [RSS feed](https://community.grafana.com/c/security-announcements.rss).

SUPPORT.md

@@ -1,10 +1,9 @@
-# Get Grafana help
+Need help or support?
 ------------------
-First, check the official [Grafana documentation](https://grafana.com/docs/).
-
-If you require further help or support then ask a question in the [Grafana community site](https://community.grafana.com/) or [Grafana Slack](http://slack.raintank.io/). You can also search the community site for previously answered questions, in case someone already had your problem and got help.
 
  **Please note:**
-- The Grafana project uses GitHub mainly for tracking bugs and feature requests.
-- Do not open an issue just to ask a question. The issue will be closed immediately.
-- Only submit issues for bug reports, feature requests, or enhancements.
+- Only submit issues for bug reports, feature requests or enhancements.
+- Grafana project uses GitHub mainly for tracking bugs and feature requests.
+- Asking a question by opening an issue will directly result in issue being closed.
+
+If you require help or support then ask a question and/or find existing questions/answers in the [Grafana community site](https://community.grafana.com/).

UPGRADING_DEPENDENCIES.md

@@ -1,4 +1,4 @@
-# Guide to upgrading dependencies
+# Guide to Upgrading Dependencies
 
 Upgrading Go or Node.js requires making changes in many different files. See below for a list and explanation for each.
 
@@ -16,7 +16,7 @@ Upgrading Go or Node.js requires making changes in many different files. See bel
 - Appveyor
 - Dockerfile
 
-## Go dependencies
+## Go Dependencies
 
 The Grafana project uses [Go modules](https://golang.org/cmd/go/#hdr-Modules__module_versions__and_more) to manage dependencies on external packages. This requires a working Go environment with version 1.11 or greater installed.
 
@@ -46,7 +46,7 @@ GO111MODULE=on go mod vendor
 
 You have to commit the changes to `go.mod`, `go.sum` and the `vendor/` directory before submitting the pull request.
 
-## Node.js dependencies
+## Node.js Dependencies
 
 Updated using `yarn`.
 

build.go

@@ -33,7 +33,6 @@ var (
 	goos    string
 	gocc    string
 	cgo     bool
-	libc    string
 	pkgArch string
 	version string = "v1"
 	// deb & rpm does not support semver so have to handle their version a little differently
@@ -52,7 +51,6 @@ var (
 	skipRpmGen            bool     = false
 	skipDebGen            bool     = false
 	printGenVersion       bool     = false
-	modVendor             bool     = true
 )
 
 func main() {
@@ -66,12 +64,10 @@ func main() {
 	flag.StringVar(&goarch, "goarch", runtime.GOARCH, "GOARCH")
 	flag.StringVar(&goos, "goos", runtime.GOOS, "GOOS")
 	flag.StringVar(&gocc, "cc", "", "CC")
-	flag.StringVar(&libc, "libc", "", "LIBC")
 	flag.BoolVar(&cgo, "cgo-enabled", cgo, "Enable cgo")
 	flag.StringVar(&pkgArch, "pkg-arch", "", "PKG ARCH")
 	flag.StringVar(&phjsToRelease, "phjs", "", "PhantomJS binary")
 	flag.BoolVar(&race, "race", race, "Use race detector")
-	flag.BoolVar(&modVendor, "modVendor", modVendor, "Go modules use vendor folder")
 	flag.BoolVar(&includeBuildId, "includeBuildId", includeBuildId, "IncludeBuildId in package name")
 	flag.BoolVar(&enterprise, "enterprise", enterprise, "Build enterprise version of Grafana")
 	flag.StringVar(&buildIdRaw, "buildId", "0", "Build ID from CI system")
@@ -108,7 +104,7 @@ func main() {
 		case "setup":
 			setup()
 
-		case "build-srv", "build-server":
+		case "build-srv":
 			clean()
 			build("grafana-server", "./pkg/cmd/grafana-server", []string{})
 
@@ -116,6 +112,10 @@ func main() {
 			clean()
 			build("grafana-cli", "./pkg/cmd/grafana-cli", []string{})
 
+		case "build-server":
+			clean()
+			build("grafana-server", "./pkg/cmd/grafana-server", []string{})
+
 		case "build":
 			//clean()
 			for _, binary := range binaries {
@@ -174,15 +174,12 @@ func makeLatestDistCopies() {
 	}
 
 	latestMapping := map[string]string{
-		"_amd64.deb":               "dist/grafana_latest_amd64.deb",
-		".x86_64.rpm":              "dist/grafana-latest-1.x86_64.rpm",
-		".linux-amd64.tar.gz":      "dist/grafana-latest.linux-x64.tar.gz",
-		".linux-amd64-musl.tar.gz": "dist/grafana-latest.linux-x64-musl.tar.gz",
-		".linux-armv7.tar.gz":      "dist/grafana-latest.linux-armv7.tar.gz",
-		".linux-armv7-musl.tar.gz": "dist/grafana-latest.linux-armv7-musl.tar.gz",
-		".linux-armv6.tar.gz":      "dist/grafana-latest.linux-armv6.tar.gz",
-		".linux-arm64.tar.gz":      "dist/grafana-latest.linux-arm64.tar.gz",
-		".linux-arm64-musl.tar.gz": "dist/grafana-latest.linux-arm64-musl.tar.gz",
+		"_amd64.deb":          "dist/grafana_latest_amd64.deb",
+		".x86_64.rpm":         "dist/grafana-latest-1.x86_64.rpm",
+		".linux-amd64.tar.gz": "dist/grafana-latest.linux-x64.tar.gz",
+		".linux-armv7.tar.gz": "dist/grafana-latest.linux-armv7.tar.gz",
+		".linux-armv6.tar.gz": "dist/grafana-latest.linux-armv6.tar.gz",
+		".linux-arm64.tar.gz": "dist/grafana-latest.linux-arm64.tar.gz",
 	}
 
 	for _, file := range files {
@@ -456,9 +453,6 @@ func gruntBuildArg(task string) []string {
 	if pkgArch != "" {
 		args = append(args, fmt.Sprintf("--arch=%v", pkgArch))
 	}
-	if libc != "" {
-		args = append(args, fmt.Sprintf("--libc=%s", libc))
-	}
 	if phjsToRelease != "" {
 		args = append(args, fmt.Sprintf("--phjsToRelease=%v", phjsToRelease))
 	}
@@ -485,13 +479,9 @@ func test(pkg string) {
 }
 
 func build(binaryName, pkg string, tags []string) {
-	libcPart := ""
-	if libc != "" {
-		libcPart = fmt.Sprintf("-%s", libc)
-	}
-	binary := fmt.Sprintf("./bin/%s-%s%s/%s", goos, goarch, libcPart, binaryName)
+	binary := fmt.Sprintf("./bin/%s-%s/%s", goos, goarch, binaryName)
 	if isDev {
-		//don't include os/arch/libc in output path in dev environment
+		//don't include os and arch in output path in dev environment
 		binary = fmt.Sprintf("./bin/%s", binaryName)
 	}
 
@@ -509,9 +499,6 @@ func build(binaryName, pkg string, tags []string) {
 	if race {
 		args = append(args, "-race")
 	}
-	if modVendor {
-		args = append(args, "-mod=vendor")
-	}
 
 	args = append(args, "-o", binary)
 	args = append(args, pkg)
@@ -519,11 +506,7 @@ func build(binaryName, pkg string, tags []string) {
 	if !isDev {
 		setBuildEnv()
 		runPrint("go", "version")
-		libcPart := ""
-		if libc != "" {
-			libcPart = fmt.Sprintf("/%s", libc)
-		}
-		fmt.Printf("Targeting %s/%s%s\n", goos, goarch, libcPart)
+		fmt.Printf("Targeting %s/%s\n", goos, goarch)
 	}
 
 	runPrint("go", args...)
@@ -546,7 +529,7 @@ func ldflags() string {
 	b.WriteString(fmt.Sprintf(" -X main.buildstamp=%d", buildStamp()))
 	b.WriteString(fmt.Sprintf(" -X main.buildBranch=%s", getGitBranch()))
 	if v := os.Getenv("LDFLAGS"); v != "" {
-		b.WriteString(fmt.Sprintf(" -extldflags \"%s\"", v))
+		b.WriteString(fmt.Sprintf(" -extldflags=%s", v))
 	}
 	return b.String()
 }
@@ -638,7 +621,6 @@ func runError(cmd string, args ...string) ([]byte, error) {
 func runPrint(cmd string, args ...string) {
 	log.Println(cmd, strings.Join(args, " "))
 	ecmd := exec.Command(cmd, args...)
-	ecmd.Env = append(os.Environ(), "GO111MODULE=on")
 	ecmd.Stdout = os.Stdout
 	ecmd.Stderr = os.Stderr
 	err := ecmd.Run()

conf/defaults.ini

@@ -155,9 +155,6 @@ google_tag_manager_id =
 
 #################################### Security ############################
 [security]
-# disable creation of admin user on first start of grafana
-disable_initial_admin_creation = false
-
 # default admin user, created on startup
 admin_user = admin
 
@@ -179,7 +176,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", "none" and "disabled"
+# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict" and "none"
 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.
@@ -318,7 +315,6 @@ 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 =
 
@@ -332,7 +328,6 @@ 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 #########################
@@ -376,17 +371,16 @@ client_secret = some_secret
 scopes = user:email
 email_attribute_name = email:primary
 email_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
@@ -439,12 +433,9 @@ 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 =
 headers =
-enable_login_token = false
 
 #################################### Auth LDAP ###########################
 [auth.ldap]
@@ -593,8 +584,6 @@ 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]
@@ -619,7 +608,6 @@ basic_auth_password =
 address =
 prefix = prod.grafana.%(instance_name)s.
 
-#################################### Grafana.com integration  ##########################
 [grafana_net]
 url = https://grafana.com
 
@@ -650,13 +638,10 @@ 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 =
@@ -684,10 +669,8 @@ container_name =
 # does not require any configuration
 
 [rendering]
-# Options to configure a remote HTTP image rendering service, e.g. using https://github.com/grafana/grafana-image-renderer.
-# URL to a remote HTTP image renderer service, e.g. http://localhost:8081/render, will enable Grafana to render panels and dashboards to PNG-images using HTTP requests to an external service.
+# Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
 server_url =
-# If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
 callback_url =
 
 [panels]

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 = %(protocol)s://%(domain)s:%(http_port)s/
+;root_url = http://localhost:3000
 
 # 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,11 +87,6 @@
 # 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
 
@@ -156,9 +151,6 @@
 
 #################################### Security ####################################
 [security]
-# disable creation of admin user on first start of grafana
-;disable_initial_admin_creation = false
-
 # default admin user, created on startup
 ;admin_user = admin
 
@@ -180,7 +172,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", "none" and "disabled"
+# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict" and "none"
 ;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.
@@ -240,15 +232,9 @@
 # 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
@@ -293,9 +279,6 @@
 # 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
@@ -317,23 +300,9 @@
 ;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
@@ -345,16 +314,6 @@
 ;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 =
 
 #################################### Generic OAuth ##########################
 [auth.generic_oauth]
@@ -369,15 +328,17 @@
 ;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 =
 ;tls_skip_verify_insecure = false
 ;tls_client_cert =
 ;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.
@@ -419,9 +380,14 @@
 # Friendly name or name of the attribute within the SAML assertion to use as the user's email
 ;assertion_attribute_email = mail
 
-#################################### Basic Auth ##########################
-[auth.basic]
-;enabled = true
+#################################### 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 =
 
 #################################### Auth Proxy ##########################
 [auth.proxy]
@@ -429,11 +395,13 @@
 ;header_name = X-WEBAUTH-USER
 ;header_property = username
 ;auto_sign_up = true
-;sync_ttl = 60
+;ldap_sync_ttl = 60
 ;whitelist = 192.168.1.1, 192.168.2.1
 ;headers = Email:X-User-Email, Name:X-User-Name
-# 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]
@@ -451,7 +419,7 @@
 ;enabled = false
 ;host = localhost:25
 ;user =
-# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
+# If the password contains # or ; you have to wrap it with trippel quotes. Ex """#password;"""
 ;password =
 ;cert_file =
 ;key_file =
@@ -463,7 +431,6 @@
 
 [emails]
 ;welcome_email_on_sign_up = false
-;templates_pattern = emails/*.html
 
 #################################### Logging ##########################
 [log]
@@ -522,41 +489,6 @@
 # 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
@@ -584,9 +516,6 @@
 # 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
@@ -597,14 +526,11 @@
 [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
 
-#If both are set, basic auth will be required for the metrics endpoint.
-; basic_auth_username =
-; basic_auth_password =
+# Publish interval
+;interval_seconds  = 10
 
 # Send internal metrics to Graphite
 [metrics.graphite]
@@ -612,11 +538,6 @@
 ;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)
@@ -639,6 +560,11 @@
 # 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.
@@ -646,8 +572,6 @@
 ;provider =
 
 [external_image_storage.s3]
-;endpoint =
-;path_style_access =
 ;bucket =
 ;region =
 ;path =
@@ -674,12 +598,14 @@
 # does not require any configuration
 
 [rendering]
-# Options to configure a remote HTTP image rendering service, e.g. using https://github.com/grafana/grafana-image-renderer.
-# URL to a remote HTTP image renderer service, e.g. http://localhost:8081/render, will enable Grafana to render panels and dashboards to PNG-images using HTTP requests to an external service.
+# Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
 ;server_url =
-# If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
 ;callback_url =
 
+[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
@@ -687,11 +613,3 @@
 [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/README.md

@@ -1,16 +0,0 @@
-# Contribute
-
-This directory contains guides for contributors to the Grafana project.
-
-- [Create a pull request](create-pull-request.md)
-- [Contributing documentation](documentation.md)
-- [Developer guide](developer-guide.md)
-- [Triage issues](triage-issues.md)
-
-The `style-guides` directory contains style guides for the Grafana software project and documentation.
-
-- [Backend style guide](style-guides/backend.md) for how to style and format backend functionality and code.
-- [Documentation style guide](style-guides/documentation-style-guide.md) for how to style and format documentation.
-- [Frontend style guide](style-guides/frontend.md) for how to style and format the user-facing functionality and code.
-- [Redux framework](style-guides/redux.md) for designing the Grafana redux framework.
-- [Themes style guide](style-guides/themes.md) for designing and updating Grafana themes.

contribute/architecture/README.md

@@ -1,10 +0,0 @@
-# Architecture
-
-Are you looking to take on contributions with bigger impact? These guides help you get a better understanding of the structure and design of the Grafana codebase.
-
-Learn more about the backend architecture:
-
-- Part 1: [Services](services.md) 
-- Part 2: [Communication](communication.md)
-- Part 3: [Database](database.md)
-

contribute/architecture/communication.md

@@ -1,123 +0,0 @@
-# Communication
-
-Grafana uses a _bus_ to pass messages between different parts of the application. All communication over the bus happens synchronously.
-
-There are three types of messages: _events_, _commands_, and _queries_.
-
-## Events
-
-An event is something that happened in the past. Since an event has already happened, you can't change it. Instead, you can react to events by triggering additional application logic to be run, whenever they occur.
-
-> Because they happened in the past, event names are written in past tense, such as `UserCreated`, and `OrgUpdated`.
-
-### Subscribe to an event
-
-In order to react to an event, you first need to _subscribe_ to it. 
-
-To subscribe to an event, register an _event listener_ in the service's `Init` method:
-
-```go
-func (s *MyService) Init() error {
-    s.bus.AddEventListener(s.UserCreated)
-    return nil
-}
-
-func (s *MyService) UserCreated(event *events.UserCreated) error {
-    // ...
-}
-```
-
-**Tip:** Browse the available events in the `events` package.
-
-### Publish an event
-
-If you want to let other parts of the application react to changes in a service, you can publish your own events:
-
-```go
-event := &events.StickersSentEvent {
-    UserID: "taylor",
-    Count:   1,
-}
-if err := s.bus.Publish(event); err != nil {
-    return err
-}
-```
-
-## Commands
-
-A command is a request for an action to be taken. Unlike an event's fire-and-forget approach, a command can fail as it is handled. The handler will then return an error.
-
-> Because we request an operation to be performed, command are written in imperative mood, such as `CreateFolderCommand`, and `DeletePlaylistCommand`.
-
-### Dispatch a command
-
-To dispatch a command, pass the object to the `Dispatch` method:
-
-```go
-cmd := &models.SendStickersCommand {
-    UserID: "taylor",
-    Count: 1,
-}
-if err := s.bus.Dispatch(cmd); err != nil {
-  if err == bus.ErrHandlerNotFound {
-    return nil
-  }
-  return err
-}
-```
-
-**Note:** `Dispatch` will return an error if no handler is registered for that command.
-
-**Tip:** Browse the available commands in the `models` package.
-
-### Handle commands
-
-Let others 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.
-
-```go
-func (s *MyService) Init() error {
-    s.bus.AddHandler(s.SendStickers)
-    return nil
-}
-
-func (s *MyService) SendStickers(cmd *models.SendStickersCommand) error {
-    // ...
-}
-```
-
-**Note:** The handler method may return an error if unable to complete the command.
-
-## Queries
-
-A command handler can optionally populate the command sent it. This pattern is commonly used to implement _queries_.
-
-### Making a query
-
-To make a query, dispatch the query instance just like you would a command. When the `Dispatch` method returns, the `Results` field contains the result of the query.
-
-```go
-query := &models.FindDashboardQuery{
-    ID: "foo",
-}
-if err := bus.Dispatch(query); err != nil {
-    return err
-}
-// The query now contains a result.
-for _, item := range query.Results {
-    // ...
-}
-```
-
-### Return query results
-
-To return results for a query, set any of the fields on the query argument before returning:
-
-```go
-func (s *MyService) FindDashboard(query *models.FindDashboardQuery) error {
-    // ...
-    query.Result = dashboard
-    return nil
-}
-```

contribute/architecture/database.md

@@ -1,123 +0,0 @@
-# Database
-
-Grafana uses a database to persist settings between restarts. In fact, if you don't specify one, Grafana creates a [SQLite3](https://www.sqlite.org/) database file on your local disk. This guide explains how to store and retrieve data from the database.
-
-Grafana supports the [following databases](https://grafana.com/docs/installation/requirements/#database):
-
-- [MySQL](https://www.mysql.com/)
-- [PostgreSQL](https://www.postgresql.org/)
-- [SQLite3](https://www.sqlite.org/)
-
-Grafana uses the [XORM](https://xorm.io) framework for persisting objects to the database. For more information on how to use XORM, refer to the [documentation](http://gobook.io/read/github.com/go-xorm/manual-en-US/).
-
-[Services](services.md) don't use XORM directly. Instead, services use the _SQL store_, a special type of service that provides an abstraction for the database layer. There are two ways of using the `sqlstore`: using `sqlstore` handlers, and using the `SqlStore` instance.
-
-## `sqlstore` handlers
-
-> **Deprecated:** We are deprecating `sqlstore` handlers in favor of using the `SqlStore` object directly in each service. Since most services still use the `sqlstore` handlers, we still want to explain how they work.
-
-The `sqlstore` package allows you to register [command handlers](communication.md#handle-commands) that either store, or retrieve objects from the database. `sqlstore` handlers are similar to services:
-
-- [Services](services.md) are command handlers that _contain business logic_.
-- `sqlstore` handlers are command handlers that _access the database_.
-
-### Register a `sqlstore` handler
-
-> **Deprecated:** Refer to the [deprecation note for `sqlstore` handlers](#sqlstore-handlers).
-
-To register a handler:
-
-- Create a new file `myrepo.go` in the `sqlstore` package.
-- Create a [command handler](communication.md#handle-commands).
-- Register the handler in the `init` function:
-
-```go
-func init() {
-    bus.AddHandler("sql", DeleteDashboard)
-}
-
-func DeleteDashboard(cmd *models.DeleteDashboardCommand) error {
-    return inTransaction(func(sess *DBSession) error {
-        _, err := sess.Exec("DELETE FROM dashboards WHERE dashboard_id=?", cmd.DashboardID)
-        return err
-    })
-}
-```
-
-Here, `inTransaction` is a helper function in the `sqlstore` package that provides a session, that lets you execute SQL statements.
-
-## `SqlStore`
-
-As opposed to a `sqlstore` handler, the `SqlStore` is a service itself. The `SqlStore` has the same responsibility however: to store and retrieve objects, to and from the database.
-
-To use the `SqlStore`, inject the `SQLStore` in your service struct:
-
-```go
-type MyService struct {
-    SQLStore *sqlstore.SqlStore `inject:""`
-}
-```
-
-You can now make SQL queries in any of your [command handlers](communication.md#handle-commands) or [event listeners](communication.md#subscribe-to-an-event):
-
-```go
-func (s *MyService) DeleteDashboard(cmd *models.DeleteDashboardCommand) error {
-    if err := s.SQLStore.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
-        _, err := sess.Exec("DELETE FROM dashboards WHERE dashboard_id=?", cmd.DashboardID)
-        return err
-    })
-}
-```
-
-For transactions, use the `WithTransactionalDbSession` method instead.
-
-## Migrations
-
-As Grafana evolves, it becomes necessary to create _schema migrations_ for one or more database tables.
-
-To see all the types of migrations you can add, refer to [migrations.go](/pkg/services/sqlstore/migrator/migrations.go).
-
-Before you add a migration, make sure that you:
-
-- Never change a migration that has been committed and pushed to master.
-- Always add new migrations, to change or undo previous migrations.
-
-Add a migration using one of the following methods:
-
-- Add migrations in the `migrations` package.
-- Implement the `DatabaseMigrator` for the service.
-
-**Important:** If there are previous migrations for a service, use that method. By adding migrations using both methods, you risk running migrations in the wrong order.
-
-### Add migrations in `migrations` package
-
-Most services have their migrations located in the [migrations](/pkg/services/sqlstore/migrations/migrations.go) package.
-
-To add a migration:
-
-- Open the [migrations.go](/pkg/services/sqlstore/migrations/migrations.go) file.
-- In the `AddMigrations` function, find the `addXxxMigration` function for the service you want to create a migration for.
-- At the end of the `addXxxMigration` function, register your migration:
-
-[Example](https://github.com/grafana/grafana/blob/00d0640b6e778ddaca021670fe851fe00982acf2/pkg/services/sqlstore/migrations/migrations.go#L55-L70)
-
-### Implement `DatabaseMigrator`
-
-During initialization, SQL store queries the service registry, and runs migrations for every service that implements the [DatabaseMigrator](https://github.com/grafana/grafana/blob/44c2007498c76c2dbb48e8366b4af410f1ee1b98/pkg/registry/registry.go#L101-L106) interface.
-
-To add a migration:
-
-- If needed, add the `AddMigration(mg *migrator.Migrator)` method to the service.
-- At the end of the `AddMigration` method, register your migration:
-
-```go
-func (s *MyService) AddMigration(mg *migrator.Migrator) {
-    // ...
-
-    mg.AddMigration("Add column age", NewAddColumnMigration(table, &Column{
-        Name:     "age",
-        Type:     migrator.DB_BigInt,
-        Nullable: true,
-    }))
-}
-```

contribute/architecture/services.md

@@ -1,69 +0,0 @@
-# Services
-
-A Grafana _service_ encapsulates and exposes application logic to the rest of the application, through a set of related operations. 
-
-Before a service can start communicating with the rest of Grafana, it needs to be registered in the _service registry_.
-
-The service registry keeps track of all available services during runtime. On start-up, Grafana uses the registry to build a dependency graph of services, a _service graph_.
-
-Even though the services in Grafana do different things, they share a number of patterns. To better understand how a service works, let's build one from scratch!
-
-## Create a service
-
-To start building a service:
-
-- Create a new Go package `mysvc` in the [pkg/services](/pkg/services) directory.
-- Create a `service.go` file inside your new directory.
-
-All services need to implement the [Service](https://godoc.org/github.com/grafana/grafana/pkg/registry#Service) interface:
-
-```go
-type MyService struct {
-}
-
-func (s *MyService) Init() error {
-    return nil
-}
-```
-
-The `Init` method is used to initialize and configure the service to make it ready to use. Services that return an error halt Grafana's startup process and cause the error to be logged as it exits.
-
-## Register a service
-
-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 an `init` function within your package.
-
-```go
-func init() {
-    registry.RegisterService(&MyService{})
-}
-```
-
-`init` functions are only run whenever a package is imported, so we also need to import the package in the application. In the `server.go` file under `pkg/cmd/grafana-server`, import the package we just created:
-
-```go
-import _ "github.com/grafana/grafana/pkg/services/mysvc"
-```
-
-## Dependencies
-
-Grafana uses the [inject](https://github.com/facebookgo/inject) package to inject dependencies during runtime. 
-
-For example, to access the [bus](communication.md), add it to the `MyService` struct:
-
-```go
-type MyService struct {
-    Bus bus.Bus `inject:""`
-}
-```
-
-You can also inject other services in the same way:
-
-```go
-type MyService struct {
-    Service other.Service `inject:""`
-}
-```
-
-**Note:** Any injected dependency needs to be an exported field. Any unexported fields result in a runtime error.

contribute/create-pull-request.md

@@ -1,95 +0,0 @@
-# Create a pull request
-
-We're excited that you're considering making a contribution to the Grafana project! This document guides you through the process of creating a [pull request](https://help.github.com/en/articles/about-pull-requests/).
-
-## Before you begin
-
-We know you're excited to create your first pull request. Before we get started, read these resources first:
-
-- Learn how to start [Contributing to Grafana](/CONTRIBUTING.md).
-- Make sure your code follows the relevant [style guides](/contribute/style-guides).
-
-## Your first pull request
-
-If this is your first time contributing to an open-source project on GitHub, make sure you read about [Creating a pull request](https://help.github.com/en/articles/creating-a-pull-request).
-
-To increase the chance of having your pull request accepted, make sure your pull request follows these guidelines:
-
-- Title and description matches the implementation.
-- Commits within the pull request follow the [Formatting guidelines](#Formatting-guidelines). 
-- The pull request closes one related issue.
-- The pull request contains necessary tests that verify the intended behavior.
-- If your pull request has conflicts, rebase your branch onto the master branch.
-
-If the pull request fixes a bug:
-
-- The pull request description must include `Closes #<issue number>` or `Fixes #<issue number>`.
-- To avoid regressions, the pull request should include tests that replicate the fixed bug.
-
-### Frontend-specific guidelines
-
-Pull requests for frontend contributions must:
-
-- Use [Emotion](/contribute/style-guides/styling.md) for styling.
-- Not increase the Angular code base.
-- Not use `any` or `{}` without reason.
-- Not contain large React components that could easily be split into several smaller components.
-- Not contain backend calls directly from components—use actions and Redux instead.
-
-Pull requests for Redux contributions must:
-
-- Use the `actionCreatorFactory` and `reducerFactory` helpers instead of traditional switch statement reducers in Redux. Refer to [Redux framework](/contribute/style-guides/redux.md) for more details.
-- Use `reducerTester` to test reducers. Refer to [Redux framework](/contribute/style-guides/redux.md) for more details.
-- Not contain code that mutates state in reducers or thunks.
-- Not contain code that accesses the reducers state slice directly. Instead, the code should use state selectors to access state.
-
-## Code review
-
-Once you've created a pull request, the next step is to have someone review your change. A review is a learning opportunity for both the reviewer and the author of the pull request.
-
-If you think a specific person needs to review your pull request, then you can tag them in the description or in a comment. Tag a user by typing the `@` symbol followed by their GitHub username.
-
-We recommend that you read [How to do a code review](https://google.github.io/eng-practices/review/reviewer/) to learn more about code reviews.
-
-## Formatting guidelines
-
-A well-written pull request minimizes the time to get your change accepted. These guidelines help you write good commit messages and descriptions for your pull requests.
-
-### Commit message format
-
-Grafana uses the guidelines for commit messages outlined in [How to Write a Git Commit Message](https://chris.beams.io/posts/git-commit/), with the following additions:
-
-- Subject line must begin with the _area_ of the commit.
-- A footer in the form of an optional [keyword and issue reference](https://help.github.com/en/articles/closing-issues-using-keywords).
-
-#### Area
-
-The area should use upper camel case, e.g. UpperCamelCase.
-
-Prefer using one of the following areas:
-
-- **Build:** Changes to the build system, or external dependencies.
-- **Chore:** Changes that don't affect functionality.
-- **Dashboard:** Changes to the Dashboard feature.
-- **Docs:** Changes to documentation.
-- **Explore:** Changes to the Explore feature.
-- **Plugins:** Changes to any of the plugins.
-
-For changes to data sources, the area should be the name of the data source, e.g., AzureMonitor, Graphite, and Prometheus.
-
-For changes to panels, the area should be the name of the panel, suffixed with Panel, e.g., GraphPanel, SinglestatPanel, and TablePanel.
-
-**Examples**
-
-- `Build: Support publishing MSI to grafana.com`
-- `Explore: Add Live option for supported data sources`
-- `GraphPanel: Fix legend sorting issues`
-- `Docs: Changed url to URL in all documentation files`
-
-### Pull request titles
-
-The Grafana team _squashes_ all commits into one when we accept a pull request. The title of the pull request becomes the subject line of the squashed commit message. We still encourage contributors to write informative commit messages, as they becomes a part of the Git commit body.
-
-We use the pull request title when we generate change logs for releases. As such, we strive to make the title as informative as possible.
-
-Make sure that the title for your pull request uses the same format as the subject line in the commit message.

contribute/developer-guide.md

@@ -1,210 +0,0 @@
-# Developer guide
-
-This guide helps you get started developing Grafana.
-
-Before you begin, you might want to read [How to contribute to Grafana as a junior dev](https://medium.com/@ivanahuckova/how-to-contribute-to-grafana-as-junior-dev-c01fe3064502) by [Ivana Huckova](https://medium.com/@ivanahuckova).
-
-
-## Dependencies
-
-Make sure you have the following dependencies installed before setting up your developer environment:
-
-- [Git](https://git-scm.com/)
-- [Go](https://golang.org/dl/) (see [go.mod](../go.mod#L3) for minimum required version)
-- [Node.js (Long Term Support)](https://nodejs.org)
-- [Yarn](https://yarnpkg.com)
-
-### macOS
-
-We recommend using [Homebrew](https://brew.sh/) for installing any missing dependencies:
-
-```
-brew install git
-brew install go
-brew install node
-
-npm install -g yarn
-```
-
-## Download Grafana
-
-We recommend using Go to download the source code for the Grafana project:
-
-1. Add `export GOPATH=$HOME/go/` to the bottom of your `$HOME/.bash_profile`.
-1. Open a terminal and run `go get github.com/grafana/grafana` in your terminal. This command downloads, and installs Grafana to your `$GOPATH`.
-1. Open `$GOPATH/src/github.com/grafana/grafana` in your favorite code editor.
-
-## Build Grafana
-
-Grafana consists of two components; the _frontend_, and the _backend_.
-
-### Frontend
-
-Before we can build the frontend assets, we need to install the dependencies:
-
-```
-yarn install --pure-lockfile
-```
-
-After the command has finished, we can start building our source code:
-
-```
-yarn start
-```
-
-Once `yarn start` has built the assets, it will continue to do so whenever any of the files change. This means you don't have to manually build the assets whenever every time you change the code.
-
-Next, we'll build the web server that will serve the frontend assets we just built.
-
-### Backend
-
-Build and run the backend by running `make run` in the root directory of the repository. This command compiles the Go source code and starts a web server.
-
-> Are you having problems with [too many open files](#troubleshooting)?
-
-By default, you can access the web server at `http://localhost:3000/`.
-
-Log in using the default credentials:
-
-| username | password |
-| -------- | -------- |
-| `admin`  | `admin`  |
-
-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_.
-
-### Run frontend tests
-
-We use [jest](https://jestjs.io/) for our frontend tests. Run them using Yarn:
-
-```
-yarn jest
-```
-
-### Run backend tests
-
-If you're developing for the backend, run the tests with the standard Go tool:
-
-```
-go test -v ./pkg/...
-```
-
-### Run end-to-end 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
-```
-
-By default, the end-to-end tests assumes Grafana is available on `localhost:3000`. To use a specific URL, set the `BASE_URL` environment variable:
-
-```
-BASE_URL=http://localhost:3333 yarn e2e-tests
-```
-
-To follow the tests in the browser while they're running, use the `yarn e2e-tests:debug` instead.
-
-```
-yarn e2e-tests:debug
-```
-
-## Configure Grafana for development
-
-The default configuration, `grafana.ini`, is located in the `conf` directory. 
-
-To override the default configuration, create a `custom.ini` file in the `conf` directory. You only need to add the options you wish to override.
-
-Enable the development mode, by adding the following line in your `custom.ini`:
-
-```
-app_mode = development
-```
-
-
-### Add data sources
-
-By now, you should be able to build and test a change you've made to the Grafana source code. In most cases, you need to add at least one data source to verify the change.
-
-To set up data sources for your development environment, go to the [devenv](/devenv) directory in the Grafana repository:
-
-```
-cd devenv
-```
-
-Run the `setup.sh` script to set up a set of data sources and dashboards in your local Grafana instance. The script creates a set of data sources called **gdev-\<type\>**, and a set of dashboards located in a folder called **gdev dashboards**.
-
-Some of the data sources require databases to run in the background.
-
-Installing and configuring databases can be a tricky business. Grafana uses [Docker](https://docker.com) to make the task of setting up databases a little easier. Make sure you [install Docker](https://docs.docker.com/docker-for-mac/install/) before proceeding to the next step.
-
-In the root directory of your Grafana repository, run the following command:
-
-```
-make devenv sources=influxdb,loki
-```
-
-The script generates a Docker Compose file with the databases you specify as `sources`, and runs them in the background.
-
-See the repository for all the [available data sources](/devenv/docker/blocks). Note that some data sources have specific Docker images for macOS, e.g. `prometheus_mac`.
-
-## Build a Docker image
-
-To build a Docker image, run:
-
-```
-make build-docker-full
-```
-
-The resulting image will be tagged as grafana/grafana:dev.
-
-**Note:** If you've already set up a local development environment, and you're running a `linux/amd64` machine, you can speed up building the Docker image:
-
-1. Build the frontend: `go run build.go build-frontend`.
-1. Build the Docker image: `make build-docker-dev`.
-
-**Note:** If you are using Docker for macOS, be sure to set the memory limit to be larger than 2 GiB. Otherwise `grunt build` may fail. The memory limit settings are available under **Docker Desktop** -> **Preferences** -> **Advanced**.
-
-## Troubleshooting
-
-Are you having issues with setting up your environment? Here are some tips that might help.
-
-### Too many open files when running `make run`
-
-Depending on your environment, you may have to increase the maximum number of open files allowed.
-
-To see how many open files are allowed, run:
-
-```
-ulimit -a
-```
-
-To change the number of open files allowed, run:
-
-```
-ulimit -S -n 2048
-```
-
-The number of files needed may be different on your environment. To determine the number of open files needed by `make run`, run:
-
-```
-find ./conf ./pkg ./public/views | wc -l
-```
-
-Another alternative is to limit the files being watched. The directories that are watched for changes are listed in the `.bra.toml` file in the root directory. 
-
-## Next steps
-
-- Read our [style guides](/contribute/style-guides).
-- Learn how to [Create a pull request](/contribute/create-pull-request.md).
-- Read [How to contribute to Grafana as a junior dev](https://medium.com/@ivanahuckova/how-to-contribute-to-grafana-as-junior-dev-c01fe3064502) by [Ivana Huckova](https://medium.com/@ivanahuckova).
-- Read about the [architecture](architecture).

contribute/documentation.md

@@ -1,42 +0,0 @@
-# Contributing to documentation
-
-This documents guides you through the process of contributing to the Grafana documentation. Make sure you've read the guide for [Contributing to Grafana](/CONTRIBUTING.md).
-
-## Your first contribution
-
-If you’re unsure about where to start, check out some of our [open docs issues](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3Atype%2Fdocs).
-
-Sometimes it can be difficult to understand an issue when you're just getting started. Refer to this list of [beginner-friendly issues](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3Atype%2Fdocs+label%3A"beginner+friendly") for tasks suitable for first-time contributors.
-
-When you’ve found an issue you want to work on, please comment on the issue to let other people know you intend to work on it.
-
-If you encounter any misspellings or violations to the style guide, please let us know by submitting an issue (or just fix them if they are minor changes).
-
-On every page in the [documentation](https://grafana.com/docs/) are two links in the upper right corner:
-
-- **Edit this page** takes you directly to the file on GitHub where you can contribute a fix.
-- **Request doc changes** prepares an issue on GitHub with relevant information already filled in.
-
-## Join our community
-
-For general discussions on documentation, you’re welcome to join the `#docs` channel on our [public Grafana Slack](http://slack.raintank.io) team.
-
-## Style and formatting
-
-All Grafana documentation is written using [Markdown](https://en.wikipedia.org/wiki/Markdown), and can be found in the [docs](/docs) directory in the [Grafana GitHub repository](https://github.com/grafana/grafana). The [documentation website](https://grafana.com/docs) is generated with [Hugo](https://gohugo.io) which uses [Blackfriday](https://github.com/russross/blackfriday) as its Markdown rendering engine.
-
-### Documentation structure
-
-The Grafana documentation is organized into topics, called _sections_. You can take a look at the current build at [grafana.com/docs/](https://grafana.com/docs/).
-
-Each top-level section is located under the [docs/sources](/docs/sources) directory. Subsections are added by creating a subdirectory in the directory of the parent section.
-
-For each section, an `_index.md` file provides an overview of the topic.
-
-### Style guide
-
-Refer to the [Documentation style guide](style-guides/documentation-style-guide.md) for information about Grafana style, word choice, and grammar conventions.
-
-### Spelling
-
-The [codespell](https://github.com/codespell-project/codespell) tool is run for every change to catch common misspellings.

contribute/style-guides/backend.md

@@ -1,45 +0,0 @@
-# Backend style guide
-
-Grafanas backend has been developed for a long time with a mix of code styles.  This guide explains how we want to write Go code in the future.
-
-Unless stated otherwise, use the guidelines listed in the following articles:
-
-- [Effective Go](https://golang.org/doc/effective_go.html)
-- [Code Review Comments](https://github.com/golang/go/wiki/CodeReviewComments)
-- [Go: Best Practices for Production Environments](http://peter.bourgon.org/go-in-production/#formatting-and-style)
-
-## Linting and formatting
-
-To ensure consistency across the Go codebase, we require all code to pass a number of linter checks.
-
-We use the standard following linters:
-
-- [gofmt](https://golang.org/cmd/gofmt/)
-- [golint](https://github.com/golang/lint)
-- [go vet](https://golang.org/cmd/vet/)
-
-In addition to the standard linters, we also use:
-
-- [revive](https://revive.run/) with a [custom config](https://github.com/grafana/grafana/blob/master/conf/revive.toml)
-- [GolangCI-Lint](https://github.com/golangci/golangci-lint)
-- [gosec](https://github.com/securego/gosec)
-
-To run all linters, use the `lint-go` Makefile target:
-
-```bash
-make lint-go
-```
-
-## Testing
-
-We value clean and readable code, that is loosely coupled and covered by unit tests. This makes it easier to collaborate and maintain the code.
-
-Tests must use the standard library, `testing`. For assertions, prefer using [testify](https://github.com/stretchr/testify).
-
-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/documentation-style-guide.md

@@ -1,153 +0,0 @@
-# Documentation style guide
-
-This style guide applies to all documentation created for Grafana products.
-
-## 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.
-
-## Published guides
-
-For all items not covered in this guide, refer to the [Microsoft Style Guide](https://docs.microsoft.com/en-us/style-guide/welcome/) and the [Chicago Manual of Style](https://www.chicagomanualofstyle.org/home.html).
-
-## Spelling
-
-The [codespell](https://github.com/codespell-project/codespell) tool is run for every change to catch common misspellings.
-
-## Grafana-specific style
-
-The following sections provide general guidelines on topics specific to Grafana documentation. Note that for the most part, these are *guidelines*, not rigid rules. If you have questions, ask in the #docs channel of Grafana Slack.
-
-### General
-
-* Use active voice. Avoid passive voice.
-  - Passive: The heatmap visualization is displayed.
-  - Active: Grafana displays the heatmap visualization.
-* Write in the imperative second person. Examples: You can write a query. Click the panel. Close the window.
-* Write in present tense.
-  - Not: The panel will open.
-  - Use: The panel opens. Grafana opens the panel.
-* Do not use an ampersand (&) as an abbreviation for "and." 
-  - **Exceptions:** If an ampersand is used in the Grafana UI, then match the UI.
-
-### File naming conventions
-
-- Files that are displayed in the help system should have names that are all lowercase, no spaces. Use hyphens instead of spaces. Example: glossary.md
-- Documentation file names should match the title. **Note:** This only applies to new files at this time. Do not change the names of older files unless directed to do so.
-- Internal reference file names should be all uppercase except the file extension. Example: CONTRIBUTING.md
-
-### Headings
-
-* Write headings in sentence case, not title case.
-  - This is sentence case
-  - This Is Title Case
-* Task topic headings start with a verb.
-  - Write a query. Create a dashboard.
-* Concept and reference topic headings should be nouns or gerunds. Examples: Contributing to docs, Visualizations, Style guide
-* Avoid following one heading with another heading.
-* Avoid skipping heading levels. For example, an h1 should be followed by an h2 rather than an h3.
-* Avoid having just one lower-level heading. For example, h1, h2, h2, h3, h3, h2 is a good order. Do no go h1, h2, h3, h2, h3, h2.
-* Don't include parenthetical words like (Important!) in headings.
-
-### Images
-
-* Preferred format is .png
-* File extension should be all lowercase.
-* Preferred DPI is 72.
-* Assume all graphics will be exclusively viewed on the web.
-* Maximum image size is 3840px X 2160px.
-* Screenshots should be readable, but not too large.
-
-### Capitalization
-
-* Grafana, Loki, and Prometheus are always capitalized unless part of a code block.
-* API names are always Title Case, followed by "API"—for example, "Dashboard Permissions API"
-* Git is always capitalized, unless part of a code block.
-* Abbreviations are always capitalized (such as API, HTTP, ID, JSON, SQL, or URL) unless they are part of a code block.
-* Menu and submenu titles always use sentence case: capitalize the first word, and lowercase the rest.
-  - "Dashboards" when referring to the submenu title.
-  - "Keyboard shortcuts" when referring to the submenu topic.
-* Generic and plural versions are always lowercase.
-  - Lowercase "dashboard" when referring to a dashboard generally.
-  - Lowercase "dashboards" when referring to multiple dashboards.
-* **Exceptions:** If a term is lowercased in the Grafana UI, then match the UI.
-
-### Links and references
-
-When referencing another document, use "Refer to" rather than alternatives such as "See" or "Check out."
-
-Always give the reader some idea of what to expect in the reference. Avoid blind references, such as, "Refer to [this file](link)."
-
-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.
-
-### 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
-
-**Exceptions:**
-* "datasource" used as an identifier
-* "datasource" in a URL
-* 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.
-
-#### display (verb)
-
-*Display* is a transitive verb, which means it always needs a direct object.
-* Correct, active voice: Grafana displays your list of active alarms.
-* Correct, but passive voice: Your list of active alarms is displayed.
-* Incorrect: The list of active alarms displays.
-
-#### open source, open-source
-
-Do not hyphenate when used as an adjective unless the lack of hyphen would cause confusion. For example: _Open source software design is the most open open-source system I can imagine._ 
-
-Do not hyphenate when it is used as a noun. For example: _Open source is the best way to develop software._
-
-#### setup, set up
-
-Two words if used as a verb, one word if used as a noun.
-
-**Examples**
-
-* Set up the workspace.
-* Initial setup might take five minutes.

contribute/style-guides/e2e.md

@@ -1,160 +0,0 @@
-# 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
-
-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/redux.md

@@ -1,48 +0,0 @@
-# Redux framework
-
-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.
-
-## Test functionality
-
-### reducerTester
-
-Fluent API that simplifies the testing of reducers
-
-#### Usage
-
-```typescript
-reducerTester()
-  .givenReducer(someReducer, initialState)
-  .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/triage-issues.md

@@ -1,32 +0,0 @@
-# Triage issues
-
-Triage helps ensure that issues resolve quickly by:
-
-- Ensuring the issue's intent and purpose is conveyed precisely. This is necessary because it can be difficult for an issue to explain how an end user experiences a problem and what actions they took.
-- Giving a contributor the information they need before they commit to resolving an issue.
-- Lowering the issue count by preventing duplicate issues.
-- Streamlining the development process by preventing duplicate discussions.
-
-This document gives you some ideas on what you can do to help. For more information, read more about [how the core Grafana team triage issues](/ISSUE_TRIAGE.md).
-
-## Improve issues
-
-Improve issues by suggesting improvements to the title and description. If you think an issue has formatting issues, bad language, or grammatical errors, post a comment to let the author and maintainers know.
-
-## Report resolved issues
-
-If you think an issue has been resolved, or is no longer relevant, suggest us to close it. Add a comment on the issue, where you explain the reason it should be closed. Make sure to include any related issues and pull requests.
-
-## Investigate issues
-
-Investigate issues that we haven't been able to reproduce yet. In some cases, there are many combinations of panels, dashboards, and data sources that make it difficult for us to reproduce certain issues. Help us by adding more information.
-
-## Vote on issues
-
-Use [GitHub reactions](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments) to let us know what's important to you. Vote on bugs if you've experienced the same problem. **Don't vote, or react, by commenting on the issue.**
-
-Read more about [how we prioritize issues](/ISSUE_TRIAGE.md#4-prioritization-of-issues).
-
-## Report duplicates
-
-If you find two issues that describe the same thing, add a comment in one of the issues, with a reference (`#<issue number>`) to the other. Explain why you think the issue is duplicated.

devenv/README.md

@@ -1,40 +1,37 @@
-# Set up your development environment
+This folder contains useful scripts and configuration for...
 
-This folder contains useful scripts and configuration so you can:
+* Configuring dev datasources in Grafana
+* Configuring dev & test scenarios dashboards.
+* Creating docker-compose file with DBs and fake data.
 
-* Configure data sources in Grafana for development.
-* Configure dashboards for development and test scenarios.
-* Create docker-compose file with databases and fake data.
 
-## Install Docker
-
-Grafana uses [Docker](https://docker.com) to make the task of setting up databases a little easier. If you do not have it already, make sure you [install Docker](https://docs.docker.com/docker-for-mac/install/) before proceeding to the next step.
-
-## Developer dashboards and data sources
+# Dev dashboards and data sources
 
 ```bash
 ./setup.sh
 ```
 
-After restarting the Grafana server, there should be a number of data sources named `gdev-<type>` provisioned as well as
-a dashboard folder named `gdev dashboards`. This folder contains dashboard and panel features tests dashboards. 
+After restarting grafana server there should now be a number of datasources named `gdev-<type>` provisioned as well as
+a dashboard folder named `gdev dashboards`. This folder contains dashboard & panel features tests dashboards. 
 
-Please update these dashboards or make new ones as new panels and dashboards features are developed or new bugs are
+#### Dev dashboards
+
+Please update these dashboards or make new ones as new panels & dashboards features are developed or new bugs are
 found. The dashboards are located in the `devenv/dev-dashboards` folder. 
 
-## docker-compose with databases
-
-This command creates a docker-compose file with specified databases configured and ready to run. Each database has
-a prepared image with some fake data ready to use. For available databases, see `docker/blocks` directory. Notice that
-for some databases there are multiple images, for example there is prometheus_mac specifically for Macs or different
-version.
+# docker-compose with databases
 
 ```bash
 make devenv sources=influxdb,prometheus2,elastic5
 ```
 
-Some of the blocks support dynamic change of the image version used in the Docker file. The signature looks like this: 
+This command will create a docker compose file with specified databases configured and ready to run. Each database has
+a prepared image with some fake data ready to use. For available databases see `docker/blocks` directory. Mind that
+for some databases there are multiple images, for example there is prometheus_mac specifically for Macs or different
+version.
+
+Some of the blocks support dynamic change of the image version used in docker file. The signature looks like this - `make devenv sources=postgres,openldap name-of-block_version=9.2` -
 
 ```bash
 make devenv sources=postgres,openldap postgres_version=9.2
-```
+```

devenv/dashboards.yaml

@@ -5,7 +5,6 @@ providers:
    folder: 'gdev dashboards'
    folderUid: ''
    type: file
-   allowUiUpdates: false
    updateIntervalSeconds: 60
    options:
      path: devenv/dev-dashboards

devenv/datasources.yaml

@@ -20,8 +20,8 @@ datasources:
     url: http://localhost:3011
 
   - name: gdev-testdata
-    isDefault: true
     type: testdata
+    isDefault: true
 
   - name: gdev-influxdb
     type: influxdb
@@ -227,20 +227,6 @@ 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-without-uid/panel_tests_polystat.json

@@ -28,7 +28,11 @@
           "value": "triggered"
         }
       ],
-      "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
       "d3DivId": "d3_svg_4",
       "datasource": "gdev-testdata",
       "decimals": 2,
@@ -111,7 +115,11 @@
       },
       "id": 4,
       "links": [],
-      "notcolors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+      "notcolors": [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+      ],
       "operatorName": "avg",
       "operatorOptions": [
         {
@@ -876,8 +884,8 @@
               "value": "celsius"
             },
             {
-              "text": "Fahrenheit (°F)",
-              "value": "fahrenheit"
+              "text": "Farenheit (°F)",
+              "value": "farenheit"
             },
             {
               "text": "Kelvin (K)",
@@ -1106,7 +1114,11 @@
           "value": "triggered"
         }
       ],
-      "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
       "d3DivId": "d3_svg_5",
       "datasource": "gdev-testdata",
       "decimals": 2,
@@ -1189,7 +1201,11 @@
       },
       "id": 5,
       "links": [],
-      "notcolors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+      "notcolors": [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+      ],
       "operatorName": "avg",
       "operatorOptions": [
         {
@@ -1975,8 +1991,8 @@
               "value": "celsius"
             },
             {
-              "text": "Fahrenheit (°F)",
-              "value": "fahrenheit"
+              "text": "Farenheit (°F)",
+              "value": "farenheit"
             },
             {
               "text": "Kelvin (K)",
@@ -2205,7 +2221,11 @@
           "value": "triggered"
         }
       ],
-      "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
       "d3DivId": "d3_svg_2",
       "datasource": "gdev-testdata",
       "decimals": 2,
@@ -2288,7 +2308,11 @@
       },
       "id": 2,
       "links": [],
-      "notcolors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+      "notcolors": [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+      ],
       "operatorName": "avg",
       "operatorOptions": [
         {
@@ -3054,8 +3078,8 @@
               "value": "celsius"
             },
             {
-              "text": "Fahrenheit (°F)",
-              "value": "fahrenheit"
+              "text": "Farenheit (°F)",
+              "value": "farenheit"
             },
             {
               "text": "Kelvin (K)",
@@ -3276,7 +3300,10 @@
   ],
   "schemaVersion": 16,
   "style": "dark",
-  "tags": ["panel-test", "gdev"],
+  "tags": [
+    "panel-test",
+    "gdev"
+  ],
   "templating": {
     "list": []
   },
@@ -3285,8 +3312,29 @@
     "to": "now"
   },
   "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
-    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ],
+    "time_options": [
+      "5m",
+      "15m",
+      "1h",
+      "6h",
+      "12h",
+      "24h",
+      "2d",
+      "7d",
+      "30d"
+    ]
   },
   "timezone": "",
   "title": "Panel Tests - Polystat",

devenv/dev-dashboards/alerting/testdata_alerts.json

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

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

@@ -4,37 +4,11 @@
       {
         "builtIn": 1,
         "datasource": "-- Grafana --",
-        "enable": false,
+        "enable": true,
         "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"
       }
     ]
   },
@@ -42,7 +16,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1576251075020,
+  "iteration": 1532618661457,
   "links": [],
   "panels": [
     {
@@ -54,14 +28,12 @@
       "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,
@@ -76,9 +48,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -110,7 +79,6 @@
       ],
       "thresholds": [],
       "timeFrom": null,
-      "timeRegions": [],
       "timeShift": null,
       "title": "Average logins / $summarize",
       "tooltip": {
@@ -157,14 +125,12 @@
       "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,
@@ -179,9 +145,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -206,7 +169,6 @@
       ],
       "thresholds": [],
       "timeFrom": null,
-      "timeRegions": [],
       "timeShift": null,
       "title": "Average payments started/ended / $summarize",
       "tooltip": {
@@ -252,14 +214,12 @@
       "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,
@@ -274,9 +234,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -295,7 +252,6 @@
       ],
       "thresholds": [],
       "timeFrom": null,
-      "timeRegions": [],
       "timeShift": null,
       "title": "Max CPU / $summarize",
       "tooltip": {
@@ -346,7 +302,6 @@
       },
       "id": 4,
       "links": [],
-      "options": {},
       "pageSize": null,
       "scroll": true,
       "showHeader": true,
@@ -385,19 +340,15 @@
       "type": "table"
     }
   ],
-  "schemaVersion": 21,
+  "schemaVersion": 16,
   "style": "dark",
   "tags": ["gdev", "mssql", "datasource-test"],
   "templating": {
     "list": [
       {
         "allValue": null,
-        "current": {
-          "text": "Africa",
-          "value": "Africa"
-        },
+        "current": {},
         "datasource": "gdev-mssql",
-        "definition": "",
         "hide": 0,
         "includeAll": false,
         "label": "Datacenter",
@@ -417,13 +368,8 @@
       },
       {
         "allValue": null,
-        "current": {
-          "selected": false,
-          "text": "All",
-          "value": "$__all"
-        },
+        "current": {},
         "datasource": "gdev-mssql",
-        "definition": "",
         "hide": 0,
         "includeAll": true,
         "label": "Hostname",
@@ -446,7 +392,6 @@
         "auto_count": 30,
         "auto_min": "10s",
         "current": {
-          "selected": false,
           "text": "1m",
           "value": "1m"
         },
@@ -543,5 +488,5 @@
   "timezone": "",
   "title": "Datasource tests - MSSQL",
   "uid": "86Js1xRmk",
-  "version": 2
+  "version": 1
 }

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

@@ -4,35 +4,11 @@
       {
         "builtIn": 1,
         "datasource": "-- Grafana --",
-        "enable": false,
+        "enable": true,
         "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"
       }
     ]
   },
@@ -40,7 +16,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1576250298312,
+  "iteration": 1532620738041,
   "links": [],
   "panels": [
     {
@@ -52,14 +28,12 @@
       "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,
@@ -74,9 +48,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -110,7 +81,6 @@
       ],
       "thresholds": [],
       "timeFrom": null,
-      "timeRegions": [],
       "timeShift": null,
       "title": "Average logins / $summarize",
       "tooltip": {
@@ -156,14 +126,12 @@
       "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,
@@ -178,9 +146,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -206,7 +171,6 @@
       ],
       "thresholds": [],
       "timeFrom": null,
-      "timeRegions": [],
       "timeShift": null,
       "title": "Average payments started/ended / $summarize",
       "tooltip": {
@@ -252,14 +216,12 @@
       "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,
@@ -274,9 +236,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -296,7 +255,6 @@
       ],
       "thresholds": [],
       "timeFrom": null,
-      "timeRegions": [],
       "timeShift": null,
       "title": "Max CPU / $summarize",
       "tooltip": {
@@ -347,7 +305,6 @@
       },
       "id": 6,
       "links": [],
-      "options": {},
       "pageSize": null,
       "scroll": true,
       "showHeader": true,
@@ -389,8 +346,7 @@
       "type": "table"
     }
   ],
-  "refresh": false,
-  "schemaVersion": 21,
+  "schemaVersion": 16,
   "style": "dark",
   "tags": ["gdev", "mysql", "datasource-tags"],
   "templating": {
@@ -402,7 +358,6 @@
           "value": "America"
         },
         "datasource": "gdev-mysql",
-        "definition": "",
         "hide": 0,
         "includeAll": false,
         "label": "Datacenter",
@@ -423,12 +378,10 @@
       {
         "allValue": null,
         "current": {
-          "selected": false,
           "text": "All",
           "value": "$__all"
         },
         "datasource": "gdev-mysql",
-        "definition": "",
         "hide": 0,
         "includeAll": true,
         "label": "Hostname",
@@ -451,7 +404,6 @@
         "auto_count": 5,
         "auto_min": "10s",
         "current": {
-          "selected": false,
           "text": "1m",
           "value": "1m"
         },
@@ -548,5 +500,5 @@
   "timezone": "",
   "title": "Datasource tests - MySQL",
   "uid": "DGsCac3kz",
-  "version": 2
+  "version": 8
 }

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

@@ -4,35 +4,11 @@
       {
         "builtIn": 1,
         "datasource": "-- Grafana --",
-        "enable": false,
+        "enable": true,
         "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"
       }
     ]
   },
@@ -40,7 +16,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1576249087264,
+  "iteration": 1532620601931,
   "links": [],
   "panels": [
     {
@@ -52,14 +28,12 @@
       "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,
@@ -74,9 +48,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -96,59 +67,20 @@
         {
           "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",
-          "select": [
-            [
-              {
-                "params": ["value"],
-                "type": "column"
-              }
-            ]
-          ],
-          "target": "",
-          "timeColumn": "time",
-          "where": [
-            {
-              "name": "$__timeFilter",
-              "params": [],
-              "type": "macro"
-            }
-          ]
+          "target": ""
         },
         {
           "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",
-          "select": [
-            [
-              {
-                "params": ["value"],
-                "type": "column"
-              }
-            ]
-          ],
-          "timeColumn": "time",
-          "where": [
-            {
-              "name": "$__timeFilter",
-              "params": [],
-              "type": "macro"
-            }
-          ]
+          "refId": "B"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
-      "timeRegions": [],
       "timeShift": null,
       "title": "Average logins / $summarize",
       "tooltip": {
@@ -194,14 +126,12 @@
       "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,
@@ -216,9 +146,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -244,7 +171,6 @@
       ],
       "thresholds": [],
       "timeFrom": null,
-      "timeRegions": [],
       "timeShift": null,
       "title": "Average payments started/ended / $summarize",
       "tooltip": {
@@ -290,14 +216,12 @@
       "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,
@@ -312,9 +236,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -334,7 +255,6 @@
       ],
       "thresholds": [],
       "timeFrom": null,
-      "timeRegions": [],
       "timeShift": null,
       "title": "Max CPU / $summarize",
       "tooltip": {
@@ -385,7 +305,6 @@
       },
       "id": 6,
       "links": [],
-      "options": {},
       "pageSize": null,
       "scroll": true,
       "showHeader": true,
@@ -426,7 +345,7 @@
       "type": "table"
     }
   ],
-  "schemaVersion": 21,
+  "schemaVersion": 16,
   "style": "dark",
   "tags": ["gdev", "postgres", "datasource-test"],
   "templating": {
@@ -438,7 +357,6 @@
           "value": "America"
         },
         "datasource": "gdev-postgres",
-        "definition": "",
         "hide": 0,
         "includeAll": false,
         "label": "Datacenter",
@@ -459,12 +377,10 @@
       {
         "allValue": null,
         "current": {
-          "selected": false,
           "text": "All",
           "value": "$__all"
         },
         "datasource": "gdev-postgres",
-        "definition": "",
         "hide": 0,
         "includeAll": true,
         "label": "Hostname",
@@ -487,7 +403,6 @@
         "auto_count": 5,
         "auto_min": "10s",
         "current": {
-          "selected": false,
           "text": "1m",
           "value": "1m"
         },
@@ -584,5 +499,5 @@
   "timezone": "",
   "title": "Datasource tests - Postgres",
   "uid": "JYola5qzz",
-  "version": 5
+  "version": 4
 }

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

@@ -1,491 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "links": [],
-  "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-nested-variables-drilldown.json

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

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

@@ -1,530 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "links": [],
-  "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-polystat/polystat_test.json

@@ -876,8 +876,8 @@
               "value": "celsius"
             },
             {
-              "text": "Fahrenheit (°F)",
-              "value": "fahrenheit"
+              "text": "Farenheit (°F)",
+              "value": "farenheit"
             },
             {
               "text": "Kelvin (K)",
@@ -1975,8 +1975,8 @@
               "value": "celsius"
             },
             {
-              "text": "Fahrenheit (°F)",
-              "value": "fahrenheit"
+              "text": "Farenheit (°F)",
+              "value": "farenheit"
             },
             {
               "text": "Kelvin (K)",
@@ -3054,8 +3054,8 @@
               "value": "celsius"
             },
             {
-              "text": "Fahrenheit (°F)",
-              "value": "fahrenheit"
+              "text": "Farenheit (°F)",
+              "value": "farenheit"
             },
             {
               "text": "Kelvin (K)",

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

@@ -1,512 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "links": [],
-  "panels": [
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 3,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "id": 6,
-      "interval": "6m",
-      "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": [
-        {
-          "alias": "__house_locations",
-          "labels": "",
-          "min": 0,
-          "noise": 5,
-          "refId": "A",
-          "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": [
-        {
-          "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": 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": 6,
-        "y": 15
-      },
-      "id": 8,
-      "interval": "10m",
-      "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": "line",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "sparkline": {
-          "show": true
-        }
-      },
-      "pluginVersion": "6.6.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": "stat"
-    },
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 9,
-        "w": 8,
-        "x": 10,
-        "y": 15
-      },
-      "id": 12,
-      "interval": "10m",
-      "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": "line",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "sparkline": {
-          "show": true
-        }
-      },
-      "pluginVersion": "6.6.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": "stat"
-    }
-  ],
-  "schemaVersion": 22,
-  "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"]
-  },
-  "timezone": "",
-  "title": "Panel Tests - Stat"
-}

devenv/docker/blocks/apache_proxy_mac/Dockerfile

@@ -1,4 +0,0 @@
-FROM jmferrer/apache2-reverse-proxy:latest
-
-COPY ports.conf /etc/apache2/sites-enabled
-COPY proxy.conf /etc/apache2/sites-enabled

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

@@ -1,10 +0,0 @@
-# This will proxy all requests for http://localhost:10081/grafana/ to
-# http://localhost:3000 (Grafana running locally)
-#
-# Please note that you'll need to change the root_url in the Grafana configuration:
-# root_url = %(protocol)s://%(domain)s:10081/grafana/
-
-  apacheproxy:
-    build: docker/blocks/apache_proxy_mac
-    ports:
-      - "10081:10081"

devenv/docker/blocks/apache_proxy_mac/ports.conf

@@ -1 +0,0 @@
-Listen 10081

devenv/docker/blocks/apache_proxy_mac/proxy.conf

@@ -1,4 +0,0 @@
-<VirtualHost *:10081>
-    ProxyPass /grafana/ http://host.docker.internal:3000/
-    ProxyPassReverse /grafana/ http://host.docker.internal:3000/
-</VirtualHost>

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: 9200
+      FD_PORT: 10200

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

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

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

@@ -9,12 +9,10 @@
 
   fake-elastic7-data:
     image: grafana/fake-data-gen
-    links:
-      - elasticsearch7
+    network_mode: bridge
     environment:
-      FD_SERVER: elasticsearch7
       FD_DATASOURCE: elasticsearch7
-      FD_PORT: 9200
+      FD_PORT: 12200
 
   filebeat7:
     image: docker.elastic.co/beats/filebeat-oss:7.0.0
@@ -26,6 +24,7 @@
 
   metricbeat7:
     image: docker.elastic.co/beats/metricbeat-oss:7.0.0
+    network_mode: host
     command: metricbeat -e -strict.perms=false
     user: root
     volumes:
@@ -36,7 +35,5 @@
     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: ["elasticsearch7:9200"]
+  hosts: ["localhost:12200"]
   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,27 +1,6 @@
   jaeger:
     image: jaegertracing/all-in-one:latest
     ports:
-      - "6831:6831"
+      - "127.0.0.1:6831:6831/udp"
       - "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

@@ -1,27 +0,0 @@
-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

@@ -1,15 +0,0 @@
-  # 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

@@ -1,27 +0,0 @@
-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

@@ -1,15 +0,0 @@
-  # 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 mcr.microsoft.com/mssql/server:2017-CU4-ubuntu
+FROM microsoft/mssql-server-linux:2017-CU4
 WORKDIR /usr/setup
 COPY . /usr/setup
 RUN chmod +x /usr/setup/setup.sh

devenv/docker/blocks/nginx_proxy/nginx_login_only.conf

@@ -1,42 +0,0 @@
-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://localhost:3000/login;
-      }
-
-      proxy_set_header Authorization "";
-      proxy_pass http://localhost:3000/;
-    }
-  }
-}

devenv/docker/blocks/nginx_proxy_mac/nginx_login_only.conf

@@ -1,42 +0,0 @@
-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 @@
-  postgres:
+  postgrestest:
     image: postgres:${postgres_version}
     environment:
       POSTGRES_USER: grafana
@@ -7,11 +7,6 @@
     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
@@ -19,6 +14,3 @@
     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.4 AS builder
+FROM golang:1.9.0 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/slow_proxy_mac/Dockerfile

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

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

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

devenv/docker/blocks/slow_proxy_mac/main.go

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

devenv/docker/compose_header.yml

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

devenv/docker/ha_test/README.md

@@ -7,7 +7,7 @@ Included services
 
 * Grafana
 * Mysql - Grafana configuration database and session storage
-* Prometheus - Monitoring of Grafana and used as data source of provisioned alert rules
+* Prometheus - Monitoring of Grafana and used as datasource of provisioned alert rules
 * Nginx - Reverse proxy for Grafana and Prometheus. Enables browsing Grafana/Prometheus UI using a hostname
 
 ## Prerequisites

devenv/docker/loadtest/README.md

@@ -35,12 +35,6 @@ 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

@@ -1,71 +0,0 @@
-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

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

docs/.gitignore

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

docs/Dockerfile

@@ -0,0 +1,14 @@
+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,9 +1,38 @@
-.PHONY: docs docs-test
+.PHONY: all default docs docs-build docs-shell shell checkvars
 
-docs:
-	docker pull grafana/docs-base:latest
-	docker run -v $(PWD)/sources:/hugo/content/docs/grafana/latest -p 3002:3002 --rm -it grafana/docs-base:latest /bin/bash -c 'npm i && make webpack && hugo server -p 3002 -D --ignoreCache --baseUrl http://localhost:3002 --bind 0.0.0.0'
+# to allow `make DOCSPORT=9000 docs`
+DOCSPORT := 3004
 
-docs-test:
-	docker pull grafana/docs-base:latest
-	docker run -v $(PWD)/sources:/hugo/content/docs/grafana/latest --rm -it grafana/docs-base:latest /bin/bash -c 'npm i && make prod'
+DOCKER_DOCS_IMAGE := grafana/grafana-docs
+SOURCES_HOST_DIR := "$(shell pwd)/sources"
+
+# 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/README.md

@@ -1,38 +1,72 @@
-# Building the docs locally
+# Building The Docs
 
-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.
+To build the docs locally, you need to have docker installed.  The
+docs are built using [Hugo](http://gohugo.io/) - a static site generator.
 
-## Requirements
+**Prepare the Docker Image**:
 
-Docker >= 2.1.0.3
+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):
 
-## Build the doc site
+```
+git clone https://github.com/grafana/website
+cd website
+make docs-build
+```
 
-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.
+**Build the Documentation**:
 
----
+Now that the docker image has been prepared we can build the
+grafana docs and start a docs server.
 
-## Content guidelines
+If you have not cloned the Grafana repository already then:
 
-Edit content in the `sources` directory.
+```
+cd ..
+git clone https://github.com/grafana/grafana
+```
 
-### Using `relref` for internal links
+Switch your working directory to the directory this file
+(README.md) is in.
 
-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.
+```
+cd grafana/docs
+```
 
-### Edit the side menu
+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.
 
-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.
+```
+touch awsconfig
+```
 
-### Add images
+Then run (possibly with ``sudo``):
 
-Images are currently hosted in the grafana/website repo.
+```
+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.
 
-## Deploy changes to grafana.com
+Open [localhost:3004](http://localhost:3004) to view the docs.
 
-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.
+### Images & Content
 
-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.
+All markdown files are located in this repo (main grafana repo). But all images are added to the https://github.com/grafana/website repo. So the process of adding images is a bit complicated.
+
+First you need create a feature (PR) branch of https://github.com/grafana/website so you can make change. Then add the image to the `/static/img/docs` directory. Then make a commit that adds the image.
+
+Then run:
+```
+make docs-build
+```
+
+This will rebuild the docs docker container.
+
+To be able to use the image 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.
+
+### Editing content
+
+Changes to the markdown files should automatically cause a docs rebuild and live reload should reload the page in your browser.

docs/config.toml

@@ -0,0 +1,20 @@
+
+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/publish.sh

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

docs/s3_website.json

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

docs/sources/_index.md

@@ -1,9 +1,9 @@
 +++
 title = "Grafana documentation"
-description = "Guides, Installation and Feature Documentation"
+description = "Guides, Installation & Feature Documentation"
 keywords = ["grafana", "installation", "documentation"]
 type = "docs"
-aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin", "/docs/grafana/v3.1"]
+aliases = ["/v1.1", "/guides/reference/admin", "/v3.1"]
 +++
 
 # Grafana Documentation
@@ -18,7 +18,7 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
     <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>Installing on Mac OS X</h5>
     </a>
       <a href="{{< relref "installation/windows.md" >}}" class="nav-cards__item nav-cards__item--install">
         <div class="nav-cards__icon fa fa-windows">
@@ -36,7 +36,7 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
         <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>
+        <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>
@@ -46,25 +46,28 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
 <div class="nav-cards">
     <a href="https://grafana.com/grafana" class="nav-cards__item nav-cards__item--guide">
         <h4>What is Grafana?</h4>
-        <p>Get an overview of Grafana's key features.</p>
+        <p>Grafana feature highlights.</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>
+        <p>Article on all the Grafana 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>
+        <h4>Getting Started</h4>
+        <p>A guide that walks you through the basics of using Grafana</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>
+        <p>A guide to help you automate your Grafana setup & configuration.</p>
     </a>
-    <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 href="{{< relref "guides/whats-new-in-v6-3.md" >}}" class="nav-cards__item nav-cards__item--guide">
+        <h4>What's new in v6.3</h4>
+        <p>Article on all the new cool features and enhancements in v6.3</p>
+    </a>
+    <a href="{{< relref "tutorials/screencasts.md" >}}" class="nav-cards__item nav-cards__item--guide">
+        <h4>Screencasts</h4>
+        <p>Video tutorials & guides</p>
     </a>
-
 </div>
 
 <h2>Data Source Guides</h2>

docs/sources/administration/cli.md

@@ -10,215 +10,41 @@ 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.
 
-Grafana CLI has `plugins` and `admin` commands, as well as global options.
+## Plugins
 
-To list all commands and options:
-```
-grafana-cli -h
-```
+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" >}}).
 
-**Linux users**
-Some commands, such as installing or removing plugins, require `sudo` in order to run.
+## Admin
 
-**Windows users**
-Some commands, such as installing or removing plugins, require you to run Windows PowerShell as Administrator. 
+> This feature is only available in Grafana 4.1 and above.
 
-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 admin reset-admin-password --homepath "c:\Program Files\grafana" 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
-```
+To show all admin commands:
+`grafana-cli admin`
 
 ### Reset 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.
+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.
 
-If there are two flags being used to set the homepath and the config file path, then running the command returns this error:
+`grafana-cli admin reset-admin-password ...`
 
-> Could not find config defaults, make sure homepath command line parameter is set or working directory is homepath 
+If running the command returns this error:
 
-To correct this, use the `--homepath` global option to specify the Grafana default homepath for this command:
+> 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:
 
 ```bash
-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
+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
 ```

docs/sources/administration/image_rendering.md

@@ -1,196 +0,0 @@
-+++
-title = "Image Rendering"
-description = ""
-keywords = ["grafana", "image", "rendering", "phantomjs"]
-type = "docs"
-aliases = ["/docs/grafana/latest/installation/image-rendering"]
-[menu.docs]
-parent = "admin"
-weight = 8
-+++
-
-# Image Rendering
-
-Grafana supports rendering of panels and dashboards as PNG-images.
-
-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`.
-
-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.
-
-## Requirements
-
-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.
-
-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.
-
-## Rendering methods
-
-### Grafana image renderer plugin
-
-> 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).
-
-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.
-
-You can install it using grafana-cli:
-
-```bash
-grafana-cli plugins install grafana-image-renderer
-```
-
-For further information and instructions refer to [troubleshooting](#troubleshooting) and the [plugin details](https://grafana.com/grafana/plugins/grafana-image-renderer).
-
-#### Install in Grafana docker image
-
-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 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
-
-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.
-
-You can run the remote HTTP rendering service using Docker or as a standalone Node.js application.
-
-**Using Docker:**
-
-The following example describes 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.
-
-```yaml
-version: '2'
-
-services:
-  grafana:
-    image: grafana/grafana:master
-    ports:
-     - "3000:3000"
-    environment:
-      GF_RENDERING_SERVER_URL: http://renderer:8081/render
-      GF_RENDERING_CALLBACK_URL: http://grafana:3000/
-      GF_LOG_FILTERS: rendering:debug
-  renderer:
-    image: grafana/grafana-image-renderer:latest
-    ports:
-      - 8081
-```
-
-and finally run:
-
-```bash
-docker-compose up
-```
-
-**Running 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.
-
-1. Git clone the [Grafana image renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) repository.
-2. Install dependencies and build:
-
-```bash
-yarn install --pure-lockfile
-yarn run build
-```
-3. Run the server
-
-```bash
-node build/app.js server --port=8081
-```
-3. Update Grafana configuration:
-
-```
-[rendering]
-server_url = http://localhost:8081/render
-callback_url = http://localhost:3000/
-```
-4. Restart Grafana
-
-For further information and instructions refer to [troubleshooting](#troubleshooting) and the [plugin details](https://grafana.com/grafana/plugins/grafana-image-renderer).
-
-### PhantomJS
-
-> 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.
-
-[PhantomJS](https://phantomjs.org/) have been the only supported and default image renderer since Grafana v2.x and is shipped with Grafana.
-
-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.
-
-Please note that PhantomJS binaries are not included for ARM. To support this you will need to ensure that a phantomjs binary is available under tools/phantomjs/phantomjs.
-
-## Alerting and render limits
-
-Alert notifications can include images, but rendering many images at the same time can overload the server where the renderer is running. For instructions of how to configure this, see [concurrent_render_limit]({{< relref "../installation/configuration/#concurrent_render_limit" >}}).
-
-## Troubleshooting
-
-Enable debug log messages for rendering in the Grafana configuration file and inspect the Grafana server log.
-
-```bash
-[log]
-filters = rendering:debug
-```
-
-### Grafana image renderer plugin and remote rendering service
-
-The plugin and rendering service uses [Chromium browser](https://www.chromium.org/) which depends on certain libraries.
-If you don't have all of those libraries installed in your system you may encounter errors when trying to render an image, e.g.
-
-```bash
-Rendering failed: Error: Failed to launch chrome!/var/lib/grafana/plugins/grafana-image-renderer/chrome-linux/chrome:
-error while loading shared libraries: libX11.so.6: cannot open shared object file: No such file or directory\n\n\nTROUBLESHOOTING: https://github.com/GoogleChrome/puppeteer/blob/master/docs/troubleshooting.md
-```
-
-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:
-
-```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
-        ...
-```
-
-**Ubuntu:**
-
-On Ubuntu 18.10 the following dependencies have been confirmed as needed for the image rendering to function.
-
-```bash
-libx11-6 libx11-xcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrender1 libxtst6 libglib2.0-0 libnss3 libcups2  libdbus-1-3 libxss1 libxrandr2 libgtk-3-0 libgtk-3-0 libasound2
-```
-
-**Centos:**
-
-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
-
-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
-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).
-
-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.
-
-```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 = ["/docs/grafana/latest/installation/provisioning"]
+aliases = ["/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
 
-Check out the [configuration]({{< relref "../installation/configuration" >}}) page for more information on what you can configure in `grafana.ini`
+Checkout the [configuration](/installation/configuration) page for more information on what you can configure in `grafana.ini`
 
 ### Config File Locations
 
@@ -147,7 +147,7 @@ Since not all datasources have the same configuration settings we only have the
 | tlsAuthWithCACert | boolean | *All* | Enable TLS authentication using CA cert |
 | tlsSkipVerify | boolean | *All* | Controls whether a client verifies the server's certificate chain and host name. |
 | graphiteVersion | string | Graphite |  Graphite version  |
-| timeInterval | string | Prometheus, Elasticsearch, InfluxDB, MySQL, PostgreSQL and MSSQL | Lowest interval/step value that should be used for this data source |
+| timeInterval | string | Prometheus, Elasticsearch, InfluxDB, MySQL, PostgreSQL & MSSQL | Lowest interval/step value that should be used for this data source |
 | esVersion | number | Elasticsearch | Elasticsearch version as a number (2/5/56/60/70) |
 | timeField | string | Elasticsearch | Which field that should be used as timestamp |
 | interval | string | Elasticsearch | Index date time format. nil(No Pattern), 'Hourly', 'Daily', 'Weekly', 'Monthly' or 'Yearly' |
@@ -163,15 +163,15 @@ Since not all datasources have the same configuration settings we only have the
 | encrypt | string | MSSQL | Connection SSL encryption handling. 'disable', 'false' or 'true' |
 | postgresVersion | number | PostgreSQL | Postgres version as a number (903/904/905/906/1000) meaning v9.3, v9.4, ..., v10 |
 | timescaledb | boolean | PostgreSQL | Enable usage of TimescaleDB extension |
-| maxOpenConns | number | MySQL, PostgreSQL and MSSQL | Maximum number of open connections to the database (Grafana v5.4+) |
-| maxIdleConns | number | MySQL, PostgreSQL and MSSQL | Maximum number of connections in the idle connection pool (Grafana v5.4+) |
-| connMaxLifetime | number | MySQL, PostgreSQL and MSSQL | Maximum amount of time in seconds a connection may be reused (Grafana v5.4+) |
+| maxOpenConns | number | MySQL, PostgreSQL & MSSQL | Maximum number of open connections to the database (Grafana v5.4+) |
+| maxIdleConns | number | MySQL, PostgreSQL & MSSQL | Maximum number of connections in the idle connection pool (Grafana v5.4+) |
+| connMaxLifetime | number | MySQL, PostgreSQL & MSSQL | Maximum amount of time in seconds a connection may be reused (Grafana v5.4+) |
 
 #### Secure Json Data
 
 `{"authType":"keys","defaultRegion":"us-west-2","timeField":"@timestamp"}`
 
-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.
+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.
 
 | Name | Type | Datasource | Description |
 | ----| ---- | ---- | --- |
@@ -227,8 +227,6 @@ providers:
   editable: true
   # <int> how often Grafana will scan for changed dashboards
   updateIntervalSeconds: 10
-  # <bool> allow updating provisioned dashboards from the UI
-  allowUiUpdates: false
   options:
     # <string, required> path to dashboard files on disk. Required
     path: /var/lib/grafana/dashboards
@@ -237,20 +235,13 @@ providers:
 When Grafana starts, it will update/insert all dashboards available in the configured path. Then later on poll that path every **updateIntervalSeconds** and look for updated json files and update/insert those into the database.
 
 #### Making changes to a provisioned dashboard
-It's possible to make changes to a provisioned dashboard in the Grafana UI. However, it is not possible to automatically save the changes back to the provisioning source.
-If `allowUiUpdates` is set to `true` and you make changes to a provisioned dashboard, you can `Save` the dashboard then changes will be persisted to the Grafana database.
 
-> **Note.** 
-> If a provisioned dashboard is saved from the UI and then later updated from the source, the dashboard stored in the database will always be overwritten. The `version` property in the JSON file will not affect this, even if it is lower than the existing dashboard.
-> 
-> If a provisioned dashboard is saved from the UI and the source is removed, the dashboard stored in the database will be deleted unless the configuration option `disableDeletion` is set to true.
+It's possible to make changes to a provisioned dashboard in Grafana UI, but there's currently no possibility to automatically save the changes back to the provisioning source.
+However, if you make changes to a provisioned dashboard you can `Save` the dashboard which will bring up a *Cannot save provisioned dashboard* dialog like seen in the screenshot below.
+Here available options will let you `Copy JSON to Clipboard` and/or `Save JSON to file` which can help you synchronize your dashboard changes back to the provisioning source.
 
-If `allowUiUpdates` is configured to `false`, you are not able to make changes to a provisioned dashboard. When you click `Save`, Grafana brings up a *Cannot save provisioned dashboard* dialog. The screenshot below illustrates this behavior.
+Note: The JSON shown in input field and when using `Copy JSON to Clipboard` and/or `Save JSON to file` will have the `id` field automatically removed to aid the provisioning workflow.
 
-Grafana offers options to export the JSON definition of a dashboard. Either `Copy JSON to Clipboard` or `Save JSON to file` can help you synchronize your dashboard changes back to the provisioning source.
-
-Note: The JSON definition in the input field when using `Copy JSON to Clipboard` or `Save JSON to file` will have the `id` field automatically removed to aid the provisioning workflow.
-                                                                                                                                                                 
 {{< docs-imagebox img="/img/docs/v51/provisioning_cannot_save_dashboard.png" max-width="500px" class="docs-image--no-shadow" >}}
 
 ### Reusable Dashboard Urls
@@ -348,8 +339,8 @@ The following sections detail the supported settings for each alert notification
 | url |
 | recipient |
 | username |
-| icon_emoji |
-| icon_url |
+| iconEmoji |
+| iconUrl |
 | uploadImage |
 | mention |
 | token |
@@ -430,7 +421,6 @@ The following sections detail the supported settings for each alert notification
 | apiKey |
 | apiUrl |
 | autoClose |
-| overridePriority |
 
 #### Alert notification `telegram`
 
@@ -438,7 +428,6 @@ The following sections detail the supported settings for each alert notification
 | ---- |
 | bottoken |
 | chatid |
-| uploadImage |
 
 #### Alert notification `threema`
 

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]({{< relref "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](/alerting/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]({{< relref "../installation/configuration/#smtp" >}})
+To enable email notifications you have to setup [SMTP settings](/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
@@ -100,7 +100,6 @@ To set up PagerDuty, all you have to do is to provide an API 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
 
 ### Webhook
@@ -112,27 +111,22 @@ Example json body:
 
 ```json
 {
-  "dashboardId":1,
-  "evalMatches":[
+  "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": [
     {
-      "value":1,
-      "metric":"Count",
-      "tags":{}
+      "metric": "requests",
+      "tags": {},
+      "value": 122
     }
-  ],
-  "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"
-}```
+  ]
+}
+```
 
 - **state** - The possible values for alert state are: `ok`, `paused`, `alerting`, `pending`, `no_data`.
 
@@ -171,10 +165,6 @@ 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
@@ -187,13 +177,12 @@ 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 | yes
+OpsGenie | `opsgenie` | yes, external only | no
 Pagerduty | `pagerduty` | yes, external only | no
 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
@@ -201,10 +190,8 @@ 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]({{< relref "../administration/image_rendering/" >}}).
-
-Most Notification Channels require that this image be publicly accessible (Slack and PagerDuty for example). In order to include images in alert notifications, Grafana can upload the image to an image store. It currently supports
-Amazon S3, Webdav, Google Cloud Storage and Azure Blob Storage. So to set that up you need to configure the [external image uploader]({{< relref "../installation/configuration/#external-image-storage" >}}) in your grafana-server ini config file.
+Grafana can render the panel associated with the alert rule and include that in the notification. 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.
 
 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.
 
@@ -223,4 +210,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]({{< relref "../installation/configuration/#domain" >}}) setting in Grafana.
+This url is based on the [domain](/installation/configuration/#domain) setting in Grafana.

docs/sources/alerting/rules.md

@@ -1,15 +1,15 @@
 +++
-title = "Alerting Engine and Rules Guide"
+title = "Alerting Engine & Rules Guide"
 description = "Configuring Alert Rules"
 keywords = ["grafana", "alerting", "guide", "rules"]
 type = "docs"
 [menu.docs]
-name = "Engine and Rules"
+name = "Engine & Rules"
 parent = "alerting"
 weight = 1
 +++
 
-# Alerting Engine and Rules Guide
+# Alerting Engine & Rules Guide
 
 > Alerting is only available in Grafana v4.0 and above.
 
@@ -28,7 +28,7 @@ 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` and `OpenTSDB`.
 
 > Alerting support for Azure Monitor is only available in Grafana v6.0 and above.
 
@@ -40,18 +40,18 @@ Currently alerting supports a limited form of high availability. Since v4.2.0 of
 
 ## Rule Config
 
-Currently only the graph panel supports alert rules.
 
-### Name and Evaluation interval
+
+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.
+
+### Name & 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
 
-> **Important note regarding No Data:**
->
-> Do not use `For` with the `If no data or all values are null` setting set to `No Data`. The triggering of `No Data` will trigger instantly and not take `For` into consideration. This may also result in that an OK notification not being sent if alert transitions from `No Data -> Pending -> OK`.
+> This setting is available in Grafana 5.4 and above.
 
 If an alert rule has a configured `For` and the query violates the configured threshold it will first go from `OK` to `Pending`. Going from `OK` to `Pending` Grafana will not send any notifications. Once the alert rule has been firing for more than `For` duration, it will change to `Alerting` and send alert notifications.
 
@@ -105,7 +105,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]({{< relref "notifications/#send-reminders" >}}).
+> of this feature for identifying new/existing series causing alert to fire. [Read more about notification reminders here](/alerting/notifications/#send-reminders).
 
 ### No Data / Null values
 
@@ -137,11 +137,11 @@ The message can contain anything, information about how you might solve the issu
 The actual notifications are configured and shared between multiple alerts. Read the
 [notifications]({{< relref "notifications.md" >}}) guide for how to configure and setup notifications.
 
-## Alert State History and Annotations
+## Alert State History & Annotations
 
 Alert state changes are recorded in the internal annotation table in Grafana's database. The state changes
 are visualized as annotations in the alert rule's graph panel. You can also go into the `State history`
-submenu in the alert tab to view and clear state history.
+submenu in the alert tab to view & clear state history.
 
 ## Troubleshooting
 

docs/sources/archive.md

@@ -12,10 +12,12 @@ weight = 200
 Here you can find links to older versions of the documentation that might be better suited for your version
 of Grafana.
 
-- [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)
+- [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)

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 = ["/docs/grafana/latest/tutorials/authproxy/"]
+aliases = ["/tutorials/authproxy/"]
 [menu.docs]
 name = "Auth Proxy"
 identifier = "auth-proxy"
@@ -13,7 +13,7 @@ weight = 2
 
 # Auth Proxy Authentication
 
-You can configure Grafana to let a HTTP reverse proxy handling authentication. Popular web servers have a very
+You can configure Grafana to let a http reverse proxy handling authentication. Popular web servers have a very
 extensive list of pluggable authentication modules, and any of them can be used with the AuthProxy feature.
 Below we detail the configuration options for auth proxy.
 
@@ -27,9 +27,8 @@ header_name = X-WEBAUTH-USER
 header_property = username
 # Set to `true` to enable auto sign up of users who do not exist in Grafana DB. Defaults to `true`.
 auto_sign_up = true
-# Define cache time to live in minutes
-# If combined with Grafana LDAP integration it is also the sync interval
-sync_ttl = 60
+# If combined with Grafana LDAP integration define sync interval in minutes
+ldap_sync_ttl = 60
 # Limit where auth proxy requests come from by configuring a list of IP addresses.
 # This can be used to prevent users spoofing the X-WEBAUTH-USER header.
 # Example `whitelist = 192.168.1.1, 192.168.1.0/24, 2001::23, 2001::0/120`
@@ -37,8 +36,6 @@ 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 =
-# Check out docs on this for more details on the below setting
-enable_login_token = false
 ```
 
 ## Interacting with Grafana’s AuthProxy via curl
@@ -157,7 +154,6 @@ For this example we use the official Apache docker image available at [Docker Hu
 ```bash
 ServerRoot "/usr/local/apache2"
 Listen 80
-LoadModule mpm_event_module modules/mod_mpm_event.so
 LoadModule authn_file_module modules/mod_authn_file.so
 LoadModule authn_core_module modules/mod_authn_core.so
 LoadModule authz_host_module modules/mod_authz_host.so
@@ -238,7 +234,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 "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 "auth/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,14 +292,4 @@ 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 "team-sync.md" >}})
-
-
-## Login token and session cookie
-
-With `enable_login_token` set to `true` Grafana will, after successful auth proxy header validation, assign the user
-a login token and cookie. You only have to configure your auth proxy to provide headers for the /login route.
-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]({{< relref "overview/#login-and-short-lived-tokens" >}})
+[Learn more about Team Sync]({{< relref "auth/team-sync.md" >}})