fix folder paths

merge all dist folders into one
Packages: publish packages@6.3.0-alpha.40
2019-07-10 00:33:50 -07:00 · 2019-07-10 00:14:18 -07:00 · 2019-07-09 23:26:20 -07:00 · 2019-07-09 23:16:17 -07:00 · 2019-07-09 10:56:08 -07:00 · 2019-07-09 10:45:55 -07:00
1456 changed files with 23037 additions and 66790 deletions
--- a/.babelrc
+++ b/.babelrc
@@ -3,11 +3,8 @@
    [
      "@babel/preset-env",
      {
-        "targets": {
-          "browsers": "last 3 versions"
-        },
-        "useBuiltIns": "entry",
-        "modules": "false",
+		  "targets": { "browsers": "last 3 versions" },
+		  "useBuiltIns": "entry"
      }
    ]
  ]
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,7 +19,7 @@ version: 2
 jobs:
  mysql-integration-test:
    docker:
-      - image: circleci/golang:1.12.10
+      - image: circleci/golang:1.12.6
      - image: circleci/mysql:5.6-ram
        environment:
          MYSQL_ROOT_PASSWORD: rootpass
@@ -30,7 +30,7 @@ jobs:
    steps:
        - checkout
        - run: sudo apt update
-        - run: sudo apt install -y default-mysql-client
+        - run: sudo apt install -y mysql-client
        - run: dockerize -wait tcp://127.0.0.1:3306 -timeout 120s
        - run: cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h 127.0.0.1 -P 3306 -u root -prootpass
        - run:
@@ -39,7 +39,7 @@ jobs:

  postgres-integration-test:
    docker:
-      - image: circleci/golang:1.12.10
+      - image: circleci/golang:1.12.6
      - image: circleci/postgres:9.3-ram
        environment:
          POSTGRES_USER: grafanatest
@@ -58,7 +58,7 @@ jobs:

  cache-server-test:
    docker:
-      - image: circleci/golang:1.12.10
+      - image: circleci/golang:1.12.6
      - image: circleci/redis:4-alpine
      - image: memcached
    working_directory: /go/src/github.com/grafana/grafana
@@ -98,34 +98,6 @@ jobs:
                path: public/e2e-test/screenShots/theOutput
                destination: output-screenshots

-  end-to-end-test-release:
-      docker:
-        - image: circleci/node:10-browsers
-        - image: grafana/grafana-dev:$CIRCLE_TAG
-      steps:
-          - run: dockerize -wait tcp://127.0.0.1:3000 -timeout 120s
-          - checkout
-          - restore_cache:
-              key: dependency-cache-{{ checksum "yarn.lock" }}
-          - run:
-              name: yarn install
-              command: 'yarn install --pure-lockfile --no-progress'
-              no_output_timeout: 5m
-          - save_cache:
-              key: dependency-cache-{{ checksum "yarn.lock" }}
-              paths:
-                - node_modules
-          - run:
-              name: run end-to-end tests
-              command: 'env BASE_URL=http://127.0.0.1:3000 yarn e2e-tests'
-              no_output_timeout: 5m
-          - store_artifacts:
-                path: public/e2e-test/screenShots/theTruth
-                destination: expected-screenshots
-          - store_artifacts:
-                path: public/e2e-test/screenShots/theOutput
-                destination: output-screenshots
-
  codespell:
    docker:
      - image: circleci/python
@@ -144,7 +116,7 @@ jobs:

  lint-go:
    docker:
-      - image: circleci/golang:1.12.10
+      - image: circleci/golang:1.12.6
        environment:
          # we need CGO because of go-sqlite3
          CGO_ENABLED: 1
@@ -155,15 +127,6 @@ jobs:
          name: Lint Go
          command: 'make lint-go'

-  shellcheck:
-    machine: true
-    working_directory: ~/go/src/github.com/grafana/grafana
-    steps:
-      - checkout
-      - run:
-          name: ShellCheck
-          command: 'make shellcheck'
-
  test-frontend:
    docker:
      - image: circleci/node:10
@@ -173,7 +136,7 @@ jobs:
          key: dependency-cache-{{ checksum "yarn.lock" }}
      - run:
          name: yarn install
-          command: 'yarn install --frozen-lockfile --no-progress'
+          command: 'yarn install --pure-lockfile --no-progress'
          no_output_timeout: 15m
      - save_cache:
          key: dependency-cache-{{ checksum "yarn.lock" }}
@@ -185,7 +148,7 @@ jobs:

  test-backend:
    docker:
-      - image: circleci/golang:1.12.10
+      - image: circleci/golang:1.12.6
    working_directory: /go/src/github.com/grafana/grafana
    steps:
      - checkout
@@ -195,7 +158,7 @@ jobs:

  build-all:
    docker:
-     - image: grafana/build-container:1.2.9
+     - image: grafana/build-container:1.2.7
    working_directory: /go/src/github.com/grafana/grafana
    steps:
      - checkout
@@ -214,15 +177,15 @@ jobs:
      - run:
          name: build and package grafana
          command: './scripts/build/build-all.sh'
-      - run:
-          name: Prepare GPG private key
-          command: './scripts/build/prepare_signing_key.sh'
      - run:
          name: sign packages
-          command: './scripts/build/sign_packages.sh dist/*.rpm'
+          command: './scripts/build/sign_packages.sh'
      - run:
          name: verify signed packages
-          command: './scripts/build/verify_signed_packages.sh dist/*.rpm'
+          command: |
+            mkdir -p ~/.rpmdb/pubkeys
+            curl -s https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana > ~/.rpmdb/pubkeys/grafana.key
+            ./scripts/build/verify_signed_packages.sh dist/*.rpm
      - run:
          name: sha-sum packages
          command: 'go run build.go sha-dist'
@@ -239,7 +202,7 @@ jobs:

  build:
    docker:
-     - image: grafana/build-container:1.2.9
+     - image: grafana/build-container:1.2.7
    working_directory: /go/src/github.com/grafana/grafana
    steps:
      - checkout
@@ -249,12 +212,9 @@ jobs:
      - run:
          name: build and package grafana
          command: './scripts/build/build.sh'
-      - run:
-          name: Prepare GPG private key
-          command: './scripts/build/prepare_signing_key.sh'
      - run:
          name: sign packages
-          command: './scripts/build/sign_packages.sh dist/*.rpm'
+          command: './scripts/build/sign_packages.sh'
      - run:
          name: sha-sum packages
          command: 'go run build.go sha-dist'
@@ -268,7 +228,7 @@ jobs:

  build-fast-backend:
    docker:
-     - image: grafana/build-container:1.2.9
+     - image: grafana/build-container:1.2.7
    working_directory: /go/src/github.com/grafana/grafana
    steps:
      - checkout
@@ -285,7 +245,7 @@ jobs:

  build-fast-frontend:
    docker:
-     - image: grafana/build-container:1.2.9
+     - image: grafana/build-container:1.2.7
    working_directory: /go/src/github.com/grafana/grafana
    steps:
      - checkout
@@ -309,7 +269,7 @@ jobs:

  build-fast-package:
    docker:
-     - image: grafana/build-container:1.2.9
+     - image: grafana/build-container:1.2.7
    working_directory: /go/src/github.com/grafana/grafana
    steps:
      - checkout
@@ -336,7 +296,7 @@ jobs:

  build-fast-save:
    docker:
-     - image: grafana/build-container:1.2.9
+     - image: grafana/build-container:1.2.7
    working_directory: /go/src/github.com/grafana/grafana
    steps:
      - checkout
@@ -363,12 +323,9 @@ jobs:
      - run:
          name: package grafana
          command: './scripts/build/build.sh --fast --package-only'
-      - run:
-          name: Prepare GPG private key
-          command: './scripts/build/prepare_signing_key.sh'
      - run:
          name: sign packages
-          command: './scripts/build/sign_packages.sh dist/*.rpm'
+          command: './scripts/build/sign_packages.sh'
      - run:
          name: sha-sum packages
          command: 'go run build.go sha-dist'
@@ -425,7 +382,7 @@ jobs:

  build-enterprise:
    docker:
-     - image: grafana/build-container:1.2.9
+     - image: grafana/build-container:1.2.7
    working_directory: /go/src/github.com/grafana/grafana
    steps:
      - checkout
@@ -441,12 +398,9 @@ jobs:
      - run:
          name: build and package enterprise
          command: './scripts/build/build.sh -enterprise'
-      - run:
-          name: Prepare GPG private key
-          command: './scripts/build/prepare_signing_key.sh'
      - run:
          name: sign packages
-          command: './scripts/build/sign_packages.sh dist/*.rpm'
+          command: './scripts/build/sign_packages.sh'
      - run:
          name: sha-sum packages
          command: 'go run build.go sha-dist'
@@ -460,7 +414,7 @@ jobs:

  build-all-enterprise:
    docker:
-    - image: grafana/build-container:1.2.9
+    - image: grafana/build-container:1.2.7
    working_directory: /go/src/github.com/grafana/grafana
    steps:
    - checkout
@@ -485,15 +439,15 @@ jobs:
    - run:
        name: build and package grafana
        command: './scripts/build/build-all.sh -enterprise'
-    - run:
-        name: Prepare GPG private key
-        command: './scripts/build/prepare_signing_key.sh'
    - run:
        name: sign packages
-        command: './scripts/build/sign_packages.sh dist/*.rpm'
+        command: './scripts/build/sign_packages.sh'
    - run:
        name: verify signed packages
-        command: './scripts/build/verify_signed_packages.sh dist/*.rpm'
+        command: |
+          mkdir -p ~/.rpmdb/pubkeys
+          curl -s https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana > ~/.rpmdb/pubkeys/grafana.key
+          ./scripts/build/verify_signed_packages.sh dist/*.rpm
    - run:
        name: sha-sum packages
        command: 'go run build.go sha-dist'
@@ -517,6 +471,9 @@ jobs:
      - run:
          name: sign in to gcp
          command: '/opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=/tmp/gcpkey.json'
+      - run:
+          name: deploy to s3
+          command: 'aws s3 sync ./enterprise-dist s3://$ENTERPRISE_BUCKET_NAME/master'
      - run:
          name: deploy to gcp
          command: '/opt/google-cloud-sdk/bin/gsutil cp ./enterprise-dist/* gs://$GCP_BUCKET_NAME/enterprise/master'
@@ -540,30 +497,24 @@ jobs:
      - run:
          name: sign in to gcp
          command: '/opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=/tmp/gcpkey.json'
+      - run:
+          name: deploy to s3
+          command: 'aws s3 sync ./enterprise-dist s3://$ENTERPRISE_BUCKET_NAME/release'
      - run:
          name: deploy to gcp
          command: '/opt/google-cloud-sdk/bin/gsutil cp ./enterprise-dist/* gs://$GCP_BUCKET_NAME/enterprise/release'
      - run:
          name: Deploy to Grafana.com
          command: './scripts/build/publish.sh --enterprise'
-      - run:
-          name: Prepare GPG private key
-          command: './scripts/build/prepare_signing_key.sh'
      - run:
          name: Load GPG private key
-          command: './scripts/build/update_repo/load-signing-key.sh'
+          command: './scripts/build/load-signing-key.sh'
      - run:
          name: Update Debian repository
          command: './scripts/build/update_repo/update-deb.sh "enterprise" "$GPG_KEY_PASSWORD" "$CIRCLE_TAG" "enterprise-dist"'
-      - run:
-          name: Publish Debian repository
-          command: './scripts/build/update_repo/publish-deb.sh "enterprise"'
      - run:
          name: Update RPM repository
          command: './scripts/build/update_repo/update-rpm.sh "enterprise" "$GPG_KEY_PASSWORD" "$CIRCLE_TAG" "enterprise-dist"'
-      - run:
-          name: Publish RPM repository
-          command: './scripts/build/update_repo/publish-rpm.sh "enterprise" "$CIRCLE_TAG"'


  deploy-master:
@@ -572,6 +523,12 @@ jobs:
    steps:
      - attach_workspace:
          at: .
+      - run:
+          name: deploy to s3
+          command: |
+            # Also
+            cp dist/grafana-latest.linux-x64.tar.gz dist/grafana-master-$(echo "${CIRCLE_SHA1}" | cut -b1-7).linux-x64.tar.gz
+            aws s3 sync ./dist s3://$BUCKET_NAME/master
      - run:
          name: Trigger Windows build
          command: './scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} master'
@@ -587,7 +544,8 @@ jobs:
      - run:
          name: Publish to Grafana.com
          command: |
-            rm dist/*latest* || true
+            rm dist/grafana-master-$(echo "${CIRCLE_SHA1}" | cut -b1-7).linux-x64.tar.gz
+            rm dist/*latest*
            cd dist && ../scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -version "v$(cat grafana.version)" --nightly

  deploy-release:
@@ -597,6 +555,9 @@ jobs:
      - checkout
      - attach_workspace:
          at: .
+      - run:
+          name: deploy to s3
+          command: 'aws s3 sync ./dist s3://$BUCKET_NAME/release'
      - run:
          name: gcp credentials
          command: 'echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json'
@@ -609,24 +570,15 @@ jobs:
      - run:
          name: Deploy to Grafana.com
          command: './scripts/build/publish.sh'
-      - run:
-          name: Prepare GPG private key
-          command: './scripts/build/prepare_signing_key.sh'
      - run:
          name: Load GPG private key
-          command: './scripts/build/update_repo/load-signing-key.sh'
+          command: './scripts/build/load-signing-key.sh'
      - run:
          name: Update Debian repository
          command: './scripts/build/update_repo/update-deb.sh "oss" "$GPG_KEY_PASSWORD" "$CIRCLE_TAG" "dist"'
-      - run:
-          name: Publish Debian repository
-          command: './scripts/build/update_repo/publish-deb.sh "oss"'
      - run:
          name: Update RPM repository
          command: './scripts/build/update_repo/update-rpm.sh "oss" "$GPG_KEY_PASSWORD" "$CIRCLE_TAG" "dist"'
-      - run:
-          name: Publish RPM repository
-          command: './scripts/build/update_repo/publish-rpm.sh "oss" "$CIRCLE_TAG"'

  build-oss-msi:
    docker:
@@ -665,55 +617,12 @@ jobs:
              echo "Build URL:"
              curl -s -u "$DOCS_CIRCLE_TOKEN:" \
                -d build_parameters[CIRCLE_JOB]=pull-submodule-changes \
-                https://circleci.com/api/v1.1/project/github/grafana/docs.grafana.com/tree/master \
+                https://circleci.com/api/v1.1/project/github/grafana/docs.grafana.com/tree/staging \
              | jq .build_url
            else
              echo "-- no changes to docs files --"
            fi

-  build-grafana-packages:
-    docker:
-      - image: circleci/node:10
-    steps:
-      - checkout
-      - run:
-          name: Boostrap lerna
-          command: 'npx lerna bootstrap'
-      - run:
-          name: Build packages
-          command: yarn packages:build
-
-
-  release-next-packages:
-    docker:
-      - image: circleci/node:10
-    steps:
-      - checkout
-      - run:
-          name: Boostrap lerna
-          command: 'npx lerna bootstrap'
-      - run:
-          name: npm - Prepare auth token
-          command: 'echo //registry.npmjs.org/:_authToken=$NPM_TOKEN >> ~/.npmrc'
-      - run:
-          name: Release next packages
-          command: './scripts/circle-release-next-packages.sh'
-
-  release-packages:
-    docker:
-      - image: circleci/node:10
-    steps:
-      - checkout
-      - run:
-          name: Boostrap lerna
-          command: 'npx lerna bootstrap'
-      - run:
-          name: npm - Prepare auth token
-          command: 'echo //registry.npmjs.org/:_authToken=$NPM_TOKEN >> ~/.npmrc'
-      - run:
-          name: Release packages
-          command: ./scripts/build/release-packages.sh "${CIRCLE_TAG}"
-
 workflows:
  version: 2
  build-master:
@@ -726,8 +635,6 @@ workflows:
          filters: *filter-only-master
      - lint-go:
          filters: *filter-only-master
-      - shellcheck:
-          filters: *filter-only-master
      - test-frontend:
          filters: *filter-only-master
      - test-backend:
@@ -743,7 +650,6 @@ workflows:
            - test-frontend
            - codespell
            - lint-go
-            - shellcheck
            - mysql-integration-test
            - postgres-integration-test
            - build-oss-msi
@@ -756,7 +662,6 @@ workflows:
            - test-frontend
            - codespell
            - lint-go
-            - shellcheck
            - mysql-integration-test
            - postgres-integration-test
          filters: *filter-only-master
@@ -767,7 +672,6 @@ workflows:
            - test-frontend
            - codespell
            - lint-go
-            - shellcheck
            - mysql-integration-test
            - postgres-integration-test
            - build-all-enterprise
@@ -779,7 +683,6 @@ workflows:
            - test-frontend
            - codespell
            - lint-go
-            - shellcheck
            - mysql-integration-test
            - postgres-integration-test
          filters: *filter-only-master
@@ -791,12 +694,6 @@ workflows:
          requires:
            - end-to-end-test
          filters: *filter-only-master
-      - release-next-packages:
-          requires:
-            - build-all
-            - test-frontend
-          filters: *filter-only-master
-
  release:
    jobs:
      - build-all:
@@ -807,8 +704,6 @@ workflows:
          filters: *filter-only-release
      - lint-go:
          filters: *filter-only-release
-      - shellcheck:
-          filters: *filter-only-release
      - test-frontend:
          filters: *filter-only-release
      - test-backend:
@@ -824,7 +719,6 @@ workflows:
            - test-frontend
            - codespell
            - lint-go
-            - shellcheck
            - mysql-integration-test
            - postgres-integration-test
            - build-oss-msi
@@ -837,7 +731,6 @@ workflows:
            - test-frontend
            - codespell
            - lint-go
-            - shellcheck
            - mysql-integration-test
            - postgres-integration-test
          filters: *filter-only-release
@@ -849,22 +742,9 @@ workflows:
            - test-frontend
            - codespell
            - lint-go
-            - shellcheck
            - mysql-integration-test
            - postgres-integration-test
          filters: *filter-only-release
-      - release-packages:
-          requires:
-            - build-all
-            - test-backend
-            - test-frontend
-            - codespell
-            - lint-go
-            - shellcheck
-            - mysql-integration-test
-            - postgres-integration-test
-            - build-oss-msi
-          filters: *filter-only-release
      - build-oss-msi:
          requires:
            - build-all
@@ -872,14 +752,9 @@ workflows:
            - test-frontend
            - codespell
            - lint-go
-            - shellcheck
            - mysql-integration-test
            - postgres-integration-test
          filters: *filter-only-release
-      - end-to-end-test-release:
-          requires:
-            - grafana-docker-release
-          filters: *filter-only-release

  build-branches-and-prs:
      jobs:
@@ -887,8 +762,6 @@ workflows:
            filters: *filter-not-release-or-master
        - build-fast-frontend:
            filters: *filter-not-release-or-master
-        - build-grafana-packages:
-            filters: *filter-not-release-or-master
        - build-fast-package:
            filters: *filter-not-release-or-master
            requires:
@@ -898,10 +771,6 @@ workflows:
            filters: *filter-not-release-or-master
        - lint-go:
            filters: *filter-not-release-or-master
-        - lint-go:
-            filters: *filter-not-release-or-master
-        - shellcheck:
-            filters: *filter-not-release-or-master
        - test-frontend:
            filters: *filter-not-release-or-master
        - test-backend:
@@ -919,7 +788,6 @@ workflows:
              - test-frontend
              - codespell
              - lint-go
-              - shellcheck
              - mysql-integration-test
              - postgres-integration-test
              - cache-server-test
@@ -931,9 +799,7 @@ workflows:
              - test-frontend
              - codespell
              - lint-go
-              - shellcheck
              - mysql-integration-test
              - postgres-integration-test
              - cache-server-test
            filters: *filter-not-release-or-master
-
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,33 +1,20 @@
-<!--
-
-Thank you for sending a pull request! Here are some tips:
-
-1. If this is your first time, please read our contribution guide at https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md
-
-2. Ensure you include and run the appropriate tests as part of your Pull Request.
-
-3. In a new feature or configuration option, an update to the documentation is necessary. Everything related to the documentation is under the docs folder in the root of the repository.
-
-4. If the Pull Request is a work in progress, make use of GitHub's "Draft PR" feature and mark it as such.
-
-5. If you can not merge your Pull Request due to a merge conflict, Rebase it. This gets it in sync with the master branch.
-
-6. Name your PR as "<FeatureArea>: Describe your change", e.g. Alerting: Prevent race condition. If it's a fix or feature relevant for the changelog describe the user impact in the title. The PR title is used to auto-generate the changelog for issues marked with the "add to changelog" label.
+<!--  Thanks for sending a pull request!  Here are some tips for you:

+1. If this is your first time, please read our [`CONTRIBUTING.md`](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md) guide.
+2. Ensure you have added or ran the appropriate tests for your PR.
+3. If it's a new feature or config option it will need a docs update. Docs are under the docs folder in repo root.
+4. If the PR is unfinished, mark it as a draft PR.
+5. Rebase your PR if it gets out of sync with master
+6. Name your PR as `<FeatureArea>: Describe your change`. If it's a fix or feature relevant for changelog describe the user  impact in the title. The PR title is used in changelog for issues marked with `add to changelog` label. 
 -->

 **What this PR does / why we need it**:

 **Which issue(s) this PR fixes**:
-
 <!--
-
-* Automatically closes linked issue when the Pull Request is merged.
-
-Usage: "Fixes #<issue number>", or "Fixes (paste link of issue)"
-
+*Automatically closes linked issue when PR is merged.
+Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
 -->
-
 Fixes #

 **Special notes for your reviewer**:
--- a/.gitignore
+++ b/.gitignore
@@ -10,11 +10,6 @@ awsconfig
 /public/views/index.html
 /public/views/error.html
 /emails/dist
-
-# Enterprise emails
-/emails/templates/enterprise_*
-/public/emails/enterprise_*
-
 /public_gen
 /public/vendor/npm
 /tmp
@@ -44,11 +39,10 @@ public/css/*.min.css
 /data/*
 /bin/*

-# devenv
-/devenv/docker-compose.yaml
-/devenv/.env
-
 conf/custom.ini
+fig.yml
+devenv/docker-compose.yml
+devenv/docker-compose.yaml
 /conf/provisioning/**/custom.yaml
 /conf/provisioning/**/dev.yaml
 /conf/ldap_dev.toml
