CircleCI: Enable internal v7.0.0 release (#24733)

* CircleCI: Sync with master branch

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

* CirclecI: Temporarily modify release pipeline to only publish internally

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

.circleci/config.yml

@@ -2,11 +2,22 @@ version: 2.1
 
 aliases:
   # Workflow filters
+  # filter-all triggers for all branches and version tags
+  - &filter-all
+    tags:
+      only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
   - &filter-only-release
     branches:
       only: chore/test-release-pipeline
     tags:
       only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
+  - &filter-not-release-or-master
+    tags:
+      ignore: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
+    branches:
+      ignore:
+        - master
+        - chore/test-release-pipeline
   - &filter-only-master
     branches:
       only: master
@@ -24,16 +35,13 @@ executors:
       - image: cimg/base:stable
   node:
     docker:
-      - image: cimg/node:12.18
+      - image: cimg/node:12.16
   go:
     docker:
       - image: cimg/go:1.14
-  e2e:
-    docker:
-      - image: srclosson/grafana-plugin-ci-e2e:latest
   grafana-build:
     docker:
-      - image: grafana/build-container:1.2.26
+      - image: grafana/build-container:1.2.16
   grafana-publish:
     docker:
       - image: grafana/grafana-ci-deploy:1.2.5
@@ -48,7 +56,7 @@ commands:
       - run:
           name: "Install Grafana build pipeline tool"
           command: |
-            VERSION=0.5.8
+            VERSION=0.4.8
             curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v${VERSION}/grabpl
             chmod +x grabpl
             mv grabpl /tmp
@@ -66,7 +74,7 @@ jobs:
       - run:
           name: Exit if enterprise and forked PR
           command: |
-            if [[ "<< parameters.edition >>" == "enterprise" && -n "$CIRCLE_PR_NUMBER" ]]; then
+            if [[ "<< parameters.edition >>" == "enterprise"  && -n "$CIRCLE_PR_NUMBER" ]]; then
               echo "Nothing to do for forked PRs, so marking this step successful"
               circleci step halt
             fi
@@ -80,15 +88,15 @@ jobs:
           command: |
             if [[ -n $CIRCLE_TAG ]]; then
               # A release build
-              /tmp/grabpl build-backend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> \
+              /tmp/grabpl build-backend --edition << parameters.edition >> \
                 --variants << parameters.variant >> $CIRCLE_TAG
             elif [[ $CIRCLE_BRANCH == "chore/test-release-pipeline" ]]; then
               # We're testing the release pipeline
-              /tmp/grabpl build-backend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> \
+              /tmp/grabpl build-backend --edition << parameters.edition >> \
                 --variants << parameters.variant >> v7.0.0-test
             else
               # A master or PR build
-              /tmp/grabpl build-backend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> \
+              /tmp/grabpl build-backend --edition << parameters.edition >> \
                 --variants << parameters.variant >> --build-id $CIRCLE_WORKFLOW_ID
             fi
       - run:
@@ -118,7 +126,7 @@ jobs:
       - run:
           name: Exit if enterprise and forked PR
           command: |
-            if [[ "<< parameters.edition >>" == "enterprise" && -n "$CIRCLE_PR_NUMBER" ]]; then
+            if [[ "<< parameters.edition >>" == "enterprise"  && -n "$CIRCLE_PR_NUMBER" ]]; then
               echo "Nothing to do for forked PRs, so marking this step successful"
               circleci step halt
             fi
@@ -147,17 +155,7 @@ jobs:
             - node_modules
       - run:
           name: Build Grafana frontend
-          command: |
-            if [[ -n $CIRCLE_TAG ]]; then
-              # A release build
-              /tmp/grabpl build-frontend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> $CIRCLE_TAG
-            elif [[ $CIRCLE_BRANCH == "chore/test-release-pipeline" ]]; then
-              # We're testing the release pipeline
-              /tmp/grabpl build-frontend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> 7.0.0-test
-            else
-              # A master or PR build
-              /tmp/grabpl build-frontend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> --build-id $CIRCLE_WORKFLOW_ID
-            fi
+          command: /tmp/grabpl build-frontend --edition << parameters.edition >>
       - run:
           name: Move artifacts
           command: mkdir << parameters.edition >> && cp -r public << parameters.edition >>/
@@ -184,7 +182,7 @@ jobs:
       - run:
           name: Exit if enterprise and forked PR
           command: |
-            if [[ "<< parameters.edition >>" == "enterprise" && -n "$CIRCLE_PR_NUMBER" ]]; then
+            if [[ "<< parameters.edition >>" == "enterprise"  && -n "$CIRCLE_PR_NUMBER" ]]; then
               echo "Nothing to do for forked PRs, so marking this step successful"
               circleci step halt
             fi
@@ -406,20 +404,20 @@ jobs:
             export GRAFANA_API_KEY=$GRAFANA_COM_API_KEY
             if [[ -n $CIRCLE_TAG ]]; then
               # A release build
-              /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition oss --sign $CIRCLE_TAG
+              /tmp/grabpl package --jobs 2 --edition oss --sign $CIRCLE_TAG
             elif [[ $CIRCLE_BRANCH == "chore/test-release-pipeline" ]]; then
               # We're testing the release pipeline
-              /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition oss --sign v7.0.0-test
+              /tmp/grabpl package --jobs 2 --edition oss --sign v7.0.0-test
             elif [[ $CIRCLE_BRANCH == "master" ]]; then
               # A master build
-              /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition oss --sign --build-id $CIRCLE_WORKFLOW_ID
+              /tmp/grabpl package --jobs 2 --edition oss --sign --build-id $CIRCLE_WORKFLOW_ID
             elif [[ -n "$CIRCLE_PR_NUMBER" ]]; then
-              # A forked PR build, don't sign as it requires an API secret
-              /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition oss --build-id $CIRCLE_WORKFLOW_ID --variants \
+              # A forked forked PR build, don't sign as it requires an API secret
+              /tmp/grabpl package --jobs 2 --edition oss --build-id $CIRCLE_WORKFLOW_ID --variants \
                 linux-x64,linux-x64-musl,osx64,win64
             else
               # A non-forked PR build
-              /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition oss --sign --build-id $CIRCLE_WORKFLOW_ID --variants \
+              /tmp/grabpl package --jobs 2 --edition oss --sign --build-id $CIRCLE_WORKFLOW_ID --variants \
                 linux-x64,linux-x64-musl,osx64,win64
             fi
       - run:
@@ -468,20 +466,20 @@ jobs:
 
             if [[ -n $CIRCLE_TAG ]]; then
               # A release build
-              /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition enterprise --sign $CIRCLE_TAG
+              /tmp/grabpl package --jobs 2 --edition enterprise --sign $CIRCLE_TAG
             elif [[ $CIRCLE_BRANCH == "chore/test-release-pipeline" ]]; then
               # We're testing the release pipeline
-              /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition enterprise --sign v7.0.0-test
+              /tmp/grabpl package --jobs 2 --edition enterprise --sign v7.0.0-test
             elif [[ $CIRCLE_BRANCH == "master" ]]; then
               # A master build
-              /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition enterprise --sign --build-id $CIRCLE_WORKFLOW_ID
+              /tmp/grabpl package --jobs 2 --edition enterprise --sign --build-id $CIRCLE_WORKFLOW_ID
             elif [[ -n "$CIRCLE_PR_NUMBER" ]]; then
-              # A forked PR build, don't sign as it requires an API secret
-              /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition enterprise --build-id $CIRCLE_WORKFLOW_ID --variants \
+              # A forked forked PR build, don't sign as it requires an API secret
+              /tmp/grabpl package --jobs 2 --edition enterprise --build-id $CIRCLE_WORKFLOW_ID --variants \
                 linux-x64,linux-x64-musl,osx64,win64
             else
               # A PR build
-              /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition enterprise --sign --build-id $CIRCLE_WORKFLOW_ID --variants \
+              /tmp/grabpl package --jobs 2 --edition enterprise --sign --build-id $CIRCLE_WORKFLOW_ID --variants \
                 linux-x64,linux-x64-musl,osx64,win64
             fi
       - run:
@@ -533,7 +531,10 @@ jobs:
                 --deb-db-bucket grafana-testing-aptly-db --deb-repo-bucket grafana-testing-repo --packages-bucket \
                 grafana-downloads-test --rpm-repo-bucket grafana-testing-repo --simulate-release
             else
-              /tmp/grabpl publish-packages --edition << parameters.edition >>
+              # TODO: Revert to non-simulation
+              /tmp/grabpl publish-packages --edition << parameters.edition >> \
+                --deb-db-bucket grafana-testing-aptly-db --deb-repo-bucket grafana-testing-repo --packages-bucket \
+                grafana-downloads-test --rpm-repo-bucket grafana-testing-repo --simulate-release
             fi
       - run:
           name: CI job failed
@@ -600,7 +601,7 @@ jobs:
       - run:
           name: Exit if enterprise and forked PR
           command: |
-            if [[ "<< parameters.edition >>" == "enterprise" && -n "$CIRCLE_PR_NUMBER" ]]; then
+            if [[ "<< parameters.edition >>" == "enterprise"  && -n "$CIRCLE_PR_NUMBER" ]]; then
               echo "Nothing to do for forked PRs, so marking this step successful"
               circleci step halt
             fi
@@ -617,12 +618,11 @@ jobs:
       - run:
           name: Install gcloud SDK
           command: |
-            VERSION=298.0.0
-            curl -fLO https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${VERSION}-linux-x86_64.tar.gz
-            echo 0d58f451331abf43d080fa997c8e580d64897627e30be74f6d8f983ccfabef1e \
-              google-cloud-sdk-${VERSION}-linux-x86_64.tar.gz | sha256sum --check --strict --status
-            tar xf google-cloud-sdk-${VERSION}-linux-x86_64.tar.gz
-            ./google-cloud-sdk/install.sh -q
+            echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \
+              sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
+            curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
+              sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
+            sudo apt-get update && sudo apt-get install google-cloud-sdk
       # XXX: Is this necessary?
       - run: docker run --privileged linuxkit/binfmt:v0.6
       - run:
@@ -632,7 +632,6 @@ jobs:
       - run:
           name: Build Docker images
           command: |
-            source google-cloud-sdk/path.bash.inc
             if [[ -n $CIRCLE_TAG || $CIRCLE_BRANCH == "chore/test-release-pipeline" || $CIRCLE_BRANCH == "master" ]]; then
               # It's a full build
               /tmp/grabpl build-docker --jobs 4 --edition << parameters.edition >> \
@@ -657,9 +656,12 @@ jobs:
               /tmp/grabpl publish-docker --jobs 4 --edition << parameters.edition >> --ubuntu=<< parameters.ubuntu >> --dry-run
             elif [[ -n $CIRCLE_TAG ]]; then
               # This is a release
-              /tmp/grabpl publish-docker --jobs 4 --edition << parameters.edition >> --ubuntu=<< parameters.ubuntu >>
+              # TODO: Revert to non-internal
+              /tmp/grabpl publish-docker --jobs 4 --edition << parameters.edition >> --ubuntu=<< parameters.ubuntu >> \
+                --internal
             else
-              /tmp/grabpl publish-docker --jobs 4 --edition << parameters.edition >> --ubuntu=<< parameters.ubuntu >>
+              # TODO: Don't ignore errors, temporary workaround until we fix #22955
+              /tmp/grabpl publish-docker --jobs 4 --edition << parameters.edition >> --ubuntu=<< parameters.ubuntu >> || echo Publishing failed!
             fi
       - run:
           name: CI job failed
@@ -671,7 +673,8 @@ jobs:
           when: on_success
 
   end-to-end-tests:
-    executor: e2e
+    docker:
+      - image: circleci/node:12-browsers
     steps:
       - attach_workspace:
           at: /tmp/workspace
@@ -785,7 +788,7 @@ jobs:
       - run:
           # Important: all words have to be in lowercase, and separated by "\n".
           name: exclude known exceptions
-          command: 'echo -e "unknwon\nreferer\nerrorstring\neror\niam" > words_to_ignore.txt'
+          command: 'echo -e "unknwon\nreferer\nerrorstring\neror" > words_to_ignore.txt'
       - run:
           name: check documentation spelling errors
           command: "codespell -I ./words_to_ignore.txt docs/"
@@ -803,32 +806,29 @@ jobs:
           name: Install Go linters
           command: |
             pushd /tmp
-            VERSION=1.28.0
-            curl -fLO https://github.com/golangci/golangci-lint/releases/download/v${VERSION}/golangci-lint-${VERSION}-linux-amd64.tar.gz
-            echo 179d34edf4baf6454a7081fbaaf74dc99397a3be8e1a535dee04d835a977bf76 \
-              golangci-lint-${VERSION}-linux-amd64.tar.gz | sha256sum --check --strict --status
-            tar -xf golangci-lint-${VERSION}-linux-amd64.tar.gz
-            sudo mv golangci-lint-${VERSION}-linux-amd64/golangci-lint /usr/local/bin/
+            curl -fLO https://github.com/golangci/golangci-lint/releases/download/v1.24.0/golangci-lint-1.24.0-linux-amd64.tar.gz
+            echo 241ca454102e909de04957ff8a5754c757cefa255758b3e1fba8a4533d19d179 \
+              golangci-lint-1.24.0-linux-amd64.tar.gz | sha256sum --check --strict --status
+            tar -xf golangci-lint-1.24.0-linux-amd64.tar.gz
+            sudo mv golangci-lint-1.24.0-linux-amd64/golangci-lint /usr/local/bin/
             popd
-            make scripts/go/bin/revive
+            make scripts/go/bin/revive scripts/go/bin/gosec
       - run:
           name: Lint Go
           command: |
-            # To save memory, run in two batches
-            golangci-lint run -v -j 4 --config scripts/go/configs/ci/.golangci.toml -E deadcode -E depguard -E dogsled \
-              -E errcheck -E goconst -E golint -E gosec -E gosimple -E govet -E exportloopref -E whitespace \
-              -E goprintffuncname ./pkg/...
-            golangci-lint run -v -j 4 --config scripts/go/configs/ci/.golangci.toml -E ineffassign -E gocritic -E nakedret \
-              -E rowserrcheck -E staticcheck -E structcheck -E typecheck -E unconvert -E unused -E varcheck ./pkg/...
+            go vet ./pkg/...
+            golangci-lint run -v -j 4 --config scripts/go/configs/ci/.golangci.yml -E deadcode -E gofmt \
+              -E gosimple -E ineffassign -E structcheck -E typecheck ./pkg/...
+            golangci-lint run -v -j 4 --config scripts/go/configs/ci/.golangci.yml -E unconvert -E unused \
+              -E varcheck -E goconst -E errcheck -E staticcheck ./pkg/...
             ./scripts/go/bin/revive -formatter stylish -config ./scripts/go/configs/revive.toml ./pkg/...
             ./scripts/go/bin/revive -formatter stylish -config ./scripts/go/configs/revive-strict.toml \
-              -exclude ./pkg/plugins/backendplugin/pluginextensionv2/... \
               ./pkg/services/alerting/... \
               ./pkg/services/provisioning/datasources/... \
-              ./pkg/services/provisioning/dashboards/... \
-              ./pkg/services/provisioning/notifiers/... \
-              ./pkg/services/provisioning/values/... \
-              ./pkg/plugins/backendplugin/...
+              ./pkg/services/provisioning/dashboards/...
+
+            ./scripts/go/bin/gosec -quiet -exclude=G104,G107,G108,G201,G202,G204,G301,G304,G401,G402,G501 \
+              -conf=./scripts/go/configs/gosec.json ./pkg/...
 
   test-frontend:
     executor: node
@@ -852,8 +852,7 @@ jobs:
             - node_modules
       - run:
           name: frontend tests
-          command: |
-            ./scripts/circle-test-frontend.sh
+          command: "./scripts/circle-test-frontend.sh"
       - store_test_results:
           path: reports/junit
       - run:
@@ -885,13 +884,18 @@ jobs:
           when: on_success
 
   build-docs-website:
-    executor: base
+    executor: grafana-build
     steps:
       - checkout
       - setup_remote_docker
       - run:
           name: CI job started
           command: "./scripts/ci-job-started.sh"
+      - run:
+          name: Install docker
+          command: |
+            apt-get update
+            apt-get install -y docker.io
       - run:
           name: Build Grafana docs website
           command: |
@@ -917,14 +921,11 @@ jobs:
     description: "Deploy Grafana master Docker image to Kubernetes"
     executor: base
     steps:
-      - attach_workspace:
-          at: /tmp/workspace
       - install-grabpl
       - run:
           name: Deploy to Kubernetes
           command: |
-            cp -r /tmp/workspace/enterprise/dist .
-            /tmp/grabpl deploy-to-k8s
+            /tmp/grabpl deploy-to-k8s $CIRCLE_WORKFLOW_ID
 
   release-packages:
     executor: node
@@ -966,13 +967,7 @@ jobs:
           command: "./scripts/ci-job-succeeded.sh"
           when: on_success
 
-  scan-docker-image:
-    description: "Scans a docker image for vulnerabilities using trivy"
-    parameters:
-      image:
-        type: string
-      tag:
-        type: string
+  scan-docker-images:
     docker:
       - image: circleci/buildpack-deps:stretch
     steps:
@@ -995,11 +990,29 @@ jobs:
           name: Clear trivy cache
           command: trivy --clear-cache
       - run:
-          name: Scan Docker image for unkown/low/medium vulnerabilities
-          command: trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM << parameters.image >>:<< parameters.tag >>
+          name: Scan grafana/grafana:master
+          command: trivy --exit-code 1 grafana/grafana:master
       - run:
-          name: Scan Docker image for high/critical vulnerabilities
-          command: trivy --exit-code 1 --severity HIGH,CRITICAL << parameters.image >>:<< parameters.tag >>
+          name: Scan grafana/grafana:master-ubuntu
+          command: trivy --exit-code 1 grafana/grafana:master-ubuntu
+      - run:
+          name: Scan grafana/grafana-enterprise:master
+          command: trivy --exit-code 1 grafana/grafana-enterprise:master
+      - run:
+          name: Scan grafana/grafana-enterprise:master-ubuntu
+          command: trivy --exit-code 1 grafana/grafana-enterprise:master-ubuntu
+      - run:
+          name: Scan grafana/grafana:latest
+          command: trivy --exit-code 1 grafana/grafana:latest
+      - run:
+          name: Scan grafana/grafana:latest-ubuntu
+          command: trivy --exit-code 1 grafana/grafana:latest-ubuntu
+      - run:
+          name: Scan grafana/grafana-enterprise:latest
+          command: trivy --exit-code 1 grafana/grafana-enterprise:latest
+      - run:
+          name: Scan grafana/grafana-enterprise:latest-ubuntu
+          command: trivy --exit-code 1 grafana/grafana-enterprise:latest-ubuntu
       - save_cache:
           key: vulnerability-db
           paths:
@@ -1044,39 +1057,39 @@ workflows:
           requires:
             - lint-go
       - build-backend:
-          filters: *filter-master-or-release
+          filters: *filter-all
           edition: oss
           variant: osx64
           name: build-oss-backend-osx64
           requires:
             - lint-go
       - build-backend:
-          filters: *filter-master-or-release
+          filters: *filter-all
           edition: oss
           variant: win64
           name: build-oss-backend-win64
           requires:
             - lint-go
       - build-backend:
-          filters: *filter-master-or-release
+          filters: *filter-all
           edition: oss
           variant: linux-x64
           name: build-oss-backend-linux-x64
           requires:
             - lint-go
       - build-backend:
-          filters: *filter-master-or-release
+          filters: *filter-all
           edition: oss
           variant: linux-x64-musl
           name: build-oss-backend-linux-x64-musl
           requires:
             - lint-go
       - build-frontend:
-          filters: *filter-master-or-release
+          filters: *filter-all
           name: build-oss-frontend
           edition: oss
       - build-plugins:
-          filters: *filter-master-or-release
+          filters: *filter-all
           name: build-oss-plugins
           edition: oss
           requires:
@@ -1117,39 +1130,39 @@ workflows:
           requires:
             - lint-go
       - build-backend:
-          filters: *filter-master-or-release
+          filters: *filter-all
           name: build-enterprise-backend-osx64
           edition: enterprise
           variant: osx64
           requires:
             - lint-go
       - build-backend:
-          filters: *filter-master-or-release
+          filters: *filter-all
           name: build-enterprise-backend-win64
           edition: enterprise
           variant: win64
           requires:
             - lint-go
       - build-backend:
-          filters: *filter-master-or-release
+          filters: *filter-all
           name: build-enterprise-backend-linux-x64
           edition: enterprise
           variant: linux-x64
           requires:
             - lint-go
       - build-backend:
-          filters: *filter-master-or-release
+          filters: *filter-all
           name: build-enterprise-backend-linux-x64-musl
           edition: enterprise
           variant: linux-x64-musl
           requires:
             - lint-go
       - build-frontend:
-          filters: *filter-master-or-release
+          filters: *filter-all
           name: build-enterprise-frontend
           edition: enterprise
       - build-plugins:
-          filters: *filter-master-or-release
+          filters: *filter-all
           name: build-enterprise-plugins
           edition: enterprise
           requires:
@@ -1157,31 +1170,31 @@ workflows:
       - build-release-publisher:
           filters: *filter-master-or-release
       - codespell:
-          filters: *filter-master-or-release
+          filters: *filter-all
       - lint-go:
-          filters: *filter-master-or-release
+          filters: *filter-all
       - shellcheck:
-          filters: *filter-master-or-release
+          filters: *filter-all
       - test-backend:
-          filters: *filter-master-or-release
+          filters: *filter-all
           requires:
             - lint-go
       - test-frontend:
-          filters: *filter-master-or-release
+          filters: *filter-all
       - mysql-integration-test:
-          filters: *filter-master-or-release
+          filters: *filter-all
           requires:
             - lint-go
             - test-backend
             - test-frontend
       - postgres-integration-test:
-          filters: *filter-master-or-release
+          filters: *filter-all
           requires:
             - lint-go
             - test-backend
             - test-frontend
       - package-oss:
-          filters: *filter-master-or-release
+          filters: *filter-all
           requires:
             - build-oss-backend-armv6
             - build-oss-backend-armv7
@@ -1199,7 +1212,7 @@ workflows:
             - shellcheck
             - build-oss-plugins
       - package-enterprise:
-          filters: *filter-master-or-release
+          filters: *filter-all
           requires:
             - build-enterprise-backend-armv6
             - build-enterprise-backend-armv7
@@ -1217,23 +1230,17 @@ workflows:
             - shellcheck
             - build-enterprise-plugins
       - build-oss-windows-installer:
-          filters: *filter-master-or-release
+          filters: *filter-all
           requires:
             - package-oss
       - build-enterprise-windows-installer:
-          filters: *filter-master-or-release
+          filters: *filter-all
           requires:
             - package-enterprise
       - release-next-packages:
           filters: *filter-only-master
           requires:
             - end-to-end-tests
-      - release-packages:
-          filters: *filter-only-release
-          requires:
-            - end-to-end-tests
-            - mysql-integration-test
-            - postgres-integration-test
       - publish-packages:
           filters: *filter-master-or-release
           name: publish-oss-packages
@@ -1256,13 +1263,14 @@ workflows:
             - mysql-integration-test
             - postgres-integration-test
             - build-release-publisher
+      # Is this OK to run on Friday?
       - publish-storybook:
-          filters: *filter-master-or-release
+          filters: *filter-all
           requires:
             - test-backend
             - test-frontend
       - build-docker-images:
-          filters: *filter-master-or-release
+          filters: *filter-all
           name: build-oss-docker-images
           edition: oss
           ubuntu: false
@@ -1273,7 +1281,7 @@ workflows:
             - package-oss
             - build-oss-windows-installer
       - build-docker-images:
-          filters: *filter-master-or-release
+          filters: *filter-all
           name: build-oss-ubuntu-docker-images
           edition: oss
           ubuntu: true
@@ -1284,7 +1292,7 @@ workflows:
             - package-oss
             - build-oss-windows-installer
       - build-docker-images:
-          filters: *filter-master-or-release
+          filters: *filter-all
           name: build-enterprise-docker-images
           edition: enterprise
           ubuntu: false
@@ -1295,7 +1303,7 @@ workflows:
             - package-enterprise
             - build-enterprise-windows-installer
       - build-docker-images:
-          filters: *filter-master-or-release
+          filters: *filter-all
           name: build-enterprise-ubuntu-docker-images
           edition: enterprise
           ubuntu: true
@@ -1306,9 +1314,14 @@ workflows:
             - package-enterprise
             - build-enterprise-windows-installer
       - end-to-end-tests:
-          filters: *filter-master-or-release
+          filters: *filter-all
           requires:
             - package-oss
+      - build-docs-website:
+          filters: *filter-not-release-or-master
+          requires:
+            - mysql-integration-test
+            - postgres-integration-test
       - deploy-to-kubernetes:
           filters: *filter-only-master
           requires:
@@ -1320,8 +1333,4 @@ workflows:
           cron: "0 0 * * *"
           filters: *filter-only-master
     jobs:
-      - scan-docker-image:
-          matrix:
-            parameters:
-              image: [grafana/grafana, grafana/grafana-enterprise]
-              tag: [latest, master, latest-ubuntu, master-ubuntu]
+      - scan-docker-images

.drone.star

@@ -1,5 +0,0 @@
-load('scripts/lib.star', 'pr_pipelines', 'master_pipelines')
-
-def main(ctx):
-    edition = 'oss'
-    return pr_pipelines(edition=edition) + master_pipelines(edition=edition)

.drone.yml

@@ -1,546 +0,0 @@
----
-kind: pipeline
-type: docker
-name: test-pr
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: identify-runner
-  image: alpine:3.12
-  commands:
-  - echo $DRONE_RUNNER_NAME
-
-- name: initialize
-  image: grafana/build-container:1.2.26
-  commands:
-  - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v$${GRABPL_VERSION}/grabpl
-  - chmod +x grabpl
-  - mkdir -p bin
-  - mv grabpl bin
-  - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
-  - tar -C bin -xzvf dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
-  - rm dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
-  - yarn install --frozen-lockfile --no-progress
-  environment:
-    DOCKERIZE_VERSION: 0.6.1
-    GRABPL_VERSION: 0.5.8
-
-- name: lint-backend
-  image: grafana/build-container:1.2.26
-  commands:
-  - golangci-lint run --config scripts/go/configs/.golangci.toml ./pkg/...
-  - revive -formatter stylish -config scripts/go/configs/revive.toml ./pkg/...
-  - ./scripts/revive-strict
-  environment:
-    CGO_ENABLED: 1
-  depends_on:
-  - initialize
-
-- name: codespell
-  image: grafana/build-container:1.2.26
-  commands:
-  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
-  - codespell -I words_to_ignore.txt docs/
-  depends_on:
-  - initialize
-
-- name: shellcheck
-  image: grafana/build-container:1.2.26
-  commands:
-  - curl -fLO http://storage.googleapis.com/grafana-downloads/ci-dependencies/shellcheck-v$${VERSION}.linux.x86_64.tar.xz
-  - echo $$CHKSUM shellcheck-v$${VERSION}.linux.x86_64.tar.xz | sha512sum --check --strict --status
-  - tar xf shellcheck-v$${VERSION}.linux.x86_64.tar.xz
-  - mv shellcheck-v$${VERSION}/shellcheck /usr/local/bin/
-  - rm -rf shellcheck-v$${VERSION}*
-  - ./bin/grabpl shellcheck
-  environment:
-    CHKSUM: beca3d7819a6bdcfbd044576df4fc284053b48f468b2f03428fe66f4ceb2c05d9b5411357fa15003cb0311406c255084cf7283a3b8fce644c340c2f6aa910b9f
-    VERSION: 0.7.1
-  depends_on:
-  - initialize
-
-- name: test-backend
-  image: grafana/build-container:1.2.26
-  commands:
-  - ./bin/grabpl test-backend
-  - ./bin/grabpl integration-tests
-  depends_on:
-  - initialize
-  - lint-backend
-
-- name: test-frontend
-  image: grafana/build-container:1.2.26
-  commands:
-  - yarn run ci:test-frontend
-  environment:
-    TEST_MAX_WORKERS: 50%
-  depends_on:
-  - initialize
-
-- name: build-backend
-  image: grafana/build-container:1.2.26
-  commands:
-  - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id $DRONE_BUILD_NUMBER --variants linux-x64,linux-x64-musl,osx64,win64 --no-pull-enterprise
-  depends_on:
-  - initialize
-  - lint-backend
-  - test-backend
-
-- name: build-frontend
-  image: grafana/build-container:1.2.26
-  commands:
-  - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id $DRONE_BUILD_NUMBER --no-pull-enterprise
-  depends_on:
-  - initialize
-  - test-frontend
-
-- name: build-plugins
-  image: grafana/build-container:1.2.26
-  commands:
-  - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps
-  depends_on:
-  - initialize
-  - lint-backend
-
-- name: package
-  image: grafana/build-container:1.2.26
-  commands:
-  - . scripts/build/gpg-test-vars.sh && ./bin/grabpl package --jobs 8 --edition oss --build-id $DRONE_BUILD_NUMBER --no-pull-enterprise --variants linux-x64,linux-x64-musl,osx64,win64
-  depends_on:
-  - build-backend
-  - build-frontend
-  - build-plugins
-  - test-backend
-  - test-frontend
-  - codespell
-  - shellcheck
-
-- name: end-to-end-tests-server
-  image: grafana/build-container:1.2.26
-  detach: true
-  commands:
-  - ./e2e/start-server
-  depends_on:
-  - package
-
-- name: end-to-end-tests
-  image: grafana/ci-e2e:12.18-1
-  commands:
-  - ./node_modules/.bin/cypress install
-  - ./bin/grabpl e2e-tests
-  environment:
-    HOST: end-to-end-tests-server
-  depends_on:
-  - end-to-end-tests-server
-
-- name: build-storybook
-  image: grafana/build-container:1.2.26
-  commands:
-  - yarn storybook:build
-  depends_on:
-  - package
-
-- name: build-docs-website
-  image: grafana/docs-base:latest
-  commands:
-  - mkdir -p /hugo/content/docs/grafana
-  - cp -r docs/sources /hugo/content/docs/grafana/latest
-  - cd /hugo && make prod
-  depends_on:
-  - initialize
-
-- name: copy-packages-for-docker
-  image: grafana/build-container:1.2.26
-  commands:
-  - cp dist/*.tar.gz packaging/docker/
-  depends_on:
-  - package
-
-- name: build-docker-images
-  image: grafana/drone-grafana-docker:0.2.0
-  settings:
-    archs: amd64
-    dry_run: true
-    edition: oss
-  depends_on:
-  - copy-packages-for-docker
-
-- name: postgres-integration-tests
-  image: grafana/build-container:1.2.26
-  commands:
-  - apt-get update
-  - apt-get install -yq postgresql-client
-  - ./bin/dockerize -wait tcp://postgres:5432 -timeout 120s
-  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database postgres
-  environment:
-    GRAFANA_TEST_DB: postgres
-    PGPASSWORD: grafanatest
-    POSTGRES_HOST: postgres
-  depends_on:
-  - test-backend
-  - test-frontend
-
-- name: mysql-integration-tests
-  image: grafana/build-container:1.2.26
-  commands:
-  - apt-get update
-  - apt-get install -yq default-mysql-client
-  - ./bin/dockerize -wait tcp://mysql:3306 -timeout 120s
-  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root -prootpass
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database mysql
-  environment:
-    GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql
-  depends_on:
-  - test-backend
-  - test-frontend
-
-services:
-- name: postgres
-  image: postgres:12.3-alpine
-  environment:
-    POSTGRES_DB: grafanatest
-    POSTGRES_PASSWORD: grafanatest
-    POSTGRES_USER: grafanatest
-
-- name: mysql
-  image: mysql:5.6.48
-  environment:
-    MYSQL_DATABASE: grafana_tests
-    MYSQL_PASSWORD: password
-    MYSQL_ROOT_PASSWORD: rootpass
-    MYSQL_USER: grafana
-
-trigger:
-  event:
-  - pull_request
-
----
-kind: pipeline
-type: docker
-name: test-master
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: identify-runner
-  image: alpine:3.12
-  commands:
-  - echo $DRONE_RUNNER_NAME
-
-- name: initialize
-  image: grafana/build-container:1.2.26
-  commands:
-  - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v$${GRABPL_VERSION}/grabpl
-  - chmod +x grabpl
-  - mkdir -p bin
-  - mv grabpl bin
-  - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
-  - tar -C bin -xzvf dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
-  - rm dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
-  - yarn install --frozen-lockfile --no-progress
-  environment:
-    DOCKERIZE_VERSION: 0.6.1
-    GRABPL_VERSION: 0.5.8
-
-- name: lint-backend
-  image: grafana/build-container:1.2.26
-  commands:
-  - golangci-lint run --config scripts/go/configs/.golangci.toml ./pkg/...
-  - revive -formatter stylish -config scripts/go/configs/revive.toml ./pkg/...
-  - ./scripts/revive-strict
-  environment:
-    CGO_ENABLED: 1
-  depends_on:
-  - initialize
-
-- name: codespell
-  image: grafana/build-container:1.2.26
-  commands:
-  - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
-  - codespell -I words_to_ignore.txt docs/
-  depends_on:
-  - initialize
-
-- name: shellcheck
-  image: grafana/build-container:1.2.26
-  commands:
-  - curl -fLO http://storage.googleapis.com/grafana-downloads/ci-dependencies/shellcheck-v$${VERSION}.linux.x86_64.tar.xz
-  - echo $$CHKSUM shellcheck-v$${VERSION}.linux.x86_64.tar.xz | sha512sum --check --strict --status
-  - tar xf shellcheck-v$${VERSION}.linux.x86_64.tar.xz
-  - mv shellcheck-v$${VERSION}/shellcheck /usr/local/bin/
-  - rm -rf shellcheck-v$${VERSION}*
-  - ./bin/grabpl shellcheck
-  environment:
-    CHKSUM: beca3d7819a6bdcfbd044576df4fc284053b48f468b2f03428fe66f4ceb2c05d9b5411357fa15003cb0311406c255084cf7283a3b8fce644c340c2f6aa910b9f
-    VERSION: 0.7.1
-  depends_on:
-  - initialize
-
-- name: test-backend
-  image: grafana/build-container:1.2.26
-  commands:
-  - ./bin/grabpl test-backend
-  - ./bin/grabpl integration-tests
-  depends_on:
-  - initialize
-  - lint-backend
-
-- name: test-frontend
-  image: grafana/build-container:1.2.26
-  commands:
-  - yarn run ci:test-frontend
-  environment:
-    TEST_MAX_WORKERS: 50%
-  depends_on:
-  - initialize
-
-- name: frontend-metrics
-  image: grafana/build-container:1.2.26
-  commands:
-  - ./scripts/ci-frontend-metrics.sh | ./bin/grabpl publish-metrics $${GRAFANA_MISC_STATS_API_KEY}
-  environment:
-    GRAFANA_MISC_STATS_API_KEY:
-      from_secret: grafana_misc_stats_api_key
-  depends_on:
-  - initialize
-
-- name: build-backend
-  image: grafana/build-container:1.2.26
-  commands:
-  - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id $DRONE_BUILD_NUMBER --no-pull-enterprise
-  depends_on:
-  - initialize
-  - lint-backend
-  - test-backend
-
-- name: build-frontend
-  image: grafana/build-container:1.2.26
-  commands:
-  - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id $DRONE_BUILD_NUMBER --no-pull-enterprise
-  depends_on:
-  - initialize
-  - test-frontend
-
-- name: build-plugins
-  image: grafana/build-container:1.2.26
-  commands:
-  - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps
-  depends_on:
-  - initialize
-  - lint-backend
-
-- name: package
-  image: grafana/build-container:1.2.26
-  commands:
-  - . scripts/build/gpg-test-vars.sh && ./bin/grabpl package --jobs 8 --edition oss --build-id $DRONE_BUILD_NUMBER --no-pull-enterprise
-  depends_on:
-  - build-backend
-  - build-frontend
-  - build-plugins
-  - test-backend
-  - test-frontend
-  - codespell
-  - shellcheck
-
-- name: end-to-end-tests-server
-  image: grafana/build-container:1.2.26
-  detach: true
-  commands:
-  - ./e2e/start-server
-  depends_on:
-  - package
-
-- name: end-to-end-tests
-  image: grafana/ci-e2e:12.18-1
-  commands:
-  - ./node_modules/.bin/cypress install
-  - ./bin/grabpl e2e-tests
-  environment:
-    HOST: end-to-end-tests-server
-  depends_on:
-  - end-to-end-tests-server
-
-- name: build-storybook
-  image: grafana/build-container:1.2.26
-  commands:
-  - yarn storybook:build
-  depends_on:
-  - package
-
-- name: publish-storybook
-  image: grafana/grafana-ci-deploy:1.2.6
-  commands:
-  - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json
-  - gcloud auth activate-service-account --key-file=/tmp/gcpkey.json
-  - echo gsutil -m rsync -d -r ./packages/grafana-ui/dist/storybook gs://grafana-storybook/canary
-  environment:
-    GCP_KEY:
-      from_secret: gcp_key
-  depends_on:
-  - build-storybook
-
-- name: build-docs-website
-  image: grafana/docs-base:latest
-  commands:
-  - mkdir -p /hugo/content/docs/grafana
-  - cp -r docs/sources /hugo/content/docs/grafana/latest
-  - cd /hugo && make prod
-  depends_on:
-  - initialize
-
-- name: copy-packages-for-docker
-  image: grafana/build-container:1.2.26
-  commands:
-  - cp dist/*.tar.gz packaging/docker/
-  depends_on:
-  - package
-
-- name: build-docker-images
-  image: grafana/drone-grafana-docker:0.2.0
-  settings:
-    dry_run: true
-    edition: oss
-  depends_on:
-  - copy-packages-for-docker
-
-- name: build-docker-images-ubuntu
-  image: grafana/drone-grafana-docker:0.2.0
-  settings:
-    dry_run: true
-    edition: oss
-    ubuntu: true
-  depends_on:
-  - copy-packages-for-docker
-
-- name: postgres-integration-tests
-  image: grafana/build-container:1.2.26
-  commands:
-  - apt-get update
-  - apt-get install -yq postgresql-client
-  - ./bin/dockerize -wait tcp://postgres:5432 -timeout 120s
-  - psql -p 5432 -h postgres -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database postgres
-  environment:
-    GRAFANA_TEST_DB: postgres
-    PGPASSWORD: grafanatest
-    POSTGRES_HOST: postgres
-  depends_on:
-  - test-backend
-  - test-frontend
-
-- name: mysql-integration-tests
-  image: grafana/build-container:1.2.26
-  commands:
-  - apt-get update
-  - apt-get install -yq default-mysql-client
-  - ./bin/dockerize -wait tcp://mysql:3306 -timeout 120s
-  - cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql -P 3306 -u root -prootpass
-  - go clean -testcache
-  - ./bin/grabpl integration-tests --database mysql
-  environment:
-    GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql
-  depends_on:
-  - test-backend
-  - test-frontend
-
-- name: release-next-npm-packages
-  image: grafana/build-container:1.2.26
-  commands:
-  - npx lerna bootstrap
-  - echo "//registry.npmjs.org/:_authToken=$${NPM_TOKEN}" >> ~/.npmrc
-  - echo ./scripts/circle-release-next-packages.sh
-  environment:
-    NPM_TOKEN:
-      from_secret: npm_token
-  depends_on:
-  - end-to-end-tests
-
-- name: publish-packages
-  image: grafana/grafana-ci-deploy:1.2.6
-  commands:
-  - echo ./bin/grabpl publish-packages --edition oss
-  depends_on:
-  - package
-  - end-to-end-tests
-  - mysql-integration-tests
-  - postgres-integration-tests
-
-services:
-- name: postgres
-  image: postgres:12.3-alpine
-  environment:
-    POSTGRES_DB: grafanatest
-    POSTGRES_PASSWORD: grafanatest
-    POSTGRES_USER: grafanatest
-
-- name: mysql
-  image: mysql:5.6.48
-  environment:
-    MYSQL_DATABASE: grafana_tests
-    MYSQL_PASSWORD: password
-    MYSQL_ROOT_PASSWORD: rootpass
-    MYSQL_USER: grafana
-
-trigger:
-  branch:
-  - master
-  event:
-  - push
-
----
-kind: pipeline
-type: docker
-name: windows-installer-master
-
-platform:
-  os: windows
-  arch: amd64
-  version: 1809
-
-steps:
-- name: identify-runner
-  image: mcr.microsoft.com/windows:1809
-  commands:
-  - echo $Env:DRONE_RUNNER_NAME
-
-- name: build-windows-installer
-  image: grafana/ci-wix:0.1.1
-  commands:
-  - $$gcpKey = $$env:GCP_KEY
-  - "[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) > gcpkey.json"
-  - dos2unix gcpkey.json
-  - gcloud auth activate-service-account --key-file=gcpkey.json
-  - rm gcpkey.json
-  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.8/windows/grabpl.exe -OutFile grabpl.exe
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/oss/master/grafana-7.2.0-9fffe273pre.windows-amd64.zip -OutFile grafana.zip
-  - cp C:\App\nssm-2.24.zip .
-  - ./grabpl.exe windows-installer --edition oss grafana.zip
-  - $$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0]
-  - echo "gsutil cp $$fname gs://grafana-downloads/oss/master/"
-  - echo "gsutil cp $$fname.sha256 gs://grafana-downloads/oss/master/"
-  environment:
-    GCP_KEY:
-      from_secret: gcp_key
-
-trigger:
-  branch:
-  - master
-  event:
-  - push
-
-depends_on:
-- test-master
-
-...

.editorconfig

@@ -25,6 +25,3 @@ trim_trailing_whitespace = false
 [Makefile]
 indent_style = tab
 indent_size = 2
-
-[*.star]
-indent_size = 4

.eslintrc

@@ -1,13 +1,4 @@
 {
   "extends": ["@grafana/eslint-config"],
-  "root": true,
-  "overrides": [
-    {
-      "files": ["packages/**/*.{ts,tsx}", "public/app/**/*.{ts,tsx}"],
-      "rules": {
-        "react-hooks/rules-of-hooks": "off",
-        "react-hooks/exhaustive-deps": "off"
-      }
-    }
-  ]
+  "root": true
 }

