Merge pull request #13421 from grafana/teams-limit-cherrypick

teampicker: increase limit from 10 to 100
updated version
2026-01-06 17:33:49 +08:00 · 2018-09-25 21:06:16 +02:00 · 2018-09-25 21:00:51 +02:00 · 2018-09-25 20:57:58 +02:00 · 2018-09-07 16:35:16 +02:00 · 2018-09-07 16:32:49 +02:00
1385 changed files with 32283 additions and 63845 deletions
--- a/.bra.toml
+++ b/.bra.toml
@@ -9,7 +9,7 @@ watch_dirs = [
 	"$WORKDIR/public/views",
 	"$WORKDIR/conf",
 ]
-watch_exts = [".go", ".ini", ".toml", ".template.html"]
+watch_exts = [".go", ".ini", ".toml"]
 build_delay = 1500
 cmds = [
  ["go", "run", "build.go", "-dev", "build-server"],
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,21 +5,16 @@ aliases:
      ignore: /.*/
    tags:
      only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
-  - &filter-not-release-or-master
+  - &filter-not-release
    tags:
      ignore: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
-    branches:
-      ignore: master
-  - &filter-only-master
-    branches:
-      only: master

 version: 2

 jobs:
  mysql-integration-test:
    docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.10
      - image: circleci/mysql:5.6-ram
        environment:
          MYSQL_ROOT_PASSWORD: rootpass
@@ -32,14 +27,14 @@ 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/... '

  postgres-integration-test:
    docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.10
      - image: circleci/postgres:9.3-ram
        environment:
          POSTGRES_USER: grafanatest
@@ -51,7 +46,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/...'
@@ -74,38 +69,36 @@ jobs:

  gometalinter:
    docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.10
        environment:
          # we need CGO because of go-sqlite3
          CGO_ENABLED: 1
    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 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=ineffassign --enable=structcheck --enable=unconvert --enable=varcheck ./...'
-      - run:
-          name: run go vet
-          command: 'go vet ./pkg/...'
+          command: 'gometalinter.v2 --enable-gc --vendor --deadline 10m --disable-all --enable=deadcode --enable=ineffassign --enable=structcheck --enable=unconvert --enable=varcheck ./...'

  test-frontend:
    docker:
-      - image: circleci/node:8
+      - image: circleci/node:6.11.4
    steps:
      - checkout
+      - run:
+          name: install yarn
+          command: 'sudo npm install -g yarn --quiet'
      - restore_cache:
          key: dependency-cache-{{ checksum "yarn.lock" }}
      - run:
          name: yarn install
          command: 'yarn install --pure-lockfile --no-progress'
-          no_output_timeout: 15m
      - save_cache:
          key: dependency-cache-{{ checksum "yarn.lock" }}
          paths:
@@ -116,7 +109,7 @@ jobs:

  test-backend:
    docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.10
    working_directory: /go/src/github.com/grafana/grafana
    steps:
      - checkout
@@ -126,7 +119,7 @@ jobs:

  build-all:
    docker:
-     - image: grafana/build-container:1.1.0
+     - image: grafana/build-container:1.0.0
    working_directory: /go/src/github.com/grafana/grafana
    steps:
      - checkout
@@ -148,88 +141,20 @@ jobs:
      - 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: Build Grafana.com master publisher
+          name: Build Grafana.com publisher
          command: 'go build -o scripts/publish scripts/build/publish.go'
-      - run:
-          name: Build Grafana.com release publisher
-          command: 'cd scripts/build/release_publisher && 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.1.0
-    working_directory: /go/src/github.com/grafana/grafana
-    steps:
-      - checkout
-      - run:
-          name: prepare build tools
-          command: '/tmp/bootstrap.sh'
-      - run:
-          name: build and package grafana
-          command: './scripts/build/build.sh'
-      - run:
-          name: sign packages
-          command: './scripts/build/sign_packages.sh'
-      - run:
-          name: sha-sum packages
-          command: 'go run build.go sha-dist'
-      - persist_to_workspace:
-          root: .
-          paths:
-            - dist/grafana*
-
-  grafana-docker-master:
-    docker:
-      - image: docker:stable-git
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - setup_remote_docker
-      - run: docker info
-      - run: cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
-      - run: cd packaging/docker && ./build-deploy.sh "master-${CIRCLE_SHA1}"
-
-  grafana-docker-pr:
-    docker:
-      - image: docker:stable-git
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - setup_remote_docker
-      - run: docker info
-      - run: cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
-      - run: cd packaging/docker && ./build.sh "${CIRCLE_SHA1}"
-
-  grafana-docker-release:
-      docker:
-        - image: docker:stable-git
-      steps:
-        - checkout
-        - attach_workspace:
-            at: .
-        - setup_remote_docker
-        - run: docker info
-        - run: cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
-        - run: cd packaging/docker && ./build-deploy.sh "${CIRCLE_TAG}"
+      - store_artifacts:
+          path: dist

  build-enterprise:
    docker:
@@ -238,7 +163,7 @@ jobs:
    steps:
      - checkout
      - run:
-          name: build, test and package grafana enterprise
+          name: build and package grafana
          command: './scripts/build/build_enterprise.sh'
      - run:
          name: sign packages
@@ -246,26 +171,6 @@ jobs:
      - 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: 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 ./enterprise-dist s3://$ENTERPRISE_BUCKET_NAME/master'

  deploy-master:
    docker:
@@ -285,6 +190,9 @@ jobs:
      - run:
          name: Trigger Windows build
          command: './scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} master'
+      - run:
+          name: Trigger Docker build
+          command: './scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN} master-$(echo "${CIRCLE_SHA1}" | cut -b1-7)'
      - run:
          name: Publish to Grafana.com
          command: |
@@ -304,29 +212,30 @@ jobs:
          name: deploy to s3
          command: 'aws s3 sync ./dist s3://$BUCKET_NAME/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'
+      - run:
+          name: Trigger Docker build
+          command: './scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN} ${CIRCLE_TAG}'

 workflows:
  version: 2
-  build-master:
+  test-and-build:
    jobs:
      - build-all:
-          filters: *filter-only-master
-      - build-enterprise:
-          filters: *filter-only-master
+          filters: *filter-not-release
      - codespell:
-          filters: *filter-only-master
+          filters: *filter-not-release
      - gometalinter:
-          filters: *filter-only-master
+          filters: *filter-not-release
      - test-frontend:
-          filters: *filter-only-master
+          filters: *filter-not-release
      - test-backend:
-          filters: *filter-only-master
+          filters: *filter-not-release
      - mysql-integration-test:
-          filters: *filter-only-master
+          filters: *filter-not-release
      - postgres-integration-test:
-          filters: *filter-only-master
+          filters: *filter-not-release
      - deploy-master:
          requires:
            - build-all
@@ -336,29 +245,9 @@ workflows:
            - gometalinter
            - mysql-integration-test
            - postgres-integration-test
-          filters: *filter-only-master
-      - grafana-docker-master:
-          requires:
-            - build-all
-            - test-backend
-            - test-frontend
-            - codespell
-            - gometalinter
-            - mysql-integration-test
-            - postgres-integration-test
-          filters: *filter-only-master
-      - deploy-enterprise-master:
-          requires:
-            - build-all
-            - test-backend
-            - test-frontend
-            - codespell
-            - gometalinter
-            - mysql-integration-test
-            - postgres-integration-test
-            - build-enterprise
-          filters: *filter-only-master
-
+          filters:
+           branches:
+             only: master
  release:
    jobs:
      - build-all:
@@ -385,40 +274,3 @@ workflows:
            - mysql-integration-test
            - postgres-integration-test
          filters: *filter-only-release
-      - grafana-docker-release:
-          requires:
-            - build-all
-            - test-backend
-            - test-frontend
-            - codespell
-            - gometalinter
-            - mysql-integration-test
-            - postgres-integration-test
-          filters: *filter-only-release
-
-  build-branches-and-prs:
-      jobs:
-        - build:
-            filters: *filter-not-release-or-master
-        - codespell:
-            filters: *filter-not-release-or-master
-        - gometalinter:
-            filters: *filter-not-release-or-master
-        - test-frontend:
-            filters: *filter-not-release-or-master
-        - test-backend:
-            filters: *filter-not-release-or-master
-        - mysql-integration-test:
-            filters: *filter-not-release-or-master
-        - postgres-integration-test:
-            filters: *filter-not-release-or-master
-        - grafana-docker-pr:
-            requires:
-              - build
-              - test-backend
-              - test-frontend
-              - codespell
-              - gometalinter
-              - mysql-integration-test
-              - postgres-integration-test
-            filters: *filter-not-release-or-master
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,12 +3,9 @@
 .git
 .gitignore
 .github
-.vscode
-bin
 data*
 dist
 docker
-Dockerfile
 docs
 dump.rdb
 node_modules
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -2,12 +2,12 @@ Follow the setup guide in README.md

 ### Rebuild frontend assets on source change
 ```
-yarn watch
+grunt && grunt watch
 ```

 ### Rerun tests on source change
 ```
-yarn jest
+grunt karma:dev
 ```

 ### Run tests for backend assets before commit
@@ -17,6 +17,6 @@ test -z "$(gofmt -s -l . | grep -v -E 'vendor/(github.com|golang.org|gopkg.in)'

 ### Run tests for frontend assets before commit
 ```
-yarn test
+npm test
 go test -v ./pkg/...
 ```
--- a/.gitignore
+++ b/.gitignore
@@ -33,18 +33,15 @@ public/css/*.min.css
 *.tmp
 .DS_Store
 .vscode/
-.vs/

 /data/*
 /bin/*

 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
 profile.cov
 /grafana
 /local
@@ -58,7 +55,6 @@ debug.test
 /examples/*/dist
 /packaging/**/*.rpm
 /packaging/**/*.deb
-/packaging/**/*.tar.gz

 # Ignore OSX indexing
 .DS_Store
@@ -71,7 +67,4 @@ debug.test
 /vendor/**/appengine*
 *.orig

-/devenv/bulk-dashboards/*.json
-/devenv/bulk_alerting_dashboards/*.json
-
-/scripts/build/release_publisher/release_publisher
+/devenv/dashboards/bulk-testing/*.json
--- a/.jscs.json
+++ b/.jscs.json
@@ -0,0 +1,13 @@
+{
+    "disallowImplicitTypeConversion": ["string"],
+    "disallowKeywords": ["with"],
+    "disallowMultipleLineBreaks": true,
+    "disallowMixedSpacesAndTabs": true,
+    "disallowTrailingWhitespace": true,
+    "requireSpacesInFunctionExpression": {
+        "beforeOpeningCurlyBrace": true
+    },
+    "disallowSpacesInsideArrayBrackets": true,
+    "disallowSpacesInsideParentheses": true,
+    "validateIndentation": 2
+}
--- a/.jshintrc
+++ b/.jshintrc
@@ -0,0 +1,37 @@
+{
+  "browser": true,
+  "esversion": 6,
+  "bitwise":false,
+  "curly": true,
+  "eqnull": true,
+  "strict": false,
+  "devel": true,
+  "eqeqeq": true,
+  "forin": false,
+  "immed": true,
+  "supernew": true,
+  "expr": true,
+  "indent": 2,
+  "latedef": false,
+  "newcap": true,
+  "noarg": true,
+  "noempty": true,
+  "undef": true,
+  "boss": true,
+  "trailing": true,
+  "laxbreak": true,
+  "laxcomma": true,
+  "sub": true,
+  "unused": true,
+  "maxdepth": 6,
+  "maxlen": 140,
+
+  "globals": {
+    "System": true,
+    "Promise": true,
+    "define": true,
+    "require": true,
+    "Chromath": false,
+    "setImmediate": true
+  }
+}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,166 +1,4 @@
-# 5.3.0 (unreleased)
-
-# 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-beta1 (2018-09-06)
-
-### New Major Features
-
-* **Alerting**: Notification reminders [#7330](https://github.com/grafana/grafana/issues/7330), thx [@jbaublitz](https://github.com/jbaublitz)
-* **Dashboard**: TV & Kiosk mode changes, new cycle view mode button in dashboard toolbar [#13025](https://github.com/grafana/grafana/pull/13025)
-* **OAuth**: Gitlab OAuth with support for filter by groups [#5623](https://github.com/grafana/grafana/issues/5623), thx [@BenoitKnecht](https://github.com/BenoitKnecht)
-* **Postgres**: Graphical query builder [#10095](https://github.com/grafana/grafana/issues/10095), thx [svenklemm](https://github.com/svenklemm)
-
-### New Features
-
-* **LDAP**: Define Grafana Admin permission in ldap group mappings [#2469](https://github.com/grafana/grafana/issues/2496), PR [#12622](https://github.com/grafana/grafana/issues/12622)
-* **LDAP**: Client certificates support [#12805](https://github.com/grafana/grafana/issues/12805), thx [@nyxi](https://github.com/nyxi)
-* **Profile**: List teams that the user is member of in current/active organization [#12476](https://github.com/grafana/grafana/issues/12476)
-* **Configuration**: Allow auto-assigning users to specific organization (other than Main. Org) [#1823](https://github.com/grafana/grafana/issues/1823) [#12801](https://github.com/grafana/grafana/issues/12801), thx [@gzzo](https://github.com/gzzo) and [@ofosos](https://github.com/ofosos)
-* **Dataproxy**: Pass configured/auth headers to a Datasource [#10971](https://github.com/grafana/grafana/issues/10971), thx [@mrsiano](https://github.com/mrsiano)
-* **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)
-
-### Minor
-
-* **Alerting**: Its now possible to configure the default value for how to handle errors and no data in alerting. [#10424](https://github.com/grafana/grafana/issues/10424)
-* **Alerting**: Fix diff and percent_diff reducers [#11563](https://github.com/grafana/grafana/issues/11563), thx [@jessetane](https://github.com/jessetane)
-* **Alerting**: Fix rendering timeout which could cause notifications to not be sent due to rendering timing out [#12151](https://github.com/grafana/grafana/issues/12151)
-* **Docker**: Make it possible to set a specific plugin url [#12861](https://github.com/grafana/grafana/pull/12861), thx [ClementGautier](https://github.com/ClementGautier)
-* **GrafanaCli**: Fixed issue with grafana-cli install plugin resulting in corrupt http response from source error. Fixes [#13079](https://github.com/grafana/grafana/issues/13079)
-* **Provisioning**: Should allow one default datasource per organisation [#12229](https://github.com/grafana/grafana/issues/12229)
-* **Github OAuth**: Allow changes of user info at Github to be synched to Grafana when signing in [#11818](https://github.com/grafana/grafana/issues/11818), thx [@rwaweber](https://github.com/rwaweber)
-* **OAuth**: Fix overriding tls_skip_verify_insecure using environment variable [#12747](https://github.com/grafana/grafana/issues/12747), thx [@jangaraj](https://github.com/jangaraj)
-* **Prometheus**: Fix graph panel bar width issue in aligned prometheus queries [#12379](https://github.com/grafana/grafana/issues/12379)
-* **Prometheus**: Heatmap - fix unhandled error when some points are missing [#12484](https://github.com/grafana/grafana/issues/12484)
-* **Prometheus**: Add $__interval, $__interval_ms, $__range, $__range_s & $__range_ms support for dashboard and template queries [#12597](https://github.com/grafana/grafana/issues/12597) [#12882](https://github.com/grafana/grafana/issues/12882), thx [@roidelapluie](https://github.com/roidelapluie)
-* **Elasticsearch**: For alerting/backend, support having index name to the right of pattern in index pattern [#12731](https://github.com/grafana/grafana/issues/12731)
-* **Graphite**: Fix for quoting of int function parameters (when using variables) [#11927](https://github.com/grafana/grafana/pull/11927)
-* **InfluxDB**: Support timeFilter in query templating for InfluxDB [#12598](https://github.com/grafana/grafana/pull/12598), thx [kichristensen](https://github.com/kichristensen)
-* **Postgres/MySQL/MSSQL**: New $__unixEpochGroup and $__unixEpochGroupAlias macros [#12892](https://github.com/grafana/grafana/issues/12892), thx [@svenklemm](https://github.com/svenklemm)
-* **Postgres/MySQL/MSSQL**: Add previous fill mode to $__timeGroup macro which will fill in previously seen value when point is missing [#12756](https://github.com/grafana/grafana/issues/12756), thx [@svenklemm](https://github.com/svenklemm)
-* **Postgres/MySQL/MSSQL**: Use floor rounding in $__timeGroup macro function [#12460](https://github.com/grafana/grafana/issues/12460), thx [@svenklemm](https://github.com/svenklemm)
-* **Postgres/MySQL/MSSQL**: Use metric column as prefix when returning multiple value columns [#12727](https://github.com/grafana/grafana/issues/12727), thx [@svenklemm](https://github.com/svenklemm)
-* **Postgres/MySQL/MSSQL**: New $__timeGroupAlias macro. Postgres $__timeGroup no longer automatically adds time column alias [#12749](https://github.com/grafana/grafana/issues/12749), thx [@svenklemm](https://github.com/svenklemm)
-* **Postgres/MySQL/MSSQL**: Escape single quotes in variables [#12785](https://github.com/grafana/grafana/issues/12785), thx [@eMerzh](https://github.com/eMerzh)
-* **Postgres/MySQL/MSSQL**: Min time interval support [#13157](https://github.com/grafana/grafana/issues/13157), thx [@svenklemm](https://github.com/svenklemm)
-* **MySQL/MSSQL**: Use datetime format instead of epoch for $__timeFilter, $__timeFrom and $__timeTo macros [#11618](https://github.com/grafana/grafana/issues/11618) [#11619](https://github.com/grafana/grafana/issues/11619), thx [@AustinWinstanley](https://github.com/AustinWinstanley)
-* **Postgres**: Escape ssl mode parameter in connectionstring [#12644](https://github.com/grafana/grafana/issues/12644), thx [@yogyrahmawan](https://github.com/yogyrahmawan)
-* **Cloudwatch**: Improved error handling [#12489](https://github.com/grafana/grafana/issues/12489), thx [@mtanda](https://github.com/mtanda)
-* **Cloudwatch**: AppSync metrics and dimensions [#12300](https://github.com/grafana/grafana/issues/12300), thx [@franciscocpg](https://github.com/franciscocpg)
-* **Cloudwatch**: Direct Connect metrics and dimensions [#12762](https://github.com/grafana/grafana/pulls/12762), thx [@mindriot88](https://github.com/mindriot88)
-* **Cloudwatch**: Added BurstBalance metric to list of AWS RDS metrics [#12561](https://github.com/grafana/grafana/pulls/12561), thx [@activeshadow](https://github.com/activeshadow)
-* **Cloudwatch**: Add new Redshift metrics and dimensions [#12063](https://github.com/grafana/grafana/pulls/12063), thx [@A21z](https://github.com/A21z)
-* **Dashboard**: Fix selecting current dashboard from search should not reload dashboard [#12248](https://github.com/grafana/grafana/issues/12248)
-* **Dashboard**: Use uid when linking to dashboards internally in a dashboard [#10705](https://github.com/grafana/grafana/issues/10705)
-* **Graph**: Option to hide series from tooltip [#3341](https://github.com/grafana/grafana/issues/3341), thx [@mtanda](https://github.com/mtanda)
-* **Singlestat**: Make colorization of prefix and postfix optional in singlestat [#11892](https://github.com/grafana/grafana/pull/11892), thx [@ApsOps](https://github.com/ApsOps)
-* **Table**: Adjust header contrast for the light theme [#12668](https://github.com/grafana/grafana/issues/12668)
-* **Table**: Fix link color when using light theme and thresholds in use [#12766](https://github.com/grafana/grafana/issues/12766)
-* **Table**: Fix for useless horizontal scrollbar for table panel [#9964](https://github.com/grafana/grafana/issues/9964)
-* **Table**: Make table sorting stable when null values exist [#12362](https://github.com/grafana/grafana/pull/12362), thx [@bz2](https://github.com/bz2)
-* **Heatmap**: Fix broken tooltip and crosshair on Firefox [#12486](https://github.com/grafana/grafana/issues/12486)
-* **Datasource**: Fix UI issue with secret fields after updating datasource [#11270](https://github.com/grafana/grafana/issues/11270)
-* **Variables**: Skip unneeded extra query request when de-selecting variable values used for repeated panels [#8186](https://github.com/grafana/grafana/issues/8186), thx [@mtanda](https://github.com/mtanda)
-* **Variables**: Limit amount of queries executed when updating variable that other variable(s) are dependent on [#11890](https://github.com/grafana/grafana/issues/11890)
-* **Variables**: Support query variable refresh when another variable referenced in `Regex` field change its value [#12952](https://github.com/grafana/grafana/issues/12952), thx [@franciscocpg](https://github.com/franciscocpg)
-* **Variables**: Support variables in query variable `Custom all value` field [#12965](https://github.com/grafana/grafana/issues/12965), thx [@franciscocpg](https://github.com/franciscocpg)
-* **Units**: Change units to include characters for power of 2 and 3 [#12744](https://github.com/grafana/grafana/pull/12744), thx [@Worty](https://github.com/Worty)
-* **Units**: Polish złoty currency [#12691](https://github.com/grafana/grafana/pull/12691), thx [@mwegrzynek](https://github.com/mwegrzynek)
-* **Units**: Adds bitcoin axes unit. [#13125](https://github.com/grafana/grafana/pull/13125)
-* **Api**: Delete nonexistent datasource should return 404 [#12313](https://github.com/grafana/grafana/issues/12313), thx [@AustinWinstanley](https://github.com/AustinWinstanley)
-* **Logging**: Reopen log files after receiving a SIGHUP signal [#13112](https://github.com/grafana/grafana/pull/13112), thx [@filewalkwithme](https://github.com/filewalkwithme)
-* **Login**: Show loading animation while waiting for authentication response on login [#12865](https://github.com/grafana/grafana/issues/12865)
-* **UI**: Fix iOS home screen "app" icon and Windows 10 app experience [#12752](https://github.com/grafana/grafana/issues/12752), thx [@andig](https://github.com/andig)
-* **Plugins**: Convert URL-like text to links in plugins readme [#12843](https://github.com/grafana/grafana/pull/12843), thx [pgiraud](https://github.com/pgiraud)
-
-### Breaking changes
-
-* Postgres datasource no longer automatically adds time column alias when using the $__timeGroup alias. However, there's code in place which should make this change backward compatible and shouldn't create any issues.
-* Kiosk mode now also hides submenu (variables)
-* ?inactive url parameter no longer supported, replaced with kiosk=tv url parameter
-
-### 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.
-
-* **Dashboard**: Auto fit dashboard panels to optimize space used for current TV / Monitor [#12768](https://github.com/grafana/grafana/issues/12768)
-
-### Tech
-
-* **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
-
-See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-6-4-security-update/10050) for details.
-
-# 5.2.2 (2018-07-25)
-
-### Minor
-
-* **Prometheus**: Fix graph panel bar width issue in aligned prometheus queries [#12379](https://github.com/grafana/grafana/issues/12379)
-* **Dashboard**: Dashboard links not updated when changing variables [#12506](https://github.com/grafana/grafana/issues/12506)
-* **Postgres/MySQL/MSSQL**: Fix connection leak [#12636](https://github.com/grafana/grafana/issues/12636) [#9827](https://github.com/grafana/grafana/issues/9827)
-* **Plugins**: Fix loading of external plugins [#12551](https://github.com/grafana/grafana/issues/12551)
-* **Dashboard**: Remove unwanted scrollbars in embedded panels [#12589](https://github.com/grafana/grafana/issues/12589)
-* **Prometheus**: Prevent error using $__interval_ms in query [#12533](https://github.com/grafana/grafana/pull/12533), thx [@mtanda](https://github.com/mtanda)
-
-# 5.2.1 (2018-06-29)
-
-### Minor
-
-* **Auth Proxy**: Important security fix for whitelist of IP address feature [#12444](https://github.com/grafana/grafana/pull/12444)
-* **UI**: Fix - Grafana footer overlapping page [#12430](https://github.com/grafana/grafana/issues/12430)
-* **Logging**: Errors should be reported before crashing [#12438](https://github.com/grafana/grafana/issues/12438)
-
-# 5.2.0-stable (2018-06-27)
-
-### Minor
-
-* **Plugins**: Handle errors correctly when loading datasource plugin [#12383](https://github.com/grafana/grafana/pull/12383) thx [@rozetko](https://github.com/rozetko)
-* **Render**: Enhance error message if phantomjs executable is not found [#11868](https://github.com/grafana/grafana/issues/11868)
-* **Dashboard**: Set correct text in drop down when variable is present in url [#11968](https://github.com/grafana/grafana/issues/11968)
-
-### 5.2.0-beta3 fixes
-
-* **LDAP**: Handle "dn" ldap attribute more gracefully [#12385](https://github.com/grafana/grafana/pull/12385), reverts [#10970](https://github.com/grafana/grafana/pull/10970)
-
-# 5.2.0-beta3 (2018-06-21)
-
-### Minor
-
-* **Build**: All rpm packages should be signed [#12359](https://github.com/grafana/grafana/issues/12359)
-
-# 5.2.0-beta2 (2018-06-20)
+# 5.2.0 (unreleased)

 ### New Features

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

 ### Minor

-* **Permissions**: Important security fix for API keys with viewer role [#12343](https://github.com/grafana/grafana/issues/12343)
 * **Dashboard**: Fix so panel titles doesn't wrap [#11074](https://github.com/grafana/grafana/issues/11074)
 * **Dashboard**: Prevent double-click when saving dashboard [#11963](https://github.com/grafana/grafana/issues/11963)
 * **Dashboard**: AutoFocus the add-panel search filter [#12189](https://github.com/grafana/grafana/pull/12189) thx [@ryantxu](https://github.com/ryantxu)
@@ -178,24 +15,12 @@ See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-
 * **Influxdb**: Add support for mode function [#12286](https://github.com/grafana/grafana/issues/12286)
 * **Cloudwatch**: Fixes panic caused by bad timerange settings [#12199](https://github.com/grafana/grafana/issues/12199)
 * **Auth Proxy**: Whitelist proxy IP address instead of client IP address [#10707](https://github.com/grafana/grafana/issues/10707)
-* **User Management**: Make sure that a user always has a current org assigned [#11076](https://github.com/grafana/grafana/issues/11076)
-* **Snapshots**: Fix: annotations not properly extracted leading to incorrect rendering of annotations [#12278](https://github.com/grafana/grafana/issues/12278)
-* **LDAP**: Allow use of DN in group_search_filter_user_attribute and member_of [#3132](https://github.com/grafana/grafana/issues/3132), thx [@mmolnar](https://github.com/mmolnar)
-* **Graph**: Fix legend decimals precision calculation [#11792](https://github.com/grafana/grafana/issues/11792)
-* **Dashboard**: Make sure to process panels in collapsed rows when exporting dashboard [#12256](https://github.com/grafana/grafana/issues/12256)
-
-### 5.2.0-beta1 fixes
-
-* **Dashboard**: Dashboard link doesn't work when "As dropdown" option is checked [#12315](https://github.com/grafana/grafana/issues/12315)
-* **Dashboard**: Fix regressions after save modal changes, including adhoc template issues [#12240](https://github.com/grafana/grafana/issues/12240)
-* **Docker**: Config keys ending with _FILE are not respected [#170](https://github.com/grafana/grafana-docker/issues/170)

 # 5.2.0-beta1 (2018-06-05)

 ### New Features

 * **Elasticsearch**: Alerting support [#5893](https://github.com/grafana/grafana/issues/5893), thx [@WPH95](https://github.com/WPH95)
-* **Build**: Crosscompile and packages Grafana on arm, windows, linux and darwin [#11920](https://github.com/grafana/grafana/pull/11920), thx [@fg2it](https://github.com/fg2it)
 * **Login**: Change admin password after first login [#11882](https://github.com/grafana/grafana/issues/11882)
 * **Alert list panel**: Updated to support filtering alerts by name, dashboard title, folder, tags [#11500](https://github.com/grafana/grafana/issues/11500), [#8168](https://github.com/grafana/grafana/issues/8168), [#6541](https://github.com/grafana/grafana/issues/6541)

@@ -231,14 +56,6 @@ See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-
 * **Dashboard list panel**: Search dashboards by folder [#11525](https://github.com/grafana/grafana/issues/11525)
 * **Sidenav**: Always show server admin link in sidenav if grafana admin [#11657](https://github.com/grafana/grafana/issues/11657)

-# 5.1.5 (2018-06-27)
-
-* **Docker**: Config keys ending with _FILE are not respected [#170](https://github.com/grafana/grafana-docker/issues/170)
-
-# 5.1.4 (2018-06-19)
-
-* **Permissions**: Important security fix for API keys with viewer role [#12343](https://github.com/grafana/grafana/issues/12343)
-
 # 5.1.3 (2018-05-16)

 * **Scroll**: Graph panel / legend texts shifts on the left each time we move scrollbar on firefox [#11830](https://github.com/grafana/grafana/issues/11830)
@@ -321,7 +138,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)
@@ -491,12 +308,6 @@ The following properties have been deprecated and will be removed in a future re
  - `uri` property in `GET /api/search` -> Use new `url` or `uid` property instead
  - `meta.slug` property in `GET /api/dashboards/uid/:uid` and `GET /api/dashboards/db/:slug` -> Use new `meta.url` or `dashboard.uid` property instead

-# 4.6.4 (2018-08-29)
-
-### Important fix for LDAP & OAuth login vulnerability
-
-See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-6-4-security-update/10050) for details.
-
 # 4.6.3 (2017-12-14)

 ## Fixes
@@ -508,7 +319,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)
@@ -1467,8 +1278,8 @@ 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 #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 #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 promted 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
 - [Issue #171](https://github.com/grafana/grafana/issues/171).   Panel: Different time periods, panels can override dashboard relative time and/or add a time shift
@@ -1926,4 +1737,3 @@ Thanks to everyone who contributed fixes and provided feedback :+1:
 # 1.0.0 (2014-01-19)

 First public release
-
--- a/82
+++ b/82
@@ -1,82 +0,0 @@
-# Golang build container
-FROM golang:1.11
-
-WORKDIR $GOPATH/src/github.com/grafana/grafana
-
-COPY Gopkg.toml Gopkg.lock ./
-COPY vendor vendor
-
-ARG DEP_ENSURE=""
-RUN if [ ! -z "${DEP_ENSURE}" ]; then \
-      go get -u github.com/golang/dep/cmd/dep && \
-      dep ensure --vendor-only; \
-    fi
-
-COPY pkg pkg
-COPY build.go build.go
-COPY package.json package.json
-
-RUN go run build.go build
-
-# Node build container
-FROM node:8
-
-WORKDIR /usr/src/app/
-
-COPY package.json yarn.lock ./
-RUN yarn install --pure-lockfile --no-progress
-
-COPY Gruntfile.js tsconfig.json tslint.json ./
-COPY public public
-COPY scripts scripts
-COPY emails emails
-
-ENV NODE_ENV production
-RUN ./node_modules/.bin/grunt build
-
-# Final container
-FROM debian:stretch-slim
-
-ARG GF_UID="472"
-ARG GF_GID="472"
-
-ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
-    GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
-    GF_PATHS_DATA="/var/lib/grafana" \
-    GF_PATHS_HOME="/usr/share/grafana" \
-    GF_PATHS_LOGS="/var/log/grafana" \
-    GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
-    GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
-
-WORKDIR $GF_PATHS_HOME
-
-RUN apt-get update && apt-get install -qq -y libfontconfig ca-certificates && \
-    apt-get autoremove -y && \
-    rm -rf /var/lib/apt/lists/*
-
-COPY conf ./conf
-
-RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
-    groupadd -r -g $GF_GID grafana && \
-    useradd -r -u $GF_UID -g grafana grafana && \
-    mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
-             "$GF_PATHS_PROVISIONING/dashboards" \
-             "$GF_PATHS_LOGS" \
-             "$GF_PATHS_PLUGINS" \
-             "$GF_PATHS_DATA" && \
-    cp "$GF_PATHS_HOME/conf/sample.ini" "$GF_PATHS_CONFIG" && \
-    cp "$GF_PATHS_HOME/conf/ldap.toml" /etc/grafana/ldap.toml && \
-    chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" && \
-    chmod 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS"
-
-COPY --from=0 /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-server /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-cli ./bin/
-COPY --from=1 /usr/src/app/public ./public
-COPY --from=1 /usr/src/app/tools ./tools
-COPY tools/phantomjs/render.js ./tools/phantomjs/render.js
-
-EXPOSE 3000
-
-COPY ./packaging/docker/run.sh /run.sh
-
-USER grafana
-ENTRYPOINT [ "/run.sh" ]
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -19,12 +19,6 @@
  packages = ["."]
  revision = "7677a1d7c1137cd3dd5ba7a076d0c898a1ef4520"

-[[projects]]
-  branch = "master"
-  name = "github.com/VividCortex/mysqlerr"
-  packages = ["."]
-  revision = "6c6b55f8796f578c870b7e19bafb16103bc40095"
-
 [[projects]]
  name = "github.com/aws/aws-sdk-go"
  packages = [
@@ -38,7 +32,6 @@
    "aws/credentials/ec2rolecreds",
    "aws/credentials/endpointcreds",
    "aws/credentials/stscreds",
-    "aws/csm",
    "aws/defaults",
    "aws/ec2metadata",
    "aws/endpoints",
@@ -50,8 +43,6 @@
    "internal/shareddefaults",
    "private/protocol",
    "private/protocol/ec2query",
-    "private/protocol/eventstream",
-    "private/protocol/eventstream/eventstreamapi",
    "private/protocol/query",
    "private/protocol/query/queryutil",
    "private/protocol/rest",
@@ -63,8 +54,8 @@
    "service/s3",
    "service/sts"
  ]
-  revision = "fde4ded7becdeae4d26bf1212916aabba79349b4"
-  version = "v1.14.12"
+  revision = "c7cd1ebe87257cde9b65112fc876b0339ea0ac30"
+  version = "v1.13.49"

 [[projects]]
  branch = "master"
@@ -679,6 +670,6 @@
 [solve-meta]
  analyzer-name = "dep"
  analyzer-version = 1
-  inputs-digest = "6e9458f912a5f0eb3430b968f1b4dbc4e3b7671b282cf4fe1573419a6d9ba0d4"
+  inputs-digest = "85cc057e0cc074ab5b43bd620772d63d51e07b04e8782fcfe55e6929d2fc40f7"
  solver-name = "gps-cdcl"
  solver-version = 1
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -36,7 +36,7 @@ ignored = [

 [[constraint]]
  name = "github.com/aws/aws-sdk-go"
-  version = "1.13.56"
+  version = "1.12.65"

 [[constraint]]
  branch = "master"
@@ -203,7 +203,3 @@ ignored = [
 [[constraint]]
  name = "github.com/denisenkom/go-mssqldb"
  revision = "270bc3860bb94dd3a3ffd047377d746c5e276726"
-
-[[constraint]]
-  name = "github.com/VividCortex/mysqlerr"
-  branch = "master"
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,3 +1,4 @@
+/* jshint node:true */
 'use strict';
 module.exports = function (grunt) {
  var os = require('os');
@@ -25,6 +26,7 @@ module.exports = function (grunt) {
    }
  }

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

--- a/12
+++ b/12
@@ -24,15 +24,6 @@ build-js:

 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 package-only latest
-	cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
-	cd packaging/docker && docker build --tag grafana/grafana:dev .
-
-build-docker-full:
-	docker build --tag grafana/grafana:dev .
-
 test-go:
 	go test -v ./pkg/...

@@ -43,3 +34,6 @@ test: test-go test-js

 run:
 	./bin/grafana-server
+
+protoc:
+	protoc -I pkg/tsdb/models pkg/tsdb/models/*.proto --go_out=plugins=grpc:pkg/tsdb/models/.
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1,5 +1,5 @@

-Copyright 2014-2018 Grafana Labs
+Copyright 2014-2017 Grafana Labs

 This software is based on Kibana: 
 Copyright 2012-2013 Elasticsearch BV
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ the latest master builds [here](https://grafana.com/grafana/download)

 ### Dependencies

- Go 1.11
+- Go 1.10
 - NodeJS LTS

 ### Building the backend
@@ -43,7 +43,7 @@ To build the assets, rebuild on file change, and serve them by Grafana's webserv
 ```bash
 npm install -g yarn
 yarn install --pure-lockfile
-yarn watch
+npm run watch
 ```

 Build the assets, rebuild on file change with Hot Module Replacement (HMR), and serve them by webpack-dev-server (http://localhost:3333):
@@ -54,9 +54,14 @@ env GRAFANA_THEME=light yarn start
 ```
 Note: HMR for Angular is not supported. If you edit files in the Angular part of the app, the whole page will reload.

-Run tests
+Run tests 
 ```bash
-yarn jest
+npm run jest
+```
+
+Run karma tests
+```bash
+npm run karma
 ```

 ### Recompile backend on source change
@@ -69,15 +74,6 @@ 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 (on linux/amd64)
-
-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`
-
 ### Dev config

 Create a custom.ini in the conf directory to override default configuration options.
@@ -93,38 +89,30 @@ In your custom.ini uncomment (remove the leading `;`) sign. And set `app_mode =
 #### Frontend
 Execute all frontend tests
 ```bash
-yarn test
+npm run test
 ```

-Writing & watching frontend tests
+Writing & watching frontend tests (we have two test runners)

- Start watcher: `yarn jest`
- Jest will run all test files that end with the name ".test.ts"
+- jest for all new tests that do not require browser context (React+more)
+   - Start watcher: `npm run jest`
+   - Jest will run all test files that end with the name ".jest.ts"
+- karma + mocha is used for testing angularjs components. We do want to migrate these test to jest over time (if possible).
+  - Start watcher: `npm run karma`
+  - Karma+Mocha runs all files that end with the name "_specs.ts".

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

 # Run Golang tests using mysql as database - convenient to use /docker/blocks/mysql_tests
-GRAFANA_TEST_DB=mysql go test ./pkg/...
+GRAFANA_TEST_DB=mysql go test ./pkg/... 

 # Run Golang tests using postgres as database - convenient to use /docker/blocks/postgres_tests
-GRAFANA_TEST_DB=postgres 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.
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,27 +1,34 @@
-# Roadmap (2018-08-07)
+# Roadmap (2018-05-06)

 This roadmap is a tentative plan for the core development team. Things change constantly as PRs come in and priorities change. 
 But it will give you an idea of our current vision and plan. 
  
 ### Short term (1-2 months)
-  - PRs & Bugs
+
+  - Elasticsearch alerting
+  - Crossplatform builds
+  - Backend service refactorings
+  - Explore UI 
+  - First login registration view
+  
+### Mid term (2-4 months)
  - Multi-Stat panel
-  - Metrics & Log Explore UI 
- 
-### Mid term (2-4 months)  
  - React Panels 
-  - Change visualization (panel type) on the fly. 
  - Templating Query Editor UI Plugin hook
-  - Backend plugins
  
 ### Long term (4 - 8 months)
- - Alerting improvements (silence, per series tracking, etc)
- - Progress on React migration
+
+- Alerting improvements (silence, per series tracking, etc)
+- Progress on React migration
+- Change visualization (panel type) on the fly. 
+- Multi stat panel (vertical version of singlestat with bars/graph mode with big number etc) 
+- Repeat panel by query results 

 ### In a distant future far far away
- - Meta queries 
- - Integrated light weight TSDB
- - Web socket & live data sources
+
+- Meta queries 
+- Integrated light weight TSDB
+- Web socket & live data sources

 ### Outside contributions
 We know this is being worked on right now by contributors (and we hope to merge it when it's ready). 
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,7 @@ clone_folder: c:\gopath\src\github.com\grafana\grafana
 environment:
  nodejs_version: "6"
  GOPATH: C:\gopath
-  GOVERSION: 1.11
+  GOVERSION: 1.10

 install:
  - rmdir c:\go /s /q
--- a/build.go
+++ b/build.go
@@ -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
@@ -69,10 +64,6 @@ func main() {

 	readVersionFromPackageJson()

-	if pkgArch == "" {
-		pkgArch = goarch
-	}
-
 	log.Printf("Version: %s, Linux Version: %s, Package Iteration: %s\n", version, linuxPackageVersion, linuxPackageIteration)

 	if flag.NArg() == 0 {
@@ -114,16 +105,10 @@ func main() {

 		case "package":
 			grunt(gruntBuildArg("build")...)
-			grunt(gruntBuildArg("package")...)
-			if goos == linux {
-				createLinuxPackages()
-			}
+			packageGrafana()

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

 		case "pkg-rpm":
 			grunt(gruntBuildArg("release")...)
@@ -148,6 +133,22 @@ func main() {
 	}
 }

+func packageGrafana() {
+	platformArg := fmt.Sprintf("--platform=%v", goos)
+	previousPkgArch := pkgArch
+	if pkgArch == "" {
+		pkgArch = goarch
+	}
+	postProcessArgs := gruntBuildArg("package")
+	postProcessArgs = append(postProcessArgs, platformArg)
+	grunt(postProcessArgs...)
+	pkgArch = previousPkgArch
+
+	if goos == "linux" {
+		createLinuxPackages()
+	}
+}
+
 func makeLatestDistCopies() {
 	files, err := ioutil.ReadDir("dist")
 	if err != nil {
@@ -329,7 +330,6 @@ func createPackage(options linuxPackageOptions) {
 	name := "grafana"
 	if enterprise {
 		name += "-enterprise"
-		args = append(args, "--replaces", "grafana")
 	}
 	args = append(args, "--name", name)

@@ -383,7 +383,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...)
@@ -403,8 +403,6 @@ func gruntBuildArg(task string) []string {
 	if phjsToRelease != "" {
 		args = append(args, fmt.Sprintf("--phjsToRelease=%v", phjsToRelease))
 	}
-	args = append(args, fmt.Sprintf("--platform=%v", goos))
-
 	return args
 }

@@ -421,11 +419,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"
 	}

@@ -467,6 +465,7 @@ 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.enterprise=%t", enterprise))
 	return b.String()
 }

@@ -489,11 +488,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
 	}
--- a/codecov.yml
+++ b/codecov.yml
@@ -0,0 +1,11 @@
+coverage:
+  precision: 2
+  round: down
+  range: "50...100"
+
+  status:
+    project: yes
+    patch: yes
+    changes: no
+
+comment: off
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -14,9 +14,6 @@ instance_name = ${HOSTNAME}
 # Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
 data = data

-# Temporary files in `data` directory older than given duration will be removed
-temp_data_lifetime = 24h
-
 # Directory where grafana can store logs
 logs = data/log

@@ -213,9 +210,6 @@ allow_org_create = false
 # Set to true to automatically assign new users to the default organization (id 1)
 auto_assign_org = true

-# Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true)
-auto_assign_org_id = 1
-
 # Default role new users will be automatically assigned (if auto_assign_org above is set to true)
 auto_assign_org_role = Viewer

@@ -270,18 +264,6 @@ api_url = https://api.github.com/user
 team_ids =
 allowed_organizations =

-#################################### GitLab Auth #########################
-[auth.gitlab]
-enabled = false
-allow_sign_up = true
-client_id = some_id
-client_secret = some_secret
-scopes = api
-auth_url = https://gitlab.com/oauth/authorize
-token_url = https://gitlab.com/oauth/token
-api_url = https://gitlab.com/api/v4
-allowed_groups =
-
 #################################### Google Auth #########################
 [auth.google]
 enabled = false
@@ -321,16 +303,11 @@ 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 =
 team_ids =
 allowed_organizations =
-tls_skip_verify_insecure = false
-tls_client_cert =
-tls_client_key =
-tls_client_ca =

 #################################### Basic Auth ##########################
 [auth.basic]
@@ -468,16 +445,6 @@ enabled = true
 # Makes it possible to turn off alert rule execution but alerting UI is visible
 execute_alerts = true

-# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
-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
@@ -549,8 +516,3 @@ container_name =

 [external_image_storage.local]
 # does not require any configuration
-
-[rendering]
-# Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
-server_url =
-callback_url =
--- a/conf/ldap.toml
+++ b/conf/ldap.toml
@@ -15,9 +15,6 @@ start_tls = false
 ssl_skip_verify = false
 # set to the path to your root CA certificate or leave unset to use system defaults
 # root_ca_cert = "/path/to/certificate.crt"
-# Authentication against LDAP servers requiring client certificates
-# client_cert = "/path/to/client.crt"
-# client_key = "/path/to/client.key"

 # Search user bind dn
 bind_dn = "cn=admin,dc=grafana,dc=org"
@@ -31,11 +28,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]
@@ -49,8 +72,6 @@ email =  "email"
 [[servers.group_mappings]]
 group_dn = "cn=admins,dc=grafana,dc=org"
 org_role = "Admin"
-# To make user an instance admin  (Grafana Admin) uncomment line below
-# grafana_admin = true
 # The Grafana organization database id, optional, if left out the default org (id 1) will be used
 # org_id = 1

--- a/conf/provisioning/datasources/sample.yaml
+++ b/conf/provisioning/datasources/sample.yaml
@@ -40,14 +40,11 @@ apiVersion: 1
 #      graphiteVersion: "1.1"
 #      tlsAuth: true
 #      tlsAuthWithCACert: true
-#      httpHeaderName1: "Authorization"
 #   # <string> json object of data that will be encrypted.
 #   secureJsonData:
 #     tlsCACert: "..."
 #     tlsClientCert: "..."
 #     tlsClientKey: "..."
-#     # <openshift\kubernetes token example>
-#     httpHeaderValue1: "Bearer xf5yhfkpsnmgo"
 #   version: 1
 #   # <bool> allow users to edit datasources from the UI.
 #   editable: false
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -14,9 +14,6 @@
 # Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
 ;data = /var/lib/grafana

-# Temporary files in `data` directory older than given duration will be removed
-;temp_data_lifetime = 24h
-
 # Directory where grafana can store logs
 ;logs = /var/log/grafana

@@ -272,10 +269,6 @@ log_queries =
 ;api_url = https://foo.bar/user
 ;team_ids =
 ;allowed_organizations =
-;tls_skip_verify_insecure = false
-;tls_client_cert =
-;tls_client_key =
-;tls_client_ca =

 #################################### Grafana.com Auth ####################
 [auth.grafana_com]
@@ -387,16 +380,6 @@ log_queries =
 # Makes it possible to turn off alert rule execution but alerting UI is visible
 ;execute_alerts = true

-# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
-;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
@@ -435,7 +418,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

@@ -470,8 +453,3 @@ log_queries =

 [external_image_storage.local]
 # does not require any configuration
-
-[rendering]
-# Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
-;server_url =
-;callback_url =
--- a/devenv/README.md
+++ b/devenv/README.md
@@ -1,16 +1,11 @@
 This folder contains useful scripts and configuration for...

-* Configuring dev datasources in Grafana
-* Configuring dev & test scenarios dashboards.
+* Configuring datasources in Grafana
+* Provision example dashboards in Grafana
+* Run preconfiured datasources as docker containers
+
+want to know more? run setup!

 ```bash
 ./setup.sh
 ```
-
-After restarting grafana server there should now be a number of datasources named `gdev-<type>` provisioned as well as a dashboard folder named `gdev dashboards`. This folder contains dashboard & panel features tests dashboards. 
-
-# Dev dashboards
-
-Please update these dashboards or make new ones as new panels & dashboards features are developed or new bugs are found. The dashboards are located in the `devenv/dev-dashboards` folder. 
-
-
--- a/devenv/bulk_alerting_dashboards/bulk_alerting_dashboards.yaml
+++ b/devenv/bulk_alerting_dashboards/bulk_alerting_dashboards.yaml
@@ -1,9 +0,0 @@
-apiVersion: 1
-
-providers:
- - name: 'Bulk alerting dashboards'
-   folder: 'Bulk alerting dashboards'
-   type: file
-   options:
-     path: devenv/bulk_alerting_dashboards
-
--- a/devenv/bulk_alerting_dashboards/bulkdash_alerting.jsonnet
+++ b/devenv/bulk_alerting_dashboards/bulkdash_alerting.jsonnet
@@ -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
-}
--- a/devenv/dashboards.yaml
+++ b/devenv/dashboards.yaml
@@ -1,9 +0,0 @@
-apiVersion: 1
-
-providers:
- - name: 'gdev dashboards'
-   folder: 'gdev dashboards'
-   type: file
-   options:
-     path: devenv/dev-dashboards
-
--- a/devenv/dashboards/bulk-testing/bulk-dashboards.yaml
+++ b/devenv/dashboards/bulk-testing/bulk-dashboards.yaml
@@ -5,5 +5,5 @@ providers:
   folder: 'Bulk dashboards'
   type: file
   options:
-     path: devenv/bulk-dashboards
+     path: devenv/dashboards/bulk-testing

--- a/devenv/dashboards/bulk-testing/bulkdash.jsonnet
+++ b/devenv/dashboards/bulk-testing/bulkdash.jsonnet
--- a/devenv/datasources/default/default.yaml
+++ b/devenv/datasources/default/default.yaml
@@ -1,41 +1,38 @@
 apiVersion: 1

 datasources:
-  - name: gdev-graphite
+  - name: Graphite
    type: graphite
    access: proxy
    url: http://localhost:8080
    jsonData:
      graphiteVersion: "1.1"
-
-  - name: gdev-prometheus
+  
+  - name: Prometheus
    type: prometheus
    access: proxy
    isDefault: true
    url: http://localhost:9090
-
-  - name: gdev-testdata
-    type: testdata
-
-  - name: gdev-influxdb
+  
+  - name: InfluxDB
    type: influxdb
    access: proxy
    database: site
    user: grafana
    password: grafana
    url: http://localhost:8086
-    jsonData:
+    jsonData: 
      timeInterval: "15s"

-  - name: gdev-opentsdb
+  - name: OpenTsdb
    type: opentsdb
    access: proxy
    url: http://localhost:4242
-    jsonData:
+    jsonData: 
      tsdbResolution: 1
      tsdbVersion: 1

-  - name: gdev-elasticsearch-metrics
+  - name: Elastic
    type: elasticsearch
    access: proxy
    database: "[metrics-]YYYY.MM.DD"
@@ -43,38 +40,22 @@ datasources:
    jsonData:
      interval: Daily
      timeField: "@timestamp"
-
-  - name: gdev-mysql
+  
+  - name: MySQL
    type: mysql
    url: localhost:3306
    database: grafana
    user: grafana
    password: password

-  - name: gdev-mysql-ds-tests
-    type: mysql
-    url: localhost:3306
-    database: grafana_ds_tests
-    user: grafana
-    password: password
-
-  - name: gdev-mssql
+  - name: MSSQL
    type: mssql
    url: localhost:1433
    database: grafana
    user: grafana
-    secureJsonData:
-      password: Password!
+    password: "Password!"

-  - name: gdev-mssql-ds-tests
-    type: mssql
-    url: localhost:1433
-    database: grafanatest
-    user: grafana
-    secureJsonData:
-      password: Password!
-
-  - name: gdev-postgres
+  - name: Postgres
    type: postgres
    url: localhost:5432
    database: grafana
@@ -84,17 +65,7 @@ datasources:
    jsonData:
      sslmode: "disable"

-  - name: gdev-postgres-ds-tests
-    type: postgres
-    url: localhost:5432
-    database: grafanadstest
-    user: grafanatest
-    secureJsonData:
-      password: grafanatest
-    jsonData:
-      sslmode: "disable"
-
-  - name: gdev-cloudwatch
+  - name: Cloudwatch
    type: cloudwatch
    editable: true
    jsonData:
--- a/devenv/dev-dashboards/panel_tests_graph.json
+++ b/devenv/dev-dashboards/panel_tests_graph.json
--- a/devenv/dev-dashboards/panel_tests_polystat.json
+++ b/devenv/dev-dashboards/panel_tests_polystat.json
--- a/devenv/dev-dashboards/panel_tests_singlestat.json
+++ b/devenv/dev-dashboards/panel_tests_singlestat.json
@@ -1,574 +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": [
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": true,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "datasource": "gdev-testdata",
-      "decimals": null,
-      "description": "",
-      "format": "ms",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 8,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "postfix": "postfix",
-      "postfixFontSize": "50%",
-      "prefix": "prefix",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": true
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "expr": "",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,2,3,4,5"
-        }
-      ],
-      "thresholds": "5,10",
-      "title": "prefix 3 ms (green) postfixt + sparkline",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "avg"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorPrefix": false,
-      "colorValue": true,
-      "colors": [
-        "#d44a3a",
-        "rgba(237, 129, 40, 0.89)",
-        "#299c46"
-      ],
-      "datasource": "gdev-testdata",
-      "decimals": null,
-      "description": "",
-      "format": "ms",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 8,
-        "x": 8,
-        "y": 0
-      },
-      "id": 3,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": true,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": true
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "expr": "",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,2,3,4,5"
-        }
-      ],
-      "thresholds": "5,10",
-      "title": "3 ms (red)  + full height sparkline",
-      "type": "singlestat",
-      "valueFontSize": "200%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "avg"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": true,
-      "colorPrefix": false,
-      "colorValue": false,
-      "colors": [
-        "#d44a3a",
-        "rgba(237, 129, 40, 0.89)",
-        "#299c46"
-      ],
-      "datasource": "gdev-testdata",
-      "decimals": null,
-      "description": "",
-      "format": "ms",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 8,
-        "x": 16,
-        "y": 0
-      },
-      "id": 4,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": true,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "expr": "",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,2,3,4,5"
-        }
-      ],
-      "thresholds": "5,10",
-      "title": "3 ms + red background",
-      "type": "singlestat",
-      "valueFontSize": "200%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "avg"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorPrefix": false,
-      "colorValue": true,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "datasource": "gdev-testdata",
-      "decimals": null,
-      "description": "",
-      "format": "ms",
-      "gauge": {
-        "maxValue": 150,
-        "minValue": 0,
-        "show": true,
-        "thresholdLabels": true,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 8,
-        "x": 0,
-        "y": 7
-      },
-      "id": 5,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": true,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "expr": "",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "10,20,80"
-        }
-      ],
-      "thresholds": "81,90",
-      "title": "80 ms green gauge, thresholds 81, 90",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "current"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorPrefix": false,
-      "colorValue": true,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "datasource": "gdev-testdata",
-      "decimals": null,
-      "description": "",
-      "format": "ms",
-      "gauge": {
-        "maxValue": 150,
-        "minValue": 0,
-        "show": true,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 8,
-        "x": 8,
-        "y": 7
-      },
-      "id": 6,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": true,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "expr": "",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "10,20,80"
-        }
-      ],
-      "thresholds": "81,90",
-      "title": "80 ms green gauge, thresholds 81, 90, no labels",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "current"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorPrefix": false,
-      "colorValue": true,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "datasource": "gdev-testdata",
-      "decimals": null,
-      "description": "",
-      "format": "ms",
-      "gauge": {
-        "maxValue": 150,
-        "minValue": 0,
-        "show": true,
-        "thresholdLabels": false,
-        "thresholdMarkers": false
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 8,
-        "x": 16,
-        "y": 7
-      },
-      "id": 7,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": true,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "expr": "",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "10,20,80"
-        }
-      ],
-      "thresholds": "81,90",
-      "title": "80 ms green gauge, thresholds 81, 90, no markers or labels",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "current"
-    }
-  ],
-  "refresh": false,
-  "revision": 8,
-  "schemaVersion": 16,
-  "style": "dark",
-  "tags": [
-    "gdev",
-    "panel-tests"
-  ],
-  "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": "browser",
-  "title": "Panel Tests - Singlestat",
-  "uid": "singlestat",
-  "version": 14
-}
--- a/devenv/dev-dashboards/panel_tests_table.json
+++ b/devenv/dev-dashboards/panel_tests_table.json
@@ -1,453 +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": [
-    {
-      "columns": [],
-      "datasource": "gdev-testdata",
-      "fontSize": "100%",
-      "gridPos": {
-        "h": 11,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 3,
-      "links": [],
-      "pageSize": 10,
-      "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.9)",
-            "rgba(237, 129, 40, 0.89)",
-            "rgba(50, 172, 45, 0.97)"
-          ],
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "decimals": 2,
-          "mappingType": 1,
-          "pattern": "ColorCell",
-          "thresholds": [
-            "5",
-            "10"
-          ],
-          "type": "number",
-          "unit": "currencyUSD"
-        },
-        {
-          "alias": "",
-          "colorMode": "value",
-          "colors": [
-            "rgba(245, 54, 54, 0.9)",
-            "rgba(237, 129, 40, 0.89)",
-            "rgba(50, 172, 45, 0.97)"
-          ],
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "decimals": 2,
-          "mappingType": 1,
-          "pattern": "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": "server1",
-          "expr": "",
-          "format": "table",
-          "intervalFactor": 1,
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,90,30,5,0,20,10"
-        },
-        {
-          "alias": "server2",
-          "refId": "B",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,90,30,5,0"
-        }
-      ],
-      "title": "Time series to rows (2 pages)",
-      "transform": "timeseries_to_rows",
-      "type": "table"
-    },
-    {
-      "columns": [
-        {
-          "text": "Avg",
-          "value": "avg"
-        },
-        {
-          "text": "Max",
-          "value": "max"
-        },
-        {
-          "text": "Current",
-          "value": "current"
-        }
-      ],
-      "datasource": "gdev-testdata",
-      "fontSize": "100%",
-      "gridPos": {
-        "h": 11,
-        "w": 12,
-        "x": 12,
-        "y": 0
-      },
-      "id": 4,
-      "links": [],
-      "pageSize": 10,
-      "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.9)",
-            "rgba(237, 129, 40, 0.89)",
-            "rgba(50, 172, 45, 0.97)"
-          ],
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "decimals": 2,
-          "mappingType": 1,
-          "pattern": "ColorCell",
-          "thresholds": [
-            "5",
-            "10"
-          ],
-          "type": "number",
-          "unit": "currencyUSD"
-        },
-        {
-          "alias": "",
-          "colorMode": "value",
-          "colors": [
-            "rgba(245, 54, 54, 0.9)",
-            "rgba(237, 129, 40, 0.89)",
-            "rgba(50, 172, 45, 0.97)"
-          ],
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "decimals": 2,
-          "mappingType": 1,
-          "pattern": "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": "server1",
-          "expr": "",
-          "format": "table",
-          "intervalFactor": 1,
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,90,30,5,0,20,10"
-        },
-        {
-          "alias": "server2",
-          "refId": "B",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,90,30,5,0"
-        }
-      ],
-      "title": "Time series aggregations",
-      "transform": "timeseries_aggregations",
-      "type": "table"
-    },
-    {
-      "columns": [],
-      "datasource": "gdev-testdata",
-      "fontSize": "100%",
-      "gridPos": {
-        "h": 7,
-        "w": 24,
-        "x": 0,
-        "y": 11
-      },
-      "id": 5,
-      "links": [],
-      "pageSize": null,
-      "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": "row",
-          "colors": [
-            "rgba(245, 54, 54, 0.9)",
-            "rgba(237, 129, 40, 0.89)",
-            "rgba(50, 172, 45, 0.97)"
-          ],
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "decimals": 2,
-          "mappingType": 1,
-          "pattern": "/Color/",
-          "thresholds": [
-            "5",
-            "10"
-          ],
-          "type": "number",
-          "unit": "currencyUSD"
-        },
-        {
-          "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": "1,20,90,30,5,0,20,10"
-        }
-      ],
-      "title": "color row by threshold",
-      "transform": "timeseries_to_columns",
-      "type": "table"
-    },
-    {
-      "columns": [],
-      "datasource": "gdev-testdata",
-      "fontSize": "100%",
-      "gridPos": {
-        "h": 8,
-        "w": 24,
-        "x": 0,
-        "y": 18
-      },
-      "id": 2,
-      "links": [],
-      "pageSize": null,
-      "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.9)",
-            "rgba(237, 129, 40, 0.89)",
-            "rgba(50, 172, 45, 0.97)"
-          ],
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "decimals": 2,
-          "mappingType": 1,
-          "pattern": "ColorCell",
-          "thresholds": [
-            "5",
-            "10"
-          ],
-          "type": "number",
-          "unit": "currencyUSD"
-        },
-        {
-          "alias": "",
-          "colorMode": "value",
-          "colors": [
-            "rgba(245, 54, 54, 0.9)",
-            "rgba(237, 129, 40, 0.89)",
-            "rgba(50, 172, 45, 0.97)"
-          ],
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "decimals": 2,
-          "mappingType": 1,
-          "pattern": "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": "1,20,90,30,5,0,20,10"
-        },
-        {
-          "alias": "ColorCell",
-          "refId": "B",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "5,1,2,3,4,5,10,20"
-        }
-      ],
-      "title": "Column style thresholds & units",
-      "transform": "timeseries_to_columns",
-      "type": "table"
-    }
-  ],
-  "refresh": false,
-  "revision": 8,
-  "schemaVersion": 16,
-  "style": "dark",
-  "tags": [
-    "gdev",
-    "panel-tests"
-  ],
-  "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": "browser",
-  "title": "Panel Tests - Table",
-  "uid": "pttable",
-  "version": 1
-}
--- a/devenv/docker/blocks/nginx_proxy/Dockerfile
+++ b/devenv/docker/blocks/nginx_proxy/Dockerfile
@@ -1,4 +0,0 @@
-FROM nginx:alpine
-
-COPY nginx.conf /etc/nginx/nginx.conf
-COPY htpasswd /etc/nginx/htpasswd
--- a/devenv/docker/blocks/nginx_proxy/htpasswd
+++ b/devenv/docker/blocks/nginx_proxy/htpasswd
@@ -1,3 +0,0 @@
-user1:$apr1$1odeeQb.$kwV8D/VAAGUDU7pnHuKoV0
-user2:$apr1$A2kf25r.$6S0kp3C7vIuixS5CL0XA9.
-admin:$apr1$IWn4DoRR$E2ol7fS/dkI18eU4bXnBO1
--- a/devenv/docker/blocks/nginx_proxy/nginx.conf
+++ b/devenv/docker/blocks/nginx_proxy/nginx.conf
@@ -1,38 +0,0 @@
-events { worker_connections 1024; }
-
-http {
-  sendfile on;
-
-  proxy_redirect     off;
-  proxy_set_header   Host $host;
-  proxy_set_header   X-Real-IP $remote_addr;
-  proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-  proxy_set_header   X-Forwarded-Host $server_name;
-
-  server {
-    listen 10080;
-
-    location /grafana/ {
-      ################################################################
-      # Enable these settings to test with basic auth and an auth proxy header
-      # the htpasswd file contains an admin user with password admin and
-      # user1: grafana and user2: grafana
-      ################################################################
-
-      # auth_basic "Restricted Content";
-      # auth_basic_user_file /etc/nginx/htpasswd;
-
-      ################################################################
-      # To use the auth proxy header, set the following in custom.ini:
-      # [auth.proxy]
-      # enabled = true
-      # header_name = X-WEBAUTH-USER
-      # header_property = username
-      ################################################################
-
-      # proxy_set_header X-WEBAUTH-USER $remote_user;
-
-      proxy_pass http://localhost:3000/;
-    }
-  }
-}
--- a/devenv/docker/blocks/openldap/ldap_dev.toml
+++ b/devenv/docker/blocks/openldap/ldap_dev.toml
@@ -1,86 +0,0 @@
-# To troubleshoot and get more log info enable ldap debug logging in grafana.ini
-# [log]
-# filters = ldap:debug
-
-[[servers]]
-# Ldap server host (specify multiple hosts space separated)
-host = "127.0.0.1"
-# Default port is 389 or 636 if use_ssl = true
-port = 389
-# Set to true if ldap server supports TLS
-use_ssl = false
-# Set to true if connect ldap server with STARTTLS pattern (create connection in insecure, then upgrade to secure connection with TLS)
-start_tls = false
-# set to true if you want to skip ssl cert validation
-ssl_skip_verify = false
-# set to the path to your root CA certificate or leave unset to use system defaults
-# root_ca_cert = "/path/to/certificate.crt"
-
-# Search user bind dn
-bind_dn = "cn=admin,dc=grafana,dc=org"
-# Search user bind password
-# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
-bind_password = 'grafana'
-
-# User search filter, for example "(cn=%s)" or "(sAMAccountName=%s)" or "(uid=%s)"
-search_filter = "(cn=%s)"
-
-# An array of base dns to search through
-search_base_dns = ["dc=grafana,dc=org"]
-
-# In POSIX LDAP schemas, without memberOf attribute a secondary query must be made for groups.
-# This is done by enabling group_search_filter below. You must also set member_of= "cn"
-# in [servers.attributes] below.
-
-# Users with nested/recursive group membership and an LDAP server that supports LDAP_MATCHING_RULE_IN_CHAIN
-# can set group_search_filter, group_search_filter_user_attribute, group_search_base_dns and member_of
-# below in such a way that the user's recursive group membership is considered.
-#
-# Nested Groups + Active Directory (AD) Example:
-#
-#   AD groups store the Distinguished Names (DNs) of members, so your filter must
-#   recursively search your groups for the authenticating user's DN. For example:
-#
-#     group_search_filter = "(member:1.2.840.113556.1.4.1941:=%s)"
-#     group_search_filter_user_attribute = "distinguishedName"
-#     group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
-#
-#     [servers.attributes]
-#     ...
-#     member_of = "distinguishedName"
-
-## Group search filter, to retrieve the groups of which the user is a member (only set if memberOf attribute is not available)
-# group_search_filter = "(&(objectClass=posixGroup)(memberUid=%s))"
-## Group search filter user attribute defines what user attribute gets substituted for %s in group_search_filter.
-## Defaults to the value of username in [server.attributes]
-## Valid options are any of your values in [servers.attributes]
-## If you are using nested groups you probably want to set this and member_of in
-## [servers.attributes] to "distinguishedName"
-# group_search_filter_user_attribute = "distinguishedName"
-## An array of the base DNs to search through for groups. Typically uses ou=groups
-# group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
-
-# Specify names of the ldap attributes your ldap uses
-[servers.attributes]
-name = "givenName"
-surname = "sn"
-username = "cn"
-member_of = "memberOf"
-email =  "email"
-
-# Map ldap groups to grafana org roles
-[[servers.group_mappings]]
-group_dn = "cn=admins,ou=groups,dc=grafana,dc=org"
-org_role = "Admin"
-grafana_admin = true
-# The Grafana organization database id, optional, if left out the default org (id 1) will be used
-# org_id = 1
-
-[[servers.group_mappings]]
-group_dn = "cn=editors,ou=groups,dc=grafana,dc=org"
-org_role = "Editor"
-
-[[servers.group_mappings]]
-# If you want to match all (or no ldap groups) then you can use wildcard
-group_dn = "*"
-org_role = "Viewer"
--- a/devenv/docker/blocks/openldap/prepopulate.sh
+++ b/devenv/docker/blocks/openldap/prepopulate.sh
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-echo "Pre-populating ldap entries, first waiting for ldap to start"
-
-sleep 3
-
-adminUserDn="cn=admin,dc=grafana,dc=org"
-adminPassword="grafana"
-
-for file in `ls /etc/ldap/prepopulate/*.ldif`; do
-  ldapadd -x -D $adminUserDn -w $adminPassword -f "$file"
-done
-
-
--- a/devenv/docker/blocks/openldap/prepopulate/1_units.ldif
+++ b/devenv/docker/blocks/openldap/prepopulate/1_units.ldif
@@ -1,9 +0,0 @@
-dn: ou=groups,dc=grafana,dc=org
-ou: Groups
-objectclass: top
-objectclass: organizationalUnit
-
-dn: ou=users,dc=grafana,dc=org
-ou: Users
-objectclass: top
-objectclass: organizationalUnit
--- a/devenv/docker/blocks/openldap/prepopulate/2_users.ldif
+++ b/devenv/docker/blocks/openldap/prepopulate/2_users.ldif
@@ -1,80 +0,0 @@
-# ldap-admin
-dn: cn=ldap-admin,ou=users,dc=grafana,dc=org
-mail: ldap-admin@grafana.com
-userPassword: grafana
-objectClass: person
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-sn: ldap-admin
-cn: ldap-admin
-
-dn: cn=ldap-editor,ou=users,dc=grafana,dc=org
-mail: ldap-editor@grafana.com
-userPassword: grafana
-objectClass: person
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-sn: ldap-editor
-cn: ldap-editor
-
-dn: cn=ldap-viewer,ou=users,dc=grafana,dc=org
-mail: ldap-viewer@grafana.com
-userPassword: grafana
-objectClass: person
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-sn: ldap-viewer
-cn: ldap-viewer
-
-dn: cn=ldap-carl,ou=users,dc=grafana,dc=org
-mail: ldap-carl@grafana.com
-userPassword: grafana
-objectClass: person
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-sn: ldap-carl
-cn: ldap-carl
-
-dn: cn=ldap-daniel,ou=users,dc=grafana,dc=org
-mail: ldap-daniel@grafana.com
-userPassword: grafana
-objectClass: person
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-sn: ldap-daniel
-cn: ldap-daniel
-
-dn: cn=ldap-leo,ou=users,dc=grafana,dc=org
-mail: ldap-leo@grafana.com
-userPassword: grafana
-objectClass: person
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-sn: ldap-leo
-cn: ldap-leo
-
-dn: cn=ldap-tobias,ou=users,dc=grafana,dc=org
-mail: ldap-tobias@grafana.com
-userPassword: grafana
-objectClass: person
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-sn: ldap-tobias
-cn: ldap-tobias
-
-dn: cn=ldap-torkel,ou=users,dc=grafana,dc=org
-mail: ldap-torkel@grafana.com
-userPassword: grafana
-objectClass: person
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-sn: ldap-torkel
-cn: ldap-torkel
--- a/devenv/docker/blocks/openldap/prepopulate/3_groups.ldif
+++ b/devenv/docker/blocks/openldap/prepopulate/3_groups.ldif
@@ -1,25 +0,0 @@
-dn: cn=admins,ou=groups,dc=grafana,dc=org
-cn: admins
-objectClass: groupOfNames
-objectClass: top
-member: cn=ldap-admin,ou=users,dc=grafana,dc=org
-member: cn=ldap-torkel,ou=users,dc=grafana,dc=org
-
-dn: cn=editors,ou=groups,dc=grafana,dc=org
-cn: editors
-objectClass: groupOfNames
-member: cn=ldap-editor,ou=users,dc=grafana,dc=org
-
-dn: cn=backend,ou=groups,dc=grafana,dc=org
-cn: backend
-objectClass: groupOfNames
-member: cn=ldap-carl,ou=users,dc=grafana,dc=org
-member: cn=ldap-leo,ou=users,dc=grafana,dc=org
-member: cn=ldap-torkel,ou=users,dc=grafana,dc=org
-
-dn: cn=frontend,ou=groups,dc=grafana,dc=org
-cn: frontend
-objectClass: groupOfNames
-member: cn=ldap-torkel,ou=users,dc=grafana,dc=org
-member: cn=ldap-daniel,ou=users,dc=grafana,dc=org
-member: cn=ldap-leo,ou=users,dc=grafana,dc=org
--- a/devenv/docker/ha_test/.gitignore
+++ b/devenv/docker/ha_test/.gitignore
@@ -1 +0,0 @@
-grafana/provisioning/dashboards/alerts/alert-*
--- a/devenv/docker/ha_test/README.md
+++ b/devenv/docker/ha_test/README.md
@@ -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
-```
--- a/devenv/docker/ha_test/alerts.sh
+++ b/devenv/docker/ha_test/alerts.sh
@@ -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 "$@"
--- a/devenv/docker/ha_test/docker-compose.yaml
+++ b/devenv/docker/ha_test/docker-compose.yaml
@@ -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
-    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
--- a/devenv/docker/ha_test/grafana/provisioning/alerts.jsonnet
+++ b/devenv/docker/ha_test/grafana/provisioning/alerts.jsonnet
@@ -1,202 +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,
-        "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
-}
--- a/devenv/docker/ha_test/grafana/provisioning/dashboards/alerts.yaml
+++ b/devenv/docker/ha_test/grafana/provisioning/dashboards/alerts.yaml
@@ -1,8 +0,0 @@
-apiVersion: 1
-
-providers:
- - name: 'Alerts'
-   folder: 'Alerts'
-   type: file
-   options:
-     path: /etc/grafana/provisioning/dashboards/alerts
--- a/devenv/docker/ha_test/grafana/provisioning/dashboards/alerts/overview.json
+++ b/devenv/docker/ha_test/grafana/provisioning/dashboards/alerts/overview.json
@@ -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
-}
--- a/devenv/docker/ha_test/grafana/provisioning/datasources/datasources.yaml
+++ b/devenv/docker/ha_test/grafana/provisioning/datasources/datasources.yaml
@@ -1,11 +0,0 @@
-apiVersion: 1
-
-datasources:
-  - name: Prometheus
-    type: prometheus
-    access: proxy
-    url: http://prometheus:9090
-    jsonData:
-      timeInterval: 10s
-      queryTimeout: 30s
-      httpMethod: POST
--- a/devenv/docker/ha_test/prometheus/prometheus.yml
+++ b/devenv/docker/ha_test/prometheus/prometheus.yml
@@ -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
--- a/devenv/setup.sh
+++ b/devenv/setup.sh
@@ -1,81 +1,61 @@
-#!/bin/bash
+#/bin/bash

 bulkDashboard() {

-		requiresJsonnet
+    requiresJsonnet

-		COUNTER=0
-		MAX=400
-		while [  $COUNTER -lt $MAX ]; do
-				jsonnet -o "bulk-dashboards/dashboard${COUNTER}.json" -e "local bulkDash = import 'bulk-dashboards/bulkdash.jsonnet'; bulkDash + {  uid: 'uid-${COUNTER}',  title: 'title-${COUNTER}' }"
-				let COUNTER=COUNTER+1
-		done
+    COUNTER=0
+    MAX=400
+    while [  $COUNTER -lt $MAX ]; do
+        jsonnet -o "dashboards/bulk-testing/dashboard${COUNTER}.json" -e "local bulkDash = import 'dashboards/bulk-testing/bulkdash.jsonnet'; bulkDash + {  uid: 'uid-${COUNTER}',  title: 'title-${COUNTER}' }"
+        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 ./dashboards/bulk-testing/bulk-dashboards.yaml ../conf/provisioning/dashboards/custom.yaml
 }

 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
+    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
 }

-devDashboards() {
-		echo -e "\xE2\x9C\x94 Setting up all dev dashboards using provisioning"
-		ln -s -f ../../../devenv/dashboards.yaml ../conf/provisioning/dashboards/dev.yaml
+defaultDashboards() {
+    echo "not implemented yet"
 }

-devDatasources() {
-		echo -e "\xE2\x9C\x94 Setting up all dev datasources using provisioning"
+defaultDatasources() {
+    echo "setting up all default datasources using provisioning"

-		ln -s -f ../../../devenv/datasources.yaml ../conf/provisioning/datasources/dev.yaml
+    ln -s -f -r ./datasources/default/default.yaml ../conf/provisioning/datasources/custom.yaml
 }

 usage() {
-	echo -e "\n"
+	echo -e "install.sh\n\tThis script installs my basic setup for a debian laptop\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 "  default-datasources                 - provisiong all core datasources"
 }

 main() {
-	echo -e "------------------------------------------------------------------"
-	echo -e "This script setups provisioning for dev datasources and dashboards"
-	echo -e "------------------------------------------------------------------"
-	echo -e "\n"
-
 	local cmd=$1

-	if [[ $cmd == "bulk-alerting-dashboards" ]]; then
-		bulkAlertingDashboard
-	elif [[ $cmd == "bulk-dashboards" ]]; then
+	if [[ -z "$cmd" ]]; then
+		usage
+		exit 1
+	fi
+
+	if [[ $cmd == "bulk-dashboards" ]]; then
+		bulkDashboard
+    elif [[ $cmd == "default-datasources" ]]; then
+		defaultDatasources
+    elif [[ $cmd == "default-dashboards" ]]; then
 		bulkDashboard
 	else
-		devDashboards
-		devDatasources
-	fi
-
-  if [[ -z "$cmd" ]]; then
 		usage
 	fi
-
 }

 main "$@"
--- a/devenv/docker/blocks/apache_proxy/Dockerfile
+++ b/devenv/docker/blocks/apache_proxy/Dockerfile
--- a/devenv/docker/blocks/apache_proxy/docker-compose.yaml
+++ b/devenv/docker/blocks/apache_proxy/docker-compose.yaml
@@ -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
--- a/devenv/docker/blocks/apache_proxy/ports.conf
+++ b/devenv/docker/blocks/apache_proxy/ports.conf
--- a/devenv/docker/blocks/apache_proxy/proxy.conf
+++ b/devenv/docker/blocks/apache_proxy/proxy.conf
--- a/devenv/docker/blocks/collectd/Dockerfile
+++ b/devenv/docker/blocks/collectd/Dockerfile
--- a/devenv/docker/blocks/collectd/README.md
+++ b/devenv/docker/blocks/collectd/README.md
--- a/devenv/docker/blocks/collectd/collectd.conf.tpl
+++ b/devenv/docker/blocks/collectd/collectd.conf.tpl
--- a/devenv/docker/blocks/collectd/docker-compose.yaml
+++ b/devenv/docker/blocks/collectd/docker-compose.yaml
@@ -1,5 +1,5 @@
  collectd:
-    build: docker/blocks/collectd
+    build: blocks/collectd
    environment:
      HOST_NAME: myserver
      GRAPHITE_HOST: graphite
--- a/devenv/docker/blocks/collectd/etc_mtab
+++ b/devenv/docker/blocks/collectd/etc_mtab
--- a/devenv/docker/blocks/collectd/start_container
+++ b/devenv/docker/blocks/collectd/start_container
--- a/devenv/docker/blocks/elastic/docker-compose.yaml
+++ b/devenv/docker/blocks/elastic/docker-compose.yaml
--- a/devenv/docker/blocks/elastic/elasticsearch.yml
+++ b/devenv/docker/blocks/elastic/elasticsearch.yml
--- a/devenv/docker/blocks/elastic1/docker-compose.yaml
+++ b/devenv/docker/blocks/elastic1/docker-compose.yaml
--- a/devenv/docker/blocks/elastic1/elasticsearch.yml
+++ b/devenv/docker/blocks/elastic1/elasticsearch.yml
--- a/devenv/docker/blocks/elastic5/docker-compose.yaml
+++ b/devenv/docker/blocks/elastic5/docker-compose.yaml
--- a/devenv/docker/blocks/elastic5/elasticsearch.yml
+++ b/devenv/docker/blocks/elastic5/elasticsearch.yml
--- a/devenv/docker/blocks/elastic6/docker-compose.yaml
+++ b/devenv/docker/blocks/elastic6/docker-compose.yaml
--- a/devenv/docker/blocks/elastic6/elasticsearch.yml
+++ b/devenv/docker/blocks/elastic6/elasticsearch.yml
--- a/devenv/docker/blocks/graphite/Dockerfile
+++ b/devenv/docker/blocks/graphite/Dockerfile
--- a/devenv/docker/blocks/graphite/docker-compose.yaml
+++ b/devenv/docker/blocks/graphite/docker-compose.yaml
@@ -1,5 +1,5 @@
  graphite09:
-    build: docker/blocks/graphite
+    build: blocks/graphite
    ports:
      - "8080:80"
      - "2003:2003"
--- a/devenv/docker/blocks/graphite/files/carbon.conf
+++ b/devenv/docker/blocks/graphite/files/carbon.conf
--- a/devenv/docker/blocks/graphite/files/events_views.py
+++ b/devenv/docker/blocks/graphite/files/events_views.py
--- a/devenv/docker/blocks/graphite/files/initial_data.json
+++ b/devenv/docker/blocks/graphite/files/initial_data.json
--- a/devenv/docker/blocks/graphite/files/local_settings.py
+++ b/devenv/docker/blocks/graphite/files/local_settings.py
--- a/devenv/docker/blocks/graphite/files/my_htpasswd
+++ b/devenv/docker/blocks/graphite/files/my_htpasswd
--- a/devenv/docker/blocks/graphite/files/nginx.conf
+++ b/devenv/docker/blocks/graphite/files/nginx.conf
--- a/devenv/docker/blocks/graphite/files/statsd_config.js
+++ b/devenv/docker/blocks/graphite/files/statsd_config.js
--- a/devenv/docker/blocks/graphite/files/storage-aggregation.conf
+++ b/devenv/docker/blocks/graphite/files/storage-aggregation.conf
--- a/devenv/docker/blocks/graphite/files/storage-schemas.conf
+++ b/devenv/docker/blocks/graphite/files/storage-schemas.conf
--- a/devenv/docker/blocks/graphite/files/supervisord.conf
+++ b/devenv/docker/blocks/graphite/files/supervisord.conf
--- a/devenv/docker/blocks/graphite1/Dockerfile
+++ b/devenv/docker/blocks/graphite1/Dockerfile
--- a/devenv/docker/blocks/graphite1/big-dashboard.json
+++ b/devenv/docker/blocks/graphite1/big-dashboard.json
--- a/devenv/docker/blocks/graphite1/conf/etc/logrotate.d/graphite-statsd
+++ b/devenv/docker/blocks/graphite1/conf/etc/logrotate.d/graphite-statsd
--- a/devenv/docker/blocks/graphite1/conf/etc/my_init.d/01_conf_init.sh
+++ b/devenv/docker/blocks/graphite1/conf/etc/my_init.d/01_conf_init.sh
--- a/devenv/docker/blocks/graphite1/conf/etc/nginx/nginx.conf
+++ b/devenv/docker/blocks/graphite1/conf/etc/nginx/nginx.conf
--- a/devenv/docker/blocks/graphite1/conf/etc/nginx/sites-enabled/graphite-statsd.conf
+++ b/devenv/docker/blocks/graphite1/conf/etc/nginx/sites-enabled/graphite-statsd.conf
--- a/devenv/docker/blocks/graphite1/conf/etc/service/carbon-aggregator/run
+++ b/devenv/docker/blocks/graphite1/conf/etc/service/carbon-aggregator/run
--- a/devenv/docker/blocks/graphite1/conf/etc/service/carbon/run
+++ b/devenv/docker/blocks/graphite1/conf/etc/service/carbon/run
--- a/devenv/docker/blocks/graphite1/conf/etc/service/graphite/run
+++ b/devenv/docker/blocks/graphite1/conf/etc/service/graphite/run
--- a/devenv/docker/blocks/graphite1/conf/etc/service/nginx/run
+++ b/devenv/docker/blocks/graphite1/conf/etc/service/nginx/run
--- a/devenv/docker/blocks/graphite1/conf/etc/service/statsd/run
+++ b/devenv/docker/blocks/graphite1/conf/etc/service/statsd/run
--- a/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/aggregation-rules.conf
+++ b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/aggregation-rules.conf
@@ -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>
 #
--- a/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/blacklist.conf
+++ b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/blacklist.conf
--- a/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/carbon.amqp.conf
+++ b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/carbon.amqp.conf
--- a/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/carbon.conf
+++ b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/carbon.conf
--- a/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/dashboard.conf
+++ b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/dashboard.conf
--- a/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/graphTemplates.conf
+++ b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/graphTemplates.conf
--- a/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/relay-rules.conf
+++ b/devenv/docker/blocks/graphite1/conf/opt/graphite/conf/relay-rules.conf
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Torkel Ödegaard	6f9b7347fc	Merge pull request #13421 from grafana/teams-limit-cherrypick teampicker: increase limit from 10 to 100	2018-09-25 21:06:16 +02:00
Torkel Ödegaard	dfec6be0a8	updated version	2018-09-25 21:00:51 +02:00
Torkel Ödegaard	c17ee27957	teampicker: increase limit from 10 to 100	2018-09-25 20:57:58 +02:00
Marcus Efraimsson	0bbac5cade	Merge pull request #13193 from grafana/cp-5.2.4 Cherry picks v5.2.4	2018-09-07 16:35:16 +02:00
Marcus Efraimsson	e385bc141b	release 5.2.4	2018-09-07 16:32:49 +02:00
Carl Bergquist	c53d7ad47c	cli: avoid rely on response.ContentLength (#13120 ) response.ContentLength might be invalid if the http response is chunked. fixes #13079 (cherry picked from commit `ee1083d9b4`)	2018-09-07 16:30:49 +02:00
Leonard Gram	cf4c090fe2	Version updated to 5.2.3.	2018-08-22 10:20:39 +02:00
Torkel Ödegaard	1440e77bea	fixed test in cherry picked commit	2018-08-21 14:01:52 +02:00
Torkel Ödegaard	df83bf10a2	sql: added code migration type (cherry picked from commit `92ed1f04af`)	2018-08-21 13:56:08 +02:00
Marcus Efraimsson	aeaf7b23a6	Merge pull request #12712 from grafana/cp-5.2.2 Cherry-picks for 5.2.2	2018-07-25 13:17:28 +02:00
Marcus Efraimsson	0ff4aa80ed	remove unnecessary conversions (cherry picked from commit `d2f31a716f`)	2018-07-25 12:27:42 +02:00
Marcus Efraimsson	020ecfdf56	release 5.2.2	2018-07-25 12:17:12 +02:00
Torkel Ödegaard	e70a9de45a	fix: postgres/mysql engine cache was not being used, fixes #12636 (cherry picked from commit `cd60234e7c`)	2018-07-25 12:11:19 +02:00
Torkel Ödegaard	a6fc391583	fix: panel embedd scrolbar fix, fixes #12589 (cherry picked from commit `02ecf01bba`)	2018-07-25 12:10:41 +02:00
Mitsuhiro Tanda	534ba6d805	(prometheus) prevent error to use $__interval_ms in query (#12533 ) * prevent error to use $__interval_ms in query * add test * prevent error to use $__interval_ms in query (cherry picked from commit `18a8290c65`)	2018-07-25 12:08:42 +02:00
David Kaltschmidt	2bd1a19169	Fix freezing browser when loading plugin - broken since `4d2dd2209` - `` was previously working as a path matcher, but freezes browser when used with new cache-busting plugin loader - changed matcher to be `/` (cherry picked from commit `81e62e1051`)	2018-07-25 12:07:15 +02:00
David	a996dd25d6	Fix css loading in plugins (#12573 ) - allow css loader to be imported again (wasnt prefixed by plugin) (cherry picked from commit `4d2dd22095`)	2018-07-25 12:06:36 +02:00
Marcus Efraimsson	4d108007fe	fix links not updating after changing variables (cherry picked from commit `5e4d6958d6`)	2018-07-25 12:02:58 +02:00
David	4df07b4e25	Fix bar width issue in aligned prometheus queries (#12483 ) * Fix bar width issue in aligned prometheus queries This was broken because null values were filled in with unaligned times. * use aligned times for result transformation * add tests An earlier version of this fix aligned the times again in the transformer, but I think it's safe to only deal with aligned times in the response. * Fixed prometheus heatmap tranformer test The interval needs to be 1 to prevent step alignment. (cherry picked from commit `0d1f7c8782`)	2018-07-25 12:01:18 +02:00
Marcus Efraimsson	2040f61c56	Merge pull request #12458 from grafana/cp-5.2.1 Cherry-picks for 5.2.1	2018-06-29 11:17:46 +02:00
Marcus Efraimsson	aa94f7ebfe	release 5.2.1	2018-06-29 10:58:00 +02:00
Torkel Ödegaard	855b570878	fix: log close/flush was done too early, before server shutdown log message was called, fixes #12438 (cherry picked from commit `7a7c6f8fab`)	2018-06-29 10:56:00 +02:00
Marcus Efraimsson	1713f7f01d	Revert "auth proxy: use real ip when validating white listed ip's" (cherry picked from commit `8af5da7383`)	2018-06-29 10:55:27 +02:00
Marcus Efraimsson	2b7d124be8	fix footer css issue (cherry picked from commit `54420363d3`)	2018-06-29 10:54:16 +02:00
Marcus Efraimsson	ad4d71740a	Merge pull request #12415 from grafana/cp-5.2.0 Cherry-picks for v5.2.0 stable	2018-06-27 09:38:18 +02:00
Marcus Efraimsson	77312d3a9c	release v5.2.0	2018-06-26 18:21:56 +02:00
Marcus Efraimsson	3565fe7105	login: fix layout issues (cherry picked from commit `9f02927761`)	2018-06-26 18:17:45 +02:00
Marcus Efraimsson	df62c6a197	set correct text in drop down when variable is present in url using key/values (cherry picked from commit `5280084480`)	2018-06-26 18:16:59 +02:00
Marcus Efraimsson	f929bd51db	enhance error message if phantomjs executable is not found if arm build, explain that phantomjs is not included by default in arm builds. If not explain that phantom js isn't installed correctly (cherry picked from commit `f106de0efd`)	2018-06-26 18:16:26 +02:00
rozetko	381f3da30e	Set $rootScope in DatasourceSrv (cherry picked from commit `97db9ece98`)	2018-06-26 18:15:52 +02:00
Aleksei Magusev	f48ea5eea6	Fix ResponseParser for InfluxDB to return only string values (cherry picked from commit `b7482ae8b7`)	2018-06-26 18:15:01 +02:00
Aleksei Magusev	3c2cb7715b	Conditionally select a field to return in ResponseParser for InfluxDB This patch also fixes "value[1] \|\| value[0]" to not ignore zeros. (cherry picked from commit `e104e9b2c2`)	2018-06-26 18:14:44 +02:00
Dan Cech	90132770fa	handle "dn" ldap attribute more gracefully (#12385 ) * handle "dn" ldap attribute more gracefully * use strings.ToLower (cherry picked from commit `583df47c2f`)	2018-06-26 09:44:12 +02:00
Daniel Lee	30c882c18d	Merge pull request #12364 from grafana/cp-5.2.0-beta3 Cherry-picks for v5.2.0-beta3	2018-06-21 11:11:12 +02:00
Marcus Efraimsson	e5836064ce	release v5.2.0-beta3	2018-06-21 10:54:24 +02:00
Marcus Efraimsson	f7cb827944	build: fix signing of multiple rpm packages (cherry picked from commit `e617e23927`)	2018-06-21 10:54:04 +02:00
Marcus Efraimsson	f76cafa68e	Merge pull request #12357 from grafana/cp-5.2.0-beta2 Cherry-picks for v5.2.0-beta2	2018-06-20 15:21:50 +02:00
Marcus Efraimsson	cdae9126ed	release v5.2.0-beta2	2018-06-20 14:58:30 +02:00
Marcus Efraimsson	b4c1df11f6	make sure to process panels in collapsed rows when exporting dashboard (cherry picked from commit `a2e08dc4e8`)	2018-06-20 14:56:13 +02:00
Alexander Zobnin	7c94d5cd1a	graph: fix legend decimals precision calculation (cherry picked from commit `24f6d34abd`)	2018-06-20 14:55:38 +02:00
Marcus Efraimsson	74d6b5fc1c	dashboard: fix drop down links (cherry picked from commit `4ef4a4d3a7`)	2018-06-20 14:55:04 +02:00
Marcus Efraimsson	af42e0836a	fix regressions after save modal changes of not storing time and variables per default Fix problem with adhoc variable filters not handled. Fix problem with saving variables and time per default when saving a dashboard as/first time. Fix updating dashboard model after save with saving time/variables enabled so that next time you save you won't get checkboxes for save time/variables unless any values changed. Tests validating correctness if time/variable values has changed. (cherry picked from commit `41ac8d4cd5`)	2018-06-20 14:54:13 +02:00
Martin Molnar	f453fbe8ef	feat(ldap): Allow use of DN in user attribute filter (#3132 ) (cherry picked from commit `be2fa54459`)	2018-06-20 14:53:36 +02:00
Marcus Efraimsson	8d635efda0	snapshot: copy correct props when creating a snapshot (cherry picked from commit `a738347957`)	2018-06-20 14:52:59 +02:00
Marcus Efraimsson	0f2e879339	set current org when adding/removing user to org To not get into a situation where a user has a current organization assign which he is not a member of we try to always make sure that a user has a valid current organization assigned. (cherry picked from commit `6d48d0a80c`)	2018-06-20 14:52:11 +02:00
Marcus Efraimsson	e51dd88260	Merge pull request #12340 from grafana/apikey-permission-fix-cherry-pick2 v5.2.x cherry pick fix	2018-06-19 12:37:26 +02:00
Torkel Ödegaard	984293cc52	fix: fixed permission issue with api key with viewer role in dashboards with default permissions (cherry picked from commit `24d0b43e62`)	2018-06-19 11:14:33 +02:00
Marcus Efraimsson	9a1a9584b7	Merge pull request #12316 from grafana/v52_merge_master Merge master to v5.2.x release branch	2018-06-18 11:50:48 +02:00
Marcus Efraimsson	8a69ffb007	Merge branch 'master' into v52_merge_master	2018-06-18 09:44:39 +02:00
Leonard Gram	faa5e699d2	Release v5.2.0-beta1.	2018-06-05 10:43:14 +02:00
				`@@ -1 +0,0 @@`
				`grafana/provisioning/dashboards/alerts/alert-*`