@@ -94,6 +88,3 @@ theOutput/

 # Ignore go local build dependencies
 /scripts/go/bin/**
-
-# Ignore compilation stats from `yarn stats`
-compilation-stats.json
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,177 +1,4 @@
-# 6.4.0 (unreleased)
-
-## Breaking changes
-
-### Annotations
-
-There are some breaking changes in the annotations HTTP API for region annotations. Region annotations are now represented
-using a single event instead of two seperate events. Check breaking changes in HTTP API [below](#http-api) and [HTTP API documentation](https://grafana.com/docs/http_api/annotations/) for more details.
-
-### Docker
-
-Grafana is now using Alpine 3.10 as docker base image.
-
-### HTTP API
-  - `GET /api/alert-notifications` now requires at least editor access. New `/api/alert-notifications/lookup` returns less information than `/api/alert-notifications` and can be access by any authenticated user.
-  - `GET /api/alert-notifiers` now requires at least editor access
-  - `GET /api/org/users` now requires org admin role. New `/api/org/users/lookup` returns less information than `/api/org/users` and can be access by users that are org admins, admin in any folder or admin of any team.
-  - `GET /api/annotations` no longer returns `regionId` property.
-  - `POST /api/annotations` no longer supports `isRegion` property.
-  - `PUT /api/annotations/:id` no longer supports `isRegion` property.
-  - `PATCH /api/annotations/:id` no longer supports `isRegion` property.
-  - `DELETE /api/annotations/region/:id` has been removed.
-
-## Deprecation notes
-
-### PhantomJS
-
-[PhantomJS](https://phantomjs.org/), which is used for rendering images of dashboards and panels, is deprecated and will be removed in a future Grafana release. A deprecation warning will from now on be logged when Grafana starts up if PhantomJS is in use.
-
-Please consider migrating from PhantomJS to the [Grafana Image Renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer).
-
-# 6.3.5 (2019-09-02)
-
-### Upgrades
-* **Build**: Upgrade to go 1.12.9. [#18638](https://github.com/grafana/grafana/pull/18638), [@marcusolsson](https://github.com/marcusolsson)
-
-### Bug Fixes
-* **Dashboard**: Fixes dashboards init failed loading error for dashboards with panel links that had missing properties. [#18786](https://github.com/grafana/grafana/pull/18786), [@torkelo](https://github.com/torkelo)
-* **Editor**: Fixes issue where only entire lines were being copied. [#18806](https://github.com/grafana/grafana/pull/18806), [@kaydelaney](https://github.com/kaydelaney)
-* **Explore**: Fixes query field layout in splitted view for Safari browsers. [#18654](https://github.com/grafana/grafana/pull/18654), [@hugohaggmark](https://github.com/hugohaggmark)
-* **LDAP**: multildap + ldap integration. [#18588](https://github.com/grafana/grafana/pull/18588), [@markelog](https://github.com/markelog)
-* **Profile/UserAdmin**: Fix for user agent parser crashes grafana-server on 32-bit builds. [#18788](https://github.com/grafana/grafana/pull/18788), [@marcusolsson](https://github.com/marcusolsson)
-* **Prometheus**: Prevents panel editor crash when switching to Prometheus datasource. [#18616](https://github.com/grafana/grafana/pull/18616), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Prometheus**: Changes brace-insertion behavior to be less annoying. [#18698](https://github.com/grafana/grafana/pull/18698), [@kaydelaney](https://github.com/kaydelaney)
-
-# 6.3.4 (2019-08-29)
-
-* **Security**: Urgent security patch release. Please read more in our [blog](https://grafana.com/blog/2019/08/29/grafana-5.4.5-and-6.3.4-released-with-important-security-fix/)
-
-# 6.3.3 (2019-08-15)
-
-### Bug Fixes
-* **Annotations**: Fix failing annotation query when time series query is cancelled. [#18532](https://github.com/grafana/grafana/pull/18532), [@dprokop](https://github.com/dprokop)
-* **Auth**: Do not set SameSite cookie attribute if cookie_samesite is none. [#18462](https://github.com/grafana/grafana/pull/18462), [@papagian](https://github.com/papagian)
-* **DataLinks**: Apply scoped variables to data links correctly. [#18454](https://github.com/grafana/grafana/pull/18454), [@dprokop](https://github.com/dprokop)
-* **DataLinks**: Respect timezone when displaying datapoint's timestamp in graph context menu. [#18461](https://github.com/grafana/grafana/pull/18461), [@dprokop](https://github.com/dprokop)
-* **DataLinks**: Use datapoint timestamp correctly when interpolating variables. [#18459](https://github.com/grafana/grafana/pull/18459), [@dprokop](https://github.com/dprokop)
-* **Explore**: Fix loading error for empty queries. [#18488](https://github.com/grafana/grafana/pull/18488), [@davkal](https://github.com/davkal)
-* **Graph**: Fixes legend issue clicking on series line icon and issue with horizontal scrollbar being visible on windows. [#18563](https://github.com/grafana/grafana/pull/18563), [@torkelo](https://github.com/torkelo)
-* **Graphite**: Avoid glob of single-value array variables . [#18420](https://github.com/grafana/grafana/pull/18420), [@gotjosh](https://github.com/gotjosh)
-* **Prometheus**: Fix queries with label_replace remove the $1 match when loading query editor. [#18480](https://github.com/grafana/grafana/pull/18480), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Prometheus**: More consistently allows for multi-line queries in editor. [#18362](https://github.com/grafana/grafana/pull/18362), [@kaydelaney](https://github.com/kaydelaney)
-* **TimeSeries**: Assume values are all numbers. [#18540](https://github.com/grafana/grafana/pull/18540), [@ryantxu](https://github.com/ryantxu)
-
-# 6.3.2 (2019-08-07)
-
-### Bug Fixes
-* **Gauge/BarGauge**: Fixes issue with lost thresholds and an issue loading Gauge with avg stat. [#18375](https://github.com/grafana/grafana/pull/18375)
-
-# 6.3.1 (2019-08-07)
-
-### Bug Fixes
-* **PanelLinks**: Fixes crash issue with Gauge & Bar Gauge panels with panel links (drill down links). [#18430](https://github.com/grafana/grafana/pull/18430)
-
-# 6.3.0 (2019-08-06)
-### Features / Enhancements
-* **OAuth**: Do not set SameSite OAuth cookie if cookie_samesite is None. [#18392](https://github.com/grafana/grafana/pull/18392), [@papagian](https://github.com/papagian)
-
-### Bug Fixes
-* **PanelLinks**: Fix render issue when there is no panel description. [#18408](https://github.com/grafana/grafana/pull/18408), [@dehrax](https://github.com/dehrax)
-
-# 6.3.0-beta4 (2019-08-02)
-### Features / Enhancements
-* **Auth Proxy**: Include additional headers as part of the cache key. [#18298](https://github.com/grafana/grafana/pull/18298), [@gotjosh](https://github.com/gotjosh)
-
-# 6.3.0-beta3 (2019-08-02)
-### Bug Fixes
-* **OAuth**: Fix "missing saved state" OAuth login failure due to SameSite cookie policy. [#18332](https://github.com/grafana/grafana/pull/18332), [@papagian](https://github.com/papagian)
-* **cli**: fix for recognizing when in dev mode.. [#18334](https://github.com/grafana/grafana/pull/18334), [@xlson](https://github.com/xlson)
-
-# 6.3.0-beta2 (2019-07-26)
-### Features / Enhancements
-* **Build grafana images consistently**. [#18224](https://github.com/grafana/grafana/pull/18224), [@hassanfarid](https://github.com/hassanfarid)
-* **Docs**: SAML. [#18069](https://github.com/grafana/grafana/pull/18069), [@gotjosh](https://github.com/gotjosh)
-* **Permissions**: Show plugins in nav for non admin users but hide plugin configuration. [#18234](https://github.com/grafana/grafana/pull/18234), [@aocenas](https://github.com/aocenas)
-* **TimePicker**: Increase max height of quick range dropdown. [#18247](https://github.com/grafana/grafana/pull/18247), [@torkelo](https://github.com/torkelo)
-
-### Bug Fixes
-* **DataLinks**: Fixes incorrect interpolation of ${__series_name} . [#18251](https://github.com/grafana/grafana/pull/18251), [@torkelo](https://github.com/torkelo)
-* **Loki**: Display live tailed logs in correct order in Explore. [#18031](https://github.com/grafana/grafana/pull/18031), [@kaydelaney](https://github.com/kaydelaney)
-* **PhantomJS**: Fixes rendering on Debian Buster. [#18162](https://github.com/grafana/grafana/pull/18162), [@xlson](https://github.com/xlson)
-* **TimePicker**: Fixed style issue for custom range popover. [#18244](https://github.com/grafana/grafana/pull/18244), [@torkelo](https://github.com/torkelo)
-* **Timerange**: Fixes a bug where custom time ranges didn't respect UTC. [#18248](https://github.com/grafana/grafana/pull/18248), [@kaydelaney](https://github.com/kaydelaney)
-* **remote_cache**: Fix redis connstr parsing. [#18204](https://github.com/grafana/grafana/pull/18204), [@mblaschke](https://github.com/mblaschke)
-
-
-# 6.3.0-beta1 (2019-07-10)
-### Features / Enhancements
-* **Alerting**: Add tags to alert rules. [#10989](https://github.com/grafana/grafana/pull/10989), [@Thib17](https://github.com/Thib17)
-* **Alerting**: Attempt to send email notifications to all given email addresses. [#16881](https://github.com/grafana/grafana/pull/16881), [@zhulongcheng](https://github.com/zhulongcheng)
-* **Alerting**: Improve alert rule testing. [#16286](https://github.com/grafana/grafana/pull/16286), [@marefr](https://github.com/marefr)
-* **Alerting**: Support for configuring content field for Discord alert notifier. [#17017](https://github.com/grafana/grafana/pull/17017), [@jan25](https://github.com/jan25)
-* **Alertmanager**: Replace illegal chars with underscore in label names. [#17002](https://github.com/grafana/grafana/pull/17002), [@bergquist](https://github.com/bergquist)
-* **Auth**: Allow expiration of API keys. [#17678](https://github.com/grafana/grafana/pull/17678), [@papagian](https://github.com/papagian)
-* **Auth**: Return device, os and browser when listing user auth tokens in HTTP API. [#17504](https://github.com/grafana/grafana/pull/17504), [@shavonn](https://github.com/shavonn)
-* **Auth**: Support list and revoke of user auth tokens in UI. [#17434](https://github.com/grafana/grafana/pull/17434), [@shavonn](https://github.com/shavonn)
-* **AzureMonitor**: change clashing built-in Grafana variables/macro names for Azure Logs. [#17140](https://github.com/grafana/grafana/pull/17140), [@shavonn](https://github.com/shavonn)
-* **CloudWatch**: Made region visible for AWS Cloudwatch Expressions. [#17243](https://github.com/grafana/grafana/pull/17243), [@utkarshcmu](https://github.com/utkarshcmu)
-* **Cloudwatch**: Add AWS DocDB metrics. [#17241](https://github.com/grafana/grafana/pull/17241), [@utkarshcmu](https://github.com/utkarshcmu)
-* **Dashboard**: Use timezone dashboard setting when exporting to CSV. [#18002](https://github.com/grafana/grafana/pull/18002), [@dehrax](https://github.com/dehrax)
-* **Data links**. [#17267](https://github.com/grafana/grafana/pull/17267), [@torkelo](https://github.com/torkelo)
-* **Docker**: Switch base image to ubuntu:latest from debian:stretch to avoid security issues.. [#17066](https://github.com/grafana/grafana/pull/17066), [@bergquist](https://github.com/bergquist)
-* **Elasticsearch**: Support for visualizing logs in Explore . [#17605](https://github.com/grafana/grafana/pull/17605), [@marefr](https://github.com/marefr)
-* **Explore**: Adds Live option for supported datasources. [#17062](https://github.com/grafana/grafana/pull/17062), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Explore**: Adds orgId to URL for sharing purposes. [#17895](https://github.com/grafana/grafana/pull/17895), [@kaydelaney](https://github.com/kaydelaney)
-* **Explore**: Adds support for new loki 'start' and 'end' params for labels endpoint. [#17512](https://github.com/grafana/grafana/pull/17512), [@kaydelaney](https://github.com/kaydelaney)
-* **Explore**: Adds support for toggling raw query mode in explore. [#17870](https://github.com/grafana/grafana/pull/17870), [@kaydelaney](https://github.com/kaydelaney)
-* **Explore**: Allow switching between metrics and logs . [#16959](https://github.com/grafana/grafana/pull/16959), [@marefr](https://github.com/marefr)
-* **Explore**: Combines the timestamp and local time columns into one. [#17775](https://github.com/grafana/grafana/pull/17775), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Explore**: Display log lines context . [#17097](https://github.com/grafana/grafana/pull/17097), [@dprokop](https://github.com/dprokop)
-* **Explore**: Don't parse log levels if provided by field or label. [#17180](https://github.com/grafana/grafana/pull/17180), [@marefr](https://github.com/marefr)
-* **Explore**: Improves performance of Logs element by limiting re-rendering. [#17685](https://github.com/grafana/grafana/pull/17685), [@kaydelaney](https://github.com/kaydelaney)
-* **Explore**: Support for new LogQL filtering syntax. [#16674](https://github.com/grafana/grafana/pull/16674), [@davkal](https://github.com/davkal)
-* **Explore**: Use new TimePicker from Grafana/UI. [#17793](https://github.com/grafana/grafana/pull/17793), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Explore**: handle newlines in LogRow Highlighter. [#17425](https://github.com/grafana/grafana/pull/17425), [@rrfeng](https://github.com/rrfeng)
-* **Graph**: Added new fill gradient option. [#17528](https://github.com/grafana/grafana/pull/17528), [@torkelo](https://github.com/torkelo)
-* **GraphPanel**: Don't sort series when legend table & sort column is not visible . [#17095](https://github.com/grafana/grafana/pull/17095), [@shavonn](https://github.com/shavonn)
-* **InfluxDB**: Support for visualizing logs in Explore. [#17450](https://github.com/grafana/grafana/pull/17450), [@hugohaggmark](https://github.com/hugohaggmark)
-* **Logging**: Login and Logout actions (#17760). [#17883](https://github.com/grafana/grafana/pull/17883), [@ATTron](https://github.com/ATTron)
-* **Logging**: Move log package to pkg/infra. [#17023](https://github.com/grafana/grafana/pull/17023), [@zhulongcheng](https://github.com/zhulongcheng)
-* **Metrics**: Expose stats about roles as metrics. [#17469](https://github.com/grafana/grafana/pull/17469), [@bergquist](https://github.com/bergquist)
-* **MySQL/Postgres/MSSQL**: Add parsing for day, weeks and year intervals in macros. [#13086](https://github.com/grafana/grafana/pull/13086), [@bernardd](https://github.com/bernardd)
-* **MySQL**: Add support for periodically reloading client certs. [#14892](https://github.com/grafana/grafana/pull/14892), [@tpetr](https://github.com/tpetr)
-* **Plugins**: replace dataFormats list with skipDataQuery flag in plugin.json. [#16984](https://github.com/grafana/grafana/pull/16984), [@ryantxu](https://github.com/ryantxu)
-* **Prometheus**: Take timezone into account for step alignment. [#17477](https://github.com/grafana/grafana/pull/17477), [@fxmiii](https://github.com/fxmiii)
-* **Prometheus**: Use overridden panel range for $__range instead of dashboard range. [#17352](https://github.com/grafana/grafana/pull/17352), [@patrick246](https://github.com/patrick246)
-* **Prometheus**: added time range filter to series labels query. [#16851](https://github.com/grafana/grafana/pull/16851), [@FUSAKLA](https://github.com/FUSAKLA)
-* **Provisioning**: Support folder that doesn't exist yet in dashboard provisioning. [#17407](https://github.com/grafana/grafana/pull/17407), [@Nexucis](https://github.com/Nexucis)
-* **Refresh picker**: Handle empty intervals. [#17585](https://github.com/grafana/grafana/pull/17585), [@dehrax](https://github.com/dehrax)
-* **Singlestat**: Add y min/max config to singlestat sparklines. [#17527](https://github.com/grafana/grafana/pull/17527), [@pitr](https://github.com/pitr)
-* **Snapshot**: use given key and deleteKey. [#16876](https://github.com/grafana/grafana/pull/16876), [@zhulongcheng](https://github.com/zhulongcheng)
-* **Templating**: Correctly display __text in multi-value variable after page reload. [#17840](https://github.com/grafana/grafana/pull/17840), [@EduardSergeev](https://github.com/EduardSergeev)
-* **Templating**: Support selecting all filtered values of a multi-value variable. [#16873](https://github.com/grafana/grafana/pull/16873), [@r66ad](https://github.com/r66ad)
-* **Tracing**: allow propagation with Zipkin headers. [#17009](https://github.com/grafana/grafana/pull/17009), [@jrockway](https://github.com/jrockway)
-* **Users**: Disable users removed from LDAP. [#16820](https://github.com/grafana/grafana/pull/16820), [@alexanderzobnin](https://github.com/alexanderzobnin)
-
-### Bug Fixes
-* **AddPanel**: Fix issue when removing moved add panel widget . [#17659](https://github.com/grafana/grafana/pull/17659), [@dehrax](https://github.com/dehrax)
-* **CLI**: Fix encrypt-datasource-passwords fails with sql error. [#18014](https://github.com/grafana/grafana/pull/18014), [@marefr](https://github.com/marefr)
-* **Elasticsearch**: Fix default max concurrent shard requests. [#17770](https://github.com/grafana/grafana/pull/17770), [@marefr](https://github.com/marefr)
-* **Explore**: Fix browsing back to dashboard panel. [#17061](https://github.com/grafana/grafana/pull/17061), [@jschill](https://github.com/jschill)
-* **Explore**: Fix filter by series level in logs graph. [#17798](https://github.com/grafana/grafana/pull/17798), [@marefr](https://github.com/marefr)
-* **Explore**: Fix issues when loading and both graph/table are collapsed. [#17113](https://github.com/grafana/grafana/pull/17113), [@marefr](https://github.com/marefr)
-* **Explore**: Fix selection/copy of log lines. [#17121](https://github.com/grafana/grafana/pull/17121), [@marefr](https://github.com/marefr)
-* **Fix**: Wrap value of multi variable in array when coming from URL. [#16992](https://github.com/grafana/grafana/pull/16992), [@aocenas](https://github.com/aocenas)
-* **Frontend**: Fix for Json tree component not working. [#17608](https://github.com/grafana/grafana/pull/17608), [@srid12](https://github.com/srid12)
-* **Graphite**: Fix for issue with alias function being moved last. [#17791](https://github.com/grafana/grafana/pull/17791), [@torkelo](https://github.com/torkelo)
-* **Graphite**: Fixes issue with seriesByTag & function with variable param. [#17795](https://github.com/grafana/grafana/pull/17795), [@torkelo](https://github.com/torkelo)
-* **Graphite**: use POST for /metrics/find requests. [#17814](https://github.com/grafana/grafana/pull/17814), [@papagian](https://github.com/papagian)
-* **HTTP Server**: Serve Grafana with a custom URL path prefix. [#17048](https://github.com/grafana/grafana/pull/17048), [@jan25](https://github.com/jan25)
-* **InfluxDB**: Fixes single quotes are not escaped in label value filters. [#17398](https://github.com/grafana/grafana/pull/17398), [@Panzki](https://github.com/Panzki)
-* **Prometheus**: Correctly escape '|' literals in interpolated PromQL variables. [#16932](https://github.com/grafana/grafana/pull/16932), [@Limess](https://github.com/Limess)
-* **Prometheus**: Fix when adding label for metrics which contains colons in Explore. [#16760](https://github.com/grafana/grafana/pull/16760), [@tolwi](https://github.com/tolwi)
-* **SinglestatPanel**: Remove background color when value turns null. [#17552](https://github.com/grafana/grafana/pull/17552), [@druggieri](https://github.com/druggieri)
+# 6.3.0 (unreleased)

 # 6.2.5 (2019-06-25)

@@ -582,10 +409,6 @@ repo on July 1st. Make sure you have switched to the new repo by then. The new r
 * **Text Panel**: The text panel does no longer by default allow unsantizied HTML. [#4117](https://github.com/grafana/grafana/issues/4117). This means that if you have text panels with scripts tags they will no longer work as before. To enable unsafe javascript execution in text panels enable the settings `disable_sanitize_html` under the section `[panels]` in your Grafana ini file, or set env variable  `GF_PANELS_DISABLE_SANITIZE_HTML=true`.
 * **Dashboard**: Panel property `minSpan` replaced by `maxPerRow`. Dashboard migration will automatically migrate all dashboard panels using the `minSpan` property to the new `maxPerRow` property [#12991](https://github.com/grafana/grafana/pull/12991)

-# 5.4.5 (2019-08-29)
-
-* **Security**: Urgent security patch release. Please read more in our [blog](https://grafana.com/blog/2019/08/29/grafana-5.4.5-and-6.3.4-released-with-important-security-fix/)
-
 # 5.4.4 (2019-04-29)

 * **Security**: Urgent security patch release. Please read more in our [blog](https://grafana.com/blog/2019/04/29/grafana-5.4.4-and-6.1.6-released-with-important-security-fix/)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,7 +3,7 @@
 Grafana uses GitHub to manage contributions.
 Contributions take the form of pull requests that will be reviewed by the core team.

- If you are a new contributor see: [Steps to Contribute](#steps-to-contribute).
+- If you are a new contributor see: [Steps to Contribute](#steps-to-contribute)

 - If you have a trivial fix or improvement, go ahead and create a pull request.

@@ -11,21 +11,19 @@ Contributions take the form of pull requests that will be reviewed by the core t

 - Sign our [CLA](http://docs.grafana.org/contribute/cla/).

- Make sure to follow the code style guides:
+- Make sure to follow the code style guides
  - [Backend](https://github.com/grafana/grafana/tree/master/pkg)
  - [Frontend](https://github.com/grafana/grafana/tree/master/style_guides)

-## Steps to contribute
+## Steps to Contribute

 Should you wish to work on a GitHub issue, check first if it is not already assigned to someone. If it is free, you claim it by commenting on the issue that you want to work on it. This is to prevent duplicated efforts from contributors on the same issue.

 Please check the [`beginner friendly`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) and [`help wanted`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) labels to find issues that are good for getting started. If you have questions about one of the issues, with or without the tag, please comment on them and one of the core team or the original poster will clarify it.

-To setup a local development environment we recommend reading [Building Grafana from source](http://docs.grafana.org/project/building_from_source/).
+To setup a local development environment we recommend reading [Building Grafana from source](http://docs.grafana.org/project/building_from_source/)

-## Pull request checklist
-
-Whether you are contributing or doing code review, first read and understand https://google.github.io/eng-practices/review/reviewer/ for general engineering practices around code reviews that we also use.
+## Pull Request Checklist

 - Branch from the master branch and, if needed, rebase to the current master branch before submitting your pull request. If it doesn't merge cleanly with master you may be asked to rebase your changes.

@@ -33,46 +31,14 @@ Whether you are contributing or doing code review, first read and understand htt

 - Add tests relevant to the fixed bug or new feature.

-### High-level checks
+- Follow [PR and commit messages guidelines](#PR-and-commit-messages-guidelines)

- [ ] The pull request adds value and the impact of the change is in line with [Backend](https://github.com/grafana/grafana/tree/master/pkg) or [Frontend](https://github.com/grafana/grafana/tree/master/style_guides).
- [ ] The pull request works the way it says it should do.
- [ ] The pull request closes one issue if possible and does not fix unrelated issues within the same pull request.
- [ ] The pull request contains necessary tests.
-
-### Low-level checks
-
- [ ] The pull request contains a title that explains it. It follows [PR and commit messages guidelines](#Pull-Requests-titles-and-message).
- [ ] The pull request contains necessary links to issues. 
- [ ] The pull request contains commits with messages that are small and understandable. It follows [PR and commit messages guidelines](#Pull-Requests-titles-and-message).
- [ ] The pull request does not contain magic strings or numbers that could be replaced with an `Enum` or `const` instead.
-
-#### Bug-specific checks
-
- [ ] The pull request contains `Closes: #Issue` or `Fixes: #Issue` in pull request description.
- [ ] The Pull Request adds tests that replicate the fixed bug and helps avoid regressions.
-
-### Frontend-specific checks
-
- [ ] The pull request does not increase the Angular code base.
-  > We are in the process of migrating to React so any increment of Angular code is generally discouraged.
- [ ] The pull request does not contain uses of `any` or `{}` without comments describing why.
- [ ] The pull request does not contain large React components that could easily be split into several smaller components.
- [ ] The pull request does not contain back end calls directly from components, use actions and Redux instead.
-
-#### Redux specific checks (skip if your pull request does not contain Redux changes)
-
- [ ] The pull request does not contain code that mutates state in reducers or thunks.
- [ ] The pull request uses helpers `actionCreatorFactory` and `reducerFactory` instead of traditional `switch statement` reducers in Redux. See [Redux framework](https://github.com/grafana/grafana/tree/master/style_guides/redux.md) for more details.
- [ ] The pull request uses `reducerTester` to test reducers. See [Redux framework](https://github.com/grafana/grafana/tree/master/style_guides/redux.md) for more details.
- [ ] The pull request does not contain code that accesses the reducers state slice directly, instead, the code uses state selectors to access state.
-
-### Pull request titles and message
+### Pull Requests titles and message

 Pull request titles should follow this format: `Area: Name of the change`.
 Titles are used to generate the changelog so they should be as descriptive as possible in one line.

-Good examples:
+Good Examples

 - `Explore: Adds Live option for supported datasources`
 - `GraphPanel: Don't sort series when legend table & sort column is not visible`
@@ -87,7 +53,7 @@ The commit message of the commits in the Pull Request can still be part of the g

 The Git commit title should be short, descriptive and include the Pull Request ID.

-Good examples:
+Good Examples

 - `Explore: Live supprt in datasources (#12345)`
 - `GraphPanel: Fix legend sorting issues (#12345)`
--- a/40
+++ b/40
@@ -1,7 +1,5 @@
 # Golang build container
-FROM golang:1.12.10-alpine
-
-RUN apk add --no-cache gcc g++
+FROM golang:1.12.4

 WORKDIR $GOPATH/src/github.com/grafana/grafana

@@ -17,17 +15,7 @@ COPY package.json package.json
 RUN go run build.go build

 # Node build container
-FROM node:10.14.2-alpine
-
-# PhantomJS
-RUN apk add --no-cache curl &&\
-    cd /tmp && curl -Ls https://github.com/dustinblackman/phantomized/releases/download/2.1.1/dockerized-phantomjs.tar.gz | tar xz &&\
-    cp -R lib lib64 / &&\
-    cp -R usr/lib/x86_64-linux-gnu /usr/lib &&\
-    cp -R usr/share /usr/share &&\
-    cp -R etc/fonts /etc &&\
-    curl -k -Ls https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 | tar -jxf - &&\
-    cp phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs
+FROM node:10.14.2

 WORKDIR /usr/src/app/

@@ -36,7 +24,7 @@ COPY packages packages

 RUN yarn install --pure-lockfile --no-progress

-COPY Gruntfile.js tsconfig.json tslint.json .browserslistrc ./
+COPY Gruntfile.js tsconfig.json tslint.json ./
 COPY public public
 COPY scripts scripts
 COPY emails emails
@@ -45,7 +33,7 @@ ENV NODE_ENV production
 RUN ./node_modules/.bin/grunt build

 # Final container
-FROM alpine:3.10
+FROM ubuntu:latest

 LABEL maintainer="Grafana team <hello@grafana.com>"

@@ -62,14 +50,16 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi

 WORKDIR $GF_PATHS_HOME

-RUN apk add --no-cache ca-certificates bash && \
-    apk add --no-cache --upgrade --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main openssl musl-utils
+RUN apt-get update && apt-get upgrade -y && \
+    apt-get install -qq -y libfontconfig1 ca-certificates && \
+    apt-get autoremove -y && \
+    rm -rf /var/lib/apt/lists/*

 COPY conf ./conf

 RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
-    addgroup -S -g $GF_GID grafana && \
-    adduser -S -u $GF_UID -G grafana grafana && \
+    groupadd -r -g $GF_GID grafana && \
+    useradd -r -u $GF_UID -g grafana grafana && \
    mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
             "$GF_PATHS_PROVISIONING/dashboards" \
             "$GF_PATHS_PROVISIONING/notifiers" \
@@ -79,15 +69,7 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
    cp "$GF_PATHS_HOME/conf/sample.ini" "$GF_PATHS_CONFIG" && \
    cp "$GF_PATHS_HOME/conf/ldap.toml" /etc/grafana/ldap.toml && \
    chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
-    chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
-
-# PhantomJS
-COPY --from=1 /tmp/lib /lib
-COPY --from=1 /tmp/lib64 /lib64
-COPY --from=1 /tmp/usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu
-COPY --from=1 /tmp/usr/share /usr/share
-COPY --from=1 /tmp/etc/fonts /etc/fonts
-COPY --from=1 /usr/local/bin/phantomjs /usr/local/bin
+    chmod 777 -R "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"

 COPY --from=0 /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-server /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-cli ./bin/
 COPY --from=1 /usr/src/app/public ./public
--- a/ISSUE_TRIAGE.md
+++ b/ISSUE_TRIAGE.md
@@ -99,7 +99,7 @@ See [investigation of issues](#investigation-of-issues).

 Helping the Grafana project to know which issues are most important by users and the community is crucial for the success of the project. Read more about [prioritizing issues](#4-prioritization-of-issues) for details about how issues are being prioritized. The Grafana project use GitGub issues and reactions for collecting votes on enhancement and bugs.

-**Please don't add `+1` issue comments or similar since that will notify everyone that have subscribed to an issue and it doesn't add any useful update, rather it creates a bad habit.**
+**Please don't add `+1` issue comments or similar since that will notify everyone that have subscribed to an issue and it doesn't add any useful update, rather it creates a bad .**

 If you want to show your interest or importance of an issue, please use [GitHub's reactions](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments).

@@ -119,7 +119,7 @@ To get started with issue triage and finding issues that haven't been triaged yo

 ### Browse unlabeled issues

-The easiest and straight forward way of getting started and finding issues that haven't been triaged is to browse [unlabeled issues](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+no%3Alabel) and starting from the bottom and working yourself to the top.
+The easiest and straigt forward way of getting started and finding issues that haven't been triaged is to browse [unlabeled issues](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+no%3Alabel) and starting from the bottom and working yourself to the top.

 ### Subscribe to all notifications

@@ -179,12 +179,10 @@ Depending on the issue, you might not feel all this information is needed. Use y

 If the author provides the standard information but you are still unable to triage the issue, request additional information. Do this kindly and politely because you are asking for more of the author's time.

-If the author does not respond to the requested information within the timespan of a week, close the issue with a kind note stating that the author can request for the issue to be reopened when the necessary information is provided.
+If the author does not respond requested information within the timespan of a week, close the issue with a kind note stating that the author can request for the issue to be reopened when the necessary information is provided.

 When you feel you have all the information needed you're ready to [categorizing the issue](#3-categorizing-an-issue).

-If you receive a notification with additional information provided but you are not anymore on issue triage and you feel you do not have time to handle it, you should delegate it to the current person on issue triage.
-
 ## 3. Categorizing an issue

 An issue can have multiple of the following labels. Typically, a properly categorized issue should at least have:
@@ -355,15 +353,6 @@ For some other combinations there may not be possible at all for a maintainer to

 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.

-## External PRs
-
-Part of issue triage should also be triaging of external PRs. Main goal should be to make sure PRs from external contributors have an owner/reviewer and are not forgotten.
-
-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. 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
--- a/28
+++ b/28
@@ -2,14 +2,13 @@

 .PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go gosec revive golangci-lint go-vet test-go test-js test run clean devenv devenv-down revive-alerting

-GO = GO111MODULE=on go
-GO_FILES ?= ./pkg/...
-SH_FILES ?= $(shell find ./scripts -name *.sh)
+GO := GO111MODULE=on go
+GO_FILES := ./pkg/...

 all: deps build

 deps-go:
-	$(GO) run build.go setup
+	go run build.go setup

 deps-js: node_modules

@@ -17,15 +16,15 @@ deps: deps-js

 build-go:
 	@echo "build go files"
-	$(GO) run build.go build
+	GO111MODULE=on go run build.go build

 build-server:
 	@echo "build server"
-	$(GO) run build.go build-server
+	GO111MODULE=on go run build.go build-server

 build-cli:
 	@echo "build in CI environment"
-	$(GO) run build.go build-cli
+	GO111MODULE=on go run build.go build-cli

 build-js:
 	@echo "build frontend"
@@ -36,7 +35,7 @@ build: build-go build-js
 build-docker-dev:
 	@echo "build development container"
 	@echo "\033[92mInfo:\033[0m the frontend code is expected to be built already."
-	$(GO) run build.go -goos linux -pkg-arch amd64 ${OPT} build pkg-archive latest
+	GO111MODULE=on go run build.go -goos linux -pkg-arch amd64 ${OPT} build pkg-archive latest
 	cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
 	cd packaging/docker && docker build --tag grafana/grafana:dev .

@@ -46,7 +45,7 @@ build-docker-full:

 test-go:
 	@echo "test backend"
-	$(GO) test -v ./pkg/...
+	GO111MODULE=on go test -v ./pkg/...

 test-js:
 	@echo "test frontend"
@@ -73,7 +72,7 @@ scripts/go/bin/gosec: scripts/go/go.mod

 scripts/go/bin/bra: scripts/go/go.mod
 	@cd scripts/go; \
-	$(GO) build -o ./bin/bra github.com/unknwon/bra
+	$(GO) build -o ./bin/bra github.com/Unknwon/bra

 scripts/go/bin/golangci-lint: scripts/go/go.mod
 	@cd scripts/go; \
@@ -108,15 +107,10 @@ golangci-lint: scripts/go/bin/golangci-lint

 go-vet:
 	@echo "lint via go vet"
-	@$(GO) vet $(GO_FILES)
+	@go vet $(GO_FILES)

 lint-go: go-vet golangci-lint revive revive-alerting gosec

-# with disabled SC1071 we are ignored some TCL,Expect `/usr/bin/env expect` scripts
-shellcheck: $(SH_FILES)
-	@docker run --rm -v "$$PWD:/mnt" koalaman/shellcheck:stable \
-	$(SH_FILES) -e SC1071
-
 run: scripts/go/bin/bra
 	@scripts/go/bin/bra run

@@ -131,7 +125,7 @@ devenv: devenv-down

 	@cd devenv; \
 	./create_docker_compose.sh $(targets) || \
-	(rm -rf {docker-compose.yaml,conf.tmp,.env}; exit 1)
+	(rm -rf docker-compose.yaml; exit 1)

 	@cd devenv; \
 	docker-compose up -d --build
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# [Grafana](https://grafana.com) [![Circle CI](https://circleci.com/gh/grafana/grafana.svg?style=svg)](https://circleci.com/gh/grafana/grafana) [![Go Report Card](https://goreportcard.com/badge/github.com/grafana/grafana)](https://goreportcard.com/report/github.com/grafana/grafana) 
+# [Grafana](https://grafana.com) [![Circle CI](https://circleci.com/gh/grafana/grafana.svg?style=svg)](https://circleci.com/gh/grafana/grafana) [![Go Report Card](https://goreportcard.com/badge/github.com/grafana/grafana)](https://goreportcard.com/report/github.com/grafana/grafana) [![codecov](https://codecov.io/gh/grafana/grafana/branch/master/graph/badge.svg)](https://codecov.io/gh/grafana/grafana)

 [Website](https://grafana.com) |
 [Twitter](https://twitter.com/grafana) |
@@ -22,7 +22,7 @@ Be sure to read the [getting started guide](http://docs.grafana.org/guides/getti
 ## Run from master

 If you want to build a package yourself, or contribute - here is a guide for how to do that. You can always find
-the latest master builds [here](https://grafana.com/grafana/download).
+the latest master builds [here](https://grafana.com/grafana/download)

 ### Dependencies

@@ -50,11 +50,6 @@ make run
 ```

 #### Frontend
-Install front-end dependencies first:
-
-```bash
-yarn install --pure-lockfile
-```

 Rebuild on file change, and serve them by Grafana's webserver (http://localhost:3000):

@@ -105,18 +100,18 @@ Run the image you have built using: `docker run --rm -p 3000:3000 grafana/grafan

 #### Building on linux/amd64 (fast)

-1. Build the frontend `go run build.go build-frontend`.
-2. Build the docker image `make build-docker-dev`.
+1. Build the frontend `go run build.go build-frontend`
+2. Build the docker image `make build-docker-dev`

-The resulting image will be tagged as `grafana/grafana:dev`.
+The resulting image will be tagged as `grafana/grafana:dev`

 #### Building anywhere (slower)

 Choose this option to build on platforms other than linux/amd64 and/or not have to setup the Grafana development environment.

-1. `make build-docker-full` or `docker build -t grafana/grafana:dev`.
+1. `make build-docker-full` or `docker build -t grafana/grafana:dev .`

-The resulting image will be tagged as `grafana/grafana:dev`.
+The resulting image will be tagged as `grafana/grafana:dev`

 Notice: If you are using Docker for MacOS, be sure to set the memory limit to be larger than 2 GiB (at docker -> Preferences -> Advanced), otherwise `grunt build` may fail.

@@ -136,67 +131,45 @@ In your custom.ini uncomment (remove the leading `;`) sign. And set `app_mode =

 #### Frontend

-Execute all frontend tests:
+Execute all frontend tests

 ```bash
 yarn test
 ```

-Write and watch frontend tests:
+Writing & watching frontend tests

- Start watcher: `yarn jest`.
- Jest runs all test files that end with the name ".test.ts".
+- Start watcher: `yarn jest`
+- Jest will run all test files that end with the name ".test.ts"

 #### Backend

 ```bash
 # Run Golang tests using sqlite3 as database (default)
 go test ./pkg/...
-```

-##### Running the MySQL or Postgres backend tests:
+# Run Golang tests using mysql as database - convenient to use /docker/blocks/mysql_tests
+GRAFANA_TEST_DB=mysql go test ./pkg/...

-Run these by setting `GRAFANA_TEST_DB` in your environment.
-
- `GRAFANA_TEST_DB=mysql` to test MySQL
- `GRAFANA_TEST_DB=postgres` to test Postgres
-
-Follow the instructions in `./devenv` to spin up test containers running the appropriate databases with `docker-compose`
- Use `docker/blocks/mysql_tests` or `docker/blocks/postgres_tests` as appropriate.
-
-```bash
-# MySQL
-# Tests can only be ran in one Go package at a time due to clashing db queries. To run MySQL tests for the "pkg/services/sqlstore" package, run:
-GRAFANA_TEST_DB=mysql go test ./pkg/services/sqlstore/...
-
-# Or run all the packages using the circle CI scripts. This method will be slower as the scripts will run all the tests, including the integration tests.
-./scripts/circle-test-mysql.sh
-```
-
-```bash
-# Postgres
-# Tests can only be ran in one Go package at a time due to clashing db queries. To run Postgres tests for the "pkg/services/sqlstore" package, run:
-GRAFANA_TEST_DB=postgres go test ./pkg/services/sqlstore/...
-
-# Or run all the packages using the circle CI scripts. This method will be slower as the scripts will run all the tests, including the integration tests.
-./scripts/circle-test-postgres.sh
+# Run Golang tests using postgres as database - convenient to use /docker/blocks/postgres_tests
+GRAFANA_TEST_DB=postgres go test ./pkg/...
 ```

 #### End-to-end

-Execute all end-to-end tests:
+Execute all end-to-end tests

 ```bash
 yarn e2e-tests
 ```

-Execute all end-to-end tests using using a specific url:
+Execute all end-to-end tests using using a specific url

 ```bash
 ENV BASE_URL=http://localhost:3333 yarn e2e-tests
 ```

-Debugging all end-to-end tests (BROWSER=1 starts the browser and SLOWMO=1 delays each puppeteer operation by 100ms):
+Debugging all end-to-end tests (BROWSER=1 will start the browser and SLOWMO=1 will delay each puppeteer operation by 100ms)

 ```bash
 ENV BROWSER=1 SLOWMO=1 yarn e2e-tests
@@ -205,18 +178,20 @@ ENV BROWSER=1 SLOWMO=1 yarn e2e-tests
 ### Datasource and dashboard provisioning

 [Here](https://github.com/grafana/grafana/tree/master/devenv) you can find helpful scripts and docker-compose setup
-that will populate your dev environment for quicker testing and experimenting.
+that will populate your dev environment for quicker testing end experimenting.

 ## Contribute

 If you have any ideas for improvement or have found a bug, do not hesitate to open an issue.
-And if you have time, clone this repo and submit a pull request to help me make Grafana the kickass metrics and devops dashboard we all dream about!
+And if you have time, clone this repo and submit a pull request to help me make Grafana
+the kickass metrics & devops dashboard we all dream about!

 Read the [contributing](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md) guide then check the [`beginner friendly`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) label to find issues that are easy and that we would like help with.

 ## Plugin development

-Checkout the [Plugin Development Guide](http://docs.grafana.org/plugins/developing/development/) and checkout the [PLUGIN_DEV.md](https://github.com/grafana/grafana/blob/master/PLUGIN_DEV.md) file for changes in Grafana that relate to plugin development.
+Checkout the [Plugin Development Guide](http://docs.grafana.org/plugins/developing/development/) and checkout the [PLUGIN_DEV.md](https://github.com/grafana/grafana/blob/master/PLUGIN_DEV.md) file for changes in Grafana that relate to
+plugin development.

 ## License

--- a/build.go
+++ b/build.go
@@ -528,9 +528,6 @@ func ldflags() string {
 	b.WriteString(fmt.Sprintf(" -X main.commit=%s", getGitSha()))
 	b.WriteString(fmt.Sprintf(" -X main.buildstamp=%d", buildStamp()))
 	b.WriteString(fmt.Sprintf(" -X main.buildBranch=%s", getGitBranch()))
-	if v := os.Getenv("LDFLAGS"); v != "" {
-		b.WriteString(fmt.Sprintf(" -extldflags=%s", v))
-	}
 	return b.String()
 }

@@ -595,11 +592,6 @@ func getGitSha() string {
 }

 func buildStamp() int64 {
-	// use SOURCE_DATE_EPOCH if set.
-	if s, _ := strconv.ParseInt(os.Getenv("SOURCE_DATE_EPOCH"), 10, 64); s > 0 {
-		return s
-	}
-
 	bs, err := runError("git", "show", "-s", "--format=%ct")
 	if err != nil {
 		return time.Now().Unix()
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -28,7 +28,7 @@ provisioning = conf/provisioning

 #################################### Server ##############################
 [server]
-# Protocol (http, https, h2, socket)
+# Protocol (http, https, socket)
 protocol = http

 # The ip address to bind to, empty will bind to all interfaces
@@ -116,7 +116,7 @@ type = database

 # cache connectionstring options
 # database: will use Grafana primary database.
-# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`. Only addr is required. ssl may be 'true', 'false', or 'insecure'.
+# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0`. Only addr is required.
 # memcache: 127.0.0.1:11211
 connstr =

@@ -214,10 +214,6 @@ external_enabled = true
 external_snapshot_url = https://snapshots-origin.raintank.io
 external_snapshot_name = Publish to snapshot.raintank.io

-# Set to true to enable this Grafana instance act as an external snapshot server and allow unauthenticated requests for
-# creating and deleting snapshots.
-public_mode = false
-
 # remove expired snapshot
 snapshot_remove_expired = true

@@ -370,7 +366,6 @@ client_id = some_id
 client_secret = some_secret
 scopes = user:email
 email_attribute_name = email:primary
-email_attribute_path =
 auth_url =
 token_url =
 api_url =
@@ -384,45 +379,17 @@ send_client_credentials_via_post = false

 #################################### SAML Auth ###########################
 [auth.saml] # Enterprise only
-# Defaults to false. If true, the feature is enabled
 enabled = false
-
-# Base64-encoded public X.509 certificate. Used to sign requests to the IdP
-certificate =
-
-# Path to the public X.509 certificate. Used to sign requests to the IdP
-certificate_path =
-
-# Base64-encoded private key. Used to decrypt assertions from the IdP
 private_key =
-
-# Path to the private key. Used to decrypt assertions from the IdP
 private_key_path =
-
-# Base64-encoded IdP SAML metadata XML. Used to verify and obtain binding locations from the IdP
+certificate =
+certificate_path =
 idp_metadata =
-
-# Path to the SAML metadata XML. Used to verify and obtain binding locations from the IdP
 idp_metadata_path =
-
-# URL to fetch SAML IdP metadata. Used to verify and obtain binding locations from the IdP
 idp_metadata_url =
-
-# Duration, since the IdP issued a response and the SP is allowed to process it. Defaults to 90 seconds
 max_issue_delay = 90s
-
-# Duration, for how long the SP's metadata should be valid. Defaults to 48 hours
 metadata_valid_duration = 48h

-# Friendly name or name of the attribute within the SAML assertion to use as the user's name
-assertion_attribute_name = displayName
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
-assertion_attribute_login = mail
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's email
-assertion_attribute_email = mail
-
 #################################### Basic Auth ##########################
 [auth.basic]
 enabled = true
@@ -593,10 +560,8 @@ enabled = true
 #################################### Internal Grafana Metrics ############
 # Metrics available at HTTP API Url /metrics
 [metrics]
-enabled              = true
-interval_seconds     = 10
-# Disable total stats (stat_totals_*) metrics to be generated
-disable_total_stats = false
+enabled           = true
+interval_seconds  = 10

 #If both are set, basic auth will be required for the metrics endpoint.
 basic_auth_username =
@@ -684,7 +649,3 @@ app_tls_skip_verify_insecure = false

 [enterprise]
 license_path =
-
-[feature_toggles]
-# enable features, separated by spaces
-enable =
--- a/conf/ldap.toml
+++ b/conf/ldap.toml
@@ -47,7 +47,7 @@ email =  "email"

 # Map ldap groups to grafana org roles
 [[servers.group_mappings]]
-group_dn = "cn=admins,ou=groups,dc=grafana,dc=org"
+group_dn = "cn=admins,dc=grafana,dc=org"
 org_role = "Admin"
 # To make user an instance admin  (Grafana Admin) uncomment line below
 # grafana_admin = true
@@ -55,7 +55,7 @@ org_role = "Admin"
 # org_id = 1

 [[servers.group_mappings]]
-group_dn = "cn=users,ou=groups,dc=grafana,dc=org"
+group_dn = "cn=users,dc=grafana,dc=org"
 org_role = "Editor"

 [[servers.group_mappings]]
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -28,7 +28,7 @@

 #################################### Server ####################################
 [server]
-# Protocol (http, https, h2, socket)
+# Protocol (http, https, socket)
 ;protocol = http

 # The ip address to bind to, empty will bind to all interfaces
@@ -112,7 +112,7 @@

 # cache connectionstring options
 # database: will use Grafana primary database.
-# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`. Only addr is required. ssl may be 'true', 'false', or 'insecure'.
+# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0`. Only addr is required.
 # memcache: 127.0.0.1:11211
 ;connstr =

@@ -209,10 +209,6 @@
 ;external_snapshot_url = https://snapshots-origin.raintank.io
 ;external_snapshot_name = Publish to snapshot.raintank.io

-# Set to true to enable this Grafana instance act as an external snapshot server and allow unauthenticated requests for
-# creating and deleting snapshots.
-;public_mode = false
-
 # remove expired snapshot
 ;snapshot_remove_expired = true

@@ -323,8 +319,6 @@
 ;client_id = some_id
 ;client_secret = some_secret
 ;scopes = user:email,read:org
-;email_attribute_name = email:primary
-;email_attribute_path =
 ;auth_url = https://foo.bar/login/oauth/authorize
 ;token_url = https://foo.bar/login/oauth/access_token
 ;api_url = https://foo.bar/user
@@ -340,46 +334,18 @@
 ;send_client_credentials_via_post = false

 #################################### SAML Auth ###########################
-[auth.saml] # Enterprise only
-# Defaults to false. If true, the feature is enabled.
+;[auth.saml] # Enterprise only
 ;enabled = false
-
-# Base64-encoded public X.509 certificate. Used to sign requests to the IdP
-;certificate =
-
-# Path to the public X.509 certificate. Used to sign requests to the IdP
-;certificate_path =
-
-# Base64-encoded private key. Used to decrypt assertions from the IdP
 ;private_key =
-
-;# Path to the private key. Used to decrypt assertions from the IdP
 ;private_key_path =
-
-# Base64-encoded IdP SAML metadata XML. Used to verify and obtain binding locations from the IdP
+;certificate =
+;certificate_path =
 ;idp_metadata =
-
-# Path to the SAML metadata XML. Used to verify and obtain binding locations from the IdP
 ;idp_metadata_path =
-
-# URL to fetch SAML IdP metadata. Used to verify and obtain binding locations from the IdP
 ;idp_metadata_url =
-
-# Duration, since the IdP issued a response and the SP is allowed to process it. Defaults to 90 seconds.
 ;max_issue_delay = 90s
-
-# Duration, for how long the SP's metadata should be valid. Defaults to 48 hours.
 ;metadata_valid_duration = 48h

-# Friendly name or name of the attribute within the SAML assertion to use as the user's name
-;assertion_attribute_name = displayName
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
-;assertion_attribute_login = mail
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's email
-;assertion_attribute_email = mail
-
 #################################### Grafana.com Auth ####################
 [auth.grafana_com]
 ;enabled = false
@@ -526,8 +492,6 @@
 [metrics]
 # Disable / Enable internal metrics
 ;enabled           = true
-# Disable total stats (stat_totals_*) metrics to be generated
-;disable_total_stats = false

 # Publish interval
 ;interval_seconds  = 10
--- a/devenv/README.md
+++ b/devenv/README.md
@@ -22,7 +22,8 @@ found. The dashboards are located in the `devenv/dev-dashboards` folder.
 # docker-compose with databases

 ```bash
-make devenv sources=influxdb,prometheus2,elastic5
+./create_docker_compose.sh influxdb prometheus2 elastic5
+docker-compose up
 ```

 This command will create a docker compose file with specified databases configured and ready to run. Each database has
@@ -30,8 +31,3 @@ a prepared image with some fake data ready to use. For available databases see `
 for some databases there are multiple images, for example there is prometheus_mac specifically for Macs or different
 version.

-Some of the blocks support dynamic change of the image version used in docker file. The signature looks like this - `make devenv sources=postgres,openldap name-of-block_version=9.2` -
-
-```bash
-make devenv sources=postgres,openldap postgres_version=9.2
-```
--- a/devenv/create_docker_compose.sh
+++ b/devenv/create_docker_compose.sh
@@ -8,8 +8,8 @@ grafana_config_file=conf.tmp
 grafana_config=config

 compose_header_file=docker/compose_header.yml
-compose_file=docker-compose.yaml
-env_file=.env
+fig_file=docker-compose.yaml
+fig_config=docker-compose.yaml

 if [ "$#" == 0 ]; then
    blocks=`ls $blocks_dir`
@@ -24,15 +24,15 @@ if [ "$#" == 0 ]; then
    exit 0
 fi

-for file in $grafana_config_file $compose_file $env_file; do
+for file in $grafana_config_file $fig_file; do
    if [ -e $file ]; then
        echo "Deleting $file"
        rm $file
    fi
 done

-echo "Adding Compose header to $compose_file"
-cat $compose_header_file >> $compose_file
+echo "Adding Compose header to $fig_file"
+cat $compose_header_file >> $fig_file

 for dir in $@; do
    current_dir=$blocks_dir/$dir
@@ -47,16 +47,10 @@ for dir in $@; do
        echo "" >> $grafana_config_file
    fi

-    if [ -e $current_dir/$compose_file ]; then
-        echo "Adding $current_dir/$compose_file to $compose_file"
-        cat $current_dir/$compose_file >> $compose_file
-        echo "" >> $compose_file
-    fi
-
-    if [ -e $current_dir/$env_file ]; then
-        echo "Adding $current_dir/$env_file to .env"
-        cat $current_dir/$env_file >> .env
-        echo "" >> .env
+    if [ -e $current_dir/$fig_config ]; then
+        echo "Adding $current_dir/$fig_config to $fig_file"
+        cat $current_dir/$fig_config >> $fig_file
+        echo "" >> $fig_file
    fi
 done

--- a/devenv/dev-dashboards/feature-templating/testdata-datalinks.json
+++ b/devenv/dev-dashboards/feature-templating/testdata-datalinks.json
@@ -1,510 +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": 1568372030444,
-  "links": [],
-  "panels": [
-    {
-      "content": "## Data link variables overview\n\nThis dashboard presents variables that one can use when creating *data links*. All links redirect to this dashboard and this panel represents the values that were interpolated in the link that was clicked.\n\n\n#### Series variables\n1. **Name:** <span style=\"color: orange;\">$seriesName</span>\n2. **label.datacenter:** <span style=\"color: orange;\">$labelDatacenter</span>\n3. **label.datacenter.region:** <span style=\"color: orange;\">$labelDatacenterRegion</span>\n\n#### Field variables\n1. **Name:** <span style=\"color: orange;\">$fieldName</span>\n\n#### Value variables\n1. **Time:** <span style=\"color: orange;\">$valueTime</span>\n2. **Numeric:** <span style=\"color: orange;\">$valueNumeric</span>\n3. **Text:** <span style=\"color: orange;\">$valueText</span>\n4. **Calc:** <span style=\"color: orange;\">$valueCalc</span>\n\n",
-      "gridPos": {
-        "h": 16,
-        "w": 6,
-        "x": 0,
-        "y": 0
-      },
-      "id": 8,
-      "mode": "markdown",
-      "options": {},
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "",
-      "transparent": true,
-      "type": "text"
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 8,
-        "w": 9,
-        "x": 6,
-        "y": 0
-      },
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": [
-          {
-            "targetBlank": false,
-            "title": "Drill it down",
-            "url": "http://localhost:3000/d/wfTJJL5Wz/datalinks-source?var-seriesName=${__series.name}&var-labelDatacenter=${__series.labels.datacenter}&var-labelDatacenterRegion=${__series.labels[\"datacenter.region\"]}&var-valueTime=${__value.time}&var-valueNumeric=${__value.numeric}&var-valueText=${__value.text}"
-          }
-        ]
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "Foo datacenter",
-          "labels": "datacenter=foo,datacenter.region=us-east-1",
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "alias": "Bar datacenter",
-          "labels": "datacenter=bar,datacenter.region=us-east-2",
-          "refId": "B",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Multiple series",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 8,
-        "w": 9,
-        "x": 15,
-        "y": 0
-      },
-      "id": 9,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": [
-          {
-            "targetBlank": false,
-            "title": "Drill it down",
-            "url": "http://localhost:3000/d/wfTJJL5Wz/datalinks-source?var-seriesName=${__series.name}&var-valueTime=${__value.time}&var-valueNumeric=${__value.numeric}&var-valueText=${__value.text}&var-fieldName=${__field.name}"
-          }
-        ]
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "Foo datacenter",
-          "labels": "datacenter=foo,datacenter.region=us-east-1",
-          "refId": "A",
-          "scenarioId": "random_walk_table",
-          "stringInput": ""
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Multiple fields",
-      "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
-      }
-    },
-    {
-      "cacheTimeout": null,
-      "datasource": "-- Dashboard --",
-      "gridPos": {
-        "h": 8,
-        "w": 9,
-        "x": 6,
-        "y": 8
-      },
-      "id": 6,
-      "links": [],
-      "options": {
-        "displayMode": "lcd",
-        "fieldOptions": {
-          "calcs": ["last"],
-          "defaults": {
-            "links": [
-              {
-                "targetBlank": true,
-                "title": "Drill it down!",
-                "url": "http://localhost:3000/d/wfTJJL5Wz/datalinks-source\n?var-fieldName=${__field.name}\n&var-labelDatacenter=${__series.labels.datacenter}\n&var-labelDatacenterRegion=${__series.labels[\"datacenter.region\"]}\n&var-valueNumeric=${__value.numeric}\n&var-valueText=${__value.text}\n&var-valueCalc=${__value.calc}"
-              }
-            ],
-            "mappings": [
-              {
-                "id": 0,
-                "op": "=",
-                "text": "N/A",
-                "type": 1,
-                "value": "null"
-              }
-            ],
-            "max": 100,
-            "min": 0,
-            "nullValueMode": "connected",
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "title": "${__series.name} - $__calc",
-            "unit": "none"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "horizontal"
-      },
-      "pluginVersion": "6.4.0-pre",
-      "targets": [
-        {
-          "panelId": 2,
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Value reducers 1",
-      "type": "bargauge"
-    },
-    {
-      "datasource": "-- Dashboard --",
-      "gridPos": {
-        "h": 8,
-        "w": 9,
-        "x": 15,
-        "y": 8
-      },
-      "id": 4,
-      "options": {
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "links": [
-              {
-                "title": "Drill it down",
-                "url": "http://localhost:3000/d/wfTJJL5Wz/datalinks-source?var-fieldName=${__field.name}&var-labelDatacenter=${__series.labels.datacenter}&var-labelDatacenterRegion=${__series.labels[\"datacenter.region\"]}&var-valueNumeric=${__value.numeric}&var-valueText=${__value.text}&var-valueCalc=${__value.calc}"
-              }
-            ],
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "title": "${__series.name} - $__calc"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "showThresholdLabels": false,
-        "showThresholdMarkers": true
-      },
-      "pluginVersion": "6.4.0-pre",
-      "targets": [
-        {
-          "panelId": 2,
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Value reducers 2",
-      "type": "gauge"
-    }
-  ],
-  "schemaVersion": 20,
-  "style": "dark",
-  "tags": ["gdev", "templating"],
-  "templating": {
-    "list": [
-      {
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "hide": 2,
-        "label": "Series name",
-        "name": "seriesName",
-        "options": [
-          {
-            "text": "",
-            "value": ""
-          }
-        ],
-        "query": "",
-        "skipUrlSync": false,
-        "type": "textbox"
-      },
-      {
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "hide": 2,
-        "label": null,
-        "name": "labelDatacenter",
-        "options": [
-          {
-            "text": "",
-            "value": ""
-          }
-        ],
-        "query": "",
-        "skipUrlSync": false,
-        "type": "textbox"
-      },
-      {
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "hide": 2,
-        "label": null,
-        "name": "labelDatacenterRegion",
-        "options": [
-          {
-            "text": "",
-            "value": ""
-          }
-        ],
-        "query": "",
-        "skipUrlSync": false,
-        "type": "textbox"
-      },
-      {
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "hide": 2,
-        "label": null,
-        "name": "valueTime",
-        "options": [
-          {
-            "text": "",
-            "value": ""
-          }
-        ],
-        "query": "",
-        "skipUrlSync": false,
-        "type": "textbox"
-      },
-      {
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "hide": 2,
-        "label": null,
-        "name": "valueNumeric",
-        "options": [
-          {
-            "text": "",
-            "value": ""
-          }
-        ],
-        "query": "",
-        "skipUrlSync": false,
-        "type": "textbox"
-      },
-      {
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "hide": 2,
-        "label": null,
-        "name": "valueText",
-        "options": [
-          {
-            "text": "",
-            "value": ""
-          }
-        ],
-        "query": "",
-        "skipUrlSync": false,
-        "type": "textbox"
-      },
-      {
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "hide": 2,
-        "label": null,
-        "name": "valueCalc",
-        "options": [
-          {
-            "text": "",
-            "value": ""
-          }
-        ],
-        "query": "",
-        "skipUrlSync": false,
-        "type": "textbox"
-      },
-      {
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "hide": 2,
-        "label": null,
-        "name": "fieldName",
-        "options": [
-          {
-            "text": "",
-            "value": ""
-          }
-        ],
-        "query": "",
-        "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": "Datalinks - variables",
-  "uid": "wfTJJL5Wz",
-  "version": 1
-}
--- a/devenv/dev-dashboards/feature-templating/testdata-nested-variables-drilldown.json
+++ b/devenv/dev-dashboards/feature-templating/testdata-nested-variables-drilldown.json
@@ -1,307 +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": [
-    {
-      "content": "## Data center = $datacenter\n\n### server = $server\n\n#### pod = $pod",
-      "gridPos": {
-        "h": 6,
-        "w": 15,
-        "x": 0,
-        "y": 0
-      },
-      "id": 4,
-      "mode": "markdown",
-      "options": {},
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "type": "text"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": false,
-      "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
-      "format": "none",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 6,
-        "w": 9,
-        "x": 15,
-        "y": 0
-      },
-      "id": 6,
-      "interval": null,
-      "links": [
-        {
-          "targetBlank": true,
-          "title": "Overview dashboard",
-          "url": "d/-Y-tnEDWk/dashboard-tests-nested-template-variables?orgId=1&${__all_variables}&${__url_time_range}"
-        }
-      ],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": true,
-        "ymax": null,
-        "ymin": null
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "thresholds": "",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel drilldown link test",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "avg"
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 13,
-        "w": 24,
-        "x": 0,
-        "y": 6
-      },
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "$datacenter.$server.$pod",
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Panel Title",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "refresh": false,
-  "schemaVersion": 19,
-  "style": "dark",
-  "tags": ["gdev", "templating"],
-  "templating": {
-    "list": [
-      {
-        "allValue": null,
-        "current": {
-          "text": "A",
-          "value": ["A"]
-        },
-        "datasource": "TestData DB-1",
-        "definition": "*",
-        "hide": 0,
-        "includeAll": true,
-        "label": null,
-        "multi": true,
-        "name": "datacenter",
-        "options": [],
-        "query": "*",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "allValue": null,
-        "current": {
-          "text": "AA",
-          "value": ["AA"]
-        },
-        "datasource": "TestData DB-1",
-        "definition": "$datacenter.*",
-        "hide": 0,
-        "includeAll": true,
-        "label": null,
-        "multi": true,
-        "name": "server",
-        "options": [],
-        "query": "$datacenter.*",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "allValue": null,
-        "current": {
-          "text": "All",
-          "value": ["$__all"]
-        },
-        "datasource": "gdev-testdata",
-        "definition": "$datacenter.$server.*",
-        "hide": 0,
-        "includeAll": true,
-        "label": null,
-        "multi": true,
-        "name": "pod",
-        "options": [],
-        "query": "$datacenter.$server.*",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      }
-    ]
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
-  },
-  "timezone": "",
-  "title": "Templating - Nested Variables Drilldown",
-  "uid": "O6GmNPvWk",
-  "version": 8
-}
--- a/devenv/dev-dashboards/feature-templating/testdata-nested-variables.json
+++ b/devenv/dev-dashboards/feature-templating/testdata-nested-variables.json
@@ -1,412 +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,
-  "id": 13844,
-  "iteration": 1566896059256,
-  "links": [],
-  "panels": [
-    {
-      "content": "## Data center = $datacenter\n\n### server = $server\n\n#### pod = $pod",
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 4,
-      "mode": "markdown",
-      "options": {},
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "type": "text"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": false,
-      "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
-      "datasource": "gdev-testdata",
-      "format": "none",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 4,
-        "x": 12,
-        "y": 0
-      },
-      "id": 6,
-      "interval": null,
-      "links": [
-        {
-          "targetBlank": true,
-          "title": "Drilldown detail dashboard",
-          "url": "d/O6GmNPvWk/dashboard-tests-nested-template-variables-drilldown?orgId=1&${__all_variables}&${__url_time_range}"
-        }
-      ],
-      "mappingType": 1,
-      "mappingTypes": [],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": true,
-        "ymax": null,
-        "ymin": null
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "thresholds": "",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel drilldown link test",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "avg"
-    },
-    {
-      "cacheTimeout": null,
-      "gridPos": {
-        "h": 9,
-        "w": 4,
-        "x": 16,
-        "y": 0
-      },
-      "id": 8,
-      "links": [],
-      "options": {
-        "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": "6.4.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "React gauge datalink",
-      "type": "gauge"
-    },
-    {
-      "cacheTimeout": null,
-      "gridPos": {
-        "h": 9,
-        "w": 4,
-        "x": 20,
-        "y": 0
-      },
-      "id": 9,
-      "links": [],
-      "options": {
-        "displayMode": "basic",
-        "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": "vertical"
-      },
-      "pluginVersion": "6.4.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "React gauge datalink",
-      "type": "bargauge"
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 13,
-        "w": 24,
-        "x": 0,
-        "y": 9
-      },
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "$datacenter.$server.$pod",
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Panel Title",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "refresh": false,
-  "schemaVersion": 19,
-  "style": "dark",
-  "tags": ["gdev", "templating"],
-  "templating": {
-    "list": [
-      {
-        "allValue": null,
-        "current": {
-          "text": "A",
-          "value": ["A"]
-        },
-        "datasource": "gdev-testdata",
-        "definition": "*",
-        "hide": 0,
-        "includeAll": true,
-        "label": null,
-        "multi": true,
-        "name": "datacenter",
-        "options": [],
-        "query": "*",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "allValue": null,
-        "current": {
-          "text": "AA",
-          "value": ["AA"]
-        },
-        "datasource": "gdev-testdata",
-        "definition": "$datacenter.*",
-        "hide": 0,
-        "includeAll": true,
-        "label": null,
-        "multi": true,
-        "name": "server",
-        "options": [],
-        "query": "$datacenter.*",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "allValue": null,
-        "current": {
-          "text": "All",
-          "value": ["$__all"]
-        },
-        "datasource": "gdev-testdata",
-        "definition": "$datacenter.$server.*",
-        "hide": 0,
-        "includeAll": true,
-        "label": null,
-        "multi": true,
-        "name": "pod",
-        "options": [],
-        "query": "$datacenter.$server.*",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      }
-    ]
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
-  },
-  "timezone": "",
-  "title": "Templating - Nested Template Variables",
-  "uid": "-Y-tnEDWk",
-  "version": 2
-}
--- a/devenv/dev-dashboards/panel-common/auto_decimals.json
+++ b/devenv/dev-dashboards/panel-common/auto_decimals.json
--- a/devenv/dev-dashboards/panel-common/shared_queries.json
+++ b/devenv/dev-dashboards/panel-common/shared_queries.json
@@ -1,322 +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": [
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 0,
-      "fillGradient": 6,
-      "gridPos": {
-        "h": 15,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": true,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,90,30,5,0,100"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,90,30,5,-100,200"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "2.5,3.5,4.5,10.5,20.5,21.5,19.5"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Raw Data Graph",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "datasource": "-- Dashboard --",
-      "gridPos": {
-        "h": 5,
-        "w": 12,
-        "x": 12,
-        "y": 0
-      },
-      "id": 4,
-      "options": {
-        "fieldOptions": {
-          "calcs": ["lastNotNull"],
-          "defaults": {
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "showThresholdLabels": false,
-        "showThresholdMarkers": true
-      },
-      "pluginVersion": "6.4.0-pre",
-      "targets": [
-        {
-          "panelId": 2,
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Last non nulll",
-      "type": "gauge"
-    },
-    {
-      "datasource": "-- Dashboard --",
-      "gridPos": {
-        "h": 5,
-        "w": 12,
-        "x": 12,
-        "y": 5
-      },
-      "id": 6,
-      "options": {
-        "fieldOptions": {
-          "calcs": ["min"],
-          "defaults": {
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "showThresholdLabels": false,
-        "showThresholdMarkers": true
-      },
-      "pluginVersion": "6.4.0-pre",
-      "targets": [
-        {
-          "panelId": 2,
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "min",
-      "type": "gauge"
-    },
-    {
-      "datasource": "-- Dashboard --",
-      "gridPos": {
-        "h": 5,
-        "w": 12,
-        "x": 12,
-        "y": 10
-      },
-      "id": 5,
-      "options": {
-        "displayMode": "basic",
-        "fieldOptions": {
-          "calcs": ["max"],
-          "defaults": {
-            "mappings": [],
-            "max": 200,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "blue",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 120
-              }
-            ]
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "vertical"
-      },
-      "pluginVersion": "6.4.0-pre",
-      "targets": [
-        {
-          "panelId": 2,
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Max",
-      "type": "bargauge"
-    },
-    {
-      "columns": [],
-      "datasource": "-- Dashboard --",
-      "fontSize": "100%",
-      "gridPos": {
-        "h": 10,
-        "w": 24,
-        "x": 0,
-        "y": 15
-      },
-      "id": 8,
-      "options": {},
-      "pageSize": null,
-      "showHeader": true,
-      "sort": {
-        "col": 0,
-        "desc": true
-      },
-      "styles": [
-        {
-          "alias": "Time",
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "pattern": "Time",
-          "type": "date"
-        },
-        {
-          "alias": "",
-          "colorMode": null,
-          "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
-          "decimals": 2,
-          "pattern": "/.*/",
-          "thresholds": [],
-          "type": "number",
-          "unit": "short"
-        }
-      ],
-      "targets": [
-        {
-          "panelId": 2,
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "transform": "timeseries_to_columns",
-      "type": "table"
-    }
-  ],
-  "schemaVersion": 19,
-  "style": "dark",
-  "tags": ["gdev", "datasource-test"],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
-  },
-  "timezone": "",
-  "title": "Datasource tests -  Shared Queries",
-  "uid": "ZqZnVvFZz",
-  "version": 10
-}
--- a/devenv/dev-dashboards/panel-gauge/gauge_tests.json
+++ b/devenv/dev-dashboards/panel-gauge/gauge_tests.json
@@ -44,7 +44,7 @@
      "nullPointMode": "null",
      "options-gauge": {
        "baseColor": "#299c46",
-        "decimals": 2,
+        "decimals": "2",
        "maxValue": 100,
        "minValue": 0,
        "options": {
@@ -111,7 +111,7 @@
      "nullPointMode": "null",
      "options-gauge": {
        "baseColor": "#299c46",
-        "decimals": null,
+        "decimals": "",
        "maxValue": 100,
        "minValue": 0,
        "options": {
@@ -178,7 +178,7 @@
      "nullPointMode": "null",
      "options-gauge": {
        "baseColor": "#299c46",
-        "decimals": null,
+        "decimals": "",
        "maxValue": 100,
        "minValue": 0,
        "options": {
--- a/devenv/dev-dashboards/panel-graph/graph_y_axis.json
+++ b/devenv/dev-dashboards/panel-graph/graph_y_axis.json
@@ -1,810 +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": [
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 8,
-        "x": 0,
-        "y": 0
-      },
-      "id": 7,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "0,500,1000,3000,2500,4000,4500,5000,7000,7500,8000,8500,9000,9500,10000"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 0 - 10K (unit short)",
-      "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": "10000",
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 8,
-        "x": 8,
-        "y": 0
-      },
-      "id": 5,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "0,500,1000,3000,2500,4000,4500,5000,7000,7500,8000,8500,9000,9500,10000"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 0 - 10K (unit bytes metric)",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "decbytes",
-          "label": null,
-          "logBase": 1,
-          "max": "10000",
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 8,
-        "x": 16,
-        "y": 0
-      },
-      "id": 4,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "0,500,1000,3000,2500,4000,4500,5000,7000,7500,8000,8500,9000,9500,10000"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 0 - 10K (unit bytes IEC)",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "bytes",
-          "label": null,
-          "logBase": 1,
-          "max": "10000",
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 9,
-        "w": 8,
-        "x": 0,
-        "y": 7
-      },
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "0,500,1000,3000,2500,4000,4500,5000,7000,7500,8000,8500,9000,9500,10000"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 0 - 10K (unit short)",
-      "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": "10000",
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 9,
-        "w": 8,
-        "x": 8,
-        "y": 7
-      },
-      "id": 3,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "0.001,0.0002,0.0003"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 0.0002 - 0.001 (unit short)",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 9,
-        "w": 8,
-        "x": 16,
-        "y": 7
-      },
-      "id": 6,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "12000,15000,20000"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 12000 - 30000 (unit ms)",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "ms",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 9,
-        "w": 8,
-        "x": 0,
-        "y": 16
-      },
-      "id": 9,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "0,10000000000"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 0 - 1B (unit short)",
-      "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": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 9,
-        "w": 8,
-        "x": 8,
-        "y": 16
-      },
-      "id": 10,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "0,10000000000"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 0 - 1B (unit bytes)",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "decbytes",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 16,
-        "y": 16
-      },
-      "id": 8,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "12000,15000,20000"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 12000 - 30000 (unit ms)",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "ms",
-          "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
-      }
-    }
-  ],
-  "refresh": false,
-  "schemaVersion": 19,
-  "style": "dark",
-  "tags": ["gdev", "panel-tests"],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
-  },
-  "timezone": "",
-  "title": "Panel Tests - Graph - Y axis ticks",
-  "uid": "P7vAAhvZk",
-  "version": 1
-}
--- a/devenv/dev-dashboards/panel-singlestat/singlestat_test.json
+++ b/devenv/dev-dashboards/panel-singlestat/singlestat_test.json
@@ -501,237 +501,6 @@
        }
      ],
      "valueName": "current"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorPrefix": false,