.github/CODEOWNERS

@@ -12,49 +12,12 @@
 # This should make it easy to add new rules without breaking existing ones.
 
 # Documentation owner: Diana Payton
-/docs/ @oddlittlebird @achatterjee-grafana
-/contribute/ @oddlittlebird  @marcusolsson @achatterjee-grafana
-
+/docs/ @oddlittlebird
+/contribute/ @oddlittlebird  @marcusolsson
+# @grafana/ui component documentation
+*.mdx @marcusolsson @jessover9000
 
 # Backend code
 *.go @grafana/backend-platform
 go.mod @grafana/backend-platform
 go.sum @grafana/backend-platform
-
-/e2e @grafana/grafana-frontend-platform
-/packages @grafana/grafana-frontend-platform
-/plugins-bundled @grafana/grafana-frontend-platform
-/public @grafana/grafana-frontend-platform
-/scripts/build/release-packages.sh @grafana/grafana-frontend-platform
-/scripts/circle-release-next-packages.sh @grafana/grafana-frontend-platform
-/scripts/ci-frontend-metrics.sh @grafana/grafana-frontend-platform
-/scripts/grunt @grafana/grafana-frontend-platform
-/scripts/webpack @grafana/grafana-frontend-platform
-package.json @grafana/grafana-frontend-platform
-tsconfig.json @grafana/grafana-frontend-platform
-lerna.json @grafana/grafana-frontend-platform
-.babelrc @grafana/grafana-frontend-platform
-.prettierrc.js @grafana/grafana-frontend-platform
-.eslintrc @grafana/grafana-frontend-platform
-
-# @grafana/ui component documentation
-*.mdx @marcusolsson @jessover9000 @grafana/grafana-frontend-platform
-
-/public/app/features/explore/ @grafana/observability-squad
-/packages/jaeger-ui-components/ @grafana/observability-squad
-
-# Core datasources
-/public/app/plugins/datasource/cloudwatch @grafana/backend-platform @grafana/observability-squad
-/public/app/plugins/datasource/elasticsearch @grafana/observability-squad
-/public/app/plugins/datasource/grafana-azure-monitor-datasource @grafana/backend-platform
-/public/app/plugins/datasource/graphite @grafana/observability-squad
-/public/app/plugins/datasource/influxdb @grafana/observability-squad
-/public/app/plugins/datasource/jaeger @grafana/observability-squad
-/public/app/plugins/datasource/loki @grafana/observability-squad
-/public/app/plugins/datasource/mssql @grafana/backend-platform
-/public/app/plugins/datasource/mysql @grafana/backend-platform
-/public/app/plugins/datasource/opentsdb @grafana/backend-platform
-/public/app/plugins/datasource/postgres @grafana/backend-platform
-/public/app/plugins/datasource/prometheus @grafana/observability-squad
-/public/app/plugins/datasource/cloud-monitoring @grafana/backend-platform
-/public/app/plugins/datasource/zipkin @grafana/observability-squad

.github/ISSUE_TEMPLATE/1-bug_report.md

@@ -5,13 +5,9 @@ labels: 'type: bug'
 ---
 
 <!--
-Please use this template to create your bug report. By providing as much info as possible you help us understand the issue, reproduce it and resolve it for you quicker. Therefor take a couple of extra minutes to make sure you have provided all info needed.
-
-PROTIP: record your screen and attach it as a gif to showcase the issue.
-
-* Questions should be posted to: https://community.grafana.com
-* Use query inspector to troubleshoot issues: https://bit.ly/2XNF6YS
-* How to record and attach gif: https://bit.ly/2Mi8T6K
+Please use this template while reporting a bug and provide as much info as possible.
+Questions should be posted to https://community.grafana.com
+Use query inspector to troubleshoot issues: https://community.grafana.com/t/using-grafanas-query-inspector-to-troubleshoot-issues/2630
 -->
 
 **What happened**:

.github/ISSUE_TEMPLATE/4-grafana_ui_component.md

