v5.3.0-beta1 release

2018-09-06 14:38:22 +02:00
1229 changed files with 16787 additions and 71661 deletions
@@ -1,10 +1,9 @@
 [run]
 init_cmds = [
  ["go", "run", "build.go", "-dev", "build-server"],
-	["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
+	["./bin/grafana-server", "cfg:app_mode=development"]
 ]
 watch_all = true
-follow_symlinks = true
 watch_dirs = [
 	"$WORKDIR/pkg",
 	"$WORKDIR/public/views",
@@ -14,5 +13,5 @@ watch_exts = [".go", ".ini", ".toml", ".template.html"]
 build_delay = 1500
 cmds = [
  ["go", "run", "build.go", "-dev", "build-server"],
-	["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
+	["./bin/grafana-server", "cfg:app_mode=development"]
 ]
@@ -32,7 +32,7 @@ jobs:
        - run: sudo apt update
        - 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: cat docker/blocks/mysql_tests/setup.sql | mysql -h 127.0.0.1 -P 3306 -u root -prootpass
        - run:
            name: mysql integration tests
            command: 'GRAFANA_TEST_DB=mysql go test ./pkg/services/sqlstore/... ./pkg/tsdb/mysql/... '
@@ -51,7 +51,7 @@ jobs:
        - run: sudo apt update
        - run: sudo apt install -y postgresql-client
        - run: dockerize -wait tcp://127.0.0.1:5432 -timeout 120s
-        - run: 'PGPASSWORD=grafanatest psql -p 5432 -h 127.0.0.1 -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql'
+        - run: 'PGPASSWORD=grafanatest psql -p 5432 -h 127.0.0.1 -U grafanatest -d grafanatest -f docker/blocks/postgres_tests/setup.sql'
        - run:
            name: postgres integration tests
            command: 'GRAFANA_TEST_DB=postgres go test ./pkg/services/sqlstore/... ./pkg/tsdb/postgres/...'
@@ -81,17 +81,15 @@ jobs:
    working_directory: /go/src/github.com/grafana/grafana
    steps:
      - checkout
-      - run: 'go get -u github.com/alecthomas/gometalinter'
+      - run: 'go get -u gopkg.in/alecthomas/gometalinter.v2'
      - run: 'go get -u github.com/tsenart/deadcode'
-      - run: 'go get -u github.com/jgautheron/goconst/cmd/goconst'
      - run: 'go get -u github.com/gordonklaus/ineffassign'
-      - run: 'go get -u honnef.co/go/tools/cmd/megacheck'
      - run: 'go get -u github.com/opennota/check/cmd/structcheck'
      - run: 'go get -u github.com/mdempsky/unconvert'
      - run: 'go get -u github.com/opennota/check/cmd/varcheck'
      - run:
          name: run linters
-          command: 'gometalinter --enable-gc --vendor --deadline 10m --disable-all --enable=deadcode --enable=goconst --enable=gofmt --enable=ineffassign --enable=megacheck --enable=structcheck --enable=unconvert --enable=varcheck ./...'
+          command: 'gometalinter.v2 --enable-gc --vendor --deadline 10m --disable-all --enable=deadcode --enable=ineffassign --enable=structcheck --enable=unconvert --enable=varcheck ./...'
      - run:
          name: run go vet
          command: 'go vet ./pkg/...'
@@ -127,7 +125,7 @@ jobs:

  build-all:
    docker:
-     - image: grafana/build-container:1.2.1
+     - image: grafana/build-container:1.1.0
    working_directory: /go/src/github.com/grafana/grafana
    steps:
      - checkout
@@ -159,23 +157,18 @@ jobs:
          name: sha-sum packages
          command: 'go run build.go sha-dist'
      - run:
-          name: Build Grafana.com master publisher
+          name: Build Grafana.com publisher
          command: 'go build -o scripts/publish scripts/build/publish.go'
-      - run:
-          name: Test and build Grafana.com release publisher
-          command: 'cd scripts/build/release_publisher && go test . && go build -o release_publisher .'
      - persist_to_workspace:
          root: .
          paths:
            - dist/grafana*
            - scripts/*.sh
            - scripts/publish
-            - scripts/build/release_publisher/release_publisher
-            - scripts/build/publish.sh

  build:
    docker:
-     - image: grafana/build-container:1.2.1
+     - image: grafana/build-container:1.1.0
    working_directory: /go/src/github.com/grafana/grafana
    steps:
      - checkout
@@ -191,9 +184,6 @@ jobs:
      - run:
          name: sha-sum packages
          command: 'go run build.go sha-dist'
-      - run:
-          name: Test Grafana.com release publisher
-          command: 'cd scripts/build/release_publisher && go test .'
      - persist_to_workspace:
          root: .
          paths:
@@ -210,10 +200,6 @@ jobs:
      - run: docker info
      - run: cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
      - run: cd packaging/docker && ./build-deploy.sh "master-${CIRCLE_SHA1}"
-      - run: rm packaging/docker/grafana-latest.linux-x64.tar.gz
-      - run: cp enterprise-dist/grafana-enterprise-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz
-      - run: cd packaging/docker && ./build-enterprise.sh "master"
-

  grafana-docker-pr:
    docker:
@@ -238,28 +224,16 @@ jobs:
        - run: docker info
        - run: cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
        - run: cd packaging/docker && ./build-deploy.sh "${CIRCLE_TAG}"
-        - run: rm packaging/docker/grafana-latest.linux-x64.tar.gz
-        - run: cp enterprise-dist/grafana-enterprise-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz
-        - run: cd packaging/docker && ./build-enterprise.sh "${CIRCLE_TAG}"

  build-enterprise:
    docker:
-     - image: grafana/build-container:1.2.1
+     - image: grafana/build-container:v0.1
    working_directory: /go/src/github.com/grafana/grafana
    steps:
      - checkout
      - run:
-          name: prepare build tools
-          command: '/tmp/bootstrap.sh'
-      - run:
-          name: checkout enterprise
-          command: './scripts/build/prepare-enterprise.sh'
-      - run:
-          name: test enterprise
-          command: 'go test ./pkg/extensions/...'
-      - run:
-          name: build and package enterprise
-          command: './scripts/build/build.sh -enterprise'
+          name: build, test and package grafana enterprise
+          command: './scripts/build/build_enterprise.sh'
      - run:
          name: sign packages
          command: './scripts/build/sign_packages.sh'
@@ -274,104 +248,28 @@ jobs:
          paths:
            - enterprise-dist/grafana-enterprise*

-  build-all-enterprise:
-    docker:
-    - image: grafana/build-container:1.2.1
-    working_directory: /go/src/github.com/grafana/grafana
-    steps:
-    - checkout
-    - run:
-        name: prepare build tools
-        command: '/tmp/bootstrap.sh'
-    - run:
-        name: checkout enterprise
-        command: './scripts/build/prepare-enterprise.sh'
-    - restore_cache:
-        key: phantomjs-binaries-{{ checksum "scripts/build/download-phantomjs.sh" }}
-    - run:
-        name: download phantomjs binaries
-        command: './scripts/build/download-phantomjs.sh'
-    - save_cache:
-        key: phantomjs-binaries-{{ checksum "scripts/build/download-phantomjs.sh" }}
-        paths:
-        - /tmp/phantomjs
-    - run:
-        name: test enterprise
-        command: 'go test ./pkg/extensions/...'
-    - run:
-        name: build and package grafana
-        command: './scripts/build/build-all.sh -enterprise'
-    - run:
-        name: sign packages
-        command: './scripts/build/sign_packages.sh'
-    - run:
-        name: verify signed packages
-        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'
-    - run:
-        name: move enterprise packages into their own folder
-        command: 'mv dist enterprise-dist'
-    - persist_to_workspace:
-        root: .
-        paths:
-        - enterprise-dist/grafana-enterprise*
-
  deploy-enterprise-master:
    docker:
-      - image: grafana/grafana-ci-deploy:1.0.0
+      - image: circleci/python:2.7-stretch
    steps:
      - attach_workspace:
          at: .
      - run:
-          name: gcp credentials
-          command: 'echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json'
-      - run:
-          name: sign in to gcp
-          command: '/opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=/tmp/gcpkey.json'
+          name: install awscli
+          command: 'sudo pip install awscli'
      - 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'
-      - run:
-          name: Deploy to grafana.com
-          command: 'cd enterprise-dist && ../scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -enterprise -from-local'
-
-
-  deploy-enterprise-release:
-    docker:
-    - image: grafana/grafana-ci-deploy:1.0.0
-    steps:
-      - attach_workspace:
-         at: .
-      - run:
-          name: gcp credentials
-          command: 'echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json'
-      - 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'

  deploy-master:
    docker:
-      - image: grafana/grafana-ci-deploy:1.0.0
+      - image: circleci/python:2.7-stretch
    steps:
      - attach_workspace:
          at: .
+      - run:
+          name: install awscli
+          command: 'sudo pip install awscli'
      - run:
          name: deploy to s3
          command: |
@@ -381,15 +279,6 @@ jobs:
      - run:
          name: Trigger Windows build
          command: './scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} master'
-      - run:
-          name: gcp credentials
-          command: 'echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json'
-      - 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 gcp
-          command: '/opt/google-cloud-sdk/bin/gsutil cp ./dist/* gs://$GCP_BUCKET_NAME/oss/master'
      - run:
          name: Publish to Grafana.com
          command: |
@@ -398,25 +287,19 @@ jobs:

  deploy-release:
    docker:
-      - image: grafana/grafana-ci-deploy:1.0.0
+      - image: circleci/python:2.7-stretch
    steps:
      - attach_workspace:
          at: .
+      - run:
+          name: install awscli
+          command: 'sudo pip install awscli'
      - 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'
-      - 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 gcp
-          command: '/opt/google-cloud-sdk/bin/gsutil cp ./dist/* gs://$GCP_BUCKET_NAME/oss/release'
-      - run:
-          name: Deploy to Grafana.com
-          command: './scripts/build/publish.sh'
+          name: Trigger Windows build
+          command: './scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} release'

 workflows:
  version: 2
@@ -424,7 +307,7 @@ workflows:
    jobs:
      - build-all:
          filters: *filter-only-master
-      - build-all-enterprise:
+      - build-enterprise:
          filters: *filter-only-master
      - codespell:
          filters: *filter-only-master
@@ -451,7 +334,6 @@ workflows:
      - grafana-docker-master:
          requires:
            - build-all
-            - build-all-enterprise
            - test-backend
            - test-frontend
            - codespell
@@ -468,15 +350,13 @@ workflows:
            - gometalinter
            - mysql-integration-test
            - postgres-integration-test
-            - build-all-enterprise
+            - build-enterprise
          filters: *filter-only-master

  release:
    jobs:
      - build-all:
          filters: *filter-only-release
-      - build-all-enterprise:
-          filters: *filter-only-release
      - codespell:
          filters: *filter-only-release
      - gometalinter:
@@ -499,21 +379,9 @@ workflows:
            - mysql-integration-test
            - postgres-integration-test
          filters: *filter-only-release
-      - deploy-enterprise-release:
-          requires:
-            - build-all
-            - build-all-enterprise
-            - test-backend
-            - test-frontend
-            - codespell
-            - gometalinter
-            - mysql-integration-test
-            - postgres-integration-test
-          filters: *filter-only-release
      - grafana-docker-release:
          requires:
            - build-all
-            - build-all-enterprise
            - test-backend
            - test-frontend
            - codespell
@@ -0,0 +1,22 @@
+Follow the setup guide in README.md
+
+### Rebuild frontend assets on source change
+```
+yarn watch
+```
+
+### Rerun tests on source change
+```
+yarn jest
+```
+
+### Run tests for backend assets before commit
+```
+test -z "$(gofmt -s -l . | grep -v -E 'vendor/(github.com|golang.org|gopkg.in)' | tee /dev/stderr)"
+```
+
+### Run tests for frontend assets before commit
+```
+yarn test
+go test -v ./pkg/...
+```
@@ -8,7 +8,6 @@ awsconfig
 /dist
 /public/build
 /public/views/index.html
-/public/views/error.html
 /emails/dist
 /public_gen
 /public/vendor/npm
@@ -41,8 +40,8 @@ public/css/*.min.css

 conf/custom.ini
 fig.yml
-devenv/docker-compose.yml
-devenv/docker-compose.yaml
+docker-compose.yml
+docker-compose.yaml
 /conf/provisioning/**/custom.yaml
 /conf/provisioning/**/dev.yaml
 /conf/ldap_dev.toml
@@ -55,7 +54,6 @@ profile.cov
 /pkg/cmd/grafana-server/grafana-server
 /pkg/cmd/grafana-server/debug
 /pkg/extensions
-/public/app/extensions
 debug.test
 /examples/*/dist
 /packaging/**/*.rpm
@@ -70,9 +68,7 @@ debug.test
 /vendor/**/*.yml
 /vendor/**/*_test.go
 /vendor/**/.editorconfig
+/vendor/**/appengine*
 *.orig

 /devenv/bulk-dashboards/*.json
-/devenv/bulk_alerting_dashboards/*.json
-
-/scripts/build/release_publisher/release_publisher
@@ -1,129 +1,4 @@
-# 5.4.0 (unreleased)
-
-### New Features
-
-* **Alerting**: Introduce alert debouncing with the `FOR` setting. [#7886](https://github.com/grafana/grafana/issues/7886) & [#6202](https://github.com/grafana/grafana/issues/6202)
-* **Alerting**: Option to disable OK alert notifications [#12330](https://github.com/grafana/grafana/issues/12330) & [#6696](https://github.com/grafana/grafana/issues/6696), thx [@davewat](https://github.com/davewat)
-* **Postgres/MySQL/MSSQL**: Adds support for configuration of max open/idle connections and connection max lifetime. Also, panels with multiple SQL queries will now be executed concurrently [#11711](https://github.com/grafana/grafana/issues/11711), thx [@connection-reset](https://github.com/connection-reset)
-* **MySQL**: Graphical query builder [#13762](https://github.com/grafana/grafana/issues/13762), thx [svenklemm](https://github.com/svenklemm)
-* **MySQL**: Support connecting thru Unix socket for MySQL datasource [#12342](https://github.com/grafana/grafana/issues/12342), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino)
-* **MSSQL**: Add encrypt setting to allow configuration of how data sent between client and server are encrypted [#13629](https://github.com/grafana/grafana/issues/13629), thx [@ramiro](https://github.com/ramiro)
-* **Stackdriver**: Not possible to authenticate using GCE metadata server [#13669](https://github.com/grafana/grafana/issues/13669)
-* **Teams**: Team preferences (theme, home dashboard, timezone) support [#12550](https://github.com/grafana/grafana/issues/12550)
-* **Graph**: Time regions support enabling highlight of weekdays and/or certain timespans [#5930](https://github.com/grafana/grafana/issues/5930)
-* **OAuth**: Automatic redirect to sign-in with OAuth [#11893](https://github.com/grafana/grafana/issues/11893), thx [@Nick-Triller](https://github.com/Nick-Triller)
-* **Stackdriver**: Template query editor [#13561](https://github.com/grafana/grafana/issues/13561)
-
-### Minor
-
-* **Security**: Upgrade macaron session package to fix security issue. [#14043](https://github.com/grafana/grafana/pull/14043)
-* **Cloudwatch**: Show all available CloudWatch regions [#12308](https://github.com/grafana/grafana/issues/12308), thx [@mtanda](https://github.com/mtanda)
-* **Cloudwatch**: AWS/Connect metrics and dimensions [#13970](https://github.com/grafana/grafana/pull/13970), thx [@zcoffy](https://github.com/zcoffy)
-* **Cloudwatch**: CloudHSM metrics and dimensions [#14129](https://github.com/grafana/grafana/pull/14129), thx [@daktari](https://github.com/daktari)
-* **Cloudwatch**: Enable using variables in the stats field [#13810](https://github.com/grafana/grafana/issues/13810), thx [@mtanda](https://github.com/mtanda)
-* **Postgres**: Add delta window function to postgres query builder [#13925](https://github.com/grafana/grafana/issues/13925), thx [svenklemm](https://github.com/svenklemm)
-* **Elasticsearch**: Fix switching to/from es raw document metric query [#6367](https://github.com/grafana/grafana/issues/6367)
-* **Elasticsearch**: Fix deprecation warning about terms aggregation order key in Elasticsearch 6.x [#11977](https://github.com/grafana/grafana/issues/11977)
-* **Graph**: Render dots when no connecting line can be made [#13605](https://github.com/grafana/grafana/issues/13605), thx [@jsferrei](https://github.com/jsferrei)
-* **Table**: Fix CSS alpha background-color applied twice in table cell with link [#13606](https://github.com/grafana/grafana/issues/13606), thx [@grisme](https://github.com/grisme)
-* **Singlestat**: Fix XSS in prefix/postfix [#13946](https://github.com/grafana/grafana/issues/13946), thx [@cinaglia](https://github.com/cinaglia)
-* **Units**: New clock time format, to format ms or second values as for example `01h:59m`, [#13635](https://github.com/grafana/grafana/issues/13635), thx [@franciscocpg](https://github.com/franciscocpg)
-* **Alerting**: Increaste default duration for queries [#13945](https://github.com/grafana/grafana/pull/13945)
-* **Alerting**: More options for the Slack Alert notifier [#13993](https://github.com/grafana/grafana/issues/13993), thx [@andreykaipov](https://github.com/andreykaipov)
-* **Alerting**: Can't receive DingDing alert when alert is triggered [#13723](https://github.com/grafana/grafana/issues/13723), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino)
-* **Alerting**: Increase Telegram captions length limit [#13876](https://github.com/grafana/grafana/pull/13876), thx [@skgsergio](https://github.com/skgsergio)
-* **Internal metrics**: Renamed `grafana_info` to `grafana_build_info` and added branch, goversion and revision [#13876](https://github.com/grafana/grafana/pull/13876)
-* **Datasource Proxy**: Keep trailing slash for datasource proxy requests [#13326](https://github.com/grafana/grafana/pull/13326), thx [@ryantxu](https://github.com/ryantxu)
-* **OAuth**: Fix Google OAuth relies on email, not google account id [#13924](https://github.com/grafana/grafana/issues/13924), thx [@vinicyusmacedo](https://github.com/vinicyusmacedo)
-* **Dashboard**: Toggle legend using keyboard shortcut [#13655](https://github.com/grafana/grafana/issues/13655), thx [@davewat](https://github.com/davewat)
-* **Dashboard**: Fix render dashboard row drag handle only in edit mode [#13555](https://github.com/grafana/grafana/issues/13555), thx [@praveensastry](https://github.com/praveensastry)
-* **Teams**: Fix cannot select team if not included in initial search [#13425](https://github.com/grafana/grafana/issues/13425)
-* **Render**: Support full height screenshots using phantomjs render script [#13352](https://github.com/grafana/grafana/pull/13352), thx [@amuraru](https://github.com/amuraru)
-* **HTTP API**: Support retrieving teams by user [#14120](https://github.com/grafana/grafana/pull/14120), thx [@supercharlesliu](https://github.com/supercharlesliu)
-* **Metrics**: Add basic authentication to metrics endpoint [#13577](https://github.com/grafana/grafana/issues/13577), thx [@bobmshannon](https://github.com/bobmshannon)
-
-### Breaking changes
-
-* Postgres/MySQL/MSSQL datasources now per default uses `max open connections` = `unlimited` (earlier 10), `max idle connections` = `2` (earlier 10) and `connection max lifetime` = `4` hours (earlier unlimited).
-
-# 5.3.4 (2018-11-13)
-
-* **Alerting**: Delete alerts when parent folder was deleted [#13322](https://github.com/grafana/grafana/issues/13322)
-* **MySQL**: Fix `$__timeFilter()` should respect local time zone [#13769](https://github.com/grafana/grafana/issues/13769)
-* **Dashboard**: Fix datasource selection in panel by enter key [#13932](https://github.com/grafana/grafana/issues/13932)
-* **Graph**: Fix table legend height when positioned below graph and using Internet Explorer 11 [#13903](https://github.com/grafana/grafana/issues/13903)
-* **Dataproxy**: Drop origin and referer http headers [#13328](https://github.com/grafana/grafana/issues/13328) [#13949](https://github.com/grafana/grafana/issues/13949), thx [@roidelapluie](https://github.com/roidelapluie)
-
-# 5.3.3 (2018-11-13)
-
-### File Exfiltration vulnerability Security fix
-
-See [security announcement](https://community.grafana.com/t/grafana-5-3-3-and-4-6-5-security-update/11961) for details.
-
-# 5.3.2 (2018-10-24)
-
-* **InfluxDB/Graphite/Postgres**: Prevent cross site scripting (XSS) in query editor [#13667](https://github.com/grafana/grafana/issues/13667), thx [@svenklemm](https://github.com/svenklemm)
-* **Postgres**: Fix template variables error [#13692](https://github.com/grafana/grafana/issues/13692), thx [@svenklemm](https://github.com/svenklemm)
-* **Cloudwatch**: Fix service panic because of race conditions [#13674](https://github.com/grafana/grafana/issues/13674), thx [@mtanda](https://github.com/mtanda)
-* **Cloudwatch**: Fix check for invalid percentile statistics [#13633](https://github.com/grafana/grafana/issues/13633), thx [@apalaniuk](https://github.com/apalaniuk)
-* **Stackdriver/Cloudwatch**: Allow user to change unit in graph panel if cloudwatch/stackdriver datasource response doesn't include unit [#13718](https://github.com/grafana/grafana/issues/13718), thx [@mtanda](https://github.com/mtanda)
-* **Stackdriver**: stackdriver user-metrics duplicated response when multiple resource types [#13691](https://github.com/grafana/grafana/issues/13691)
-* **Variables**: Fix text box template variable doesn't work properly without a default value [#13666](https://github.com/grafana/grafana/issues/13666)
-* **Variables**: Fix variable dependency check when using `${var}` format [#13600](https://github.com/grafana/grafana/issues/13600)
-* **Dashboard**: Fix kiosk=1 url parameter should put dashboard in kiosk mode [#13764](https://github.com/grafana/grafana/pull/13764)
-* **LDAP**: Fix super admins can also be admins of orgs [#13710](https://github.com/grafana/grafana/issues/13710), thx [@adrien-f](https://github.com/adrien-f)
-* **Provisioning**: Fix deleting provisioned dashboard folder should cleanup provisioning meta data [#13280](https://github.com/grafana/grafana/issues/13280)
-
-### Minor
-
-* **Docker**: adds curl back into the docker image for utility. [#13794](https://github.com/grafana/grafana/pull/13794)
-
-# 5.3.1 (2018-10-16)
-
-* **Render**: Fix PhantomJS render of graph panel when legend displayed as table to the right [#13616](https://github.com/grafana/grafana/issues/13616)
-* **Stackdriver**: Filter option disappears after removing initial filter [#13607](https://github.com/grafana/grafana/issues/13607)
-* **Elasticsearch**: Fix no limit size in terms aggregation for alerting queries [#13172](https://github.com/grafana/grafana/issues/13172), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino)
-* **InfluxDB**: Fix for annotation issue that caused text to be shown twice [#13553](https://github.com/grafana/grafana/issues/13553)
-* **Variables**: Fix nesting variables leads to exception and missing refresh [#13628](https://github.com/grafana/grafana/issues/13628)
-* **Variables**: Prometheus: Single letter labels are not supported [#13641](https://github.com/grafana/grafana/issues/13641), thx [@olshansky](https://github.com/olshansky)
-* **Graph**: Fix graph time formatting for Last 24h ranges [#13650](https://github.com/grafana/grafana/issues/13650)
-* **Playlist**: Fix cannot add dashboards with long names to playlist [#13464](https://github.com/grafana/grafana/issues/13464), thx [@neufeldtech](https://github.com/neufeldtech)
-* **HTTP API**: Fix /api/org/users so that query and limit querystrings works
-
-# 5.3.0 (2018-10-10)
-
-* **Stackdriver**: Filter wildcards and regex matching are not yet supported [#13495](https://github.com/grafana/grafana/issues/13495)
-* **Stackdriver**: Support the distribution metric type for heatmaps [#13559](https://github.com/grafana/grafana/issues/13559)
-* **Cloudwatch**: Automatically set graph yaxis unit [#13575](https://github.com/grafana/grafana/issues/13575), thx [@mtanda](https://github.com/mtanda)
-
-# 5.3.0-beta3 (2018-10-03)
-
-* **Stackdriver**: Fix for missing ngInject [#13511](https://github.com/grafana/grafana/pull/13511)
-* **Permissions**: Fix for broken permissions selector [#13507](https://github.com/grafana/grafana/issues/13507)
-* **Alerting**: Alert reminders deduping not working as expected when running multiple Grafana instances [#13492](https://github.com/grafana/grafana/issues/13492)
-
-# 5.3.0-beta2 (2018-10-01)
-
-### New Features
-
-* **Annotations**: Enable template variables in tagged annotations queries [#9735](https://github.com/grafana/grafana/issues/9735)
-* **Stackdriver**: Support for Google Stackdriver Datasource [#13289](https://github.com/grafana/grafana/pull/13289)
-
-### Minor
-
-* **Provisioning**: Dashboard Provisioning now support symlinks that changes target [#12534](https://github.com/grafana/grafana/issues/12534), thx [@auhlig](https://github.com/auhlig)
-* **OAuth**: Allow oauth email attribute name to be configurable [#12986](https://github.com/grafana/grafana/issues/12986), thx [@bobmshannon](https://github.com/bobmshannon)
-* **Tags**: Default sort order for GetDashboardTags [#11681](https://github.com/grafana/grafana/pull/11681), thx [@Jonnymcc](https://github.com/Jonnymcc)
-* **Prometheus**: Label completion queries respect dashboard time range  [#12251](https://github.com/grafana/grafana/pull/12251), thx [@mtanda](https://github.com/mtanda)
-* **Prometheus**: Allow to display annotations based on Prometheus series value [#10159](https://github.com/grafana/grafana/issues/10159), thx [@mtanda](https://github.com/mtanda)
-* **Prometheus**: Adhoc-filtering for Prometheus dashboards [#13212](https://github.com/grafana/grafana/issues/13212)
-* **Singlestat**: Fix gauge display accuracy for percents [#13270](https://github.com/grafana/grafana/issues/13270), thx [@tianon](https://github.com/tianon)
-* **Dashboard**: Prevent auto refresh from starting when loading dashboard with absolute time range [#12030](https://github.com/grafana/grafana/issues/12030)
-* **Templating**: New templating variable type `Text box` that allows free text input [#3173](https://github.com/grafana/grafana/issues/3173)
-* **Alerting**: Link to view full size image in Microsoft Teams alert notifier [#13121](https://github.com/grafana/grafana/issues/13121), thx [@holiiveira](https://github.com/holiiveira)
-* **Alerting**: Fixes a bug where all alerts would send reminders after upgrade & restart [#13402](https://github.com/grafana/grafana/pull/13402)
-* **Alerting**: Concurrent render limit for graphs used in notifications [#13401](https://github.com/grafana/grafana/pull/13401)
-* **Postgres/MySQL/MSSQL**: Add support for replacing $__interval and  $__interval_ms in alert queries [#11555](https://github.com/grafana/grafana/issues/11555), thx [@svenklemm](https://github.com/svenklemm)
+# 5.3.0 (unreleased)

 # 5.3.0-beta1 (2018-09-06)

@@ -141,7 +16,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-3-3-and-4-
 * **Profile**: List teams that the user is member of in current/active organization [#12476](https://github.com/grafana/grafana/issues/12476)
 * **Configuration**: Allow auto-assigning users to specific organization (other than Main. Org) [#1823](https://github.com/grafana/grafana/issues/1823) [#12801](https://github.com/grafana/grafana/issues/12801), thx [@gzzo](https://github.com/gzzo) and [@ofosos](https://github.com/ofosos)
 * **Dataproxy**: Pass configured/auth headers to a Datasource [#10971](https://github.com/grafana/grafana/issues/10971), thx [@mrsiano](https://github.com/mrsiano)
-* **CloudWatch**: GetMetricData support [#11487](https://github.com/grafana/grafana/issues/11487), thx [@mtanda](https://github.com/mtanda)
+* **Cloudwatch**: CloudWatch GetMetricData support [#11487](https://github.com/grafana/grafana/issues/11487), thx [@mtanda](https://github.com/mtanda)
 * **Postgres**: TimescaleDB support, e.g. use `time_bucket` for grouping by time when option enabled [#12680](https://github.com/grafana/grafana/pull/12680), thx [svenklemm](https://github.com/svenklemm)
 * **Cleanup**: Make temp file time to live configurable [#11607](https://github.com/grafana/grafana/issues/11607), thx [@xapon](https://github.com/xapon)

@@ -206,7 +81,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-3-3-and-4-

 ### New experimental features

-These are new features that's still being worked on and are in an experimental phase. We encourage users to try these out and provide any feedback in related issue.
+These are new features that's still being worked on and are in an experimental phase. We incourage users to try these out and provide any feedback in related issue.

 * **Dashboard**: Auto fit dashboard panels to optimize space used for current TV / Monitor [#12768](https://github.com/grafana/grafana/issues/12768)

@@ -215,10 +90,6 @@ These are new features that's still being worked on and are in an experimental p
 * **Frontend**: Convert all Frontend Karma tests to Jest tests [#12224](https://github.com/grafana/grafana/issues/12224)
 * **Backend**: Upgrade to golang 1.11 [#13030](https://github.com/grafana/grafana/issues/13030)

-# 5.2.4 (2018-09-07)
-
-* **GrafanaCli**: Fixed issue with grafana-cli install plugin resulting in corrupt http response from source error. Fixes [#13079](https://github.com/grafana/grafana/issues/13079)
-
 # 5.2.3 (2018-08-29)

 ### Important fix for LDAP & OAuth login vulnerability
@@ -423,7 +294,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-
 * **Dashboard**: Sizing and positioning of settings menu icons [#11572](https://github.com/grafana/grafana/pull/11572)
 * **Dashboard**: Add search filter/tabs to new panel control [#10427](https://github.com/grafana/grafana/issues/10427)
 * **Folders**: User with org viewer role should not be able to save/move dashboards in/to general folder [#11553](https://github.com/grafana/grafana/issues/11553)
-* **Influxdb**: Don't assume the first column in table response is time. [#11476](https://github.com/grafana/grafana/issues/11476), thx [@hahnjo](https://github.com/hahnjo)
+* **Influxdb**: Dont assume the first column in table response is time. [#11476](https://github.com/grafana/grafana/issues/11476), thx [@hahnjo](https://github.com/hahnjo)

 ### Tech
 * Backend code simplification [#11613](https://github.com/grafana/grafana/pull/11613), thx [@knweiss](https://github.com/knweiss)
@@ -610,7 +481,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-
 # 4.6.2 (2017-11-16)

 ## Important
-* **Prometheus**: Fixes bug with new prometheus alerts in Grafana. Make sure to download this version if you're using Prometheus for alerting. More details in the issue. [#9777](https://github.com/grafana/grafana/issues/9777)
+* **Prometheus**: Fixes bug with new prometheus alerts in Grafana. Make sure to download this version if your using Prometheus for alerting. More details in the issue. [#9777](https://github.com/grafana/grafana/issues/9777)

 ## Fixes
 * **Color picker**: Bug after using textbox input field to change/paste color string [#9769](https://github.com/grafana/grafana/issues/9769)
@@ -1569,7 +1440,7 @@ Grafana 2.x is fundamentally different from 1.x; it now ships with an integrated

 **New features**
 - [Issue #1623](https://github.com/grafana/grafana/issues/1623). Share Dashboard: Dashboard snapshot sharing (dash and data snapshot), save to local or save to public snapshot dashboard snapshots.raintank.io site
- [Issue #1622](https://github.com/grafana/grafana/issues/1622). Share Panel: The share modal now has an embed option, gives you an iframe that you can use to embed a single graph on another web site
+- [Issue #1622](https://github.com/grafana/grafana/issues/1622). Share Panel: The share modal now has an embed option, gives you an iframe that you can use to embedd a single graph on another web site
 - [Issue #718](https://github.com/grafana/grafana/issues/718).   Dashboard: When saving a dashboard and another user has made changes in between the user is prompted with a warning if he really wants to overwrite the other's changes
 - [Issue #1331](https://github.com/grafana/grafana/issues/1331). Graph & Singlestat: New axis/unit format selector and more units (kbytes, Joule, Watt, eV), and new design for graph axis & grid tab and single stat options tab views
 - [Issue #1241](https://github.com/grafana/grafana/issues/1242). Timepicker: New option in timepicker (under dashboard settings), to change ``now`` to be for example ``now-1m``, useful when you want to ignore last minute because it contains incomplete data
@@ -1,56 +0,0 @@
-
-# Contributing
-
-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 have a trivial fix or improvement, go ahead and create a pull request.
-
-* If you plan to do something more involved, discuss your idea on the respective [issue](https://github.com/grafana/grafana/issues) or create a [new issue](https://github.com/grafana/grafana/issues/new) if it does not exist. This will avoid unnecessary work and surely give you and us a good deal of inspiration. 
-
-
-## 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) label 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.
-
-
-
-## Setup
-
-Follow the setup guide in README.md
-
-### Rebuild frontend assets on source change
-```
-yarn watch
-```
-
-### Rerun tests on source change
-```
-yarn jest
-```
-
-### Run tests for backend assets before commit
-```
-test -z "$(gofmt -s -l . | grep -v -E 'vendor/(github.com|golang.org|gopkg.in)' | tee /dev/stderr)"
-```
-
-### Run tests for frontend assets before commit
-```
-yarn test
-go test -v ./pkg/...
-```
-
-
-## 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.
-
-* Commits should be as small as possible, while ensuring that each commit is correct independently (i.e., each commit should compile and pass tests).
-
-* If your patch is not getting reviewed or you need a specific person to review it, you can @-reply a reviewer asking for a review in the pull request or a comment.
-
-* Add tests relevant to the fixed bug or new feature.
@@ -50,8 +50,7 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi

 WORKDIR $GF_PATHS_HOME

-RUN apt-get update && apt-get upgrade -y && \
-    apt-get install -qq -y libfontconfig ca-certificates && \
+RUN apt-get update && apt-get install -qq -y libfontconfig ca-certificates && \
    apt-get autoremove -y && \
    rm -rf /var/lib/apt/lists/*

@@ -2,39 +2,24 @@


 [[projects]]
-  digest = "1:f8ad8a53fa865a70efbe215b0ca34735523f50ea39e0efde319ab6fc80089b44"
  name = "cloud.google.com/go"
  packages = ["compute/metadata"]
-  pruneopts = "NUT"
  revision = "056a55f54a6cc77b440b31a56a5e7c3982d32811"
  version = "v0.22.0"

 [[projects]]
-  digest = "1:167b6f65a6656de568092189ae791253939f076df60231fdd64588ac703892a1"
  name = "github.com/BurntSushi/toml"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "b26d9c308763d68093482582cea63d69be07a0f0"
  version = "v0.3.0"

 [[projects]]
  branch = "master"
-  digest = "1:7d23e6e1889b8bb4bbb37a564708fdab4497ce232c3a99d66406c975b642a6ff"
  name = "github.com/Unknwon/com"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "7677a1d7c1137cd3dd5ba7a076d0c898a1ef4520"

 [[projects]]
-  branch = "master"
-  digest = "1:1610787cd9726e29d8fecc2a80e43e4fced008a1f560fec6688fc4d946f17835"
-  name = "github.com/VividCortex/mysqlerr"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "6c6b55f8796f578c870b7e19bafb16103bc40095"
-
-[[projects]]
-  digest = "1:58294d68772aab5a8941b7d5d228eff7cccf63f895e914bc9bc38fda80471ea5"
  name = "github.com/aws/aws-sdk-go"
  packages = [
    "aws",
@@ -70,523 +55,405 @@
    "service/ec2",
    "service/ec2/ec2iface",
    "service/s3",
-    "service/sts",
+    "service/sts"
  ]
-  pruneopts = "NUT"
  revision = "fde4ded7becdeae4d26bf1212916aabba79349b4"
  version = "v1.14.12"

 [[projects]]
  branch = "master"
-  digest = "1:79cad073c7be02632d3fa52f62486848b089f560db1e94536de83a408c0f4726"
  name = "github.com/benbjohnson/clock"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "7dc76406b6d3c05b5f71a86293cbcf3c4ea03b19"

 [[projects]]
  branch = "master"
-  digest = "1:707ebe952a8b3d00b343c01536c79c73771d100f63ec6babeaed5c79e2b8a8dd"
  name = "github.com/beorn7/perks"
  packages = ["quantile"]
-  pruneopts = "NUT"
  revision = "3a771d992973f24aa725d07868b467d1ddfceafb"

 [[projects]]
  branch = "master"
-  digest = "1:433a2ff0ef4e2f8634614aab3174783c5ff80120b487712db96cc3712f409583"
  name = "github.com/bmizerany/assert"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "b7ed37b82869576c289d7d97fb2bbd8b64a0cb28"

 [[projects]]
  branch = "master"
-  digest = "1:d8f9145c361920507a4f85ffb7f70b96beaedacba2ce8c00aa663adb08689d3e"
  name = "github.com/bradfitz/gomemcache"
  packages = ["memcache"]
-  pruneopts = "NUT"
  revision = "1952afaa557dc08e8e0d89eafab110fb501c1a2b"

 [[projects]]
  branch = "master"
-  digest = "1:8ecb89af7dfe3ac401bdb0c9390b134ef96a97e85f732d2b0604fb7b3977839f"
  name = "github.com/codahale/hdrhistogram"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "3a0bb77429bd3a61596f5e8a3172445844342120"

 [[projects]]
-  digest = "1:5dba68a1600a235630e208cb7196b24e58fcbb77bb7a6bec08fcd23f081b0a58"
  name = "github.com/codegangsta/cli"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"
  version = "v1.20.0"

 [[projects]]
-  digest = "1:a2c1d0e43bd3baaa071d1b9ed72c27d78169b2b269f71c105ac4ba34b1be4a39"
  name = "github.com/davecgh/go-spew"
  packages = ["spew"]
-  pruneopts = "NUT"
  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
  version = "v1.1.0"

 [[projects]]
-  digest = "1:1b318d2dd6cea8a1a8d8ec70348852303bd3e491df74e8bca6e32eb5a4d06970"
  name = "github.com/denisenkom/go-mssqldb"
  packages = [
    ".",
-    "internal/cp",
+    "internal/cp"
  ]
-  pruneopts = "NUT"
  revision = "270bc3860bb94dd3a3ffd047377d746c5e276726"

 [[projects]]
  branch = "master"
-  digest = "1:2da5f11ad66ff01a27a5c3dba4620b7eee2327be75b32c9ee9f87c9a8001ecbf"
  name = "github.com/facebookgo/inject"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "cc1aa653e50f6a9893bcaef89e673e5b24e1e97b"

 [[projects]]
  branch = "master"
-  digest = "1:1108df7f658c90db041e0d6174d55be689aaeb0585913b9c3c7aab51a3a6b2b1"
  name = "github.com/facebookgo/structtag"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "217e25fb96916cc60332e399c9aa63f5c422ceed"

 [[projects]]
-  digest = "1:ade392a843b2035effb4b4a2efa2c3bab3eb29b992e98bacf9c898b0ecb54e45"
  name = "github.com/fatih/color"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
  version = "v1.7.0"

 [[projects]]
-  digest = "1:e05711632e1515319b014e8fe4cbe1d30ab024c473403f60cf0fdeb4c586a474"
  name = "github.com/go-ini/ini"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "6529cf7c58879c08d927016dde4477f18a0634cb"
  version = "v1.36.0"

 [[projects]]
-  digest = "1:7e1c00b9959544fa1ccca7cf0407a5b29ac6d5201059c4fac6f599cb99bfd24d"
  name = "github.com/go-ldap/ldap"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9"
  version = "v2.5.1"

 [[projects]]
  branch = "master"
-  digest = "1:682a0aca743a1a4a36697f3d7f86c0ed403c4e3a780db9935f633242855eac9c"
  name = "github.com/go-macaron/binding"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "ac54ee249c27dca7e76fad851a4a04b73bd1b183"

 [[projects]]
  branch = "master"
-  digest = "1:6326b27f8e0c8e135c8674ddbc619fae879664ac832e8e6fa6a23ce0d279ed4d"
  name = "github.com/go-macaron/gzip"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "cad1c6580a07c56f5f6bc52d66002a05985c5854"

 [[projects]]
  branch = "master"
-  digest = "1:fb8711b648d1ff03104fc1d9593a13cb1d5120be7ba2b01641c14ccae286a9e3"
  name = "github.com/go-macaron/inject"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "d8a0b8677191f4380287cfebd08e462217bac7ad"

 [[projects]]
  branch = "master"
-  digest = "1:21577aafe885f088e8086a3415f154c63c0b7ce956a6994df2ac5776bc01b7e3"
  name = "github.com/go-macaron/session"
  packages = [
    ".",
    "memcache",
    "postgres",
-    "redis",
+    "redis"
  ]
-  pruneopts = "NUT"
-  revision = "068d408f9c54c7fa7fcc5e2bdd3241ab21280c9e"
+  revision = "b8e286a0dba8f4999042d6b258daf51b31d08938"

 [[projects]]
-  digest = "1:fddd4bada6100d6fc49a9f32f18ba5718db45a58e4b00aa6377e1cfbf06af34f"
  name = "github.com/go-sql-driver/mysql"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "2cc627ac8defc45d65066ae98f898166f580f9a4"

 [[projects]]
-  digest = "1:a1efdbc2762667c8a41cbf02b19a0549c846bf2c1d08cad4f445e3344089f1f0"
  name = "github.com/go-stack/stack"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "259ab82a6cad3992b4e21ff5cac294ccb06474bc"
  version = "v1.7.0"

 [[projects]]
-  digest = "1:b9d4f09cdaaa9e7dca5ed0b501ca5519eb2168dd01fc5d174c54edfe42a7d5ed"
  name = "github.com/go-xorm/builder"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "bad0a612f0d6277b953910822ab5dfb30dd18237"
  version = "v0.2.0"

 [[projects]]
-  digest = "1:30fb106b0cd6d64ea6fccded579c8f7d788460092f885fcc8f3edd02fc2085a4"
  name = "github.com/go-xorm/core"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "da1adaf7a28ca792961721a34e6e04945200c890"
  version = "v0.5.7"

 [[projects]]
-  digest = "1:007d1354e4f44e6a393337e7623bcf911dfe75d6ef30fb767a6a0b65d302f5ed"
  name = "github.com/go-xorm/xorm"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "1933dd69e294c0a26c0266637067f24dbb25770c"
  version = "v0.6.4"

 [[projects]]
  branch = "master"
-  digest = "1:ffbb19fb66f140b5ea059428d1f84246a055d1bc3d9456c1e5c3d143611f03d0"
  name = "github.com/golang/protobuf"
  packages = [
    "proto",
    "ptypes",
    "ptypes/any",
    "ptypes/duration",
-    "ptypes/timestamp",
+    "ptypes/timestamp"
  ]
-  pruneopts = "NUT"
  revision = "927b65914520a8b7d44f5c9057611cfec6b2e2d0"

 [[projects]]
  branch = "master"
-  digest = "1:f14d1b50e0075fb00177f12a96dd7addf93d1e2883c25befd17285b779549795"
  name = "github.com/gopherjs/gopherjs"
  packages = ["js"]
-  pruneopts = "NUT"
  revision = "8dffc02ea1cb8398bb73f30424697c60fcf8d4c5"

 [[projects]]
-  digest = "1:3b708ebf63bfa9ba3313bedb8526bc0bb284e51474e65e958481476a9d4a12aa"
  name = "github.com/gorilla/websocket"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"
  version = "v1.2.0"

 [[projects]]
-  digest = "1:4e771d1c6e15ca4516ad971c34205c822b5cff2747179679d7b321e4e1bfe431"
  name = "github.com/gosimple/slug"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "e9f42fa127660e552d0ad2b589868d403a9be7c6"
  version = "v1.1.1"

 [[projects]]
  branch = "master"
-  digest = "1:08e53c69cd267ef7d71eeae5d953153d0d2bc1b8e0b498731fe9acaead7001b6"
  name = "github.com/grafana/grafana-plugin-model"
  packages = [
    "go/datasource",
-    "go/renderer",
+    "go/renderer"
  ]
-  pruneopts = "NUT"
  revision = "84176c64269d8060f99e750ee8aba6f062753336"

 [[projects]]
  branch = "master"
-  digest = "1:58ba5285227b0f635652cd4aa82c4cfd00b590191eadd823462f0c9f64e3ae07"
  name = "github.com/hashicorp/go-hclog"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "69ff559dc25f3b435631604f573a5fa1efdb6433"

 [[projects]]
-  digest = "1:532090ffc3b05a7e4c0229dd2698d79149f2e0683df993224a8b202f607fb605"
  name = "github.com/hashicorp/go-plugin"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "e8d22c780116115ae5624720c9af0c97afe4f551"

 [[projects]]
  branch = "master"
-  digest = "1:8925116d1edcd85fc0c014e1aa69ce12892489b48ee633a605c46d893b8c151f"
  name = "github.com/hashicorp/go-version"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "23480c0665776210b5fbbac6eaaee40e3e6a96b7"

 [[projects]]
  branch = "master"
-  digest = "1:8deb0c5545c824dfeb0ac77ab8eb67a3d541eab76df5c85ce93064ef02d44cd0"
  name = "github.com/hashicorp/yamux"
  packages = ["."]
-  pruneopts = "NUT"
-  revision = "7221087c3d281fda5f794e28c2ea4c6e4d5c4558"
+  revision = "2658be15c5f05e76244154714161f17e3e77de2e"

 [[projects]]
-  digest = "1:efbe016b6d198cf44f1db0ed2fbdf1b36ebf1f6956cc9b76d6affa96f022d368"
  name = "github.com/inconshreveable/log15"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "0decfc6c20d9ca0ad143b0e89dcaa20f810b4fb3"
  version = "v2.13"

 [[projects]]
-  digest = "1:ac6d01547ec4f7f673311b4663909269bfb8249952de3279799289467837c3cc"
  name = "github.com/jmespath/go-jmespath"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "0b12d6b5"

 [[projects]]
-  digest = "1:6ddab442e52381bab82fb6c07ef3f4b565ff7ec4b8fae96d8dd4b8573a460597"
  name = "github.com/jtolds/gls"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "77f18212c9c7edc9bd6a33d383a7b545ce62f064"
  version = "v4.2.1"

 [[projects]]
-  digest = "1:1da1796a71eb70f1e3e085984d044f67840bb0326816ec8276231aa87b1b9fc3"
  name = "github.com/klauspost/compress"
  packages = [
    "flate",
-    "gzip",
+    "gzip"
  ]
-  pruneopts = "NUT"
  revision = "6c8db69c4b49dd4df1fff66996cf556176d0b9bf"
  version = "v1.2.1"

 [[projects]]
-  digest = "1:5e55a8699c9ff7aba1e4c8952aeda209685d88d4cb63a8766c338e333b8e65d6"
  name = "github.com/klauspost/cpuid"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da"
  version = "v1.1"

 [[projects]]
-  digest = "1:b95da1293525625ef6f07be79d537b9bf2ecd7901efcf9a92193edafbd55b9ef"
  name = "github.com/klauspost/crc32"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "cb6bfca970f6908083f26f39a79009d608efd5cd"
  version = "v1.1"

 [[projects]]
-  digest = "1:7b21c7fc5551b46d1308b4ffa9e9e49b66c7a8b0ba88c0130474b0e7a20d859f"
  name = "github.com/kr/pretty"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "73f6ac0b30a98e433b289500d779f50c1a6f0712"
  version = "v0.1.0"

 [[projects]]
-  digest = "1:c3a7836b5904db0f8b609595b619916a6831cb35b8b714aec39f96d00c6155d8"
  name = "github.com/kr/text"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f"
  version = "v0.1.0"

 [[projects]]
  branch = "master"
-  digest = "1:7a1e592f0349d56fac8ce47f28469e4e7f4ce637cb26f40c88da9dff25db1c98"
  name = "github.com/lib/pq"
  packages = [
    ".",
-    "oid",
+    "oid"
  ]
-  pruneopts = "NUT"
  revision = "d34b9ff171c21ad295489235aec8b6626023cd04"

 [[projects]]
-  digest = "1:08c231ec84231a7e23d67e4b58f975e1423695a32467a362ee55a803f9de8061"
  name = "github.com/mattn/go-colorable"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"
  version = "v0.0.9"

 [[projects]]
-  digest = "1:bc4f7eec3b7be8c6cb1f0af6c1e3333d5bb71072951aaaae2f05067b0803f287"
  name = "github.com/mattn/go-isatty"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
  version = "v0.0.3"

 [[projects]]
-  digest = "1:536979f1c56397dbf91c2785159b37dec37e35d3bffa3cd1cfe66d25f51f8088"
  name = "github.com/mattn/go-sqlite3"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "323a32be5a2421b8c7087225079c6c900ec397cd"
  version = "v1.7.0"

 [[projects]]
-  digest = "1:5985ef4caf91ece5d54817c11ea25f182697534f8ae6521eadcd628c142ac4b6"
  name = "github.com/matttproud/golang_protobuf_extensions"
  packages = ["pbutil"]
-  pruneopts = "NUT"
  revision = "3247c84500bff8d9fb6d579d800f20b3e091582c"
  version = "v1.0.0"

 [[projects]]
  branch = "master"
-  digest = "1:18b773b92ac82a451c1276bd2776c1e55ce057ee202691ab33c8d6690efcc048"
  name = "github.com/mitchellh/go-testing-interface"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "a61a99592b77c9ba629d254a693acffaeb4b7e28"

 [[projects]]
-  digest = "1:3b517122f3aad1ecce45a630ea912b3092b4729f25532a911d0cb2935a1f9352"
  name = "github.com/oklog/run"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "4dadeb3030eda0273a12382bb2348ffc7c9d1a39"
  version = "v1.0.0"

 [[projects]]
-  digest = "1:7da29c22bcc5c2ffb308324377dc00b5084650348c2799e573ed226d8cc9faf0"
  name = "github.com/opentracing/opentracing-go"
  packages = [
    ".",
    "ext",
-    "log",
+    "log"
  ]
-  pruneopts = "NUT"
  revision = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38"
  version = "v1.0.2"

 [[projects]]
-  digest = "1:748946761cf99c8b73cef5a3c0ee3e040859dd713a20cece0d0e0dc04e6ceca7"
  name = "github.com/patrickmn/go-cache"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"
  version = "v2.1.0"

 [[projects]]
-  digest = "1:5cf3f025cbee5951a4ee961de067c8a89fc95a5adabead774f82822efabab121"
  name = "github.com/pkg/errors"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
  version = "v0.8.0"

 [[projects]]
-  digest = "1:4759bed95e3a52febc18c071db28790a5c6e9e106ee201a37add6f6a056f8f9c"
  name = "github.com/prometheus/client_golang"
  packages = [
    "api",
    "api/prometheus/v1",
    "prometheus",
-    "prometheus/promhttp",
+    "prometheus/promhttp"
  ]
-  pruneopts = "NUT"
  revision = "967789050ba94deca04a5e84cce8ad472ce313c1"
  version = "v0.9.0-pre1"

 [[projects]]
  branch = "master"
-  digest = "1:32d10bdfa8f09ecf13598324dba86ab891f11db3c538b6a34d1c3b5b99d7c36b"
  name = "github.com/prometheus/client_model"
  packages = ["go"]
-  pruneopts = "NUT"
  revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"

 [[projects]]
  branch = "master"
-  digest = "1:768b555b86742de2f28beb37f1dedce9a75f91f871d75b5717c96399c1a78c08"
  name = "github.com/prometheus/common"
  packages = [
    "expfmt",
    "internal/bitbucket.org/ww/goautoneg",
-    "model",
+    "model"
  ]
-  pruneopts = "NUT"
  revision = "d811d2e9bf898806ecfb6ef6296774b13ffc314c"

 [[projects]]
  branch = "master"
-  digest = "1:c4a213a8d73fbb0b13f717ba7996116602ef18ecb42b91d77405877914cb0349"
  name = "github.com/prometheus/procfs"
  packages = [
    ".",
    "internal/util",
    "nfs",
-    "xfs",
+    "xfs"
  ]
-  pruneopts = "NUT"
  revision = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e"

 [[projects]]
  branch = "master"
-  digest = "1:16e2136a67ec44aa2d1d6b0fd65394b3c4a8b2a1b6730c77967f7b7b06b179b2"
  name = "github.com/rainycape/unidecode"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "cb7f23ec59bec0d61b19c56cd88cee3d0cc1870c"

 [[projects]]
-  digest = "1:d917313f309bda80d27274d53985bc65651f81a5b66b820749ac7f8ef061fd04"
  name = "github.com/sergi/go-diff"
  packages = ["diffmatchpatch"]
-  pruneopts = "NUT"
  revision = "1744e2970ca51c86172c8190fadad617561ed6e7"
  version = "v1.0.0"

 [[projects]]
-  digest = "1:1f0b284a6858827de4c27c66b49b2b25df3e16b031c2b57b7892273131e7dd2b"
  name = "github.com/smartystreets/assertions"
  packages = [
    ".",
    "internal/go-render/render",
-    "internal/oglematchers",
+    "internal/oglematchers"
  ]
-  pruneopts = "NUT"
  revision = "7678a5452ebea5b7090a6b163f844c133f523da2"
  version = "1.8.3"

 [[projects]]
-  digest = "1:7efd0b2309cdd6468029fa30c808c50a820c9344df07e1a4bbdaf18f282907aa"
  name = "github.com/smartystreets/goconvey"
  packages = [
    "convey",
    "convey/gotest",
-    "convey/reporting",
+    "convey/reporting"
  ]
-  pruneopts = "NUT"
  revision = "9e8dc3f972df6c8fcc0375ef492c24d0bb204857"
  version = "1.6.3"

 [[projects]]
  branch = "master"
-  digest = "1:a66add8dd963bfc72649017c1b321198f596cb4958cb1a11ff91a1be8691020b"
  name = "github.com/teris-io/shortid"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "771a37caa5cf0c81f585d7b6df4dfc77e0615b5c"

 [[projects]]
-  digest = "1:3d48c38e0eca8c66df62379c5ae7a83fb5cd839b94f241354c07ba077da7bc45"
  name = "github.com/uber/jaeger-client-go"
  packages = [
    ".",
@@ -604,55 +471,43 @@
    "thrift-gen/jaeger",
    "thrift-gen/sampling",
    "thrift-gen/zipkincore",
-    "utils",
+    "utils"
  ]
-  pruneopts = "NUT"
  revision = "b043381d944715b469fd6b37addfd30145ca1758"
  version = "v2.14.0"

 [[projects]]
-  digest = "1:0f09db8429e19d57c8346ad76fbbc679341fa86073d3b8fb5ac919f0357d8f4c"
  name = "github.com/uber/jaeger-lib"
  packages = ["metrics"]
-  pruneopts = "NUT"
  revision = "ed3a127ec5fef7ae9ea95b01b542c47fbd999ce5"
  version = "v1.5.0"

 [[projects]]
-  digest = "1:4c7d12ad3ef47bb03892a52e2609dc9a9cff93136ca9c7d31c00b79fcbc23c7b"
  name = "github.com/yudai/gojsondiff"
  packages = [
    ".",
-    "formatter",
+    "formatter"
  ]
-  pruneopts = "NUT"
  revision = "7b1b7adf999dab73a6eb02669c3d82dbb27a3dd6"
  version = "1.0.0"

 [[projects]]
  branch = "master"
-  digest = "1:e50cbf8eba568d59b71e08c22c2a77809ed4646ae06ef4abb32b3d3d3fdb1a77"
  name = "github.com/yudai/golcs"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "ecda9a501e8220fae3b4b600c3db4b0ba22cfc68"

 [[projects]]
  branch = "master"
-  digest = "1:758f363e0dff33cf00b234be2efb12f919d79b42d5ae3909ff9eb69ef2c3cca5"
  name = "golang.org/x/crypto"
  packages = [
-    "ed25519",
-    "ed25519/internal/edwards25519",
    "md4",
-    "pbkdf2",
+    "pbkdf2"
  ]
-  pruneopts = "NUT"
  revision = "1a580b3eff7814fc9b40602fd35256c63b50f491"

 [[projects]]
  branch = "master"
-  digest = "1:0b3fee9c4472022a0982ee0d81e08b3cc3e595f50befd7a4b358b48540d9d8c5"
  name = "golang.org/x/net"
  packages = [
    "context",
@@ -662,43 +517,35 @@
    "http2/hpack",
    "idna",
    "internal/timeseries",
-    "trace",
+    "trace"
  ]
-  pruneopts = "NUT"
  revision = "2491c5de3490fced2f6cff376127c667efeed857"

 [[projects]]
  branch = "master"
-  digest = "1:46bd4e66bfce5e77f08fc2e8dcacc3676e679241ce83d9c150ff0397d686dd44"
  name = "golang.org/x/oauth2"
  packages = [
    ".",
    "google",
    "internal",
    "jws",
-    "jwt",
+    "jwt"
  ]
-  pruneopts = "NUT"
  revision = "cdc340f7c179dbbfa4afd43b7614e8fcadde4269"

 [[projects]]
  branch = "master"
-  digest = "1:39ebcc2b11457b703ae9ee2e8cca0f68df21969c6102cb3b705f76cca0ea0239"
  name = "golang.org/x/sync"
  packages = ["errgroup"]
-  pruneopts = "NUT"
  revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca"

 [[projects]]
  branch = "master"
-  digest = "1:ec21c5bf0572488865b93e30ffd9132afbf85bec0b20c2d6cbcf349cf2031ed5"
  name = "golang.org/x/sys"
  packages = ["unix"]
-  pruneopts = "NUT"
  revision = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b"

 [[projects]]
-  digest = "1:e7071ed636b5422cc51c0e3a6cebc229d6c9fffc528814b519a980641422d619"
  name = "golang.org/x/text"
  packages = [
    "collate",
@@ -714,14 +561,12 @@
    "unicode/bidi",
    "unicode/cldr",
    "unicode/norm",
-    "unicode/rangetable",
+    "unicode/rangetable"
  ]
-  pruneopts = "NUT"
  revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
  version = "v0.3.0"

 [[projects]]
-  digest = "1:dbd5568923513ee74aa626d027e2a8a352cf8f35df41d19f4e34491d1858c38b"
  name = "google.golang.org/appengine"
  packages = [
    ".",
@@ -734,22 +579,18 @@
    "internal/modules",
    "internal/remote_api",
    "internal/urlfetch",
-    "urlfetch",
+    "urlfetch"
  ]
-  pruneopts = "NUT"
  revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a"
  version = "v1.0.0"

 [[projects]]
  branch = "master"
-  digest = "1:3c24554c312721e98fa6b76403e7100cf974eb46b1255ea7fc6471db9a9ce498"
  name = "google.golang.org/genproto"
  packages = ["googleapis/rpc/status"]
-  pruneopts = "NUT"
  revision = "7bb2a897381c9c5ab2aeb8614f758d7766af68ff"

 [[projects]]
-  digest = "1:840b77b6eb539b830bb760b6e30b688ed2ff484bd83466fce2395835ed9367fe"
  name = "google.golang.org/grpc"
  packages = [
    ".",
@@ -776,167 +617,62 @@
    "stats",
    "status",
    "tap",
-    "transport",
+    "transport"
  ]
-  pruneopts = "NUT"
  revision = "1e2570b1b19ade82d8dbb31bba4e65e9f9ef5b34"
  version = "v1.11.1"

 [[projects]]
  branch = "v3"
-  digest = "1:1244a9b3856f70d5ffb74bbfd780fc9d47f93f2049fa265c6fb602878f507bf8"
  name = "gopkg.in/alexcesaro/quotedprintable.v3"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "2caba252f4dc53eaf6b553000885530023f54623"

 [[projects]]
-  digest = "1:aea6e9483c167cc6fdf1274c442558c5dda8fd3373372be04d98c79100868da1"
  name = "gopkg.in/asn1-ber.v1"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "379148ca0225df7a432012b8df0355c2a2063ac0"
  version = "v1.2"

 [[projects]]
-  digest = "1:24bfc2e8bf971485cb5ba0f0e5b08a1b806cca5828134df76b32d1ea50f2ab49"
  name = "gopkg.in/bufio.v1"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "567b2bfa514e796916c4747494d6ff5132a1dfce"
  version = "v1"

 [[projects]]
-  digest = "1:e05711632e1515319b014e8fe4cbe1d30ab024c473403f60cf0fdeb4c586a474"
  name = "gopkg.in/ini.v1"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "6529cf7c58879c08d927016dde4477f18a0634cb"
  version = "v1.36.0"

 [[projects]]
-  digest = "1:3b0cf3a465fd07f76e5fc1a9d0783c662dac0de9fc73d713ebe162768fd87b5f"
  name = "gopkg.in/macaron.v1"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "c1be95e6d21e769e44e1ec33cec9da5837861c10"
  version = "v1.3.1"

 [[projects]]
  branch = "v2"
-  digest = "1:d52332f9e9f2c6343652e13aa3fd40cfd03353520c9a48d90f21215d3012d50f"
  name = "gopkg.in/mail.v2"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "5bc5c8bb07bd8d2803831fbaf8cbd630fcde2c68"

 [[projects]]
-  digest = "1:00126f697efdcab42f07c89ac8bf0095fb2328aef6464e070055154088cea859"
  name = "gopkg.in/redis.v2"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "e6179049628164864e6e84e973cfb56335748dea"
  version = "v2.3.2"

 [[projects]]
-  digest = "1:a50fabe7a46692dc7c656310add3d517abe7914df02afd151ef84da884605dc8"
-  name = "gopkg.in/square/go-jose.v2"
-  packages = [
-    ".",
-    "cipher",
-    "json",
-  ]
-  pruneopts = "NUT"
-  revision = "ef984e69dd356202fd4e4910d4d9c24468bdf0b8"
-  version = "v2.1.9"
-
-[[projects]]
-  branch = "v2"
-  digest = "1:7c95b35057a0ff2e19f707173cc1a947fa43a6eb5c4d300d196ece0334046082"
  name = "gopkg.in/yaml.v2"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
+  version = "v2.2.1"

 [solve-meta]
  analyzer-name = "dep"
  analyzer-version = 1
-  input-imports = [
-    "github.com/BurntSushi/toml",
-    "github.com/Unknwon/com",
-    "github.com/VividCortex/mysqlerr",
-    "github.com/aws/aws-sdk-go/aws",
-    "github.com/aws/aws-sdk-go/aws/awserr",
-    "github.com/aws/aws-sdk-go/aws/awsutil",
-    "github.com/aws/aws-sdk-go/aws/credentials",
-    "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds",
-    "github.com/aws/aws-sdk-go/aws/credentials/endpointcreds",
-    "github.com/aws/aws-sdk-go/aws/defaults",
-    "github.com/aws/aws-sdk-go/aws/ec2metadata",
-    "github.com/aws/aws-sdk-go/aws/endpoints",
-    "github.com/aws/aws-sdk-go/aws/request",
-    "github.com/aws/aws-sdk-go/aws/session",
-    "github.com/aws/aws-sdk-go/service/cloudwatch",
-    "github.com/aws/aws-sdk-go/service/ec2",
-    "github.com/aws/aws-sdk-go/service/ec2/ec2iface",
-    "github.com/aws/aws-sdk-go/service/s3",
-    "github.com/aws/aws-sdk-go/service/sts",
-    "github.com/benbjohnson/clock",
-    "github.com/bmizerany/assert",
-    "github.com/codegangsta/cli",
-    "github.com/davecgh/go-spew/spew",
-    "github.com/denisenkom/go-mssqldb",
-    "github.com/facebookgo/inject",
-    "github.com/fatih/color",
-    "github.com/go-ldap/ldap",
-    "github.com/go-macaron/binding",
-    "github.com/go-macaron/gzip",
-    "github.com/go-macaron/session",
-    "github.com/go-macaron/session/memcache",
-    "github.com/go-macaron/session/postgres",
-    "github.com/go-macaron/session/redis",
-    "github.com/go-sql-driver/mysql",
-    "github.com/go-stack/stack",
-    "github.com/go-xorm/core",
-    "github.com/go-xorm/xorm",
-    "github.com/gorilla/websocket",
-    "github.com/gosimple/slug",
-    "github.com/grafana/grafana-plugin-model/go/datasource",
-    "github.com/grafana/grafana-plugin-model/go/renderer",
-    "github.com/hashicorp/go-hclog",
-    "github.com/hashicorp/go-plugin",
-    "github.com/hashicorp/go-version",
-    "github.com/inconshreveable/log15",
-    "github.com/lib/pq",
-    "github.com/mattn/go-isatty",
-    "github.com/mattn/go-sqlite3",
-    "github.com/opentracing/opentracing-go",
-    "github.com/opentracing/opentracing-go/ext",
-    "github.com/opentracing/opentracing-go/log",
-    "github.com/patrickmn/go-cache",
-    "github.com/pkg/errors",
-    "github.com/prometheus/client_golang/api",
-    "github.com/prometheus/client_golang/api/prometheus/v1",
-    "github.com/prometheus/client_golang/prometheus",
-    "github.com/prometheus/client_golang/prometheus/promhttp",
-    "github.com/prometheus/client_model/go",
-    "github.com/prometheus/common/expfmt",
-    "github.com/prometheus/common/model",
-    "github.com/smartystreets/goconvey/convey",
-    "github.com/teris-io/shortid",
-    "github.com/uber/jaeger-client-go/config",
-    "github.com/yudai/gojsondiff",
-    "github.com/yudai/gojsondiff/formatter",
-    "golang.org/x/net/context/ctxhttp",
-    "golang.org/x/oauth2",
-    "golang.org/x/oauth2/google",
-    "golang.org/x/oauth2/jwt",
-    "golang.org/x/sync/errgroup",
-    "gopkg.in/ini.v1",
-    "gopkg.in/macaron.v1",
-    "gopkg.in/mail.v2",
-    "gopkg.in/square/go-jose.v2",
-    "gopkg.in/yaml.v2",
-  ]
+  inputs-digest = "81a37e747b875cf870c1b9486fa3147e704dea7db8ba86f7cb942d3ddc01d3e3"
  solver-name = "gps-cdcl"
  solver-version = 1
@@ -203,11 +203,3 @@ ignored = [
 [[constraint]]
  name = "github.com/denisenkom/go-mssqldb"
  revision = "270bc3860bb94dd3a3ffd047377d746c5e276726"
-
-[[constraint]]
-  name = "github.com/VividCortex/mysqlerr"
-  branch = "master"
-
-[[constraint]]
-  name = "gopkg.in/square/go-jose.v2"
-  version = "2.1.9"
@@ -9,17 +9,12 @@ module.exports = function (grunt) {
    destDir: 'dist',
    tempDir: 'tmp',
    platform: process.platform.replace('win32', 'windows'),
-    enterprise: false,
  };

  if (grunt.option('platform')) {
    config.platform = grunt.option('platform');
  }

-  if (grunt.option('enterprise')) {
-    config.enterprise = true;
-  }
-
  if (grunt.option('arch')) {
    config.arch = grunt.option('arch');
  } else {
@@ -30,6 +25,7 @@ module.exports = function (grunt) {
    }
  }

+  config.coverage = grunt.option('coverage');
  config.phjs = grunt.option('phjsToRelease');
  config.pkg.version = grunt.option('pkgVer') || config.pkg.version;

@@ -5,7 +5,8 @@ all: deps build
 deps-go:
 	go run build.go setup

-deps-js: node_modules
+deps-js:
+	yarn install --pure-lockfile --no-progress

 deps: deps-js

@@ -25,7 +26,7 @@ build: build-go build-js

 build-docker-dev:
 	@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
+	go run build.go -goos linux -pkg-arch amd64 ${OPT} build package-only latest
 	cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
 	cd packaging/docker && docker build --tag grafana/grafana:dev .

@@ -43,9 +44,5 @@ test: test-go test-js
 run:
 	./bin/grafana-server

-clean:
-	rm -rf node_modules
-	rm -rf public/build
-
-node_modules: package.json yarn.lock
-	yarn install --pure-lockfile --no-progress
+protoc:
+	protoc -I pkg/tsdb/models pkg/tsdb/models/*.proto --go_out=plugins=grpc:pkg/tsdb/models/.
@@ -6,8 +6,8 @@ upgrading Grafana please check here before creating an issue.

 ## Links

- [Datasource plugin written in TypeScript](https://github.com/grafana/typescript-template-datasource)
- [Simple JSON datasource plugin](https://github.com/grafana/simple-json-datasource)
+- [Datasource plugin written in typescript](https://github.com/grafana/typescript-template-datasource)
+- [Simple json dataource plugin](https://github.com/grafana/simple-json-datasource)
 - [Plugin development guide](http://docs.grafana.org/plugins/developing/development/)
 - [Webpack Grafana plugin template project](https://github.com/CorpGlory/grafana-plugin-template-webpack)

@@ -24,7 +24,7 @@ the latest master builds [here](https://grafana.com/grafana/download)

 ### Dependencies

- Go (Latest Stable)
+- Go 1.11
 - NodeJS LTS

 ### Building the backend
@@ -69,27 +69,15 @@ bra run

 Open grafana in your browser (default: `http://localhost:3000`) and login with admin user (default: `user/pass = admin/admin`).

-### Building a Docker image
+### Building a docker image (on linux/amd64)

-There are two different ways to build a Grafana docker image. If you're machine is setup for Grafana development and you run linux/amd64 you can build just the image. Otherwise, there is the option to build Grafana completely within Docker.
-
-Run the image you have built using: `docker run --rm -p 3000:3000 grafana/grafana:dev`
-
-#### Building on linux/amd64 (fast)
+This builds a docker image from your local sources:

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

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

-#### Building anywhere (slower)
-
-Choose this option to build on platforms other than linux/amd64 and/or not have to setup the Grafana development environment.
-
-1. `make build-docker-full` or `docker build -t grafana/grafana:dev .`
-
-The resulting image will be tagged as `grafana/grafana:dev`
-
 ### Dev config

 Create a custom.ini in the conf directory to override default configuration options.
@@ -125,6 +113,18 @@ GRAFANA_TEST_DB=mysql go test ./pkg/...
 GRAFANA_TEST_DB=postgres go test ./pkg/...
 ```

+## Building custom docker image
+
+You can build a custom image using Docker, which doesn't require installing any dependencies besides docker itself.
+```bash
+git clone https://github.com/grafana/grafana
+cd grafana
+docker build -t grafana:dev .
+docker run -d --name=grafana -p 3000:3000 grafana:dev
+```
+
+Open grafana in your browser (default: `http://localhost:3000`) and login with admin user (default: `user/pass = admin/admin`).
+
 ## Contribute

 If you have any idea for an improvement or found a bug, do not hesitate to open an issue.
@@ -138,5 +138,5 @@ plugin development.

 ## License

-Grafana is distributed under [Apache 2.0 License](https://github.com/grafana/grafana/blob/master/LICENSE.md).
+Grafana is distributed under Apache 2.0 License.

@@ -1,89 +0,0 @@
-# Guide to Upgrading Dependencies
-
-Upgrading Go or Node.js requires making changes in many different files. See below for a list and explanation for each.
-
-## Go
-
- CircleCi
- `grafana/build-container`
- Appveyor
- Dockerfile
-
-## Node.js
-
- CircleCI
- `grafana/build-container`
- Appveyor
- Dockerfile
-
-## Go Dependencies
-
-Updated using `dep`.
-
- `Gopkg.toml`
- `Gopkg.lock`
-
-## Node.js Dependencies
-
-Updated using `yarn`.
-
- `package.json`
-
-## Where to make changes
-
-### CircleCI
-
-Our builds run on CircleCI through our build script.
-
-#### Files
-
- `.circleci/config.yml`.
-
-#### Dependencies
-
- nodejs
- golang
- grafana/build-container (our custom docker build container)
-
-### grafana/build-container
-
-The main build step (in CircleCI) is built using a custom build container that comes pre-baked with some of the neccesary dependencies.
-
-Link: [grafana-build-container](https://github.com/grafana/grafana-build-container)
-
-#### Dependencies
-
- fpm
- nodejs
- golang
- crosscompiling (several compilers)
-
-### Appveyor
-
-Master and release builds trigger test runs on Appveyors build environment so that tests will run on Windows.
-
-#### Files:
-
- `appveyor.yml`
-
-#### Dependencies
-
- nodejs
- golang
-
-### Dockerfile
-
-There is a Docker build for Grafana in the root of the project that allows anyone to build Grafana just using Docker.
-
-#### Files
-
- `Dockerfile`
-
-#### Dependencies
-
- nodejs
- golang
-
-### Local developer environments
-
-Please send out a notice in the grafana-dev slack channel when updating Go or Node.js to make it easier for everyone to update their local developer environments.
@@ -5,7 +5,7 @@ os: Windows Server 2012 R2
 clone_folder: c:\gopath\src\github.com\grafana\grafana

 environment:
-  nodejs_version: "8"
+  nodejs_version: "6"
  GOPATH: C:\gopath
  GOVERSION: 1.11

@@ -22,11 +22,6 @@ import (
 	"time"
 )

-const (
-	windows = "windows"
-	linux   = "linux"
-)
-
 var (
 	//versionRe = regexp.MustCompile(`-[0-9]{1,3}-g[0-9a-f]{5,10}`)
 	goarch  string
@@ -41,8 +36,8 @@ var (
 	race                  bool
 	phjsToRelease         string
 	workingDir            string
-	includeBuildId        bool     = true
-	buildId               string   = "0"
+	includeBuildNumber    bool     = true
+	buildNumber           int      = 0
 	binaries              []string = []string{"grafana-server", "grafana-cli"}
 	isDev                 bool     = false
 	enterprise            bool     = false
@@ -54,8 +49,6 @@ func main() {

 	ensureGoPath()

-	var buildIdRaw string
-
 	flag.StringVar(&goarch, "goarch", runtime.GOARCH, "GOARCH")
 	flag.StringVar(&goos, "goos", runtime.GOOS, "GOOS")
 	flag.StringVar(&gocc, "cc", "", "CC")
@@ -63,14 +56,12 @@ func main() {
 	flag.StringVar(&pkgArch, "pkg-arch", "", "PKG ARCH")
 	flag.StringVar(&phjsToRelease, "phjs", "", "PhantomJS binary")
 	flag.BoolVar(&race, "race", race, "Use race detector")
-	flag.BoolVar(&includeBuildId, "includeBuildId", includeBuildId, "IncludeBuildId in package name")
+	flag.BoolVar(&includeBuildNumber, "includeBuildNumber", includeBuildNumber, "IncludeBuildNumber in package name")
 	flag.BoolVar(&enterprise, "enterprise", enterprise, "Build enterprise version of Grafana")
-	flag.StringVar(&buildIdRaw, "buildId", "0", "Build ID from CI system")
+	flag.IntVar(&buildNumber, "buildNumber", 0, "Build number from CI system")
 	flag.BoolVar(&isDev, "dev", isDev, "optimal for development, skips certain steps")
 	flag.Parse()

-	buildId = shortenBuildId(buildIdRaw)
-
 	readVersionFromPackageJson()

 	if pkgArch == "" {
@@ -119,17 +110,16 @@ func main() {
 		case "package":
 			grunt(gruntBuildArg("build")...)
 			grunt(gruntBuildArg("package")...)
-			if goos == linux {
+			if goos == "linux" {
 				createLinuxPackages()
 			}

 		case "package-only":
 			grunt(gruntBuildArg("package")...)
-			if goos == linux {
+			if goos == "linux" {
 				createLinuxPackages()
 			}
-		case "pkg-archive":
-			grunt(gruntBuildArg("package")...)
+

 		case "pkg-rpm":
 			grunt(gruntBuildArg("release")...)
@@ -203,9 +193,9 @@ func readVersionFromPackageJson() {
 	}

 	// add timestamp to iteration
-	if includeBuildId {
-		if buildId != "0" {
-			linuxPackageIteration = fmt.Sprintf("%s%s", buildId, linuxPackageIteration)
+	if includeBuildNumber {
+		if buildNumber != 0 {
+			linuxPackageIteration = fmt.Sprintf("%d%s", buildNumber, linuxPackageIteration)
 		} else {
 			linuxPackageIteration = fmt.Sprintf("%d%s", time.Now().Unix(), linuxPackageIteration)
 		}
@@ -389,7 +379,7 @@ func ensureGoPath() {
 }

 func grunt(params ...string) {
-	if runtime.GOOS == windows {
+	if runtime.GOOS == "windows" {
 		runPrint(`.\node_modules\.bin\grunt`, params...)
 	} else {
 		runPrint("./node_modules/.bin/grunt", params...)
@@ -398,7 +388,7 @@ func grunt(params ...string) {

 func gruntBuildArg(task string) []string {
 	args := []string{task}
-	if includeBuildId {
+	if includeBuildNumber {
 		args = append(args, fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration))
 	} else {
 		args = append(args, fmt.Sprintf("--pkgVer=%v", version))
@@ -409,10 +399,6 @@ func gruntBuildArg(task string) []string {
 	if phjsToRelease != "" {
 		args = append(args, fmt.Sprintf("--phjsToRelease=%v", phjsToRelease))
 	}
-	if enterprise {
-		args = append(args, "--enterprise")
-	}
-
 	args = append(args, fmt.Sprintf("--platform=%v", goos))

 	return args
@@ -431,11 +417,11 @@ func test(pkg string) {
 func build(binaryName, pkg string, tags []string) {
 	binary := fmt.Sprintf("./bin/%s-%s/%s", goos, goarch, binaryName)
 	if isDev {
-		//don't include os and arch in output path in dev environment
+		//dont include os and arch in output path in dev environment
 		binary = fmt.Sprintf("./bin/%s", binaryName)
 	}

-	if goos == windows {
+	if goos == "windows" {
 		binary += ".exe"
 	}

@@ -477,7 +463,6 @@ func ldflags() string {
 	b.WriteString(fmt.Sprintf(" -X main.version=%s", version))
 	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()))
 	return b.String()
 }

@@ -500,11 +485,11 @@ func clean() {

 func setBuildEnv() {
 	os.Setenv("GOOS", goos)
-	if goos == windows {
+	if goos == "windows" {
 		// require windows >=7
 		os.Setenv("CGO_CFLAGS", "-D_WIN32_WINNT=0x0601")
 	}
-	if goarch != "amd64" || goos != linux {
+	if goarch != "amd64" || goos != "linux" {
 		// needed for all other archs
 		cgo = true
 	}
@@ -525,14 +510,6 @@ func setBuildEnv() {
 	}
 }

-func getGitBranch() string {
-	v, err := runError("git", "rev-parse", "--abbrev-ref", "HEAD")
-	if err != nil {
-		return "master"
-	}
-	return string(v)
-}
-
 func getGitSha() string {
 	v, err := runError("git", "rev-parse", "--short", "HEAD")
 	if err != nil {
@@ -638,11 +615,3 @@ func shaFile(file string) error {

 	return out.Close()
 }
-
-func shortenBuildId(buildId string) string {
-	buildId = strings.Replace(buildId, "-", "", -1)
-	if len(buildId) < 9 {
-		return buildId
-	}
-	return buildId[0:8]
-}
@@ -0,0 +1,11 @@
+coverage:
+  precision: 2
+  round: down
+  range: "50...100"
+
+  status:
+    project: yes
+    patch: yes
+    changes: no
+
+comment: off
@@ -246,10 +246,6 @@ disable_signout_menu = false
 # URL to redirect the user to after sign out
 signout_redirect_url =

-# Set to true to attempt login with OAuth automatically, skipping the login screen.
-# This setting is ignored if multiple OAuth providers are configured.
-oauth_auto_login = false
-
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -325,7 +321,6 @@ allow_sign_up = true
 client_id = some_id
 client_secret = some_secret
 scopes = user:email
-email_attribute_name = email:primary
 auth_url =
 token_url =
 api_url =
@@ -348,7 +343,6 @@ header_property = username
 auto_sign_up = true
 ldap_sync_ttl = 60
 whitelist =
-headers =

 #################################### Auth LDAP ###########################
 [auth.ldap]
@@ -479,10 +473,6 @@ error_or_timeout = alerting
 # Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
 nodata_or_nullvalues = no_data

-# Alert notifications can include images, but rendering many images at the same time can overload the server
-# This limit will protect the server from render overloading and make sure notifications are sent out quickly
-concurrent_render_limit = 5
-
 #################################### Explore #############################
 [explore]
 # Enable the Explore section
@@ -494,10 +484,6 @@ enabled = false
 enabled           = true
 interval_seconds  = 10

-#If both are set, basic auth will be required for the metrics endpoint.
-basic_auth_username =
-basic_auth_password =
-
 # Send internal Grafana metrics to graphite
 [metrics.graphite]
 # Enable by setting the address setting (ex localhost:2003)
@@ -563,10 +549,3 @@ container_name =
 # Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
 server_url =
 callback_url =
-
-[panels]
-enable_alpha = false
-
-[enterprise]
-license_path =
-
@@ -31,11 +31,37 @@ search_filter = "(cn=%s)"
 # An array of base dns to search through
 search_base_dns = ["dc=grafana,dc=org"]

-## For Posix or LDAP setups that does not support member_of attribute you can define the below settings
-## Please check grafana LDAP docs for examples
+# 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"]
-# group_search_filter_user_attribute = "uid"

 # Specify names of the ldap attributes your ldap uses
 [servers.attributes]
@@ -223,10 +223,6 @@ log_queries =
 # URL to redirect the user to after sign out
 ;signout_redirect_url =

-# Set to true to attempt login with OAuth automatically, skipping the login screen.
-# This setting is ignored if multiple OAuth providers are configured.
-;oauth_auto_login = false
-
 #################################### Anonymous Auth ##########################
 [auth.anonymous]
 # enable anonymous access
@@ -298,7 +294,6 @@ log_queries =
 ;auto_sign_up = true
 ;ldap_sync_ttl = 60
 ;whitelist = 192.168.1.1, 192.168.2.1
-;headers = Email:X-User-Email, Name:X-User-Name

 #################################### Basic Auth ##########################
 [auth.basic]
@@ -398,10 +393,6 @@ log_queries =
 # Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
 ;nodata_or_nullvalues = no_data

-# Alert notifications can include images, but rendering many images at the same time can overload the server
-# This limit will protect the server from render overloading and make sure notifications are sent out quickly
-;concurrent_render_limit = 5
-
 #################################### Explore #############################
 [explore]
 # Enable the Explore section
@@ -440,7 +431,7 @@ log_queries =
 ;sampler_param = 1

 #################################### Grafana.com integration  ##########################
-# Url used to import dashboards directly from Grafana.com
+# Url used to to import dashboards directly from Grafana.com
 [grafana_com]
 ;url = https://grafana.com

@@ -480,8 +471,3 @@ log_queries =
 # Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
 ;server_url =
 ;callback_url =
-
-[enterprise]
-# Path to a valid Grafana Enterprise license.jwt file
-;license_path =
-
@@ -1,9 +0,0 @@
-apiVersion: 1
-
-providers:
- - name: 'Bulk alerting dashboards'
-   folder: 'Bulk alerting dashboards'
-   type: file
-   options:
-     path: devenv/bulk_alerting_dashboards
-
@@ -1,168 +0,0 @@
-{
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "id": null,
-  "links": [],
-  "panels": [
-    {
-      "alert": {
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                65
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "A",
-                "5m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "frequency": "10s",
-        "handler": 1,
-        "name": "bulk alerting",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-prometheus",
-      "fill": 1,
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "$$hashKey": "object:117",
-          "expr": "go_goroutines",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A"
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 50
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ]
-    }
-  ],
-  "schemaVersion": 16,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ],
-    "time_options": [
-      "5m",
-      "15m",
-      "1h",
-      "6h",
-      "12h",
-      "24h",
-      "2d",
-      "7d",
-      "30d"
-    ]
-  },
-  "timezone": "",
-  "title": "New dashboard",
-  "uid": null,
-  "version": 0
-}
@@ -927,123 +927,6 @@
      "title": "",
      "type": "text"
    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "editable": true,
-      "error": false,
-      "fill": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 16,
-        "x": 0,
-        "y": 44
-      },
-      "id": 21,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "null",
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "C-series",
-          "steppedLine": true
-        }
-      ],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "",
-          "hide": false,
-          "refId": "B",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,null,40,null,90,null,null,100,null,null,100,null,null,80,null",
-          "target": ""
-        },
-        {
-          "alias": "",
-          "hide": false,
-          "refId": "C",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "20,null40,null,null,50,null,70,null,100,null,10,null,30,null",
-          "target": ""
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Null between points",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "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
-      }
-    },
-    {
-      "content": "Left is showing null between values for a normal line graph and staircase graph. Orphaned data points should be rendered as points",
-      "editable": true,
-      "error": false,
-      "gridPos": {
-        "h": 7,
-        "w": 8,
-        "x": 16,
-        "y": 44
-      },
-      "id": 22,
-      "links": [],
-      "mode": "markdown",
-      "title": "",
-      "type": "text"
-    },
    {
      "aliasColors": {},
      "bars": false,
@@ -1056,7 +939,7 @@
        "h": 7,
        "w": 24,
        "x": 0,
-        "y": 51
+        "y": 44
      },
      "id": 20,
      "legend": {
@@ -1141,7 +1024,7 @@
        "h": 7,
        "w": 12,
        "x": 0,
-        "y": 58
+        "y": 51
      },
      "id": 16,
      "legend": {
@@ -1244,7 +1127,7 @@
        "h": 7,
        "w": 12,
        "x": 12,
-        "y": 58
+        "y": 51
      },
      "id": 17,
      "legend": {
@@ -1383,7 +1266,7 @@
        "h": 7,
        "w": 12,
        "x": 0,
-        "y": 65
+        "y": 58
      },
      "id": 18,
      "legend": {
@@ -1487,7 +1370,7 @@
        "h": 7,
        "w": 12,
        "x": 12,
-        "y": 65
+        "y": 58
      },
      "id": 19,
      "legend": {
@@ -1671,5 +1554,5 @@
  "timezone": "browser",
  "title": "Panel Tests - Graph",
  "uid": "5SdHCadmz",
-  "version": 1
+  "version": 3
 }
@@ -1,511 +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,
-      "datasource": "gdev-testdata",
-      "fill": 2,
-      "gridPos": {
-        "h": 8,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "null",
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "target": ""
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [
-        {
-          "colorMode": "gray",
-          "fill": true,
-          "fillColor": "rgba(255, 255, 255, 0.03)",
-          "from": "08:30",
-          "fromDayOfWeek": 1,
-          "line": false,
-          "lineColor": "rgba(255, 255, 255, 0.2)",
-          "op": "time",
-          "to": "16:45",
-          "toDayOfWeek": 5
-        }
-      ],
-      "timeShift": null,
-      "title": "Business Hours",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "fill": 2,
-      "gridPos": {
-        "h": 8,
-        "w": 24,
-        "x": 0,
-        "y": 8
-      },
-      "id": 4,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "null",
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "target": ""
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [
-        {
-          "colorMode": "red",
-          "fill": true,
-          "fillColor": "rgba(255, 255, 255, 0.03)",
-          "from": "20:00",
-          "fromDayOfWeek": 7,
-          "line": false,
-          "lineColor": "rgba(255, 255, 255, 0.2)",
-          "op": "time",
-          "to": "23:00",
-          "toDayOfWeek": 7
-        }
-      ],
-      "timeShift": null,
-      "title": "Sunday's 20-23",
-      "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": {
-        "A-series": "#d683ce"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "fill": 2,
-      "gridPos": {
-        "h": 8,
-        "w": 24,
-        "x": 0,
-        "y": 16
-      },
-      "id": 3,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "null",
-      "percentage": false,
-      "pointradius": 0.5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "target": ""
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [
-        {
-          "colorMode": "custom",
-          "fill": true,
-          "fillColor": "rgba(255, 0, 0, 0.22)",
-          "from": "",
-          "fromDayOfWeek": 1,
-          "line": true,
-          "lineColor": "rgba(255, 0, 0, 0.32)",
-          "op": "time",
-          "to": "",
-          "toDayOfWeek": 1
-        },
-        {
-          "colorMode": "custom",
-          "fill": true,
-          "fillColor": "rgba(255, 127, 0, 0.22)",
-          "fromDayOfWeek": 2,
-          "line": true,
-          "lineColor": "rgba(255, 127, 0, 0.32)",
-          "op": "time",
-          "toDayOfWeek": 2
-        },
-        {
-          "colorMode": "custom",
-          "fill": true,
-          "fillColor": "rgba(255, 255, 0, 0.22)",
-          "fromDayOfWeek": 3,
-          "line": true,
-          "lineColor": "rgba(255, 255, 0, 0.22)",
-          "op": "time",
-          "toDayOfWeek": 3
-        },
-        {
-          "colorMode": "custom",
-          "fill": true,
-          "fillColor": "rgba(0, 255, 0, 0.22)",
-          "fromDayOfWeek": 4,
-          "line": true,
-          "lineColor": "rgba(0, 255, 0, 0.32)",
-          "op": "time",
-          "toDayOfWeek": 4
-        },
-        {
-          "colorMode": "custom",
-          "fill": true,
-          "fillColor": "rgba(0, 0, 255, 0.22)",
-          "fromDayOfWeek": 5,
-          "line": true,
-          "lineColor": "rgba(0, 0, 255, 0.32)",
-          "op": "time",
-          "toDayOfWeek": 5
-        },
-        {
-          "colorMode": "custom",
-          "fill": true,
-          "fillColor": "rgba(75, 0, 130, 0.22)",
-          "fromDayOfWeek": 6,
-          "line": true,
-          "lineColor": "rgba(75, 0, 130, 0.32)",
-          "op": "time",
-          "toDayOfWeek": 6
-        },
-        {
-          "colorMode": "custom",
-          "fill": true,
-          "fillColor": "rgba(148, 0, 211, 0.22)",
-          "fromDayOfWeek": 7,
-          "line": true,
-          "lineColor": "rgba(148, 0, 211, 0.32)",
-          "op": "time",
-          "toDayOfWeek": 7
-        }
-      ],
-      "timeShift": null,
-      "title": "Each day of week",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "fill": 2,
-      "gridPos": {
-        "h": 8,
-        "w": 24,
-        "x": 0,
-        "y": 24
-      },
-      "id": 5,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "null",
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "target": ""
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [
-        {
-          "colorMode": "red",
-          "fill": false,
-          "from": "05:00",
-          "line": true,
-          "op": "time"
-        }
-      ],
-      "timeShift": null,
-      "title": "05:00",
-      "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": 16,
-  "style": "dark",
-  "tags": [
-    "gdev",
-    "panel-tests"
-  ],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-30d",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ],
-    "time_options": [
-      "5m",
-      "15m",
-      "1h",
-      "6h",
-      "12h",
-      "24h",
-      "2d",
-      "7d",
-      "30d"
-    ]
-  },
-  "timezone": "browser",
-  "title": "Panel Tests - Graph (Time Regions)",
-  "uid": "XMjIZPmik",
-  "version": 1
-}
@@ -404,112 +404,6 @@
      "title": "Column style thresholds & units",
      "transform": "timeseries_to_columns",
      "type": "table"
-    },
-    {
-      "columns": [],
-      "datasource": "gdev-testdata",
-      "fontSize": "100%",
-      "gridPos": {
-        "h": 10,
-        "w": 24,
-        "x": 0,
-        "y": 26
-      },
-      "id": 6,
-      "links": [],
-      "pageSize": 20,
-      "scroll": true,
-      "showHeader": true,
-      "sort": {
-        "col": 0,
-        "desc": true
-      },
-      "styles": [
-        {
-          "alias": "Time",
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "pattern": "Time",
-          "type": "date"
-        },
-        {
-          "alias": "",
-          "colorMode": "cell",
-          "colors": [
-            "rgba(245, 54, 54, 0.5)",
-            "rgba(237, 129, 40, 0.5)",
-            "rgba(50, 172, 45, 0.5)"
-          ],
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "decimals": 2,
-          "link": true,
-          "linkTargetBlank": true,
-          "linkTooltip": "",
-          "linkUrl": "http://www.grafana.com",
-          "mappingType": 1,
-          "pattern": "ColorCell",
-          "thresholds": [
-            "5",
-            "10"
-          ],
-          "type": "number",
-          "unit": "currencyUSD"
-        },
-        {
-          "alias": "",
-          "colorMode": "value",
-          "colors": [
-            "rgba(245, 54, 54, 0.5)",
-            "rgba(237, 129, 40, 0.5)",
-            "rgba(50, 172, 45, 0.5)"
-          ],
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "decimals": 2,
-          "link": true,
-          "linkUrl": "http://www.grafana.com",
-          "mappingType": 1,
-          "pattern": "ColorValue",
-          "thresholds": [
-            "5",
-            "10"
-          ],
-          "type": "number",
-          "unit": "Bps"
-        },
-        {
-          "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": [
-        {
-          "alias": "ColorValue",
-          "expr": "",
-          "format": "table",
-          "intervalFactor": 1,
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "null,1,20,90,30,5,0,20,10"
-        },
-        {
-          "alias": "ColorCell",
-          "refId": "B",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "null,5,1,2,3,4,5,10,20"
-        }
-      ],
-      "title": "Column style thresholds and links",
-      "transform": "timeseries_to_columns",
-      "type": "table"
    }
  ],
  "refresh": false,
@@ -555,5 +449,5 @@
  "timezone": "browser",
  "title": "Panel Tests - Table",
  "uid": "pttable",
-  "version": 2
-}
+  "version": 1
+}
@@ -1,546 +1,250 @@
 {
-  "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": [
-    {
-      "alert": {
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                60
-              ],
-              "type": "gt"
-            },
-            "query": {
-              "params": [
-                "A",
-                "5m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "enabled": true,
-        "frequency": "60s",
-        "handler": 1,
-        "name": "TestData - Always OK",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "editable": true,
-      "error": false,
-      "fill": 1,
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 3,
-      "isNew": true,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenario": "random_walk",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,90,30,5,0",
-          "target": ""
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 60
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Always OK",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": "125",
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "alert": {
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                177
-              ],
-              "type": "gt"
-            },
-            "query": {
-              "params": [
-                "A",
-                "5m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "enabled": true,
-        "executionErrorState": "alerting",
-        "for": "0m",
-        "frequency": "60s",
-        "handler": 1,
-        "name": "TestData - Always Alerting",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "editable": true,
-      "error": false,
-      "fill": 1,
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 12,
-        "y": 0
-      },
-      "id": 4,
-      "isNew": true,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenario": "random_walk",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "200,445,100,150,200,220,190",
-          "target": ""
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 177
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Always Alerting",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "alert": {
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                1
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "A",
-                "15m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "for": "5m",
-        "frequency": "1m",
-        "handler": 1,
-        "name": "TestData - No data",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "editable": true,
-      "error": false,
-      "fill": 1,
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 0,
-        "y": 7
-      },
-      "id": 5,
-      "isNew": true,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenario": "random_walk",
-          "scenarioId": "no_data_points",
-          "stringInput": "",
-          "target": ""
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 1
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "No data",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "alert": {
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                177
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "A",
-                "15m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "for": "1m",
-        "frequency": "1m",
-        "handler": 1,
-        "name": "TestData - Always Alerting with For",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "editable": true,
-      "error": false,
-      "fill": 1,
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 12,
-        "y": 7
-      },
-      "id": 6,
-      "isNew": true,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenario": "random_walk",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "200,445,100,150,200,220,190",
-          "target": ""
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 177
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Always Alerting with For",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
  "revision": 2,
-  "schemaVersion": 16,
-  "style": "dark",
+  "title": "Alerting with TestData",
  "tags": [
    "grafana-test"
  ],
-  "templating": {
-    "list": []
-  },
+  "style": "dark",
+  "timezone": "browser",
+  "editable": true,
+  "hideControls": false,
+  "sharedCrosshair": false,
+  "rows": [
+    {
+      "collapse": false,
+      "editable": true,
+      "height": 255.625,
+      "panels": [
+        {
+          "alert": {
+            "conditions": [
+              {
+                "evaluator": {
+                  "params": [
+                    60
+                  ],
+                  "type": "gt"
+                },
+                "query": {
+                  "params": [
+                    "A",
+                    "5m",
+                    "now"
+                  ]
+                },
+                "reducer": {
+                  "params": [],
+                  "type": "avg"
+                },
+                "type": "query"
+              }
+            ],
+            "enabled": true,
+            "frequency": "60s",
+            "handler": 1,
+            "name": "TestData - Always OK",
+            "noDataState": "no_data",
+            "notifications": []
+          },
+          "aliasColors": {},
+          "bars": false,
+          "datasource": "gdev-testdata",
+          "editable": true,
+          "error": false,
+          "fill": 1,
+          "id": 3,
+          "isNew": true,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 2,
+          "links": [],
+          "nullPointMode": "connected",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "span": 6,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "refId": "A",
+              "scenario": "random_walk",
+              "scenarioId": "csv_metric_values",
+              "stringInput": "1,20,90,30,5,0",
+              "target": ""
+            }
+          ],
+          "thresholds": [
+            {
+              "value": 60,
+              "op": "gt",
+              "fill": true,
+              "line": true,
+              "colorMode": "critical"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Always OK",
+          "tooltip": {
+            "msResolution": false,
+            "shared": true,
+            "sort": 0,
+            "value_type": "cumulative"
+          },
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": "125",
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ]
+        },
+        {
+          "alert": {
+            "conditions": [
+              {
+                "evaluator": {
+                  "params": [
+                    177
+                  ],
+                  "type": "gt"
+                },
+                "query": {
+                  "params": [
+                    "A",
+                    "5m",
+                    "now"
+                  ]
+                },
+                "reducer": {
+                  "params": [],
+                  "type": "avg"
+                },
+                "type": "query"
+              }
+            ],
+            "enabled": true,
+            "frequency": "60s",
+            "handler": 1,
+            "name": "TestData - Always Alerting",
+            "noDataState": "no_data",
+            "notifications": []
+          },
+          "aliasColors": {},
+          "bars": false,
+          "datasource": "gdev-testdata",
+          "editable": true,
+          "error": false,
+          "fill": 1,
+          "id": 4,
+          "isNew": true,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 2,
+          "links": [],
+          "nullPointMode": "connected",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "span": 6,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "refId": "A",
+              "scenario": "random_walk",
+              "scenarioId": "csv_metric_values",
+              "stringInput": "200,445,100,150,200,220,190",
+              "target": ""
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "critical",
+              "fill": true,
+              "line": true,
+              "op": "gt",
+              "value": 177
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Always Alerting",
+          "tooltip": {
+            "msResolution": false,
+            "shared": true,
+            "sort": 0,
+            "value_type": "cumulative"
+          },
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ]
+        }
+      ],
+      "title": "New row"
+    }
+  ],
  "time": {
    "from": "now-6h",
    "to": "now"
@@ -570,8 +274,14 @@
      "30d"
    ]
  },
-  "timezone": "browser",
-  "title": "Alerting with TestData",
-  "uid": "7MeksYbmk",
-  "version": 1
-}
+  "templating": {
+    "list": []
+  },
+  "annotations": {
+    "list": []
+  },
+  "schemaVersion": 13,
+  "version": 4,
+  "links": [],
+  "gnetId": null
+}
@@ -1,5 +0,0 @@
-  memcached:
-    image: redis:latest
-    ports:
-      - "6379:6379"
-
@@ -1 +0,0 @@
-grafana/provisioning/dashboards/alerts/alert-*
@@ -1,137 +0,0 @@
-# Grafana High Availability (HA) test setup
-
-A set of docker compose services which together creates a Grafana HA test setup with capability of easily
-scaling up/down number of Grafana instances.
-
-Included services
-
-* Grafana
-* Mysql - Grafana configuration database and session storage
-* Prometheus - Monitoring of Grafana and used as datasource of provisioned alert rules
-* Nginx - Reverse proxy for Grafana and Prometheus. Enables browsing Grafana/Prometheus UI using a hostname
-
-## Prerequisites
-
-### Build grafana docker container
-
-Build a Grafana docker container from current branch and commit and tag it as grafana/grafana:dev.
-
-```bash
-$ cd <grafana repo>
-$ make build-docker-full
-```
-
-### Virtual host names
-
-#### Alternative 1 - Use dnsmasq
-
-```bash
-$ sudo apt-get install dnsmasq
-$ echo 'address=/loc/127.0.0.1' | sudo tee /etc/dnsmasq.d/dnsmasq-loc.conf > /dev/null
-$ sudo /etc/init.d/dnsmasq restart
-$ ping whatever.loc
-PING whatever.loc (127.0.0.1) 56(84) bytes of data.
-64 bytes from localhost (127.0.0.1): icmp_seq=1 ttl=64 time=0.076 ms
--- whatever.loc ping statistics ---
-1 packet transmitted, 1 received, 0% packet loss, time 1998ms
-```
-
-#### Alternative 2 - Manually update /etc/hosts
-
-Update your `/etc/hosts` to be able to access Grafana and/or Prometheus UI using a hostname.
-
-```bash
-$ cat /etc/hosts
-127.0.0.1       grafana.loc
-127.0.0.1       prometheus.loc
-```
-
-## Start services
-
-```bash
-$ docker-compose up -d
-```
-
-Browse
-* http://grafana.loc/
-* http://prometheus.loc/
-
-Check for any errors
-
-```bash
-$ docker-compose logs | grep error
-```
-
-### Scale Grafana instances up/down
-
-Scale number of Grafana instances to `<instances>`
-
-```bash
-$ docker-compose up --scale grafana=<instances> -d
-# for example 3 instances
-$ docker-compose up --scale grafana=3 -d
-```
-
-## Test alerting
-
-### Create notification channels
-
-Creates default notification channels, if not already exists
-
-```bash
-$ ./alerts.sh setup
-```
-
-### Slack notifications
-
-Disable
-
-```bash
-$ ./alerts.sh slack -d
-```
-
-Enable and configure url
-
-```bash
-$ ./alerts.sh slack -u https://hooks.slack.com/services/...
-```
-
-Enable, configure url and enable reminders
-
-```bash
-$ ./alerts.sh slack -u https://hooks.slack.com/services/... -r -e 10m
-```
-
-### Provision alert dashboards with alert rules
-
-Provision 1 dashboard/alert rule (default)
-
-```bash
-$ ./alerts.sh provision
-```
-
-Provision 10 dashboards/alert rules
-
-```bash
-$ ./alerts.sh provision -a 10
-```
-
-Provision 10 dashboards/alert rules and change condition to `gt > 100`
-
-```bash
-$ ./alerts.sh provision -a 10 -c 100
-```
-
-### Pause/unpause all alert rules
-
-Pause
-
-```bash
-$ ./alerts.sh pause
-```
-
-Unpause
-
-```bash
-$ ./alerts.sh unpause
-```
@@ -1,156 +0,0 @@
-#!/bin/bash
-
-requiresJsonnet() {
-		if ! type "jsonnet" > /dev/null; then
-				echo "you need you install jsonnet to run this script"
-				echo "follow the instructions on https://github.com/google/jsonnet"
-				exit 1
-		fi
-}
-
-setup() {
-	STATUS=$(curl -s -o /dev/null -w '%{http_code}' http://admin:admin@grafana.loc/api/alert-notifications/1)
-  if [ $STATUS -eq 200 ]; then
-    echo "Email already exists, skipping..."
-  else
-		curl -H "Content-Type: application/json" \
-		-d '{
-			"name": "Email",
-			"type":  "email",
-			"isDefault": false,
-			"sendReminder": false,
-			"uploadImage": true,
-			"settings": {
-				"addresses": "user@test.com"
-			}
-		}' \
-		http://admin:admin@grafana.loc/api/alert-notifications
-  fi
-
-	STATUS=$(curl -s -o /dev/null -w '%{http_code}' http://admin:admin@grafana.loc/api/alert-notifications/2)
-  if [ $STATUS -eq 200 ]; then
-    echo "Slack already exists, skipping..."
-  else
-		curl -H "Content-Type: application/json" \
-		-d '{
-			"name": "Slack",
-			"type":  "slack",
-			"isDefault": false,
-			"sendReminder": false,
-			"uploadImage": true
-		}' \
-		http://admin:admin@grafana.loc/api/alert-notifications
-  fi
-}
-
-slack() {
-	enabled=true
-	url=''
-	remind=false
-	remindEvery='10m'
-
-	while getopts ":e:u:dr" o; do
-    case "${o}" in
-				e)
-            remindEvery=${OPTARG}
-            ;;
-				u)
-            url=${OPTARG}
-            ;;
-				d)
-            enabled=false
-            ;;
-				r)
-            remind=true
-            ;;
-    esac
-	done
-	shift $((OPTIND-1))
-
-	curl -X PUT \
-		-H "Content-Type: application/json" \
-		-d '{
-			"id": 2,
-			"name": "Slack",
-			"type":  "slack",
-			"isDefault": '$enabled',
-			"sendReminder": '$remind',
-			"frequency": "'$remindEvery'",
-			"uploadImage": true,
-			"settings": {
-				"url": "'$url'"
-			}
-		}' \
-		http://admin:admin@grafana.loc/api/alert-notifications/2
-}
-
-provision() {
-	alerts=1
-	condition=65
-	while getopts ":a:c:" o; do
-    case "${o}" in
-        a)
-            alerts=${OPTARG}
-            ;;
-				c)
-            condition=${OPTARG}
-            ;;
-    esac
-	done
-	shift $((OPTIND-1))
-
-	requiresJsonnet
-
-	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
-}
-
-pause() {
-	curl -H "Content-Type: application/json" \
-  -d '{"paused":true}' \
-  http://admin:admin@grafana.loc/api/admin/pause-all-alerts
-}
-
-unpause() {
-	curl -H "Content-Type: application/json" \
-  -d '{"paused":false}' \
-  http://admin:admin@grafana.loc/api/admin/pause-all-alerts
-}
-
-usage() {
-	echo -e "Usage: ./alerts.sh COMMAND [OPTIONS]\n"
-	echo -e "Commands"
-	echo -e "  setup\t\t creates default alert notification channels"
-	echo -e "  slack\t\t configure slack notification channel"
-	echo -e "    [-d]\t\t\t disable notifier, default enabled"
-	echo -e "    [-u]\t\t\t url"
-	echo -e "    [-r]\t\t\t send reminders"
-	echo -e "    [-e <remind every>]\t\t default 10m\n"
-	echo -e "  provision\t provision alerts"
-	echo -e "    [-a <alert rule count>]\t default 1"
-	echo -e "    [-c <condition value>]\t default 65\n"
-	echo -e "  pause\t\t pause all alerts"
-	echo -e "  unpause\t unpause all alerts"
-}
-
-main() {
-	local cmd=$1
-
-	if [[ $cmd == "setup" ]]; then
-		setup
-	elif [[ $cmd == "slack" ]]; then
-		slack "${@:2}"
-	elif [[ $cmd == "provision" ]]; then
-		provision "${@:2}"
-	elif [[ $cmd == "pause" ]]; then
-		pause
-	elif [[ $cmd == "unpause" ]]; then
-		unpause
-	fi
-
-  if [[ -z "$cmd" ]]; then
-		usage
-	fi
-}
-
-main "$@"
@@ -1,78 +0,0 @@
-version: "2.1"
-
-services:
-  nginx-proxy:
-    image: jwilder/nginx-proxy
-    ports:
-      - "80:80"
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-
-  db:
-    image: mysql:5.6
-    environment:
-      MYSQL_ROOT_PASSWORD: rootpass
-      MYSQL_DATABASE: grafana
-      MYSQL_USER: grafana
-      MYSQL_PASSWORD: password
-    ports:
-      - 3306
-    healthcheck:
-      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
-      timeout: 10s
-      retries: 10
-
-  # db:
-  #   image: postgres:9.3
-  #   environment:
-  #     POSTGRES_DATABASE: grafana
-  #     POSTGRES_USER: grafana
-  #     POSTGRES_PASSWORD: password
-  #   ports:
-  #     - 5432
-  #   healthcheck:
-  #     test: ["CMD-SHELL", "pg_isready -d grafana -U grafana"]
-  #     timeout: 10s
-  #     retries: 10
-
-  grafana:
-    image: grafana/grafana:dev
-    volumes:
-      - ./grafana/provisioning/:/etc/grafana/provisioning/
-    environment:
-      - VIRTUAL_HOST=grafana.loc
-      - GF_SERVER_ROOT_URL=http://grafana.loc
-      - GF_DATABASE_NAME=grafana
-      - GF_DATABASE_USER=grafana
-      - GF_DATABASE_PASSWORD=password
-      - GF_DATABASE_TYPE=mysql
-      - GF_DATABASE_HOST=db:3306
-      - GF_SESSION_PROVIDER=mysql
-      - GF_SESSION_PROVIDER_CONFIG=grafana:password@tcp(db:3306)/grafana?allowNativePasswords=true
-      # - GF_DATABASE_TYPE=postgres
-      # - GF_DATABASE_HOST=db:5432
-      # - GF_DATABASE_SSL_MODE=disable
-      # - GF_SESSION_PROVIDER=postgres
-      # - GF_SESSION_PROVIDER_CONFIG=user=grafana password=password host=db port=5432 dbname=grafana sslmode=disable
-      - GF_LOG_FILTERS=alerting.notifier:debug,alerting.notifier.slack:debug
-    ports:
-      - 3000
-    depends_on:
-      db:
-        condition: service_healthy
-
-  prometheus:
-    image: prom/prometheus:v2.4.2
-    volumes:
-      - ./prometheus/:/etc/prometheus/
-    environment:
-      - VIRTUAL_HOST=prometheus.loc
-    ports:
-      - 9090
-
-  # mysqld-exporter:
-  #   image: prom/mysqld-exporter
-  #   environment:
-  #     - DATA_SOURCE_NAME=grafana:password@(mysql:3306)/
-  #   ports:
-  #     - 9104
@@ -1,203 +0,0 @@
-local numAlerts = std.extVar('alerts');
-local condition = std.extVar('condition');
-local arr = std.range(1, numAlerts);
-
-local alertDashboardTemplate = {
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "id": null,
-  "links": [],
-  "panels": [
-    {
-      "alert": {
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                65
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "A",
-                "5m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "frequency": "10s",
-        "handler": 1,
-        "for": "1m",
-        "name": "bulk alerting",
-        "noDataState": "no_data",
-        "notifications": [
-          {
-            "id": 2
-          }
-        ]
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "Prometheus",
-      "fill": 1,
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "$$hashKey": "object:117",
-          "expr": "go_goroutines",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A"
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 50
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ]
-    }
-  ],
-  "schemaVersion": 16,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ],
-    "time_options": [
-      "5m",
-      "15m",
-      "1h",
-      "6h",
-      "12h",
-      "24h",
-      "2d",
-      "7d",
-      "30d"
-    ]
-  },
-  "timezone": "",
-  "title": "New dashboard",
-  "uid": null,
-  "version": 0
-};
-
-
-{
-  ['alert-' + std.toString(x) + '.json']:
-    alertDashboardTemplate + {
-      panels: [
-        alertDashboardTemplate.panels[0] +
-        {
-          alert+: {
-            name: 'Alert rule ' + x,
-            conditions: [
-              alertDashboardTemplate.panels[0].alert.conditions[0] +
-              {
-                evaluator+: {
-                  params: [condition]
-                }
-              },
-            ],
-          },
-        },
-      ],
-      uid: 'alert-' + x,
-      title: 'Alert ' + x
-    },
-      for x in arr
-}
@@ -1,8 +0,0 @@
-apiVersion: 1
-
-providers:
- - name: 'Alerts'
-   folder: 'Alerts'
-   type: file
-   options:
-     path: /etc/grafana/provisioning/dashboards/alerts
@@ -1,172 +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": {
-        "Active alerts": "#bf1b00"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "Prometheus",
-      "fill": 1,
-      "gridPos": {
-        "h": 12,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "interval": "",
-      "legend": {
-        "alignAsTable": true,
-        "avg": false,
-        "current": true,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "null",
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "Active grafana instances",
-          "dashes": true,
-          "fill": 0
-        }
-      ],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "sum(increase(grafana_alerting_notification_sent_total[1m])) by(job)",
-          "format": "time_series",
-          "instant": false,
-          "interval": "1m",
-          "intervalFactor": 1,
-          "legendFormat": "Notifications sent",
-          "refId": "A"
-        },
-        {
-          "expr": "min(grafana_alerting_active_alerts) without(instance)",
-          "format": "time_series",
-          "interval": "1m",
-          "intervalFactor": 1,
-          "legendFormat": "Active alerts",
-          "refId": "B"
-        },
-        {
-          "expr": "count(up{job=\"grafana\"})",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "Active grafana instances",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Notifications sent vs active alerts",
-      "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": 3
-      }
-    }
-  ],
-  "schemaVersion": 16,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ],
-    "time_options": [
-      "5m",
-      "15m",
-      "1h",
-      "6h",
-      "12h",
-      "24h",
-      "2d",
-      "7d",
-      "30d"
-    ]
-  },
-  "timezone": "",
-  "title": "Overview",
-  "uid": "xHy7-hAik",
-  "version": 6
-}
@@ -1,11 +0,0 @@
-apiVersion: 1
-
-datasources:
-  - name: Prometheus
-    type: prometheus
-    access: proxy
-    url: http://prometheus:9090
-    jsonData:
-      timeInterval: 10s
-      queryTimeout: 30s
-      httpMethod: POST
@@ -1,39 +0,0 @@
-# my global config
-global:
-  scrape_interval:     10s # By default, scrape targets every 15 seconds.
-  evaluation_interval: 10s # By default, scrape targets every 15 seconds.
-  # scrape_timeout is set to the global default (10s).
-
-# Load and evaluate rules in this file every 'evaluation_interval' seconds.
-#rule_files:
-# - "alert.rules"
-# - "first.rules"
-# - "second.rules"
-
-# alerting:
-#   alertmanagers:
-#   - scheme: http
-#     static_configs:
-#     - targets:
-#       - "127.0.0.1:9093"
-
-scrape_configs:
-  - job_name: 'prometheus'
-    static_configs:
-      - targets: ['localhost:9090']
-
-  - job_name: 'grafana'
-    dns_sd_configs:
-      - names:
-        - 'grafana'
-        type: 'A'
-        port: 3000
-        refresh_interval: 10s
-
-  # - job_name: 'mysql'
-  #   dns_sd_configs:
-  #     - names:
-  #       - 'mysqld-exporter'
-  #       type: 'A'
-  #       port: 9104
-  #       refresh_interval: 10s
@@ -11,21 +11,7 @@ bulkDashboard() {
 				let COUNTER=COUNTER+1
 		done

-		ln -s -f ../../../devenv/bulk-dashboards/bulk-dashboards.yaml ../conf/provisioning/dashboards/custom.yaml
-}
-
-bulkAlertingDashboard() {
-
-		requiresJsonnet
-
-		COUNTER=0
-		MAX=100
-		while [  $COUNTER -lt $MAX ]; do
-				jsonnet -o "bulk_alerting_dashboards/alerting_dashboard${COUNTER}.json" -e "local bulkDash = import 'bulk_alerting_dashboards/bulkdash_alerting.jsonnet'; bulkDash + {  uid: 'bd-${COUNTER}',  title: 'alerting-title-${COUNTER}' }"
-				let COUNTER=COUNTER+1
-		done
-
-		ln -s -f ../../../devenv/bulk_alerting_dashboards/bulk_alerting_dashboards.yaml ../conf/provisioning/dashboards/custom.yaml
+		ln -s -f -r ./bulk-dashboards/bulk-dashboards.yaml ../conf/provisioning/dashboards/custom.yaml
 }

 requiresJsonnet() {
@@ -50,9 +36,8 @@ devDatasources() {
 usage() {
 	echo -e "\n"
 	echo "Usage:"
-	echo "  bulk-dashboards                              - create and provisioning 400 dashboards"
-	echo "  bulk-alerting-dashboards                     - create and provisioning 400 dashboards with alerts"
-	echo "  no args                                      - provisiong core datasources and dev dashboards"
+	echo "  bulk-dashboards                     - create and provisioning 400 dashboards"
+	echo "  no args                             - provisiong core datasources and dev dashboards"
 }

 main() {
@@ -63,9 +48,7 @@ main() {

 	local cmd=$1

-	if [[ $cmd == "bulk-alerting-dashboards" ]]; then
-		bulkAlertingDashboard
-	elif [[ $cmd == "bulk-dashboards" ]]; then
+	if [[ $cmd == "bulk-dashboards" ]]; then
 		bulkDashboard
 	else
 		devDashboards
@@ -5,5 +5,5 @@
 # root_url = %(protocol)s://%(domain)s:10081/grafana/

  apacheproxy:
-    build: docker/blocks/apache_proxy
+    build: blocks/apache_proxy
    network_mode: host
@@ -1,5 +1,5 @@
  collectd:
-    build: docker/blocks/collectd
+    build: blocks/collectd
    environment:
      HOST_NAME: myserver
      GRAPHITE_HOST: graphite
@@ -1,5 +1,5 @@
  graphite09:
-    build: docker/blocks/graphite
+    build: blocks/graphite
    ports:
      - "8080:80"
      - "2003:2003"
@@ -8,7 +8,7 @@
 # 'avg'. The name of the aggregate metric will be derived from
 # 'output_template' filling in any captured fields from 'input_pattern'.
 #
-# For example, if your metric naming scheme is:
+# For example, if you're metric naming scheme is:
 #
 #   <env>.applications.<app>.<server>.<metric>
 #
@@ -1,6 +1,6 @@
  graphite:
    build:
-      context: docker/blocks/graphite1
+      context: blocks/graphite1
      args:
        version: master
    ports:
@@ -6,7 +6,7 @@
      - "8083:8083"
      - "8086:8086"
    volumes:
-      - ./docker/blocks/influxdb/influxdb.conf:/etc/influxdb/influxdb.conf
+      - ./blocks/influxdb/influxdb.conf:/etc/influxdb/influxdb.conf

  fake-influxdb-data:
    image: grafana/fake-data-gen
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`grafana/provisioning/dashboards/alerts/alert-*`