-      "colorValue": false,
-      "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
-      "datasource": "gdev-testdata",
-      "decimals": null,
-      "description": "",
-      "format": "none",
-      "gauge": {
-        "maxValue": 150,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 4,
-        "w": 8,
-        "x": 0,
-        "y": 14
-      },
-      "id": 8,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": true,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false
-      },
-      "tableColumn": "Info",
-      "targets": [
-        {
-          "alias": "",
-          "expr": "",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A",
-          "scenarioId": "random_walk_table",
-          "stringInput": ""
-        }
-      ],
-      "thresholds": "81,90",
-      "title": "TableData 'Info' string Column",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [],
-      "valueName": "current"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorPrefix": false,
-      "colorValue": false,
-      "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
-      "datasource": "gdev-testdata",
-      "decimals": 2,
-      "description": "",
-      "format": "celsius",
-      "gauge": {
-        "maxValue": 150,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 4,
-        "w": 8,
-        "x": 8,
-        "y": 14
-      },
-      "id": 9,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": true,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false
-      },
-      "tableColumn": "Min",
-      "targets": [
-        {
-          "alias": "",
-          "expr": "",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A",
-          "scenarioId": "random_walk_table",
-          "stringInput": ""
-        }
-      ],
-      "thresholds": "81,90",
-      "title": "TableData 'Value' as temp Column",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [],
-      "valueName": "current"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorPrefix": false,
-      "colorValue": false,
-      "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
-      "datasource": "gdev-testdata",
-      "decimals": null,
-      "description": "",
-      "format": "dateTimeFromNow",
-      "gauge": {
-        "maxValue": 150,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 4,
-        "w": 8,
-        "x": 16,
-        "y": 14
-      },
-      "id": 10,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": true,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false
-      },
-      "tableColumn": "time",
-      "targets": [
-        {
-          "alias": "",
-          "expr": "",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "stringInput": ""
-        }
-      ],
-      "thresholds": "81,90",
-      "title": "last_time display (a few seconds ago)",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [],
-      "valueName": "last_time"
    }
  ],
  "refresh": false,