@@ -1,39 +0,0 @@
----
-name: '@grafana/ui component request'
-about: Suggest a component for the @grafana/ui package
-labels: 'area/grafana/ui'
----
-
-<!-- 
-By using this template you will make it easier for us to make sure that documentation and implementation stays up to date for every component in @grafana/ui
-
-Thank you!
--->
-
-**Why is this component needed**:
-<!-- Explain your use case -->
-___
- - [ ] Is/could it be used in more than one place in Grafana?
-
-**Where is/could it be used?**:
-
-___
-- [ ] Post screenshots possible.
-- [ ] It has a single use case.
-- [ ] It is/could be used in multiple places.
-
-**Implementation** (Checklist meant for the person implementing the component)
-
-- [ ] Component has a story in Storybook.
-- [ ] Props and naming follows [our style guide](https://github.com/grafana/grafana/blob/master/contribute/style-guides/frontend.md).
-- [ ] It is extendable (rest props are spread, styles with className work, and so on).
-- [ ] Uses [theme for spacing, colors, and so on](https://github.com/grafana/grafana/blob/master/contribute/style-guides/themes.md).
-- [ ] Works with both light and dark theme.
-
-**Documentation**
-
-- [ ] Properties are documented.
-- [ ] Use cases are described.
-- [ ] Code examples for the different use cases.
-- [ ] Dos and don'ts.
-- [ ] Styling guidelines, specific color usage (if applicable).

.gitignore

@@ -46,7 +46,6 @@ public/css/*.min.css
 .DS_Store
 .vscode/
 .vs/
-.eslintcache
 
 /data/*
 /bin/*
@@ -113,7 +112,7 @@ compilation-stats.json
 /packages/grafana-e2e/cypress/logs
 /e2e/server.log
 /e2e/**/screenshots
-!/e2e/**/screenshots/expected/*
+!/e2e/**/screenshots/expeced/*
 /e2e/**/videos/*
 
 # report dumping the whole system env

CHANGELOG.md

@@ -1,319 +1,14 @@
-# 7.2.0-beta1 (unreleased)
-
-### Breaking changes
-
-* **Units**: The date time units `YYYY-MM-DD HH:mm:ss` and `MM/DD/YYYY h:mm:ss a` have been renamed to `Datetime ISO`
- and `Datetime US` respectively. This is no breaking change just a visual name change (the unit id is unchanged). The
- unit behavior is different however, it no longer hides the date part if the date is today. If you want this old
- behavior you need to change unit to `Datetime ISO (No date if today)` or  `Datetime US (No date if today)`.
-
-# 7.1.5 (2020-08-25)
-
-### Features / Enhancements
-* **Stats**: Stop counting the same user multiple times. [#26777](https://github.com/grafana/grafana/pull/26777), [@sakjur](https://github.com/sakjur)
-
-### Bug Fixes
-* **Alerting**: remove LongToWide call in alerting. [#27140](https://github.com/grafana/grafana/pull/27140), [@kylebrandt](https://github.com/kylebrandt)
-* **AzureMonitor**: fix panic introduced in 7.1.4 when unit was unspecified and alias was used. [#27113](https://github.com/grafana/grafana/pull/27113), [@kylebrandt](https://github.com/kylebrandt)
-* **Variables**: Fixes issue with All variable not being resolved. [#27151](https://github.com/grafana/grafana/pull/27151), [@hugohaggmark](https://github.com/hugohaggmark)
-
-# 7.1.4 (2020-08-20)
-
-### Features / Enhancements
-* **Azure App Insights Alert error - tsdb.HandleRequest() failed to convert dataframe "" to tsdb.TimeSeriesSlice**. [#26897](https://github.com/grafana/grafana/issues/26897)
-* **AzureMonitor**: map more units. [#26990](https://github.com/grafana/grafana/pull/26990), [@kylebrandt](https://github.com/kylebrandt)
-* **Azuremonitor**: do not set unit if literal "Unspecified". [#26839](https://github.com/grafana/grafana/pull/26839), [@kylebrandt](https://github.com/kylebrandt)
-* **Dataframe/Alerting**: to tsdb.TimeSeriesSlice - accept "empty" time series. [#26903](https://github.com/grafana/grafana/pull/26903), [@kylebrandt](https://github.com/kylebrandt)
-* **Field overrides**: Filter by field name using regex. [#27070](https://github.com/grafana/grafana/pull/27070), [@dprokop](https://github.com/dprokop)
-* **Overrides**: expose byType matcher UI. [#27056](https://github.com/grafana/grafana/pull/27056), [@ryantxu](https://github.com/ryantxu)
-
-### Bug Fixes
-* **CloudWatch**: Add FreeStorageCapacity metric. [#26503](https://github.com/grafana/grafana/pull/26503), [@waqark3389](https://github.com/waqark3389)
-* **CloudWatch**: Fix sorting of metrics results. [#26835](https://github.com/grafana/grafana/pull/26835), [@aknuds1](https://github.com/aknuds1)
-* **Cloudwatch**: Add FileSystemId as a dimension key for the AWS/FSx namespace. [#26662](https://github.com/grafana/grafana/pull/26662), [@waqark3389](https://github.com/waqark3389)
-* **InfluxDB**: Update Flux placeholder URL with respect to latest Go client. [#27086](https://github.com/grafana/grafana/pull/27086), [@aknuds1](https://github.com/aknuds1)
-* **InfluxDB**: Upgrade Go client, use data source HTTP client. [#27012](https://github.com/grafana/grafana/pull/27012), [@aknuds1](https://github.com/aknuds1)
-* **Proxy**: Fix updating refresh token in OAuth pass-thru. [#26885](https://github.com/grafana/grafana/pull/26885), [@seanlaff](https://github.com/seanlaff)
-* **Templating**: Fixes so texts show in picker not the values. [#27002](https://github.com/grafana/grafana/pull/27002), [@hugohaggmark](https://github.com/hugohaggmark)
-
-# 7.1.3 (2020-08-06)
-
-### Bug Fixes
-  * **Templating**: Templating: Fix undefined result when using raw interpolation format [#26818](https://github.com/grafana/grafana/pull/26818)
-
-# 7.1.2 (2020-08-05)
-
-### Features / Enhancements
-  * **Explore**: Don't run queries on datasource change. [#26033](https://github.com/grafana/grafana/pull/26033), [@davkal](https://github.com/davkal)
-  * **TemplateSrv**: Formatting options for ${__from} and ${__to}, unix seconds epoch, ISO 8601/RFC 3339. [#26466](https://github.com/grafana/grafana/pull/26466), [@torkelo](https://github.com/torkelo)
-  * **Toolkit/Plugin**: throw an Error instead of a string. [#26618](https://github.com/grafana/grafana/pull/26618), [@leventebalogh](https://github.com/leventebalogh)
-
-  ### Bug Fixes
-  * **Dashbard**: Fix refresh interval settings to allow setting it to equal min_refresh_interval. [#26615](https://github.com/grafana/grafana/pull/26615), [@torkelo](https://github.com/torkelo)
-  * **Flux**: Ensure connections to InfluxDB are closed. [#26735](https://github.com/grafana/grafana/pull/26735), [@sneddrs](https://github.com/sneddrs)
-  * **Query history**: Fix search filtering if null value. [#26768](https://github.com/grafana/grafana/pull/26768), [@ivanahuckova](https://github.com/ivanahuckova)
-  * **QueryOptions**: Fix not being able to change cache timeout setting. [#26614](https://github.com/grafana/grafana/pull/26614), [@torkelo](https://github.com/torkelo)
-  * **StatPanel**: Fix stat panel display name not showing when explicitly set. [#26616](https://github.com/grafana/grafana/pull/26616), [@torkelo](https://github.com/torkelo)
-  * **Templating**: Fixed access to system variables like __dashboard, __user & __org during dashboard load & variable queries. [#26637](https://github.com/grafana/grafana/pull/26637), [@torkelo](https://github.com/torkelo)
-  * **TextPanel**: Fix content overflowing panel boundaries. [#26612](https://github.com/grafana/grafana/pull/26612), [@torkelo](https://github.com/torkelo)
-  * **TimePicker**: Fix position and responsive behavior. [#26570](https://github.com/grafana/grafana/pull/26570), [@torkelo](https://github.com/torkelo)
-  * **TimePicker**: Fixes app crash when changing custom range to nothing. [#26775](https://github.com/grafana/grafana/pull/26775), [@hugohaggmark](https://github.com/hugohaggmark)
-  * **Units**: Remove duplicate SI prefix from mSv and µSv. [#26598](https://github.com/grafana/grafana/pull/26598), [@tofurky](https://github.com/tofurky)
-
-# 7.1.1 (2020-07-24)
-
-### Features / Enhancements
-* **Graph**: Support setting field unit & override data source (automatic) unit. [#26529](https://github.com/grafana/grafana/pull/26529), [@ryantxu](https://github.com/ryantxu)
-* **Tracing**: Add errorIconColor prop to TraceSpanData. [#26509](https://github.com/grafana/grafana/pull/26509), [@zoltanbedi](https://github.com/zoltanbedi)
-
-### Bug Fixes
-* **Branding**: Fix login app title. [#26425](https://github.com/grafana/grafana/pull/26425), [@benrubson](https://github.com/benrubson)
-* **Bring back scripts evaluation in TextPanel**. [#26413](https://github.com/grafana/grafana/pull/26413), [@dprokop](https://github.com/dprokop)
-* **Dashboard**: Fix empty panels after scrolling on Safari/iOS. [#26495](https://github.com/grafana/grafana/pull/26495), [@torkelo](https://github.com/torkelo)
-* **Dashboard**: Fix for viewer can enter panel edit mode by modifying url (but cannot not save anything). [#26556](https://github.com/grafana/grafana/pull/26556), [@torkelo](https://github.com/torkelo)
-* **Elasticsearch**: Fix displaying of bucket script input. [#26552](https://github.com/grafana/grafana/pull/26552), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Explore**: parse queryType from explore url. [#26349](https://github.com/grafana/grafana/pull/26349), [@zoltanbedi](https://github.com/zoltanbedi)
-* **Tracing**: upstream fix for hovering on log lines. [#26426](https://github.com/grafana/grafana/pull/26426), [@zoltanbedi](https://github.com/zoltanbedi)
-
-# 7.1.0 (2020-07-16)
-
-### Features / Enhancements
-* **Backend**: Use latest go plugin sdk (0.74.0) to sort wide frames. [#26207](https://github.com/grafana/grafana/pull/26207), [@kylebrandt](https://github.com/kylebrandt)
-* **Elasticsearch**: Create Raw Doc metric to render raw JSON docs in columns in the new table panel. [#26233](https://github.com/grafana/grafana/pull/26233), [@ivanahuckova](https://github.com/ivanahuckova)
-* **PluginsListPage**: More plugins button should open in new window. [#26305](https://github.com/grafana/grafana/pull/26305), [@zoltanbedi](https://github.com/zoltanbedi)
-
-### Bug Fixes
-* **AdminUsers**: Reset page to zero on query change. [#26293](https://github.com/grafana/grafana/pull/26293), [@hshoff](https://github.com/hshoff)
-* **CloudWatch Logs**: Fixes grouping of results by numeric field. [#26298](https://github.com/grafana/grafana/pull/26298), [@kaydelaney](https://github.com/kaydelaney)
-* **DashboardLinks**: Do not over-query search endpoint. [#26311](https://github.com/grafana/grafana/pull/26311), [@torkelo](https://github.com/torkelo)
-* **Docker**: Make sure to create default plugin provisioning directory. [#26017](https://github.com/grafana/grafana/pull/26017), [@marefr](https://github.com/marefr)
-* **Elastic**: Fix error "e.buckets[Symbol.iterator] is not a function" when using filter. [#26217](https://github.com/grafana/grafana/pull/26217), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Explore/Loki**: Escape \ in labels for show context queries. [#26116](https://github.com/grafana/grafana/pull/26116), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Jaeger/Zipkin**: URL-encode service names and trace ids for API calls. [#26115](https://github.com/grafana/grafana/pull/26115), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Prometheus**: Fix prom links in mixed mode. [#26244](https://github.com/grafana/grafana/pull/26244), [@zoltanbedi](https://github.com/zoltanbedi)
-* **Provisioning**: Fix bug when provision app plugins using Enterprise edition. [#26340](https://github.com/grafana/grafana/pull/26340), [@marefr](https://github.com/marefr)
-* **Sign In** Use correct url for the Sign In button. [#26239](https://github.com/grafana/grafana/pull/26239), [@dprokop](https://github.com/dprokop)
-
-# 7.1.0-beta3 (2020-07-13)
-
-### Features / Enhancements
-* **Explore**: Unification of logs/metrics/traces user interface. [#25890](https://github.com/grafana/grafana/pull/25890), [@aocenas](https://github.com/aocenas)
-* **Graph panel**: Move Stacking and null values before Hover tooltip options (#26035). [#26037](https://github.com/grafana/grafana/pull/26037), [@jsoref](https://github.com/jsoref)
-* **LDAP**: Get all groups for all group base search DNs. [#25825](https://github.com/grafana/grafana/pull/25825), [@Annegies](https://github.com/Annegies)
-* **Table**: JSON Cell should try to convert strings to JSON. [#26024](https://github.com/grafana/grafana/pull/26024), [@ryantxu](https://github.com/ryantxu)
-* **Transform**: adding missing "table"-transform and "series to rows"-transform to Grafana v7-transforms. [#26042](https://github.com/grafana/grafana/pull/26042), [@mckn](https://github.com/mckn)
-
-### Bug Fixes
-* **AdminUsersTable**: Fix width issues. [#26019](https://github.com/grafana/grafana/pull/26019), [@tskarhed](https://github.com/tskarhed)
-* **BarGauge**: Fix space bug in single series mode. [#26176](https://github.com/grafana/grafana/pull/26176), [@torkelo](https://github.com/torkelo)
-* **Dashboard**: Allow removing min refresh interval from refresh options (5s or other). [#26150](https://github.com/grafana/grafana/pull/26150), [@torkelo](https://github.com/torkelo)
-* **DataLinks**: Fixed interpolation of repeated variables used in Graph data links. [#26147](https://github.com/grafana/grafana/pull/26147), [@torkelo](https://github.com/torkelo)
-* **Do not break dashboard settings UI when time intervals end with trailing comma**. [#26126](https://github.com/grafana/grafana/pull/26126), [@dprokop](https://github.com/dprokop)
-* **Elastic**: Display correct log message based on selected log field. [#26020](https://github.com/grafana/grafana/pull/26020), [@ivanahuckova](https://github.com/ivanahuckova)
-* **InfluxDB**: Fixed new group by dropdown now showing after first use. [#26031](https://github.com/grafana/grafana/pull/26031), [@torkelo](https://github.com/torkelo)
-* **StatPanel**: Fixes issue with name showing for single series / field results. [#26070](https://github.com/grafana/grafana/pull/26070), [@torkelo](https://github.com/torkelo)
-* **Templating**: Fix recursive loop of template variable queries when changing ad-hoc-variable. [#26191](https://github.com/grafana/grafana/pull/26191), [@torkelo](https://github.com/torkelo)
-
-# 7.0.6 (2020-07-09)
-
-### Bug fixes
-
-* **Templating**: Fixed recursive queries triggered when switching dashboard settings view [#26137](https://github.com/grafana/grafana/pull/26137)
-* **Templating**: Fix recursive loop of template variable queries when changing ad-hoc-variable [#26191](https://github.com/grafana/grafana/pull/26191)
-* **Auth**: Add support for forcing authentication in anonymous mode and modify SignIn to use it instead of redirect [#25567](https://github.com/grafana/grafana/pull/25567)
-* **Auth**: Fix POST request failures with anonymous access [#26049](https://github.com/grafana/grafana/pull/26049)
-
-# 7.1.0-beta 2 (2020-07-02)
-
-### Features / Enhancements
-* **Loki**: Allow aliasing Loki queries in dashboard. [#25706](https://github.com/grafana/grafana/pull/25706), [@bastjan](https://github.com/bastjan)
-
-### Bug Fixes
-* **Explore**: Fix href when jumping from Explore to Add data source. [#25991](https://github.com/grafana/grafana/pull/25991), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Fix**: Build-in plugins failed to load in windows. [#25982](https://github.com/grafana/grafana/pull/25982), [@papagian](https://github.com/papagian)
-
-# 7.1.0-beta 1 (2020-07-01)
-
-### Features / Enhancements
-* **Alerting**: Adds support for multiple URLs in Alertmanager notifier. [#24196](https://github.com/grafana/grafana/pull/24196), [@alistarle](https://github.com/alistarle)
-* **Alerting**: updating the victorops alerter to handle the no_data alert type. [#23761](https://github.com/grafana/grafana/pull/23761), [@rrusso1982](https://github.com/rrusso1982)
-* **Azure**: Application Insights metrics to Frame and support multiple query dimensions. [#25849](https://github.com/grafana/grafana/pull/25849), [@kylebrandt](https://github.com/kylebrandt)
-* **Azure**: Multiple dimension support for Azure Monitor Service. [#25947](https://github.com/grafana/grafana/pull/25947), [@kylebrandt](https://github.com/kylebrandt)
-* **Azure**: Split Insights into two services. [#25410](https://github.com/grafana/grafana/pull/25410), [@kylebrandt](https://github.com/kylebrandt)
-* **Backend plugins**: Refactor to allow shared contract between core and external backend plugins. [#25472](https://github.com/grafana/grafana/pull/25472), [@marefr](https://github.com/marefr)
-* **Branding**: Use AppTitle as document title. [#25271](https://github.com/grafana/grafana/pull/25271), [@benrubson](https://github.com/benrubson)
-* **Chore**: upgrade to typescript 3.9.3. [#25154](https://github.com/grafana/grafana/pull/25154), [@ryantxu](https://github.com/ryantxu)
-* **CloudWatch**: Add Route53 DNSQueries metric and dimension. [#25125](https://github.com/grafana/grafana/pull/25125), [@erkolson](https://github.com/erkolson)
-* **CloudWatch**: Added AWS DataSync metrics and dimensions. [#25054](https://github.com/grafana/grafana/pull/25054), [@ilyastoli](https://github.com/ilyastoli)
-* **CloudWatch**: Added AWS MediaStore metrics and dimensions. [#25492](https://github.com/grafana/grafana/pull/25492), [@ilyastoli](https://github.com/ilyastoli)
-* **CloudWatch**: Added AWS RoboMaker metrics and dimensions. [#25090](https://github.com/grafana/grafana/pull/25090), [@ilyastoli](https://github.com/ilyastoli)
-* **CloudWatch**: Added AWS SDKMetrics metrics and dimensions. [#25150](https://github.com/grafana/grafana/pull/25150), [@ilyastoli](https://github.com/ilyastoli)
-* **CloudWatch**: Added AWS ServiceCatalog metrics and dimensions. [#25812](https://github.com/grafana/grafana/pull/25812), [@ilyastoli](https://github.com/ilyastoli)
-* **CloudWatch**: Added AWS WAFV2 metrics. [#24048](https://github.com/grafana/grafana/pull/24048), [@mikkokupsu](https://github.com/mikkokupsu)
-* **Dashboards**: Make path to default dashboard configurable. [#25595](https://github.com/grafana/grafana/pull/25595), [@bergquist](https://github.com/bergquist)
-* **Elastic**: Internal data links. [#25942](https://github.com/grafana/grafana/pull/25942), [@aocenas](https://github.com/aocenas)
-* **Elasticsearch**: Add support for template variable in date histogram min_doc_count. [#21064](https://github.com/grafana/grafana/pull/21064), [@faxm0dem](https://github.com/faxm0dem)
-* **Elasticsearch**: Adds cumulative sum aggregation support. [#24820](https://github.com/grafana/grafana/pull/24820), [@retzkek](https://github.com/retzkek)
-* **Elasticsearch**: Support using a variable for histogram and terms min doc count. [#25392](https://github.com/grafana/grafana/pull/25392), [@marefr](https://github.com/marefr)
-* **Explore/Loki**: Show results of instant queries only in table and time series only in graph. [#25845](https://github.com/grafana/grafana/pull/25845), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Explore**: Remove legend formatting when switching from panel to Explore. [#25848](https://github.com/grafana/grafana/pull/25848), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Footer**: Add back footer to login page. [#25656](https://github.com/grafana/grafana/pull/25656), [@torkelo](https://github.com/torkelo)
-* **ForgottenPassword**: Move view to login screen. [#25366](https://github.com/grafana/grafana/pull/25366), [@tskarhed](https://github.com/tskarhed)
-* **Gauge**: Hide orientation option in panel options. [#25511](https://github.com/grafana/grafana/pull/25511), [@torkelo](https://github.com/torkelo)
-* **Grafana-UI**: Add FileUpload. [#25835](https://github.com/grafana/grafana/pull/25835), [@Clarity-89](https://github.com/Clarity-89)
-* **GraphPanel**: Make legend values clickable series toggles. [#25581](https://github.com/grafana/grafana/pull/25581), [@hshoff](https://github.com/hshoff)
-* **Influx**: Support flux in the influx datasource. [#25308](https://github.com/grafana/grafana/pull/25308), [@ryantxu](https://github.com/ryantxu)
-* **Migration**: Select org. [#24739](https://github.com/grafana/grafana/pull/24739), [@tskarhed](https://github.com/tskarhed)
-* **Migration**: Settings forms. [#24741](https://github.com/grafana/grafana/pull/24741), [@tskarhed](https://github.com/tskarhed)
-* **Panel Inspect**: use Monaco editor for json display. [#25251](https://github.com/grafana/grafana/pull/25251), [@ryantxu](https://github.com/ryantxu)
-* **Panel edit**: Clicking twice on a visualization closes the VizPicker. [#25739](https://github.com/grafana/grafana/pull/25739), [@peterholmberg](https://github.com/peterholmberg)
-* **PanelInspect**: Update UI for Data display options. [#25478](https://github.com/grafana/grafana/pull/25478), [@tskarhed](https://github.com/tskarhed)
-* **Plugins**: move jaeger trace type to grafana data. [#25403](https://github.com/grafana/grafana/pull/25403), [@zoltanbedi](https://github.com/zoltanbedi)
-* **Provisioning**: Adds support for enabling app plugins. [#25649](https://github.com/grafana/grafana/pull/25649), [@marefr](https://github.com/marefr)
-* **Provisioning**: Use folders structure from the file system to create desired folders in dashboard provisioning. [#23117](https://github.com/grafana/grafana/pull/23117), [@nabokihms](https://github.com/nabokihms)
-* **Query history**: Add keyboard shortcut support for commenting. [#24736](https://github.com/grafana/grafana/pull/24736), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Query history**: Add search for query history and starred queries. [#25747](https://github.com/grafana/grafana/pull/25747), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Rich history**: Updates for default settings and starred queries deletion. [#25732](https://github.com/grafana/grafana/pull/25732), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Search**: support URL query params. [#25541](https://github.com/grafana/grafana/pull/25541), [@Clarity-89](https://github.com/Clarity-89)
-* **Stackdriver**: Deep linking from Grafana panels to the Metrics Explorer. [#25858](https://github.com/grafana/grafana/pull/25858), [@papagian](https://github.com/papagian)
-* **Stackdriver**: Rename Stackdriver to Google Cloud Monitoring. [#25807](https://github.com/grafana/grafana/pull/25807), [@papagian](https://github.com/papagian)
-* **StatPanel**: Option showing name instead of value and more. [#25676](https://github.com/grafana/grafana/pull/25676), [@torkelo](https://github.com/torkelo)
-* **Switch**: Deprecate checked prop in favor of value. [#25862](https://github.com/grafana/grafana/pull/25862), [@tskarhed](https://github.com/tskarhed)
-* **Tab**: Make active tab clickable and add hyperlink functionality. [#25546](https://github.com/grafana/grafana/pull/25546), [@tskarhed](https://github.com/tskarhed)
-* **Table**: Adds adhoc filtering. [#25467](https://github.com/grafana/grafana/pull/25467), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Teams**: Add index for permission check. [#25736](https://github.com/grafana/grafana/pull/25736), [@sakjur](https://github.com/sakjur)
-* **Template variable filters**: Hide overflowing text. [#25801](https://github.com/grafana/grafana/pull/25801), [@tskarhed](https://github.com/tskarhed)
-* **Templating**: Add bult in __user {name, id, login, email} variable to templating system. [#23378](https://github.com/grafana/grafana/pull/23378), [@aidanmountford](https://github.com/aidanmountford)
-* **Templating**: removes old Angular variable system and featureToggle. [#24779](https://github.com/grafana/grafana/pull/24779), [@hugohaggmark](https://github.com/hugohaggmark)
-* **TextPanel**: Adds proper editor for markdown and html. [#25618](https://github.com/grafana/grafana/pull/25618), [@hugohaggmark](https://github.com/hugohaggmark)
-* **TextPanel**: Removes Angular Text Panel. [#25504](https://github.com/grafana/grafana/pull/25504), [@hugohaggmark](https://github.com/hugohaggmark)
-* **TextPanel**: Removes text mode. [#25589](https://github.com/grafana/grafana/pull/25589), [@hugohaggmark](https://github.com/hugohaggmark)
-* **TimeZone**: unify the time zone pickers to one that can rule them all. [#24803](https://github.com/grafana/grafana/pull/24803), [@mckn](https://github.com/mckn)
-* **Transform**: added merge transform that will merge multiple series/tables into one table. [#25490](https://github.com/grafana/grafana/pull/25490), [@mckn](https://github.com/mckn)
-* **Units**: add base-pascals and rotational speed units. [#22879](https://github.com/grafana/grafana/pull/22879), [@sakjur](https://github.com/sakjur)
-* **Units**: add new unit for duration, it is optimized for displaying days, hours, minutes and seconds. [#24175](https://github.com/grafana/grafana/pull/24175), [@pabigot](https://github.com/pabigot)
-* **Variables**: enables cancel for slow query variables queries. [#24430](https://github.com/grafana/grafana/pull/24430), [@hugohaggmark](https://github.com/hugohaggmark)
-* **switches default value for security settings**. [#25175](https://github.com/grafana/grafana/pull/25175), [@bergquist](https://github.com/bergquist)
-* **Reporting:** add monthly schedule option. (Enterprise)
-
-### Bug Fixes
-* **DatatLinks**: Fix open in new tab state mismatch. [#25826](https://github.com/grafana/grafana/pull/25826), [@tskarhed](https://github.com/tskarhed)
-* **Explore/Loki**: Fix field type in table for instant queries. [#25907](https://github.com/grafana/grafana/pull/25907), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Explore/Loki**: Fix scrolling of context when leaving context window. [#25838](https://github.com/grafana/grafana/pull/25838), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Explore/SQL data sources**: Show correctly interpolated queries. [#25110](https://github.com/grafana/grafana/pull/25110), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Explore/Tooltip**: Fix label value in tooltip. [#25940](https://github.com/grafana/grafana/pull/25940), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Explore**: Fix query editors on mobile. [#25148](https://github.com/grafana/grafana/pull/25148), [@ivanahuckova](https://github.com/ivanahuckova)
-* **Explore**: adds an ability to exit log row context with ESC key. [#24205](https://github.com/grafana/grafana/pull/24205), [@Estrax](https://github.com/Estrax)
-* **Fix**: Value mappings match against string values. [#25929](https://github.com/grafana/grafana/pull/25929), [@peterholmberg](https://github.com/peterholmberg)
-* **GraphPanel**: Fix annotations overflowing panels. [#25606](https://github.com/grafana/grafana/pull/25606), [@hshoff](https://github.com/hshoff)
-* **Instrumentation**: Fix setting Jaeger tracing address through Grafana config. [#25768](https://github.com/grafana/grafana/pull/25768), [@marefr](https://github.com/marefr)
-* **Prometheus**: Fix performance issue in processing of histogram labels. [#25813](https://github.com/grafana/grafana/pull/25813), [@bsherrod](https://github.com/bsherrod)
-* **Provisioning**: Makes file the default dashboard provisioner type. [#24856](https://github.com/grafana/grafana/pull/24856), [@bergquist](https://github.com/bergquist)
-* **Templating**: fixes variables not being interpolated after dashboard refresh. [#25698](https://github.com/grafana/grafana/pull/25698), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Units**: Custom unit suffix and docs for custom units. [#25710](https://github.com/grafana/grafana/pull/25710), [@torkelo](https://github.com/torkelo)
-* **ValueFormats**: Fix byte-format data rates. [#25424](https://github.com/grafana/grafana/pull/25424), [@mueslo](https://github.com/mueslo)
-* **Variables**: Fixes maximum call stack bug for empty value. [#25503](https://github.com/grafana/grafana/pull/25503), [@hugohaggmark](https://github.com/hugohaggmark)
-
-### Security fixes
-* **Graph**: Fix XSS vulnerability with series overrides [#25401](https://github.com/grafana/grafana/pull/25401). Thanks to Rotem Reiss for reporting this.
-
-# 7.0.5 (2020-06-30)
-
-### Bug Fixes
-
-- **Datasource**: Make sure data proxy timeout applies to HTTP client. [#25865](https://github.com/grafana/grafana/pull/25865), [@marefr](https://github.com/marefr)
-- **Graphite**: Fix tag value dropdowns not showing in query editor. [#25889](https://github.com/grafana/grafana/pull/25889), [@torkelo](https://github.com/torkelo)
-
-# 7.0.4 (2020-06-25)
-
-### Features / Enhancements
-
-- **Dashboard**: Redirects for old (pre 7.0) edit & view panel urls. [#25653](https://github.com/grafana/grafana/pull/25653), [@torkelo](https://github.com/torkelo)
-- **Stackdriver**: Use default project name if project name isn't set on the query. [#25413](https://github.com/grafana/grafana/pull/25413), [@alexashley](https://github.com/alexashley)
-- **TablePanel**: Sort numbers correctly. [#25421](https://github.com/grafana/grafana/pull/25421), [@speakyourcode](https://github.com/speakyourcode)
-- **Update Bitcoin currency to use proper symbol, add mBTC and μBTC**. [#24182](https://github.com/grafana/grafana/pull/24182), [@overcookedpanda](https://github.com/overcookedpanda)
-- **Variables**: Links that update variables on current dashboard does not trigger refresh / update. [#25192](https://github.com/grafana/grafana/pull/25192), [@torkelo](https://github.com/torkelo)
-
-### Bug Fixes
-
-- **Azure Monitor**: fixes undefined is not iterable. [#25586](https://github.com/grafana/grafana/pull/25586), [@hugohaggmark](https://github.com/hugohaggmark)
-- **Datasources**: Handle URL parsing error. [#25742](https://github.com/grafana/grafana/pull/25742), [@marefr](https://github.com/marefr)
-- **InfluxDB**: Fix invalid memory address or nil pointer dereference when schema is missing in URL. [#25565](https://github.com/grafana/grafana/pull/25565), [@marefr](https://github.com/marefr)
-- **Security**: Use Header.Set and Header.Del for X-Grafana-User header. [#25495](https://github.com/grafana/grafana/pull/25495), [@beardhatcode](https://github.com/beardhatcode)
-- **Stackdriver**: Fix creating Label Values datasource query variable. [#25633](https://github.com/grafana/grafana/pull/25633), [@papagian](https://github.com/papagian)
-- **Table**: Support custom date formats via custom unit. [#25195](https://github.com/grafana/grafana/pull/25195), [@torkelo](https://github.com/torkelo)
-- **Templating**: Fixes query variable with \${\_\_searchFilter} value selection not causing refresh & url update. [#25770](https://github.com/grafana/grafana/pull/25770), [@torkelo](https://github.com/torkelo)
-
-# 7.0.3 (2020-06-03)
-
-### Features / Enhancements
-
-- **Stats**: include all fields. [#24829](https://github.com/grafana/grafana/pull/24829), [@ryantxu](https://github.com/ryantxu)
-- **Variables**: change VariableEditorList row action Icon to IconButton. [#25217](https://github.com/grafana/grafana/pull/25217), [@hshoff](https://github.com/hshoff)
-
-### Bug Fixes
-
-- **Cloudwatch**: Fix dimensions of DDoSProtection. [#25317](https://github.com/grafana/grafana/pull/25317), [@papagian](https://github.com/papagian)
-- **Configuration**: Fix env var override of sections containing hyphen. [#25178](https://github.com/grafana/grafana/pull/25178), [@marefr](https://github.com/marefr)
-- **Dashboard**: Get panels in collapsed rows. [#25079](https://github.com/grafana/grafana/pull/25079), [@peterholmberg](https://github.com/peterholmberg)
-- **Do not show alerts tab when alerting is disabled**. [#25285](https://github.com/grafana/grafana/pull/25285), [@dprokop](https://github.com/dprokop)
-- **Jaeger**: fixes cascader option label duration value. [#25129](https://github.com/grafana/grafana/pull/25129), [@Estrax](https://github.com/Estrax)
-- **Transformations**: Fixed Transform tab crash & no update after adding first transform. [#25152](https://github.com/grafana/grafana/pull/25152), [@torkelo](https://github.com/torkelo)
-
-# 7.0.2 (2020-06-03)
-
-- **Security**: Urgent security patch release. Please read more in our [blog](https://grafana.com/blog/2020/06/03/grafana-6.7.4-and-7.0.2-released-with-important-security-fix/)
-
-# 7.0.1 (2020-05-26)
-
-### Features / Enhancements
-
-- **Datasource/CloudWatch**: Makes CloudWatch Logs query history more readable. [#24795](https://github.com/grafana/grafana/pull/24795), [@kaydelaney](https://github.com/kaydelaney)
-- **Download CSV**: Add date and time formatting. [#24992](https://github.com/grafana/grafana/pull/24992), [@ryantxu](https://github.com/ryantxu)
-- **Table**: Make last cell value visible when right aligned. [#24921](https://github.com/grafana/grafana/pull/24921), [@peterholmberg](https://github.com/peterholmberg)
-- **TablePanel**: Adding sort order persistance. [#24705](https://github.com/grafana/grafana/pull/24705), [@torkelo](https://github.com/torkelo)
-- **Transformations**: Display correct field name when using reduce transformation. [#25068](https://github.com/grafana/grafana/pull/25068), [@peterholmberg](https://github.com/peterholmberg)
-- **Transformations**: Allow custom number input for binary operations. [#24752](https://github.com/grafana/grafana/pull/24752), [@ryantxu](https://github.com/ryantxu)
-
-### Bug Fixes
-
-- **Cloudwatch**: Fix AWS WAF and AWS DDoSProtection metrics. [#25071](https://github.com/grafana/grafana/pull/25071), [@papagian](https://github.com/papagian)
-- **Dashboard/Links**: Fixes dashboard links by tags not working. [#24773](https://github.com/grafana/grafana/pull/24773), [@KamalGalrani](https://github.com/KamalGalrani)
-- **Dashboard/Links**: Fixes open in new window for dashboard link. [#24772](https://github.com/grafana/grafana/pull/24772), [@KamalGalrani](https://github.com/KamalGalrani)
-- **Dashboard/Links**: Variables are resolved and limits to 100. [#25076](https://github.com/grafana/grafana/pull/25076), [@hugohaggmark](https://github.com/hugohaggmark)
-- **DataLinks**: Bring back variables interpolation in title. [#24970](https://github.com/grafana/grafana/pull/24970), [@dprokop](https://github.com/dprokop)
-- **Datasource/CloudWatch**: Field suggestions no longer limited to prefix-only. [#24855](https://github.com/grafana/grafana/pull/24855), [@kaydelaney](https://github.com/kaydelaney)
-- **Explore/Table**: Keep existing field types if possible. [#24944](https://github.com/grafana/grafana/pull/24944), [@kaydelaney](https://github.com/kaydelaney)
-- **Explore**: Fix wrap lines toggle for results of queries with filter expression. [#24915](https://github.com/grafana/grafana/pull/24915), [@ivanahuckova](https://github.com/ivanahuckova)
-- **Explore**: fix undo in query editor. [#24797](https://github.com/grafana/grafana/pull/24797), [@zoltanbedi](https://github.com/zoltanbedi)
-- **Explore**: fix word break in type head info. [#25014](https://github.com/grafana/grafana/pull/25014), [@zoltanbedi](https://github.com/zoltanbedi)
-- **Graph**: Legend decimals now work as expected. [#24931](https://github.com/grafana/grafana/pull/24931), [@torkelo](https://github.com/torkelo)
-- **LoginPage**: Fix hover color for service buttons. [#25009](https://github.com/grafana/grafana/pull/25009), [@tskarhed](https://github.com/tskarhed)
-- **LogsPanel**: Fix scrollbar. [#24850](https://github.com/grafana/grafana/pull/24850), [@ivanahuckova](https://github.com/ivanahuckova)
-- **MoveDashboard**: Fix for moving dashboard caused all variables to be lost. [#25005](https://github.com/grafana/grafana/pull/25005), [@torkelo](https://github.com/torkelo)
-- **Organize transformer**: Use display name in field order comparer. [#24984](https://github.com/grafana/grafana/pull/24984), [@dprokop](https://github.com/dprokop)
-- **Panel**: shows correct panel menu items in view mode. [#24912](https://github.com/grafana/grafana/pull/24912), [@hugohaggmark](https://github.com/hugohaggmark)
-- **PanelEditor Fix missing labels and description if there is only single option in category**. [#24905](https://github.com/grafana/grafana/pull/24905), [@dprokop](https://github.com/dprokop)
-- **PanelEditor**: Overrides name matcher still show all original field names even after Field default display name is specified. [#24933](https://github.com/grafana/grafana/pull/24933), [@torkelo](https://github.com/torkelo)
-- **PanelInspector**: Makes sure Data display options are visible. [#24902](https://github.com/grafana/grafana/pull/24902), [@hugohaggmark](https://github.com/hugohaggmark)
-- **PanelInspector**: Hides unsupported data display options for Panel type. [#24918](https://github.com/grafana/grafana/pull/24918), [@hugohaggmark](https://github.com/hugohaggmark)
-- **PanelMenu**: Make menu disappear on button press. [#25015](https://github.com/grafana/grafana/pull/25015), [@tskarhed](https://github.com/tskarhed)
-- **Postgres**: Fix add button. [#25087](https://github.com/grafana/grafana/pull/25087), [@phemmer](https://github.com/phemmer)
-- **Prometheus**: Fix recording rules expansion. [#24977](https://github.com/grafana/grafana/pull/24977), [@ivanahuckova](https://github.com/ivanahuckova)
-- **Stackdriver**: Fix creating Service Level Objectives (SLO) datasource query variable. [#25023](https://github.com/grafana/grafana/pull/25023), [@papagian](https://github.com/papagian)
-
-# 7.0.0 (2020-05-18)
+# 7.0.0 (unreleased)
 
 ## Breaking changes
 
 - **Removed PhantomJS**: PhantomJS was deprecated in [Grafana v6.4](https://grafana.com/docs/grafana/latest/guides/whats-new-in-v6-4/#phantomjs-deprecation) and starting from Grafana v7.0.0, all PhantomJS support has been removed. This means that Grafana no longer ships with a built-in image renderer, and we advise you to install the [Grafana Image Renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer).
-- **Dashboard**: A global minimum dashboard refresh interval is now enforced and defaults to 5 seconds.
-- **Interval calculation**: There is now a new option `Max data points` that controls the auto interval `$__interval` calculation. Interval was previously calculated by dividing the panel width by the time range. With the new max data points option it is now easy to set `$__interval` to a dynamic value that is time range agnostic. For example if you set `Max data points` to 10 Grafana will dynamically set `$__interval` by dividing the current time range by 10.
-- **Datasource/Loki**: Support for [deprecated Loki endpoints](https://github.com/grafana/loki/blob/master/docs/api.md#lokis-http-api) has been removed.
-- **Backend plugins**: Grafana now requires backend plugins to be signed, otherwise Grafana will not load/start them. This is an additional security measure to make sure backend plugin binaries and files haven't been tampered with. Refer to [Upgrade Grafana](https://grafana.com/docs/grafana/latest/installation/upgrading/#upgrading-to-v7-0) for more information.
 - **Docker**: Our Ubuntu based images have been upgraded to Ubuntu [20.04 LTS](https://releases.ubuntu.com/20.04/).
+- **Dashboard**: A global minimum dashboard refresh interval is now enforced and defaults to 5 seconds.
 - **@grafana/ui**: Forms migration notice, see [@grafana/ui changelog](https://github.com/grafana/grafana/blob/master/packages/grafana-ui/CHANGELOG.md)
 - **@grafana/ui**: Select API change for creating custom values, see [@grafana/ui changelog](https://github.com/grafana/grafana/blob/master/packages/grafana-ui/CHANGELOG.md)
+- **Interval calculation**: There is now a new option `Max data points` that controls the auto interval `$__interval` calculation. Interval was previously calculated by dividing the panel width by the time range. With the new max data points option it is now easy to set `$__interval` to a dynamic value that is time range agnostic. For example if you set `Max data points` to 10 Grafana will dynamically set `$__interval` by dividing the current time range by 10.
+- **Datasource/Loki**: Support for [deprecated Loki endpoints](https://github.com/grafana/loki/blob/master/docs/api.md#lokis-http-api) has been removed.
 
 **Deprecation warnings**
 
@@ -356,7 +51,7 @@ Grafana 7.0 comes with a new table panel (and deprecates the old one). This new
 
 ### Panel inspector
 
-The panel inspector is a feature that every panel will support, including internal as well as external community plugins. In this new panel inspector, you can view the raw data in a table format, apply some pre-defined transformations, and download as CSV. You can find the **Inspect** setting in the panel menu. Use the keyboard shortcut `i` when hovering over a panel to get the panel inspector to appear.
+The panel inspector is a feature that every panel will support, including internal as well as external community plugins. In this new panel inspector, you can view the raw data in a table format, apply some pre-defined transformations, and download as CSV. You can find the __Inspect__ setting in the panel menu. Use the keyboard shortcut `i` when hovering over a panel to get the panel inspector to appear.
 
 ### Improved time zone support
 
@@ -366,73 +61,6 @@ With this feature, you can specify the local time zone of the service or system
 
 We have also extended the time zone options so you can select any of the standard [ISO 8601 time zones](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).
 
-### Features / Enhancements
-
-- **Azure Monitor**: Deep linking from Log Analytic queries to the Azure Portal. [#24417](https://github.com/grafana/grafana/pull/24417), [@daniellee](https://github.com/daniellee)
-- **Backend plugins**: Log deprecation warning when using the unofficial first version of backend plugins. [#24675](https://github.com/grafana/grafana/pull/24675), [@marefr](https://github.com/marefr)
-- **CloudWatch/Logs**: Add data links to CloudWatch logs for deep linking to AWS. [#24334](https://github.com/grafana/grafana/pull/24334), [@kaydelaney](https://github.com/kaydelaney)
-- **CloudWatch**: Unify look of query mode select between dashboard and explore. [#24648](https://github.com/grafana/grafana/pull/24648), [@aocenas](https://github.com/aocenas)
-- **Docker**: Adds tzdata package to Ubuntu image. [#24422](https://github.com/grafana/grafana/pull/24422), [@xlson](https://github.com/xlson)
-- **Editor**: New line on Enter, run query on Shift+Enter. [#24654](https://github.com/grafana/grafana/pull/24654), [@davkal](https://github.com/davkal)
-- **Loki**: Allow multiple derived fields with the same name. [#24437](https://github.com/grafana/grafana/pull/24437), [@aocenas](https://github.com/aocenas)
-- **Orgs**: Add future deprecation notice. [#24502](https://github.com/grafana/grafana/pull/24502), [@torkelo](https://github.com/torkelo)
-
-### Bug Fixes
-
-- **@grafana/toolkit**: Use process.cwd() instead of PWD to get directory. [#24677](https://github.com/grafana/grafana/pull/24677), [@zoltanbedi](https://github.com/zoltanbedi)
-- **Admin**: Makes long settings values line break in settings page. [#24559](https://github.com/grafana/grafana/pull/24559), [@hugohaggmark](https://github.com/hugohaggmark)
-- **Azure Monitor**: Fix failure when using table join in Log Analytics queries. [#24528](https://github.com/grafana/grafana/pull/24528), [@daniellee](https://github.com/daniellee)
-- **CloudWatch/Logs**: Add error message when log groups are not selected. [#24361](https://github.com/grafana/grafana/pull/24361), [@aocenas](https://github.com/aocenas)
-- **CloudWatch/Logs**: Allows a user to search for log groups that aren't there initially. [#24695](https://github.com/grafana/grafana/pull/24695), [@kaydelaney](https://github.com/kaydelaney)
-- **CloudWatch/Logs**: Correctly interpolate variables in logs queries. [#24619](https://github.com/grafana/grafana/pull/24619), [@kaydelaney](https://github.com/kaydelaney)
-- **CloudWatch/Logs**: Fix autocomplete after by keyword. [#24644](https://github.com/grafana/grafana/pull/24644), [@aocenas](https://github.com/aocenas)
-- **CloudWatch/Logs**: Fix field autocomplete suggestions inside function. [#24406](https://github.com/grafana/grafana/pull/24406), [@aocenas](https://github.com/aocenas)
-- **CloudWatch/Logs**: Fix fields not being refetched when log group changed. [#24529](https://github.com/grafana/grafana/pull/24529), [@aocenas](https://github.com/aocenas)
-- **CloudWatch/Logs**: Fix panic on multiple aggregations queries. [#24683](https://github.com/grafana/grafana/pull/24683), [@aocenas](https://github.com/aocenas)
-- **CloudWatch/Logs**: Fix query error when results were sparse. [#24702](https://github.com/grafana/grafana/pull/24702), [@aocenas](https://github.com/aocenas)
-- **CloudWatch/Logs**: Fix suggestion for already inserted field. [#24581](https://github.com/grafana/grafana/pull/24581), [@aocenas](https://github.com/aocenas)
-- **CloudWatch/Logs**: Fix suggestions of fields after comma. [#24520](https://github.com/grafana/grafana/pull/24520), [@aocenas](https://github.com/aocenas)
-- **CloudWatch/Logs**: Fixes various autocomplete issues. [#24583](https://github.com/grafana/grafana/pull/24583), [@kaydelaney](https://github.com/kaydelaney)
-- **CloudWatch/Logs**: Handle errors that are not awserr.Error instances. [#24641](https://github.com/grafana/grafana/pull/24641), [@aknuds1](https://github.com/aknuds1)
-- **CloudWatch/Logs**: Handle invalidation of log groups when switching data source. [#24703](https://github.com/grafana/grafana/pull/24703), [@kaydelaney](https://github.com/kaydelaney)
-- **CloudWatch/Logs**: Make stats hint show consistently. [#24392](https://github.com/grafana/grafana/pull/24392), [@aocenas](https://github.com/aocenas)
-- **CloudWatch/Logs**: Prevents hidden data frame fields from displaying in tables. [#24580](https://github.com/grafana/grafana/pull/24580), [@kaydelaney](https://github.com/kaydelaney)
-- **CloudWatch/Logs**: Results of stats queries are now grouped. [#24396](https://github.com/grafana/grafana/pull/24396), [@kaydelaney](https://github.com/kaydelaney)
-- **CloudWatch/Logs**: Usability improvements. [#24447](https://github.com/grafana/grafana/pull/24447), [@kaydelaney](https://github.com/kaydelaney)
-- **Dashboard**: Allow editing provisioned dashboard JSON and add confirmation when JSON is copied to dashboard. [#24680](https://github.com/grafana/grafana/pull/24680), [@dprokop](https://github.com/dprokop)
-- **Dashboard**: Fix for strange "dashboard not found" errors when opening links in dashboard settings. [#24416](https://github.com/grafana/grafana/pull/24416), [@torkelo](https://github.com/torkelo)
-- **Dashboard**: Fix so default data source is selected when data source can't be found in panel editor. [#24526](https://github.com/grafana/grafana/pull/24526), [@mckn](https://github.com/mckn)
-- **Dashboard**: Fixed issue changing a panel from transparent back to normal in panel editor. [#24483](https://github.com/grafana/grafana/pull/24483), [@torkelo](https://github.com/torkelo)
-- **Dashboard**: Make header names reflect the field name when exporting to CSV file from the the panel inspector. [#24624](https://github.com/grafana/grafana/pull/24624), [@peterholmberg](https://github.com/peterholmberg)
-- **Dashboard**: Make sure side pane is displayed with tabs by default in panel editor. [#24636](https://github.com/grafana/grafana/pull/24636), [@dprokop](https://github.com/dprokop)
-- **Data source**: Fix query/annotation help content formatting. [#24687](https://github.com/grafana/grafana/pull/24687), [@AgnesToulet](https://github.com/AgnesToulet)
-- **Data source**: Fixes async mount errors. [#24579](https://github.com/grafana/grafana/pull/24579), [@Estrax](https://github.com/Estrax)
-- **Data source**: Fixes saving a data source without failure when URL doesn't specify a protocol. [#24497](https://github.com/grafana/grafana/pull/24497), [@aknuds1](https://github.com/aknuds1)
-- **Explore/Prometheus**: Show results of instant queries only in table. [#24508](https://github.com/grafana/grafana/pull/24508), [@ivanahuckova](https://github.com/ivanahuckova)
-- **Explore**: Fix rendering of react query editors. [#24593](https://github.com/grafana/grafana/pull/24593), [@ivanahuckova](https://github.com/ivanahuckova)
-- **Explore**: Fixes loading more logs in logs context view. [#24135](https://github.com/grafana/grafana/pull/24135), [@Estrax](https://github.com/Estrax)
-- **Graphite**: Fix schema and dedupe strategy in rollup indicators for Metrictank queries. [#24685](https://github.com/grafana/grafana/pull/24685), [@torkelo](https://github.com/torkelo)
-- **Graphite**: Makes query annotations work again. [#24556](https://github.com/grafana/grafana/pull/24556), [@hugohaggmark](https://github.com/hugohaggmark)
-- **Logs**: Clicking "Load more" from context overlay doesn't expand log row. [#24299](https://github.com/grafana/grafana/pull/24299), [@kaydelaney](https://github.com/kaydelaney)
-- **Logs**: Fix total bytes process calculation. [#24691](https://github.com/grafana/grafana/pull/24691), [@davkal](https://github.com/davkal)
-- **Org/user/team preferences**: Fixes so UI Theme can be set back to Default. [#24628](https://github.com/grafana/grafana/pull/24628), [@AgnesToulet](https://github.com/AgnesToulet)
-- **Plugins**: Fix manifest validation. [#24573](https://github.com/grafana/grafana/pull/24573), [@aknuds1](https://github.com/aknuds1)
-- **Provisioning**: Use proxy as default access mode in provisioning. [#24669](https://github.com/grafana/grafana/pull/24669), [@bergquist](https://github.com/bergquist)
-- **Search**: Fix select item when pressing enter and Grafana is served using a sub path. [#24634](https://github.com/grafana/grafana/pull/24634), [@tskarhed](https://github.com/tskarhed)
-- **Search**: Save folder expanded state. [#24496](https://github.com/grafana/grafana/pull/24496), [@Clarity-89](https://github.com/Clarity-89)
-- **Security**: Tag value sanitization fix in OpenTSDB data source. [#24539](https://github.com/grafana/grafana/pull/24539), [@rotemreiss](https://github.com/rotemreiss)
-- **Table**: Do not include angular options in options when switching from angular panel. [#24684](https://github.com/grafana/grafana/pull/24684), [@torkelo](https://github.com/torkelo)
-- **Table**: Fixed persisting column resize for time series fields. [#24505](https://github.com/grafana/grafana/pull/24505), [@torkelo](https://github.com/torkelo)
-- **Table**: Fixes Cannot read property subRows of null. [#24578](https://github.com/grafana/grafana/pull/24578), [@hugohaggmark](https://github.com/hugohaggmark)
-- **Time picker**: Fixed so you can enter a relative range in the time picker without being converted to absolute range. [#24534](https://github.com/grafana/grafana/pull/24534), [@mckn](https://github.com/mckn)
-- **Transformations**: Make transform dropdowns not cropped. [#24615](https://github.com/grafana/grafana/pull/24615), [@dprokop](https://github.com/dprokop)
-- **Transformations**: Sort order should be preserved as entered by user when using the reduce transformation. [#24494](https://github.com/grafana/grafana/pull/24494), [@hugohaggmark](https://github.com/hugohaggmark)
-- **Units**: Adds scale symbol for currencies with suffixed symbol. [#24678](https://github.com/grafana/grafana/pull/24678), [@hugohaggmark](https://github.com/hugohaggmark)
-- **Variables**: Fixes filtering options with more than 1000 entries. [#24614](https://github.com/grafana/grafana/pull/24614), [@hugohaggmark](https://github.com/hugohaggmark)
-- **Variables**: Fixes so Textbox variables read value from url. [#24623](https://github.com/grafana/grafana/pull/24623), [@hugohaggmark](https://github.com/hugohaggmark)
-- **Zipkin**: Fix error when span contains remoteEndpoint. [#24524](https://github.com/grafana/grafana/pull/24524), [@aocenas](https://github.com/aocenas)
-- **SAML**: Switch from email to login for user login attribute mapping (Enterprise)
-
 # 7.0.0-beta3 (2020-05-08)
 
 ### Features / Enhancements
@@ -499,7 +127,6 @@ We have also extended the time zone options so you can select any of the standar
 - **Tracing**: Fix view bounds after trace change. [#23994](https://github.com/grafana/grafana/pull/23994), [@aocenas](https://github.com/aocenas)
 - **Variables**: Migrates old tags format for consistency. [#24276](https://github.com/grafana/grafana/pull/24276), [@hugohaggmark](https://github.com/hugohaggmark)
 - **Reporting**: Update report schedule as soon as a report is updated (Enterprise)
-- **White-labeling**: Makes login title and subtitle configurable (Enterprise)
 
 # 7.0.0-beta1 (2020-04-28)
 
@@ -631,10 +258,6 @@ We have also extended the time zone options so you can select any of the standar
 - **Rich history**: Fix create url and run query for various datasources. [#23627](https://github.com/grafana/grafana/pull/23627), [@ivanahuckova](https://github.com/ivanahuckova)
 - **Security**: Fix XSS vulnerability in table panel. [#23816](https://github.com/grafana/grafana/pull/23816), [@torkelo](https://github.com/torkelo)
 
-# 6.7.4 (2020-06-03)
-
-- **Security**: Urgent security patch release. Please read more in our [blog](https://grafana.com/blog/2020/06/03/grafana-6.7.4-and-7.0.2-released-with-important-security-fix/)
-
 # 6.7.3 (2020-04-23)
 
 ### Bug Fixes
@@ -2114,7 +1737,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-3-3-and-4-
 - **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)
-- **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)
+- **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)
 - **Prometheus**: Heatmap - fix unhandled error when some points are missing [#12484](https://github.com/grafana/grafana/issues/12484)
@@ -2429,7 +2052,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-
 
 ### Fixes
 
-- **oauth** Fix GitHub OAuth not working with private Organizations [#11028](https://github.com/grafana/grafana/pull/11028) [@lostick](https://github.com/lostick)
+- **oauth** Fix Github OAuth not working with private Organizations [#11028](https://github.com/grafana/grafana/pull/11028) [@lostick](https://github.com/lostick)
 - **kiosk** white area over bottom panels in kiosk mode [#11010](https://github.com/grafana/grafana/issues/11010)
 - **alerting** Fix OK state doesn't show up in Microsoft Teams [#11032](https://github.com/grafana/grafana/pull/11032), thx [@manacker](https://github.com/manacker)
 
@@ -2441,7 +2064,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-
 - **Folders** Make it easier/explicit to access/modify folders using the API [#10630](https://github.com/grafana/grafana/issues/10630)
 - **Dashboard** Scrollbar works incorrectly in Grafana 5.0 Beta4 in some cases [#10982](https://github.com/grafana/grafana/issues/10982)
 - **ElasticSearch** Custom aggregation sizes no longer allowed for Elasticsearch [#10124](https://github.com/grafana/grafana/issues/10124)
-- **oauth** GitHub OAuth with allowed organizations fails to login [#10964](https://github.com/grafana/grafana/issues/10964)
+- **oauth** Github OAuth with allowed organizations fails to login [#10964](https://github.com/grafana/grafana/issues/10964)
 - **heatmap** Heatmap panel has partially hidden legend [#10793](https://github.com/grafana/grafana/issues/10793)
 - **snapshots** Expired snapshots not being cleaned up [#10996](https://github.com/grafana/grafana/pull/10996)
 
@@ -2474,7 +2097,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-
 - **Light theme** Fixed problem with light theme in safari, [#10869](https://github.com/grafana/grafana/issues/10869)
 - **Provisioning** Now handles deletes when dashboard json files removed from disk [#10865](https://github.com/grafana/grafana/issues/10865)
 - **MySQL** Fixed issue with schema migration on old mysql (index too long) [#10779](https://github.com/grafana/grafana/issues/10779)
-- **GitHub OAuth** Fixed fetching github orgs from private github org [#10823](https://github.com/grafana/grafana/issues/10823)
+- **Github OAuth** Fixed fetching github orgs from private github org [#10823](https://github.com/grafana/grafana/issues/10823)
 - **Embedding** Fixed issues embedding panel [#10787](https://github.com/grafana/grafana/issues/10787)
 
 # 5.0.0-beta1 (2018-02-05)
@@ -2533,7 +2156,7 @@ Dashboard panels and rows are positioned using a gridPos object `{x: 0, y: 0, w:
 - **Dashboard**: Make it possible to start dashboards from search and dashboard list panel [#1871](https://github.com/grafana/grafana/issues/1871)
 - **Annotations**: Posting annotations now return the id of the annotation [#9798](https://github.com/grafana/grafana/issues/9798)
 - **Systemd**: Use systemd notification ready flag [#10024](https://github.com/grafana/grafana/issues/10024), thx [@jgrassler](https://github.com/jgrassler)
-- **GitHub**: Use organizations_url provided from github to verify user belongs in org. [#10111](https://github.com/grafana/grafana/issues/10111), thx
+- **Github**: Use organizations_url provided from github to verify user belongs in org. [#10111](https://github.com/grafana/grafana/issues/10111), thx
   [@adiletmaratov](https://github.com/adiletmaratov)
 - **Backend**: Fixed bug where Grafana exited before all sub routines where finished [#10131](https://github.com/grafana/grafana/issues/10131)
 - **Azure**: Adds support for Azure blob storage as external image stor [#8955](https://github.com/grafana/grafana/issues/8955), thx [@saada](https://github.com/saada)
@@ -3540,8 +3163,8 @@ Grunt & Watch tasks:
 
 - [Issue #2218](https://github.com/grafana/grafana/issues/2218). Auth: You can now authenticate against api with username / password using basic auth
 - [Issue #2095](https://github.com/grafana/grafana/issues/2095). Search: Search now supports filtering by multiple dashboard tags
-- [Issue #1905](https://github.com/grafana/grafana/issues/1905). GitHub OAuth: You can now configure a GitHub team membership requirement, thx @dewski
-- [Issue #2052](https://github.com/grafana/grafana/issues/2052). GitHub OAuth: You can now configure a GitHub organization requirement, thx @indrekj
+- [Issue #1905](https://github.com/grafana/grafana/issues/1905). Github OAuth: You can now configure a Github team membership requirement, thx @dewski
+- [Issue #2052](https://github.com/grafana/grafana/issues/2052). Github OAuth: You can now configure a Github organization requirement, thx @indrekj
 - [Issue #1891](https://github.com/grafana/grafana/issues/1891). Security: New config option to disable the use of gravatar for profile images
 - [Issue #1921](https://github.com/grafana/grafana/issues/1921). Auth: Support for user authentication via reverse proxy header (like X-Authenticated-User, or X-WEBAUTH-USER)
 - [Issue #960](https://github.com/grafana/grafana/issues/960). Search: Backend can now index a folder with json files, will be available in search (saving back to folder is not supported, this feature is meant for static generated json dashboards)
@@ -3583,7 +3206,7 @@ Grunt & Watch tasks:
 - [Issue #1749](https://github.com/grafana/grafana/issues/1749). Graph Panel: Table legends are now visible when rendered to PNG
 - [Issue #1786](https://github.com/grafana/grafana/issues/1786). Graph Panel: Legend in table mode now aligns, graph area is reduced depending on how many series
 - [Issue #1734](https://github.com/grafana/grafana/issues/1734). Support for unicode / international characters in dashboard title (improved slugify)
-- [Issue #1782](https://github.com/grafana/grafana/issues/1782). GitHub OAuth: Now works with GitHub for Enterprise, thanks @williamjoy
+- [Issue #1782](https://github.com/grafana/grafana/issues/1782). Github OAuth: Now works with Github for Enterprise, thanks @williamjoy
 - [Issue #1780](https://github.com/grafana/grafana/issues/1780). Dashboard snapshot: Should not require login to view snapshot, Fixes #1780
 
 # 2.0.0-Beta3 (2015-04-12)

CODE_OF_CONDUCT.md

@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at conduct@grafana.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at contact@grafana.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

CONTRIBUTING.md

@@ -58,10 +58,10 @@ When you're ready to contribute, it's time to [Create a pull request](/contribut
 
 #### Contributor License Agreement (CLA)
 
-Before we can accept your pull request, you need to [sign our CLA](https://grafana.com/docs/grafana/latest/developers/cla/). If you haven't, our CLA assistant prompts you to when you create your pull request.
+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.
 
 ## Where do I go from here?
 
 - 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/grafana/latest/developers/plugins/) for Grafana.
+- Get started [developing plugins](https://grafana.com/docs/plugins/developing/development/) for Grafana.

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12.18.3-alpine3.12 as js-builder
+FROM node:12.16.3-alpine3.11 as js-builder
 
 WORKDIR /usr/src/app/
 
@@ -16,7 +16,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN ./node_modules/.bin/grunt build
 
-FROM golang:1.15.1-alpine3.12 as go-builder
+FROM golang:1.14.2-alpine3.11 as go-builder
 
 RUN apk add --no-cache gcc g++
 
@@ -32,7 +32,7 @@ COPY build.go package.json ./
 RUN go run build.go build
 
 # Final stage
-FROM alpine:3.12
+FROM alpine:3.11
 
 LABEL maintainer="Grafana team <hello@grafana.com>"
 
@@ -50,7 +50,7 @@ ENV PATH="/usr/share/grafana/bin:$PATH" \
 WORKDIR $GF_PATHS_HOME
 
 RUN apk add --no-cache ca-certificates bash tzdata && \
-    apk add --no-cache openssl musl-utils
+    apk add --no-cache --upgrade openssl musl-utils
 
 COPY conf ./conf
 

Dockerfile.ubuntu

@@ -1,4 +1,4 @@
-FROM node:12.18.3-slim AS js-builder
+FROM node:12.16.3-slim AS js-builder
 
 WORKDIR /usr/src/app/
 
@@ -16,7 +16,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN ./node_modules/.bin/grunt build
 
-FROM golang:1.15.1 AS go-builder
+FROM golang:1.14.2 AS go-builder
 
 WORKDIR /src/grafana
 
@@ -50,7 +50,7 @@ WORKDIR $GF_PATHS_HOME
 COPY conf conf
 
 # curl should be part of the image
-RUN apt-get update && apt-get install -y ca-certificates curl
+RUN apt-get update && apt-get upgrade -y && apt-get install -y ca-certificates curl
 
 RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
   addgroup --system --gid $GF_GID grafana && \
@@ -66,6 +66,7 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
     chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
     chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
 
+
 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

GOVERNANCE.md

@@ -1,203 +0,0 @@
-# Governance
-
-This document describes the rules and governance of the project. It is meant to be followed by all the developers of the project and the Grafana community. Common terminology used in this governance document are listed below:
-
-- **Team members**: Any members of the private [grafana-team][team] Google group.
-
-- **Maintainers**: Maintainers lead an individual project or parts thereof ([`MAINTAINERS.md`][maintainers]).
-
-- **Projects**: A single repository in the Grafana GitHub organization and listed below is referred to as a project:
-
-  - clock-panel
-  - devtools
-  - gel-app
-  - grafana
-  - grafana-github-datasource
-  - grafana-image-renderer
-  - grafana-kiosk
-  - grafana-plugin-sdk-go
-  - grafana-polystat-panel
-  - grafonnet-lib
-  - kairosdb-datasource
-  - piechart-panel
-  - simple-angular-panel
-  - simple-app-plugin
-  - simple-datasource
-  - simple-datasource-backend
-  - simple-json-backend-datasource
-  - simple-json-datasource
-  - simple-react-panel
-  - strava-datasource
-  - tutorials
-  - worldmap-panel
-
-- **The Grafana project**: The sum of all activities performed under this governance, concerning one or more repositories or the community.
-
-## Values
-
-The Grafana developers and community are expected to follow the values defined in the Grafana Code of Conduct. Furthermore, the Grafana community strives for kindness, giving feedback effectively, and building a welcoming environment. The Grafana developers generally decide by consensus and only resort to conflict resolution by a majority vote if consensus cannot be reached.
-
-## Projects
-
-Each project must have a [`MAINTAINERS.md`][maintainers] file with at least one maintainer. Where a project has a release process, access and documentation should be such that more than one person can perform a release. Releases should be announced on the Grafana Labs blog. Any new projects should be first proposed on the [team mailing list][team] following the voting procedures listed below.
-
-## Decision making
-
-### Team members
-
-Team member status may be given to those who have made ongoing contributions to the Grafana project for at least 3 months. This is usually in the form of code improvements and/or notable work on documentation, but organizing events or user support could also be taken into account.
-
-New members may be proposed by any existing member by email to [grafana-team][team]. It is highly desirable to reach consensus about acceptance of a new member. However, the proposal is ultimately voted on by a formal [supermajority vote](#supermajority-vote).
-
-If the new member proposal is accepted, the proposed team member should be contacted privately via email to confirm or deny their acceptance of team membership. This email will also be CC'd to [grafana-team][team] for record-keeping purposes.
-
-If they choose to accept, the [onboarding](#onboarding) procedure is followed.
-
-Team members may retire at any time by emailing [the team][team].
-
-Team members can be removed by [supermajority vote](#supermajority-vote) on [the team mailing list][team].
-For this vote, the member in question is not eligible to vote and does not count towards the quorum.
-Any removal vote can cover only one single person.
-
-Upon death of a member, they leave the team automatically.
-
-In case a member leaves, the [offboarding](#offboarding) procedure is applied.
-
-The current team members are:
-
-- Alexander Zobnin ([Grafana Labs](https://grafana.com/))
-- Andrej Ocenas ([Grafana Labs](https://grafana.com/))
-- Arve Knudsen ([Grafana Labs](https://grafana.com/))
-- Brian Gann ([Grafana Labs](https://grafana.com/))
-- Carl Bergquist ([Grafana Labs](https://grafana.com/))
-- Chris Trott ([Grafana Labs](https://grafana.com/))
-- Daniel Lee ([Grafana Labs](https://grafana.com/))
-- David Kaltschmidt ([Grafana Labs](https://grafana.com/))
-- Diana Payton ([Grafana Labs](https://grafana.com/))
-- Diana Sarlinska ([Grafana Labs](https://grafana.com/))
-- Dominik Prokop ([Grafana Labs](https://grafana.com/))
-- Emil Tullstedt ([Grafana Labs](https://grafana.com/))
-- Hugo Häggmark ([Grafana Labs](https://grafana.com/))
-- Ivana Huckova ([Grafana Labs](https://grafana.com/))
-- Jeroen Op 't Eynde ([Grafana Labs](https://grafana.com/))
-- Jessica Müller ([Grafana Labs](https://grafana.com/))
-- Julien Pivotto ([Inuits](https://inuits.eu/))
-- Kay Delaney ([Grafana Labs](https://grafana.com/))
-- Kyle Brandt ([Grafana Labs](https://grafana.com/))
-- Leonard Gram ([Grafana Labs](https://grafana.com/))
-- Lukas Siatka ([Grafana Labs](https://grafana.com/))
-- Malcolm Holmes ([Grafana Labs](https://grafana.com/))
-- Marcus Andersson ([Grafana Labs](https://grafana.com/))
-- Marcus Efraimsson ([Grafana Labs](https://grafana.com/))
-- Marcus Olsson ([Grafana Labs](https://grafana.com/))
-- Mitsuhiro Tanda ([GREE](https://corp.gree.net/jp/en/))
-- Patrick O’Carroll ([Grafana Labs](https://grafana.com/))
-- Peter Holmberg ([Grafana Labs](https://grafana.com/))
-- Richard Hartmann ([Grafana Labs](https://grafana.com/))
-- Ryan McKinley ([Grafana Labs](https://grafana.com/))
-- Sofia Papagiannaki ([Grafana Labs](https://grafana.com/))
-- Stephanie Closson ([Grafana Labs](https://grafana.com/))
-- Tobias Skarhed ([Grafana Labs](https://grafana.com/))
-- Torkel Ödegaard ([Grafana Labs](https://grafana.com/))
-- Utkarsh Bhatnagar ([Tinder](https://www.tinder.com/))
-
-### Maintainers
-
-Maintainers lead one or more project(s) or parts thereof and serve as a point of conflict resolution amongst the contributors to this project. Ideally, maintainers are also team members, but exceptions are possible for suitable maintainers that, for whatever reason, are not yet team members.
-
-Changes in maintainership have to be announced on the [developers mailing list][devs]. They are decided by [rough consensus](#consensus) and formalized by changing the [`MAINTAINERS.md`][maintainers] file of the respective repository.
-
-Maintainers are granted commit rights to all projects covered by this governance.
-
-A maintainer or committer may resign by notifying the [team mailing list][team]. A maintainer with no project activity for a year is considered to have resigned. Maintainers that wish to resign are encouraged to propose another team member to take over the project.
-
-A project may have multiple maintainers, as long as the responsibilities are clearly agreed upon between them. This includes coordinating who handles which issues and pull requests.
-
-### Technical decisions
-
-Technical decisions that only affect a single project are made informally by the maintainer of this project, and [rough consensus](#consensus) is assumed. Technical decisions that span multiple parts of the Grafana project should be discussed and made on the [Grafana developer mailing list][devs].
-
-Decisions are usually made by [rough consensus](#consensus). If no consensus can be reached, the matter may be resolved by [majority vote](#majority-vote).
-
-### Governance changes
-
-Changes to this document are made by Grafana Labs.
-
-### Other matters
-
-Any matter that needs a decision may be called to a vote by any member if they deem it necessary. For private or personnel matters, discussion and voting takes place on the [team mailing list][team], otherwise on the [developer mailing list][devs].
-
-## Voting
-
-The Grafana project usually runs by informal consensus, however sometimes a formal decision must be made.
-
-Depending on the subject matter, as laid out [above](#decision-making), different methods of voting are used.
-
-For all votes, voting must be open for at least one week. The end date should be clearly stated in the call to vote. A vote may be called and closed early if enough votes have come in one way so that further votes cannot change the final decision.
-
-In all cases, all and only [team members](#team-members) are eligible to vote, with the sole exception of the forced removal of a team member, in which said member is not eligible to vote.
-
-Discussion and votes on personnel matters (including but not limited to team membership and maintainership) are held in private on the [team mailing list][team]. All other discussion and votes are held in public on the [developer mailing list][devs].
-
-For public discussions, anyone interested is encouraged to participate. Formal power to object or vote is limited to [team members](#team-members).
-
-### Consensus
-
-The default decision making mechanism for the Grafana project is [rough][rough] consensus. This means that any decision on technical issues is considered supported by the [team][team] as long as nobody objects or the objection has been considered but not necessarily accommodated.
-
-Silence on any consensus decision is implicit agreement and equivalent to explicit agreement. Explicit agreement may be stated at will. Decisions may, but do not need to be called out and put up for decision on the [developers mailing list][devs] at any time and by anyone.
-
-Consensus decisions can never override or go against the spirit of an earlier explicit vote.
-
-If any [team member](#team-members) raises objections, the team members work together towards a solution that all involved can accept. This solution is again subject to rough consensus.
-
-In case no consensus can be found, but a decision one way or the other must be made, any [team member](#team-members) may call a formal [majority vote](#majority-vote).
-
-### Majority vote
-
-Majority votes must be called explicitly in a separate thread on the appropriate mailing list. The subject must be prefixed with `[VOTE]`. In the body, the call to vote must state the proposal being voted on. It should reference any discussion leading up to this point.
-
-Votes may take the form of a single proposal, with the option to vote yes or no, or the form of multiple alternatives.
-
-A vote on a single proposal is considered successful if more vote in favor than against.
-
-If there are multiple alternatives, members may vote for one or more alternatives, or vote “no” to object to all alternatives. It is not possible to cast an “abstain” vote. A vote on multiple alternatives is considered decided in favor of one alternative if it has received the most votes in favor, and a vote from more than half of those voting. Should no alternative reach this quorum, another vote on a reduced number of options may be called separately.
-
-### Supermajority vote
-
-Supermajority votes must be called explicitly in a separate thread on the appropriate mailing list. The subject must be prefixed with `[VOTE]`. In the body, the call to vote must state the proposal being voted on. It should reference any discussion leading up to this point.
-
-Votes may take the form of a single proposal, with the option to vote yes or no, or the form of multiple alternatives.
-
-A vote on a single proposal is considered successful if at least two thirds of those eligible to vote vote in favor.
-
-If there are multiple alternatives, members may vote for one or more alternatives, or vote “no” to object to all alternatives. A vote on multiple alternatives is considered decided in favor of one alternative if it has received the most votes in favor, and a vote from at least two thirds of those eligible to vote. Should no alternative reach this quorum, another vote on a reduced number of options may be called separately.
-
-## On- / Offboarding
-
-### Onboarding
-
-The new member is
-
-- added to the list of [team members](#team-members). Ideally by sending a PR of their own, at least approving said PR.
-- announced on the [developers mailing list][devs] by an existing team member. Ideally, the new member replies in this thread, acknowledging team membership.
-- added to the projects with commit rights.
-- added to the [team mailing list][team].
-
-### Offboarding
-
-The ex-member is
-
-- removed from the list of [team members](#team-members). Ideally by sending a PR of their own, at least approving said PR. In case of forced removal, no approval is needed.
-- removed from the projects. Optionally, they can retain maintainership of one or more repositories if the [team](#team-members) agrees.
-- removed from the team mailing list and demoted to a normal member of the other mailing lists.
-- not allowed to call themselves an active team member any more, nor allowed to imply this to be the case.
-- added to a list of previous members if they so choose.
-
-If needed, we reserve the right to publicly announce removal.
-
-[coc]: https://github.com/grafana/grafana/blob/master/CODE_OF_CONDUCT.md
-[devs]: https://groups.google.com/forum/#!forum/grafana-developers
-[maintainers]: https://github.com/grafana/grafana/blob/master/MAINTAINERS.md
-[rough]: https://tools.ietf.org/html/rfc7282
-[team]: https://groups.google.com/forum/#!forum/grafana-team

Gruntfile.js

@@ -1,5 +1,5 @@
 'use strict';
-module.exports = function(grunt) {
+module.exports = function (grunt) {
   var os = require('os');
   var config = {
     pkg: grunt.file.readJSON('package.json'),
@@ -47,20 +47,18 @@ module.exports = function(grunt) {
 
   // Utility function to load plugin settings into config
   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
-        config[key] = config[key] || {};
-        grunt.util._.extend(config[key], require(path + option)(config, grunt));
-      });
+    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
+      config[key] = config[key] || {};
+      grunt.util._.extend(config[key], require(path + option)(config,grunt));
+    });
     // technically not required
     return config;
   }
 
   // Merge that object with what with whatever we have here
-  loadConfig(config, './scripts/grunt/options/');
+  loadConfig(config,'./scripts/grunt/options/');
   // pass the config to grunt
   grunt.initConfig(config);
 };

ISSUE_TRIAGE.md

@@ -143,7 +143,7 @@ Label | Description
 `type/feature-request` | Request for a new feature or enhancement.
 `type/docs` | Documentation problem or enhancement.
 `type/accessibility` | Accessibility problem or enhancement.
-`type/question` | Issue is a question or is perceived as such.
+`type/question` | Issue is or perceived as a question.
 `type/duplicate` | An existing issue of the same subject/request have already been reported.
 `type/works-as-intended` | A reported bug works as intended/by design.
 `type/build-packaging` | Build or packaging problem or enhancement.
@@ -152,7 +152,7 @@ Label | Description
 
 ### Duplicate issue?
 
-Make sure it's not a duplicate by searching existing issues using related terms from the issue title and description. If you think you know there is an existing issue, but can't find it, please reach out to one of the maintainers and ask for help. If you identify that the issue is a duplicate of an existing issue:
+Make sure that it's not a duplicate by searching existing issues using related terms from the issue title and description. If you think you know there are an existing issue, but can't find it please reach out to one of the maintainers and ask for help. If you identify that the issue is a duplicate of an existing issue:
 
 1. Add a comment `Duplicate of #<issue number>`. GitHub will recognize this and add some additional context to the issue activity.
 2. Close the issue and label it with `type/duplicate`.
@@ -188,8 +188,8 @@ If it's not perfectly clear that it's an actual bug, quickly try to reproduce it
 First, evaluate if the documentation makes sense to be included in the Grafana project:
 
 - Is this something we want/can maintain as a project?
-- Is this referring to usage of some specific integration/tool and in that case is that a popular use case in combination with Grafana?
-- If unsure, kindly and politely add a comment explaining that we would need [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments) to identify that lots of other users want/need this.
+- Is this referring to usage of some specific integration/tool and in that case are those a popular use case in combination with Grafana?
+- If unsure, kindly and politely add a comment explaining that we would need [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments) to identify that lots of other users wants/needs this.
 
 Second, label the issue `type/docs` and at least one `area/*` or `datasource/*` label.
 
@@ -219,9 +219,9 @@ In general bugs and enhancement issues should be labeled with a priority.
 
 This is the most difficult thing with triaging issues since it requires a lot of knowledge, context and experience before being able to think of and start feel comfortable adding a certain priority label.
 
-The key here is asking for help and discuss issues to understand how more experienced project members think and reason. By doing that you learn more and eventually be more and more comfortable with prioritizing issues.
+The key here is asking for help and discuss issues to understand how more experienced project members thinks and reason. By doing that you learn more and eventually be more and more comfortable with prioritizing issues.
 
-In case there is an uncertainty around the prioritization of an issue, please ask the maintainers for help.
+In any case there are uncertainty around the priorization of an issue, please ask the maintainers for help.
 
 Label | Description
 ------- | --------
@@ -235,7 +235,7 @@ Label | Description
 
 **Critical bug?**
 
-1. If a bug has been categorized and any of the following criteria apply, the bug should be labeled as critical and must be actively worked on as someone's top priority right now.
+1. If a bug have been categorized and any of the following problems applies the bug should be labeled as critical and must be actively worked on as someone's top priority right now.
 
    - Results in any data loss
    - Critical security or performance issues
@@ -273,9 +273,9 @@ Label | Description
 
 ## 5. Requesting help from the community
 
-Depending on the issue and/or priority, it's always a good idea to consider signalling to the community that help from community is appreciated and needed in case an issue is not prioritized to be worked on by maintainers. Use your best judgement. In general, requesting help from the community means that a contribution has a good chance of getting accepted and merged.
+Depending on the issue and/or priority, it's always a good idea to consider signalling to the community that help from community is appreciated and needed in case an issue is not prioritized to be worked on by maintainers. Use your best judgement. In general, when requesting help from the community it means a contribution has a good chance of getting accepted and merged.
 
-In many cases the issue author or community as a whole is more suitable to contribute changes since they're experts in their domain. It's also quite common that someone has tried to get something to work using the documentation without success and made an effort to get it to work and/or reached out to the [community site](https://community.grafana.com/) to get the missing information. Particularly in these areas it's more likely that there exist experts in their own domain and it is usually a good idea to request help from contributors:
+In many cases the issue author or community as a whole is more suitable to contribute changes since they're experts in their domain. It's also quite common that someone has tried to get something to work using the documentation without success and made an effort to get it to work and/or reached out to the [community site](https://community.grafana.com/) to get the missing information. In especially these areas it's more likely that there exists experts in their own domain and usually a good idea to request help from contributors:
 
 - Database setups
 - Authentication like OAuth providers and LDAP setups
@@ -292,11 +292,11 @@ In many cases the issue author or community as a whole is more suitable to contr
 
 ## Investigation of issues
 
-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 on 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 put on hold until someone else (maintainer or contributor) picks it up and eventually starts investigating it.
+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 is a certain number 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, 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.
 
-For some other combinations it may not be possible at all for a maintainer to setup a proper test environment to investigate the issue. In these cases we really appreciate any help we can get from the community. Otherwise the issue is highly likely to be closed.
+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.
 
 Even if you don't have the time or knowledge to investigate an issue we highly recommend that you [upvote](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments) the issue if you happen to have the same problem. If you have further details that may help investigating the issue please provide as much information as possible.
 
@@ -306,14 +306,14 @@ Part of issue triage should also be triaging of external PRs. Main goal should b
 
 1. Check new external PRs which do not have a reviewer.
 1. Check if there is a link to an existing issue.
-1. If not and you know which issue it is solving, add the link yourself, otherwise ask the author to link the issue or create one.
+1. If not and you know which issue it is solving add the link yourself, otherwise ask the author to link the issue or create one.
 1. Assign a reviewer based on who was handling the linked issue or what code or feature does the PR touches (look at who was the last to make changes there if all else fails).
 
 ## Appendix
 
 ### Setting up Gmail filters
 
-If you're using Gmail it's highly recommended that you setup filters to automatically remove email from the inbox and label them accordingly to make it easy for you to understand when you need to act upon a notification or process all incoming issues that haven't been triaged.
+If you're using Gmail it's highly recommened that you setup filters to automatically remove email from the inbox and label them accordingly to make it easy for you to understand when you need to act upon a notification or process all incoming issues that haven't been triaged.
 
 This may be setup by personal preference, but here's a working configuration for reference.
 1. Follow instructions in [gist](https://gist.github.com/marefr/9167c2e31466f6316c1cba118874e74f)
@@ -327,14 +327,14 @@ This will give you a structure of labels in the sidebar similar to the following
 ```
  - Inbox
  ...
- - GitHub (mine)
+ - Github (mine)
    - activity
    - assigned
    - mentions
- - GitHub (other)
+ - Github (other)
   - Grafana
 ```
 
-* All notifications you’ll need to read/take action on show up as unread in GitHub (mine) and its sub-labels.
-* All other notifications you don’t need to take action on show up as unread in GitHub (other) and its sub-labels
+* All notifications you’ll need to read/take action on shows up as unread in Github (mine) and its sub-labels.
+* All other notifications you don’t need to take action on shows up as unread in Github (other) and its sub-labels
   * This is convenient for issue triage and to follow the activity in the Grafana project.

MAINTAINERS.md

@@ -1,8 +0,0 @@
-@torkelo is the main/default maintainer, some parts of the codebase have other maintainers:
-
-* Backend:
-  * @bergquist
-* Plugins:
-  * @ryantxu
-* UX/UI:
-  * @davkal

Makefile

@@ -4,7 +4,7 @@
 
 -include local/Makefile
 
-.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go revive golangci-lint test-go test-js test run run-frontend clean devenv devenv-down revive-strict protobuf help
+.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go gosec revive golangci-lint go-vet test-go test-js test run run-frontend clean devenv devenv-down revive-alerting protobuf help
 
 GO = GO111MODULE=on go
 GO_FILES ?= ./pkg/...
@@ -42,7 +42,6 @@ build-cli: ## Build Grafana CLI application.
 build-js: ## Build frontend assets.
 	@echo "build frontend"
 	yarn run build
-	yarn run plugins:build-bundled
 
 build: build-go build-js ## Build backend and frontend.
 
@@ -81,9 +80,14 @@ revive: scripts/go/bin/revive
 		-config ./scripts/go/configs/revive.toml \
 		$(GO_FILES)
 
-revive-strict: scripts/go/bin/revive
-	@echo "lint via revive (strict)"
-	@scripts/revive-strict scripts/go/bin/revive
+revive-alerting: scripts/go/bin/revive
+	@echo "lint alerting via revive"
+	@scripts/go/bin/revive \
+		-formatter stylish \
+		-config ./scripts/go/configs/revive-strict.toml \
+		./pkg/services/alerting/... \
+		./pkg/services/provisioning/datasources/... \
+		./pkg/services/provisioning/dashboards/...
 
 scripts/go/bin/golangci-lint: scripts/go/go.mod
 	@cd scripts/go; \
@@ -92,10 +96,26 @@ scripts/go/bin/golangci-lint: scripts/go/go.mod
 golangci-lint: scripts/go/bin/golangci-lint
 	@echo "lint via golangci-lint"
 	@scripts/go/bin/golangci-lint run \
-		--config ./scripts/go/configs/.golangci.toml \
+		--config ./scripts/go/configs/.golangci.yml \
 		$(GO_FILES)
 
-lint-go: golangci-lint revive revive-strict # Run all code checks for backend.
+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.
 
 # with disabled SC1071 we are ignored some TCL,Expect `/usr/bin/env expect` scripts
 shellcheck: $(SH_FILES) ## Run checks for shell scripts.

README.md

@@ -15,6 +15,15 @@ Grafana allows you to query, visualize, alert on and understand your metrics no
 - **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.
 
+### Grafana 7.0 and GrafanaCONline
+
+- Grafana 7.0 Beta is [available for download](https://grafana.com/grafana/download).
+- Read [what's is new](https://grafana.com/docs/grafana/latest/guides/whats-new-in-v7-0/).
+
+Want to learn more about Grafana 7 and more? Sign up for our online conference!
+
+[![GrafanaCONline](public/img/grafanaconline.png)](https://grafana.com/about/events/grafanacon/2020/?source=grafana-readme)
+
 ## Get started
 
 - [Get Grafana](https://grafana.com/get)

SECURITY.md

@@ -6,7 +6,7 @@ Please encrypt your message to us; please use our PGP key. The key fingerprint i
 
 F988 7BEA 027A 049F AE8E  5CAA D125 8932 BE24 C5CA
 
-The key is available from [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=0xF9887BEA027A049FAE8E5CAAD1258932BE24C5CA&fingerprint=on&op=index).
+The key is available from [pgp.mit.edu](https://pgp.mit.edu/pks/lookup?op=get&search=0xF9887BEA027A049FAE8E5CAAD1258932BE24C5CA) by searching for [grafana](https://pgp.mit.edu/pks/lookup?search=grafana&op=index).
 
 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.
 

WORKFLOW.md

@@ -1,73 +0,0 @@
-# Grafana workflow
-
-This document is based on [GOVERNANCE.md](GOVERNANCE.md). We assume good faith and intend to keep all processes as lightweight as possible but as specific as required. In case of disagreements about anything in this document, GOVERNANCE.md applies.
-
-The key words “MUST”, “MUST NOT”, “REQUIRED”, “SHALL”, “SHALL NOT”, “SHOULD”, “SHOULD NOT”, “RECOMMENDED”, “MAY”, and “OPTIONAL” in this document are to be interpreted as described in [RFC2119](http://tools.ietf.org/html/rfc2119).
-
-Git and [GitHub terminology](https://help.github.com/en/github/getting-started-with-github/github-glossary) are used throughout this document.
-
-Team members and their access to repositories is maintained through [GitHub teams](https://help.github.com/en/github/setting-up-and-managing-organizations-and-teams/about-teams). Team maintainers add and remove team members as outlined in GOVERNANCE.md.
-
-# Code changes
-
-## Proposing changes
-
-Examples of proposed changes are overarching architecture, component design, and specific code or graphical elements. Proposed changes SHOULD cover the big picture and intention, but individual parts SHOULD be split into the smallest possible changes. Changes SHOULD be based on and target the master branch. Depending on size of the proposed change, each change SHOULD be discussed, in increasing order of change size and complexity:
-* Directly in a RR (Pull Request) - this MAY be done, but SHOULD not be the common case.
-* Issue
-* Developer mailing list
-* Design document, shared via Google Docs, accessible to at least all team members.
-
-Significant changes MUST be discussed and agreed upon with the relevant subsystem maintainers.
-
-## Merging PRs (Pull Requests)
-
-Depending on the size and complexity of a PR, different requirements MUST be applied. Any team member contributing substantially to a PR MUST NOT count against review requirements.
-Commits MUST be merged into master using PRs. They MUST NOT be merged into master directly.
-* Every merge MUST be approved by at least one team member.
-* Non-trivial changes MUST be approved by at least
-  * two team members, or
-  * one subsystem maintainer.
-* Significant changes MUST be approved by at least
-  * two team members, AND
-  * the relevant subsystem maintainer.
-
-PRs MUST be [reviewed](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/reviewing-changes-in-pull-requests) and [approved](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/approving-a-pull-request-with-required-reviews) via GitHub’s review system.
-* Reviewers MAY write comments if approving
-* Reviewers MUST write comments if rejecting a PR or if requesting changes.
-
-Once a PR is approved as per above, any team member MAY merge the PR.
-
-# Release workflow
-
-## Branch structure
-
-Grafana uses trunk-based development.
-
-In particular, we found that the following principles match how we work:
-* Master and release branches MUST always build without failure.
-* Branches SHOULD be merged often. Larger changes SHOULD be activated with feature flags until they are ready. Long-lived development branches SHOULD be avoided.
-* Changes MAY be enabled by default once they are in a complete state
-* Changes which span multiple PRs MUST be described in an overarching issue or Google Doc.
-
-## Releases
-
-Releases MUST follow [Semantic Versioning](https://semver.org/) in naming and SHOULD follow Semantic Versioning as closely as reasonably possible for non-library software.
-
-Release branches MUST be split from the following branches.
-* MAJOR release branches MUST be based on master.
-* MINOR release branches MUST be based on master.
-* PATCH release branches MUST be split from the relevant MINOR release branch’s most current PATCH
-
-Security releases follow the same process but MUST be prepared in secret. Security releases MUST NOT include changes which are not related to the security fix. Normal release processes MUST accommodate the security release process. SECURITY.md MUST be followed.
-
-PRs intended for inclusion in the next PATCH release MUST be labeled with `cherry-pick-needed` so they can be picked up by automated release tooling.
-
-Releases follow the following cadence
-* MAJOR: Yearly
-* MINOR: Every 4-6 weeks
-* PATCH: As needed
-
-Releases SHOULD NOT be delayed by pending changes.
-
-Releases MUST be coordinated with the relevant subsystem maintainers.

build.go

@@ -9,7 +9,6 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"go/build"
 	"io"
 	"io/ioutil"
 	"log"
@@ -58,6 +57,8 @@ func main() {
 	log.SetOutput(os.Stdout)
 	log.SetFlags(0)
 
+	ensureGoPath()
+
 	var buildIdRaw string
 
 	flag.StringVar(&goarch, "goarch", runtime.GOARCH, "GOARCH")
@@ -105,16 +106,16 @@ func main() {
 
 		case "build-srv", "build-server":
 			clean()
-			doBuild("grafana-server", "./pkg/cmd/grafana-server", []string{})
+			build("grafana-server", "./pkg/cmd/grafana-server", []string{})
 
 		case "build-cli":
 			clean()
-			doBuild("grafana-cli", "./pkg/cmd/grafana-cli", []string{})
+			build("grafana-cli", "./pkg/cmd/grafana-cli", []string{})
 
 		case "build":
 			//clean()
 			for _, binary := range binaries {
-				doBuild(binary, "./pkg/cmd/"+binary, []string{})
+				build(binary, "./pkg/cmd/"+binary, []string{})
 			}
 
 		case "build-frontend":
@@ -416,6 +417,18 @@ func createPackage(options linuxPackageOptions) {
 	runPrint("fpm", append([]string{"-t", options.packageType}, args...)...)
 }
 
+func ensureGoPath() {
+	if os.Getenv("GOPATH") == "" {
+		cwd, err := os.Getwd()
+		if err != nil {
+			log.Fatal(err)
+		}
+		gopath := filepath.Clean(filepath.Join(cwd, "../../../../"))
+		log.Println("GOPATH is", gopath)
+		os.Setenv("GOPATH", gopath)
+	}
+}
+
 func grunt(params ...string) {
 	if runtime.GOOS == windows {
 		runPrint(`.\node_modules\.bin\grunt`, params...)
@@ -463,7 +476,7 @@ func test(pkg string) {
 	runPrint("go", "test", "-short", "-timeout", "60s", pkg)
 }
 
-func doBuild(binaryName, pkg string, tags []string) {
+func build(binaryName, pkg string, tags []string) {
 	libcPart := ""
 	if libc != "" {
 		libcPart = fmt.Sprintf("-%s", libc)
@@ -541,7 +554,7 @@ func clean() {
 
 	rmr("dist")
 	rmr("tmp")
-	rmr(filepath.Join(build.Default.GOPATH, fmt.Sprintf("pkg/%s_%s/github.com/grafana", goos, goarch)))
+	rmr(filepath.Join(os.Getenv("GOPATH"), fmt.Sprintf("pkg/%s_%s/github.com/grafana", goos, goarch)))
 }
 
 func setBuildEnv() {

conf/defaults.ini

@@ -126,8 +126,7 @@ connstr =
 # This enables data proxy logging, default is false
 logging = false
 
-# How long the data proxy waits before timing out, default is 30 seconds.
-# This setting also applies to core backend HTTP data sources where query requests use an HTTP client with timeout set.
+# How long the data proxy should wait before timing out default is 30 (seconds)
 timeout = 30
 
 # If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
@@ -189,6 +188,7 @@ allow_embedding = false
 # Set to true if you want to enable http strict transport security (HSTS) response header.
 # This is only sent when HTTPS is enabled in this configuration.
 # HSTS tells browsers that the site should only be accessed using HTTPS.
+# The default will change to true in the next minor release, 6.3.
 strict_transport_security = false
 
 # Sets how long a browser should cache HSTS. Only applied if strict_transport_security is enabled.
@@ -202,12 +202,12 @@ strict_transport_security_subdomains = false
 
 # Set to true to enable the X-Content-Type-Options response header.
 # The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised
-# in the Content-Type headers should not be changed and be followed.
-x_content_type_options = true
+# in the Content-Type headers should not be changed and be followed. The default will change to true in the next minor release, 6.3.
+x_content_type_options = false
 
 # Set to true to enable the X-XSS-Protection header, which tells browsers to stop pages from loading
-# when they detect reflected cross-site scripting (XSS) attacks.
-x_xss_protection = true
+# when they detect reflected cross-site scripting (XSS) attacks. The default will change to true in the next minor release, 6.3.
+x_xss_protection = false
 
 
 #################################### Snapshots ###########################
@@ -234,9 +234,6 @@ versions_to_keep = 20
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 min_refresh_interval = 5s
 
-# Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json"
-default_home_dashboard_path =
-
 #################################### Users ###############################
 [users]
 # disable user signup / registration
@@ -301,8 +298,8 @@ signout_redirect_url =
 # This setting is ignored if multiple OAuth providers are configured.
 oauth_auto_login = false
 
-# OAuth state max age cookie duration in seconds. Defaults to 600 seconds.
-oauth_state_cookie_max_age = 600
+# OAuth state max age cookie duration. Defaults to 60 seconds.
+oauth_state_cookie_max_age = 60
 
 # limit of api_key seconds to live before expiration
 api_key_max_seconds_to_live = -1
@@ -318,15 +315,12 @@ org_name = Main Org.
 # specify role for unauthenticated users
 org_role = Viewer
 
-# mask the Grafana version number for unauthenticated users
-hide_version = false
-
-#################################### GitHub Auth #########################
+#################################### Github Auth #########################
 [auth.github]
 enabled = false
 allow_sign_up = true
 client_id = some_id
-client_secret =
+client_secret = some_secret
 scopes = user:email,read:org
 auth_url = https://github.com/login/oauth/authorize
 token_url = https://github.com/login/oauth/access_token
@@ -340,7 +334,7 @@ allowed_organizations =
 enabled = false
 allow_sign_up = true
 client_id = some_id
-client_secret =
+client_secret = some_secret
 scopes = api
 auth_url = https://gitlab.com/oauth/authorize
 token_url = https://gitlab.com/oauth/token
@@ -353,7 +347,7 @@ allowed_groups =
 enabled = false
 allow_sign_up = true
 client_id = some_client_id
-client_secret =
+client_secret = some_client_secret
 scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
 auth_url = https://accounts.google.com/o/oauth2/auth
 token_url = https://accounts.google.com/o/oauth2/token
@@ -367,7 +361,7 @@ hosted_domain =
 enabled = false
 allow_sign_up = true
 client_id = some_id
-client_secret =
+client_secret = some_secret
 scopes = user:email
 allowed_organizations =
 
@@ -375,7 +369,7 @@ allowed_organizations =
 enabled = false
 allow_sign_up = true
 client_id = some_id
-client_secret =
+client_secret = some_secret
 scopes = user:email
 allowed_organizations =
 
@@ -385,7 +379,7 @@ name = Azure AD
 enabled = false
 allow_sign_up = true
 client_id = some_client_id
-client_secret =
+client_secret = some_client_secret
 scopes = openid email profile
 auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
 token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
@@ -398,7 +392,7 @@ name = Okta
 enabled = false
 allow_sign_up = true
 client_id = some_id
-client_secret =
+client_secret = some_secret
 scopes = openid profile email groups
 auth_url = https://<tenant-id>.okta.com/oauth2/v1/authorize
 token_url = https://<tenant-id>.okta.com/oauth2/v1/token
@@ -413,13 +407,11 @@ name = OAuth
 enabled = false
 allow_sign_up = true
 client_id = some_id
-client_secret =
+client_secret = some_secret
 scopes = user:email
 email_attribute_name = email:primary
 email_attribute_path =
-login_attribute_path =
 role_attribute_path =
-id_token_attribute_name =
 auth_url =
 token_url =
 api_url =
@@ -472,7 +464,6 @@ skip_verify = false
 from_address = admin@grafana.localhost
 from_name = Grafana
 ehlo_identity =
-startTLS_policy =
 
 [emails]
 welcome_email_on_sign_up = false
@@ -599,36 +590,6 @@ max_attempts = 3
 # Makes it possible to enforce a minimal interval between evaluations, to reduce load on the backend
 min_interval_seconds = 1
 
-# Configures for how long alert annotations are stored. Default is 0, which keeps them forever.
-# This setting should be expressed as an duration. Ex 6h (hours), 10d (days), 2w (weeks), 1M (month).
-max_annotation_age =
-
-# Configures max number of alert annotations that Grafana stores. Default value is 0, which keeps all alert annotations.
-max_annotations_to_keep =
-
-#################################### Annotations #########################
-
-[annotations.dashboard]
-# Dashboard annotations means that annotations are associated with the dashboard they are created on.
-
-# Configures how long dashboard annotations are stored. Default is 0, which keeps them forever.
-# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
-max_age =
-
-# Configures max number of dashboard annotations that Grafana stores. Default value is 0, which keeps all dashboard annotations.
-max_annotations_to_keep =
-
-[annotations.api]
-# API annotations means that the annotations have been created using the API without any
-# association with a dashboard.
-
-# Configures how long Grafana stores API annotations. Default is 0, which keeps them forever.
-# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
-max_age =
-
-# Configures max number of API annotations that Grafana keeps. Default value is 0, which keeps all API annotations.
-max_annotations_to_keep =
-
 #################################### Explore #############################
 [explore]
 # Enable the Explore section
@@ -707,8 +668,6 @@ public_url =
 key_file =
 bucket =
 path =
-enable_signed_urls = false
-signed_url_expiration =
 
 [external_image_storage.azure_blob]
 account_name =
@@ -789,7 +748,7 @@ rendering_clustering_mode =
 # When rendering_mode = clustered you can define maximum number of browser instances/incognito pages that can execute concurrently..
 rendering_clustering_max_concurrency =
 
-# Limit the maximum viewport width, height and device scale factor that can be requested.
+# Limit the maxiumum viewport width, height and device scale factor that can be requested.
 rendering_viewport_max_width =
 rendering_viewport_max_height =
 rendering_viewport_max_device_scale_factor =
@@ -805,22 +764,3 @@ license_path =
 [feature_toggles]
 # enable features, separated by spaces
 enable =
-
-[date_formats]
-# For information on what formatting patterns that are supported https://momentjs.com/docs/#/displaying/
-
-# Default system date format used in time range picker and other places where full time is displayed
-full_date = YYYY-MM-DD HH:mm:ss
-
-# Used by graph and other places where we only show small intervals
-interval_second = HH:mm:ss
-interval_minute = HH:mm
-interval_hour = MM/DD HH:mm
-interval_day = MM/DD
-interval_month = YYYY-MM
-interval_year = YYYY
-
-# Experimental feature
-use_browser_locale = false
-
-

conf/provisioning/plugins/sample.yaml

@@ -1,11 +0,0 @@
-# # config file version
-apiVersion: 1
-
-# apps:
-#   - type: grafana-example-app
-#     org_name: Main Org.
-#     disabled: true
-#   - type: raintank-worldping-app
-#     org_id: 1
-#     jsonData:
-#       apiKey: "API KEY"

conf/sample.ini

@@ -127,8 +127,7 @@
 # This enables data proxy logging, default is false
 ;logging = false
 
-# How long the data proxy waits before timing out, default is 30 seconds.
-# This setting also applies to core backend HTTP data sources where query requests use an HTTP client with timeout set.
+# How long the data proxy should wait before timing out default is 30 (seconds)
 ;timeout = 30
 
 # If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
@@ -143,7 +142,7 @@
 ;reporting_enabled = true
 
 # Set to false to disable all checks to https://grafana.net
-# for new versions (grafana itself and plugins), check is used
+# for new vesions (grafana itself and plugins), check is used
 # in some UI views to notify that grafana or plugin update exists
 # This option does not cause any auto updates, nor send any information
 # only a GET request to http://grafana.com to get latest versions
@@ -190,6 +189,7 @@
 # Set to true if you want to enable http strict transport security (HSTS) response header.
 # This is only sent when HTTPS is enabled in this configuration.
 # HSTS tells browsers that the site should only be accessed using HTTPS.
+# The default version will change to true in the next minor release, 6.3.
 ;strict_transport_security = false
 
 # Sets how long a browser should cache HSTS. Only applied if strict_transport_security is enabled.
@@ -203,12 +203,12 @@
 
 # Set to true to enable the X-Content-Type-Options response header.
 # The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised
-# in the Content-Type headers should not be changed and be followed.
-;x_content_type_options = true
+# in the Content-Type headers should not be changed and be followed. The default will change to true in the next minor release, 6.3.
+;x_content_type_options = false
 
 # Set to true to enable the X-XSS-Protection header, which tells browsers to stop pages from loading
-# when they detect reflected cross-site scripting (XSS) attacks.
-;x_xss_protection = true
+# when they detect reflected cross-site scripting (XSS) attacks. The default will change to true in the next minor release, 6.3.
+;x_xss_protection = false
 
 #################################### Snapshots ###########################
 [snapshots]
@@ -233,9 +233,6 @@
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ;min_refresh_interval = 5s
 
-# Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json"
-;default_home_dashboard_path =
-
 #################################### Users ###############################
 [users]
 # disable user signup / registration
@@ -300,8 +297,8 @@
 # This setting is ignored if multiple OAuth providers are configured.
 ;oauth_auto_login = false
 
-# OAuth state max age cookie duration in seconds. Defaults to 600 seconds.
-;oauth_state_cookie_max_age = 600
+# OAuth state max age cookie duration. Defaults to 60 seconds.
+;oauth_state_cookie_max_age = 60
 
 # limit of api_key seconds to live before expiration
 ;api_key_max_seconds_to_live = -1
@@ -317,10 +314,7 @@
 # specify role for unauthenticated users
 ;org_role = Viewer
 
-# mask the Grafana version number for unauthenticated users
-;hide_version = false
-
-#################################### GitHub Auth ##########################
+#################################### Github Auth ##########################
 [auth.github]
 ;enabled = false
 ;allow_sign_up = true
@@ -407,8 +401,6 @@
 ;scopes = user:email,read:org
 ;email_attribute_name = email:primary
 ;email_attribute_path =
-;login_attribute_path =
-;id_token_attribute_name =
 ;auth_url = https://foo.bar/login/oauth/authorize
 ;token_url = https://foo.bar/login/oauth/access_token
 ;api_url = https://foo.bar/user
@@ -462,8 +454,6 @@
 ;from_name = Grafana
 # EHLO identity in SMTP dialog (defaults to instance_name)
 ;ehlo_identity = dashboard.example.com
-# SMTP startTLS policy (defaults to 'OpportunisticStartTLS')
-;startTLS_policy = NoStartTLS
 
 [emails]
 ;welcome_email_on_sign_up = false
@@ -591,36 +581,6 @@
 # Makes it possible to enforce a minimal interval between evaluations, to reduce load on the backend
 ;min_interval_seconds = 1
 
-# Configures for how long alert annotations are stored. Default is 0, which keeps them forever.
-# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
-;max_annotation_age =
-
-# Configures max number of alert annotations that Grafana stores. Default value is 0, which keeps all alert annotations.
-;max_annotations_to_keep =
-
-#################################### Annotations #########################
-
-[annotations.dashboard]
-# Dashboard annotations means that annotations are associated with the dashboard they are created on.
-
-# Configures how long dashboard annotations are stored. Default is 0, which keeps them forever.
-# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
-;max_age =
-
-# Configures max number of dashboard annotations that Grafana stores. Default value is 0, which keeps all dashboard annotations.
-;max_annotations_to_keep =
-
-[annotations.api]
-# API annotations means that the annotations have been created using the API without any
-# association with a dashboard.
-
-# Configures how long Grafana stores API annotations. Default is 0, which keeps them forever.
-# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
-;max_age =
-
-# Configures max number of API annotations that Grafana keeps. Default value is 0, which keeps all API annotations.
-;max_annotations_to_keep =
-
 #################################### Explore #############################
 [explore]
 # Enable the Explore section
@@ -777,7 +737,7 @@
 # When rendering_mode = clustered you can define maximum number of browser instances/incognito pages that can execute concurrently..
 ;rendering_clustering_max_concurrency =
 
-# Limit the maximum viewport width, height and device scale factor that can be requested.
+# Limit the maxiumum viewport width, height and device scale factor that can be requested.
 ;rendering_viewport_max_width =
 ;rendering_viewport_max_height =
 ;rendering_viewport_max_device_scale_factor =
@@ -794,20 +754,3 @@
 [feature_toggles]
 # enable features, separated by spaces
 ;enable =
-
-[date_formats]
-# For information on what formatting patterns that are supported https://momentjs.com/docs/#/displaying/
-
-# Default system date format used in time range picker and other places where full time is displayed
-;full_date = YYYY-MM-DD HH:mm:ss
-
-# Used by graph and other places where we only show small intervals
-;interval_second = HH:mm:ss
-;interval_minute = HH:mm
-;interval_hour = MM/DD HH:mm
-;interval_day = MM/DD
-;interval_month = YYYY-MM
-;interval_year = YYYY
-
-# Experimental feature
-;use_browser_locale = false

contribute/developer-guide.md

@@ -27,14 +27,11 @@ npm install -g yarn
 
 ## Download Grafana
 
-We recommend using the Git command-line interface to download the source code for the Grafana project:
+We recommend using Go to download the source code for the Grafana project:
 
-1. Open a terminal and run `git clone https://github.com/grafana/grafana.git`. This command downloads Grafana to a new `grafana` directory in your current directory.
-1. Open the `grafana` directory in your favorite code editor.
-
-For alternative ways of cloning the Grafana repository, please refer to [GitHub's cloning a repository](https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository) documentation.
-
-**Warning:** Do not use `go get` to download Grafana. Recent versions of Go have added behavior which isn't compatible with the way the Grafana repository is structured.
+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
 
@@ -128,7 +125,7 @@ yarn e2e:dev
 
 ## Configure Grafana for development
 
-The default configuration, `defaults.ini`, is located in the `conf` directory.
+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.
 
@@ -187,7 +184,7 @@ Are you having issues with setting up your environment? Here are some tips that
 
 ### Too many open files when running `make run`
 
-Depending on your environment, you may have to increase the maximum number of open files allowed. For the rest of this section, we will assume you are on a Unix like OS (e.g. Linux/macOS), where you can control the maximum number of open files through the [ulimit](https://ss64.com/bash/ulimit.html) shell command.
+Depending on your environment, you may have to increase the maximum number of open files allowed. For the rest of this section, we will assume you are on a Unix like OS (e.g. Linux/MacOS), where you can control the maximum number of open files through the [ulimit](https://ss64.com/bash/ulimit.html) shell command.
 
 To see how many open files are allowed, run:
 
@@ -228,7 +225,7 @@ For some people, typically using the bash shell, ulimit fails with an error simi
 ulimit: open files: cannot modify limit: Operation not permitted
 ```
 
-If that happens to you, chances are you've already set a lower limit and your shell won't let you set a higher one. Try looking in your shell initialization files (~/.bashrc typically), if there's already a ulimit command that you can tweak.
+If that happens to you, chances are you've already set a lower limit and your shell won't let you set a higher one. Try looking in your shell initalization files (~/.bashrc typically), if there's already a ulimit command that you can tweak.
 
 ## Next steps
 

contribute/style-guides/backend.md

@@ -1,6 +1,6 @@
 # Backend style guide
 
-Grafana's 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.
+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:
 

contribute/style-guides/code-comments.md

@@ -25,7 +25,7 @@ All `exported` apis from the package should have a release tag to indicate its s
 
 - [`@alpha`](https://api-extractor.com/pages/tsdoc/tag_alpha/) - early draft of api and will probably change.
 - [`@beta`](https://api-extractor.com/pages/tsdoc/tag_beta/) - close to being stable but might change.
-- [`@public`](https://api-extractor.com/pages/tsdoc/tag_public/) - ready for usage in production.
+- [`@public`](https://api-extractor.com/pages/tsdoc/tag_public/) - ready for useage in production.
 - [`@internal`](https://api-extractor.com/pages/tsdoc/tag_internal/) - for internal use only.
 
 ### Main stability of APIs
@@ -139,7 +139,7 @@ This attribute can be skipped if the type provided by `typescript` and the funct
 
 ```typescript
 /**
- * Will help to create a resource resolver depending
+ * Will help to create a resource resovler depending
  * on the current execution context.
  * 
  * @param context - The current execution context.
@@ -179,7 +179,7 @@ This attribute can be skipped if the type provided by `typescript` and the funct
 
 ```typescript
 /**
- * Will help to create a resource resolver depending
+ * Will help to create a resource resovler depending
  * on the current execution context.
  * 
  * @param context - The current execution context.
@@ -206,4 +206,4 @@ export const factory = (context: Context): IResolver => {
 export const isEqual = (x: number, y: number): boolean => {
     return x === y;
 }
-```
+```

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

@@ -22,11 +22,11 @@ Start your document with a single ``#`` for the title of the page. Add the sub-h
 
 * Make text **bold** using two asterisks.
 
-**Example:** It is ``**important**`` to use GitHub Flavored Markdown emoji consistently.
+**Example:** It is ``**important**`` to use Github Flavored Markdown emoji consistently.
 
 * Make text ``*emphasized*`` using single `` _underscores_`` or a single asterisk.
 
-**Example:** GitHub Flavored Markdown emoji should _only_ appear in specific cases.
+**Example:** Github Flavored Markdown emoji should _only_ appear in specific cases.
 
 
 ## Links and references
@@ -36,7 +36,7 @@ the web URL in curved brackets.
 
 \[text to display](www.website.com)
 
-**Example:** For more information on including emoji in GitHub flavored Markdown, refer to the [webfx page on emoji](https://www.webfx.com/tools/emoji-cheat-sheet/) for a list of emoji.
+**Example:** For more information on including emoji in Github flavored Markdown, refer to the [webfx page on emoji](https://www.webfx.com/tools/emoji-cheat-sheet/) for a list of emoji.
 
 ## Block quotes
 

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

@@ -4,7 +4,7 @@ This style guide applies to all documentation created for Grafana products.
 
 For information about how to write technical documentation, we suggest reviewing the content of the [Google Technical Writing courses](https://developers.google.com/tech-writing).
 
-The [Divio documentation system](https://documentation.divio.com/) site and the [Vue writing principles](https://v3.vuejs.org/guide/contributing/writing-guide.html#principles) are also good resources.
+The [Divio documentation system](https://documentation.divio.com/) site is also a good resource.
 
 ## Contributing
 
@@ -18,32 +18,6 @@ For all items not covered in this guide, refer to the [Microsoft Style Guide](ht
 
 The [codespell](https://github.com/codespell-project/codespell) tool is run for every change to catch common misspellings.
 
-## Inclusive language
-
-This section provides guidelines on how to avoid using charged language in documentation.
-
-### Allowing and blocking
-
-Don't use "whitelist" or "blacklist" when referring to allowing or blocking content or traffic.
-
-* When used as a noun, use "allowlist" or "blocklist".
-* When used as a verb, use "allow" or "block"
-
-Example: _To **allow** outgoing traffic, add the IP to the **allowlist**._
-
-### Leader and follower
-
-Don't use "master" or "slave" to describe relationships between nodes or processes.
-
-* Use "leader", "main" or "primary," instead of "master."
-* Use "follower" or "secondary," instead of "slave."
-
-### Exceptions
-
-When referring to a configuration or settings used by third-party libraries och technologies outside the Grafana project, prefer the original name to avoid confusion.
-
-For example, use "master" when referring to the default Git branch.
-
 ## 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.
@@ -57,10 +31,9 @@ The following sections provide general guidelines on topics specific to Grafana
 * 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."
+* Do not use an ampersand (&) as an abbreviation for "and." 
   - **Exceptions:** If an ampersand is used in the Grafana UI, then match the UI.
 * Avoid using internal slang and jargon in technical documentation.
-* Do not use two spaces after a period. Only add one space after each sentence. Do not add a space at the end of the paragraph.
 
 ### File naming conventions
 
@@ -183,7 +156,7 @@ One word, not two.
 
 #### open source, open-source
 
-Do not hyphenate when used as an adjective unless the lack of hyphen would cause confusion. For example: _Open source software design is the most open open-source system I can imagine._
+Do not hyphenate when used as an adjective unless the lack of hyphen would cause confusion. For example: _Open source software design is the most open open-source system I can imagine._ 
 
 Do not hyphenate when it is used as a noun. For example: _Open source is the best way to develop software._
 

contribute/style-guides/e2e.md

@@ -66,8 +66,8 @@ The next step is to create a `Page` representation in our e2e test framework to
 
 ```typescript
 export const Login = {
-  url: '/login', // used when called from Login.visit()
-  username: 'Username input field', // used when called from Login.username().type('Hello World')
+  url: "/login", // used when called from Login.visit()
+  username: "Username input field", // used when called from Login.username().type('Hello World')
 };
 ```
 
@@ -186,3 +186,24 @@ describe('List test', () => {
   });
 });
 ```
+
+## Debugging PhantomJS image rendering
+
+### Common Error
+
+The most common error with PhantomJs image rendering is when a PR introduces an import that has functionality that's not supported by PhantomJs. To quickly identify which new import causes this you can use a tool like `es-check`.
+
+1. Run > `npx es-check es5 './public/build/*.js'`
+2. Check the output for files that break es5 compatibility.
+3. Lazy load the failing imports if possible.
+
+### Debugging
+
+There is no easy or comprehensive way to debug PhantomJS smoke test (image rendering) failures. However, PhantomJS exposes remote debugging interface which can give you a sense of what is going wrong in the smoke test. Before performing the steps described below make sure your local Grafana instance is running:
+
+1. Go to `tools/phantomjs` directory
+2. Execute `phantomjs` binary against `render.js` file: `./phantomjs --remote-debugger-port=9009 --remote-debugger-autorun=yes ./render.js url="http://localhost:3000"`
+3. In your browser navigate to `http://localhost:9009/`
+4. Select `http://localhost:3000/login` from the list. You will get access to Webkit's inspector to see the console's output from the smoke test.
+
+The method described above is not perfect, but is helpful to evaluate smoke tests breaking due to bundle errors.

contribute/style-guides/frontend.md

@@ -15,8 +15,6 @@ Generally we follow the Airbnb [React Style Guide](https://github.com/airbnb/jav
   - [React](#react)
     - [Props](#props)
   - [State management](#state-management)
-  
-  - [Proposal for removing or replacing Angular dependencies](https://github.com/grafana/grafana/pull/23048)
 
 ## Basic rules
 
@@ -109,7 +107,7 @@ class DateCalculator {
 }
 class DateCalculator {
   // bad
-  calculate_time_range () {...}
+  calculate_timee_range () {...}
 }
 
 class DateCalculator {
@@ -149,7 +147,7 @@ interface ModalState {
 ```typescript
 const getStyles  = = () => ({
   // bad
-  ElementWrapper: css`...`,
+  ElementWraper: css`...`,
   // bad
   ["element-wrapper"]: css`...`,
 
@@ -326,6 +324,6 @@ static defaultProps: Partial<Props> = { ... }
 ## State management
 
 - Don't mutate state in reducers or thunks.
-- Use `createSlice`. See [Redux Toolkit](https://redux-toolkit.js.org/) for more details.
+- Use helpers `actionCreatorFactory` and `reducerFactory` instead of traditional `switch statement` reducers in Redux. See [Redux framework](redux.md) for more details.
 - Use `reducerTester` to test reducers. See [Redux framework](redux.md) for more details.
 - Use state selectors to access state instead of accessing state directly.

contribute/style-guides/styling.md

@@ -23,27 +23,6 @@ const ComponentA = () => (
 );
 ```
 
-### Styling with theme
-
-To access the theme in your styles, use the `useStyles` hook. It provides basic memoization and access to the theme object.
-
-```tsx
-import React, { FC } from 'react';
-import { GrafanaTheme } from '@grafana/data';
-import { useStyles } from '@grafana/ui';
-import { css } from 'emotion';
-
-const getComponentStyles = (theme: GrafanaTheme) => css`
-  padding: ${theme.spacing.md};
-`;
-
-const Foo: FC<FooProps> = () => {
-  const styles = useStyles(getComponentsStyles);
-
-  // Use styles with className
-};
-```
-
 ### Styling complex components
 
 In more complex cases, especially when you need to style multiple DOM elements in one component, or when using styles that depend on properties and/or state, you should create a helper function that returns an object of styles. This function should also be wrapped in the `stylesFactory` helper function, which will provide basic memoization.
@@ -57,7 +36,10 @@ import { GrafanaTheme } from '@grafana/data';
 import { selectThemeVariant, stylesFactory, useTheme } from '@grafana/ui';
 
 const getStyles = stylesFactory((theme: GrafanaTheme) => {
-  const backgroundColor = selectThemeVariant({ light: theme.colors.red, dark: theme.colors.blue }, theme.type);
+  const backgroundColor = selectThemeVariant(
+    { light: theme.colors.red, dark: theme.colors.blue },
+    theme.type
+  );
 
   return {
     wrapper: css`

contribute/style-guides/themes.md

@@ -18,40 +18,6 @@ This section provides usage guidelines.
 
 Here's how to use Grafana themes in React components.
 
-#### useStyles hook
-
-`useStyles` memoizes the function and provides access to the theme.
-
-```tsx
-import React, { FC } from 'react';
-import { GrafanaTheme } from '@grafana/data';
-import { useStyles } from '@grafana/ui';
-import { css } from 'emotion';
-
-const getComponentStyles = (theme: GrafanaTheme) => css`
-  padding: ${theme.spacing.md};
-`;
-
-const Foo: FC<FooProps> = () => {
-  const styles = useStyles(getComponentsStyles);
-
-  // Use styles with className
-};
-```
-
-#### Get the theme object
-
-```tsx
-import React, { FC } from 'react';
-import { useTheme } from '@grafana/ui';
-
-const Foo: FC<FooProps> = () => {
-  const theme = useTheme();
-
-  // Your component has access to the theme variables now
-};
-```
-
 #### Using `ThemeContext` directly
 
 ```tsx
@@ -60,6 +26,19 @@ import { ThemeContext } from '@grafana/ui';
 <ThemeContext.Consumer>{theme => <Foo theme={theme} />}</ThemeContext.Consumer>;
 ```
 
+or
+
+```tsx
+import React, { useContext } from 'react';
+import { ThemeContext } from '@grafana/ui';
+
+const Foo: React.FunctionComponent<FooProps> = () => {
+  const theme = useContext(ThemeContext);
+
+  // Your component has access to the theme variables now
+}
+```
+
 #### Using `withTheme` higher-order component (HOC)
 
 With this method your component will be automatically wrapped in `ThemeContext.Consumer` and provided with current theme via `theme` prop. Components used with `withTheme` must implement the `Themeable` interface.
@@ -97,38 +76,69 @@ describe('MyComponent', () => {
     restoreThemeContext();
   });
 
-
-  it('renders correctly', () => {
+  it('renders correctyl', () => {
     const wrapper = mount(<MyComponent />)
     expect(wrapper).toMatchSnapshot();
   });
 });
 ```
 
+### Using themes in [Storybook](https://storybook.js.org/)
+
+All stories are wrapped with `ThemeContext.Provider` using a global decorator. To render a `Themeable` component that isn't wrapped by a `withTheme` HOC, either create a new component in your story, or use the `renderComponentWithTheme` helper.
+
+#### Create a new component:
+
+```tsx
+// Foo.story.tsx
+const FooWithTheme = withTheme(Foo);
+
+FooStories.add('Story' () => {
+  return <FooWithTheme />
+});
+```
+
+#### Use `renderComponentWithTheme` helper:
+
+```tsx
+// Bar.story.tsx
+
+BarStories.add('Story' () => {
+  return renderComponentWithTheme(Bar, /* pass props here */)
+});
+```
+
+### Using themes in Angular code
+
+There should be very few cases where a theme would be used in an Angular context. For this purpose, there is a function available that retrieves the current theme:
+
+```ts
+import { getCurrentTheme } from app/core/utils/ConfigProvider
+```
+
+Angular components should be migrated to React, or if that's not possible at the moment, styled using Sass.
+
 ## FAQ
 
 This section provides insight into frequently-asked questions.
 
 ### How can I modify Sass variable files?
 
-**If possible, migrate styles to Emotion**
-
 > For the following to apply you need to run `yarn dev` task.
 
 `[_variables|_variables.dark|_variables.light].generated.scss` files are the ones that are referenced in the main Sass files for Sass variables to be available. **These files are automatically generated and should never be modified by hand!**
 
-#### If you need to modify a _Sass variable value_ you need to modify the corresponding Typescript file that is the source of the variables:
-
+#### If you need to modify a *Sass variable value* you need to modify the corresponding Typescript file that is the source of the variables:
 - `_variables.generated.scss` - modify `grafana-ui/src/themes/default.ts`
 - `_variables.light.generated.scss` - modify `grafana-ui/src/themes/light.ts`
 - `_variables.dark.generated.scss` - modify `grafana-ui/src/themes/dark.ts`
 
-#### If you need to _add new variable_ to Sass variables you need to modify corresponding template file:
-
+#### If you need to *add new variable* to Sass variables you need to modify corresponding template file:
 - `_variables.generated.scss` - modify `grafana-ui/src/themes/_variables.scss.tmpl.ts`
 - `_variables.light.generated.scss` - modify `grafana-ui/src/themes/_variables.light.scss.tmpl.ts`
 - `_variables.dark.generated.scss` - modify `grafana-ui/src/themes/_variables.dark.scss.tmpl.ts`
 
+
 ## Limitations
 
 This section describes limitations with Grafana's theming system.

devenv/datasources.yaml

@@ -1,3 +1,4 @@
+
 apiVersion: 1
 
 datasources:
@@ -225,7 +226,6 @@ datasources:
     jsonData:
       authType: credentials
       defaultRegion: eu-west-2
-      customMetricsNamespaces: "CWAgent"
 
   # Keep to test old /api/prom API
   - name: gdev-loki-0.3
@@ -270,3 +270,5 @@ datasources:
     access: proxy
     url: http://localhost:9411
     editable: false
+
+

devenv/dev-dashboards-without-uid/panel_tests_graph.json

@@ -454,7 +454,7 @@
       "yaxes": [
         {
           "format": "percent",
-          "label": "Percent",
+          "label": "Perecent",
           "logBase": 1,
           "max": null,
           "min": null,
@@ -1632,7 +1632,10 @@
   "revision": 8,
   "schemaVersion": 16,
   "style": "dark",
-  "tags": ["gdev", "panel-tests"],
+  "tags": [
+    "gdev",
+    "panel-tests"
+  ],
   "templating": {
     "list": []
   },
@@ -1641,8 +1644,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": "browser",
   "title": "Panel Tests - Graph",

devenv/dev-dashboards-without-uid/panel_tests_polystat.json

@@ -428,14 +428,6 @@
             {
               "text": "Bitcoin (฿)",
               "value": "currencyBTC"
-            },
-            {
-              "text": "Milli Bitcoin (mBTC)",
-              "value": "currencymBTC"
-            },
-            {
-              "text": "Micro Bitcoin (μBTC)",
-              "value": "currencyμBTC"
             }
           ],
           "text": "currency"

devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v2.json

@@ -28,7 +28,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1591027568655,
+  "iteration": 1554310942895,
   "links": [
     {
       "asDropdown": true,
@@ -47,14 +47,7 @@
       "datasource": "gdev-elasticsearch-v2-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 7,
@@ -62,7 +55,6 @@
         "x": 0,
         "y": 0
       },
-      "hiddenSeries": false,
       "id": 1,
       "legend": {
         "alignAsTable": true,
@@ -79,9 +71,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -181,14 +170,7 @@
       "datasource": "gdev-elasticsearch-v2-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 6,
@@ -196,7 +178,6 @@
         "x": 0,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 2,
       "legend": {
         "alignAsTable": true,
@@ -213,9 +194,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -314,14 +292,7 @@
       "datasource": "gdev-elasticsearch-v2-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 6,
@@ -329,7 +300,6 @@
         "x": 12,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 3,
       "legend": {
         "alignAsTable": true,
@@ -346,9 +316,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -460,12 +427,6 @@
       "datasource": "gdev-elasticsearch-v2-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fontSize": "100%",
       "gridPos": {
         "h": 7,
@@ -484,13 +445,11 @@
       },
       "styles": [
         {
-          "align": "auto",
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
           "pattern": "@timestamp",
           "type": "date"
         },
         {
-          "align": "auto",
           "colorMode": null,
           "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
@@ -546,7 +505,7 @@
       ],
       "title": "ES Metrics",
       "transform": "table",
-      "type": "table-old"
+      "type": "table"
     },
     {
       "columns": [
@@ -570,12 +529,6 @@
       "datasource": "gdev-elasticsearch-v2-logs",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fontSize": "100%",
       "gridPos": {
         "h": 7,
@@ -594,7 +547,6 @@
       },
       "styles": [
         {
-          "align": "auto",
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
           "pattern": "@timestamp",
           "type": "date"
@@ -622,7 +574,7 @@
       ],
       "title": "ES Log query",
       "transform": "json",
-      "type": "table-old"
+      "type": "table"
     },
     {
       "circleMaxSize": 30,
@@ -632,12 +584,6 @@
       "decimals": 0,
       "esGeoPoint": "@location",
       "esMetric": "Average",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 12,
         "w": 24,
@@ -699,7 +645,7 @@
       "valueName": "total"
     }
   ],
-  "schemaVersion": 25,
+  "schemaVersion": 18,
   "style": "dark",
   "tags": ["elasticsearch", "gdev", "datasource-test"],
   "templating": {
@@ -732,5 +678,5 @@
   "timezone": "browser",
   "title": "Datasource tests - Elasticsearch v2",
   "uid": "RlqLq2fiz",
-  "version": 1
+  "version": 5
 }

devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v5.json

@@ -28,7 +28,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1591027589702,
+  "iteration": 1554310560048,
   "links": [
     {
       "asDropdown": true,
@@ -47,14 +47,7 @@
       "datasource": "gdev-elasticsearch-v5-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 7,
@@ -62,7 +55,6 @@
         "x": 0,
         "y": 0
       },
-      "hiddenSeries": false,
       "id": 1,
       "legend": {
         "alignAsTable": true,
@@ -79,9 +71,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -181,14 +170,7 @@
       "datasource": "gdev-elasticsearch-v5-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 6,
@@ -196,7 +178,6 @@
         "x": 0,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 2,
       "legend": {
         "alignAsTable": true,
@@ -213,9 +194,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -314,14 +292,7 @@
       "datasource": "gdev-elasticsearch-v5-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 6,
@@ -329,7 +300,6 @@
         "x": 12,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 3,
       "legend": {
         "alignAsTable": true,
@@ -346,9 +316,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -460,12 +427,6 @@
       "datasource": "gdev-elasticsearch-v5-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fontSize": "100%",
       "gridPos": {
         "h": 7,
@@ -484,13 +445,11 @@
       },
       "styles": [
         {
-          "align": "auto",
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
           "pattern": "@timestamp",
           "type": "date"
         },
         {
-          "align": "auto",
           "colorMode": null,
           "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
@@ -546,7 +505,7 @@
       ],
       "title": "ES Metrics",
       "transform": "table",
-      "type": "table-old"
+      "type": "table"
     },
     {
       "columns": [
@@ -570,12 +529,6 @@
       "datasource": "gdev-elasticsearch-v5-logs",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fontSize": "100%",
       "gridPos": {
         "h": 7,
@@ -594,7 +547,6 @@
       },
       "styles": [
         {
-          "align": "auto",
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
           "pattern": "@timestamp",
           "type": "date"
@@ -622,7 +574,7 @@
       ],
       "title": "ES Log query",
       "transform": "json",
-      "type": "table-old"
+      "type": "table"
     },
     {
       "circleMaxSize": 30,
@@ -633,12 +585,6 @@
       "esGeoPoint": "@location",
       "esLocationName": "",
       "esMetric": "Average",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 12,
         "w": 24,
@@ -700,7 +646,7 @@
       "valueName": "total"
     }
   ],
-  "schemaVersion": 25,
+  "schemaVersion": 18,
   "style": "dark",
   "tags": ["elasticsearch", "gdev", "datasource-test"],
   "templating": {
@@ -733,5 +679,5 @@
   "timezone": "browser",
   "title": "Datasource tests - Elasticsearch v5",
   "uid": "8HjT32Bmz",
-  "version": 1
+  "version": 5
 }

devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v6.json

@@ -28,7 +28,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1591027529668,
+  "iteration": 1554310839317,
   "links": [
     {
       "asDropdown": true,
@@ -47,14 +47,7 @@
       "datasource": "gdev-elasticsearch-v6-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 7,
@@ -62,7 +55,6 @@
         "x": 0,
         "y": 0
       },
-      "hiddenSeries": false,
       "id": 1,
       "legend": {
         "alignAsTable": true,
@@ -79,9 +71,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -181,14 +170,7 @@
       "datasource": "gdev-elasticsearch-v6-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 6,
@@ -196,7 +178,6 @@
         "x": 0,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 2,
       "legend": {
         "alignAsTable": true,
@@ -213,9 +194,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -314,14 +292,7 @@
       "datasource": "gdev-elasticsearch-v6-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 6,
@@ -329,7 +300,6 @@
         "x": 12,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 3,
       "legend": {
         "alignAsTable": true,
@@ -346,9 +316,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -460,12 +427,6 @@
       "datasource": "gdev-elasticsearch-v6-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fontSize": "100%",
       "gridPos": {
         "h": 7,
@@ -484,13 +445,11 @@
       },
       "styles": [
         {
-          "align": "auto",
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
           "pattern": "@timestamp",
           "type": "date"
         },
         {
-          "align": "auto",
           "colorMode": null,
           "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
@@ -546,7 +505,7 @@
       ],
       "title": "ES Metrics",
       "transform": "table",
-      "type": "table-old"
+      "type": "table"
     },
     {
       "columns": [
@@ -570,12 +529,6 @@
       "datasource": "gdev-elasticsearch-v6-logs",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fontSize": "100%",
       "gridPos": {
         "h": 7,
@@ -594,7 +547,6 @@
       },
       "styles": [
         {
-          "align": "auto",
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
           "pattern": "@timestamp",
           "type": "date"
@@ -622,7 +574,7 @@
       ],
       "title": "ES Log query",
       "transform": "json",
-      "type": "table-old"
+      "type": "table"
     },
     {
       "circleMaxSize": 30,
@@ -632,12 +584,6 @@
       "decimals": 0,
       "esGeoPoint": "@location",
       "esMetric": "Average",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 12,
         "w": 24,
@@ -699,8 +645,7 @@
       "valueName": "total"
     }
   ],
-  "refresh": false,
-  "schemaVersion": 25,
+  "schemaVersion": 18,
   "style": "dark",
   "tags": ["elasticsearch", "gdev", "datasource-test"],
   "templating": {
@@ -717,7 +662,7 @@
     ]
   },
   "time": {
-    "from": "now-1h",
+    "from": "now-30m",
     "to": "now"
   },
   "timepicker": {
@@ -733,5 +678,5 @@
   "timezone": "browser",
   "title": "Datasource tests - Elasticsearch v6",
   "uid": "NF8Pq2Biz",
-  "version": 1
+  "version": 5
 }

devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v6_filebeat.json

@@ -15,7 +15,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1591027621672,
+  "iteration": 1554902936982,
   "links": [
     {
       "asDropdown": true,
@@ -34,21 +34,13 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "gdev-elasticsearch-v6-filebeat",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "gridPos": {
         "h": 5,
         "w": 24,
         "x": 0,
         "y": 0
       },
-      "hiddenSeries": false,
       "id": 4,
       "legend": {
         "avg": false,
@@ -62,9 +54,6 @@
       "lines": false,
       "linewidth": 1,
       "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 2,
       "points": false,
@@ -153,13 +142,22 @@
       }
     },
     {
-      "datasource": "gdev-elasticsearch-v6-filebeat",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
+      "columns": [
+        {
+          "text": "@timestamp",
+          "value": "@timestamp"
         },
-        "overrides": []
-      },
+        {
+          "text": "fields.level",
+          "value": "fields.level"
+        },
+        {
+          "text": "message",
+          "value": "message"
+        }
+      ],
+      "datasource": "gdev-elasticsearch-v6-filebeat",
+      "fontSize": "100%",
       "gridPos": {
         "h": 22,
         "w": 24,
@@ -168,35 +166,58 @@
       },
       "id": 2,
       "links": [],
-      "options": {
-        "showLabels": false,
-        "showTime": true,
-        "sortOrder": "Descending",
-        "wrapLogMessage": true
+      "pageSize": null,
+      "scroll": true,
+      "showHeader": true,
+      "sort": {
+        "col": 0,
+        "desc": true
       },
+      "styles": [
+        {
+          "alias": "Time",
+          "dateFormat": "YYYY-MM-DD HH:mm:ss",
+          "pattern": "@timestamp",
+          "type": "date"
+        },
+        {
+          "alias": "Level",
+          "colorMode": null,
+          "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+          "dateFormat": "YYYY-MM-DD HH:mm:ss",
+          "decimals": 2,
+          "mappingType": 1,
+          "pattern": "fields.level",
+          "thresholds": [""],
+          "type": "string",
+          "unit": "short",
+          "valueMaps": []
+        },
+        {
+          "alias": "Message",
+          "colorMode": null,
+          "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+          "decimals": 2,
+          "pattern": "message",
+          "preserveFormat": false,
+          "sanitize": false,
+          "thresholds": [],
+          "type": "string",
+          "unit": "short"
+        }
+      ],
       "targets": [
         {
-          "bucketAggs": [
-            {
-              "$$hashKey": "object:394",
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "auto",
-                "min_doc_count": 0,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
+          "bucketAggs": [],
           "metrics": [
             {
-              "$$hashKey": "object:359",
               "field": "select field",
               "id": "1",
               "meta": {},
-              "settings": {},
-              "type": "logs"
+              "settings": {
+                "size": 500
+              },
+              "type": "raw_document"
             }
           ],
           "query": "fields.app:grafana",
@@ -207,10 +228,11 @@
       "timeFrom": null,
       "timeShift": null,
       "title": "Panel Title",
-      "type": "logs"
+      "transform": "json",
+      "type": "table"
     }
   ],
-  "schemaVersion": 25,
+  "schemaVersion": 18,
   "style": "dark",
   "tags": ["gdev", "elasticsearch", "datasource-test"],
   "templating": {
@@ -227,7 +249,7 @@
     ]
   },
   "time": {
-    "from": "now-30m",
+    "from": "now-1h",
     "to": "now"
   },
   "timepicker": {
@@ -237,5 +259,5 @@
   "timezone": "",
   "title": "Datasource tests - Elasticsearch v6 Filebeat",
   "uid": "06tPt4gZz",
-  "version": 1
+  "version": 8
 }

devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v7.json

@@ -28,7 +28,8 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1591027717495,
+  "id": 2342,
+  "iteration": 1555593977614,
   "links": [
     {
       "asDropdown": true,
@@ -47,14 +48,7 @@
       "datasource": "gdev-elasticsearch-v7-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 7,
@@ -62,7 +56,6 @@
         "x": 0,
         "y": 0
       },
-      "hiddenSeries": false,
       "id": 1,
       "legend": {
         "alignAsTable": true,
@@ -79,9 +72,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -181,14 +171,7 @@
       "datasource": "gdev-elasticsearch-v7-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 6,
@@ -196,7 +179,6 @@
         "x": 0,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 2,
       "legend": {
         "alignAsTable": true,
@@ -213,9 +195,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -314,14 +293,7 @@
       "datasource": "gdev-elasticsearch-v7-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 6,
@@ -329,7 +301,6 @@
         "x": 12,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 3,
       "legend": {
         "alignAsTable": true,
@@ -346,9 +317,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -460,12 +428,6 @@
       "datasource": "gdev-elasticsearch-v7-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fontSize": "100%",
       "gridPos": {
         "h": 7,
@@ -484,13 +446,11 @@
       },
       "styles": [
         {
-          "align": "auto",
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
           "pattern": "@timestamp",
           "type": "date"
         },
         {
-          "align": "auto",
           "colorMode": null,
           "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
@@ -546,7 +506,7 @@
       ],
       "title": "ES Metrics",
       "transform": "table",
-      "type": "table-old"
+      "type": "table"
     },
     {
       "columns": [
@@ -570,12 +530,6 @@
       "datasource": "gdev-elasticsearch-v7-logs",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fontSize": "100%",
       "gridPos": {
         "h": 7,
@@ -594,7 +548,6 @@
       },
       "styles": [
         {
-          "align": "auto",
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
           "pattern": "@timestamp",
           "type": "date"
@@ -622,7 +575,7 @@
       ],
       "title": "ES Log query",
       "transform": "json",
-      "type": "table-old"
+      "type": "table"
     },
     {
       "circleMaxSize": 30,
@@ -632,12 +585,6 @@
       "decimals": 0,
       "esGeoPoint": "@location",
       "esMetric": "Average",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 12,
         "w": 24,
@@ -699,7 +646,7 @@
       "valueName": "total"
     }
   ],
-  "schemaVersion": 25,
+  "schemaVersion": 18,
   "style": "dark",
   "tags": ["elasticsearch", "gdev", "datasource-test"],
   "templating": {

devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v7_filebeat.json

@@ -15,7 +15,8 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1591027736516,
+  "id": 2341,
+  "iteration": 1555591591930,
   "links": [
     {
       "asDropdown": true,
@@ -34,21 +35,13 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "gdev-elasticsearch-v7-filebeat",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "gridPos": {
         "h": 5,
         "w": 24,
         "x": 0,
         "y": 0
       },
-      "hiddenSeries": false,
       "id": 4,
       "legend": {
         "avg": false,
@@ -62,9 +55,6 @@
       "lines": false,
       "linewidth": 1,
       "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 2,
       "points": false,
@@ -153,13 +143,22 @@
       }
     },
     {
-      "datasource": "gdev-elasticsearch-v7-filebeat",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
+      "columns": [
+        {
+          "text": "@timestamp",
+          "value": "@timestamp"
         },
-        "overrides": []
-      },
+        {
+          "text": "fields.level",
+          "value": "fields.level"
+        },
+        {
+          "text": "message",
+          "value": "message"
+        }
+      ],
+      "datasource": "gdev-elasticsearch-v7-filebeat",
+      "fontSize": "100%",
       "gridPos": {
         "h": 22,
         "w": 24,
@@ -168,35 +167,58 @@
       },
       "id": 2,
       "links": [],
-      "options": {
-        "showLabels": false,
-        "showTime": true,
-        "sortOrder": "Descending",
-        "wrapLogMessage": true
+      "pageSize": null,
+      "scroll": true,
+      "showHeader": true,
+      "sort": {
+        "col": 0,
+        "desc": true
       },
+      "styles": [
+        {
+          "alias": "Time",
+          "dateFormat": "YYYY-MM-DD HH:mm:ss",
+          "pattern": "@timestamp",
+          "type": "date"
+        },
+        {
+          "alias": "Level",
+          "colorMode": null,
+          "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+          "dateFormat": "YYYY-MM-DD HH:mm:ss",
+          "decimals": 2,
+          "mappingType": 1,
+          "pattern": "fields.level",
+          "thresholds": [""],
+          "type": "string",
+          "unit": "short",
+          "valueMaps": []
+        },
+        {
+          "alias": "Message",
+          "colorMode": null,
+          "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+          "decimals": 2,
+          "pattern": "message",
+          "preserveFormat": false,
+          "sanitize": false,
+          "thresholds": [],
+          "type": "string",
+          "unit": "short"
+        }
+      ],
       "targets": [
         {
-          "bucketAggs": [
-            {
-              "$$hashKey": "object:522",
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "auto",
-                "min_doc_count": 0,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
+          "bucketAggs": [],
           "metrics": [
             {
-              "$$hashKey": "object:484",
               "field": "select field",
               "id": "1",
               "meta": {},
-              "settings": {},
-              "type": "logs"
+              "settings": {
+                "size": 500
+              },
+              "type": "raw_document"
             }
           ],
           "query": "fields.app:grafana",
@@ -207,10 +229,11 @@
       "timeFrom": null,
       "timeShift": null,
       "title": "Panel Title",
-      "type": "logs"
+      "transform": "json",
+      "type": "table"
     }
   ],
-  "schemaVersion": 25,
+  "schemaVersion": 18,
   "style": "dark",
   "tags": ["elasticsearch", "gdev", "datasource-test"],
   "templating": {

devenv/dev-dashboards/feature-templating/global-variables-and-interpolation.json

@@ -1,110 +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,
-  "iteration": 1596705352582,
-  "links": [],
-  "panels": [
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 16,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "id": 11,
-      "options": {
-        "content": "## Global variables\n\n* `__dashboard` = `${__dashboard}`\n* `__dashboard.name` = `${__dashboard.name}`\n* `__dashboard.uid` = `${__dashboard.uid}`\n* `__org.name` = `${__org.name}`\n* `__org.id` = `${__org.id}`\n* `__user.id` = `${__user.id}`\n* `__user.login` = `${__user.login}`\n         \n## Formats\n\n* `Server:raw` = `${Server:raw}`\n* `Server:regex` = `${Server:regex}`\n* `Server:lucene` = `${Server:lucene}`\n* `Server:glob` = `${Server:glob}`\n* `Server:pipe` = `${Server:pipe}`\n* `Server:distributed` = `${Server:distributed}`\n* `Server:csv` = `${Server:csv}`\n* `Server:html` = `${Server:html}`\n* `Server:json` = `${Server:json}`\n* `Server:percentencode` = `${Server:percentencode}`\n* `Server:singlequote` = `${Server:singlequote}`\n* `Server:doublequote` = `${Server:doublequote}`\n* `Server:sqlstring` = `${Server:sqlstring}`\n* `Server:date` = `${Server:date}`\n\n",
-        "mode": "markdown"
-      },
-      "pluginVersion": "7.1.0",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Variable interpolation",
-      "type": "text"
-    }
-  ],
-  "schemaVersion": 26,
-  "style": "dark",
-  "tags": ["gdev", "templating"],
-  "templating": {
-    "list": [
-      {
-        "allValue": null,
-        "current": {
-          "selected": true,
-          "text": "All",
-          "value": ["$__all"]
-        },
-        "hide": 0,
-        "includeAll": true,
-        "label": null,
-        "multi": true,
-        "name": "Server",
-        "options": [
-          {
-            "selected": true,
-            "text": "All",
-            "value": "$__all"
-          },
-          {
-            "selected": false,
-            "text": "A'A\"A",
-            "value": "A'A\"A"
-          },
-          {
-            "selected": false,
-            "text": "BB\\B",
-            "value": "BB\\B"
-          },
-          {
-            "selected": false,
-            "text": "CCC",
-            "value": "CCC"
-          }
-        ],
-        "query": "A'A\"A,BB\\B,CCC",
-        "queryValue": "",
-        "skipUrlSync": false,
-        "type": "custom"
-      }
-    ]
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
-  },
-  "timezone": "",
-  "title": "Templating - Global variables and interpolation",
-  "uid": "HYaGDGIMk",
-  "version": 5
-}

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

@@ -15,18 +15,12 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1590677937026,
+  "id": 13844,
+  "iteration": 1566896059256,
   "links": [],
   "panels": [
     {
       "content": "## Data center = $datacenter\n\n### server = $server\n\n#### pod = $pod",
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 9,
         "w": 12,
@@ -35,6 +29,7 @@
       },
       "id": 4,
       "mode": "markdown",
+      "options": {},
       "targets": [
         {
           "refId": "A",
@@ -52,12 +47,6 @@
       "colorValue": false,
       "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
       "datasource": "gdev-testdata",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "format": "none",
       "gauge": {
         "maxValue": 100,
@@ -86,6 +75,7 @@
       "maxDataPoints": 100,
       "nullPointMode": "connected",
       "nullText": null,
+      "options": {},
       "postfix": "",
       "postfixFontSize": "50%",
       "prefix": "",
@@ -129,41 +119,6 @@
     },
     {
       "cacheTimeout": null,
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "links": [
-            {
-              "targetBlank": true,
-              "title": "Go to drilldown",
-              "url": "/d/O6GmNPvWk/dashboard-tests-nested-template-variables-drilldown?orgId=1&${__all_variables}&${__url_time_range}"
-            }
-          ],
-          "mappings": [],
-          "max": 100,
-          "min": 0,
-          "nullValueMode": "connected",
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 9,
         "w": 4,
@@ -173,15 +128,40 @@
       "id": 8,
       "links": [],
       "options": {
-        "orientation": "horizontal",
-        "reduceOptions": {
+        "fieldOptions": {
           "calcs": ["mean"],
+          "defaults": {
+            "links": [
+              {
+                "targetBlank": true,
+                "title": "Go to drilldown",
+                "url": "/d/O6GmNPvWk/dashboard-tests-nested-template-variables-drilldown?orgId=1&${__all_variables}&${__url_time_range}"
+              }
+            ],
+            "mappings": [],
+            "max": 100,
+            "min": 0,
+            "nullValueMode": "connected",
+            "thresholds": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ],
+            "unit": "none"
+          },
+          "override": {},
           "values": false
         },
+        "orientation": "horizontal",
         "showThresholdLabels": false,
         "showThresholdMarkers": true
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "6.4.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -195,41 +175,6 @@
     },
     {
       "cacheTimeout": null,
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "links": [
-            {
-              "targetBlank": true,
-              "title": "Go to drilldown",
-              "url": "/d/O6GmNPvWk/dashboard-tests-nested-template-variables-drilldown?orgId=1&${__all_variables}&${__url_time_range}"
-            }
-          ],
-          "mappings": [],
-          "max": 100,
-          "min": 0,
-          "nullValueMode": "connected",
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 9,
         "w": 4,
@@ -240,14 +185,38 @@
       "links": [],
       "options": {
         "displayMode": "basic",
-        "orientation": "vertical",
-        "reduceOptions": {
+        "fieldOptions": {
           "calcs": ["mean"],
+          "defaults": {
+            "links": [
+              {
+                "targetBlank": true,
+                "title": "Go to drilldown",
+                "url": "/d/O6GmNPvWk/dashboard-tests-nested-template-variables-drilldown?orgId=1&${__all_variables}&${__url_time_range}"
+              }
+            ],
+            "mappings": [],
+            "max": 100,
+            "min": 0,
+            "nullValueMode": "connected",
+            "thresholds": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ],
+            "unit": "none"
+          },
+          "override": {},
           "values": false
         },
-        "showUnfilled": true
+        "orientation": "vertical"
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "6.4.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -259,108 +228,20 @@
       "title": "React gauge datalink",
       "type": "bargauge"
     },
-    {
-      "datasource": "CsvData",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "align": null
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "server"
-            },
-            "properties": [
-              {
-                "id": "links",
-                "value": [
-                  {
-                    "title": "filter",
-                    "url": "http://localhost:3000/d/-Y-tnEDWk/templating-nested-template-variables?var-datacenter=${__data.fields[datacenter]}&var-server=${__value.raw}"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 6,
-        "w": 24,
-        "x": 0,
-        "y": 9
-      },
-      "id": 11,
-      "options": {
-        "showHeader": true
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "data": [
-            {
-              "fields": [
-                {
-                  "config": {},
-                  "name": "datacenter",
-                  "type": "string",
-                  "values": ["A", "B", "C"]
-                },
-                {
-                  "config": {},
-                  "name": "server",
-                  "type": "string",
-                  "values": ["AA", "BB", "CC"]
-                }
-              ]
-            }
-          ],
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Data links that filter update variables on current dashboard",
-      "type": "table"
-    },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "gdev-testdata",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 13,
         "w": 24,
         "x": 0,
-        "y": 15
+        "y": 9
       },
-      "hiddenSeries": false,
       "id": 2,
       "legend": {
         "avg": false,
@@ -435,7 +316,7 @@
     }
   ],
   "refresh": false,
-  "schemaVersion": 25,
+  "schemaVersion": 19,
   "style": "dark",
   "tags": ["gdev", "templating"],
   "templating": {
@@ -443,7 +324,6 @@
       {
         "allValue": null,
         "current": {
-          "selected": true,
           "text": "A",
           "value": ["A"]
         },
@@ -469,7 +349,6 @@
       {
         "allValue": null,
         "current": {
-          "selected": true,
           "text": "AA",
           "value": ["AA"]
         },
@@ -495,7 +374,6 @@
       {
         "allValue": null,
         "current": {
-          "selected": true,
           "text": "All",
           "value": ["$__all"]
         },
@@ -525,7 +403,7 @@
     "to": "now"
   },
   "timepicker": {
-    "refresh_intervals": ["10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
   },
   "timezone": "",
   "title": "Templating - Nested Template Variables",

devenv/dev-dashboards/feature-templating/testdata-variables-textbox.json

@@ -1,235 +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,
-  "iteration": 1597300832273,
-  "links": [],
-  "panels": [
-    {
-      "datasource": "CsvData",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "align": null
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Query"
-            },
-            "properties": [
-              {
-                "id": "links",
-                "value": [
-                  {
-                    "title": "Search",
-                    "url": "/d/spVR9LSMk/templating-textbox-and-data-links?var-query=${__value.raw:percentencode}"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "options": {
-        "showHeader": true
-      },
-      "pluginVersion": "7.2.0-pre",
-      "targets": [
-        {
-          "data": [
-            {
-              "fields": [
-                {
-                  "config": {},
-                  "name": "Query",
-                  "type": "string",
-                  "values": ["Contains+Plus", "Contains&Ampersand", "Contains white space"]
-                },
-                {
-                  "config": {},
-                  "name": " Test",
-                  "type": "string",
-                  "values": ["asd", "asd", "asd"]
-                }
-              ]
-            }
-          ],
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Data",
-      "type": "table"
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 4,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.2.0-pre",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "${query}",
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Query: ${query}",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "schemaVersion": 26,
-  "style": "dark",
-  "tags": ["gdev", "templating"],
-  "templating": {
-    "list": [
-      {
-        "current": {
-          "selected": false,
-          "text": "asdasda+",
-          "value": "asdasda+"
-        },
-        "hide": 0,
-        "label": null,
-        "name": "query",
-        "options": [
-          {
-            "selected": true,
-            "text": "asdasda+",
-            "value": "asdasda+"
-          }
-        ],
-        "query": "asdasda+",
-        "skipUrlSync": false,
-        "type": "textbox"
-      }
-    ]
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
-  },
-  "timezone": "",
-  "title": "Templating - Textbox & data links",
-  "uid": "spVR9LSMk",
-  "version": 9
-}

devenv/dev-dashboards/panel-common/shared_queries.json

@@ -155,7 +155,7 @@
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Last non-null",
+      "title": "Last non nulll",
       "type": "gauge"
     },
     {

devenv/dev-dashboards/panel-graph/graph_tests.json

@@ -454,7 +454,7 @@
       "yaxes": [
         {
           "format": "percent",
-          "label": "Percent",
+          "label": "Perecent",
           "logBase": 1,
           "max": null,
           "min": null,

devenv/dev-dashboards/panel-polystat/polystat_test.json

@@ -428,14 +428,6 @@
             {
               "text": "Bitcoin (฿)",
               "value": "currencyBTC"
-            },
-            {
-              "text": "Milli Bitcoin (mBTC)",
-              "value": "currencymBTC"
-            },
-            {
-              "text": "Micro Bitcoin (μBTC)",
-              "value": "currencyμBTC"
             }
           ],
           "text": "currency"

devenv/dev-dashboards/panel-singlestat/singlestat_test.json

@@ -85,7 +85,7 @@
         }
       ],
       "thresholds": "5,10",
-      "title": "prefix 3 ms (green) postfix + sparkline",
+      "title": "prefix 3 ms (green) postfixt + sparkline",
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [

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

@@ -19,42 +19,6 @@
   "panels": [
     {
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "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": []
-      },
       "gridPos": {
         "h": 3,
         "w": 24,
@@ -65,20 +29,51 @@
       "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",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
         "sparkline": {
           "show": true
-        },
-        "textMode": "auto"
+        }
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "6.6.0-pre",
       "targets": [
         {
           "alias": "__house_locations",
@@ -98,42 +93,6 @@
     },
     {
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "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": []
-      },
       "gridPos": {
         "h": 6,
         "w": 24,
@@ -144,20 +103,51 @@
       "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",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
         "sparkline": {
           "show": true
-        },
-        "textMode": "auto"
+        }
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "6.6.0-pre",
       "targets": [
         {
           "alias": "__house_locations",
@@ -176,42 +166,6 @@
     },
     {
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "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": []
-      },
       "gridPos": {
         "h": 6,
         "w": 24,
@@ -222,20 +176,51 @@
       "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",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
         "sparkline": {
           "show": true
-        },
-        "textMode": "auto"
+        }
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "6.6.0-pre",
       "targets": [
         {
           "alias": "__house_locations",
@@ -254,44 +239,8 @@
     },
     {
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "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": []
-      },
       "gridPos": {
-        "h": 18,
+        "h": 14,
         "w": 6,
         "x": 0,
         "y": 15
@@ -300,20 +249,51 @@
       "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",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
         "sparkline": {
           "show": true
-        },
-        "textMode": "auto"
+        }
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "6.6.0-pre",
       "targets": [
         {
           "alias": "__server_names",
@@ -326,49 +306,13 @@
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Horizontal with graph",
+      "title": "Panel Title",
       "type": "stat"
     },
     {
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "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": []
-      },
       "gridPos": {
-        "h": 9,
+        "h": 11,
         "w": 4,
         "x": 6,
         "y": 15
@@ -377,20 +321,51 @@
       "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",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
         "sparkline": {
           "show": true
-        },
-        "textMode": "auto"
+        }
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "6.6.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -423,50 +398,14 @@
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Auto grid",
+      "title": "Panel Title",
       "type": "stat"
     },
     {
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "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": []
-      },
       "gridPos": {
         "h": 9,
-        "w": 6,
+        "w": 8,
         "x": 10,
         "y": 15
       },
@@ -474,20 +413,51 @@
       "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",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
         "sparkline": {
           "show": true
-        },
-        "textMode": "auto"
+        }
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "6.6.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -520,257 +490,11 @@
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Horizontal",
-      "type": "stat"
-    },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "mappings": [],
-          "max": 200,
-          "min": 0,
-          "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": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 8,
-        "x": 16,
-        "y": 15
-      },
-      "id": 15,
-      "interval": "5m",
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
-        "sparkline": {
-          "show": true
-        },
-        "textMode": "name"
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "alias": "__server_names",
-          "max": 200,
-          "min": 0,
-          "noise": 5,
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 7,
-          "spread": 20,
-          "startValue": 0
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Text mode name",
-      "type": "stat"
-    },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "mappings": [],
-          "max": 200,
-          "min": 0,
-          "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": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 18,
-        "x": 6,
-        "y": 24
-      },
-      "id": 16,
-      "interval": "5m",
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
-        "sparkline": {
-          "show": true
-        },
-        "textMode": "value"
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "alias": "__server_names",
-          "max": 200,
-          "min": 0,
-          "noise": 15,
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 45,
-          "spread": 1,
-          "startValue": 0
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Value only",
-      "type": "stat"
-    },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "mappings": [],
-          "max": 200,
-          "min": 0,
-          "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": []
-      },
-      "gridPos": {
-        "h": 5,
-        "w": 24,
-        "x": 0,
-        "y": 33
-      },
-      "id": 17,
-      "interval": "5m",
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
-        "sparkline": {
-          "show": true
-        },
-        "textMode": "none"
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "alias": "__server_names",
-          "max": 200,
-          "min": 0,
-          "noise": 15,
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 200,
-          "spread": 1,
-          "startValue": 0
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "No text",
+      "title": "Panel Title",
       "type": "stat"
     }
   ],
-  "schemaVersion": 26,
+  "schemaVersion": 22,
   "style": "dark",
   "tags": ["gdev", "panel-tests"],
   "templating": {
@@ -784,7 +508,5 @@
     "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
   },
   "timezone": "",
-  "title": "Panel Tests - Stat",
-  "uid": "EJ8_d9jZk",
-  "version": 1
+  "title": "Panel Tests - Stat"
 }

devenv/dev-dashboards/panel-table/table_tests_new.json

@@ -1,602 +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": 1,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "id": 7,
-      "title": "Cell styles",
-      "type": "row"
-    },
-    {
-      "datasource": "gdev-testdata",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "align": "center",
-            "displayMode": "color-background"
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "percentage",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "blue",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 60
-              },
-              {
-                "color": "red",
-                "value": 70
-              }
-            ]
-          },
-          "unit": "degree"
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Max"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 84
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Last"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 78
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Mean"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 74
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Field"
-            },
-            "properties": [
-              {
-                "id": "custom.align",
-                "value": "left"
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 16,
-        "w": 7,
-        "x": 0,
-        "y": 1
-      },
-      "id": 4,
-      "options": {
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": true,
-            "displayName": "Last"
-          }
-        ]
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 15,
-          "stringInput": ""
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Colored background",
-      "transformations": [
-        {
-          "id": "reduce",
-          "options": {
-            "reducers": ["max", "mean", "last"]
-          }
-        }
-      ],
-      "type": "table"
-    },
-    {
-      "datasource": "gdev-testdata",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "align": null
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "percentage",
-            "steps": [
-              {
-                "color": "orange",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 50
-              }
-            ]
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Value"
-            },
-            "properties": [
-              {
-                "id": "custom.displayMode",
-                "value": "gradient-gauge"
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Info"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 92
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Min"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 76
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Max"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 89
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Time"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 165
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 16,
-        "w": 8,
-        "x": 7,
-        "y": 1
-      },
-      "id": 2,
-      "options": {
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": false,
-            "displayName": "Min"
-          }
-        ]
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk_table",
-          "stringInput": ""
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Bar gauge cells",
-      "transformations": [
-        {
-          "id": "organize",
-          "options": {
-            "excludeByName": {
-              "Time": true
-            },
-            "indexByName": {
-              "Info": 1,
-              "Max": 3,
-              "Min": 2,
-              "Time": 0,
-              "Value": 4
-            },
-            "renameByName": {}
-          }
-        }
-      ],
-      "type": "table"
-    },
-    {
-      "datasource": "gdev-testdata",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "align": null
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "percentage",
-            "steps": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 50
-              }
-            ]
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Value"
-            },
-            "properties": [
-              {
-                "id": "custom.displayMode",
-                "value": "lcd-gauge"
-              },
-              {
-                "id": "custom.align",
-                "value": "center"
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 16,
-        "w": 9,
-        "x": 15,
-        "y": 1
-      },
-      "id": 5,
-      "options": {
-        "showHeader": true,
-        "sortBy": []
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk_table",
-          "stringInput": ""
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Retro LCD cell",
-      "transformations": [
-        {
-          "id": "organize",
-          "options": {
-            "excludeByName": {
-              "Info": false,
-              "Max": true,
-              "Min": true,
-              "Time": false
-            },
-            "indexByName": {
-              "Info": 1,
-              "Max": 3,
-              "Min": 2,
-              "Time": 0,
-              "Value": 4
-            },
-            "renameByName": {}
-          }
-        }
-      ],
-      "type": "table"
-    },
-    {
-      "collapsed": false,
-      "datasource": null,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 17
-      },
-      "id": 9,
-      "panels": [],
-      "title": "Data links",
-      "type": "row"
-    },
-    {
-      "datasource": "gdev-testdata",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "align": "center",
-            "displayMode": "color-text"
-          },
-          "decimals": 2,
-          "mappings": [],
-          "thresholds": {
-            "mode": "percentage",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "blue",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 50
-              },
-              {
-                "color": "red",
-                "value": 70
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Time"
-            },
-            "properties": [
-              {
-                "id": "custom.align",
-                "value": null
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "{name=\"S1\", server=\"A\"}"
-            },
-            "properties": [
-              {
-                "id": "links",
-                "value": [
-                  {
-                    "title": "Details",
-                    "url": "http://detail?serverLabel=${__field.labels.server}&valueNumeric=${__value.numeric}"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 18
-      },
-      "id": 3,
-      "maxDataPoints": "10",
-      "options": {
-        "showHeader": true
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "alias": "S1",
-          "labels": "server=A",
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 1,
-          "stringInput": ""
-        },
-        {
-          "alias": "S2",
-          "labels": "server=B",
-          "refId": "B",
-          "scenarioId": "random_walk",
-          "seriesCount": 1,
-          "stringInput": ""
-        },
-        {
-          "alias": "S3",
-          "labels": "server=C",
-          "refId": "C",
-          "scenarioId": "random_walk",
-          "seriesCount": 1,
-          "stringInput": ""
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Data link with labels and numeric value",
-      "transformations": [
-        {
-          "id": "seriesToColumns",
-          "options": {}
-        }
-      ],
-      "type": "table"
-    },
-    {
-      "datasource": "gdev-testdata",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "align": "center",
-            "displayMode": "auto"
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "percentage",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "blue",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 60
-              },
-              {
-                "color": "red",
-                "value": 70
-              }
-            ]
-          },
-          "unit": "degree"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 5,
-        "x": 12,
-        "y": 18
-      },
-      "id": 10,
-      "options": {
-        "showHeader": false,
-        "sortBy": [
-          {
-            "desc": true,
-            "displayName": "Last"
-          }
-        ]
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk_table",
-          "seriesCount": 5,
-          "stringInput": ""
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "No header",
-      "transformations": [
-        {
-          "id": "organize",
-          "options": {
-            "excludeByName": {
-              "Min": true,
-              "Time": true,
-              "Value": true
-            },
-            "indexByName": {
-              "Info": 2,
-              "Max": 4,
-              "Min": 3,
-              "Time": 0,
-              "Value": 1
-            },
-            "renameByName": {}
-          }
-        }
-      ],
-      "type": "table"
-    }
-  ],
-  "schemaVersion": 25,
-  "style": "dark",
-  "tags": ["gdev", "panel-tests"],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
-  },
-  "timezone": "",
-  "title": "Panel Tests - React Table",
-  "uid": "U_bZIMRMk",
-  "version": 17
-}

devenv/docker/blocks/collectd/Dockerfile

@@ -10,7 +10,7 @@ ADD     etc_mtab /etc/mtab
 
 ADD     collectd.conf.tpl /etc/collectd/collectd.conf.tpl
 
-RUN	pip install --no-cache-dir envtpl
+RUN	pip install envtpl
 ADD     start_container /usr/bin/start_container
 RUN     chmod +x /usr/bin/start_container
 CMD     start_container

devenv/docker/blocks/graphite1/Dockerfile

@@ -35,7 +35,7 @@ RUN if [ ! -z "${CONTAINER_TIMEZONE}" ]; \
 
 # fix python dependencies (LTS Django and newer memcached/txAMQP)
 RUN pip install --upgrade pip && \
-  pip install --no-cache-dir django==1.8.18 \
+  pip install django==1.8.18 \
   python-memcached==1.53 \
   txAMQP==0.6.2
 
@@ -62,13 +62,13 @@ RUN python ./setup.py install
 # install carbon
 RUN git clone -b ${carbon_version} --depth 1 ${carbon_repo} /usr/local/src/carbon
 WORKDIR /usr/local/src/carbon
-RUN pip install --no-cache-dir -r requirements.txt \
+RUN pip install -r requirements.txt \
   && python ./setup.py install
 
 # install graphite
 RUN git clone -b ${graphite_version} --depth 1 ${graphite_repo} /usr/local/src/graphite-web
 WORKDIR /usr/local/src/graphite-web
-RUN pip install --no-cache-dir -r requirements.txt \
+RUN pip install -r requirements.txt \
   && python ./setup.py install
 
 # install statsd

devenv/docker/blocks/graphite1/conf/etc/my_init.d/01_conf_init.sh

@@ -30,7 +30,7 @@ fi
 #  - /opt/statsd
 statsd_dir_contents=$(find /opt/statsd -mindepth 1 -print -quit)
 if [[ -z $statsd_dir_contents ]]; then
-  git clone --depth 1 -b v0.7.2 https://github.com/etsy/statsd.git /opt/statsd
+  git clone -b v0.7.2 https://github.com/etsy/statsd.git /opt/statsd
   cp $conf_dir/opt/statsd/config.js /opt/statsd/config.js
 fi
 

devenv/docker/blocks/influxdb/.env

@@ -1 +0,0 @@
-influxdb_version=1.8.1-alpine

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

@@ -1,5 +1,5 @@
   influxdb:
-    image: influxdb:${influxdb_version}
+    image: influxdb:1.7.6
     container_name: influxdb
     ports:
       - '2004:2004'

devenv/docker/blocks/multiple-openldap/entrypoint.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# When not limiting the open file descriptors limit, the memory consumption of
+# When not limiting the open file descritors limit, the memory consumption of
 # slapd is absurdly high. See https://github.com/docker/docker/issues/8231
 ulimit -n 8192
 

devenv/docker/blocks/openldap/entrypoint.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# When not limiting the open file descriptors limit, the memory consumption of
+# When not limiting the open file descritors limit, the memory consumption of
 # slapd is absurdly high. See https://github.com/docker/docker/issues/8231
 ulimit -n 8192
 

devenv/docker/blocks/prometheus2/Dockerfile

@@ -1,4 +1,3 @@
 FROM prom/prometheus:v2.7.2
 ADD prometheus.yml /etc/prometheus/
-ADD recording.yml /etc/prometheus/
-ADD alert.yml /etc/prometheus/
+ADD alert.rules /etc/prometheus/

devenv/docker/blocks/prometheus2/alert.rules

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

devenv/docker/blocks/prometheus2/alert.yml

@@ -1,11 +0,0 @@
-groups:
-  - name: ALERT
-    rules:
-    - alert: AppCrash
-      expr: process_open_fds > 0
-      for: 15s
-      labels:
-        severity: critical
-      annotations:
-        summary: Number of open fds > 0
-        description: Just testing

devenv/docker/blocks/prometheus2/prometheus.yml

@@ -5,17 +5,17 @@ global:
   # scrape_timeout is set to the global default (10s).
 
 # Load and evaluate rules in this file every 'evaluation_interval' seconds.
-rule_files:
-  - "alert.yml"
-  - "recording.yml"
+#rule_files:
+# - "alert.rules"
+# - "first.rules"
 # - "second.rules"
 
-alerting:
-  alertmanagers:
-  - scheme: http
-    static_configs:
-    - targets:
-      - "alertmanager:9093"
+# alerting:
+#   alertmanagers:
+#   - scheme: http
+#     static_configs:
+#     - targets:
+#       - "127.0.0.1:9093"
 
 scrape_configs:
   - job_name: 'prometheus'

devenv/docker/blocks/prometheus2/recording.yml

@@ -1,16 +0,0 @@
-groups:
-  - name: RECORDING_RULES
-    rules:
-      - record: instance_path:requests:rate5m
-        expr: rate(prometheus_http_requests_total{job="prometheus"}[5m])
-      - record: path:requests:rate5m
-        expr: sum without (instance)(instance_path:requests:rate5m{job="prometheus"})
-      - record: instance_path:reloads_failures:rate5m
-        expr: rate(prometheus_tsdb_reloads_failures_total{job="prometheus"}[5m])
-      - record: instance_path:reloads:rate5m
-        expr: rate(prometheus_tsdb_reloads_total{job="prometheus"}[5m])
-      - record: instance_path:request_failures_per_requests:ratio_rate5m
-        expr: |2
-            instance_path:reloads_failures:rate5m{job="prometheus"}
-          /
-            instance_path:reloads:rate5m{job="prometheus"}

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

devenv/docker/loadtest/annotations_by_tag_test.js

@@ -3,7 +3,7 @@ import { createClient, createBasicAuthClient } from './modules/client.js';
 import { createTestOrgIfNotExists, createTestdataDatasourceIfNotExists } from './modules/util.js';
 
 export let options = {
-  noCookiesReset: true,
+  noCookiesReset: true
 };
 
 let endpoint = __ENV.URL || 'http://localhost:3000';
@@ -18,38 +18,35 @@ export const setup = () => {
     orgId: orgId,
     datasourceId: datasourceId,
   };
-};
+}
 
-export default data => {
-  group('annotation by tag test', () => {
+export default (data) => {
+  group("annotation by tag test", () => {
     if (__ITER === 0) {
-      group('user authenticates thru ui with username and password', () => {
+      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,
+          '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', () => {
+      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,
-            },
-          ],
+          queries: [{
+            refId: 'A',
+            scenarioId: 'random_walk',
+            intervalMs: 10000,
+            maxDataPoints: 433,
+            datasourceId: data.datasourceId,
+          }]
         };
 
         requests.push({ method: 'GET', url: '/api/annotations?from=1580825186534&to=1580846786535' });
@@ -61,14 +58,14 @@ export default data => {
         let responses = client.batch(requests);
         for (let n = 0; n < batchCount; n++) {
           check(responses[n], {
-            'response status is 200': r => r.status === 200,
+            'response status is 200': (r) => r.status === 200,
           });
         }
       });
     }
   });
 
-  sleep(5);
-};
+  sleep(5)
+}
 
-export const teardown = data => {};
+export const teardown = (data) => {}

devenv/docker/loadtest/auth_proxy_test.js

@@ -2,7 +2,7 @@ import { sleep, check, group } from 'k6';
 import { createBasicAuthClient } from './modules/client.js';
 
 export let options = {
-  noCookiesReset: true,
+  noCookiesReset: true
 };
 
 let endpoint = __ENV.URL || 'http://localhost:10080/grafana';
@@ -19,17 +19,17 @@ export const setup = () => {
   return {
     datasourceId: res.json().id,
   };
-};
+}
 
-export default data => {
-  group('auth proxy test', () => {
-    group('batch proxy requests', () => {
+export default (data) => {
+  group("auth proxy test", () => {
+    group("batch proxy requests", () => {
       const d = new Date();
       const batchCount = 300;
       const requests = [];
       const query = encodeURI('topk(5, max(scrape_duration_seconds) by (job))');
-      const start = d.getTime() / 1000 - 3600;
-      const end = d.getTime() / 1000;
+      const start = (d.getTime() / 1000) - 3600;
+      const end = (d.getTime() / 1000);
       const step = 20;
 
       requests.push({ method: 'GET', url: '/api/annotations?dashboardId=8&from=1558670300607&to=1558691900607' });
@@ -44,13 +44,13 @@ export default data => {
       let responses = client.batch(requests);
       for (let n = 0; n < batchCount; n++) {
         check(responses[n], {
-          'response status is 200': r => r.status === 200,
+          'response status is 200': (r) => r.status === 200,
         });
       }
     });
   });
 
-  sleep(5);
-};
+  sleep(5)
+}
 
-export const teardown = data => {};
+export const teardown = (data) => {}

devenv/docker/loadtest/auth_token_slow_test.js

@@ -3,11 +3,11 @@ import { createClient, createBasicAuthClient } from './modules/client.js';
 import { createTestOrgIfNotExists, createTestdataDatasourceIfNotExists } from './modules/util.js';
 
 export let options = {
-  noCookiesReset: true,
+  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 slowQuery = (__ENV.SLOW_QUERY && __ENV.SLOW_QUERY.length > 0) ? parseInt(__ENV.SLOW_QUERY, 10) : 5;
 const client = createClient(endpoint);
 
 export const setup = () => {
@@ -19,18 +19,17 @@ export const setup = () => {
     orgId: orgId,
     datasourceId: datasourceId,
   };
-};
+}
 
-export default data => {
+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', () => {
+      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,
+          '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,
         });
       });
     }
@@ -42,16 +41,14 @@ export default data => {
         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,
-            },
-          ],
+          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' });
@@ -63,14 +60,14 @@ export default data => {
         let responses = client.batch(requests);
         for (let n = 0; n < batchCount; n++) {
           check(responses[n], {
-            'response status is 200': r => r.status === 200,
+            'response status is 200': (r) => r.status === 200,
           });
         }
       });
     }
   });
 
-  sleep(5);
-};
+  sleep(5)
+}
 
-export const teardown = data => {};
+export const teardown = (data) => {}

devenv/docker/loadtest/auth_token_test.js

@@ -3,7 +3,7 @@ import { createClient, createBasicAuthClient } from './modules/client.js';
 import { createTestOrgIfNotExists, createTestdataDatasourceIfNotExists } from './modules/util.js';
 
 export let options = {
-  noCookiesReset: true,
+  noCookiesReset: true
 };
 
 let endpoint = __ENV.URL || 'http://localhost:3000';
@@ -18,38 +18,35 @@ export const setup = () => {
     orgId: orgId,
     datasourceId: datasourceId,
   };
-};
+}
 
-export default data => {
-  group('user auth token test', () => {
+export default (data) => {
+  group("user auth token test", () => {
     if (__ITER === 0) {
-      group('user authenticates thru ui with username and password', () => {
+      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,
+          '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', () => {
+      group("batch tsdb requests", () => {
         const batchCount = 20;
         const requests = [];
         const payload = {
           from: '1547765247624',
           to: '1547768847624',
-          queries: [
-            {
-              refId: 'A',
-              scenarioId: 'random_walk',
-              intervalMs: 10000,
-              maxDataPoints: 433,
-              datasourceId: data.datasourceId,
-            },
-          ],
+          queries: [{
+            refId: 'A',
+            scenarioId: 'random_walk',
+            intervalMs: 10000,
+            maxDataPoints: 433,
+            datasourceId: data.datasourceId,
+          }]
         };
 
         requests.push({ method: 'GET', url: '/api/annotations?dashboardId=2074&from=1548078832772&to=1548082432772' });
@@ -61,14 +58,14 @@ export default data => {
         let responses = client.batch(requests);
         for (let n = 0; n < batchCount; n++) {
           check(responses[n], {
-            'response status is 200': r => r.status === 200,
+            'response status is 200': (r) => r.status === 200,
           });
         }
       });
     }
   });
 
-  sleep(5);
-};
+  sleep(5)
+}
 
-export const teardown = data => {};
+export const teardown = (data) => {}

devenv/docker/loadtest/modules/client.js

@@ -1,4 +1,4 @@
-import http from 'k6/http';
+import http from "k6/http";
 import encoding from 'k6/encoding';
 
 export const UIEndpoint = class UIEndpoint {
@@ -10,7 +10,7 @@ export const UIEndpoint = class UIEndpoint {
     const payload = { user: username, password: pwd };
     return this.httpClient.formPost('/login', payload);
   }
-};
+}
 
 export const DatasourcesEndpoint = class DatasourcesEndpoint {
   constructor(httpClient) {
@@ -32,7 +32,7 @@ export const DatasourcesEndpoint = class DatasourcesEndpoint {
   delete(id) {
     return this.httpClient.delete(`/datasources/${id}`);
   }
-};
+}
 
 export const OrganizationsEndpoint = class OrganizationsEndpoint {
   constructor(httpClient) {
@@ -57,7 +57,7 @@ export const OrganizationsEndpoint = class OrganizationsEndpoint {
   delete(id) {
     return this.httpClient.delete(`/orgs/${id}`);
   }
-};
+}
 
 export const GrafanaClient = class GrafanaClient {
   constructor(httpClient) {
@@ -79,10 +79,10 @@ export const GrafanaClient = class GrafanaClient {
   onBeforeRequest(params) {
     if (this.orgId && this.orgId > 0) {
       params = params.headers || {};
-      params.headers['X-Grafana-Org-Id'] = this.orgId;
+      params.headers["X-Grafana-Org-Id"] = this.orgId;
     }
   }
-};
+}
 
 export const BaseClient = class BaseClient {
   constructor(url, subUrl) {
@@ -99,12 +99,14 @@ export const BaseClient = class BaseClient {
   }
 
   withUrl(subUrl) {
-    let c = new BaseClient(this.url, subUrl);
+    let c = new BaseClient(this.url,  subUrl);
     c.onBeforeRequest = this.onBeforeRequest;
     return c;
   }
 
-  beforeRequest(params) {}
+  beforeRequest(params) {
+
+  }
 
   get(url, params) {
     params = params || {};
@@ -154,7 +156,7 @@ export const BaseClient = class BaseClient {
 
     return http.batch(requests);
   }
-};
+}
 
 export class BasicAuthClient extends BaseClient {
   constructor(url, subUrl, username, password) {
@@ -164,7 +166,7 @@ export class BasicAuthClient extends BaseClient {
   }
 
   withUrl(subUrl) {
-    let c = new BasicAuthClient(this.url, subUrl, this.username, this.password);
+    let c = new BasicAuthClient(this.url,  subUrl, this.username, this.password);
     c.onBeforeRequest = this.onBeforeRequest;
     return c;
   }
@@ -177,10 +179,10 @@ export class BasicAuthClient extends BaseClient {
   }
 }
 
-export const createClient = url => {
+export const createClient = (url) => {
   return new GrafanaClient(new BaseClient(url, ''));
-};
+}
 
 export const createBasicAuthClient = (url, username, password) => {
   return new GrafanaClient(new BasicAuthClient(url, '', username, password));
-};
+}

devenv/docker/loadtest/modules/util.js

@@ -1,4 +1,4 @@
-export const createTestOrgIfNotExists = client => {
+export const createTestOrgIfNotExists = (client) => {
   let orgId = 0;
   let res = client.orgs.getByName('k6');
   if (res.status === 404) {
@@ -13,9 +13,9 @@ export const createTestOrgIfNotExists = client => {
 
   client.withOrgId(orgId);
   return orgId;
-};
+}
 
-export const createTestdataDatasourceIfNotExists = client => {
+export const createTestdataDatasourceIfNotExists = (client) => {
   const payload = {
     access: 'proxy',
     isDefault: false,
@@ -32,4 +32,4 @@ export const createTestdataDatasourceIfNotExists = client => {
   }
 
   return res.json().id;
-};
+}

devenv/e2e-api-tests/jest.js

@@ -1,15 +1,19 @@
 module.exports = {
   verbose: true,
-  globals: {
-    'ts-jest': {
-      tsConfigFile: 'tsconfig.json',
-    },
+  "globals": {
+    "ts-jest": {
+      "tsConfigFile": "tsconfig.json"
+    }
   },
-  transform: {
-    '^.+\\.tsx?$': '<rootDir>/../../node_modules/ts-jest/preprocessor.js',
+  "transform": {
+    "^.+\\.tsx?$": "<rootDir>/../../node_modules/ts-jest/preprocessor.js"
   },
-  moduleDirectories: ['node_modules'],
-  testRegex: '(\\.|/)(test)\\.ts$',
-  testEnvironment: 'node',
-  moduleFileExtensions: ['ts', 'js', 'json'],
+  "moduleDirectories": ["node_modules"],
+  "testRegex": "(\\.|/)(test)\\.ts$",
+  "testEnvironment": "node",
+  "moduleFileExtensions": [
+    "ts",
+    "js",
+    "json"
+  ],
 };

devenv/local-npm/conf/nginx/Dockerfile

@@ -1,3 +0,0 @@
-FROM tutum/nginx
-RUN rm /etc/nginx/sites-enabled/default
-ADD sites-enabled /etc/nginx/sites-enabled

devenv/local-npm/conf/nginx/sites-enabled/verdaccio-conf

@@ -1,14 +0,0 @@
-server {
-  listen 80 default_server;
-	access_log /var/log/nginx/verdaccio.log;
-	charset utf-8;
-  location / {
-    proxy_pass              http://grafana-npm.local:4873/;
-    proxy_set_header        Host $host;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-NginX-Proxy true;
-    proxy_ssl_session_reuse off;
-    proxy_set_header Host $http_host;
-    proxy_redirect off;
-  }
-}

devenv/local-npm/docker-compose.yaml

@@ -1,26 +0,0 @@
-version: '2'
-
-services:
-  verdaccio:
-    image: verdaccio/verdaccio:4
-    container_name: verdaccio_root_path
-    ports:
-      - "4873:4873"
-    volumes:
-      - verdaccio:/verdaccio
-
-  nginx:
-    restart: always
-    build: conf/nginx
-    ports:
-      - "80:80"
-    volumes:
-      - /www/public
-    volumes_from:
-      - verdaccio
-    links:
-      - verdaccio:verdaccio
-
-volumes:
-  verdaccio:
-    driver: local

devenv/setup.sh

@@ -59,7 +59,7 @@ usage() {
 	echo "Usage:"
 	echo "  bulk-dashboards                              - create and provisioning 400 dashboards"
 	echo "  bulk-alerting-dashboards                     - create and provisioning 400 dashboards with alerts"
-	echo "  no args                                      - provisioning core datasources and dev dashboards"
+	echo "  no args                                      - provisiong core datasources and dev dashboards"
 }
 
 main() {

docs/README.md

@@ -33,6 +33,6 @@ Images are currently hosted in the grafana/website repo.
 
 ## Deploy changes to grafana.com
 
-When a PR is merged to master with changes in the `docs/sources` directory, those changes are automatically synched to the grafana/website repo and published to the staging site.
+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.
 
-Generally, someone from marketing will publish to production each day, so as long as the sync is successful your docs edits will be published. Alternatively, you can refer to [publishing to production](https://github.com/grafana/website#publishing-to-production-grafanacom) if you'd like to do it yourself.
+In order to make those changes live, open a PR in the website repo that merges the `docs-grafana` branch into `master`. Then follow the publishing guidelines in that repo.

docs/sources/_index.md

@@ -30,7 +30,7 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
         <img src="/static/img/logos/logo-docker.svg">
         <h5>Run Docker image</h5>
     </a>
-    <a href="https://grafana.com/docs/grafana-cloud/" class="nav-cards__item nav-cards__item--install">
+    <a href="https://grafana.com/cloud/grafana" class="nav-cards__item nav-cards__item--install">
         <div class="nav-cards__icon fa fa-cloud">
         </div>
         <h5>Grafana Cloud</h5>
@@ -53,7 +53,7 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
         <h4>Getting started</h4>
         <p>Learn the basics of using Grafana.</p>
     </a>
-    <a href="{{< relref "administration/configuration.md" >}}" class="nav-cards__item nav-cards__item--guide">
+    <a href="{{< relref "installation/configuration.md" >}}" class="nav-cards__item nav-cards__item--guide">
         <h4>Configure Grafana</h4>
         <p>Review the configuration and setup options.</p>
     </a>
@@ -65,8 +65,8 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
         <h4>Provisioning</h4>
         <p>Learn how to automate your Grafana configuration.</p>
     </a>
-    <a href="{{< relref "guides/whats-new-in-v7-0.md" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>What's new in v7.0</h4>
+    <a href="{{< relref "guides/whats-new-in-v6-6.md" >}}" class="nav-cards__item nav-cards__item--guide">
+        <h4>What's new in v6.6</h4>
         <p>Explore the features and enhancements in the latest release.</p>
     </a>
 
@@ -91,9 +91,9 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
       <img src="/img/docs/logos/icon_prometheus.svg" >
       <h5>Prometheus</h5>
     </a>
-    <a href="{{< relref "features/datasources/cloudmonitoring.md" >}}" class="nav-cards__item nav-cards__item--ds">
-      <img src="/img/docs/logos/icon_cloudmonitoring.svg">
-      <h5>Google Cloud Monitoring</h5>
+    <a href="{{< relref "features/datasources/stackdriver.md" >}}" class="nav-cards__item nav-cards__item--ds">
+      <img src="/img/docs/logos/icon_stackdriver.svg">
+      <h5>Google Stackdriver</h5>
     </a>
     <a href="{{< relref "features/datasources/cloudwatch.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_cloudwatch.svg">

docs/sources/administration/_index.md

@@ -8,6 +8,4 @@ identifier = "admin"
 weight = 2
 +++
 
-# Administration
 
-This section provides resources for Grafana administrators and users performing administrative tasks.

docs/sources/administration/change-home-dashboard.md

@@ -1,59 +0,0 @@
-+++
-title = "Change the default home dashboard"
-description = "How to replace the default home dashboard"
-keywords = ["grafana", "configuration", "documentation", "home"]
-type = "docs"
-[menu.docs]
-name = "Home Dashboard"
-identifier = "change-home-dashboard"
-parent = "admin"
-weight = 100
-+++
-
-# Change the default home dashboard
-
-You can change the default dashboard on the organization, team and user level. The home dashboard you set for the whole organization is the one all users will see by default. The team dashboard applies to all users assigned to the team in Grafana. The team dashboard overrides the organization dashboard settings. Personal dashboard settings override team dashboard settings. 
-
-## Set the home dashboard for your organization
-
-### Set the default dashboard through preferences
-
-1. Navigate to the dashboard you want to set as the home dashboard.
-1. Star this dashboard by clicking on the star next to the dashboard title.
-1. On the left menu, hover your cursor over the **Configuration** (gear) icon and then click **Preferences**.
-1. In the **Home Dashboard** field, select the dashboard you want to use for your home dashboard. Options include all starred dashboards.
-
-### Set the default dashboard through configuration
-
-If preferences are set as described above, then they override this value.
-You can provide your own JSON file to change the home dashboard. No user will be able to update this dashboard in Grafana.
-
-#### [Optional] Convert an existing dashboard into a JSON file
-1. Navigate to your dashboard page.
-1. Click the **Share dashboard** icon next to the dashboard title.
-1. In the **Export** tab, click on **Save to file**.
-
-#### Use a JSON file as the home dashboard
-1. Save your JSON file somewhere that Grafana can access it, for example, in the Grafana `data` folder of Grafana. 
-1. Update your configuration file to set the path to the JSON file. Read how to update this file in the [configuration]({{< relref "./configuration.md">}}) documentation.
-```ini
-[dashboards]
-# Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json"
-default_home_dashboard_path = data/main-dashboard.json
-```
-
-## Set home dashboard for your team
-
-1. Navigate to the dashboard you want to set as the home dashboard.
-1. Star this dashboard by clicking on the star next to the dashboard title. 
-1. On the left menu, hover your cursor over the **Configuration** (gear) icon and then click **Teams**.
-1. Click on the team you want to change the home dashboard for and then navigate to the **Settings** tab.
-1. In the **Home Dashboard** field, select the dashboard you want to use for your home dashboard. Options include all starred dashboards. 
-
-## Set your personal home dashboard
-
-1. Navigate to the dashboard you want to set as the home dashboard.
-1. Star this dashboard by clicking on the star next to the dashboard title. 
-1. On the left menu, hover your cursor over your avatar and then click **Preferences**.
-1. In the **Home Dashboard** field, select the dashboard you want to use for your home dashboard. Options include all starred dashboards. 
-

docs/sources/administration/change-your-password.md

@@ -1,29 +0,0 @@
-+++
-title = "Change your password"
-description = "How to change your Grafana password"
-keywords = ["grafana", "password", "change", "preferences"]
-type = "docs"
-[menu.docs]
-weight = 100
-+++
-
-# Change your Grafana password
-
-You can change your password in the Change Password tab.
-
-> **Note:** If your Grafana instance uses an external authentication provider, then you might not be able to change your password. Contact your Grafana administrator for more information.
-
-## Change your password
-
-1. Hover your mouse over your user icon in the lower left corner of the screen.
-1. Click **Change Password**. Grafana opens the Change Password tab.
-1. Enter your **Old password** to authorize the change.
-1. Enter your **New password** and then **Confirm password**.
-1. Click **Change Password**.
-
-## Admin user management resources
-
-Grafana admins can use the following tools:
-
-- Use the [User API]({{< relref "../http_api/user.md" >}}) to change your password programmatically or to manage users.
-- The [Manage users]({{< relref "../manage-users/_index.md" >}}) section explains how to manage users and teams.

docs/sources/administration/cli.md

@@ -23,7 +23,7 @@ grafana-cli -h
 Some commands, such as installing or removing plugins, require `sudo` in order to run.
 
 **Windows users**
-Some commands, such as installing or removing plugins, require you to run Windows PowerShell as Administrator.
+Some commands, such as installing or removing plugins, require you to run Windows PowerShell as Administrator. 
 
 Before you enter commands, `cd` into the Grafana bin directory. The default path is:
 ```
@@ -101,40 +101,40 @@ grafana-cli --insecure --pluginUrl https://company.com/grafana/plugins/<plugin-i
 
 ### Enable debug logging
 
-`--debug` or `-d` enables debug logging. Debug output is returned and shown in the terminal.
+`--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
+### 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 installations in Grafana Cloud) or when resetting the admin password and you have non-default values for some important config value (like where the database is located).
+For example, you can use it to redirect logging to another file (maybe to log plugin installations in a service like Hosted Grafana) or when resetting the admin password and you have non-default values for some important config value (like where the database is located).
 
 **Example:**
 ```bash
 grafana-cli --configOverrides cfg:default.paths.log=/dev/null plugins install <plugin-id>
 ```
 
-### Override homepath value
+### Override homepath value  
 
 Sets the path for the Grafana install/home path, defaults to working directory. You do not need to use this if you are in the Grafana installation directory when using the CLI.
-
+ 
 **Example:**
 ```bash
 grafana-cli --homepath "c:\Program Files\grafana" admin reset-admin-password mynewpassword
 ```
 
-### Override config file
+### Override config file         
 
-`--config value` overrides the default location where Grafana expects the configuration file. Refer to [Configuration]({{< relref "../administration/configuration.md" >}}) for more information about configuring Grafana and default configuration file locations.
+`--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 --config "/etc/configuration/" admin reset-admin-password mynewpassword
+grafana-cli admin reset-admin-password --config "/etc/configuration/" mynewpassword
 ```
 
 ## Plugins commands
@@ -200,7 +200,7 @@ grafana-cli admin
 
 If there are two flags being used to set the homepath and the config file path, then running the command returns this error:
 
-> Could not find config defaults, make sure homepath command line parameter is set or working directory is homepath
+> Could not find config defaults, make sure homepath command line parameter is set or working directory is homepath 
 
 To correct this, use the `--homepath` global option to specify the Grafana default homepath for this command:
 

docs/sources/administration/image_rendering.md

@@ -14,7 +14,7 @@ Grafana supports automatic rendering of panels and dashboards as PNG images. Thi
 
 While an image is being rendered, the PNG image is temporarily written to the file system. When the image is rendered, the PNG image is temporarily written to the `png` folder in the Grafana `data` folder.
 
-A background job runs every 10 minutes and removes temporary images. You can configure how long an image should be stored before being removed by configuring the [temp-data-lifetime]({{< relref "../administration/configuration/#temp-data-lifetime" >}}) setting.
+A background job runs every 10 minutes and removes temporary images. You can configure how long an image should be stored before being removed by configuring the [temp-data-lifetime]({{< relref "../installation/configuration/#temp-data-lifetime" >}}) setting.
 
 You can also render a PNG by clicking the dropdown arrow next to a panel title, then clicking **Share > Direct link rendered image**.
 
@@ -26,7 +26,7 @@ Rendering images can require a lot of memory, mainly because Grafana creates bro
 
 ## 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 "../administration/configuration/#concurrent_render_limit" >}}).
+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" >}}).
 
 ## Install Grafana Image Renderer plugin
 
@@ -154,20 +154,6 @@ On Ubuntu 18.10 the following dependencies have been confirmed as needed for the
 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
 ```
 