--- a/devenv/docker/blocks/mysql/.env
+++ b/devenv/docker/blocks/mysql/.env
@@ -1 +0,0 @@
-mysql_version=5.6
--- a/devenv/docker/blocks/mysql/docker-compose.yaml
+++ b/devenv/docker/blocks/mysql/docker-compose.yaml
@@ -1,5 +1,5 @@
  mysql:
-    image: mysql:${mysql_version}
+    image: mysql:5.6
    environment:
      MYSQL_ROOT_PASSWORD: rootpass
      MYSQL_DATABASE: grafana
--- a/devenv/docker/blocks/nginx_proxy_mac/docker-compose.yaml
+++ b/devenv/docker/blocks/nginx_proxy_mac/docker-compose.yaml
@@ -5,7 +5,7 @@
 # root_url = %(protocol)s://%(domain)s:10080/grafana/

  nginxproxy:
-    build: docker/blocks/nginx_proxy_mac
+    build: docker/blocks/nginx_proxy
    ports:
      - "10080:10080"

--- a/devenv/docker/blocks/openldap/ldap_dev.toml
+++ b/devenv/docker/blocks/openldap/ldap_dev.toml
@@ -28,6 +28,38 @@ search_filter = "(cn=%s)"
 # An array of base dns to search through
 search_base_dns = ["dc=grafana,dc=org"]

+# In POSIX LDAP schemas, without memberOf attribute a secondary query must be made for groups.
+# This is done by enabling group_search_filter below. You must also set member_of= "cn"
+# in [servers.attributes] below.
+
+# Users with nested/recursive group membership and an LDAP server that supports LDAP_MATCHING_RULE_IN_CHAIN
+# can set group_search_filter, group_search_filter_user_attribute, group_search_base_dns and member_of
+# below in such a way that the user's recursive group membership is considered.
+#
+# Nested Groups + Active Directory (AD) Example:
+#
+#   AD groups store the Distinguished Names (DNs) of members, so your filter must
+#   recursively search your groups for the authenticating user's DN. For example:
+#
+#     group_search_filter = "(member:1.2.840.113556.1.4.1941:=%s)"
+#     group_search_filter_user_attribute = "distinguishedName"
+#     group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
+#
+#     [servers.attributes]
+#     ...
+#     member_of = "distinguishedName"
+
+## Group search filter, to retrieve the groups of which the user is a member (only set if memberOf attribute is not available)
+# group_search_filter = "(&(objectClass=posixGroup)(memberUid=%s))"
+## Group search filter user attribute defines what user attribute gets substituted for %s in group_search_filter.
+## Defaults to the value of username in [server.attributes]
+## Valid options are any of your values in [servers.attributes]
+## If you are using nested groups you probably want to set this and member_of in
+## [servers.attributes] to "distinguishedName"
+# group_search_filter_user_attribute = "distinguishedName"
+## An array of the base DNs to search through for groups. Typically uses ou=groups
+# group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
+
 # Specify names of the ldap attributes your ldap uses
 [servers.attributes]
 name = "givenName"
--- a/devenv/docker/blocks/openldap/ldap_posix_dev.toml
+++ b/devenv/docker/blocks/openldap/ldap_posix_dev.toml
@@ -1,57 +0,0 @@
-# To troubleshoot and get more log info enable ldap debug logging in grafana.ini
-# [log]
-# filters = ldap:debug
-
-[[servers]]
-# Ldap server host (specify multiple hosts space separated)
-host = "127.0.0.1"
-# Default port is 389 or 636 if use_ssl = true
-port = 389
-# Set to true if ldap server supports TLS
-use_ssl = false
-# Set to true if connect ldap server with STARTTLS pattern (create connection in insecure, then upgrade to secure connection with TLS)
-start_tls = false
-# set to true if you want to skip ssl cert validation
-ssl_skip_verify = false
-# set to the path to your root CA certificate or leave unset to use system defaults
-# root_ca_cert = "/path/to/certificate.crt"
-
-# Search user bind dn
-bind_dn = "cn=admin,dc=grafana,dc=org"
-# Search user bind password
-# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
-bind_password = 'grafana'
-
-# An array of base dns to search through
-search_base_dns = ["dc=grafana,dc=org"]
-
-search_filter = "(uid=%s)"
-
-group_search_filter = "(&(objectClass=posixGroup)(memberUid=%s))"
-group_search_filter_user_attribute = "uid"
-group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
-
-[servers.attributes]
-name = "givenName"
-surname = "sn"
-username = "cn"
-member_of = "memberOf"
-email =  "email"
-
-# Map ldap groups to grafana org roles
-[[servers.group_mappings]]
-group_dn = "cn=posix-admins,ou=groups,dc=grafana,dc=org"
-org_role = "Admin"
-grafana_admin = true
-
-# The Grafana organization database id, optional, if left out the default org (id 1) will be used
-# org_id = 1
-
-[[servers.group_mappings]]
-group_dn = "cn=editors,ou=groups,dc=grafana,dc=org"
-org_role = "Editor"
-
-[[servers.group_mappings]]
-# If you want to match all (or no ldap groups) then you can use wildcard
-group_dn = "*"
-org_role = "Viewer"
--- a/devenv/docker/blocks/openldap/notes.md
+++ b/devenv/docker/blocks/openldap/notes.md
@@ -12,7 +12,7 @@ After adding ldif files to `prepopulate`:

 ## Enabling LDAP in Grafana

-If you want to use users/groups with `memberOf` support Copy the ldap_dev.toml file in this folder into your `conf` folder (it is gitignored already). To enable it in the .ini file to get Grafana to use this block:
+Copy the ldap_dev.toml file in this folder into your `conf` folder (it is gitignored already). To enable it in the .ini file to get Grafana to use this block:

 ```ini
 [auth.ldap]
@@ -21,8 +21,6 @@ config_file = conf/ldap_dev.toml
 ; allow_sign_up = true
 ```

-Otherwise perform same actions for `ldap_dev_posix.toml` config.
-
 ## Groups & Users

 admins
@@ -40,11 +38,3 @@ editors
  ldap-editors
 no groups
  ldap-viewer
-
-
-## Groups & Users (POSIX)
-
-admins
-  ldap-posix-admin
-no groups
-  ldap-posix
--- a/devenv/docker/blocks/openldap/prepopulate/2_users.ldif
+++ b/devenv/docker/blocks/openldap/prepopulate/2_users.ldif
@@ -78,31 +78,3 @@ objectClass: inetOrgPerson
 objectClass: organizationalPerson
 sn: ldap-torkel
 cn: ldap-torkel
-
-# admin for posix group (without support for memberOf attribute)
-dn: uid=ldap-posix-admin,ou=users,dc=grafana,dc=org
-mail: ldap-posix-admin@grafana.com
-userPassword: grafana
-objectclass: top
-objectclass: posixAccount
-objectclass: inetOrgPerson
-homedirectory: /home/ldap-posix-admin
-sn: ldap-posix-admin
-cn: ldap-posix-admin
-uid: ldap-posix-admin
-uidnumber: 1
-gidnumber: 1
-
-# user for posix group (without support for memberOf attribute)
-dn: uid=ldap-posix,ou=users,dc=grafana,dc=org
-mail: ldap-posix@grafana.com
-userPassword: grafana
-objectclass: top
-objectclass: posixAccount
-objectclass: inetOrgPerson
-homedirectory: /home/ldap-posix
-sn: ldap-posix
-cn: ldap-posix
-uid: ldap-posix
-uidnumber: 2
-gidnumber: 2
--- a/devenv/docker/blocks/openldap/prepopulate/3_groups.ldif
+++ b/devenv/docker/blocks/openldap/prepopulate/3_groups.ldif
@@ -23,21 +23,3 @@ objectClass: groupOfNames
 member: cn=ldap-torkel,ou=users,dc=grafana,dc=org
 member: cn=ldap-daniel,ou=users,dc=grafana,dc=org
 member: cn=ldap-leo,ou=users,dc=grafana,dc=org
-
-# -- POSIX --
-
-# posix admin group (without support for memberOf attribute)
-dn: cn=posix-admins,ou=groups,dc=grafana,dc=org
-cn: admins
-objectClass: top
-objectClass: posixGroup
-gidNumber: 1
-memberUid: ldap-posix-admin
-
-# posix group (without support for memberOf attribute)
-dn: cn=posix,ou=groups,dc=grafana,dc=org
-cn: viewers
-objectClass: top
-objectClass: posixGroup
-gidNumber: 2
-memberUid: ldap-posix
--- a/devenv/docker/blocks/postgres/.env
+++ b/devenv/docker/blocks/postgres/.env
@@ -1 +0,0 @@
-postgres_version=9.3
--- a/devenv/docker/blocks/postgres/docker-compose.yaml
+++ b/devenv/docker/blocks/postgres/docker-compose.yaml
@@ -1,5 +1,5 @@
  postgrestest:
-    image: postgres:${postgres_version}
+    image: postgres:9.3
    environment:
      POSTGRES_USER: grafana
      POSTGRES_PASSWORD: password
--- a/devenv/docker/ha_test/alerts.sh
+++ b/devenv/docker/ha_test/alerts.sh
@@ -101,7 +101,7 @@ provision() {

 	requiresJsonnet

-	find grafana/provisioning/dashboards/alerts -maxdepth 1 -name 'alert*.json' -delete
+	rm -rf grafana/provisioning/dashboards/alerts/alert-*.json
 	jsonnet -m grafana/provisioning/dashboards/alerts grafana/provisioning/alerts.jsonnet --ext-code alerts=$alerts --ext-code condition=$condition
 }

--- a/docs/VERSION
+++ b/docs/VERSION
@@ -0,0 +1 @@
+v5.0
--- a/docs/sources/_index.md
+++ b/docs/sources/_index.md
@@ -60,9 +60,9 @@ aliases = ["/v1.1", "/guides/reference/admin", "/v3.1"]
        <h4>Provisioning</h4>
        <p>A guide to help you automate your Grafana setup & configuration.</p>
    </a>
-    <a href="{{< relref "guides/whats-new-in-v6-3.md" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>What's new in v6.3</h4>
-        <p>Article on all the new cool features and enhancements in v6.3</p>
+    <a href="{{< relref "guides/whats-new-in-v6-2.md" >}}" class="nav-cards__item nav-cards__item--guide">
+        <h4>What's new in v6.2</h4>
+        <p>Article on all the new cool features and enhancements in v6.2</p>
    </a>
    <a href="{{< relref "tutorials/screencasts.md" >}}" class="nav-cards__item nav-cards__item--guide">
        <h4>Screencasts</h4>