-**Debian:**
-
-On Debian 9 (Stretch) the following dependencies have been confirmed as needed for the image rendering to function.
-
-```bash
-libx11 libcairo bcairo2 libcairo2 libxtst6 libxcomposite1 libx11-xcb1 libxcursor1 libxdamage1 libnss3 libcups libcups2 libXss libXss1 libxss1 libxrandr2 libasound2 libatk1.0-0 libatk-bridge2.0-0 libpangocairo-1.0-0 libgtk-3-0
-```
-
-On Debian 10 (Buster) the following dependencies have been confirmed as needed for the image rendering to function.
-
-```bash
-libxdamage1 libxext6 libxi6 libxtst6 libnss3 libnss3 libcups2 libxss1 libxrandr2 libasound2 libatk1.0-0 libatk-bridge2.0-0 libpangocairo-1.0-0 libpango-1.0-0 libcairo2 libatspi2.0-0 libgtk3.0-cil libgdk3.0-cil libx11-xcb-dev
-```
-
 **Centos:**
 
 On a minimal Centos installation, the following dependencies have been confirmed as needed for the image rendering to function:

docs/sources/administration/jaeger-instrumentation.md

@@ -1,19 +0,0 @@
-+++
-title = "Jaeger instrumentation"
-description = "Jaeger traces emitted and propagation by Grafana"
-keywords = ["grafana", "jaeger", "tracing"]
-type = "docs"
-[menu.docs]
-parent = "admin"
-weight = 9
-+++
-
-# Jaeger instrumentation
-
-Grafana supports [Jaeger tracing](https://www.jaegertracing.io/).
-
-Grafana can emit Jaeger traces for its HTTP API endpoints and propagate Jaeger trace information to data sources.
-All HTTP endpoints are logged evenly (annotations, dashboard, tags, and so on).
-When a trace ID is propagated, it is reported with operation 'HTTP /datasources/proxy/:id/*'.
-
-Refer to [Configuration]({{< relref "configuration.md#tracing-jaeger" >}}) for information about enabling Jaeger tracing.

docs/sources/administration/metrics.md

@@ -12,7 +12,7 @@ weight = 8
 
 Grafana collects some metrics about itself internally. Grafana supports pushing metrics to Graphite or exposing them to be scraped by Prometheus.
 
-For more information about configuration options related to Grafana metrics, refer to [metrics]({{< relref "../administration/configuration/#metrics" >}}) and [metrics.graphite]({{< relref "../administration/configuration/#metrics-graphite" >}}) in [Configuration]({{< relref "../administration/configuration.md" >}}).
+For more information about configuration options related to Grafana metrics, refer to [metrics]({{< relref "../installation/configuration/#metrics" >}}) and [metrics.graphite]({{< relref "../installation/configuration/#metrics-graphite" >}}) in [Configuration]({{< relref "../installation/configuration.md" >}}).
 
 ## Available metrics
 

docs/sources/administration/preferences.md

@@ -1,58 +0,0 @@
-+++
-title = "Change your preferences"
-description = "How to change your Grafana preferences"
-keywords = ["grafana", "profile", "change", "preferences"]
-type = "docs"
-[menu.docs]
-weight = 100
-+++
-
-# Change your Grafana preferences
-
-You can perform several tasks in the Preferences tab. You can edit your profile, change your Grafana preferences, and view information about your profile and Grafana usage.
-
-## Edit your Grafana profile
-
-Your profile includes your name, user name, and email address.
-
-1. Navigate to the Preferences tab. Hover your cursor over your user icon in the lower left corner of the screen, and then click **Preferences.**
-1. In the Edit Profile section, you can edit any of the following:
-   - **Name -** Edit this field to change the display name associated with your profile.
-   - **Email -** Edit this field to change the email address associated with your profile.
-   - **Username -** Edit this field to change your user name.
-1. Click **Save**.
-
-## Edit your Grafana preferences
-
-Your Grafana preferences include whether uses the dark or light theme, your home dashboard, and your timezone.
-
-> **Note:** Settings on your personal instance override settings made by your administrator at the instance or team level.
-
-1. Navigate to the Preferences tab. Hover your cursor over your user icon in the lower left corner of the screen, and then click **Preferences.**
-1. In the Preferences section, you can edit any of the following:
-   - **UI Theme -** Click to set the **Dark** or **Light** to select a theme. **Default** is either the dark theme or the theme selected by your Grafana administrator.
-   - **Home Dashboard -** Refer to [Set your personal home dashboard]({{< relref "change-home-dashboard.md#set-your-personal-home-dashboard" >}}) for more information.
-   - **Timezone -** Click to select an option in the **Timezone** list. Refer to [Time range controls]({{< relref "../dashboards/time-range-controls.md" >}}) for more information about Grafana time settings.
-1. Click **Save**.
-
-## View your assigned organizations
-
-Every user is a member of at least one organization. You can have different roles in every organization that you are a member of.
-
-1. Navigate to the Preferences tab. Hover your cursor over your user icon in the lower left corner of the screen, and then click **Preferences.**
-1. Scroll down to the Organizations section.
-   - **Name -** The name of the organizations you are a member of in that Grafana instance.
-   - **Role -** The role you are assigned in the organization. Refer to [Organization roles]({{< relref "../permissions/organization_roles.md" >}}) about permissions assigned to each role.
-   - **Current -** Grafana tags the organization that you are currently signed in to as _Current_.
-
-## View your Grafana sessions
-
-Grafana logs your sessions in each Grafana instance. You can review this section if you suspect someone has misused your Grafana credentials.
-
-1. Navigate to the Preferences tab. Hover your cursor over your user icon in the lower left corner of the screen, and then click **Preferences.**
-1. Scroll down to the Sessions section. Grafana displays the following:
-   - **Last seen -** How long ago you logged on.
-   - **Logged on -** The date you logged on to the current Grafana instance.
-   - **IP address -** The IP address that you logged on from.
-   - **Browser & OS -** The web browser and operating system used to log on to Grafana.
-   - If you are a Grafana Admin for the instance, then you can revoke a session by clicking the red signout icon in the session row.

docs/sources/administration/provisioning.md

@@ -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 "configuration.md" >}}) page for more information on what you can configure in `grafana.ini`
+Check out the [configuration]({{< relref "../installation/configuration" >}}) page for more information on what you can configure in `grafana.ini`
 
 ### Config File Locations
 