--- a/docs/sources/administration/provisioning.md
+++ b/docs/sources/administration/provisioning.md
@@ -45,8 +45,6 @@ datasources:
    password: $PASSWORD
 ```

-If you have a literal `$` in your value and want to avoid interpolation, `$$` can be used.
-
 <hr />

 ## Configuration Management Tools
--- a/docs/sources/alerting/notifications.md
+++ b/docs/sources/alerting/notifications.md
@@ -186,7 +186,7 @@ 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
+Webhook | `webhook` | yes, external only | no

 # Enable images in notifications {#external-image-store}

--- a/docs/sources/auth/auth-proxy.md
+++ b/docs/sources/auth/auth-proxy.md
@@ -27,7 +27,7 @@ header_name = X-WEBAUTH-USER
 header_property = username
 # Set to `true` to enable auto sign up of users who do not exist in Grafana DB. Defaults to `true`.
 auto_sign_up = true
-# If combined with Grafana LDAP integration define sync interval in minutes
+# If combined with Grafana LDAP integration define sync interval
 ldap_sync_ttl = 60
 # Limit where auth proxy requests come from by configuring a list of IP addresses.
 # This can be used to prevent users spoofing the X-WEBAUTH-USER header.
@@ -218,78 +218,3 @@ ProxyPassReverse / http://grafana:3000/
 ### Use grafana.

 With our Grafana and Apache containers running, you can now connect to http://localhost/ and log in using the username/password we created in the htpasswd file.
-
-### Team Sync (Enterprise only)
-
-> Only available in Grafana Enterprise v6.3+
-
-With Team Sync, it's possible to set up synchronization between teams in your authentication provider and Grafana. You can send Grafana values as part of an HTTP header and have Grafana map them to your team structure. This allows you to put users into specific teams automatically.
-
-To support the feature, auth proxy allows optional headers to map additional user attributes. The specific attribute to support team sync  is `Groups`.
-
-```bash
-# Optionally define more headers to sync other user attributes
-headers = "Groups:X-WEBAUTH-GROUPS"
-```
-
-You use the `X-WEBAUTH-GROUPS` header to send the team information for each user. Specifically, the set of Grafana's group IDs that the user belongs to.
-
-First, we need to set up the mapping between your authentication provider and Grafana. Follow [these instructions]({{< relref "auth/team-sync.md#enable-synchronization-for-a-team" >}}) to add groups to a team within Grafana.
-
-Once that's done. You can verify your mappings by querying the API.
-
-```bash
-# First, inspect your teams and obtain the corresponding ID of the team we want to inspect the groups for.
-curl -H "X-WEBAUTH-USER: admin" http://localhost:3000/api/teams/search
-{
-  "totalCount": 2,
-  "teams": [
-    {
-      "id": 1,
-      "orgId": 1,
-      "name": "Core",
-      "email": "core@grafana.com",
-      "avatarUrl": "/avatar/327a5353552d2dc3966e2e646908f540",
-      "memberCount": 1,
-      "permission": 0
-    },
-    {
-      "id": 2,
-      "orgId": 1,
-      "name": "Loki",
-      "email": "loki@grafana.com",
-      "avatarUrl": "/avatar/102f937d5344d33fdb37b65d430f36ef",
-      "memberCount": 0,
-      "permission": 0
-    }
-  ],
-  "page": 1,
-  "perPage": 1000
-}
-
-# Then, query the groups for that particular team. In our case, the Loki team which has an ID of "2".
-curl -H "X-WEBAUTH-USER: admin" http://localhost:3000/api/teams/2/groups
-[
-  {
-    "orgId": 1,
-    "teamId": 2,
-    "groupId": "lokiTeamOnExternalSystem"
-  }
-]
-```
-
-Finally, whenever Grafana receives a request with a header of `X-WEBAUTH-GROUPS: lokiTeamOnExternalSystem`, the user under authentication will be placed into the specified team. Placement in multiple teams is supported by using comma-separated values e.g. `lokiTeamOnExternalSystem,CoreTeamOnExternalSystem`.
-
-```bash
-curl -H "X-WEBAUTH-USER: leonard" -H "X-WEBAUTH-GROUPS: lokiteamOnExternalSystem" http://localhost:3000/dashboards/home
-{
-  "meta": {
-    "isHome": true,
-    "canSave": false,
-    ...
-}
-```
-
-With this, the user `leonard` will be automatically placed into the Loki team as part of Grafana authentication.
-
-[Learn more about Team Sync]({{< relref "auth/team-sync.md" >}})
--- a/docs/sources/auth/enhanced_ldap.md
+++ b/docs/sources/auth/enhanced_ldap.md
@@ -22,13 +22,23 @@ The enhanced LDAP integration adds additional functionality on top of the [exist

 With the enhanced LDAP integration it's possible to setup synchronization between LDAP groups and teams. This enables LDAP users which are members
 of certain LDAP groups to automatically be added/removed as members to certain teams in Grafana. Currently the synchronization will only happen every
-time a user logs in, unless Grafana 6.3 (or later) is used with active background synchronization enabled.
+time a user logs in, but an active background synchronization is currently being developed.

 Grafana keeps track of all synchronized users in teams and you can see which users have been synchronized from LDAP in the team members list, see `LDAP` label in screenshot.
 This mechanism allows Grafana to remove an existing synchronized user from a team when its LDAP group membership changes. This mechanism also enables you to manually add
 a user as member of a team and it will not be removed when the user signs in. This gives you flexibility to combine LDAP group memberships and Grafana team memberships.

-[Learn more about Team Sync]({{< relref "auth/team-sync.md">}})
+<div class="clearfix"></div>
+
+### Enable LDAP group synchronization for a team
+
+{{< docs-imagebox img="/img/docs/enterprise/team_add_external_group.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" >}}
+
+1. Navigate to Configuration / Teams.
+2. Select a team.
+3. Select the External group sync tab and click on the `Add group` button.
+4. Insert LDAP distinguished name (DN) of LDAP group you want to synchronize with the team.
+5. Click on `Add group` button to save.

 <div class="clearfix"></div>

--- a/docs/sources/auth/generic-oauth.md
+++ b/docs/sources/auth/generic-oauth.md
@@ -40,11 +40,9 @@ Set `api_url` to the resource that returns [OpenID UserInfo](https://connect2id.
 Grafana will attempt to determine the user's e-mail address by querying the OAuth provider as described below in the following order until an e-mail address is found:

 1. Check for the presence of an e-mail address via the `email` field encoded in the OAuth `id_token` parameter.
-2. Check for the presence of an e-mail address using the [JMES path](http://jmespath.org/examples.html) specified via the `email_attribute_path` configuration option. The JSON used for the path lookup is the HTTP response obtained from querying the UserInfo endpoint specified via the `api_url` configuration option.
-**Note**: Only available in Grafana v6.4+.
-3. Check for the presence of an e-mail address in the `attributes` map encoded in the OAuth `id_token` parameter. By default Grafana will perform a lookup into the attributes map using the `email:primary` key, however, this is configurable and can be adjusted by using the `email_attribute_name` configuration option.
-4. Query the `/emails` endpoint of the OAuth provider's API (configured with `api_url`) and check for the presence of an e-mail address marked as a primary address.
-5. If no e-mail address is found in steps (1-4), then the e-mail address of the user is set to the empty string.
+2. Check for the presence of an e-mail address in the `attributes` map encoded in the OAuth `id_token` parameter. By default Grafana will perform a lookup into the attributes map using the `email:primary` key, however, this is configurable and can be adjusted by using the `email_attribute_name` configuration option.
+3. Query the `/emails` endpoint of the OAuth provider's API (configured with `api_url`) and check for the presence of an e-mail address marked as a primary address.
+4. If no e-mail address is found in steps (1-3), then the e-mail address of the user is set to the empty string.

 ## Set up OAuth2 with Okta

--- a/docs/sources/auth/github.md
+++ b/docs/sources/auth/github.md
@@ -99,18 +99,3 @@ allow_sign_up = true
 allowed_organizations = github google
 ```

-### Team Sync (Enterprise only)
-
->  Only available in Grafana Enterprise v6.3+
-
-With Team Sync you can map your GitHub org teams to teams in Grafana so that your users will automatically be added to
-the correct teams. 
-
-Your GitHub teams can be referenced in two ways:
-
- `https://github.com/orgs/<org>/teams/<slug>`
- `@<org>/<slug>`
-
-Example: `@grafana/developers`
-
-[Learn more about Team Sync]({{< relref "auth/team-sync.md" >}})
--- a/docs/sources/auth/gitlab.md
+++ b/docs/sources/auth/gitlab.md
@@ -116,14 +116,3 @@ api_url = https://gitlab.com/api/v4
 allowed_groups = example, foo/bar
 ```

-### Team Sync (Enterprise only)
-
-> Only available in Grafana Enterprise v6.4+
-
-With Team Sync you can map your GitLab groups to teams in Grafana so that your users will automatically be added to
-the correct teams. 
-
-Your GitLab groups can be referenced in the same way as `allowed_groups`, like `example` or `foo/bar`.
-
-[Learn more about Team Sync]({{< relref "auth/enhanced_ldap.md" >}})
-
--- a/docs/sources/auth/ldap.md
+++ b/docs/sources/auth/ldap.md
@@ -126,6 +126,8 @@ group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
 group_search_filter_user_attribute = "uid"
 ```

+Also set `member_of = "dn"` in the `[servers.attributes]` section.
+
 ### Group Mappings

 In `[[servers.group_mappings]]` you can map an LDAP group to a Grafana organization and role.  These will be synced every time the user logs in, with LDAP being
--- a/docs/sources/auth/saml.md
+++ b/docs/sources/auth/saml.md
@@ -1,178 +0,0 @@
-+++
-title = "SAML Authentication"
-description = "Grafana SAML Authentication"
-keywords = ["grafana", "saml", "documentation", "saml-auth"]
-aliases = ["/auth/saml/"]
-type = "docs"
-[menu.docs]
-name = "SAML"
-parent = "authentication"
-weight = 5
-+++
-
-# SAML Authentication
-
-> SAML Authentication integration is only available in Grafana Enterprise. Read more about [Grafana Enterprise]({{< relref "enterprise" >}}).
-
-> Only available in Grafana v6.3+
-
-The SAML authentication integration allows your Grafana users to log in by
-using an external SAML Identity Provider (IdP). To enable this, Grafana becomes
-a Service Provider (SP) in the authentication flow, interacting with the IdP to
-exchange user information.
-
-## Supported SAML
-
-The SAML single-sign-on (SSO) standard is varied and flexible. Our implementation contains the subset of features needed to provide a smooth authentication experience into Grafana.
-
-> Should you encounter any problems with our implementation, please don't hesitate to contact us.
-
-At the moment of writing, Grafana supports:
-
-1. From the Service Provider (SP) to the Identity Provider (IdP)
-
-    - `HTTP-POST` binding
-    - `HTTP-Redirect` binding
-
-2. From the Identity Provider (IdP) to the Service Provider (SP)
-
-    - `HTTP-POST` binding
-
-3. In terms of security, we currently support signed and encrypted Assertions. However, signed or encrypted requests are not supported.
-
-4. In terms of initiation, only SP-initiated requests are supported. There's no support for IdP-initiated request.
-
-## Set up SAML Authentication
-
-To use the SAML integration, you need to enable SAML in the [main config file]({{< relref "installation/configuration.md" >}}).
-
-```bash
-[auth.saml]
-# Defaults to false. If true, the feature is enabled
-enabled = true
-
-# Base64-encoded public X.509 certificate. Used to sign requests to the IdP
-certificate =
-
-# Path to the public X.509 certificate. Used to sign requests to the IdP
-certificate_path =
-
-# Base64-encoded private key. Used to decrypt assertions from the IdP
-private_key =
-
-# Path to the private key. Used to decrypt assertions from the IdP
-private_key_path =
-
-# Base64-encoded IdP SAML metadata XML. Used to verify and obtain binding locations from the IdP
-idp_metadata =
-
-# Path to the SAML metadata XML. Used to verify and obtain binding locations from the IdP
-idp_metadata_path =
-
-# URL to fetch SAML IdP metadata. Used to verify and obtain binding locations from the IdP
-idp_metadata_url =
-
-# Duration, since the IdP issued a response and the SP is allowed to process it. Defaults to 90 seconds
-max_issue_delay =
-
-# Duration, for how long the SP's metadata should be valid. Defaults to 48 hours
-metadata_valid_duration =
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's name
-assertion_attribute_name = displayName
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
-assertion_attribute_login = mail
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's email
-assertion_attribute_email = mail
-```
-
-Important to note:
-
- like any other Grafana configuration, use of [environment variables for these options is supported]({{< relref "installation/configuration.md#using-environment-variables" >}})
- only one form of configuration option is required. Using multiple forms, e.g. both `certificate` and `certificate_path` will result in an error
-
-## Grafana Configuration
-
-An example working configuration example looks like:
-
-```bash
-[auth.saml]
-enabled = true
-certificate_path = "/path/to/certificate.cert"
-private_key_path = "/path/to/private_key.pem"
-metadata_path = "/my/metadata.xml"
-max_issue_delay = 90s
-metadata_valid_duration = 48h
-assertion_attribute_name = displayName
-assertion_attribute_login = mail
-assertion_attribute_email = mail
-```
-
-And here is a comprehensive list of the options:
-
-| Setting                                                     | Required | Description                                                                                        | Default       |
-| ----------------------------------------------------------- | -------- | -------------------------------------------------------------------------------------------------- | ------------- |
-| `enabled`                                                   | No       | Whenever SAML authentication is allowed                                                            | `false`       |
-| `certificate` or `certificate_path`                         | Yes      | Base64-encoded string or Path for the SP X.509 certificate                                         |               |
-| `private_key` or `private_key_path`                         | Yes      | Base64-encoded string or Path for the SP private key                                               |               |
-| `idp_metadata` or `idp_metadata_path` or `idp_metadata_url` | Yes      | Base64-encoded string, Path or URL for the IdP SAML metadata XML                                   |               |
-| `max_issue_delay`                                           | No       | Duration, since the IdP issued a response and the SP is allowed to process it                      | `90s`         |
-| `metadata_valid_duration`                                   | No       | Duration, for how long the SP's metadata should be valid                                           | `48h`         |
-| `assertion_attribute_name`                                  | No       | Friendly name or name of the attribute within the SAML assertion to use as the user's name         | `displayName` |
-| `assertion_attribute_login`                                 | No       | Friendly name or name of the attribute within the SAML assertion to use as the user's login handle | `mail`        |
-| `assertion_attribute_email`                                 | No       | Friendly name or name of the attribute within the SAML assertion to use as the user's email        | `mail`        |
-
-### Cert and Private Key
-
-The SAML SSO standard uses asymmetric encryption to exchange information between the SP (Grafana) and the IdP. To perform such encryption, you need a public part and a private part. In this case, the X.509 certificate provides the public part, while the private key provides the private part.
-
-Grafana supports two ways of specifying both the `certificate` and `private_key`. Without a suffix (e.g. `certificate=`), the configuration assumes you've supplied the base64-encoded file contents. However, if specified with the `_path` suffix (e.g. `certificate_path=`) Grafana will treat it as a file path and attempt to read the file from the file system.
-
-### IdP Metadata
-
-Expanding on the above, we'll also need the public part from our IdP for message verification. The SAML IdP metadata XML tells us where and how we should exchange the user information.
-
-Currently, we support three ways of specifying the IdP metadata. Without a suffix `idp_metadata=` Grafana assumes base64-encoded XML file contents, with the `_path` suffix assumes a file path and attempts to read the file from the file system and with the `_url` suffix assumes an URL and attempts to load the metadata from the given location.
-
-### Max Issue Delay
-
-Prevention of SAML response replay attacks and internal clock skews between the SP (Grafana), and the IdP is covered. You can set a maximum amount of time between the IdP issuing a response and the SP (Grafana) processing it.
-
-The configuration options is specified as a duration e.g. `max_issue_delay = 90s` or `max_issue_delay = 1h`
-
-### Metadata valid duration
-
-As an SP, our metadata is likely to expire at some point, e.g. due to a certificate rotation or change of location binding. Grafana allows you to specify for how long the metadata should be valid. Leveraging the standard's `validUntil` field, you can tell consumers until when your metadata is going to be valid. The duration is computed by adding the duration to the current time.
-
-The configuration option is specified as a duration e.g. `metadata_valid_duration = 48h`
-
-## Identity Provider (IdP) registration
-
-For the SAML integration to work correctly, you need to make the IdP aware of the SP.
-
-The integration provides two key endpoints as part of Grafana:
-
- The `/saml/metadata` endpoint. Which contains the SP's metadata. You can either download and upload it manually or make the IdP request it directly from the endpoint. Some providers name it Identifier or Entity ID.
-
- The `/saml/acs` endpoint. Which is intended to receive the ACS (Assertion Customer Service) callback. Some providers name it SSO URL or Reply URL.
-
-## Assertion mapping
-
-During the SAML SSO authentication flow, we receive the ACS (Assertion Customer Service) callback. The callback contains all the relevant information of the user under authentication embedded in the SAML response. Grafana parses the response to create (or update) the user within its internal database.
-
-For Grafana to map the user information, it looks at the individual attributes within the assertion. You can think of these attributes as Key/Value pairs (although, they contain more information than that).
-
-Grafana provides configuration options that let you modify which keys to look at for these values. The data we need to create the user in Grafana is Name, Login handle, and email.
-
-An example is `assertion_attribute_name = "givenName"` where Grafana looks within the assertion for an attribute with a friendly name or name of `givenName`. Both, the friendly name (e.g. `givenName`) or the name (e.g. `urn:oid:2.5.4.42`) can be used interchangeably as the value for the configuration option.
-
-## Troubleshooting
-
-To troubleshoot and get more log info enable saml debug logging in the [main config file]({{< relref "installation/configuration.md" >}}).
-
-```bash
-[log]
-filters = saml.auth:debug
-```
--- a/docs/sources/auth/team-sync.md
+++ b/docs/sources/auth/team-sync.md
@@ -1,47 +0,0 @@
-+++
-title = "Team Sync"
-description = "Grafana Team Sync"
-keywords = ["grafana", "auth", "documentation"]
-aliases = ["/auth/saml/"]
-type = "docs"
-[menu.docs]
-name = "Team Sync"
-parent = "authentication"
-weight = 5
-+++
-
-# Team Sync
-
-> Team Sync is only available in Grafana Enterprise. Read more about [Grafana Enterprise]({{< relref "enterprise" >}}).
-
-{{< docs-imagebox img="/img/docs/enterprise/team_members_ldap.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" >}}
-
-With the Team Sync it's possible to setup synchronization between your auth providers teams and teams in Grafana. This enables LDAP or GitHub OAuth users which are members
-of certain teams/groups to automatically be added/removed as members to certain teams in Grafana. Currently the synchronization will only happen every
-time a user logs in, unless LDAP is used together with active background synchronization that was added in Grafana 6.3.
-
-Grafana keeps track of all synchronized users in teams and you can see which users have been synchronized in the team members list, see `LDAP` label in screenshot.
-This mechanism allows Grafana to remove an existing synchronized user from a team when its LDAP group membership (for example) changes. This mechanism also enables you to manually add
-a user as member of a team and it will not be removed when the user signs in. This gives you flexibility to combine LDAP group memberships and Grafana team memberships.
-
-<div class="clearfix"></div>
-
-### Enable synchronization for a team
-
-{{< docs-imagebox img="/img/docs/enterprise/team_add_external_group.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" >}}
-
-1. Navigate to Configuration / Teams.
-2. Select a team.
-3. Select the External group sync tab and click on the `Add group` button.
-4. Insert the value of the group you want to sync with. This becomes what Grafana denominates as a `GroupID`.
-
-    - Using LDAP as an example, this is the LDAP distinguished name (DN) of LDAP group you want to synchronize with the team.
-    - Using Auth Proxy as an example, this is the value we receive as part of the custom `Groups` header.
-
-5. Click on `Add group` button to save.
-
-### Supported Providers
-
-* [LDAP]({{< relref "auth/enhanced_ldap.md#ldap-group-synchronization-for-teams" >}})
-* [GitHub OAuth]({{< relref "auth/github.md#team-sync-enterprise-only" >}})
-* [Auth Proxy]({{< relref "auth/auth-proxy.md#team-sync-enterprise-only">}})
--- a/docs/sources/enterprise/_index.md
+++ b/docs/sources/enterprise/_index.md
@@ -25,25 +25,10 @@ ___

 With Grafana Enterprise you can set up synchronization between LDAP Groups and Teams. [Learn More]({{< relref "auth/enhanced_ldap.md" >}}).

-### SAML Authentication
-
-Enables your Grafana Enterprise users to authenticate with SAML. [Learn More]({{< relref "auth/saml.md" >}}).
-
-### Team Sync
-
-Team Sync allows you to setup synchronization between teams in Grafana and teams in your auth provider so that your users automatically end up in the right team. [Learn More]({{< relref "auth/team-sync.md" >}}).
-
-Supported auth providers:
-
-* [LDAP]({{< relref "auth/enhanced_ldap.md#ldap-group-synchronization-for-teams" >}})
-* [GitHub OAuth]({{< relref "auth/github.md#team-sync-enterprise-only" >}})
-* [Auth Proxy]({{< relref "auth/auth-proxy.md#team-sync-enterprise-only">}})
-
 ### Datasource Permissions

 Datasource permissions allow you to restrict query access to only specific Teams and Users. [Learn More]({{< relref "permissions/datasource_permissions.md" >}}).

-
 ### Premium Plugins

 With a Grafana Enterprise license you will get access to premium plugins, including:
--- a/docs/sources/features/datasources/_index.md
+++ b/docs/sources/features/datasources/_index.md
@@ -34,7 +34,6 @@ The following datasources are officially supported:
 * [Microsoft SQL Server (MSSQL)]({{< relref "mssql.md" >}})
 * [OpenTSDB]({{< relref "opentsdb.md" >}})
 * [Testdata]({{< relref "testdata.md" >}})
-* [Mixed]({{< relref "mixed.md" >}})

 ## Data source plugins

--- a/docs/sources/features/datasources/azuremonitor.md
+++ b/docs/sources/features/datasources/azuremonitor.md
@@ -123,19 +123,17 @@ Note that the Azure Monitor service does not support multiple values yet. If you

 The Azure Monitor Datasource Plugin provides the following queries you can specify in the `Query` field in the Variable edit view. They allow you to fill a variable's options list.

-| Name                                                                                               | Description                                                                     |
-| -------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- |
-| _Subscriptions()_                                                                                  | Returns a list of subscriptions.                                                |
-| _ResourceGroups()_                                                                                 | Returns a list of resource groups.                                              |
-| _ResourceGroups(12345678-aaaa-bbbb-cccc-123456789aaa)_                                             | Returns a list of resource groups for a specified subscription.                 |
-| _Namespaces(aResourceGroup)_                                                                       | Returns a list of namespaces for the specified resource group.                  |
-| _Namespaces(12345678-aaaa-bbbb-cccc-123456789aaa, aResourceGroup)_                                 | Returns a list of namespaces for the specified resource group and subscription. |
-| _ResourceNames(aResourceGroup, aNamespace)_                                                        | Returns a list of resource names.                                               |
-| _ResourceNames(12345678-aaaa-bbbb-cccc-123456789aaa, aResourceGroup, aNamespace)_                  | Returns a list of resource names for a specified subscription.                  |
-| _MetricNamespace(aResourceGroup, aNamespace, aResourceName)_                                       | Returns a list of metric namespaces.                                            |
-| _MetricNamespace(12345678-aaaa-bbbb-cccc-123456789aaa, aResourceGroup, aNamespace, aResourceName)_ | Returns a list of metric namespaces for a specified subscription.               |
-| _MetricNames(aResourceGroup, aNamespace, aResourceName)_                                           | Returns a list of metric names.                                                 |
-| _MetricNames(12345678-aaaa-bbbb-cccc-123456789aaa, aResourceGroup, aNamespace, aResourceName)_     | Returns a list of metric names for a specified subscription.                    |
+| Name                                                                                         | Description                                                                     |
+| -------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- |
+| _Subscriptions()_                                                                            | Returns a list of subscriptions.                                                |
+| _ResourceGroups()_                                                                           | Returns a list of resource groups.                                              |
+| _ResourceGroups(12345678-aaaa-bbbb-cccc-123456789aaa)_                                       | Returns a list of resource groups for a specified subscription.                 |
+| _Namespaces(aResourceGroup)_                                                                 | Returns a list of namespaces for the specified resource group.                  |
+| _Namespaces(12345678-aaaa-bbbb-cccc-123456789aaa, aResourceGroup)_                           | Returns a list of namespaces for the specified resource group and subscription. |
+| _ResourceNames(aResourceGroup, aNamespace)_                                                  | Returns a list of resource names.                                               |
+| _ResourceNames(12345678-aaaa-bbbb-cccc-123456789aaaaResourceGroup, aNamespace)_              | Returns a list of resource names for a specified subscription.                  |
+| _MetricNames(aResourceGroup, aNamespace, aResourceName)_                                     | Returns a list of metric names.                                                 |
+| _MetricNames(12345678-aaaa-bbbb-cccc-123456789aaaaResourceGroup, aNamespace, aResourceName)_ | Returns a list of metric names for a specified subscription.                    |

 Examples:

--- a/docs/sources/features/datasources/cloudwatch.md
+++ b/docs/sources/features/datasources/cloudwatch.md
@@ -60,7 +60,6 @@ Here is a minimal policy example:
            "Sid": "AllowReadingMetricsFromCloudWatch",
            "Effect": "Allow",
            "Action": [
-                "cloudwatch:DescribeAlarmsForMetric",
                "cloudwatch:ListMetrics",
                "cloudwatch:GetMetricStatistics",
                "cloudwatch:GetMetricData"
--- a/docs/sources/features/datasources/elasticsearch.md
+++ b/docs/sources/features/datasources/elasticsearch.md
@@ -143,15 +143,6 @@ You can use other variables inside the query. Example query definition for a var
 In the above example, we use another variable named `$source` inside the query definition. Whenever you change, via the dropdown, the current value of the ` $source` variable, it will trigger an update of the `$host` variable so it now only contains hostnames filtered by in this case the
 `@source` document property.

-These queries by default return results in term order (which can then be sorted alphabetically or numerically as for any variable).
-To produce a list of terms sorted by doc count (a top-N values list), add an `orderBy` property of "doc_count".
-This automatically selects a descending sort; using "asc" with doc_count (a bottom-N list) can be done by setting `order: "asc"` but [is discouraged](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-terms-aggregation.html#search-aggregations-bucket-terms-aggregation-order) as it "increases the error on document counts".
-To keep terms in the doc count order, set the variable's Sort dropdown to **Disabled**; you might alternatively still want to use e.g. **Alphabetical** to re-sort them.
-
-```
-{"find": "terms", "field": "@hostname", "orderBy": "doc_count"}
-```
-
 ### Using variables in queries

 There are two syntaxes:
--- a/docs/sources/features/datasources/loki.md
+++ b/docs/sources/features/datasources/loki.md
@@ -38,7 +38,10 @@ Just add it as a datasource and you are ready to query your log data in [Explore

 ## Querying Logs

-Querying and displaying log data from Loki is available via [Explore](/features/explore), and with the [logs panel](/features/panels/logs/) in dashboards. Select the Loki data source, and then enter a log query to display your logs.
+Querying and displaying log data from Loki is available via [Explore](/features/explore).
+Select the Loki data source, and then enter a log query to display your logs.
+
+> Viewing Loki data in dashboard panels is not supported yet, but is being worked on.

 ### Log Queries

--- a/docs/sources/features/datasources/mixed.md
+++ b/docs/sources/features/datasources/mixed.md
@@ -1,19 +0,0 @@
-+++
-title = "Using the Mixed Data Source in Grafana"
-keywords = ["grafana", "dashboard", "documentation", "panels", "mixeddata"]
-type = "docs"
-[menu.docs]
-name = "MixedData"
-parent = "datasources"
-weight = 20
-+++
-
-# Mixed Data Source
-
-This Data Source allows you to specify data source on a per query basis.
-
-## Usage
-
-To use the Mixed Data Source, create a new panel or edit an existing panel and navigate to the Queries tab. From the Query popup, select "-- Mixed --". Click "Add Query" and select the desired source.
-
-You cannot change an existing query to use the Mixed Data Source.
--- a/docs/sources/features/datasources/postgres.md
+++ b/docs/sources/features/datasources/postgres.md
@@ -11,8 +11,6 @@ weight = 7

 # Using PostgreSQL in Grafana

-> NOTE: In **9.5.18, 9.4.23, 9.6.14, 10.9, 11.4, 12-beta2** versions of PostgreSQL has a [bug](https://www.postgresql.org/message-id/flat/28827.1561082086%40sss.pgh.pa.us#df2287bd7481153984bef6bab40af0db) which prevents execution of multiple column modifications via `ALTER TABLE` statement. Because Grafana uses it during initial database set up and since PostgreSQL has [fixed](https://github.com/postgres/postgres/commit/f946a409143d01951411382fbc3c91c7eb640094) this issue, Grafana **does not support these versions**
-
 Grafana ships with a built-in PostgreSQL data source plugin that allows you to query and visualize data from a PostgreSQL compatible database.

 ## Adding the data source
--- a/docs/sources/features/datasources/prometheus.md
+++ b/docs/sources/features/datasources/prometheus.md
@@ -51,22 +51,10 @@ Open a graph in edit mode by click the title > Edit (or by pressing `e` key whil
 | _Resolution_       | Controls the step option. Small steps create high-resolution graphs but can be slow over larger time ranges, lowering the resolution can speed things up. `1/2` will try to set step option to generate 1 data point for every other pixel. A value of `1/10` will try to set step option so there is a data point every 10 pixels. |
 | _Metric lookup_    | Search for metric names in this input field.                                                                                                                                                                                                                                                                                        |
 | _Format as_        | Switch between Table, Time series or Heatmap. Table format will only work in the Table panel. Heatmap format is suitable for displaying metrics having histogram type on Heatmap panel. Under the hood, it converts cumulative histogram to regular and sorts series by the bucket bound.                                           |
-| _Instant_          | Perform an "instant" query, to return only the latest value that Prometheus has scraped for the requested time series. Instant queries return results much faster than normal range queries. Use them to look up label sets.                                                                                                        |

 > NOTE: Grafana slightly modifies the request dates for queries to align them with the dynamically calculated step.
 > This ensures consistent display of metrics data but can result in a small gap of data at the right edge of a graph.

-### Instant queries
-
-The Prometheus datasource allows you to run "instant" queries, which queries only the latest value.
-You can visualize the results in a table panel to see all available labels of a timeseries.
-
-Instant query results are made up only of one datapoint per series but can be shown in the graph panel with the help of [series overrides](/features/panels/graph/#series-overrides).
-To show them in the graph as a latest value point, add a series override and select `Points > true`.
-To show a horizontal line across the whole graph, add a series override and select `Transform > constant`.
-
-> Support for constant series overrides is available from Grafana v6.4
-
 ## Templating

 Instead of hard-coding things like server, application and sensor name in your metric queries, you can use variables in their place.
--- a/docs/sources/features/panels/graph.md
+++ b/docs/sources/features/panels/graph.md
@@ -35,6 +35,37 @@ The general tab allows customization of a panel's appearance and menu options.
 ### Repeat
 Repeat a panel for each value of a variable.  Repeating panels are described in more detail [here]({{< relref "../../reference/templating.md#repeating-panels" >}}).

+### Data link
+
+> Only available in Grafana v6.3+.
+
+Data link in graph settings allows adding dynamic links to the visualization. Those links can link to either other dashboard or to an external URL.
+
+{{< docs-imagebox img="/img/docs/data_link.png"  max-width= "800px" >}}
+
+Data link is defined by title, url and a setting whether or not it should be opened in a new window.
+
+**Title** is a human readable label for the link that will be displayed in the UI. The link itself is accessible in the graph's context menu when user **clicks on a single data point**:
+
+{{< docs-imagebox img="/img/docs/data_link_tooltip.png"  max-width= "800px" >}}
+
+**URL** field allows the URL configuration for a given link. Apart from regular query params it also supports built-in variables and dashboard variables that you can choose from
+available suggestions:
+
+{{< docs-imagebox img="/img/docs/data_link_typeahead.png"  max-width= "800px" >}}
+
+
+Available built-in variables are:
+
+1. ``__all_variables`` - will add all current dashboard's variables to the URL
+2. ``__url_time_range`` - will add current dashboard's time range to the URL (i.e. ``?from=now-6h&to=now``)
+3. ``__series_name`` - will add series name as a query param in the URL (i.e. ``?series=B-series``)
+4. ``__value_time`` - will add datapoint's timestamp (Unix ms epoch) to the URL (i.e. ``?time=1560268814105``)
+
+
+#### Template variables in data links
+When linking to another dashboard that uses template variables, you can use ``var-myvar=${myvar}`` syntax (where ``myvar`` is a name of template variable)
+to use current dashboard's variable value.

 ## Metrics

@@ -187,63 +218,3 @@ Time regions allow you to highlight certain time regions of the graph to make it
 The time range tab allows you to override the dashboard time range and specify a panel specific time.
 Either through a relative from now time option or through a timeshift.
 Panel time overrides & timeshift are described in more detail [here]({{< relref "reference/timerange.md#panel-time-overrides-timeshift" >}}).
-
-### Data link
-
-> Only available in Grafana v6.3+.
-
-Data link allows adding dynamic links to the visualization. Those links can link to either other dashboard or to an external URL.
-
-{{< docs-imagebox img="/img/docs/data_link.png"  max-width= "800px" >}}
-
-Data link is defined by title, url and a setting whether or not it should be opened in a new window.
-
-**Title** is a human readable label for the link that will be displayed in the UI. The link itself is accessible in the graph's context menu when user **clicks on a single data point**:
-
-{{< docs-imagebox img="/img/docs/data_link_tooltip.png"  max-width= "800px" >}}
-
-**URL** field allows the URL configuration for a given link. Apart from regular query params it also supports built-in variables and dashboard variables that you can choose from
-available suggestions:
-
-{{< docs-imagebox img="/img/docs/data_link_typeahead.png"  max-width= "800px" >}}
-
-
-#### Built-in variables
-
-> These variables changed in 6.4 so if you have an older version of Grafana please use the version picker to select
-docs for an older version of Grafana.
-
-``__url_time_range`` - current dashboard's time range (i.e. ``?from=now-6h&to=now``)
-``__from`` - current dashboard's time range from value
-``__to`` - current dashboard's time range to value
-
-#### Series variables
-Series specific variables are available under ``__series`` namespace:
-
-``__series.name`` - series name to the URL
-
-``__series.labels.<LABEL>`` - label's value to the URL. If your label contains dots use ``__series.labels["<LABEL>"]`` syntax
-
-#### Field variables
-Field specific variables are available under ``__field`` namespace:
-
-``__field.name`` - field name to the URL
-
-#### Value variables
-Value specific variables are available under ``__value`` namespace:
-
-``__value.time`` - value's timestamp (Unix ms epoch) to the URL (i.e. ``?time=1560268814105``)
-
-``__value.raw`` - raw value
-
-``__value.numeric`` - numeric representation of a value
-
-``__value.text`` - text representation of a value
-
-``__value.calc`` - calculation name if the value is result of calculation
-
-
-#### Template variables
-
-When linking to another dashboard that uses template variables, you can use ``var-myvar=${myvar}`` syntax (where ``myvar`` is a name of template variable)
-to use current dashboard's variable value. If you want to add all of the current dashboard's variables to the URL use  ``__all_variables`` variable.
--- a/docs/sources/features/panels/logs.md
+++ b/docs/sources/features/panels/logs.md
@@ -1,39 +0,0 @@
-+++
-title = "Logs Panel"
-keywords = ["grafana", "dashboard", "documentation", "panels", "logs panel"]
-type = "docs"
-aliases = ["/reference/logs/"]
-[menu.docs]
-name = "Logs"
-parent = "panels"
-weight = 2
-+++
-
-# Logs Panel
-
-<img class="screenshot" src="/assets/img/features/logs-panel.png">
-
-> Logs panel is only available in Grafana v6.4+
-
-The logs panel shows log lines from datasources that support logs, e.g., Elastic, Influx, and Loki.
-Typically you would use this panel next to a graph panel to display the log output of a related process.
-
-## Querying Data
-
-The logs panel will show the result of queries that are specified in the **Queries** tab.
-The results of multiple queries will be merged and sorted by time.
-Note that you can scroll inside the panel in case the datasource returns more lines than can be displayed at any one time.
-
-### Query Options
-
-To limit the number of lines rendered, you can use the queries-wide **Max data points** setting. If it is not set, the datasource will usually enforce a limit.
-
-## Visualization Options
-
-### Columns
-
-1. **Time**: Show/hide the time column. This is the timestamp associated with the log line as reported from the datasource.
-2. **Order**: Set to **Ascending** to show the oldest log lines first.
-
-
-<div class="clearfix"></div>
--- a/docs/sources/guides/whats-new-in-v4-5.md
+++ b/docs/sources/guides/whats-new-in-v4-5.md
@@ -56,7 +56,7 @@ More information [here](https://community.grafana.com/t/using-grafanas-query-ins
 This option is now renamed (and moved to Options sub section above your queries):
 ![image|519x120](upload://ySjHOVpavV6yk9LHQxL9nq2HIsT.png)

-Data source selection & options & help are now above your metric queries.
+Datas source selection & options & help are now above your metric queries.
 ![image|690x179](upload://5kNDxKgMz1BycOKgG3iWYLsEVXv.png)

 ### Minor Changes
--- a/docs/sources/guides/whats-new-in-v6-3.md
+++ b/docs/sources/guides/whats-new-in-v6-3.md
@@ -1,146 +0,0 @@
-+++
-title = "What's New in Grafana v6.3"
-description = "Feature & improvement highlights for Grafana v6.3"
-keywords = ["grafana", "new", "documentation", "6.3"]
-type = "docs"
-[menu.docs]
-name = "Version 6.3"
-identifier = "v6.3"
-parent = "whatsnew"
-weight = -14
-+++
-
-# What's New in Grafana v6.3
-
-For all details please read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md)
-
-## Highlights
-
- New Explore features
-  - [Loki Live Streaming]({{< relref "#loki-live-streaming" >}})
-  - [Loki Context Queries]({{< relref "#loki-context-queries" >}})
-  - [Elasticsearch Logs Support]({{< relref "#elasticsearch-logs-support" >}})
-  - [InfluxDB Logs Support]({{< relref "#influxdb-logs-support" >}})
- [Data links]({{< relref "#data-links" >}})
- [New Time Picker]({{< relref "#new-time-picker" >}})
- [Graph Area Gradients]({{< relref "#graph-gradients" >}}) - A new graph display option!
- Grafana Enterprise
-  - [LDAP Active Sync]({{< relref "#ldap-active-sync" >}}) - LDAP Active Sync
-  - [SAML Authentication]({{< relref "#saml-authentication" >}}) - SAML Authentication
-
-## Explore improvements
-
-This release adds a ton of enhancements to Explore. Both in terms of new general enhancements but also in
-new data source specific features.
-
-### Loki live streaming
-
-For log queries using the Loki data source you can now stream logs live directly to the Explore UI.
-
-### Loki context queries
-
-After finding a log line through the heavy use of query filters it can then be useful to
-see the log lines surrounding the line your searched for. The `show context` feature
-allows you to view lines before and after the line of interest.
-
-### Elasticsearch logs support
-
-This release adds support for searching & visualizing logs stored in Elasticsearch in the Explore mode. With a special
-simplified query interface specifically designed for logs search.
-
-{{< docs-imagebox img="/img/docs/v63/elasticsearch_explore_logs.png" max-width="600px" caption="New Time Picker" >}}
-
-Please read [Using Elasticsearch in Grafana](/features/datasources/elasticsearch/#querying-logs-beta) for more detailed information on how to get started and use it.
-
-### InfluxDB logs support
-
-This release adds support for searching & visualizing logs stored in InfluxDB in the Explore mode. With a special
-simplified query interface specifically designed for logs search.
-
-{{< docs-imagebox img="/img/docs/v63/influxdb_explore_logs.png" max-width="600px" caption="New Time Picker" >}}
-
-Please read [Using InfluxDB in Grafana](/features/datasources/influxdb/#querying-logs-beta) for more detailed information on how to get started and use it.
-
-## Data Links
-
-We have simplified the UI for defining panel drilldown links (and renamed them to Panel links). We have also added a
-new type of link named `Data link`. The reason to have two different types is to make it clear how they are used
-and what variables you can use in the link. Panel links are only shown in the top left corner of
-the panel and you cannot reference series name or any data field.
-
-While `Data links` are used by the actual visualization and can reference data fields.
-
-Example:
-```url
-http://my-grafana.com/d/bPCI6VSZz/other-dashboard?var-server=${__series_name}
-```
-
-You have access to these variables:
-
-Name | Description
------------ | -------------
-*${__series_name}* | The name of the time series (or table)
-*${__value_time}* | The time of the point your clicking on (in millisecond epoch)
-*${__url_time_range}* | Interpolates as the full time range (i.e. from=21312323412&to=21312312312)
-*${__all_variables}* | Adds all current variables (and current values) to the url
-
-You can then click on point in the Graph.
-
-{{< docs-imagebox img="/img/docs/v63/graph_datalink.png" max-width="400px" caption="New Time Picker" >}}
-
-For now only the Graph panel supports `Data links` but we hope to add these to many visualizations.
-
-## New Time Picker
-
-The time picker has been re-designed and with a more basic design that makes accessing quick ranges more easy.
-
-{{< docs-imagebox img="/img/docs/v63/time_picker.png" max-width="400px" caption="New Time Picker" >}}
-
-## Graph Gradients
-
-Want more eye candy in your graphs? Then the fill gradient option might be for you! Works really well for
-graphs with only a single series.
-
-{{< docs-imagebox img="/img/docs/v63/graph_gradient_area.jpeg" max-width="800px" caption="Graph Gradient Area" >}}
-
-Looks really nice in light theme as well.
-
-{{< docs-imagebox img="/img/docs/v63/graph_gradients_white.png" max-width="800px" caption="Graph Gradient Area" >}}
-
-## Grafana Enterprise
-
-Substantial refactoring and improvements to the external auth systems has gone in to this release making the  features
-listed below possible as well as laying a foundation for future enhancements.
-
-### LDAP Active Sync
-
-This is a new Enterprise feature that enables background syncing of user information, org role and teams memberships.
-This syncing is otherwise only done at login time. With this feature you can schedule how often this user synchronization should
-occur.
-
-For example, lets say a user is removed from an LDAP group. In previous versions of Grafana an admin would have to
-wait for the user to logout or the session to expire for the Grafana permissions to update, a process that can take days.
-
-With active sync the user would be automatically removed from the corresponding team in Grafana or even logged out and disabled if no longer
-belonging to an LDAP group that gives them access to Grafana.
-
-[Read more](/auth/enhanced_ldap/#active-ldap-synchronization)
-
-### SAML Authentication
-
-Built-in support for SAML is now available in Grafana Enterprise.
-
-[See docs]({{< relref "auth/saml.md" >}})
-
-### Team Sync for GitHub OAuth
-
-When setting up OAuth with GitHub it's now possible to sync GitHub teams with Teams in Grafana.
-
-[See docs]({{< relref "auth/github.md" >}})
-
-### Team Sync for Auth Proxy
-
-We've added support for enriching the Auth Proxy headers with Teams information, which makes it possible
-to use Team Sync with Auth Proxy.
-
-[See docs](/auth/auth-proxy/#auth-proxy-authentication)
--- a/docs/sources/guides/whats-new-in-v6-4.md
+++ b/docs/sources/guides/whats-new-in-v6-4.md
@@ -1,39 +0,0 @@
-+++
-title = "What's New in Grafana v6.4"
-description = "Feature & improvement highlights for Grafana v6.4"
-keywords = ["grafana", "new", "documentation", "6.4"]
-type = "docs"
-[menu.docs]
-name = "Version 6.4"
-identifier = "v6.4"
-parent = "whatsnew"
-weight = -15
-+++
-
-# What's New in Grafana v6.4
-
-For all details please read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md)
-
-## Highlights
-
-Grafana 6.4 comes with a lot of new features and enhancements backed with tons of work around the data models and query
-execution that is going to enable powerful future capabilities. Some of those new capabilities can already be seen in
-this release, like sharing query results between panels.
-
- [**Explore:** Go back to dashboard (with query changes)]({{< relref "#go-back-to-dashboard-from-explore" >}})
- [**Explore:** Live tailing improvements]({{< relref "#live-tailing-improvements" >}})
- [**Loki:** Show logs as annotations in dashboard graphs]({{< relref "#loki-annotations" >}})
- [**Loki:** Use Loki in dashboard panels]({{< relref "#loki-in-dashbaords" >}})
- [**Panels:** New logs panel]({{< relref "#new-logs-panel" >}})
- [**Panels:** Data links improvements]({{< relref "#data-links-improvements" >}})
- [**Dashboard:** Share query results between panels]({{< relref "#share-query-results" >}})
- [**Plugins:** Alpha version of grafana-toolkit]({{< relref "#alpha-version-of-grafana-toolkit" >}})
- [**ImageRendering:** PhantomJS deprecation]({{< relref "#phantomjs-deprecation" >}})
- [**Docker:** Alpine based docker image]({{< relref "#alpine-based-docker-image" >}})
- [**LDAP Debug View**: Reporting]({{< relref "#ldap-debug-view" >}})
- [**Enterprise**: Reporting]({{< relref "#reporting" >}})
- [**Enterprise**: GitLab OAuth Team Sync support]({{< relref "#gitlab-oauth-team-sync-support" >}})
- [**Enterprise**: Teams & LDAP Improvements]({{< relref "#ldap-teams" >}})
-
-
-More details on the above coming soon!
--- a/docs/sources/http_api/_index.md
+++ b/docs/sources/http_api/_index.md
@@ -2,7 +2,6 @@
 title = "HTTP API"
 description = "Grafana HTTP API"
 keywords = ["grafana", "http", "documentation", "api", "overview"]
-aliases = ["/http_api/overview"]
 type = "docs"
 [menu.docs]
 name = "HTTP API"
--- a/docs/sources/http_api/admin.md
+++ b/docs/sources/http_api/admin.md
@@ -466,7 +466,7 @@ Content-Type: application/json

 Reloads the provisioning config files for specified type and provision entities again. It won't return
 until the new provisioned entities are already stored in the database. In case of dashboards, it will stop
-polling for changes in dashboard files and then restart it with new configs after returning.
+polling for changes in dashboard files and then restart it with new configs after returning. 

 Only works with Basic Authentication (username and password). See [introduction](http://docs.grafana.org/http_api/admin/#admin-api) for an explanation.

@@ -488,30 +488,3 @@ Content-Type: application/json
  "message": "Dashboards config reloaded"
 }
 ```
-
-## Reload LDAP configuration
-
-`POST /api/admin/ldap/reload`
-
-Reloads the LDAP configuration.
-
-Only works with Basic Authentication (username and password). See [introduction](http://docs.grafana.org/http_api/admin/#admin-api) for an explanation.
-
-**Example Request**:
-
-```http
-POST /api/admin/ldap/reload HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-```
-
-**Example Response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-{
-  "message": "LDAP config reloaded"
-}
-```
--- a/docs/sources/http_api/alerting_notification_channels.md
+++ b/docs/sources/http_api/alerting_notification_channels.md
@@ -63,48 +63,6 @@ Content-Type: application/json

 **Example Response**:

-**Example Response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-```
-
-## Get notification channel by uid
-
-`GET /api/alert-notifications/uid/:uid`
-
-Will return the notification channel given the notification channel uid.
-
-**Example Request**:
-
-```http
-GET /api/alert-notifications/uid/team-a-email-notifier HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-```
-
-**Example Response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-```
-
-## Get notification channel by id
-
-`GET /api/alert-notifications/:id`
-
-Will return the notification channel given the notification channel id.
-
-**Example Request**:
-
-```http
-GET /api/alert-notifications/1 HTTP/1.1
-Accept: application/json
 ```http
 HTTP/1.1 200
 Content-Type: application/json
--- a/docs/sources/http_api/annotations.md
+++ b/docs/sources/http_api/annotations.md
@@ -27,6 +27,7 @@ Content-Type: application/json
 Authorization: Basic YWRtaW46YWRtaW4=
 ```

+
 Query Parameters:

 - `from`: epoch datetime in milliseconds. Optional.
@@ -55,9 +56,9 @@ Content-Type: application/json

 **Example Request**:

-`POST /api/annotations`
 ```http
 POST /api/annotations HTTP/1.1
+Accept: application/json
 Content-Type: application/json

 ```
@@ -77,6 +78,7 @@ Content-Type: application/json

 `POST /api/annotations/graphite`

+**Example Request**:

 ```http
 POST /api/annotations/graphite HTTP/1.1
@@ -87,13 +89,9 @@ Content-Type: application/json

 **Example Response**:

-```http
-POST /api/annotations/graphite HTTP/1.1
 ```http
 HTTP/1.1 200
-
-```
-
+Content-Type: application/json

 ```

@@ -108,6 +106,7 @@ Content-Type: application/json
 ```http
 PUT /api/annotations/1141 HTTP/1.1
 Accept: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
 Content-Type: application/json

 ```
@@ -123,13 +122,10 @@ Content-Type: application/json
 ## Patch Annotation
 > This is available in Grafana 6.0.0-beta2 and above.

+`PATCH /api/annotations/:id`

 Updates one or more properties of an annotation that matches the specified id.

-## Patch Annotation
-> This is available in Grafana 6.0.0-beta2 and above.
-
-`PATCH /api/annotations/:id`
 This operation currently supports updating of the `text`, `tags`, `time` and `timeEnd` properties. It does not handle updating of the `isRegion` and `regionId` properties. To make an annotation regional or vice versa, consider using the [Update Annotation](#update-annotation) operation.

 **Example Request**:
@@ -180,6 +176,7 @@ Content-Type: application/json
 Deletes the annotation that matches the specified region id. A region is an annotation that covers a timerange and has a start and end time. In the Grafana database, this is a stored as two annotations connected by a region id.

 **Example Request**:
+
 ```http
 DELETE /api/annotations/region/1 HTTP/1.1
 Accept: application/json
@@ -204,7 +201,7 @@ Content-Type: application/json

 Updates one or more properties of an annotation that matches the specified id.

-This operation currently supports updating of the `text`, `tags`, `time` and `timeEnd` properties.
+This operation currently supports updating of the `text`, `tags`, `time` and `timeEnd` properties. It does not handle updating of the `isRegion` and `regionId` properties. To make an annotation regional or vice versa, consider using the [Update Annotation](#update-annotation) operation.

 **Example Request**:

@@ -256,3 +253,29 @@ Content-Type: application/json
    "message":"Annotation deleted"
 }
 ```
+
+## Delete Annotation By RegionId
+
+`DELETE /api/annotations/region/:id`
+
+Deletes the annotation that matches the specified region id. A region is an annotation that covers a timerange and has a start and end time. In the Grafana database, this is a stored as two annotations connected by a region id.
+
+**Example Request**:
+
+```http
+DELETE /api/annotations/region/1 HTTP/1.1
+Accept: application/json
+Content-Type: application/json
+Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+```
+
+**Example Response**:
+
+```http
+HTTP/1.1 200
+Content-Type: application/json
+
+{
+    "message":"Annotation region deleted"
+}
+```
--- a/docs/sources/http_api/org.md
+++ b/docs/sources/http_api/org.md
@@ -47,9 +47,6 @@ Content-Type: application/json

 ```http
 GET /api/org/users HTTP/1.1
-
-```http
-GET /api/org/users HTTP/1.1
 Accept: application/json
 Content-Type: application/json
 Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
@@ -67,47 +64,11 @@ Content-Type: application/json

 `PATCH /api/org/users/:userId`

-Returns all org users within the current organization, but with less detailed information.
-Accessible to users with org admin role, admin in any folder or admin of any team.
-Mainly used by Grafana UI for providing list of users when adding team members and
-when editing folder/dashboard permissions.
-
-**Example Request**:
-
-```http
-GET /api/org/users/lookup HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-```
-
-**Example Response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
-
-```
-
-### Updates the given user
-
-`PATCH /api/org/users/:userId`
-
-**Example Request**:
-
-```http
-PATCH /api/org/users/1 HTTP/1.1
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-
-```
-
-**Example Response**:
-
-```http
-HTTP/1.1 200
-Content-Type: application/json
+**Example Request**:
+
+```http
+PATCH /api/org/users/1 HTTP/1.1
+Accept: application/json
 Content-Type: application/json
 Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk

--- a/docs/sources/installation/_index.md
+++ b/docs/sources/installation/_index.md
@@ -12,7 +12,6 @@ weight = 1

 ## Installing Grafana

- [Requirements](requirements)
 - [Installing on Debian / Ubuntu](debian)
 - [Installing on RPM-based Linux (CentOS, Fedora, OpenSuse, RedHat)](rpm)
 - [Installing on Mac OS X](mac)
--- a/docs/sources/installation/behind_proxy.md
+++ b/docs/sources/installation/behind_proxy.md
@@ -35,8 +35,6 @@ domain = foo.bar

 ### Nginx configuration

-Nginx is a high performance load balancer, web server and reverse proxy: https://www.nginx.com/
-
 ```bash
 server {
  listen 80;
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -127,7 +127,7 @@ Another way is put a webserver like Nginx or Apache in front of Grafana and have

 ### protocol

-`http`,`https`,`h2` or `socket`
+`http`,`https` or `socket`

 > **Note** Grafana versions earlier than 3.0 are vulnerable to [POODLE](https://en.wikipedia.org/wiki/POODLE). So we strongly recommend to upgrade to 3.x or use a reverse proxy for ssl termination.

@@ -179,11 +179,11 @@ reasons.

 ### cert_file

-Path to the certificate file (if `protocol` is set to `https` or `h2`).
+Path to the certificate file (if `protocol` is set to `https`).

 ### cert_key

-Path to the certificate key file (if `protocol` is set to `https` or `h2`).
+Path to the certificate key file (if `protocol` is set to `https`).

 ### router_logging

@@ -281,24 +281,9 @@ Either `redis`, `memcached` or `database` default is `database`

 ### connstr

-The remote cache connection string. The format depends on the `type` of the remote cache.
-
-#### Database
-
-Leave empty when using `database` since it will use the primary database.
-
-#### Redis
-
-Example connstr: `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`
-
- `addr` is the host `:` port of the redis server.
- `pool_size` (optional) is the number of underlying connections that can be made to redis.
- `db` (optional) is the number indentifer of the redis database you want to use.
- `ssl` (optional) is if SSL should be used to connect to redis server. The value may be `true`, `false`, or `insecure`. Setting the value to `insecure` skips verification of the certificate chain and hostname when making the connection.
-
-#### Memcache
-
-Example connstr: `127.0.0.1:11211`
+The remote cache connection string. Leave empty when using `database` since it will use the primary database.
+Redis example config: `addr=127.0.0.1:6379,pool_size=100,db=grafana`
+Memcache example: `127.0.0.1:11211`

 <hr />

@@ -548,9 +533,6 @@ If set configures the username to use for basic authentication on the metrics en
 ### basic_auth_password
 If set configures the password to use for basic authentication on the metrics endpoint.

-### disable_total_stats
-If set to `true`, then total stats generation (`stat_totals_*` metrics) is disabled. The default is `false`.
-
 ### interval_seconds

 Flush/Write interval when sending metrics to external TSDB. Defaults to 10s.
@@ -702,11 +684,6 @@ is false. This settings was introduced in Grafana v6.0.

 Set to true if you want to test alpha plugins that are not yet ready for general usage.

-## [feature_toggles]
-### enable
-
-Keys of alpha features to enable, separated by space. Available alpha features are: `transformations`
-
 <hr />

 # Removed options
--- a/docs/sources/installation/debian.md
+++ b/docs/sources/installation/debian.md
@@ -13,13 +13,17 @@ weight = 1

 # Installing on Debian / Ubuntu

+Description | Download
+------------ | -------------
+Stable for Debian-based Linux | [x86-64](https://grafana.com/grafana/download?platform=linux)
+Stable for Debian-based Linux | [ARM64](https://grafana.com/grafana/download?platform=arm)
+Stable for Debian-based Linux | [ARMv7](https://grafana.com/grafana/download?platform=arm)
+
 Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing
 installation.

-## Download
+## Install Stable

-Go to the [download page](https://grafana.com/grafana/download?platform=linux) for the latest download
-links.

 ```bash
 wget <debian package url>
@@ -27,7 +31,13 @@ sudo apt-get install -y adduser libfontconfig1
 sudo dpkg -i grafana_<version>_amd64.deb
 ```

-You will find package urls on the [download page](https://grafana.com/grafana/download?platform=linux).
+Example:
+
+```bash
+wget https://dl.grafana.com/oss/release/grafana_5.4.2_amd64.deb
+sudo apt-get install -y adduser libfontconfig1
+sudo dpkg -i grafana_5.4.2_amd64.deb
+```

 ## APT Repository

@@ -51,7 +61,7 @@ sudo add-apt-repository "deb https://packages.grafana.com/oss/deb beta main"
 Use the above line even if you are on Ubuntu or another Debian version. Then add our gpg key. This allows you to install signed packages.

 ```bash
-wget -q -O - https://packages.grafana.com/gpg.key | sudo apt-key add -
+sudo wget -q -O - https://packages.grafana.com/gpg.key | apt-key add -
 ```

 Update your Apt repositories and install Grafana
--- a/docs/sources/installation/requirements.md
+++ b/docs/sources/installation/requirements.md
@@ -1,75 +0,0 @@
-+++
-title = "Requirements"
-description = "Requirements for Grafana"
-keywords = ["grafana", "installation", "documentation"]
-type = "docs"
-[menu.docs]
-name = "Requirements"
-identifier = "requirements"
-parent = "installation"
-weight = -1
-+++
-
-# Requirements
-
-This page includes useful information on the supported Operating Systems as well as the hardware requirements that are needed to install and use Grafana.
-
-## Operating Systems
-
-### Supported
-
- [Debian / Ubuntu](/installation/debian)
- [RPM-based Linux (CentOS, Fedora, OpenSuse, RedHat)](/installation/rpm)
- [Mac OS X](/installation/mac)
- [Windows](/installation/windows)
-
-### Unsupported
-
-Installation of Grafana on other operating systems is possible, but not supported. Please see the [building from source](/project/building_from_source/#building-grafana-from-source) guide for more information.
-
-## Hardware requirements
-
-Grafana does not use a lot of resources and is very lightweight in use of memory and CPU. Minimum recommendation is 255mb of memory and 1 CPU.
-
-Depending on what features are being used and to what extent the requirements varies. Features that consume and requires more resources:
-
- Server side rendering of images
- [Alerting](/alerting/rules/)
- Data source proxy
-
-## Database
-
-Grafana requires a database to store its configuration data, e.g. users, data sources and dashboards. The exact requirements depend on the size of the Grafana installation (e.g. the number of users, data sources, dashboards, features in use etc).
-
-Grafana supports the following databases:
-
- SQLite
- MySQL
- PostgreSQL
-
-Per default Grafana ships with and uses SQLite which is an embedded database stored on disk in Grafana's installation location.
-
-## Supported web browsers
-
-Grafana is supported in the following browsers:
-
- Chrome/Chromium
- Firefox
- Safari
- Microsoft Edge
-
-> Note 1: Older versions of above browsers may not be supported
-
-> Note 2: Internet Explorer 11 is only fully supported in Grafana versions prior v6.0.
-
-> Note 3: Running Grafana without JavaScript enabled in the browser is not supported
-
-### Known issues
-
-#### Problem with logging in using Safari 12
-
-There is a known [iOS Safari 12 issue](https://bugs.webkit.org/show_bug.cgi?id=188165) that prevents the Grafana session cookie from being written after a successful login.
-A quick workaround for this problem would be to configure [cookie_samesite](/installation/configuration/#cookie-samesite) to `none`. However, there is another known [Safari 12 issue](https://bugs.webkit.org/show_bug.cgi?id=198181) that threats `SameSite=none` as `strict` which also
-prevents the Grafana session cookie from being written after a successful login.
-
-To resolve using `none` as `SameSite` cookie attribute in combination with Safari 12, please upgrade to at least Grafana v6.3.3 which includes a fix.
--- a/docs/sources/installation/rpm.md
+++ b/docs/sources/installation/rpm.md
@@ -13,14 +13,15 @@ weight = 2

 # Installing on RPM-based Linux (CentOS, Fedora, OpenSuse, RedHat)

-Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing
-installation.
+Description | Download
+------------ | -------------
+Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [x86-64](https://grafana.com/grafana/download?platform=linux)
+Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [ARM64](https://grafana.com/grafana/download?platform=arm)
+Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [ARMv7](https://grafana.com/grafana/download?platform=arm)

-## Download
-
-Go to the [download page](https://grafana.com/grafana/download?platform=linux) for the latest download
-links.
+Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing installation.

+## Install Stable

 You can install Grafana using Yum directly.

@@ -28,7 +29,11 @@ You can install Grafana using Yum directly.
 $ sudo yum install <rpm package url>
 ```

-You will find package urls on the [download page](https://grafana.com/grafana/download?platform=linux).
+Example:
+
+```bash
+$ sudo yum install https://dl.grafana.com/oss/release/grafana-5.4.2-1.x86_64.rpm
+```

 Or install manually using `rpm`. First execute

@@ -36,6 +41,12 @@ Or install manually using `rpm`. First execute
 $ wget <rpm package url>
 ```

+Example:
+
+```bash
+$ wget https://dl.grafana.com/oss/release/grafana-5.4.2-1.x86_64.rpm
+```
+
 ### On CentOS / Fedora / Redhat:

 ```bash
--- a/docs/sources/installation/security.md
+++ b/docs/sources/installation/security.md
@@ -1,40 +0,0 @@
-+++
-title = "Security"
-description = "Security Docs"
-keywords = ["grafana", "security", "documentation"]
-type = "docs"
-[menu.docs]
-name = "Security"
-identifier = "security"
-parent = "admin"
-weight = 2
-+++
-
-# Security
-
-## Data source proxy and protecting internal services
-
-If you have non-Grafana web services running on your Grafana server or within its local network, these may be vulnerable to exploitation via the Grafana data source proxy.
-
-To prevent this type of exploitation from happening we explain a couple of different solutions  below.
-
-### Configure Grafana to only allow certain IP addresses/hostnames to be used as datasource url
-
-You can configure Grafana to only allow certain IP addresses/hostnames to be used as data source url and by that proxied through the Grafana data source proxy. See [data_source_proxy_whitelist](/installation/configuration/#data-source-proxy-whitelist) for usage instructions.
-
-### Firewall rules
-
-You should be able to configure a firewall, for example using iptables, to restrict Grafana from making network requests to certain internal web services.
-
-### Proxy server
-
-You should be able to require all network requests being made by Grafana to go through a proxy server.
-
-## Viewer query permissions
-
-Important to understand that users with Viewer role can still issue any possible query to all data sources available in the **organization**. Not just the queries that are defined on the dashboards the user with Viewer role has permissions to view.
-
-There are a couple of ways you can restrict data source query access:
-
- Create multiple data sources with some restrictions added in data source config that restrict access (like database name or credentials). Then use the [Data Source Permissions]({{< relref "permissions/datasource_permissions.md" >}}) Enterprise feature to restrict user access to the data source in Grafana.
- Create a separate Grafana organization and in that organization create a separate data source. Make sure the data source has some option/user/credentials setting that limits access to a subset of the data. Not all data sources have an option to limit access.
--- a/docs/sources/installation/upgrading.md
+++ b/docs/sources/installation/upgrading.md
@@ -17,17 +17,6 @@ In order make this a reality Grafana upgrades are backward compatible and the up

 Upgrading is generally always safe (between many minor and one major version) and dashboards and graphs will look the same. There can be minor breaking changes in some edge cases which are usually outlined in the [Release Notes](https://community.grafana.com/c/releases) and [Changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md)

-## Update plugins
-
-After you have upgraded it is highly recommended that you update all your plugins as a new version of Grafana
-can make older plugins stop working properly.
-
-You can update all plugins using
-
-```bash
-grafana-cli plugins update-all
-```
-
 ## Database Backup

 Before upgrading it can be a good idea to backup your Grafana database. This will ensure that you can always rollback to your previous version. During startup, Grafana will automatically migrate the database schema (if there are changes or new tables). Sometimes this can cause issues if you later want to downgrade.
@@ -134,7 +123,6 @@ If you're using systemd and have a large amount of annotations consider temporar
 If you have text panels with script tags they will no longer work due to a new setting that per default disallow unsanitized HTML.
 Read more [here](/installation/configuration/#disable-sanitize-html) about this new setting.

-
 ### Authentication and security

 If your using Grafana's builtin, LDAP (without Auth Proxy) or OAuth authentication all users will be required to login upon the next visit after the upgrade.
@@ -161,6 +149,7 @@ login_maximum_lifetime_days = 1

 The default cookie name for storing the auth token is `grafana_session`. you can configure this with `login_cookie_name` in `[auth]` settings.

+
 ## Upgrading to v6.2

 ### Ensure encryption of datasource secrets
@@ -193,7 +182,3 @@ The semantics of `max concurrent shard requests` changed in Elasticsearch v7.0,

 If you upgrade Elasticsearch to v7.0+ you should make sure to update the datasource configuration in Grafana so that version
 is `7.0+` and `max concurrent shard requests` properly configured. 256 was the default in pre v7.0 versions. In v7.0 and above 5 is the default.
-
-## Upgrading to v6.4
-
-One of the database migrations included in this release will merge multiple rows used to represent an annotation range into a single row.  If you have a large number of region annotations the database migration may take a long time to complete.  See [Upgrading to v5.2](#upgrading-to-v5-2) for tips on how to manage this process.
--- a/docs/sources/plugins/developing/apps.md
+++ b/docs/sources/plugins/developing/apps.md
@@ -37,11 +37,15 @@ export class ConfigCtrl {

  postUpdate() {
    if (!this.appModel.enabled) {
-      return;
+      return this.$q.resolve();
    }
-
-    // TODO, whatever you want
-    console.log('Post Update:', this);
+    return this.appEditCtrl.importDashboards().then(() => {
+      this.enabled = true;
+      return {
+        url: "plugins/raintank-kubernetes-app/page/clusters",
+        message: "Kubernetes App enabled!"
+      };
+    });
  }
 }
 ConfigCtrl.templateUrl = 'components/config/config.html';
@@ -55,5 +59,5 @@ If possible a link to a dashboard or custom page should be shown after enabling

 > Our goal is not to have a very extensive documentation but rather have actual
 > code that people can look at. An example implementation of an app can be found
-> in this [example app repo](https://github.com/grafana/grafana/tree/master/public/app/plugins/app/example-app)
+> in this [example app repo](https://github.com/grafana/example-app)

--- a/docs/sources/plugins/developing/datasources.md
+++ b/docs/sources/plugins/developing/datasources.md
@@ -146,8 +146,7 @@ Request object passed to datasource.annotationQuery function:
    "datasource": "generic datasource",
    "enable": true,
    "name": "annotation name"
-  },
-  "dashboard": DashboardModel
+  }
 }
 ```

--- a/docs/sources/plugins/developing/development.md
+++ b/docs/sources/plugins/developing/development.md
@@ -20,8 +20,7 @@ You can extend Grafana by writing your own plugins and then share them with othe

 Example plugins

- ["Hello World" panel using Angular](https://github.com/grafana/simple-angular-panel)
- ["Hello World" panel using React](https://github.com/grafana/simple-react-panel)
+- [Typescript data source example](https://github.com/grafana/typescript-template-datasource)
 - [Simple json data source](https://github.com/grafana/simple-json-datasource)
 - [Clock panel](https://github.com/grafana/clock-panel)
 - [Pie chart panel](https://github.com/grafana/piechart-panel)
--- a/docs/sources/project/building_from_source.md
+++ b/docs/sources/project/building_from_source.md
@@ -52,7 +52,7 @@ npm --add-python-to-path='true' --debug install --global windows-build-tools

 ## Build the Frontend Assets

-For this you need nodejs (v.6+):
+For this you need nodejs (v.6+).

 ```bash
 npm install -g yarn
@@ -77,10 +77,8 @@ Open grafana in your browser (default [http://localhost:3000](http://localhost:3
 To add features, customize your config, etc, you'll need to rebuild the backend when you change the source code. We use a tool named `bra` that
 does this.

-If you using *nix machine, you can just use the `make run` command, otherwise you need install `bra` binary first:
-
 ```bash
-go get github.com/unknwon/bra
+go get github.com/Unknwon/bra

 bra run
 ```
@@ -106,7 +104,7 @@ that will populate your dev environment for quicker testing end experimenting.

 ## Creating optimized release packages

-This step builds linux packages and requires that fpm is installed. Install fpm via `gem install fpm`:
+This step builds linux packages and requires that fpm is installed. Install fpm via `gem install fpm`.

 ```bash
 go run build.go build package
@@ -136,14 +134,14 @@ Please contribute to the Grafana project and submit a pull request! Build new fe
 **Solution**: delete the node_modules directory. Install [node-gyp](https://github.com/nodejs/node-gyp#installation) properly for your platform. Then run `yarn install --pure-lockfile` again.
 <br><br>

-**Problem**: When running `make run` for the first time you get an error that it is not a recognized command.
+**Problem**: When running `bra run` for the first time you get an error that it is not a recognized command.

 **Solution**: Add the bin directory in your Go workspace directory to the path. Per default this is `$HOME/go/bin` on Linux and `%USERPROFILE%\go\bin` on Windows or `$GOPATH/bin` (`%GOPATH%\bin` on Windows) if you have set your own workspace directory.
 <br><br>

 **Problem**: When executing a `go get` command on Windows and you get an error about the git repository not existing.

-**Solution**: `go get` requires Git. If you run `go get` without Git then it will create an empty directory in your Go workspace for the library you are trying to get. Even after installing Git, you will get a similar error. To fix this, delete the empty directory (for example: if you tried to run `go get github.com/unknwon/bra` then delete `%USERPROFILE%\go\src\github.com\unknwon\bra`) and run the `go get` command again.
+**Solution**: `go get` requires Git. If you run `go get` without Git then it will create an empty directory in your Go workspace for the library you are trying to get. Even after installing Git, you will get a similar error. To fix this, delete the empty directory (for example: if you tried to run `go get github.com/Unknwon/bra` then delete `%USERPROFILE%\go\src\github.com\Unknwon\bra`) and run the `go get` command again.
 <br><br>

 **Problem**: On Windows, getting errors about a tool not being installed even though you just installed that tool.
--- a/docs/sources/tutorials/_index.md
+++ b/docs/sources/tutorials/_index.md
@@ -20,7 +20,7 @@ This section of the docs contains a series for tutorials and stack setup guides.

 ## External links

- [Installing Graphite and Grafana on RHEL 6, 7, or Ubuntu in under 30 minutes](https://www.beginswithdata.com/2015/09/14/installing-graphite-and-grafana-on-rhel-6-7-or-ubuntu-in-under-30-minutes/)
+- [Installing Graphite and Grafana on RHEL 6, 7, or Ubuntu in under 30 minutes](http://blog.pkiwi.com/installing-graphite-and-grafana-on-rhel-6-7-or-ubuntu-in-under-30-minutes/)
 - [Monitoring Urbancode deployments with Docker, Graphite, Grafana, collectd and chef!](http://cloud.boriskuschel.com/2015/08/monitoring-urbancode-deploments-with.html)
 - [Scripting Grafana dashboards](http://anatolijd.blogspot.se/2014/07/scripting-grafana-dashboards.html)

--- a/docs/sources/tutorials/api_org_token_howto.md
+++ b/docs/sources/tutorials/api_org_token_howto.md
@@ -9,14 +9,13 @@ weight = 10

 # API Tutorial: How To Create API Tokens And Dashboards For A Specific Organization

-Use the Grafana API to setup new Grafana organizations or to add dynamically generated dashboards to an existing organization.
+A common scenario is to want to via the Grafana API setup new Grafana organizations or to add dynamically generated dashboards to an existing organization.

 ## Authentication

-There are two authentication methods to access the API: 
+There are two ways to authenticate against the API: basic authentication and API Tokens.

- Basic authentication: A Grafana Admin user can access some parts of the Grafana API through basic authentication. 
- API Tokens: All organization actions are accessed through an API Token. An API Token is associated with an organization. It can be used to create dashboards and other components specific for that organization.
+Some parts of the API are only available through basic authentication and these parts of the API usually require that the user is a Grafana Admin. But all organization actions are accessed via an API Token. An API Token is tied to an organization and can be used to create dashboards etc but only for that organization.

 ## How To Create A New Organization and an API Token

@@ -72,4 +71,4 @@ Using the Token that was created in the previous step, you can create a dashboar
  }' http://localhost:3000/api/dashboards/db
  ```

-  > **Note.** If you export a dashboard for sharing externally using the Share > Export menu in the Grafana UI, you cannot import that dashboard. Instead, click **View JSON** and save it to a file or fetch the JSON output through the API.
+  This import will not work if you exported the dashboard via the Share -> Export menu in the Grafana UI (it strips out data source names etc.). View the JSON and save it to a file instead or fetch the dashboard JSON via the API.
--- a/docs/versions.json
+++ b/docs/versions.json
@@ -1,6 +1,5 @@
 [
-  { "version": "v6.3", "path": "/", "archived": false, "current": true },
-  { "version": "v6.2", "path": "/v6.2", "archived": true },
+  { "version": "v6.2", "path": "/", "archived": false, "current": true },
  { "version": "v6.1", "path": "/v6.1", "archived": true },
  { "version": "v6.0", "path": "/v6.0", "archived": true },
  { "version": "v5.4", "path": "/v5.4", "archived": true },
--- a/emails/README.md
+++ b/emails/README.md
@@ -1,15 +1,9 @@
-## Prerequisites

 - npm install
 - gem install premailer
+- grunt   (default task will build new inlines email templates)
+- grunt watch  (will build on source html or css change)

-## Tasks
-
- npm run build (default task will build new inlines email templates)
- npm start (will build on source html or css change)
-
-## Result
-
-Assembled email templates will be in `dist/` and final
-inlined templates will be in `../public/emails/`
+assembled email templates will be in dist/ and final
+inlined templates will be in ../public/emails/

--- a/emails/package.json
+++ b/emails/package.json
@@ -8,14 +8,10 @@
    "email": "delder@riester.com",
    "url": "https://github.com/dnnsldr"
  },
-  "scripts": {
-    "build": "grunt",
-    "start": "grunt watch"
-  },
  "devDependencies": {
    "grunt": "^0.4.5",
-    "grunt-premailer": "^1.1.10",
-    "grunt-processhtml": "^0.4.2",
+    "grunt-premailer": "^0.2.10",
+    "grunt-processhtml": "^0.3.3",
    "grunt-uncss": "^0.3.7",
    "load-grunt-config": "^0.14.0",
    "grunt-contrib-watch": "^0.6.1",
--- a/go.mod
+++ b/go.mod
@@ -4,11 +4,12 @@ go 1.12

 require (
 	github.com/BurntSushi/toml v0.3.1
+	github.com/Unknwon/com v0.0.0-20190214221849-2d12a219ccaf
 	github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f
 	github.com/aws/aws-sdk-go v1.18.5
 	github.com/beevik/etree v1.1.0 // indirect
 	github.com/benbjohnson/clock v0.0.0-20161215174838-7dc76406b6d3
-	github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668
+	github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737
 	github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
 	github.com/codegangsta/cli v1.20.0
 	github.com/crewjam/saml v0.0.0-20190521120225-344d075952c9
@@ -21,15 +22,17 @@ require (
 	github.com/facebookgo/structtag v0.0.0-20150214074306-217e25fb9691 // indirect
 	github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 // indirect
 	github.com/fatih/color v1.7.0
-	github.com/go-macaron/binding v0.0.0-20190806013118-0b4f37bab25b
+	github.com/go-macaron/binding v0.0.0-20170611065819-ac54ee249c27
 	github.com/go-macaron/gzip v0.0.0-20160222043647-cad1c6580a07
-	github.com/go-macaron/session v0.0.0-20190805070824-1a3cdc6f5659
+	github.com/go-macaron/inject v0.0.0-20160627170012-d8a0b8677191 // indirect
+	github.com/go-macaron/session v0.0.0-20190131233854-0a0a789bf193
 	github.com/go-sql-driver/mysql v1.4.1
 	github.com/go-stack/stack v1.8.0
 	github.com/go-xorm/core v0.6.2
 	github.com/go-xorm/xorm v0.7.1
 	github.com/gobwas/glob v0.2.3
 	github.com/google/go-cmp v0.2.0 // indirect
+	github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e // indirect
 	github.com/gorilla/websocket v1.4.0
 	github.com/gosimple/slug v1.4.2
 	github.com/grafana/grafana-plugin-model v0.0.0-20180518082423-84176c64269d
@@ -37,49 +40,52 @@ require (
 	github.com/hashicorp/go-plugin v0.0.0-20190220160451-3f118e8ee104
 	github.com/hashicorp/go-version v1.1.0
 	github.com/inconshreveable/log15 v0.0.0-20180818164646-67afb5ed74ec
-	github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af
 	github.com/jonboulle/clockwork v0.1.0 // indirect
-	github.com/jung-kurt/gofpdf v1.10.1
 	github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
 	github.com/klauspost/compress v1.4.1 // indirect
 	github.com/klauspost/cpuid v1.2.0 // indirect
-	github.com/lib/pq v1.2.0
+	github.com/lib/pq v1.0.0
 	github.com/mattn/go-colorable v0.1.1 // indirect
 	github.com/mattn/go-isatty v0.0.7
-	github.com/mattn/go-sqlite3 v1.11.0
+	github.com/mattn/go-sqlite3 v1.10.0
+	github.com/onsi/ginkgo v1.8.0 // indirect
+	github.com/onsi/gomega v1.5.0 // indirect
 	github.com/opentracing/opentracing-go v1.1.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
+	github.com/pkg/errors v0.8.1
 	github.com/prometheus/client_golang v0.9.2
 	github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
 	github.com/prometheus/common v0.2.0
 	github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be // indirect
 	github.com/robfig/cron v0.0.0-20180505203441-b41be1df6967
-	github.com/robfig/cron/v3 v3.0.0
 	github.com/russellhaering/goxmldsig v0.0.0-20180430223755-7acd5e4a6ef7 // indirect
 	github.com/sergi/go-diff v1.0.0 // indirect
-	github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337
+	github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 // indirect
+	github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a
 	github.com/stretchr/testify v1.3.0
 	github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf
-	github.com/ua-parser/uap-go v0.0.0-20190826212731-daf92ba38329
+	github.com/ua-parser/uap-go v0.0.0-20190303233514-1004ccd816b3
 	github.com/uber-go/atomic v1.3.2 // indirect
 	github.com/uber/jaeger-client-go v2.16.0+incompatible
 	github.com/uber/jaeger-lib v2.0.0+incompatible // indirect
-	github.com/unknwon/com v1.0.1
 	github.com/yudai/gojsondiff v1.0.0
 	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
 	github.com/yudai/pp v2.0.1+incompatible // indirect
 	go.uber.org/atomic v1.3.2 // indirect
-	golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
+	golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a // indirect
+	golang.org/x/net v0.0.0-20190415100556-4a65cf94b679
 	golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914
-	golang.org/x/sync v0.0.0-20190423024810-112230192c58
+	golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6
+	golang.org/x/sys v0.0.0-20190415081028-16da32be82c5 // indirect
 	golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
-	gopkg.in/ini.v1 v1.46.0
+	gopkg.in/bufio.v1 v1.0.0-20140618132640-567b2bfa514e // indirect
+	gopkg.in/ini.v1 v1.42.0
 	gopkg.in/ldap.v3 v3.0.2
-	gopkg.in/macaron.v1 v1.3.4
+	gopkg.in/macaron.v1 v1.3.2
 	gopkg.in/mail.v2 v2.3.1
-	gopkg.in/redis.v5 v5.2.9
+	gopkg.in/redis.v2 v2.3.2
 	gopkg.in/square/go-jose.v2 v2.3.0
 	gopkg.in/yaml.v2 v2.2.2
 )
--- a/go.sum
+++ b/go.sum
@@ -2,6 +2,8 @@ cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/Unknwon/com v0.0.0-20190214221849-2d12a219ccaf h1:g3hliyjkDSCLzNlOEc6Bd1dngsiIwPb9LfPuYUv+F+Y=
+github.com/Unknwon/com v0.0.0-20190214221849-2d12a219ccaf/go.mod h1:voKvFVpXBJxdIPeqjoJuLK+UVcRlo/JLjeToGxPYu68=
 github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f h1:HR5nRmUQgXrwqZOwZ2DAc/aCi3Bu3xENpspW935vxu0=
 github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f/go.mod h1:f3HiCrHjHBdcm6E83vGaXh1KomZMA2P6aeo3hKx/wg0=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -14,21 +16,16 @@ github.com/benbjohnson/clock v0.0.0-20161215174838-7dc76406b6d3 h1:wOysYcIdqv3Wn
 github.com/benbjohnson/clock v0.0.0-20161215174838-7dc76406b6d3/go.mod h1:UMqtWQTnOe4byzwe7Zhwh8f8s+36uszN51sJrSIZlTE=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668 h1:U/lr3Dgy4WK+hNk4tyD+nuGjpVLPEHuJSFXMw11/HPA=
-github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
+github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737 h1:rRISKWyXfVxvoa702s91Zl5oREZTrR3yv+tXrrX7G/g=
+github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
 github.com/codegangsta/cli v1.20.0 h1:iX1FXEgwzd5+XN6wk5cVHOGQj6Q3Dcp20lUeS4lHNTw=
 github.com/codegangsta/cli v1.20.0/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA=
-github.com/couchbase/gomemcached v0.0.0-20190515232915-c4b4ca0eb21d/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c=
-github.com/couchbase/goutils v0.0.0-20190315194238-f9d42b11473b/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
-github.com/couchbaselabs/go-couchbase v0.0.0-20190708161019-23e7ca2ce2b7/go.mod h1:mby/05p8HE5yHEAKiIH/555NoblMs7PtW6NrYshDruc=
 github.com/crewjam/saml v0.0.0-20190521120225-344d075952c9 h1:+cz/lCIhz+eg8+jC8cWk5LBLbbpH39IKyHliN6GZyUE=
 github.com/crewjam/saml v0.0.0-20190521120225-344d075952c9/go.mod h1:w5eu+HNtubx+kRpQL6QFT2F3yIFfYVe6+EzOFVU7Hko=
-github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGiisLwp9rITslkFNpZD5rz43tf41QFkTWY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -37,7 +34,6 @@ github.com/denisenkom/go-mssqldb v0.0.0-20190315220205-a8ed825ac853 h1:tTngnoO/B
 github.com/denisenkom/go-mssqldb v0.0.0-20190315220205-a8ed825ac853/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ=
 github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64=
 github.com/facebookgo/inject v0.0.0-20180706035515-f23751cae28b h1:V6c4/dSTNhSaNn4c5ulbakfv277qCvs7byFYv7P83iQ=
@@ -54,14 +50,14 @@ github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-macaron/binding v0.0.0-20190806013118-0b4f37bab25b h1:U65wj9SF7qUBTGrnt6VxbHCT0Dw8dz4uch52G+5SdfA=
-github.com/go-macaron/binding v0.0.0-20190806013118-0b4f37bab25b/go.mod h1:AG8Z6qkQM8s47aUDJOco/SNwJ8Czif2hMm7rc0abDog=
+github.com/go-macaron/binding v0.0.0-20170611065819-ac54ee249c27 h1:ieTTL9+RAtpcMaskwWNN19Vdrsl4X+k2CWsQijWNsAU=
+github.com/go-macaron/binding v0.0.0-20170611065819-ac54ee249c27/go.mod h1:u+H6rwW+HQwUL+w5uaEJSpIlVZDye1o9MB4Su0JfRfM=
 github.com/go-macaron/gzip v0.0.0-20160222043647-cad1c6580a07 h1:YSIA98PevNf1NtCa/J6cz7gjzpz99WVAOa9Eg0klKps=
 github.com/go-macaron/gzip v0.0.0-20160222043647-cad1c6580a07/go.mod h1://cJFfDp/70L0oTNAMB+M8Jd0rpuIx/55iARuJ6StwE=
 github.com/go-macaron/inject v0.0.0-20160627170012-d8a0b8677191 h1:NjHlg70DuOkcAMqgt0+XA+NHwtu66MkTVVgR4fFWbcI=
 github.com/go-macaron/inject v0.0.0-20160627170012-d8a0b8677191/go.mod h1:VFI2o2q9kYsC4o7VP1HrEVosiZZTd+MVT3YZx4gqvJw=
-github.com/go-macaron/session v0.0.0-20190805070824-1a3cdc6f5659 h1:YXDFNK98PgKeBd+xM2Babdd6gyABG8H+SSAh5+hr0os=
-github.com/go-macaron/session v0.0.0-20190805070824-1a3cdc6f5659/go.mod h1:tLd0QEudXocQckwcpCq5pCuTCuYc24I0bRJDuRe9OuQ=
+github.com/go-macaron/session v0.0.0-20190131233854-0a0a789bf193 h1:z/nqwd+ql/r6Q3QGnwNd6B89UjPytM0be5pDQV9TuWw=
+github.com/go-macaron/session v0.0.0-20190131233854-0a0a789bf193/go.mod h1:ScEJm9Gk+ez5JJTml5WlBIqavAfuE5nF8e4Gvyz/X+A=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
@@ -83,18 +79,13 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekf
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg=
 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c h1:7lF+Vz0LqiRidnzC1Oq86fpX1q/iEv2KJdrCtttYjT4=
-github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e h1:XWcjeEtTFTOVA9Fs1w7n2XBftk5ib4oZrhzWk0B+3eA=
+github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gosimple/slug v1.4.2 h1:jDmprx3q/9Lfk4FkGZtvzDQ9Cj9eAmsjzeQGp24PeiQ=
@@ -126,9 +117,6 @@ github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVY
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
-github.com/jung-kurt/gofpdf v1.10.1 h1:mbprTswkr0n86clAmJ4NGCFC4fdGySCAshWzrYb3xbE=
-github.com/jung-kurt/gofpdf v1.10.1/go.mod h1:s/VXv+TdctEOx2wCEguezYaR7f0OwUAd6H9VGfRkcSs=
 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM=
 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
 github.com/klauspost/compress v1.4.1 h1:8VMb5+0wMgdBykOV96DwNwKFQ+WTI4pzYURP99CcB9E=
@@ -144,10 +132,6 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
-github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lunny/log v0.0.0-20160921050905-7887c61bf0de/go.mod h1:3q8WtuPQsoRbatJuy3nvq/hRSvuBJrHHr+ybPPiNvHQ=
-github.com/lunny/nodb v0.0.0-20160621015157-fc1ef06ad4af/go.mod h1:Cqz6pqow14VObJ7peltM+2n3PWOz7yTrfUuGbVFkzN0=
 github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
@@ -156,8 +140,6 @@ github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/mattn/go-sqlite3 v1.11.0 h1:LDdKkqtYlom37fkvqs8rMPFKAMe8+SgjbwZ6ex1/A/Q=
-github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 h1:7GoSOOW2jpsfkntVKaS2rAr1TJqfcxotyaUcuxoZSzg=
@@ -166,18 +148,14 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
-github.com/phpdave11/gofpdi v1.0.7/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -199,51 +177,39 @@ github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be h1:ta7tUOvsPHV
 github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be/go.mod h1:MIDFMn7db1kT65GmV94GzpX9Qdi7N/pQlwb+AN8wh+Q=
 github.com/robfig/cron v0.0.0-20180505203441-b41be1df6967 h1:x7xEyJDP7Hv3LVgvWhzioQqbC/KtuUhTigKlH/8ehhE=
 github.com/robfig/cron v0.0.0-20180505203441-b41be1df6967/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
-github.com/robfig/cron/v3 v3.0.0 h1:kQ6Cb7aHOHTSzNVNEhmp8EcWKLb4CbiMW9h9VyIhO4E=
-github.com/robfig/cron/v3 v3.0.0/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/russellhaering/goxmldsig v0.0.0-20180430223755-7acd5e4a6ef7 h1:J4AOUcOh/t1XbQcJfkEqhzgvMJ2tDxdCVvmHxW5QXao=
 github.com/russellhaering/goxmldsig v0.0.0-20180430223755-7acd5e4a6ef7/go.mod h1:Oz4y6ImuOQZxynhbSXk7btjEfNBtGlj2dcaOvXl2FSM=
-github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
-github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw=
-github.com/siddontang/go-snappy v0.0.0-20140704025258-d8f7bb82a96d/go.mod h1:vq0tzqLRu6TS7Id0wMo2N5QzJoKedVeovOpHjnykSzY=
-github.com/siddontang/ledisdb v0.0.0-20190202134119-8ceb77e66a92/go.mod h1:mF1DpOSOUiJRMR+FDqaqu3EBqrybQtrDDszLUZ6oxPg=
-github.com/siddontang/rdb v0.0.0-20150307021120-fc89ed2e418d/go.mod h1:AMEsy7v5z92TR1JKMkLLoaOQk++LVnOKL3ScbJ8GNGA=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 h1:Jpy1PXuP99tXNrhbq2BaPz9B+jNAvH1JPQQpG/9GCXY=
 github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w=
-github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
+github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 h1:hBSHahWMEgzwRyS6dRpxY0XyjZsHyQ61s084wo5PJe0=
+github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
-github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 h1:WN9BUFbdyOsSH/XohnWpXOlq9NBD5sGAB2FciQMUEe8=
-github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs=
+github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf h1:Z2X3Os7oRzpdJ75iPqWZc0HeJWFYNCvKsfpQwFpRNTA=
 github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf/go.mod h1:M8agBzgqHIhgj7wEn9/0hJUZcrvt9VY+Ln+S1I5Mha0=
-github.com/ua-parser/uap-go v0.0.0-20190826212731-daf92ba38329 h1:VBsKFh4W1JEMz3eLCmM9zOJKZdDkP5W4b3Y4hc7SbZc=
-github.com/ua-parser/uap-go v0.0.0-20190826212731-daf92ba38329/go.mod h1:OBcG9bn7sHtXgarhUEb3OfCnNsgtGnkVf41ilSZ3K3E=
+github.com/ua-parser/uap-go v0.0.0-20190303233514-1004ccd816b3 h1:E7xa7Zur8hLPvw+03gAeQ9esrglfV389j2PcwhiGf/I=
+github.com/ua-parser/uap-go v0.0.0-20190303233514-1004ccd816b3/go.mod h1:OBcG9bn7sHtXgarhUEb3OfCnNsgtGnkVf41ilSZ3K3E=
 github.com/uber-go/atomic v1.3.2 h1:Azu9lPBWRNKzYXSIwRfgRuDuS0YKsK4NFhiQv98gkxo=
 github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g=
 github.com/uber/jaeger-client-go v2.16.0+incompatible h1:Q2Pp6v3QYiocMxomCaJuwQGFt7E53bPYqEgug/AoBtY=
 github.com/uber/jaeger-client-go v2.16.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
 github.com/uber/jaeger-lib v2.0.0+incompatible h1:iMSCV0rmXEogjNWPh2D0xk9YVKvrtGoHJNe9ebLu/pw=
 github.com/uber/jaeger-lib v2.0.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
-github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e h1:GSGeB9EAKY2spCABz6xOX5DbxZEXolK+nBSvmsQwRjM=
-github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM=
-github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs=
-github.com/unknwon/com v1.0.1/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM=
 github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA=
 github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M=
@@ -257,10 +223,8 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc=
-golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/image v0.0.0-20190507092727-e4e5bf290fec/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a h1:Igim7XhdOpBnWPuYJ70XcNpq8q3BCACtVgNfoJxOV7g=
+golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -268,18 +232,15 @@ golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190415100556-4a65cf94b679 h1:tzVWzOrXxwAwdSCMrf+mbNrZFxwS0+HLP4m2qxtfdhk=
+golang.org/x/net v0.0.0-20190415100556-4a65cf94b679/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914 h1:jIOcLT9BZzyJ9ce+IwwZ+aF9yeCqzrR+NrD68a/SHKw=
 golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -287,25 +248,16 @@ golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa h1:KIDDMLT1O0Nr7TSxp8xM5tJcdn8tgyAONntO829og1M=
-golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190415081028-16da32be82c5 h1:UMbOtg4ZL2GyTAolLE9QfNvzskWvFkI935Z98i9moXA=
+golang.org/x/sys v0.0.0-20190415081028-16da32be82c5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190802220118-1d1727260058/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
-golang.org/x/tools v0.0.0-20190805222050-c5a2fd39b72a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373 h1:PPwnA7z1Pjf7XYaBP9GL1VAMZmcIWyFz7QCMSIIa3Bg=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/grpc v1.14.0 h1:ArxJuB1NWfPY6r9Gp9gqwplT0Ge7nqv9msgu03lHLmo=
@@ -315,23 +267,23 @@ gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gG
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
 gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=
 gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
+gopkg.in/bufio.v1 v1.0.0-20140618132640-567b2bfa514e h1:wGA78yza6bu/mWcc4QfBuIEHEtc06xdiU0X8sY36yUU=
 gopkg.in/bufio.v1 v1.0.0-20140618132640-567b2bfa514e/go.mod h1:xsQCaysVCudhrYTfzYWe577fCe7Ceci+6qjO2Rdc0Z4=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/ini.v1 v1.46.0 h1:VeDZbLYGaupuvIrsYCEOe/L/2Pcs5n7hdO1ZTjporag=
-gopkg.in/ini.v1 v1.46.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.42.0 h1:7N3gPTt50s8GuLortA00n8AqRTk75qOP98+mTPpgzRk=
+gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ldap.v3 v3.0.2 h1:R6RBtabK6e1GO0eQKtkyOFbAHO73QesLzI2w2DZ6b9w=
 gopkg.in/ldap.v3 v3.0.2/go.mod h1:oxD7NyBuxchC+SgJDE1Q5Od05eGt29SDQVBmV+HYbzw=
-gopkg.in/macaron.v1 v1.3.4 h1:HvIscOwxhFhx3swWM/979wh2QMYyuXrNmrF9l+j3HZs=
-gopkg.in/macaron.v1 v1.3.4/go.mod h1:/RoHTdC8ALpyJ3+QR36mKjwnT1F1dyYtsGM9Ate6ZFI=
+gopkg.in/macaron.v1 v1.3.2 h1:AvWIaPmwBUA87/OWzePkoxeaw6YJWDfBt1pDFPBnLf8=
+gopkg.in/macaron.v1 v1.3.2/go.mod h1:PrsiawTWAGZs6wFbT5hlr7SQ2Ns9h7cUVtcUu4lQOVo=
 gopkg.in/mail.v2 v2.3.1 h1:WYFn/oANrAGP2C0dcV6/pbkPzv8yGzqTjPmTeO7qoXk=
 gopkg.in/mail.v2 v2.3.1/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw=
+gopkg.in/redis.v2 v2.3.2 h1:GPVIIB/JnL1wvfULefy3qXmPu1nfNu2d0yA09FHgwfs=
 gopkg.in/redis.v2 v2.3.2/go.mod h1:4wl9PJ/CqzeHk3LVq1hNLHH8krm3+AXEgut4jVc++LU=
-gopkg.in/redis.v5 v5.2.9 h1:MNZYOLPomQzZMfpN3ZtD1uyJ2IDonTTlxYiV/pEApiw=
-gopkg.in/redis.v5 v5.2.9/go.mod h1:6gtv0/+A4iM08kdRfocWYB3bLX2tebpNtfKlFT6H4mY=
 gopkg.in/square/go-jose.v2 v2.3.0 h1:nLzhkFyl5bkblqYBoiWJUt5JkWOzmiaBtCxdJAqJd3U=
 gopkg.in/square/go-jose.v2 v2.3.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/stretchr/testify.v1 v1.2.2/go.mod h1:QI5V/q6UbPmuhtm10CaFZxED9NreB8PnFYN9JcR6TxU=
--- a/jest.config.e2e.js
+++ b/jest.config.e2e.js
@@ -11,5 +11,5 @@ module.exports = {
  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
  setupFiles: [],
  globals: { 'ts-jest': { isolatedModules: true } },
-  setupFilesAfterEnv: ['expect-puppeteer', '<rootDir>/packages/grafana-toolkit/src/e2e/install.ts'],
-};
+  setupFilesAfterEnv: ['expect-puppeteer', '<rootDir>/public/e2e-test/install/install.ts'],
+};
--- a/latest.json
+++ b/latest.json
@@ -1,4 +1,4 @@
 {
-  "stable": "6.3.5",
-  "testing": "6.3.5"
+  "stable": "6.2.5",
+  "testing": "6.2.5"
 }
--- a/lerna.json
+++ b/lerna.json
@@ -2,5 +2,5 @@
  "npmClient": "yarn",
  "useWorkspaces": true,
  "packages": ["packages/*"],
-  "version": "6.4.2"
+  "version": "6.3.0-alpha.40"
 }
--- a/package.json
+++ b/package.json
@@ -1,9 +1,11 @@
 {
-  "author": "Grafana Labs",
-  "license": "Apache-2.0",
  "private": true,
+  "author": {
+    "name": "Torkel Ödegaard",
+    "company": "Grafana Labs"
+  },
  "name": "grafana",
-  "version": "6.4.2",
+  "version": "6.3.0-pre",
  "repository": {
    "type": "git",
    "url": "http://github.com/grafana/grafana.git"
@@ -16,46 +18,27 @@
    "@babel/preset-typescript": "7.3.3",
    "@emotion/core": "10.0.10",
    "@rtsao/plugin-proposal-class-properties": "7.0.1-patch.1",
-    "@types/angular": "1.6.56",
-    "@types/angular-route": "1.7.0",
+    "@types/angular": "1.6.54",
    "@types/classnames": "2.2.7",
    "@types/clipboard": "2.0.1",
    "@types/d3": "4.13.1",
-    "@types/d3-scale-chromatic": "1.3.1",
    "@types/enzyme": "3.9.0",
-    "@types/enzyme-adapter-react-16": "1.0.5",
    "@types/expect-puppeteer": "3.3.1",
-    "@types/file-saver": "2.0.1",
-    "@types/hoist-non-react-statics": "3.3.0",
-    "@types/is-hotkey": "0.1.1",
    "@types/jest": "24.0.13",
    "@types/jquery": "1.10.35",
    "@types/lodash": "4.14.123",
-    "@types/marked": "0.6.5",
-    "@types/mousetrap": "1.6.3",
    "@types/node": "11.13.4",
    "@types/papaparse": "4.5.9",
    "@types/pixelmatch": "4.0.0",
    "@types/pngjs": "3.3.2",
-    "@types/prismjs": "1.16.0",
    "@types/puppeteer-core": "1.9.0",
    "@types/react": "16.8.16",
    "@types/react-dom": "16.8.4",
    "@types/react-grid-layout": "0.16.7",
-    "@types/react-redux": "7.0.8",
    "@types/react-select": "2.0.15",
-    "@types/react-table": "6.8.5",
-    "@types/react-test-renderer": "16.8.2",
    "@types/react-transition-group": "2.0.16",
    "@types/react-virtualized": "9.18.12",
    "@types/react-window": "1.7.0",
-    "@types/redux-logger": "3.0.7",
-    "@types/redux-mock-store": "1.0.1",
-    "@types/reselect": "2.2.0",
-    "@types/slate": "0.47.1",
-    "@types/slate-plain-serializer": "0.6.1",
-    "@types/slate-react": "0.22.5",
-    "@types/tinycolor2": "1.4.2",
    "angular-mocks": "1.6.6",
    "autoprefixer": "9.5.0",
    "axios": "0.19.0",
@@ -106,7 +89,7 @@
    "ng-annotate-loader": "0.6.1",
    "ng-annotate-webpack-plugin": "0.3.0",
    "ngtemplate-loader": "2.0.1",
-    "node-sass": "4.12.0",
+    "node-sass": "4.11.0",
    "npm": "6.9.0",
    "optimize-css-assets-webpack-plugin": "5.0.1",
    "phantomjs-prebuilt": "2.1.16",
@@ -123,20 +106,19 @@
    "redux-mock-store": "1.5.3",
    "regexp-replace-loader": "1.0.1",
    "rimraf": "2.6.3",
-    "rxjs-spy": "^7.5.1",
    "sass-lint": "1.12.1",
    "sass-loader": "7.1.0",
    "sinon": "1.17.6",
    "style-loader": "0.23.1",
    "terser-webpack-plugin": "1.2.3",
    "ts-jest": "24.0.2",
-    "ts-loader": "6.0.4",
+    "ts-loader": "5.3.3",
    "ts-node": "8.1.0",
    "tslib": "1.9.3",
    "tslint": "5.14.0",
    "tslint-loader": "3.5.4",
    "tslint-react": "3.6.0",
-    "typescript": "3.5.3",
+    "typescript": "3.4.1",
    "webpack": "4.29.6",
    "webpack-bundle-analyzer": "3.3.2",
    "webpack-cleanup-plugin": "0.5.1",
@@ -146,18 +128,15 @@
    "zone.js": "0.7.8"
  },
  "scripts": {
-    "dev": "webpack --progress --colors --config scripts/webpack/webpack.dev.js",
+    "dev": "webpack --progress --colors --mode development --config scripts/webpack/webpack.dev.js",
    "start": "grafana-toolkit core:start --watchTheme",
    "start:hot": "grafana-toolkit core:start --hot --watchTheme",
    "start:ignoreTheme": "grafana-toolkit core:start --hot",
-    "start:noTsCheck": "grafana-toolkit core:start --noTsCheck",
-    "stats": "webpack --mode production --config scripts/webpack/webpack.prod.js --profile --json > compilation-stats.json",
    "watch": "yarn start -d watch,start core:start --watchTheme ",
    "build": "grunt build",
    "test": "grunt test",
    "tslint": "tslint -c tslint.json --project tsconfig.json",
    "typecheck": "tsc --noEmit",
-    "typecheckPackages": "yarn workspaces run typecheck",
    "jest": "jest --notify --watch",
    "e2e-tests": "jest --runInBand --config=jest.config.e2e.js",
    "api-tests": "jest --notify --watch --config=devenv/e2e-api-tests/jest.js",
@@ -167,12 +146,9 @@
    "prettier:write": "prettier --list-different \"**/*.{ts,tsx,scss}\" --write",
    "precommit": "grafana-toolkit precommit",
    "themes:generate": "ts-node --project ./scripts/cli/tsconfig.json ./scripts/cli/generateSassVariableFiles.ts",
-    "packages:prepare": "lerna version --no-push --no-git-tag-version --force-publish --exact",
+    "packages:prepare": "lerna run clean && npm run test && lerna version --tag-version-prefix=\"packages@\" -m \"Packages: publish %s\" --no-push",
    "packages:build": "lerna run clean && lerna run build",
-    "packages:publish": "lerna publish from-package --contents dist",
-    "packages:publishLatest": "lerna publish from-package --contents dist --yes",
-    "packages:publishNext": "lerna publish from-package --contents dist --dist-tag next --yes",
-    "packages:publishCanary": "lerna publish from-package --contents dist --dist-tag canary --yes"
+    "packages:publish": "lerna publish from-package --contents dist --dist-tag next --tag-version-prefix=\"packages@\""
  },
  "husky": {
    "hooks": {
@@ -194,10 +170,20 @@
    "singleQuote": true,
    "printWidth": 120
  },
+  "license": "Apache-2.0",
  "dependencies": {
    "@babel/polyfill": "7.2.5",
-    "@grafana/slate-react": "0.22.9-grafana",
    "@torkelo/react-select": "2.4.1",
+    "@types/angular-route": "1.7.0",
+    "@types/d3-scale-chromatic": "1.3.1",
+    "@types/enzyme-adapter-react-16": "1.0.5",
+    "@types/marked": "0.6.5",
+    "@types/react-redux": "^7.0.8",
+    "@types/react-test-renderer": "16.8.2",
+    "@types/redux-logger": "3.0.7",
+    "@types/reselect": "2.2.0",
+    "@types/slate": "0.44.11",
+    "@types/tinycolor2": "1.4.2",
    "angular": "1.6.6",
    "angular-bindonce": "0.3.1",
    "angular-native-dragdrop": "1.2.2",
@@ -209,17 +195,14 @@
    "classnames": "2.2.6",
    "clipboard": "2.0.4",
    "d3": "4.13.0",
-    "d3-scale-chromatic": "1.5.0",
+    "d3-scale-chromatic": "1.3.3",
    "eventemitter3": "2.0.3",
    "fast-text-encoding": "^1.0.0",
    "file-saver": "1.3.8",
-    "hoist-non-react-statics": "3.3.0",
    "immutable": "3.8.2",
-    "is-hotkey": "0.1.4",
    "jquery": "3.4.1",
-    "lodash": "4.17.15",
+    "lodash": "4.17.11",
    "marked": "0.6.2",
-    "memoize-one": "5.1.1",
    "moment": "2.24.0",
    "mousetrap": "1.6.3",
    "mousetrap-global-bind": "1.1.0",
@@ -227,7 +210,7 @@
    "papaparse": "4.6.3",
    "prismjs": "1.16.0",
    "prop-types": "15.7.2",
-    "rc-cascader": "0.17.5",
+    "rc-cascader": "0.14.0",
    "react": "16.8.6",
    "react-dom": "16.8.6",
    "react-grid-layout": "0.16.6",
@@ -242,13 +225,16 @@
    "react-window": "1.7.1",
    "redux": "4.0.1",
    "redux-logger": "3.0.6",
+    "redux-observable": "1.1.0",
    "redux-thunk": "2.3.0",
    "reselect": "4.0.0",
    "rst2html": "github:thoward/rst2html#990cb89",
    "rxjs": "6.4.0",
    "search-query-parser": "1.5.2",
-    "slate": "0.47.8",
-    "slate-plain-serializer": "0.7.10",
+    "slate": "0.33.8",
+    "slate-plain-serializer": "0.5.41",
+    "slate-prism": "0.5.0",
+    "slate-react": "0.12.11",
    "tether": "1.4.5",
    "tether-drop": "https://github.com/torkelo/drop/tarball/master",
    "tinycolor2": "1.4.1",
--- a/packages/README.md
+++ b/packages/README.md
@@ -1,50 +1,15 @@
 ## Grafana frontend packages

-## Versioning
+## Releasing new version
 We use [Lerna](https://github.com/lerna/lerna) for packages versioning and releases

-All packages are versioned according to the current Grafana version:
- Grafana v6.3.0-alpha1 -> @grafana/* packages @ 6.3.0-alpha.1
- Grafana v6.2.5 -> @grafana/* packages @ 6.2.5
- Grafana - master branch version (based on package.json, i.e. 6.4.0-pre) -> @grafana/* packages @ 6.4.0-pre-<COMMIT-SHA> (see details below about packages publishing channels)
-
-> Please note that @grafana/toolkit, @grafana/ui, @grafana/data & @grafana/runtime packages are considered ALPHA even though they are not released as alpha versions
-
-### Stable releases
-> **Even though packages are released under a stable version, they are considered ALPHA until further notice!**
-
-Stable releases are published under `latest` tag on npm.
-
-### Alpha and beta releases
-Alpha and beta releases are published under `next` tag on npm.
-
-### Automatic pre-releases
-Every commit to master that has changes within `packages` directory is a subject of npm packages release.
-*ALL* packages will be released under version from lerna.json file with commit SHA added to it:
-
-```
-<lerna.json version>-<COMMIT_SHA>
-```
-
-Automatic prereleases are published under `canary` dist tag.
-
 ### Manual release
-> All of the steps below should be performed on a release branch, according to Grafana Release Guide
-
-> Make sure you are logged in to npm in your terminal and that you are a part of Grafana org on npm
-
-1. Run `yarn packages:prepare` script from root directory. This will perform tests on the packages and prompt for version of the packages. The version should be the same as the one being released.
-  - Make sure you use semver convention. So, *place a dot between prerelease id and prelease number*!!! i.e. 6.3.0-alpha.1
-  - Make sure you confirm the version bump when prompted!
-2. Commit changes (lerna.json & package.json files) - *"Packages version update: \<VERSION\>"*
-3. Run `yarn packages:build` script that will prepare distribution packages in `packages/grafana-*/dist`. These directories are going to be published to npm
-4. Depending whether  or not it's a prerelease:
-  - When releasing a prelease run `packages:publishNext` to publish new versions.
-  - When releasing a stable version run `packages:publishLatest` to publish new versions.
-
-5. Push version commit to the release branch
+1. Run `packages:prepare` script from root directory. This will perform cleanup, run all tests and bump version for all packages. Also, it will create `@packages@[version]` tag and version bump commit with `Packages: publish [version]` message.
+2. Run `packages:build` script that will prepare distribution packages.
+3. Run `packages:publish` to publish new versions
+   - add `--dist-tag next` to publish under `next` tag
+4. Push version commit

 ### Building individual packages
 To build induvidual packages run `grafana-toolkit package:build --scope=<ui|toolkit|runtime|data>`

-
--- a/packages/grafana-data/README.md
+++ b/packages/grafana-data/README.md
@@ -1,5 +1,3 @@
 # Grafana Data Library

-> **@grafana/data is currently in ALPHA**. Core API is unstable and can be a subject of breaking changes!
-
-This package holds the root data types and functions used within Grafana.
+This package holds the root data types and functions used within Grafana.
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -1,24 +1,21 @@
 {
-  "author": "Grafana Labs",
-  "license": "Apache-2.0",
  "name": "@grafana/data",
-  "version": "6.4.2",
+  "version": "6.3.0-alpha.39",
  "description": "Grafana Data Library",
  "keywords": [
    "typescript"
  ],
-  "repository": {
-    "type": "git",
-    "url": "http://github.com/grafana/grafana.git"
-  },
  "main": "src/index.ts",
  "scripts": {
    "tslint": "tslint -c tslint.json --project tsconfig.json",
    "typecheck": "tsc --noEmit",
    "clean": "rimraf ./dist ./compiled",
    "bundle": "rollup -c rollup.config.ts",
-    "build": "grafana-toolkit package:build --scope=data"
+    "build": "grafana-toolkit package:build --scope=data",
+    "postpublish": "npm run clean"
  },
+  "author": "Grafana Labs",
+  "license": "Apache-2.0",
  "devDependencies": {
    "@types/jest": "23.3.14",
    "@types/jquery": "1.10.35",
@@ -28,8 +25,9 @@
    "@types/pretty-format": "20.0.1",
    "@types/react": "16.8.16",
    "@types/sinon": "^7.0.11",
-    "lodash": "4.17.15",
-    "pretty-format": "24.9.0",
+    "awesome-typescript-loader": "^5.2.1",
+    "lodash": "^4.17.10",
+    "pretty-format": "^24.5.0",
    "rollup": "1.6.0",
    "rollup-plugin-commonjs": "9.2.1",
    "rollup-plugin-node-resolve": "4.0.1",
@@ -38,7 +36,9 @@
    "rollup-plugin-typescript2": "0.19.3",
    "rollup-plugin-visualizer": "0.9.2",
    "sinon": "1.17.6",
-    "typescript": "3.5.3"
+    "typescript": "3.4.1"
  },
-  "types": "src/index.ts"
+  "resolutions": {
+    "@types/lodash": "4.14.119"
+  }
 }
--- a/packages/grafana-data/src/dataframe/CircularDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/CircularDataFrame.ts
@@ -1,22 +0,0 @@
-import { MutableDataFrame } from './MutableDataFrame';
-import { CircularVector } from '../vector/CircularVector';
-
-interface CircularOptions {
-  append?: 'head' | 'tail';
-  capacity?: number;
-}
-
-/**
- * This dataframe can have values constantly added, and will never
- * exceed the given capacity
- */
-export class CircularDataFrame<T = any> extends MutableDataFrame<T> {
-  constructor(options: CircularOptions) {
-    super(undefined, (buffer?: any[]) => {
-      return new CircularVector({
-        ...options,
-        buffer,
-      });
-    });
-  }
-}
--- a/packages/grafana-data/src/dataframe/DataFrameView.test.ts
+++ b/packages/grafana-data/src/dataframe/DataFrameView.test.ts
@@ -1,84 +0,0 @@
-import { FieldType, DataFrameDTO } from '../types/dataFrame';
-import { DateTime } from '../datetime/moment_wrapper';
-import { MutableDataFrame } from './MutableDataFrame';
-import { DataFrameView } from './DataFrameView';
-
-interface MySpecialObject {
-  time: DateTime;
-  name: string;
-  value: number;
-  more: string; // MISSING
-}
-
-describe('dataFrameView', () => {
-  const frame: DataFrameDTO = {
-    fields: [
-      { name: 'time', type: FieldType.time, values: [100, 200, 300] },
-      { name: 'name', type: FieldType.string, values: ['a', 'b', 'c'] },
-      { name: 'value', type: FieldType.number, values: [1, 2, 3] },
-    ],
-  };
-  const ext = new MutableDataFrame(frame);
-  const vector = new DataFrameView<MySpecialObject>(ext);
-
-  it('Should get a typed vector', () => {
-    expect(vector.length).toEqual(3);
-
-    const first = vector.get(0);
-    expect(first.time).toEqual(100);
-    expect(first.name).toEqual('a');
-    expect(first.value).toEqual(1);
-    expect(first.more).toBeUndefined();
-  });
-
-  it('Should support the spread operator', () => {
-    expect(vector.length).toEqual(3);
-
-    const first = vector.get(0);
-    const copy = { ...first };
-    expect(copy.time).toEqual(100);
-    expect(copy.name).toEqual('a');
-    expect(copy.value).toEqual(1);
-    expect(copy.more).toBeUndefined();
-  });
-
-  it('Should support array indexes', () => {
-    expect(vector.length).toEqual(3);
-
-    const first = vector.get(0) as any;
-    expect(first[0]).toEqual(100);
-    expect(first[1]).toEqual('a');
-    expect(first[2]).toEqual(1);
-    expect(first[3]).toBeUndefined();
-  });
-
-  it('Should advertise the property names for each field', () => {
-    expect(vector.length).toEqual(3);
-    const first = vector.get(0);
-    const keys = Object.keys(first);
-    expect(keys).toEqual(['time', 'name', 'value']);
-  });
-
-  it('has a weird side effect that the object values change after interation', () => {
-    expect(vector.length).toEqual(3);
-
-    // Get the first value
-    const first = vector.get(0);
-    expect(first.name).toEqual('a');
-
-    // Then get the second one
-    const second = vector.get(1);
-
-    // the values for 'first' have changed
-    expect(first.name).toEqual('b');
-    expect(first.name).toEqual(second.name);
-  });
-
-  it('toJSON returns plain object', () => {
-    expect(vector.toJSON()[0]).toEqual({
-      time: 100,
-      name: 'a',
-      value: 1,
-    });
-  });
-});
--- a/packages/grafana-data/src/dataframe/DataFrameView.ts
+++ b/packages/grafana-data/src/dataframe/DataFrameView.ts
@@ -1,78 +0,0 @@
-import { Vector } from '../types/vector';
-import { DataFrame } from '../types/dataFrame';
-
-/**
- * This abstraction will present the contents of a DataFrame as if
- * it were a well typed javascript object Vector.
- *
- * NOTE: The contents of the object returned from `view.get(index)`
- * are optimized for use in a loop.  All calls return the same object
- * but the index has changed.
- *
- * For example, the three objects:
- *   const first = view.get(0);
- *   const second = view.get(1);
- *   const third = view.get(2);
- * will point to the contents at index 2
- *
- * If you need three different objects, consider something like:
- *   const first = { ... view.get(0) };
- *   const second = { ... view.get(1) };
- *   const third = { ... view.get(2) };
- */
-export class DataFrameView<T = any> implements Vector<T> {
-  private index = 0;
-  private obj: T;
-
-  constructor(private data: DataFrame) {
-    const obj = ({} as unknown) as T;
-    for (let i = 0; i < data.fields.length; i++) {
-      const field = data.fields[i];
-      const getter = () => {
-        return field.values.get(this.index);
-      };
-      if (!(obj as any).hasOwnProperty(field.name)) {
-        Object.defineProperty(obj, field.name, {
-          enumerable: true, // Shows up as enumerable property
-          get: getter,
-        });
-      }
-      Object.defineProperty(obj, i, {
-        enumerable: false, // Don't enumerate array index
-        get: getter,
-      });
-    }
-    this.obj = obj;
-  }
-
-  get dataFrame() {
-    return this.data;
-  }
-
-  get length() {
-    return this.data.length;
-  }
-
-  get(idx: number) {
-    this.index = idx;
-    return this.obj;
-  }
-
-  toArray(): T[] {
-    const arr: T[] = [];
-    for (let i = 0; i < this.data.length; i++) {
-      arr.push({ ...this.get(i) });
-    }
-    return arr;
-  }
-
-  toJSON(): T[] {
-    return this.toArray();
-  }
-
-  forEachRow(iterator: (row: T) => void) {
-    for (let i = 0; i < this.data.length; i++) {
-      iterator(this.get(i));
-    }
-  }
-}
--- a/packages/grafana-data/src/dataframe/FieldCache.test.ts
+++ b/packages/grafana-data/src/dataframe/FieldCache.test.ts
@@ -1,93 +0,0 @@
-import { FieldCache } from './FieldCache';
-import { FieldType } from '../types/dataFrame';
-import { toDataFrame } from './processDataFrame';
-
-describe('FieldCache', () => {
-  it('when creating a new FieldCache from fields should be able to query cache', () => {
-    const frame = toDataFrame({
-      fields: [
-        { name: 'time', type: FieldType.time },
-        { name: 'string', type: FieldType.string },
-        { name: 'number', type: FieldType.number },
-        { name: 'boolean', type: FieldType.boolean },
-        { name: 'other', type: FieldType.other },
-        { name: 'undefined' },
-      ],
-    });
-    const fieldCache = new FieldCache(frame);
-    const allFields = fieldCache.getFields();
-    expect(allFields).toHaveLength(6);
-
-    const expectedFieldNames = ['time', 'string', 'number', 'boolean', 'other', 'undefined'];
-
-    expect(allFields.map(f => f.name)).toEqual(expectedFieldNames);
-
-    expect(fieldCache.hasFieldOfType(FieldType.time)).toBeTruthy();
-    expect(fieldCache.hasFieldOfType(FieldType.string)).toBeTruthy();
-    expect(fieldCache.hasFieldOfType(FieldType.number)).toBeTruthy();
-    expect(fieldCache.hasFieldOfType(FieldType.boolean)).toBeTruthy();
-    expect(fieldCache.hasFieldOfType(FieldType.other)).toBeTruthy();
-
-    expect(fieldCache.getFields(FieldType.time).map(f => f.name)).toEqual([expectedFieldNames[0]]);
-    expect(fieldCache.getFields(FieldType.string).map(f => f.name)).toEqual([expectedFieldNames[1]]);
-    expect(fieldCache.getFields(FieldType.number).map(f => f.name)).toEqual([expectedFieldNames[2]]);
-    expect(fieldCache.getFields(FieldType.boolean).map(f => f.name)).toEqual([expectedFieldNames[3]]);
-    expect(fieldCache.getFields(FieldType.other).map(f => f.name)).toEqual([
-      expectedFieldNames[4],
-      expectedFieldNames[5],
-    ]);
-
-    expect(fieldCache.fields[0].name).toEqual(expectedFieldNames[0]);
-    expect(fieldCache.fields[1].name).toEqual(expectedFieldNames[1]);
-    expect(fieldCache.fields[2].name).toEqual(expectedFieldNames[2]);
-    expect(fieldCache.fields[3].name).toEqual(expectedFieldNames[3]);
-    expect(fieldCache.fields[4].name).toEqual(expectedFieldNames[4]);
-    expect(fieldCache.fields[5].name).toEqual(expectedFieldNames[5]);
-    expect(fieldCache.fields[6]).toBeUndefined();
-
-    expect(fieldCache.getFirstFieldOfType(FieldType.time)!.name).toEqual(expectedFieldNames[0]);
-    expect(fieldCache.getFirstFieldOfType(FieldType.string)!.name).toEqual(expectedFieldNames[1]);
-    expect(fieldCache.getFirstFieldOfType(FieldType.number)!.name).toEqual(expectedFieldNames[2]);
-    expect(fieldCache.getFirstFieldOfType(FieldType.boolean)!.name).toEqual(expectedFieldNames[3]);
-    expect(fieldCache.getFirstFieldOfType(FieldType.other)!.name).toEqual(expectedFieldNames[4]);
-
-    expect(fieldCache.hasFieldNamed('tim')).toBeFalsy();
-    expect(fieldCache.hasFieldNamed('time')).toBeTruthy();
-    expect(fieldCache.hasFieldNamed('string')).toBeTruthy();
-    expect(fieldCache.hasFieldNamed('number')).toBeTruthy();
-    expect(fieldCache.hasFieldNamed('boolean')).toBeTruthy();
-    expect(fieldCache.hasFieldNamed('other')).toBeTruthy();
-    expect(fieldCache.hasFieldNamed('undefined')).toBeTruthy();
-
-    expect(fieldCache.getFieldByName('time')!.name).toEqual(expectedFieldNames[0]);
-    expect(fieldCache.getFieldByName('string')!.name).toEqual(expectedFieldNames[1]);
-    expect(fieldCache.getFieldByName('number')!.name).toEqual(expectedFieldNames[2]);
-    expect(fieldCache.getFieldByName('boolean')!.name).toEqual(expectedFieldNames[3]);
-    expect(fieldCache.getFieldByName('other')!.name).toEqual(expectedFieldNames[4]);
-    expect(fieldCache.getFieldByName('undefined')!.name).toEqual(expectedFieldNames[5]);
-    expect(fieldCache.getFieldByName('null')).toBeUndefined();
-  });
-
-  describe('field retrieval', () => {
-    const frame = toDataFrame({
-      fields: [
-        { name: 'time', type: FieldType.time, values: [100, 200, 300] },
-        { name: 'name', type: FieldType.string, values: ['a', 'b', 'c'] },
-        { name: 'value', type: FieldType.number, values: [1, 2, 3] },
-        { name: 'value', type: FieldType.number, values: [4, 5, 6] },
-      ],
-    });
-    const ext = new FieldCache(frame);
-
-    it('should get the first field with a duplicate name', () => {
-      const field = ext.getFieldByName('value');
-      expect(field!.name).toEqual('value');
-      expect(field!.values.toArray()).toEqual([1, 2, 3]);
-    });
-
-    it('should return index of the field', () => {
-      const field = ext.getFirstFieldOfType(FieldType.number);
-      expect(field!.index).toEqual(2);
-    });
-  });
-});
--- a/packages/grafana-data/src/dataframe/FieldCache.ts
+++ b/packages/grafana-data/src/dataframe/FieldCache.ts
@@ -1,78 +0,0 @@
-import { Field, DataFrame, FieldType, guessFieldTypeForField } from '../index';
-
-interface FieldWithIndex extends Field {
-  index: number;
-}
-
-export class FieldCache {
-  fields: FieldWithIndex[] = [];
-
-  private fieldByName: { [key: string]: FieldWithIndex } = {};
-  private fieldByType: { [key: string]: FieldWithIndex[] } = {};
-
-  constructor(data: DataFrame) {
-    this.fields = data.fields.map((field, idx) => ({
-      ...field,
-      index: idx,
-    }));
-
-    for (let i = 0; i < data.fields.length; i++) {
-      const field = data.fields[i];
-      // Make sure it has a type
-      if (field.type === FieldType.other) {
-        const t = guessFieldTypeForField(field);
-        if (t) {
-          field.type = t;
-        }
-      }
-      if (!this.fieldByType[field.type]) {
-        this.fieldByType[field.type] = [];
-      }
-      this.fieldByType[field.type].push({
-        ...field,
-        index: i,
-      });
-
-      if (this.fieldByName[field.name]) {
-        console.warn('Duplicate field names in DataFrame: ', field.name);
-      } else {
-        this.fieldByName[field.name] = { ...field, index: i };
-      }
-    }
-  }
-
-  getFields(type?: FieldType): FieldWithIndex[] {
-    if (!type) {
-      return [...this.fields]; // All fields
-    }
-    const fields = this.fieldByType[type];
-    if (fields) {
-      return [...fields];
-    }
-    return [];
-  }
-
-  hasFieldOfType(type: FieldType): boolean {
-    const types = this.fieldByType[type];
-    return types && types.length > 0;
-  }
-
-  getFirstFieldOfType(type: FieldType): FieldWithIndex | undefined {
-    const arr = this.fieldByType[type];
-    if (arr && arr.length > 0) {
-      return arr[0];
-    }
-    return undefined;
-  }
-
-  hasFieldNamed(name: string): boolean {
-    return !!this.fieldByName[name];
-  }
-
-  /**
-   * Returns the first field with the given name.
-   */
-  getFieldByName(name: string): FieldWithIndex | undefined {
-    return this.fieldByName[name];
-  }
-}
--- a/packages/grafana-data/src/dataframe/MutableDataFrame.test.ts
+++ b/packages/grafana-data/src/dataframe/MutableDataFrame.test.ts
@@ -1,66 +0,0 @@
-import { DataFrameDTO, FieldType } from '../types/dataFrame';
-import { MutableDataFrame } from './MutableDataFrame';
-
-describe('Reversing DataFrame', () => {
-  describe('when called with a DataFrame', () => {
-    it('then it should reverse the order of values in all fields', () => {
-      const frame: DataFrameDTO = {
-        fields: [
-          { name: 'time', type: FieldType.time, values: [100, 200, 300] },
-          { name: 'name', type: FieldType.string, values: ['a', 'b', 'c'] },
-          { name: 'value', type: FieldType.number, values: [1, 2, 3] },
-        ],
-      };
-
-      const helper = new MutableDataFrame(frame);
-
-      expect(helper.values.time.toArray()).toEqual([100, 200, 300]);
-      expect(helper.values.name.toArray()).toEqual(['a', 'b', 'c']);
-      expect(helper.values.value.toArray()).toEqual([1, 2, 3]);
-
-      helper.reverse();
-
-      expect(helper.values.time.toArray()).toEqual([300, 200, 100]);
-      expect(helper.values.name.toArray()).toEqual(['c', 'b', 'a']);
-      expect(helper.values.value.toArray()).toEqual([3, 2, 1]);
-    });
-  });
-});
-
-describe('Apending DataFrame', () => {
-  it('Should append values', () => {
-    const dto: DataFrameDTO = {
-      fields: [
-        { name: 'time', type: FieldType.time, values: [100] },
-        { name: 'name', type: FieldType.string, values: ['a', 'b'] },
-        { name: 'value', type: FieldType.number, values: [1, 2, 3] },
-      ],
-    };
-
-    const frame = new MutableDataFrame(dto);
-    expect(frame.values.time.toArray()).toEqual([100, null, null]);
-
-    // Set a value on the second row
-    frame.set(1, { time: 200, name: 'BB', value: 20 });
-    expect(frame.toArray()).toEqual([
-      { time: 100, name: 'a', value: 1 }, // 1
-      { time: 200, name: 'BB', value: 20 }, // 2
-      { time: null, name: null, value: 3 }, // 3
-    ]);
-
-    // Set a value on the second row
-    frame.add({ value2: 'XXX' }, true);
-    expect(frame.toArray()).toEqual([
-      { time: 100, name: 'a', value: 1, value2: null }, // 1
-      { time: 200, name: 'BB', value: 20, value2: null }, // 2
-      { time: null, name: null, value: 3, value2: null }, // 3
-      { time: null, name: null, value: null, value2: 'XXX' }, // 4
-    ]);
-
-    // Make sure length survives a spread operator
-    const keys = Object.keys(frame);
-    const copy = { ...frame } as any;
-    expect(keys).toContain('length');
-    expect(copy.length).toEqual(frame.length);
-  });
-});
--- a/packages/grafana-data/src/dataframe/MutableDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/MutableDataFrame.ts
@@ -1,283 +0,0 @@
-import { Field, DataFrame, DataFrameDTO, FieldDTO, FieldType } from '../types/dataFrame';
-import { KeyValue, QueryResultMeta, Labels } from '../types/data';
-import { guessFieldTypeFromValue, guessFieldTypeForField, toDataFrameDTO } from './processDataFrame';
-import isArray from 'lodash/isArray';
-import isString from 'lodash/isString';
-import { makeFieldParser } from '../utils/fieldParser';
-import { MutableVector, Vector } from '../types/vector';
-import { ArrayVector } from '../vector/ArrayVector';
-import { vectorToArray } from '../vector/vectorToArray';
-
-export type MutableField<T = any> = Field<T, MutableVector<T>>;
-
-type MutableVectorCreator = (buffer?: any[]) => MutableVector;
-
-export const MISSING_VALUE: any = null;
-
-export class MutableDataFrame<T = any> implements DataFrame, MutableVector<T> {
-  name?: string;
-  labels?: Labels;
-  refId?: string;
-  meta?: QueryResultMeta;
-
-  fields: MutableField[] = [];
-  values: KeyValue<MutableVector> = {};
-
-  private first: Vector = new ArrayVector();
-  private creator: MutableVectorCreator;
-
-  constructor(source?: DataFrame | DataFrameDTO, creator?: MutableVectorCreator) {
-    // This creates the underlying storage buffers
-    this.creator = creator
-      ? creator
-      : (buffer?: any[]) => {
-          return new ArrayVector(buffer);
-        };
-
-    // Copy values from
-    if (source) {
-      const { name, labels, refId, meta, fields } = source;
-      if (name) {
-        this.name = name;
-      }
-      if (labels) {
-        this.labels = labels;
-      }
-      if (refId) {
-        this.refId = refId;
-      }
-      if (meta) {
-        this.meta = meta;
-      }
-      if (fields) {
-        for (const f of fields) {
-          this.addField(f);
-        }
-      }
-    }
-
-    // Get Length to show up if you use spread
-    Object.defineProperty(this, 'length', {
-      enumerable: true,
-      get: () => {
-        return this.first.length;
-      },
-    });
-  }
-
-  // Defined for Vector interface
-  get length() {
-    return this.first.length;
-  }
-
-  addFieldFor(value: any, name?: string): MutableField {
-    return this.addField({
-      name: name || '', // Will be filled in
-      type: guessFieldTypeFromValue(value),
-    });
-  }
-
-  addField(f: Field | FieldDTO, startLength?: number): MutableField {
-    let buffer: any[] | undefined = undefined;
-
-    if (f.values) {
-      if (isArray(f.values)) {
-        buffer = f.values as any[];
-      } else {
-        buffer = (f.values as Vector).toArray();
-      }
-    }
-
-    let type = f.type;
-
-    if (!type && ('time' === f.name || 'Time' === f.name)) {
-      type = FieldType.time;
-    } else {
-      if (!type && buffer && buffer.length) {
-        type = guessFieldTypeFromValue(buffer[0]);
-      }
-      if (!type) {
-        type = FieldType.other;
-      }
-    }
-
-    // Make sure it has a name
-    let name = f.name;
-    if (!name) {
-      if (type === FieldType.time) {
-        name = this.values['Time'] ? `Time ${this.fields.length + 1}` : 'Time';
-      } else {
-        name = `Field ${this.fields.length + 1}`;
-      }
-    }
-
-    const field: MutableField = {
-      name,
-      type,
-      config: f.config || {},
-      values: this.creator(buffer),
-    };
-
-    if (type === FieldType.other) {
-      type = guessFieldTypeForField(field);
-      if (type) {
-        field.type = type;
-      }
-    }
-
-    this.fields.push(field);
-    this.first = this.fields[0].values;
-
-    // The Field Already exists
-    if (this.values[name]) {
-      console.warn(`Duplicate field names found: ${name}, only the first will be accessible`);
-    } else {
-      this.values[name] = field.values;
-    }
-
-    // Make sure the field starts with a given length
-    if (startLength) {
-      while (field.values.length < startLength) {
-        field.values.add(MISSING_VALUE);
-      }
-    } else {
-      this.validate();
-    }
-
-    return field;
-  }
-
-  validate() {
-    // Make sure all arrays are the same length
-    const length = this.fields.reduce((v: number, f) => {
-      return Math.max(v, f.values.length);
-    }, 0);
-
-    // Add empty elements until everything mastches
-    for (const field of this.fields) {
-      while (field.values.length !== length) {
-        field.values.add(MISSING_VALUE);
-      }
-    }
-  }
-
-  private addMissingFieldsFor(value: any) {
-    for (const key of Object.keys(value)) {
-      if (!this.values[key]) {
-        this.addField({
-          name: key,
-          type: guessFieldTypeFromValue(value[key]),
-        });
-      }
-    }
-  }
-
-  /**
-   * Reverse all values
-   */
-  reverse() {
-    for (const f of this.fields) {
-      f.values.reverse();
-    }
-  }
-
-  /**
-   * This will add each value to the corresponding column
-   */
-  appendRow(row: any[]) {
-    // Add any extra columns
-    for (let i = this.fields.length; i < row.length; i++) {
-      this.addField({
-        name: `Field ${i + 1}`,
-        type: guessFieldTypeFromValue(row[i]),
-      });
-    }
-
-    // The first line may change the field types
-    if (this.length < 1) {
-      for (let i = 0; i < this.fields.length; i++) {
-        const f = this.fields[i];
-        if (!f.type || f.type === FieldType.other) {
-          f.type = guessFieldTypeFromValue(row[i]);
-        }
-      }
-    }
-
-    for (let i = 0; i < this.fields.length; i++) {
-      const f = this.fields[i];
-      let v = row[i];
-      if (f.type !== FieldType.string && isString(v)) {
-        if (!f.parse) {
-          f.parse = makeFieldParser(v, f);
-        }
-        v = f.parse(v);
-      }
-      f.values.add(v);
-    }
-  }
-
-  /**
-   * Add all properties of the value as fields on the frame
-   */
-  add(value: T, addMissingFields?: boolean) {
-    if (addMissingFields) {
-      this.addMissingFieldsFor(value);
-    }
-
-    // Will add one value for every field
-    const obj = value as any;
-    for (const field of this.fields) {
-      let val = obj[field.name];
-
-      if (field.type !== FieldType.string && isString(val)) {
-        if (!field.parse) {
-          field.parse = makeFieldParser(val, field);
-        }
-        val = field.parse(val);
-      }
-
-      if (val === undefined) {
-        val = MISSING_VALUE;
-      }
-
-      field.values.add(val);
-    }
-  }
-
-  set(index: number, value: T, addMissingFields?: boolean) {
-    if (index > this.length) {
-      throw new Error('Unable ot set value beyond current length');
-    }
-
-    if (addMissingFields) {
-      this.addMissingFieldsFor(value);
-    }
-
-    const obj = (value as any) || {};
-    for (const field of this.fields) {
-      field.values.set(index, obj[field.name]);
-    }
-  }
-
-  /**
-   * Get an object with a property for each field in the DataFrame
-   */
-  get(idx: number): T {
-    const v: any = {};
-    for (const field of this.fields) {
-      v[field.name] = field.values.get(idx);
-    }
-    return v as T;
-  }
-
-  toArray(): T[] {
-    return vectorToArray(this);
-  }
-
-  /**
-   * The simplified JSON values used in JSON.stringify()
-   */
-  toJSON() {
-    return toDataFrameDTO(this);
-  }
-}
--- a/packages/grafana-data/src/dataframe/index.ts
+++ b/packages/grafana-data/src/dataframe/index.ts
@@ -1,5 +0,0 @@
-export * from './DataFrameView';
-export * from './FieldCache';
-export * from './CircularDataFrame';
-export * from './MutableDataFrame';
-export * from './processDataFrame';
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ryan	461b97ee80	fix folder paths	2019-07-10 00:33:50 -07:00
ryan	724731fddc	merge all dist folders into one	2019-07-10 00:14:18 -07:00
ryan	905f2c3e16	Packages: publish packages@6.3.0-alpha.40	2019-07-09 23:26:20 -07:00
ryan	807594fd65	add download task	2019-07-09 23:16:17 -07:00
ryan	38c288bb9a	bump version	2019-07-09 10:56:08 -07:00
ryan	82996d6f0a	Packages: publish packages@6.3.0-alpha.39	2019-07-09 10:45:55 -07:00
ryan	f9d0c6525f	merge master	2019-07-09 10:04:56 -07:00
ryan	26d5db2b63	use axios for basic testing	2019-07-08 20:53:09 -07:00
ryan	a13b96521d	use ci-work folder rather than build	2019-07-08 16:56:29 -07:00
ryan	e7d1f1df14	add stubs for each ci task	2019-07-08 16:00:06 -07:00
ryan	42e7cd7d65	Merge branch 'gtk/verify' of github.com:grafana/grafana into grafana/gtk/verify * 'gtk/verify' of github.com:grafana/grafana: update comments copy all svg and png, useful if people don't use the img folder validate type and id	2019-07-08 14:16:35 -07:00
ryan	282dd029aa	update comments	2019-07-08 09:22:49 -07:00
ryan	15fd54b21b	Merge branch 'master' into gtk/verify * master: Docs: Documents new features available with Loki data source in Explore (#17984) Prometheus: added time range filter to series labels query (#16851) Explore: Adds support for new loki 'start' and 'end' params for labels endpoint (#17512) Chore: Removes custom debounce utility in favor of lodash/debounce (#17977) Api: Fix auth tokens returning wrong seenAt value (#17980)	2019-07-08 09:15:46 -07:00
ryan	1d9c4cbdfe	copy all svg and png, useful if people don't use the img folder	2019-07-07 23:04:46 -07:00
ryan	315476e20a	validate type and id	2019-07-07 21:59:59 -07:00