@@ -38,11 +38,11 @@ Example:
 
 ```yaml
 datasources:
-  - name: Graphite
-    url: http://localhost:$PORT
-    user: $USER
-    secureJsonData:
-      password: $PASSWORD
+- name: Graphite
+  url: http://localhost:$PORT
+  user: $USER
+  secureJsonData:
+    password: $PASSWORD
 ```
 
 If you have a literal `$` in your value and want to avoid interpolation, `$$` can be used.
@@ -53,25 +53,25 @@ If you have a literal `$` in your value and want to avoid interpolation, `$$` ca
 
 Currently we do not provide any scripts/manifests for configuring Grafana. Rather than spending time learning and creating scripts/manifests for each tool, we think our time is better spent making Grafana easier to provision. Therefore, we heavily rely on the expertise of the community.
 
-| Tool      | Project                                                                                                        |
-| --------- | -------------------------------------------------------------------------------------------------------------- |
-| Puppet    | [https://forge.puppet.com/puppet/grafana](https://forge.puppet.com/puppet/grafana)                             |
-| Ansible   | [https://github.com/cloudalchemy/ansible-grafana](https://github.com/cloudalchemy/ansible-grafana)             |
-| Chef      | [https://github.com/JonathanTron/chef-grafana](https://github.com/JonathanTron/chef-grafana)                   |
-| Saltstack | [https://github.com/salt-formulas/salt-formula-grafana](https://github.com/salt-formulas/salt-formula-grafana) |
-| Jsonnet   | [https://github.com/grafana/grafonnet-lib/](https://github.com/grafana/grafonnet-lib/)                         |
+Tool | Project
+-----|------------
+Puppet | [https://forge.puppet.com/puppet/grafana](https://forge.puppet.com/puppet/grafana)
+Ansible | [https://github.com/cloudalchemy/ansible-grafana](https://github.com/cloudalchemy/ansible-grafana)
+Chef | [https://github.com/JonathanTron/chef-grafana](https://github.com/JonathanTron/chef-grafana)
+Saltstack | [https://github.com/salt-formulas/salt-formula-grafana](https://github.com/salt-formulas/salt-formula-grafana)
+Jsonnet | [https://github.com/grafana/grafonnet-lib/](https://github.com/grafana/grafonnet-lib/)
 
-## Data sources
+## Datasources
 
 > This feature is available from v5.0
 
-It's possible to manage data sources in Grafana by adding one or more yaml config files in the [`provisioning/datasources`](/administration/configuration/#provisioning) directory. Each config file can contain a list of `datasources` that will be added or updated during start up. If the data source already exists, then Grafana updates it to match the configuration file. The config file can also contain a list of data sources that should be deleted. That list is called `deleteDatasources`. Grafana will delete data sources listed in `deleteDatasources` before inserting/updating those in the `datasource` list.
+It's possible to manage datasources in Grafana by adding one or more yaml config files in the [`provisioning/datasources`](/installation/configuration/#provisioning) directory. Each config file can contain a list of `datasources` that will be added or updated during start up. If the datasource already exists, Grafana will update it to match the configuration file. The config file can also contain a list of datasources that should be deleted. That list is called `deleteDatasources`. Grafana will delete datasources listed in `deleteDatasources` before inserting/updating those in the `datasource` list.
 
 ### Running Multiple Grafana Instances
 
 If you are running multiple instances of Grafana you might run into problems if they have different versions of the `datasource.yaml` configuration file. The best way to solve this problem is to add a version number to each datasource in the configuration and increase it when you update the config. Grafana will only update datasources with the same or lower version number than specified in the config. That way, old configs cannot overwrite newer configs if they restart at the same time.
 
-### Example data source Config File
+### Example Datasource Config File
 
 ```yaml
 # config file version
@@ -86,113 +86,110 @@ deleteDatasources:
 # what's available in the database
 datasources:
   # <string, required> name of the datasource. Required
-  - name: Graphite
-    # <string, required> datasource type. Required
-    type: graphite
-    # <string, required> access mode. proxy or direct (Server or Browser in the UI). Required
-    access: proxy
-    # <int> org id. will default to orgId 1 if not specified
-    orgId: 1
-    # <string> custom UID which can be used to reference this datasource in other parts of the configuration, if not specified will be generated automatically
-    uid: my_unique_uid
-    # <string> url
-    url: http://localhost:8080
-    # <string> Deprecated, use secureJsonData.password
+- name: Graphite
+  # <string, required> datasource type. Required
+  type: graphite
+  # <string, required> access mode. proxy or direct (Server or Browser in the UI). Required
+  access: proxy
+  # <int> org id. will default to orgId 1 if not specified
+  orgId: 1
+  # <string> custom UID which can be used to reference this datasource in other parts of the configuration, if not specified will be generated automatically
+  uid: my_unique_uid
+  # <string> url
+  url: http://localhost:8080
+  # <string> Deprecated, use secureJsonData.password
+  password:
+  # <string> database user, if used
+  user:
+  # <string> database name, if used
+  database:
+  # <bool> enable/disable basic auth
+  basicAuth:
+  # <string> basic auth username
+  basicAuthUser:
+  # <string> Deprecated, use secureJsonData.basicAuthPassword
+  basicAuthPassword:
+  # <bool> enable/disable with credentials headers
+  withCredentials:
+  # <bool> mark as default datasource. Max one per org
+  isDefault:
+  # <map> fields that will be converted to json and stored in jsonData
+  jsonData:
+     graphiteVersion: "1.1"
+     tlsAuth: true
+     tlsAuthWithCACert: true
+  # <string> json object of data that will be encrypted.
+  secureJsonData:
+    tlsCACert: "..."
+    tlsClientCert: "..."
+    tlsClientKey: "..."
+    # <string> database password, if used
     password:
-    # <string> database user, if used
-    user:
-    # <string> database name, if used
-    database:
-    # <bool> enable/disable basic auth
-    basicAuth:
-    # <string> basic auth username
-    basicAuthUser:
-    # <string> Deprecated, use secureJsonData.basicAuthPassword
+    # <string> basic auth password
     basicAuthPassword:
-    # <bool> enable/disable with credentials headers
-    withCredentials:
-    # <bool> mark as default datasource. Max one per org
-    isDefault:
-    # <map> fields that will be converted to json and stored in jsonData
-    jsonData:
-      graphiteVersion: '1.1'
-      tlsAuth: true
-      tlsAuthWithCACert: true
-    # <string> json object of data that will be encrypted.
-    secureJsonData:
-      tlsCACert: '...'
-      tlsClientCert: '...'
-      tlsClientKey: '...'
-      # <string> database password, if used
-      password:
-      # <string> basic auth password
-      basicAuthPassword:
-    version: 1
-    # <bool> allow users to edit datasources from the UI.
-    editable: false
+  version: 1
+  # <bool> allow users to edit datasources from the UI.
+  editable: false
 ```
 
 #### Custom Settings per Datasource
-
 Please refer to each datasource documentation for specific provisioning examples.
 
-| Datasource    | Misc                                                                               |
-| ------------- | ---------------------------------------------------------------------------------- |
+| Datasource | Misc |
+| ---- | ---- |
 | Elasticsearch | Elasticsearch uses the `database` property to configure the index for a datasource |
 
 #### Json Data
 
 Since not all datasources have the same configuration settings we only have the most common ones as fields. The rest should be stored as a json blob in the `jsonData` field. Here are the most common settings that the core datasources use.
 
-| Name                    | Type    | Datasource                                                       | Description                                                                                 |
-| ----------------------- | ------- | ---------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
-| tlsAuth                 | boolean | _All_                                                            | Enable TLS authentication using client cert configured in secure json data                  |
-| 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                         |
-| httpMode                | string  | Influxdb, Prometheus                                             | HTTP Method. 'GET', 'POST', defaults to GET                 |
-| 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' |
-| logMessageField         | string  | Elasticsearch                                                    | Which field should be used as the log message                                               |
-| logLevelField           | string  | Elasticsearch                                                    | Which field should be used to indicate the priority of the log message                      |
-| authType                | string  | Cloudwatch                                                       | Auth provider. keys/credentials/arn                                                         |
-| assumeRoleArn           | string  | Cloudwatch                                                       | ARN of Assume Role                                                                          |
-| defaultRegion           | string  | Cloudwatch                                                       | AWS region                                                                                  |
-| customMetricsNamespaces | string  | Cloudwatch                                                       | Namespaces of Custom Metrics                                                                |
-| tsdbVersion             | string  | OpenTSDB                                                         | Version                                                                                     |
-| tsdbResolution          | string  | OpenTSDB                                                         | Resolution                                                                                  |
-| sslmode                 | string  | PostgreSQL                                                       | SSLmode. 'disable', 'require', 'verify-ca' or 'verify-full'                                 |
-| sslRootCertFile         | string  | PostgreSQL                                                       | SSL server root certificate file, must be readable by the Grafana user                      |
-| sslCertFile             | string  | PostgreSQL                                                       | SSL client certificate file, must be readable by the Grafana user                           |
-| sslKeyFile              | string  | PostgreSQL                                                       | SSL client key file, must be readable by _only_ the Grafana user                            |
-| encrypt                 | string  | MSSQL                                                            | Connection SSL encryption handling. 'disable', 'false' or 'true'                            |
-| postgresVersion         | number  | PostgreSQL                                                       | Postgres version as a number (903/904/905/906/1000) meaning v9.3, v9.4, ..., v10            |
-| timescaledb             | boolean | PostgreSQL                                                       | Enable usage of TimescaleDB extension                                                       |
-| 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+)                |
+| Name | Type | Datasource | Description |
+| ---- | ---- | ---- | ---- |
+| tlsAuth | boolean | *All* |  Enable TLS authentication using client cert configured in secure json data |
+| 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 |
+| 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' |
+| logMessageField | string | Elasticsearch | Which field should be used as the log message |
+| logLevelField | string | Elasticsearch | Which field should be used to indicate the priority of the log message |
+| authType | string | Cloudwatch | Auth provider. keys/credentials/arn |
+| assumeRoleArn | string | Cloudwatch | ARN of Assume Role |
+| defaultRegion | string | Cloudwatch | AWS region |
+| customMetricsNamespaces | string | Cloudwatch | Namespaces of Custom Metrics |
+| tsdbVersion | string | OpenTSDB | Version |
+| tsdbResolution | string | OpenTSDB | Resolution |
+| sslmode | string | PostgreSQL | SSLmode. 'disable', 'require', 'verify-ca' or 'verify-full' |
+| sslRootCertFile | string | PostgreSQL | SSL server root certificate file, must be readable by the Grafana user |
+| sslCertFile | string | PostgreSQL | SSL client certificate file, must be readable by the Grafana user |
+| sslKeyFile | string | PostgreSQL | SSL client key file, must be readable by *only* the Grafana user |
+| encrypt | string | MSSQL | Connection SSL encryption handling. 'disable', 'false' or 'true' |
+| postgresVersion | number | PostgreSQL | Postgres version as a number (903/904/905/906/1000) meaning v9.3, v9.4, ..., v10 |
+| timescaledb | boolean | PostgreSQL | Enable usage of TimescaleDB extension |
+| 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+) |
 
 #### 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 "configuration.md#secret-key" >}}) from the Grafana config. The purpose of this is only to hide content from the users of the application. This should be used for storing TLS Cert and password that Grafana will append to the request on the server side. All of these settings are optional.
+Secure json data is a map of settings that will be encrypted with [secret key]({{< relref "../installation/configuration/#secret-key" >}}) from the Grafana config. The purpose of this is only to hide content from the users of the application. This should be used for storing TLS Cert and password that Grafana will append to the request on the server side. All of these settings are optional.
 
-| Name              | Type   | Datasource | Description                             |
-| ----------------- | ------ | ---------- | --------------------------------------- |
-| tlsCACert         | string | _All_      | CA cert for out going requests          |
-| tlsClientCert     | string | _All_      | TLS Client cert for outgoing requests   |
-| tlsClientKey      | string | _All_      | TLS Client key for outgoing requests    |
-| password          | string | _All_      | password                                |
-| basicAuthPassword | string | _All_      | password for basic authentication       |
-| accessKey         | string | Cloudwatch | Access key for connecting to Cloudwatch |
-| secretKey         | string | Cloudwatch | Secret key for connecting to Cloudwatch |
+| Name | Type | Datasource | Description |
+| ----| ---- | ---- | --- |
+| tlsCACert | string | *All* |CA cert for out going requests |
+| tlsClientCert | string | *All* |TLS Client cert for outgoing requests |
+| tlsClientKey | string | *All* |TLS Client key for outgoing requests |
+| password | string | *All* | password |
+| basicAuthPassword | string | *All* | password for basic authentication |
+| accessKey | string | Cloudwatch | Access key for connecting to Cloudwatch |
+| secretKey | string | Cloudwatch | Secret key for connecting to Cloudwatch |
 
 #### Custom HTTP headers for datasources
-
-Data sources managed by Grafanas provisioning can be configured to add HTTP headers to all requests
+Datasources managed by Grafanas provisioning can be configured to add HTTP headers to all requests
 going to that datasource. The header name is configured in the `jsonData` field and the header value should be
 configured in `secureJsonData`.
 
@@ -200,48 +197,18 @@ configured in `secureJsonData`.
 apiVersion: 1
 
 datasources:
-  - name: Graphite
-    jsonData:
-      httpHeaderName1: 'HeaderName'
-      httpHeaderName2: 'Authorization'
-    secureJsonData:
-      httpHeaderValue1: 'HeaderValue'
-      httpHeaderValue2: 'Bearer XXXXXXXXX'
-```
-
-## Plugins
-
-> This feature is available from v7.1
-
-You can manage plugins in Grafana by adding one or more YAML config files in the [`provisioning/plugins`]({{< relref "configuration.md#provisioning" >}}) directory. Each config file can contain a list of `apps` that will be updated during start up. Grafana updates each app to match the configuration file.
-
-### Example plugin configuration file
-
-```yaml
-apiVersion: 1
-
-apps:
-  # <string> the type of app, plugin identifier. Required
-  - type: raintank-worldping-app
-    # <int> Org ID. Default to 1, unless org_name is specified
-    org_id: 1
-    # <string> Org name. Overrides org_id unless org_id not specified
-    org_name: Main Org.
-    # <bool> disable the app. Default to false.
-    disabled: false
-    # <map> fields that will be converted to json and stored in jsonData. Custom per app.
-    jsonData:
-      # key/value pairs of string to object
-      key: value
-    # <map> fields that will be converted to json, encrypted and stored in secureJsonData. Custom per app.
-    secureJsonData:
-      # key/value pairs of string to string
-      key: value
+- name: Graphite
+  jsonData:
+    httpHeaderName1: "HeaderName"
+    httpHeaderName2: "Authorization"
+  secureJsonData:
+    httpHeaderValue1: "HeaderValue"
+    httpHeaderValue2: "Bearer XXXXXXXXX"
 ```
 
 ## Dashboards
 
-You can manage dashboards in Grafana by adding one or more YAML config files in the [`provisioning/dashboards`]({{< relref "configuration.md" >}}) directory. Each config file can contain a list of `dashboards providers` that load dashboards into Grafana from the local filesystem.
+It's possible to manage dashboards in Grafana by adding one or more yaml config files in the [`provisioning/dashboards`]({{< relref "../installation/configuration.md" >}}) directory. Each config file can contain a list of `dashboards providers` that will load dashboards into Grafana from the local filesystem.
 
 The dashboard provider config file looks somewhat like this:
 
@@ -249,37 +216,32 @@ The dashboard provider config file looks somewhat like this:
 apiVersion: 1
 
 providers:
-  # <string> an unique provider name. Required
-  - name: 'a unique provider name'
-    # <int> Org id. Default to 1
-    orgId: 1
-    # <string> name of the dashboard folder.
-    folder: ''
-    # <string> folder UID. will be automatically generated if not specified
-    folderUid: ''
-    # <string> provider type. Default to 'file'
-    type: file
-    # <bool> disable dashboard deletion
-    disableDeletion: false
-    # <bool> enable dashboard editing
-    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 when using the 'file' type
-      path: /var/lib/grafana/dashboards
-      # <bool> use folder names from filesystem to create folders in Grafana
-      foldersFromFilesStructure: true
+  # <string> an unique provider name
+- name: 'a unique provider name'
+  # <int> org id. will default to orgId 1 if not specified
+  orgId: 1
+  # <string, required> name of the dashboard folder. Required
+  folder: ''
+  # <string> folder UID. will be automatically generated if not specified
+  folderUid: ''
+  # <string, required> provider type. Required
+  type: file
+  # <bool> disable dashboard deletion
+  disableDeletion: false
+  # <bool> enable dashboard editing
+  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
 ```
 
 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.
 
-> **Note:** Dashboards are provisioned to the General folder if the `folder` option is missing or empty.
-
 #### 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.
 
@@ -288,7 +250,7 @@ If `allowUiUpdates` is set to `true` and you make changes to a provisioned dashb
 >
 > If a provisioned dashboard is saved from the UI and the source is removed, the dashboard stored in the database will be deleted unless the configuration option `disableDeletion` is set to true.
 
-If `allowUiUpdates` is configured to `false`, you are not able to make changes to a provisioned dashboard. When you click `Save`, Grafana brings up a _Cannot save provisioned dashboard_ dialog. The screenshot below illustrates this behavior.
+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.
 
 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.
 
@@ -307,43 +269,11 @@ By default Grafana will delete dashboards in the database if the file is removed
 > Be careful not to re-use the same `title` multiple times within a folder
 > or `uid` within the same installation as this will cause weird behaviors.
 
-### Provision folders structure from filesystem to Grafana
-If you already store your dashboards using folders in a git repo or on a filesystem, and also you want to have the same folder names in the Grafana menu, you can use `foldersFromFilesStructure` option.
-
-For example, to replicate these dashboards structure from the filesystem to Grafana,
-```
-/etc/dashboards
-├── /server
-│   ├── /common_dashboard.json
-│   └── /network_dashboard.json
-└── /application
-    ├── /requests_dashboard.json
-    └── /resources_dashboard.json
-```
-you need to specify just this short provision configuration file.
-```yaml
-apiVersion: 1
-
-providers:
-- name: dashboards
-  type: file
-  updateIntervalSeconds: 30
-  options:
-    path: /etc/dashboards
-    foldersFromFilesStructure: true
-```
-`server` and `application` will become new folders in Grafana menu.
-
-> **Note.** `folder` and `folderUid` options should be empty or missing to make `foldersFromFilesStructure` work.
-
-> **Note:** To provision dashboards to the General folder, store them in the root of your `path`.
-
 ## Alert Notification Channels
 
-Alert Notification Channels can be provisioned by adding one or more yaml config files in the [`provisioning/notifiers`](/administration/configuration/#provisioning) directory.
+Alert Notification Channels can be provisioned by adding one or more yaml config files in the [`provisioning/notifiers`](/installation/configuration/#provisioning) directory.
 
 Each config file can contain the following top-level fields:
-
 - `notifiers`, a list of alert notifications that will be added or updated during start up. If the notification channel already exists, Grafana will update it to match the configuration file.
 - `delete_notifiers`, a list of alert notifications to be deleted before inserting/updating those in the `notifiers` list.
 
@@ -383,16 +313,12 @@ notifiers:
     send_reminder: true
     frequency: 1h
     disable_resolve_message: false
-    # See `Supported Settings` section for settings supported for each
+    # See `Supported Settings` section for settings supporter for each
     # alert notification type.
     settings:
-      recipient: 'XXX'
+      recipient: "XXX"
+      token: "xoxb"
       uploadImage: true
-      token: 'xoxb' # legacy setting since Grafana v7.2 (stored non-encrypted)
-      url: https://slack.com # legacy setting since Grafana v7.2 (stored non-encrypted)
-    # Secure settings that will be encrypted in the database (supported since Grafana v7.2). See `Supported Settings` section for secure settings supported for each notifier.
-    secure_settings:
-      token: 'xoxb'
       url: https://slack.com
 
 delete_notifiers:
@@ -408,142 +334,140 @@ delete_notifiers:
 
 ### Supported Settings
 
-The following sections detail the supported settings and secure settings for each alert notification type. Secure settings are stored encrypted in the database and you add them to `secure_settings` in the YAML file instead of `settings`.
-
-> **Note**: Secure settings is supported since Grafana v7.2.
+The following sections detail the supported settings for each alert notification type.
 
 #### Alert notification `pushover`
 
-| Name     | Secure setting |
-| -------- | -------------- |
-| apiToken | yes |
-| userKey  | yes |
-| device   | |
-| retry    | |
-| expire   | |
+| Name |
+| ---- |
+| apiToken |
+| userKey |
+| device |
+| retry |
+| expire |
 
 #### Alert notification `slack`
 
-| Name           | Secure setting |
-| -------------- | -------------- |
-| url            | yes |
-| recipient      | |
-| username       | |
-| icon_emoji     | |
-| icon_url       | |
-| uploadImage    | |
-| mentionUsers   | |
-| mentionGroups  | |
-| mentionChannel | |
-| token          | yes |
+| Name |
+| ---- |
+| url |
+| recipient |
+| username |
+| icon_emoji |
+| icon_url |
+| uploadImage |
+| mentionUsers |
+| mentionGroups |
+| mentionChannel |
+| token |
 
 #### Alert notification `victorops`
 
-| Name        |
-| ----------- |
-| url         |
+| Name |
+| ---- |
+| url |
 | autoResolve |
 
 #### Alert notification `kafka`
 
-| Name           |
-| -------------- |
+| Name |
+| ---- |
 | kafkaRestProxy |
-| kafkaTopic     |
+| kafkaTopic |
 
 #### Alert notification `LINE`
 
-| Name  | Secure setting |
-| ----- | - |
-| token | yes |
+| Name |
+| ---- |
+| token |
 
 #### Alert notification `pagerduty`
 
-| Name           | Secure setting |
-| -------------- | - |
-| integrationKey | yes |
-| autoResolve    | |
+| Name |
+| ---- |
+| integrationKey |
+| autoResolve |
 
 #### Alert notification `sensu`
 
-| Name     | Secure setting |
-| -------- | - | 
-| url      | |
-| source   | |
-| handler  | |
-| username | |
-| password | yes |
+| Name |
+| ---- |
+| url |
+| source |
+| handler |
+| username |
+| password |
 
 #### Alert notification `prometheus-alertmanager`
 
-| Name              | Secure setting |
-| ----------------- | - |
-| url               | |
-| basicAuthUser     | |
-| basicAuthPassword | yes |
+| Name |
+| ---- |
+| url |
+| basicAuthUser |
+| basicAuthPassword |
 
 #### Alert notification `teams`
 
 | Name |
 | ---- |
-| url  |
+| url |
 
 #### Alert notification `dingding`
 
 | Name |
 | ---- |
-| url  |
+| url |
 
 #### Alert notification `email`
 
-| Name        |
-| ----------- |
+| Name |
+| ---- |
 | singleEmail |
-| addresses   |
+| addresses |
 
 #### Alert notification `hipchat`
 
-| Name   |
-| ------ |
-| url    |
+| Name |
+| ---- |
+| url |
 | apikey |
 | roomid |
 
 #### Alert notification `opsgenie`
 
-| Name             | Secure setting |
-| ---------------- | - |
-| apiKey           | yes |
-| apiUrl           | |
-| autoClose        | |
-| overridePriority | |
+| Name |
+| ---- |
+| apiKey |
+| apiUrl |
+| autoClose |
+| overridePriority |
 
 #### Alert notification `telegram`
 
-| Name        | Secure setting |
-| ----------- | - |
-| bottoken    | yes |
-| chatid      | |
-| uploadImage | |
+| Name |
+| ---- |
+| bottoken |
+| chatid |
+| uploadImage |
 
 #### Alert notification `threema`
 
-| Name         | Secure setting |
-| ------------ | - |
-| gateway_id   | |
-| recipient_id | |
-| api_secret   | yes |
+| Name |
+| ---- |
+| gateway_id |
+| recipient_id |
+| api_secret |
 
 #### Alert notification `webhook`
 
-| Name     | Secure setting |
-| -------- | - |
-| url      | |
-| username | |
-| password | yes |
+| Name |
+| ---- |
+| url |
+| username |
+| password |
 
 #### Alert notification `googlechat`
 
 | Name |
 | ---- |
-| url  |
+| url |

docs/sources/alerting/_index.md

@@ -7,51 +7,3 @@ parent = "features"
 weight = 6
 +++
 
-# Alerts overview
-
-Alerts allow you to identify problems in your system moments after they occur. By quickly identifying unintended changes in your system, you can minimize disruptions to your services.
-
-Alerts consists of two parts:
-
-- Alert rules - When the alert is triggered. Alert rules are defined by one or more conditions that are regularly evaluated by Grafana.
-- Notification channel - How the alert is delivered. When the conditions of an alert rule are met, the Grafana notifies the channels configured for that alert.
-
-Currently only the graph panel visualization supports alerts.
-
-## Alert tasks
-
-You can perform the following tasks for alerts:
-
-- [Add or edit an alert notification channel]({{< relref "notifications.md" >}})
-- [Create an alert rule]({{< relref "create-alerts.md" >}})
-- [View existing alert rules and their current state]({{< relref "view-alerts.md" >}})
-- [Test alert rules and troubleshoot]({{< relref "troubleshoot-alerts.md" >}})
-
-## Clustering
-
-Currently alerting supports a limited form of high availability. Since v4.2.0 of Grafana, alert notifications are deduped when running multiple servers. This means all alerts are executed on every server but no duplicate alert notifications are sent due to the deduping logic. Proper load balancing of alerts will be introduced in the future.
-
-## Notifications
-
-You can also set alert rule notifications along with a detailed message about the alert rule. The message can contain anything: information about how you might solve the issue, link to runbook, and so on.
-
-The actual notifications are configured and shared between multiple alerts.
-
-## Alert execution
-
-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`,
-`Google Cloud Monitoring`, `Cloudwatch`, `Azure Monitor`, `MySQL`, `PostgreSQL`, `MSSQL`, `OpenTSDB`, `Oracle`, and `Azure Data Explorer`.
-
-## Metrics from the alert engine
-
-The alert engine publishes some internal metrics about itself. You can read more about how Grafana publishes [internal metrics]({{< relref "../administration/metrics/" >}}).
-
-Description | Type | Metric name
----------- | ----------- | ----------
-Total number of alerts | counter | `alerting.active_alerts`
-Alert execution result | counter | `alerting.result`
-Notifications sent counter | counter | `alerting.notifications_sent`
-Alert execution timer | timer | `alerting.execution_time`
-
-

docs/sources/alerting/alerts-overview.md

@@ -1,56 +0,0 @@
-+++
-title = "Alerts overview"
-type = "docs"
-[menu.docs]
-identifier = "alerting"
-parent = "Alerting"
-aliases = ["/docs/grafana/latest/alerting/rules/", "/docs/grafana/latest/alerting/metrics/", "/docs/grafana/latest/alerting/rules/#query-condition-example", "/docs/grafana/latest/alerting/rules/#for", "/docs/grafana/latest/alerting/rules/#rule-config"]
-weight = 100
-+++
-
-# Alerts overview
-
-Alerts allow you to identify problems in your system moments after they occur. By quickly identifying unintended changes in your system, you can minimize disruptions to your services.
-
-Alerts consists of two parts:
-
-- Alert rules - When the alert is triggered. Alert rules are defined by one or more conditions that are regularly evaluated by Grafana.
-- Notification channel - How the alert is delivered. When the conditions of an alert rule are met, the Grafana notifies the channels configured for that alert.
-
-Currently only the graph panel visualization supports alerts.
-
-## Alert tasks
-
-You can perform the following tasks for alerts:
-
-- [Add or edit an alert notification channel]({{< relref "notifications.md" >}})
-- [Create an alert rule]({{< relref "create-alerts.md" >}})
-- [View existing alert rules and their current state]({{< relref "view-alerts.md" >}})
-- [Test alert rules and troubleshoot]({{< relref "troubleshoot-alerts.md" >}})
-
-## Clustering
-
-Currently alerting supports a limited form of high availability. Since v4.2.0 of Grafana, alert notifications are deduped when running multiple servers. This means all alerts are executed on every server but no duplicate alert notifications are sent due to the deduping logic. Proper load balancing of alerts will be introduced in the future.
-
-## Notifications
-
-You can also set alert rule notifications along with a detailed message about the alert rule. The message can contain anything: information about how you might solve the issue, link to runbook, and so on.
-
-The actual notifications are configured and shared between multiple alerts.
-
-## Alert execution
-
-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`,
-`Google Cloud Monitoring`, `Cloudwatch`, `Azure Monitor`, `MySQL`, `PostgreSQL`, `MSSQL`, `OpenTSDB`, `Oracle`, and `Azure Data Explorer`.
-
-## Metrics from the alert engine
-
-The alert engine publishes some internal metrics about itself. You can read more about how Grafana publishes [internal metrics]({{< relref "../administration/metrics/" >}}).
-
-Description | Type | Metric name
----------- | ----------- | ----------
-Total number of alerts | counter | `alerting.active_alerts`
-Alert execution result | counter | `alerting.result`
-Notifications sent counter | counter | `alerting.notifications_sent`
-Alert execution timer | timer | `alerting.execution_time`

docs/sources/alerting/create-alerts.md

@@ -1,129 +0,0 @@
-+++
-title = "Create alerts"
-description = "Configure alert rules"
-keywords = ["grafana", "alerting", "guide", "rules"]
-type = "docs"
-[menu.docs]
-name = "Create alerts"
-parent = "alerting"
-weight = 200
-+++
-
-# Create alerts
-
-Grafana alerting allows you to attach rules to your dashboard panels. When you save the dashboard, Grafana extracts the alert rules into a separate alert rule storage and schedules them for evaluation.
-
-{{< imgbox max-width="1000px" img="/img/docs/alerting/drag_handles_gif.gif" caption="Alerting overview" >}}
-
-In the Alert tab of the graph panel you can configure how often the alert rule should be evaluated and the conditions that need to be met for the alert to change state and trigger its [notifications]({{< relref "notifications.md" >}}).
-
-Currently only the graph panel supports alert rules.
-
-## Add or edit an alert rule
-
-1. Navigate to the panel you want to add or edit an alert rule for, click the title, and then click **Edit**.
-1. On the Alert tab, click **Create Alert**. If an alert already exists for this panel, then you can just edit the fields on the Alert tab.
-1. Fill out the fields. Descriptions are listed below in [Alert rule fields](#alert-rule-fields).
-1. When you have finished writing your rule, click **Save** in the upper right corner to save alert rule and the dashboard.
-1. (Optional but recommended) Click **Test rule** to make sure the rule returns the results you expect.
-
-## Delete an alert
-
-To delete an alert, scroll to the bottom of the alert and then click **Delete**.
-
-## Alert rule fields
-
-This section describes the fields you fill out to create an alert.
-
-### Rule
-
-- **Name -** Enter a descriptive name. The name will be displayed in the Alert Rules list.
-- **Evaluate every -** Specify how often the scheduler should evaluate the alert rule. This is referred to as the _evaluation interval_.
-- **For -** Specify how long the query needs to violate the configured thresholds before the alert notification triggers.
-
-You can set a minimum evaluation interval in the `alerting.min_interval_seconds` config field, to set a minimum time between evaluations. Refer to [Configuration]({{< relref "../administration/configuration.md" >}}#min-interval-seconds) for more information.
-
-> **Caution:** 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`.
-
-If an alert rule has a configured `For` and the query violates the configured threshold, then 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.
-
-Typically, it's always a good idea to use this setting since it's often worse to get false positive than wait a few minutes before the alert notification triggers. Looking at the `Alert list` or `Alert list panels` you will be able to see alerts in pending state.
-
-Below you can see an example timeline of an alert using the `For` setting. At ~16:04 the alert state changes to `Pending` and after 4 minutes it changes to `Alerting` which is when alert notifications are sent. Once the series falls back to normal the alert rule goes back to `OK`.
-{{< imgbox img="/img/docs/v54/alerting-for-dark-theme.png" caption="Alerting For" >}}
-
-{{< imgbox max-width="40%" img="/img/docs/v4/alerting_conditions.png" caption="Alerting Conditions" >}}
-
-### Conditions
-
-Currently the only condition type that exists is a `Query` condition that allows you to
-specify a query letter, time range and an aggregation function.
-
-#### Query condition example
-
-```sql
-avg() OF query(A, 15m, now) IS BELOW 14
-```
-
-- `avg()` Controls how the values for **each** series should be reduced to a value that can be compared against the threshold. Click on the function to change it to another aggregation function.
-- `query(A, 15m, now)` The letter defines what query to execute from the **Metrics** tab. The second two parameters define the time range, `15m, now` means 15 minutes ago to now. You can also do `10m, now-2m` to define a time range that will be 10 minutes ago to 2 minutes ago. This is useful if you want to ignore the last 2 minutes of data.
-- `IS BELOW 14` Defines the type of threshold and the threshold value. You can click on `IS BELOW` to change the type of threshold.
-
-The query used in an alert rule cannot contain any template variables. Currently we only support `AND` and `OR` operators between conditions and they are executed serially.
-For example, we have 3 conditions in the following order:
-_condition:A(evaluates to: TRUE) OR condition:B(evaluates to: FALSE) AND condition:C(evaluates to: TRUE)_
-so the result will be calculated as ((TRUE OR FALSE) AND TRUE) = TRUE.
-
-We plan to add other condition types in the future, like `Other Alert`, where you can include the state of another alert in your conditions, and `Time Of Day`.
-
-#### Multiple Series
-
-If a query returns multiple series then the aggregation function and threshold check will be evaluated for each series. What Grafana does not do currently is track alert rule state **per series**. This has implications that are detailed in the scenario below.
-
-- Alert condition with query that returns 2 series: **server1** and **server2**
-- **server1** series causes the alert rule to fire and switch to state `Alerting`
-- Notifications are sent out with message: _load peaking (server1)_
-- In a subsequent evaluation of the same alert rule, the **server2** series also causes the alert rule to fire
-- No new notifications are sent as the alert rule is already in state `Alerting`.
-
-So as you can see from the above scenario Grafana will not send out notifications when other series cause the alert to fire if the rule already is in state `Alerting`. To improve support for queries that return multiple series 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.
-
-### No Data & Error Handling
-
-Below are conditions you can configure how the rule evaluation engine should handle queries that return no data or only null values.
-
-| No Data Option  | Description                                                                                |
-| --------------- | ------------------------------------------------------------------------------------------ |
-| No Data         | Set alert rule state to `NoData`                                                           |
-| Alerting        | Set alert rule state to `Alerting`                                                         |
-| Keep Last State | Keep the current alert rule state, what ever it is.                                        |
-| Ok              | Not sure why you would want to send yourself an alert when things are okay, but you could. |
-
-### Execution errors or timeouts
-
-Tell Grafana how to handle execution or timeout errors.
-
-| Error or timeout option | Description                                         |
-| ----------------------- | --------------------------------------------------- |
-| Alerting                | Set alert rule state to `Alerting`                  |
-| Keep Last State         | Keep the current alert rule state, what ever it is. |
-
-If you have an unreliable time series store from which queries sometime timeout or fail randomly you can set this option to `Keep Last State` in order to basically ignore them.
-
-## Notifications
-
-In alert tab you can also specify alert rule notifications along with a detailed message about the alert rule. The message can contain anything, information about how you might solve the issue, link to runbook, and so on.
-
-The actual notifications are configured and shared between multiple alerts. Read
-[Alert notifications]({{< relref "notifications.md" >}}) for information on how to configure and set up notifications.
-
-- **Send to -** Select an alert notification channel if you have one set up.
-- **Message -** Enter a text message to be sent on the notification channel. Some alert notifiers support transforming the text to HTML or other rich formats.
-- **Tags -** Specify a list of tags (key/value) to be included in the notification. It is only supported by [some notifiers]({{< relref "notifications/#all-supported-notifiers" >}}).
-
-## Alert state history and 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.

docs/sources/alerting/metrics.md

@@ -0,0 +1,21 @@
++++
+title = "Alerting Metrics"
+description = "Alerting Metrics Guide"
+keywords = ["Grafana", "alerting", "guide", "metrics"]
+type = "docs"
+[menu.docs]
+name = "Metrics"
+parent = "alerting"
+weight = 2
++++
+
+# Metrics from the alert engine
+
+The alert engine publishes some internal metrics about itself. You can read more about how Grafana publishes [internal metrics]({{< relref "../administration/metrics/" >}}).
+
+Description | Type | Metric name
+---------- | ----------- | ----------
+Total number of alerts | counter | `alerting.active_alerts`
+Alert execution result | counter | `alerting.result`
+Notifications sent counter | counter | `alerting.notifications_sent`
+Alert execution timer | timer | `alerting.execution_time`

docs/sources/alerting/notifications.md

@@ -1,42 +1,46 @@
 +++
-title = "Alert notifications"
-description = "Alerting notifications guide"
+title = "Alerting Notifications"
+description = "Alerting Notifications Guide"
 keywords = ["Grafana", "alerting", "guide", "notifications"]
 type = "docs"
 [menu.docs]
 name = "Notifications"
 parent = "alerting"
-weight = 200
+weight = 2
 +++
 
-# Alert notifications
+
+# Alert Notifications
+
+> Alerting is only available in Grafana v4.0 and above.
 
 When an alert changes state, it sends out notifications. Each alert rule can have
 multiple notifications. In order to add a notification to an alert rule you first need
-to add and configure a `notification` channel (can be email, PagerDuty, or other integration).
+to add and configure a `notification` channel (can be email, PagerDuty or other integration).
+This is done from the Notification Channels page.
 
-This is done from the Notification channels page.
+## Notification Channel Setup
 
-> **Note:** Alerting is only available in Grafana v4.0 and above.
+On the Notification Channels page hit the `New Channel` button to go the page where you
+can configure and setup a new Notification Channel.
 
-## Add a notification channel
-
-1. In the Grafana side bar, hover your cursor over the **Alerting** (bell) icon and then click **Notification channels**.
-1. Click **Add channel**.
-1. Fill out the fields or select options described below.
-
-## New notification channel fields
+You specify a name and a type, and type specific options. You can also test the notification to make
+sure it's setup correctly.
 
 ### Default (send on all alerts)
 
-- **Name -** Enter a name for this channel. It will be displayed when users add notifications to alert rules.
-- **Type -** Select the channel type. Refer to the [List of supported notifiers](#list-of-supported-notifiers) for details.
-- **Default (send on all alerts) -** When selected, this option sends a notification on this channel for all alert rules.
-- **Include Image -** See [Enable images in notifications](#enable-images-in-notifications-external-image-store) for details.
-- **Disable Resolve Message -** When selected, this option disables the resolve message [OK] that is sent when the alerting state returns to false.
-- **Send reminders -** 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`.
+When checked, this option will notify for all alert rules - existing and new.
 
-**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.
+### Send reminders
+
+> Only available in Grafana v5.3 and above.
+
+{{< docs-imagebox max-width="600px" img="/img/docs/v53/alerting_notification_reminders.png" class="docs-image--right" caption="Alerting notification reminders setup" >}}
+
+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" >}}).
 
 These examples show how often and when reminders are sent for a triggered alert.
 
@@ -51,40 +55,22 @@ Alert rule evaluation interval | Send reminders every | Reminder sent every (aft
 
 <div class="clearfix"></div>
 
-## List of supported notifiers
+### Disable resolve message
 
-Name | Type | Supports images | Support alert rule tags
------|------|---------------- | -----------------------
-[DingDing](#dingdingdingtalk) | `dingding` | yes, external only | no
-Discord | `discord` | yes | no
-[Email](#email) | `email` | yes | no
-[Google Hangouts Chat](#google-hangouts-chat) | `googlechat` | yes, external only | no
-Hipchat | `hipchat` | yes, external only | no
-[Kafka](#kafka) | `kafka` | yes, external only | no
-Line | `line` | yes, external only | no
-Microsoft Teams | `teams` | yes, external only | no
-OpsGenie | `opsgenie` | yes, external only | yes
-[Pagerduty](#pagerduty) | `pagerduty` | yes, external only | yes
-Prometheus Alertmanager | `prometheus-alertmanager` | yes, external only | yes
-Pushover | `pushover` | yes | no
-Sensu | `sensu` | yes, external only | no
-[Slack](#slack) | `slack` | yes | no
-Telegram | `telegram` | yes | no
-Threema | `threema` | yes, external only | no
-VictorOps | `victorops` | yes, external only | no
-[Webhook](#webhook) | `webhook` | yes, external only | yes
-[Zenduty](#zenduty) | `webhook` | yes, external only | yes
+When checked, this option will disable resolve message [OK] that is sent when alerting state returns to false.
+
+## Supported Notification Types
+
+Grafana ships with the following set of notification types:
 
 ### Email
 
-To enable email notifications you have to set up [SMTP settings]({{< relref "../administration/configuration/#smtp" >}})
+To enable email notifications you have to setup [SMTP settings]({{< relref "../installation/configuration/#smtp" >}})
 in the Grafana config. Email notifications will upload an image of the alert graph to an
 external image destination if available or fallback to attaching the image to the email.
 Be aware that if you use the `local` image storage email servers and clients might not be
 able to access the image.
 
-> **Note:** Template variables are not supported in email alerts.
-
 Setting | Description
 ---------- | -----------
 Single email | Send a single email to all recipients. Disabled per default.
@@ -97,20 +83,20 @@ Addresses | Email addresses to recipients. You can enter multiple email addresse
 To set up Slack, you need to configure an incoming Slack webhook URL. You can follow
 [Sending messages using Incoming Webhooks](https://api.slack.com/incoming-webhooks) on how to do that. If you want to include screenshots of the
 firing alerts in the Slack messages you have to configure either the [external image destination](#external-image-store)
-in Grafana or a bot integration via Slack Apps. [Follow Slack's guide to set up a bot integration](https://api.slack.com/bot-users) and use the token
-provided, which starts with "xoxb".
+in Grafana or a bot integration via Slack Apps. Follow Slack's guide to set up a bot integration and use the token
+provided (https://api.slack.com/bot-users), which starts with "xoxb".
 
 Setting | Description
 ---------- | -----------
-Url | Slack incoming webhook URL, or eventually the [chat.postMessage](https://api.slack.com/methods/chat.postMessage) Slack API endpoint.
+Url | Slack incoming webhook URL.
 Username | Set the username for the bot's message.
-Recipient | Allows you to override the Slack recipient. You must either provide a channel Slack ID, a user Slack ID, a username reference (@&lt;user&gt;, all lowercase, no whitespace), or a channel reference (#&lt;channel&gt;, all lowercase, no whitespace). If you use the `chat.postMessage` Slack API endpoint, this is required.
+Recipient | Allows you to override the Slack recipient. You must either provide a channel Slack ID, a user Slack ID, a username reference (@&lt;user&gt;, all lowercase, no whitespace), or a channel reference (#&lt;channel&gt;, all lowercase, no whitespace).
 Icon emoji | Provide an emoji to use as the icon for the bot's message. Ex :smile:
 Icon URL | Provide a URL to an image to use as the icon for the bot's message.
 Mention Users | Optionally mention one or more users in the Slack notification sent by Grafana. You have to refer to users, comma-separated, via their corresponding Slack IDs (which you can find by clicking the overflow button on each user's Slack profile).
 Mention Groups | Optionally mention one or more groups in the Slack notification sent by Grafana. You have to refer to groups, comma-separated, via their corresponding Slack IDs (which you can get from each group's Slack profile URL).
 Mention Channel | Optionally mention either all channel members or just active ones.
-Token | If provided, Grafana will upload the generated image via Slack's file.upload API method, not the external image destination. If you use the `chat.postMessage` Slack API endpoint, this is required.
+Token | If provided, Grafana will upload the generated image via Slack's file.upload API method, not the external image destination.
 
 If you are using the token for a slack bot, then you have to invite the bot to the channel you want to send notifications and add the channel to the recipient field.
 
@@ -121,18 +107,11 @@ To set up PagerDuty, all you have to do is to provide an integration key.
 Setting | Description
 ---------- | -----------
 Integration Key | Integration key for PagerDuty.
-Severity | Level for dynamic notifications, default is `critical` (1)
+Severity | Level for dynamic notifications, default is `critical`
 Auto resolve incidents | Resolve incidents in PagerDuty once the alert goes back to ok
-Message in details | Removes the Alert message from the PD summary field and puts it into custom details instead (2)
 
->**Note:** The tags `Severity`, `Class`, `Group`, `dedup_key`, and `Component` have special meaning in the [Pagerduty Common Event Format - PD-CEF](https://support.pagerduty.com/docs/pd-cef). If an alert panel defines these tag keys, then they are transposed to the root of the event sent to Pagerduty. This means they will be available within the Pagerduty UI and Filtering tools. A Severity tag set on an alert overrides the global Severity set on the notification channel if it's a valid level.
+**Note:** The tags `Severity`, `Class`, `Group`, and `Component` have special meaning in the [Pagerduty Common Event Format - PD-CEF](https://support.pagerduty.com/docs/pd-cef). If an alert panel defines these tag keys, then they are transposed to the root of the event sent to Pagerduty. This means they will be available within the Pagerduty UI and Filtering tools. A Severity tag set on an alert overrides the global Severity set on the notification channel if it's a valid level.
 
->Using Message In Details will change the structure of the `custom_details` field in the PagerDuty Event.
-This might break custom event rules in your PagerDuty rules if you rely on the fields in `payload.custom_details`.
-Move any existing rules using `custom_details.myMetric` to `custom_details.queries.myMetric`.
-This behavior will become the default in a future version of Grafana.
-
-> Using `dedup_key` tag will override grafana generated `dedup_key` with a custom key.
 ### Webhook
 
 The webhook notification is a simple way to send information about a state change over HTTP to a custom endpoint.
@@ -206,26 +185,52 @@ Notifications can be sent by setting up an incoming webhook in Google Hangouts c
 
 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.
 
-### Prometheus Alertmanager
+### All supported notifiers
 
-Alertmanager handles alerts sent by client applications such as Prometheus server or Grafana. It takes care of deduplicating, grouping, and routing them to the correct receiver. Grafana notifications can be sent to Alertmanager via a simple incoming webhook. Refer to the official [Prometheus Alertmanager documentation](https://prometheus.io/docs/alerting/alertmanager) for configuration information.
-
-> **Caution:** In case of a high-availability setup, do not load balance traffic between Grafana and Alertmanagers to keep coherence between all your Alertmanager instances. Instead, point Grafana to a list of all Alertmanagers, by listing their URLs comma-separated in the notification channel configuration.
-
-### Zenduty
-
-[Zenduty](https://www.zenduty.com) is an incident alerting and response orchestration platform that not alerts the right teams via SMS, Phone(Voice), Email, Slack, Microsoft Teams and Push notifications(Android/iOS) whenever a Grafana alert is triggered, but also helps you rapidly triage and remediate critical, user impacting incidents. Grafana alert are sent to Zenduty through Grafana's native webhook dispatcher. Refer the Zenduty-Grafana [integration documentation](https://docs.zenduty.com/docs/grafana) for configuring the integration.
+Name | Type | Supports images | Support alert rule tags
+-----|------|---------------- | -----------------------
+DingDing | `dingding` | yes, external only | no
+Discord | `discord` | yes | no
+Email | `email` | yes | no
+Google Hangouts Chat | `googlechat` | yes, external only | no
+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
+Pagerduty | `pagerduty` | yes, external only | yes
+Prometheus Alertmanager | `prometheus-alertmanager` | yes, external only | yes
+Pushover | `pushover` | yes | no
+Sensu | `sensu` | yes, external only | no
+Slack | `slack` | yes | no
+Telegram | `telegram` | yes | no
+Threema | `threema` | yes, external only | no
+VictorOps | `victorops` | yes, external only | no
+Webhook | `webhook` | yes, external only | yes
 
 ## Enable images in notifications {#external-image-store}
 
 Grafana can render the panel associated with the alert rule as a PNG image and include that in the notification. Read more about the requirements and how to configure
 [image rendering]({{< relref "../administration/image_rendering/" >}}).
 
-You must configure an [external image storage provider]({{< relref "../administration/configuration/#external-image-storage" >}}) in order to receive images in alert notifications. If your notification channel requires that the image be publicly accessible (e.g. Slack, PagerDuty), configure a provider which uploads the image to a remote image store like Amazon S3, Webdav, Google Cloud Storage, or Azure Blob Storage. Otherwise, the local provider can be used to serve the image directly from Grafana.
+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.
+
+Be aware that some notifiers require 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.
 
 Notification services which need public image access are marked as 'external only'.
 
+## Use alert rule tags in notifications {#alert-rule-tags}
+
+> Only available in Grafana v6.3+.
+
+Grafana can include a list of tags (key/value) in the notification.
+It's called alert rule tags to contrast with tags parsed from timeseries.
+It currently supports only the Prometheus Alertmanager notifier.
+
+ This is an optional feature. You can get notifications without using alert rule tags.
+
 ## Configure the link back to Grafana from alert notifications
 
 All alert notifications contain a link back to the triggered alert in the Grafana instance.
-This URL is based on the [domain]({{< relref "../administration/configuration/#domain" >}}) setting in Grafana.
+This URL is based on the [domain]({{< relref "../installation/configuration/#domain" >}}) setting in Grafana.

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

@@ -1,17 +0,0 @@
-+++
-title = "Pause alert rule"
-description = "Pause an existing alert rule"
-keywords = ["grafana", "alerting", "guide", "rules", "view"]
-type = "docs"
-[menu.docs]
-parent = "alerting"
-weight = 400
-+++
-
-# Pause an alert rule
-
-Pausing the evaluation of an alert rule can sometimes be useful. For example, during a maintenance window, pausing alert rules can avoid triggering a flood of alerts.
-
-1. In the Grafana side bar, hover your cursor over the Alerting (bell) icon and then click **Alert Rules**. All configured alert rules are listed, along with their current state.
-1. Find your alert in the list, and click the **Pause** icon on the right. The **Pause** icon turns into a **Play** icon.
-1. Click the **Play** icon to resume evaluation of your alert.

docs/sources/alerting/rules.md

@@ -0,0 +1,174 @@
++++
+title = "Alerting Engine and Rules Guide"
+description = "Configuring Alert Rules"
+keywords = ["grafana", "alerting", "guide", "rules"]
+type = "docs"
+[menu.docs]
+name = "Engine and Rules"
+parent = "alerting"
+weight = 1
++++
+
+# Alerting Engine and Rules Guide
+
+Alerting in Grafana allows you to attach rules to your dashboard panels. When you save the dashboard,
+Grafana will extract the alert rules into a separate alert rule storage and schedule them for evaluation.
+
+{{< imgbox max-width="40%" img="/img/docs/v4/drag_handles_gif.gif" caption="Alerting overview" >}}
+
+In the alert tab of the graph panel you can configure how often the alert rule should be evaluated
+and the conditions that need to be met for the alert to change state and trigger its
+[notifications]({{< relref "notifications.md" >}}).
+
+## Execution
+
+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`.
+
+## Clustering
+
+Currently alerting supports a limited form of high availability. Since v4.2.0 of Grafana, alert notifications are deduped when running multiple servers. This means all alerts are executed on every server but no duplicate alert notifications are sent due to the deduping logic. Proper load balancing of alerts will be introduced in the future.
+
+<div class="clearfix"></div>
+
+## Rule Config
+
+Currently only the graph panel supports alert rules.
+
+### Name and Evaluation interval
+
+Here you can specify the name of the alert rule and how often the scheduler should evaluate the alert rule.
+**Note:** You can set a minimum interval in the `alerting.min_interval_seconds` config field, to set a minimum time between evaluations. Check out the [[configuration]]({{< relref "../installation/configuration.md" >}}#min-interval-seconds) page for more information.
+
+### For
+
+> **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`.
+
+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.
+
+Typically, it's always a good idea to use this setting since it's often worse to get false positive than wait a few minutes before the alert notification triggers. Looking at the `Alert list` or `Alert list panels` you will be able to see alerts in pending state.
+
+Below you can see an example timeline of an alert using the `For` setting. At ~16:04 the alert state changes to `Pending` and after 4 minutes it changes to `Alerting` which is when alert notifications are sent. Once the series falls back to normal the alert rule goes back to `OK`.
+{{< imgbox img="/img/docs/v54/alerting-for-dark-theme.png" caption="Alerting For" >}}
+
+{{< imgbox max-width="40%" img="/img/docs/v4/alerting_conditions.png" caption="Alerting Conditions" >}}
+
+### Conditions
+
+Currently the only condition type that exists is a `Query` condition that allows you to
+specify a query letter, time range and an aggregation function.
+
+### Query condition example
+
+```sql
+avg() OF query(A, 15m, now) IS BELOW 14
+```
+
+- `avg()` Controls how the values for **each** series should be reduced to a value that can be compared against the threshold. Click on the function to change it to another aggregation function.
+- `query(A, 15m, now)`  The letter defines what query to execute from the **Metrics** tab. The second two parameters define the time range, `15m, now` means 15 minutes ago to now. You can also do `10m, now-2m` to define a time range that will be 10 minutes ago to 2 minutes ago. This is useful if you want to ignore the last 2 minutes of data.
+- `IS BELOW 14`  Defines the type of threshold and the threshold value.  You can click on `IS BELOW` to change the type of threshold.
+
+The query used in an alert rule cannot contain any template variables. Currently we only support `AND` and `OR` operators between conditions and they are executed serially.
+For example, we have 3 conditions in the following order:
+*condition:A(evaluates to: TRUE) OR condition:B(evaluates to: FALSE) AND condition:C(evaluates to: TRUE)*
+so the result will be calculated as ((TRUE OR FALSE) AND TRUE) = TRUE.
+
+We plan to add other condition types in the future, like `Other Alert`, where you can include the state
+of another alert in your conditions, and `Time Of Day`.
+
+#### Multiple Series
+
+If a query returns multiple series then the aggregation function and threshold check will be evaluated for each series.
+What Grafana does not do currently is track alert rule state **per series**. This has implications that are detailed
+in the scenario below.
+
+- Alert condition with query that returns 2 series: **server1** and **server2**
+- **server1** series cause the alert rule to fire and switch to state `Alerting`
+- Notifications are sent out with message:  _load peaking (server1)_
+- In a subsequence evaluation of the same alert rule the **server2** series also cause the alert rule to fire
+- No new notifications are sent as the alert rule is already in state `Alerting`.
+
+So as you can see from the above scenario Grafana will not send out notifications when other series cause the alert
+to fire if the rule already is in state `Alerting`. To improve support for queries that return multiple series
+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" >}}).
+
+### No Data / Null values
+
+Below your conditions you can configure how the rule evaluation engine should handle queries that return no data or only null values.
+
+No Data Option | Description
+------------ | -------------
+NoData | Set alert rule state to `NoData`
+Alerting | Set alert rule state to `Alerting`
+Keep Last State | Keep the current alert rule state, what ever it is.
+
+### Execution errors or timeouts
+
+The last option tells how to handle execution or timeout errors.
+
+Error or timeout option | Description
+------------ | -------------
+Alerting | Set alert rule state to `Alerting`
+Keep Last State | Keep the current alert rule state, what ever it is.
+
+If you have an unreliable time series store from which queries sometime timeout or fail randomly you can set this option
+to `Keep Last State` in order to basically ignore them.
+
+## Notifications
+
+In alert tab you can also specify alert rule notifications along with a detailed message about the alert rule.
+The message can contain anything, information about how you might solve the issue, link to runbook, etc.
+
+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 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.
+
+## Troubleshooting
+
+{{< imgbox max-width="40%" img="/img/docs/v4/alert_test_rule.png" caption="Test Rule" >}}
+
+First level of troubleshooting you can do is hit the **Test Rule** button. You will get result back that you can expand
+to the point where you can see the raw data that was returned from your query.
+
+Further troubleshooting can also be done by inspecting the grafana-server log. If it's not an error or for some reason
+the log does not say anything you can enable debug logging for some relevant components. This is done
+in Grafana's ini config file.
+
+Example showing loggers that could be relevant when troubleshooting alerting.
+
+```ini
+[log]
+filters = alerting.scheduler:debug \
+          alerting.engine:debug \
+          alerting.resultHandler:debug \
+          alerting.evalHandler:debug \
+          alerting.evalContext:debug \
+          alerting.extractor:debug \
+          alerting.notifier:debug \
+          alerting.notifier.slack:debug \
+          alerting.notifier.pagerduty:debug \
+          alerting.notifier.email:debug \
+          alerting.notifier.webhook:debug \
+          tsdb.graphite:debug \
+          tsdb.prometheus:debug \
+          tsdb.opentsdb:debug \
+          tsdb.influxdb:debug \
+          tsdb.elasticsearch:debug \
+          tsdb.elasticsearch.client:debug \
+```
+
+If you want to log raw query sent to your TSDB and raw response in log you also have to set grafana.ini option `app_mode` to
+`development`.

docs/sources/alerting/troubleshoot-alerts.md

@@ -1,45 +0,0 @@
-+++
-title = "Troubleshoot alerts"
-description = "Troubleshoot alert rules"
-keywords = ["grafana", "alerting", "guide", "rules", "troubleshoot"]
-type = "docs"
-[menu.docs]
-name = "Troubleshoot alerts"
-parent = "alerting"
-weight = 500
-+++
-
-# Troubleshoot alerts
-
-If alerts are not behaving as you expect, here are some steps you can take to troubleshoot and figure out what is going wrong.
-
-{{< imgbox max-width="1000px" img="/img/docs/v4/alert_test_rule.png" caption="Test Rule" >}}
-
-The first level of troubleshooting you can do is click **Test Rule**. You will get result back that you can expand to the point where you can see the raw data that was returned from your query.
-
-Further troubleshooting can also be done by inspecting the grafana-server log. If it's not an error or for some reason the log does not say anything you can enable debug logging for some relevant components. This is done in Grafana's ini config file.
-
-Example showing loggers that could be relevant when troubleshooting alerting.
-
-```ini
-[log]
-filters = alerting.scheduler:debug \
-          alerting.engine:debug \
-          alerting.resultHandler:debug \
-          alerting.evalHandler:debug \
-          alerting.evalContext:debug \
-          alerting.extractor:debug \
-          alerting.notifier:debug \
-          alerting.notifier.slack:debug \
-          alerting.notifier.pagerduty:debug \
-          alerting.notifier.email:debug \
-          alerting.notifier.webhook:debug \
-          tsdb.graphite:debug \
-          tsdb.prometheus:debug \
-          tsdb.opentsdb:debug \
-          tsdb.influxdb:debug \
-          tsdb.elasticsearch:debug \
-          tsdb.elasticsearch.client:debug \
-```
-
-If you want to log raw query sent to your TSDB and raw response in log you also have to set grafana.ini option `app_mode` to `development`.

docs/sources/alerting/view-alerts.md

@@ -1,23 +0,0 @@
-+++
-title = "View alerts"
-description = "View existing alert rules"
-keywords = ["grafana", "alerting", "guide", "rules", "view"]
-type = "docs"
-[menu.docs]
-name = "View alerts"
-parent = "alerting"
-weight = 400
-+++
-
-# View existing alert rules
-
-Grafana stores individual alert rules in the panels where they are defined, but you can also view a list of all existing alert rules and their current state.
-
-In the Grafana side bar, hover your cursor over the Alerting (bell) icon and then click **Alert Rules**. All configured alert rules are listed, along with their current state.
-
-You can do several things while viewing alerts.
-
-- **Filter alerts by name -** Type an alert name in the **Search alerts** field.
-- **Filter alerts by state -** In **States**, select which alert states you want to see. All others will be hidden.
-- **Pause or resume an alert -** Click the **Pause** or **Play** icon next to the alert to pause or resume evaluation. See [Pause an alert rule]({{< relref "pause-an-alert-rule.md" >}}) for more information.
-- **Access alert rule settings -** Click the alert name or the **Edit alert rule** (gear) icon. Grafana opens the Alert tab of the panel where the alert rule is defined. This is helpful when an alert is firing but you don't know which panel it is defined in.

docs/sources/auth/_index.md

@@ -9,135 +9,4 @@ parent = "admin"
 weight = 3
 +++
 
-# User Authentication Overview
-
-Grafana provides many ways to authenticate users. Some authentication integrations also enable syncing user permissions and org memberships.
-
-Here is a table showing all supported authentication providers and the features available for them. [Team sync]({{< relref "../enterprise/team-sync.md" >}}) and [active sync]({{< relref "../enterprise/enhanced_ldap.md#active-ldap-synchronization" >}}) are only available in Grafana Enterprise.
-
-Provider | Support | Role mapping | Team sync<br> *(Enterprise only)* | Active sync<br> *(Enterprise only)*
--------- | :-----: | :----------: | :-------: | :---------: 
-[Auth Proxy]({{< relref "auth-proxy.md" >}})       | v2.1+ | - | v6.3+ | - 
-[Azure AD OAuth]({{< relref "azuread.md" >}})      | v6.7+ | v6.7+ | v6.7+ | - 
-[Generic OAuth]({{< relref "generic-oauth.md" >}}) | v4.0+ | v6.5+ | - | - 
-[GitHub OAuth]({{< relref "github.md" >}})         | v2.0+ | - | v6.3+ | -
-[GitLab OAuth]({{< relref "gitlab.md" >}})         | v5.3+ | - | v6.4+ | -
-[Google OAuth]({{< relref "google.md" >}})         | v2.0+ | - | - | - 
-[LDAP]({{< relref "ldap.md" >}})                   | v2.1+ | v2.1+ | v5.3+ | v6.3+
-[Okta OAuth]({{< relref "okta.md" >}})             | v7.0+ | v7.0+ | v7.0+ | - 
-[SAML]({{< relref "../enterprise/saml.md" >}}) (Enterprise only)    | v6.3+ | v7.0+ | v7.0+ | - 
-
-## Grafana Auth
-
-Grafana of course has a built in user authentication system with password authentication enabled by default. You can
-disable authentication by enabling anonymous access. You can also hide login form and only allow login through an auth
-provider (listed above). There is also options for allowing self sign up.
-
-### Login and short-lived tokens
-
-> The following applies when using Grafana's built in user authentication, LDAP (without Auth proxy) or OAuth integration.
-
-Grafana are using short-lived tokens as a mechanism for verifying authenticated users.
-These short-lived tokens are rotated each `token_rotation_interval_minutes` for an active authenticated user.
-
-An active authenticated user that gets it token rotated will extend the `login_maximum_inactive_lifetime_days` time from "now" that Grafana will remember the user.
-This means that a user can close its browser and come back before `now + login_maximum_inactive_lifetime_days` and still being authenticated.
- This is true as long as the time since user login is less than `login_maximum_lifetime_days`.
-
-#### Remote logout
-
-You can logout from other devices by removing login sessions from the bottom of your profile page. If you are
-a Grafana admin user you can also do the same for any user from the Server Admin / Edit User view.
-
-## Settings
-
-Example:
-
-```bash
-[auth]
-
-# Login cookie name
-login_cookie_name = grafana_session
-
-# The lifetime (days) an authenticated user can be inactive before being required to login at next visit. Default is 7 days.
-login_maximum_inactive_lifetime_days = 7
-
-# The maximum lifetime (days) an authenticated user can be logged in since login time before being required to login. Default is 30 days.
-login_maximum_lifetime_days = 30
-
-# How often should auth tokens be rotated for authenticated users when being active. The default is each 10 minutes.
-token_rotation_interval_minutes = 10
-
-# The maximum lifetime (seconds) an api key can be used. If it is set all the api keys should have limited lifetime that is lower than this value.
-api_key_max_seconds_to_live = -1
-```
-
-### Anonymous authentication
-
-You can make Grafana accessible without any login required by enabling anonymous access in the configuration file.
-
-Example:
-
-```bash
-[auth.anonymous]
-enabled = true
-
-# Organization name that should be used for unauthenticated users
-org_name = Main Org.
-
-# Role for unauthenticated users, other valid values are `Editor` and `Admin`
-org_role = Viewer
-```
-
-If you change your organization name in the Grafana UI this setting needs to be updated to match the new name.
-
-### Basic authentication
-
-Basic auth is enabled by default and works with the built in Grafana user password authentication system and LDAP
-authentication integration.
-
-To disable basic auth:
-
-```bash
-[auth.basic]
-enabled = false
-```
-
-### Disable login form
-
-You can hide the Grafana login form using the below configuration settings.
-
-```bash
-[auth]
-disable_login_form = true
-```
-
-### Automatic OAuth login
-
-Set to true to attempt login with OAuth automatically, skipping the login screen.
-This setting is ignored if multiple OAuth providers are configured.
-Defaults to `false`.
-
-```bash
-[auth]
-oauth_auto_login = true
-```
-
-### Hide sign-out menu
-
-Set the option detailed below to true to hide sign-out menu link. Useful if you use an auth proxy.
-
-```bash
-[auth]
-disable_signout_menu = true
-```
-
-### URL redirect after signing out
-
-URL to redirect the user to after signing out from Grafana. This can for example be used to enable signout from oauth provider.
-
-```bash
-[auth]
-signout_redirect_url =
-```