test

Minor copy
Run next packages release on master but not when tagged with release
2019-07-12 15:08:35 +02:00 · 2019-07-12 13:43:58 +02:00 · 2019-07-12 13:41:43 +02:00 · 2019-07-12 13:19:29 +02:00 · 2019-07-12 13:04:00 +02:00 · 2019-07-12 12:53:37 +02:00
252 changed files with 4274 additions and 3276 deletions
@@ -7,12 +7,17 @@ aliases:
      only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
  - &filter-not-release-or-master
    tags:
-      ignore: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
+      ignore: /^v[0--9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
    branches:
      ignore: master
  - &filter-only-master
    branches:
      only: master
+  - &filter-only-master-but-not-release
+    tags:
+      ignore: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
+    branches:
+      only: master

 version: 2

@@ -98,34 +103,6 @@ jobs:
                path: public/e2e-test/screenShots/theOutput
                destination: output-screenshots

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

-  shellcheck:
-    machine: true
-    working_directory: ~/go/src/github.com/grafana/grafana
-    steps:
-      - checkout
-      - run:
-          name: ShellCheck
-          command: 'make shellcheck'
-
  test-frontend:
    docker:
      - image: circleci/node:10
@@ -660,6 +628,21 @@ jobs:
              echo "-- no changes to docs files --"
            fi

+  release-next-packages:
+    docker:
+      - image: circleci/node:10
+    steps:
+      - checkout
+      - run:
+          name: Boostrap lerna
+          command: 'npx lerna bootstrap'
+      - run:
+          name: npm - Prepare auth token
+          command: 'echo //registry.npmjs.org/:_authToken=$NPM_TOKEN >> ~/.npmrc'
+      - run:
+          name: Release next packages
+          command: './scripts/circle-release-next-packages.sh'
+
 workflows:
  version: 2
  build-master:
@@ -672,8 +655,6 @@ workflows:
          filters: *filter-only-master
      - lint-go:
          filters: *filter-only-master
-      - shellcheck:
-          filters: *filter-only-master
      - test-frontend:
          filters: *filter-only-master
      - test-backend:
@@ -689,7 +670,6 @@ workflows:
            - test-frontend
            - codespell
            - lint-go
-            - shellcheck
            - mysql-integration-test
            - postgres-integration-test
            - build-oss-msi
@@ -702,7 +682,6 @@ workflows:
            - test-frontend
            - codespell
            - lint-go
-            - shellcheck
            - mysql-integration-test
            - postgres-integration-test
          filters: *filter-only-master
@@ -713,7 +692,6 @@ workflows:
            - test-frontend
            - codespell
            - lint-go
-            - shellcheck
            - mysql-integration-test
            - postgres-integration-test
            - build-all-enterprise
@@ -725,7 +703,6 @@ workflows:
            - test-frontend
            - codespell
            - lint-go
-            - shellcheck
            - mysql-integration-test
            - postgres-integration-test
          filters: *filter-only-master
@@ -737,6 +714,11 @@ workflows:
          requires:
            - end-to-end-test
          filters: *filter-only-master
+      - release-next-packages:
+          requires:
+            - test-frontend
+            - build-fast-frontend
+          filters: *filter-only-master-but-not-release
  release:
    jobs:
      - build-all:
@@ -747,8 +729,6 @@ workflows:
          filters: *filter-only-release
      - lint-go:
          filters: *filter-only-release
-      - shellcheck:
-          filters: *filter-only-release
      - test-frontend:
          filters: *filter-only-release
      - test-backend:
@@ -764,7 +744,6 @@ workflows:
            - test-frontend
            - codespell
            - lint-go
-            - shellcheck
            - mysql-integration-test
            - postgres-integration-test
            - build-oss-msi
@@ -777,7 +756,6 @@ workflows:
            - test-frontend
            - codespell
            - lint-go
-            - shellcheck
            - mysql-integration-test
            - postgres-integration-test
          filters: *filter-only-release
@@ -789,7 +767,6 @@ workflows:
            - test-frontend
            - codespell
            - lint-go
-            - shellcheck
            - mysql-integration-test
            - postgres-integration-test
          filters: *filter-only-release
@@ -800,14 +777,9 @@ workflows:
            - test-frontend
            - codespell
            - lint-go
-            - shellcheck
            - mysql-integration-test
            - postgres-integration-test
          filters: *filter-only-release
-      - end-to-end-test-release:
-          requires:
-            - grafana-docker-release
-          filters: *filter-only-release

  build-branches-and-prs:
      jobs:
@@ -824,10 +796,6 @@ workflows:
            filters: *filter-not-release-or-master
        - lint-go:
            filters: *filter-not-release-or-master
-        - lint-go:
-            filters: *filter-not-release-or-master
-        - shellcheck:
-            filters: *filter-not-release-or-master
        - test-frontend:
            filters: *filter-not-release-or-master
        - test-backend:
@@ -845,7 +813,6 @@ workflows:
              - test-frontend
              - codespell
              - lint-go
-              - shellcheck
              - mysql-integration-test
              - postgres-integration-test
              - cache-server-test
@@ -857,8 +824,8 @@ workflows:
              - test-frontend
              - codespell
              - lint-go
-              - shellcheck
              - mysql-integration-test
              - postgres-integration-test
              - cache-server-test
            filters: *filter-not-release-or-master
+
@@ -1,4 +1,73 @@
-# 6.3.0 (unreleased)
+# 6.4.0 (unreleased)
+
+# 6.3.0-beta1
+### Features / Enhancements
+* **Alerting**: Add tags to alert rules. [#10989](https://github.com/grafana/grafana/pull/10989), [@Thib17](https://github.com/Thib17)
+* **Alerting**: Attempt to send email notifications to all given email addresses. [#16881](https://github.com/grafana/grafana/pull/16881), [@zhulongcheng](https://github.com/zhulongcheng)
+* **Alerting**: Improve alert rule testing. [#16286](https://github.com/grafana/grafana/pull/16286), [@marefr](https://github.com/marefr)
+* **Alerting**: Support for configuring content field for Discord alert notifier. [#17017](https://github.com/grafana/grafana/pull/17017), [@jan25](https://github.com/jan25)
+* **Alertmanager**: Replace illegal chars with underscore in label names. [#17002](https://github.com/grafana/grafana/pull/17002), [@bergquist](https://github.com/bergquist)
+* **Auth**: Allow expiration of API keys. [#17678](https://github.com/grafana/grafana/pull/17678), [@papagian](https://github.com/papagian)
+* **Auth**: Return device, os and browser when listing user auth tokens in HTTP API. [#17504](https://github.com/grafana/grafana/pull/17504), [@shavonn](https://github.com/shavonn)
+* **Auth**: Support list and revoke of user auth tokens in UI. [#17434](https://github.com/grafana/grafana/pull/17434), [@shavonn](https://github.com/shavonn)
+* **AzureMonitor**: change clashing built-in Grafana variables/macro names for Azure Logs. [#17140](https://github.com/grafana/grafana/pull/17140), [@shavonn](https://github.com/shavonn)
+* **CloudWatch**: Made region visible for AWS Cloudwatch Expressions. [#17243](https://github.com/grafana/grafana/pull/17243), [@utkarshcmu](https://github.com/utkarshcmu)
+* **Cloudwatch**: Add AWS DocDB metrics. [#17241](https://github.com/grafana/grafana/pull/17241), [@utkarshcmu](https://github.com/utkarshcmu)
+* **Dashboard**: Use timezone dashboard setting when exporting to CSV. [#18002](https://github.com/grafana/grafana/pull/18002), [@dehrax](https://github.com/dehrax)
+* **Data links**. [#17267](https://github.com/grafana/grafana/pull/17267), [@torkelo](https://github.com/torkelo)
+* **Docker**: Switch base image to ubuntu:latest from debian:stretch to avoid security issues.. [#17066](https://github.com/grafana/grafana/pull/17066), [@bergquist](https://github.com/bergquist)
+* **Elasticsearch**: Support for visualizing logs in Explore . [#17605](https://github.com/grafana/grafana/pull/17605), [@marefr](https://github.com/marefr)
+* **Explore**: Adds Live option for supported datasources. [#17062](https://github.com/grafana/grafana/pull/17062), [@hugohaggmark](https://github.com/hugohaggmark)
+* **Explore**: Adds orgId to URL for sharing purposes. [#17895](https://github.com/grafana/grafana/pull/17895), [@kaydelaney](https://github.com/kaydelaney)
+* **Explore**: Adds support for new loki 'start' and 'end' params for labels endpoint. [#17512](https://github.com/grafana/grafana/pull/17512), [@kaydelaney](https://github.com/kaydelaney)
+* **Explore**: Adds support for toggling raw query mode in explore. [#17870](https://github.com/grafana/grafana/pull/17870), [@kaydelaney](https://github.com/kaydelaney)
+* **Explore**: Allow switching between metrics and logs . [#16959](https://github.com/grafana/grafana/pull/16959), [@marefr](https://github.com/marefr)
+* **Explore**: Combines the timestamp and local time columns into one. [#17775](https://github.com/grafana/grafana/pull/17775), [@hugohaggmark](https://github.com/hugohaggmark)
+* **Explore**: Display log lines context . [#17097](https://github.com/grafana/grafana/pull/17097), [@dprokop](https://github.com/dprokop)
+* **Explore**: Don't parse log levels if provided by field or label. [#17180](https://github.com/grafana/grafana/pull/17180), [@marefr](https://github.com/marefr)
+* **Explore**: Improves performance of Logs element by limiting re-rendering. [#17685](https://github.com/grafana/grafana/pull/17685), [@kaydelaney](https://github.com/kaydelaney)
+* **Explore**: Support for new LogQL filtering syntax. [#16674](https://github.com/grafana/grafana/pull/16674), [@davkal](https://github.com/davkal)
+* **Explore**: Use new TimePicker from Grafana/UI. [#17793](https://github.com/grafana/grafana/pull/17793), [@hugohaggmark](https://github.com/hugohaggmark)
+* **Explore**: handle newlines in LogRow Highlighter. [#17425](https://github.com/grafana/grafana/pull/17425), [@rrfeng](https://github.com/rrfeng)
+* **Graph**: Added new fill gradient option. [#17528](https://github.com/grafana/grafana/pull/17528), [@torkelo](https://github.com/torkelo)
+* **GraphPanel**: Don't sort series when legend table & sort column is not visible . [#17095](https://github.com/grafana/grafana/pull/17095), [@shavonn](https://github.com/shavonn)
+* **InfluxDB**: Support for visualizing logs in Explore. [#17450](https://github.com/grafana/grafana/pull/17450), [@hugohaggmark](https://github.com/hugohaggmark)
+* **Logging**: Login and Logout actions (#17760). [#17883](https://github.com/grafana/grafana/pull/17883), [@ATTron](https://github.com/ATTron)
+* **Logging**: Move log package to pkg/infra. [#17023](https://github.com/grafana/grafana/pull/17023), [@zhulongcheng](https://github.com/zhulongcheng)
+* **Metrics**: Expose stats about roles as metrics. [#17469](https://github.com/grafana/grafana/pull/17469), [@bergquist](https://github.com/bergquist)
+* **MySQL/Postgres/MSSQL**: Add parsing for day, weeks and year intervals in macros. [#13086](https://github.com/grafana/grafana/pull/13086), [@bernardd](https://github.com/bernardd)
+* **MySQL**: Add support for periodically reloading client certs. [#14892](https://github.com/grafana/grafana/pull/14892), [@tpetr](https://github.com/tpetr)
+* **Plugins**: replace dataFormats list with skipDataQuery flag in plugin.json. [#16984](https://github.com/grafana/grafana/pull/16984), [@ryantxu](https://github.com/ryantxu)
+* **Prometheus**: Take timezone into account for step alignment. [#17477](https://github.com/grafana/grafana/pull/17477), [@fxmiii](https://github.com/fxmiii)
+* **Prometheus**: Use overridden panel range for $__range instead of dashboard range. [#17352](https://github.com/grafana/grafana/pull/17352), [@patrick246](https://github.com/patrick246)
+* **Prometheus**: added time range filter to series labels query. [#16851](https://github.com/grafana/grafana/pull/16851), [@FUSAKLA](https://github.com/FUSAKLA)
+* **Provisioning**: Support folder that doesn't exist yet in dashboard provisioning. [#17407](https://github.com/grafana/grafana/pull/17407), [@Nexucis](https://github.com/Nexucis)
+* **Refresh picker**: Handle empty intervals. [#17585](https://github.com/grafana/grafana/pull/17585), [@dehrax](https://github.com/dehrax)
+* **Singlestat**: Add y min/max config to singlestat sparklines. [#17527](https://github.com/grafana/grafana/pull/17527), [@pitr](https://github.com/pitr)
+* **Snapshot**: use given key and deleteKey. [#16876](https://github.com/grafana/grafana/pull/16876), [@zhulongcheng](https://github.com/zhulongcheng)
+* **Templating**: Correctly display __text in multi-value variable after page reload. [#17840](https://github.com/grafana/grafana/pull/17840), [@EduardSergeev](https://github.com/EduardSergeev)
+* **Templating**: Support selecting all filtered values of a multi-value variable. [#16873](https://github.com/grafana/grafana/pull/16873), [@r66ad](https://github.com/r66ad)
+* **Tracing**: allow propagation with Zipkin headers. [#17009](https://github.com/grafana/grafana/pull/17009), [@jrockway](https://github.com/jrockway)
+* **Users**: Disable users removed from LDAP. [#16820](https://github.com/grafana/grafana/pull/16820), [@alexanderzobnin](https://github.com/alexanderzobnin)
+
+### Bug Fixes
+* **AddPanel**: Fix issue when removing moved add panel widget . [#17659](https://github.com/grafana/grafana/pull/17659), [@dehrax](https://github.com/dehrax)
+* **CLI**: Fix encrypt-datasource-passwords fails with sql error. [#18014](https://github.com/grafana/grafana/pull/18014), [@marefr](https://github.com/marefr)
+* **Elasticsearch**: Fix default max concurrent shard requests. [#17770](https://github.com/grafana/grafana/pull/17770), [@marefr](https://github.com/marefr)
+* **Explore**: Fix browsing back to dashboard panel. [#17061](https://github.com/grafana/grafana/pull/17061), [@jschill](https://github.com/jschill)
+* **Explore**: Fix filter by series level in logs graph. [#17798](https://github.com/grafana/grafana/pull/17798), [@marefr](https://github.com/marefr)
+* **Explore**: Fix issues when loading and both graph/table are collapsed. [#17113](https://github.com/grafana/grafana/pull/17113), [@marefr](https://github.com/marefr)
+* **Explore**: Fix selection/copy of log lines. [#17121](https://github.com/grafana/grafana/pull/17121), [@marefr](https://github.com/marefr)
+* **Fix**: Wrap value of multi variable in array when coming from URL. [#16992](https://github.com/grafana/grafana/pull/16992), [@aocenas](https://github.com/aocenas)
+* **Frontend**: Fix for Json tree component not working. [#17608](https://github.com/grafana/grafana/pull/17608), [@srid12](https://github.com/srid12)
+* **Graphite**: Fix for issue with alias function being moved last. [#17791](https://github.com/grafana/grafana/pull/17791), [@torkelo](https://github.com/torkelo)
+* **Graphite**: Fixes issue with seriesByTag & function with variable param. [#17795](https://github.com/grafana/grafana/pull/17795), [@torkelo](https://github.com/torkelo)
+* **Graphite**: use POST for /metrics/find requests. [#17814](https://github.com/grafana/grafana/pull/17814), [@papagian](https://github.com/papagian)
+* **HTTP Server**: Serve Grafana with a custom URL path prefix. [#17048](https://github.com/grafana/grafana/pull/17048), [@jan25](https://github.com/jan25)
+* **InfluxDB**: Fixes single quotes are not escaped in label value filters. [#17398](https://github.com/grafana/grafana/pull/17398), [@Panzki](https://github.com/Panzki)
+* **Prometheus**: Correctly escape '|' literals in interpolated PromQL variables. [#16932](https://github.com/grafana/grafana/pull/16932), [@Limess](https://github.com/Limess)
+* **Prometheus**: Fix when adding label for metrics which contains colons in Explore. [#16760](https://github.com/grafana/grafana/pull/16760), [@tolwi](https://github.com/tolwi)
+* **SinglestatPanel**: Remove background color when value turns null. [#17552](https://github.com/grafana/grafana/pull/17552), [@druggieri](https://github.com/druggieri)

 # 6.2.5 (2019-06-25)

@@ -33,7 +33,7 @@ ENV NODE_ENV production
 RUN ./node_modules/.bin/grunt build

 # Final container
-FROM ubuntu:18.04
+FROM ubuntu:latest

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

@@ -2,14 +2,13 @@

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

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

 all: deps build

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

 deps-js: node_modules

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

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

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

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

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

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

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

 test-js:
 	@echo "test frontend"
@@ -108,15 +107,10 @@ golangci-lint: scripts/go/bin/golangci-lint

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

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

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

@@ -147,12 +147,34 @@ Writing & watching frontend tests
 ```bash
 # Run Golang tests using sqlite3 as database (default)
 go test ./pkg/...
+```

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

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

 #### End-to-end
@@ -379,45 +379,17 @@ send_client_credentials_via_post = false

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

-# Friendly name or name of the attribute within the SAML assertion to use as the user's name
-assertion_attribute_name = displayName
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
-assertion_attribute_login = mail
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's email
-assertion_attribute_email = mail
-
 #################################### Basic Auth ##########################
 [auth.basic]
 enabled = true
@@ -334,46 +334,18 @@
 ;send_client_credentials_via_post = false

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

-# Friendly name or name of the attribute within the SAML assertion to use as the user's name
-;assertion_attribute_name = displayName
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
-;assertion_attribute_login = mail
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's email
-;assertion_attribute_email = mail
-
 #################################### Grafana.com Auth ####################
 [auth.grafana_com]
 ;enabled = false
@@ -44,7 +44,7 @@
      "nullPointMode": "null",
      "options-gauge": {
        "baseColor": "#299c46",
-        "decimals": 2,
+        "decimals": "2",
        "maxValue": 100,
        "minValue": 0,
        "options": {
@@ -111,7 +111,7 @@
      "nullPointMode": "null",
      "options-gauge": {
        "baseColor": "#299c46",
-        "decimals": null,
+        "decimals": "",
        "maxValue": 100,
        "minValue": 0,
        "options": {
@@ -178,7 +178,7 @@
      "nullPointMode": "null",
      "options-gauge": {
        "baseColor": "#299c46",
-        "decimals": null,
+        "decimals": "",
        "maxValue": 100,
        "minValue": 0,
        "options": {
@@ -5,7 +5,7 @@
 # root_url = %(protocol)s://%(domain)s:10080/grafana/

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

@@ -28,6 +28,38 @@ search_filter = "(cn=%s)"
 # An array of base dns to search through
 search_base_dns = ["dc=grafana,dc=org"]

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

 ## Enabling LDAP in Grafana

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

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

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

 admins
@@ -40,11 +38,3 @@ editors
  ldap-editors
 no groups
  ldap-viewer
-
-
-## Groups & Users (POSIX)
-
-admins
-  ldap-posix-admin
-no groups
-  ldap-posix
@@ -78,31 +78,3 @@ objectClass: inetOrgPerson
 objectClass: organizationalPerson
 sn: ldap-torkel
 cn: ldap-torkel
-
-# admin for posix group (without support for memberOf attribute)
-dn: uid=ldap-posix-admin,ou=users,dc=grafana,dc=org
-mail: ldap-posix-admin@grafana.com
-userPassword: grafana
-objectclass: top
-objectclass: posixAccount
-objectclass: inetOrgPerson
-homedirectory: /home/ldap-posix-admin
-sn: ldap-posix-admin
-cn: ldap-posix-admin
-uid: ldap-posix-admin
-uidnumber: 1
-gidnumber: 1
-
-# user for posix group (without support for memberOf attribute)
-dn: uid=ldap-posix,ou=users,dc=grafana,dc=org
-mail: ldap-posix@grafana.com
-userPassword: grafana
-objectclass: top
-objectclass: posixAccount
-objectclass: inetOrgPerson
-homedirectory: /home/ldap-posix
-sn: ldap-posix
-cn: ldap-posix
-uid: ldap-posix
-uidnumber: 2
-gidnumber: 2
@@ -23,21 +23,3 @@ objectClass: groupOfNames
 member: cn=ldap-torkel,ou=users,dc=grafana,dc=org
 member: cn=ldap-daniel,ou=users,dc=grafana,dc=org
 member: cn=ldap-leo,ou=users,dc=grafana,dc=org
-
-# -- POSIX --
-
-# posix admin group (without support for memberOf attribute)
-dn: cn=posix-admins,ou=groups,dc=grafana,dc=org
-cn: admins
-objectClass: top
-objectClass: posixGroup
-gidNumber: 1
-memberUid: ldap-posix-admin
-
-# posix group (without support for memberOf attribute)
-dn: cn=posix,ou=groups,dc=grafana,dc=org
-cn: viewers
-objectClass: top
-objectClass: posixGroup
-gidNumber: 2
-memberUid: ldap-posix
@@ -45,6 +45,8 @@ datasources:
    password: $PASSWORD
 ```

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

 ## Configuration Management Tools
@@ -27,7 +27,7 @@ header_name = X-WEBAUTH-USER
 header_property = username
 # Set to `true` to enable auto sign up of users who do not exist in Grafana DB. Defaults to `true`.
 auto_sign_up = true
-# If combined with Grafana LDAP integration define sync interval
+# If combined with Grafana LDAP integration define sync interval in minutes
 ldap_sync_ttl = 60
 # Limit where auth proxy requests come from by configuring a list of IP addresses.
 # This can be used to prevent users spoofing the X-WEBAUTH-USER header.
@@ -126,6 +126,8 @@ group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
 group_search_filter_user_attribute = "uid"
 ```

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

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

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

-### SAML Authentication
-
-Enables your Grafana Enterprise users to authenticate with SAML. [Learn More]({{< relref "auth/saml.md" >}}).
-
 ### Premium Plugins

 With a Grafana Enterprise license you will get access to premium plugins, including:
@@ -130,8 +130,6 @@ belonging to an LDAP group that gives them access to Grafana.

 Built-in support for SAML is now available in Grafana Enterprise.

-[See docs]({{< relref "auth/saml.md" >}})
-
 ### Team Sync for GitHub OAuth

 When setting up OAuth with GitHub it's now possible to sync GitHub teams with Teams in Grafana.
@@ -37,11 +37,15 @@ export class ConfigCtrl {

  postUpdate() {
    if (!this.appModel.enabled) {
-      return;
+      return this.$q.resolve();
    }
-
-    // TODO, whatever you want
-    console.log('Post Update:', this);
+    return this.appEditCtrl.importDashboards().then(() => {
+      this.enabled = true;
+      return {
+        url: "plugins/raintank-kubernetes-app/page/clusters",
+        message: "Kubernetes App enabled!"
+      };
+    });
  }
 }
 ConfigCtrl.templateUrl = 'components/config/config.html';
@@ -1,6 +1,5 @@
 [
-  { "version": "v6.3", "path": "/", "archived": false, "current": true },
-  { "version": "v6.2", "path": "/v6.2", "archived": true },
+  { "version": "v6.2", "path": "/", "archived": false, "current": true },
  { "version": "v6.1", "path": "/v6.1", "archived": true },
  { "version": "v6.0", "path": "/v6.0", "archived": true },
  { "version": "v5.4", "path": "/v5.4", "archived": true },
@@ -1,4 +1,4 @@
 {
  "stable": "6.2.5",
-  "testing": "6.2.5"
+  "testing": "6.3.0-beta1"
 }
@@ -2,5 +2,5 @@
  "npmClient": "yarn",
  "useWorkspaces": true,
  "packages": ["packages/*"],
-  "version": "6.3.0-alpha.36"
+  "version": "6.4.0-alpha.12"
 }
@@ -5,7 +5,7 @@
    "company": "Grafana Labs"
  },
  "name": "grafana",
-  "version": "6.3.3",
+  "version": "6.4.0-pre",
  "repository": {
    "type": "git",
    "url": "http://github.com/grafana/grafana.git"
@@ -89,7 +89,7 @@
    "ng-annotate-loader": "0.6.1",
    "ng-annotate-webpack-plugin": "0.3.0",
    "ngtemplate-loader": "2.0.1",
-    "node-sass": "4.11.0",
+    "node-sass": "4.12.0",
    "npm": "6.9.0",
    "optimize-css-assets-webpack-plugin": "5.0.1",
    "phantomjs-prebuilt": "2.1.16",
@@ -148,7 +148,8 @@
    "themes:generate": "ts-node --project ./scripts/cli/tsconfig.json ./scripts/cli/generateSassVariableFiles.ts",
    "packages:prepare": "lerna run clean && npm run test && lerna version --tag-version-prefix=\"packages@\" -m \"Packages: publish %s\" --no-push",
    "packages:build": "lerna run clean && lerna run build",
-    "packages:publish": "lerna publish from-package --contents dist --tag-version-prefix=\"packages@\" --dist-tag next"
+    "packages:publish": "lerna publish from-package --contents dist",
+    "packages:publishNext": "lerna publish from-package --contents dist --dist-tag next --yes"
  },
  "husky": {
    "hooks": {
@@ -201,7 +202,7 @@
    "file-saver": "1.3.8",
    "immutable": "3.8.2",
    "jquery": "3.4.1",
-    "lodash": "4.17.11",
+    "lodash": "4.17.14",
    "marked": "0.6.2",
    "moment": "2.24.0",
    "mousetrap": "1.6.3",
@@ -1,3 +1,3 @@
 # Grafana Data Library

-The core data components
+This package holds the root data types and functions used within Grafana.
@@ -1,6 +1,6 @@
 {
  "name": "@grafana/data",
-  "version": "6.3.0-alpha.36",
+  "version": "6.4.0-alpha.12",
  "description": "Grafana Data Library",
  "keywords": [
    "typescript"
@@ -11,8 +11,7 @@
    "typecheck": "tsc --noEmit",
    "clean": "rimraf ./dist ./compiled",
    "bundle": "rollup -c rollup.config.ts",
-    "build": "grafana-toolkit package:build --scope=data",
-    "postpublish": "npm run clean"
+    "build": "grafana-toolkit package:build --scope=data"
  },
  "author": "Grafana Labs",
  "license": "Apache-2.0",
@@ -37,8 +36,5 @@
    "rollup-plugin-visualizer": "0.9.2",
    "sinon": "1.17.6",
    "typescript": "3.4.1"
-  },
-  "resolutions": {
-    "@types/lodash": "4.14.119"
  }
 }
@@ -1,6 +1,3 @@
-import { Threshold } from './threshold';
-import { ValueMapping } from './valueMapping';
-
 export enum LoadingState {
  NotStarted = 'NotStarted',
  Loading = 'Loading',
@@ -52,12 +49,6 @@ export interface Field {
  decimals?: number | null; // Significant digits (for display)
  min?: number | null;
  max?: number | null;
-
-  // Convert input values into a display value
-  mappings?: ValueMapping[];
-
-  // Must be sorted by 'value', first value is always -Infinity
-  thresholds?: Threshold[];
 }

 export interface Labels {
@@ -2,7 +2,6 @@ export * from './data';
 export * from './dataLink';
 export * from './logs';
 export * from './navModel';
-export * from './select';
 export * from './time';
 export * from './threshold';
 export * from './utils';
@@ -1,10 +0,0 @@
-/**
- * Used in select elements
- */
-export interface SelectableValue<T = any> {
-  label?: string;
-  value?: T;
-  imgUrl?: string;
-  description?: string;
-  [key: string]: any;
-}
@@ -1,4 +1,5 @@
 export interface Threshold {
+  index: number;
  value: number;
  color: string;
 }
@@ -5,18 +5,6 @@ import { TimeZone } from '../types';

 const units: DurationUnit[] = ['y', 'M', 'w', 'd', 'h', 'm', 's'];

-export function isMathString(text: string | DateTime | Date): boolean {
-  if (!text) {
-    return false;
-  }
-
-  if (typeof text === 'string' && (text.substring(0, 3) === 'now' || text.includes('||'))) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
 /**
 * Parses different types input to a moment instance. There is a specific formatting language that can be used
 * if text arg is string. See unit tests for examples.
@@ -1,14 +1,6 @@
-import { fieldReducers, ReducerID, reduceField } from './fieldReducer';
+import { getFieldReducers, ReducerID, reduceField } from './index';

 import _ from 'lodash';
-import { DataFrame } from '../types/data';
-
-/**
- * Run a reducer and get back the value
- */
-function reduce(series: DataFrame, fieldIndex: number, id: string): any {
-  return reduceField({ series, fieldIndex, reducers: [id] })[id];
-}

 describe('Stats Calculators', () => {
  const basicTable = {
@@ -17,16 +9,29 @@ describe('Stats Calculators', () => {
  };

  it('should load all standard stats', () => {
-    for (const id of Object.keys(ReducerID)) {
-      const reducer = fieldReducers.getIfExists(id);
-      const found = reducer ? reducer.id : '<NOT FOUND>';
-      expect(found).toEqual(id);
-    }
+    const names = [
+      ReducerID.sum,
+      ReducerID.max,
+      ReducerID.min,
+      ReducerID.logmin,
+      ReducerID.mean,
+      ReducerID.last,
+      ReducerID.first,
+      ReducerID.count,
+      ReducerID.range,
+      ReducerID.diff,
+      ReducerID.step,
+      ReducerID.delta,
+      // ReducerID.allIsZero,
+      // ReducerID.allIsNull,
+    ];
+    const stats = getFieldReducers(names);
+    expect(stats.length).toBe(names.length);
  });

  it('should fail to load unknown stats', () => {
    const names = ['not a stat', ReducerID.max, ReducerID.min, 'also not a stat'];
-    const stats = fieldReducers.list(names);
+    const stats = getFieldReducers(names);
    expect(stats.length).toBe(2);

    const found = stats.map(v => v.id);
@@ -87,34 +92,6 @@ describe('Stats Calculators', () => {
    expect(stats.delta).toEqual(300);
  });

-  it('consistenly check allIsNull/allIsZero', () => {
-    const empty = {
-      fields: [{ name: 'A' }],
-      rows: [],
-    };
-    const allNull = ({
-      fields: [{ name: 'A' }],
-      rows: [null, null, null, null],
-    } as unknown) as DataFrame;
-    const allNull2 = {
-      fields: [{ name: 'A' }],
-      rows: [[null], [null], [null], [null]],
-    };
-    const allZero = {
-      fields: [{ name: 'A' }],
-      rows: [[0], [0], [0], [0]],
-    };
-
-    expect(reduce(empty, 0, ReducerID.allIsNull)).toEqual(true);
-    expect(reduce(allNull, 0, ReducerID.allIsNull)).toEqual(true);
-    expect(reduce(allNull2, 0, ReducerID.allIsNull)).toEqual(true);
-
-    expect(reduce(empty, 0, ReducerID.allIsZero)).toEqual(false);
-    expect(reduce(allNull, 0, ReducerID.allIsZero)).toEqual(false);
-    expect(reduce(allNull2, 0, ReducerID.allIsZero)).toEqual(false);
-    expect(reduce(allZero, 0, ReducerID.allIsZero)).toEqual(true);
-  });
-
  it('consistent results for first/last value with null', () => {
    const info = [
      {
@@ -1,8 +1,7 @@
 // Libraries
 import isNumber from 'lodash/isNumber';

-import { DataFrame, NullValueMode } from '../types';
-import { Registry, RegistryItem } from './registry';
+import { DataFrame, NullValueMode } from '../types/index';

 export enum ReducerID {
  sum = 'sum',
@@ -35,13 +34,38 @@ export interface FieldCalcs {
 // Internal function
 type FieldReducer = (data: DataFrame, fieldIndex: number, ignoreNulls: boolean, nullAsZero: boolean) => FieldCalcs;

-export interface FieldReducerInfo extends RegistryItem {
+export interface FieldReducerInfo {
+  id: string;
+  name: string;
+  description: string;
+  alias?: string; // optional secondary key.  'avg' vs 'mean', 'total' vs 'sum'
+
  // Internal details
  emptyInputResult?: any; // typically null, but some things like 'count' & 'sum' should be zero
  standard: boolean; // The most common stats can all be calculated in a single pass
  reduce?: FieldReducer;
 }

+/**
+ * @param ids list of stat names or null to get all of them
+ */
+export function getFieldReducers(ids?: string[]): FieldReducerInfo[] {
+  if (ids === null || ids === undefined) {
+    if (!hasBuiltIndex) {
+      getById(ReducerID.mean);
+    }
+    return listOfStats;
+  }
+
+  return ids.reduce((list, id) => {
+    const stat = getById(id);
+    if (stat) {
+      list.push(stat);
+    }
+    return list;
+  }, new Array<FieldReducerInfo>());
+}
+
 interface ReduceFieldOptions {
  series: DataFrame;
  fieldIndex: number;
@@ -59,7 +83,7 @@ export function reduceField(options: ReduceFieldOptions): FieldCalcs {
    return {};
  }

-  const queue = fieldReducers.list(reducers);
+  const queue = getFieldReducers(reducers);

  // Return early for empty series
  // This lets the concrete implementations assume at least one row
@@ -98,107 +122,122 @@ export function reduceField(options: ReduceFieldOptions): FieldCalcs {
 //
 // ------------------------------------------------------------------------------

-export const fieldReducers = new Registry<FieldReducerInfo>(() => [
-  {
-    id: ReducerID.lastNotNull,
-    name: 'Last (not null)',
-    description: 'Last non-null value',
-    standard: true,
-    aliasIds: ['current'],
-    reduce: calculateLastNotNull,
-  },
-  {
-    id: ReducerID.last,
-    name: 'Last',
-    description: 'Last Value',
-    standard: true,
-    reduce: calculateLast,
-  },
-  { id: ReducerID.first, name: 'First', description: 'First Value', standard: true, reduce: calculateFirst },
-  {
-    id: ReducerID.firstNotNull,
-    name: 'First (not null)',
-    description: 'First non-null value',
-    standard: true,
-    reduce: calculateFirstNotNull,
-  },
-  { id: ReducerID.min, name: 'Min', description: 'Minimum Value', standard: true },
-  { id: ReducerID.max, name: 'Max', description: 'Maximum Value', standard: true },
-  { id: ReducerID.mean, name: 'Mean', description: 'Average Value', standard: true, aliasIds: ['avg'] },
-  {
-    id: ReducerID.sum,
-    name: 'Total',
-    description: 'The sum of all values',
-    emptyInputResult: 0,
-    standard: true,
-    aliasIds: ['total'],
-  },
-  {
-    id: ReducerID.count,
-    name: 'Count',
-    description: 'Number of values in response',
-    emptyInputResult: 0,
-    standard: true,
-  },
-  {
-    id: ReducerID.range,
-    name: 'Range',
-    description: 'Difference between minimum and maximum values',
-    standard: true,
-  },
-  {
-    id: ReducerID.delta,
-    name: 'Delta',
-    description: 'Cumulative change in value',
-    standard: true,
-  },
-  {
-    id: ReducerID.step,
-    name: 'Step',
-    description: 'Minimum interval between values',
-    standard: true,
-  },
-  {
-    id: ReducerID.diff,
-    name: 'Difference',
-    description: 'Difference between first and last values',
-    standard: true,
-  },
-  {
-    id: ReducerID.logmin,
-    name: 'Min (above zero)',
-    description: 'Used for log min scale',
-    standard: true,
-  },
-  {
-    id: ReducerID.allIsZero,
-    name: 'All Zeros',
-    description: 'All values are zero',
-    emptyInputResult: false,
-    standard: true,
-  },
-  {
-    id: ReducerID.allIsNull,
-    name: 'All Nulls',
-    description: 'All values are null',
-    emptyInputResult: true,
-    standard: true,
-  },
-  {
-    id: ReducerID.changeCount,
-    name: 'Change Count',
-    description: 'Number of times the value changes',
-    standard: false,
-    reduce: calculateChangeCount,
-  },
-  {
-    id: ReducerID.distinctCount,
-    name: 'Distinct Count',
-    description: 'Number of distinct values',
-    standard: false,
-    reduce: calculateDistinctCount,
-  },
-]);
+// private registry of all stats
+interface TableStatIndex {
+  [id: string]: FieldReducerInfo;
+}
+
+const listOfStats: FieldReducerInfo[] = [];
+const index: TableStatIndex = {};
+let hasBuiltIndex = false;
+
+function getById(id: string): FieldReducerInfo | undefined {
+  if (!hasBuiltIndex) {
+    [
+      {
+        id: ReducerID.lastNotNull,
+        name: 'Last (not null)',
+        description: 'Last non-null value',
+        standard: true,
+        alias: 'current',
+        reduce: calculateLastNotNull,
+      },
+      {
+        id: ReducerID.last,
+        name: 'Last',
+        description: 'Last Value',
+        standard: true,
+        reduce: calculateLast,
+      },
+      { id: ReducerID.first, name: 'First', description: 'First Value', standard: true, reduce: calculateFirst },
+      {
+        id: ReducerID.firstNotNull,
+        name: 'First (not null)',
+        description: 'First non-null value',
+        standard: true,
+        reduce: calculateFirstNotNull,
+      },
+      { id: ReducerID.min, name: 'Min', description: 'Minimum Value', standard: true },
+      { id: ReducerID.max, name: 'Max', description: 'Maximum Value', standard: true },
+      { id: ReducerID.mean, name: 'Mean', description: 'Average Value', standard: true, alias: 'avg' },
+      {
+        id: ReducerID.sum,
+        name: 'Total',
+        description: 'The sum of all values',
+        emptyInputResult: 0,
+        standard: true,
+        alias: 'total',
+      },
+      {
+        id: ReducerID.count,
+        name: 'Count',
+        description: 'Number of values in response',
+        emptyInputResult: 0,
+        standard: true,
+      },
+      {
+        id: ReducerID.range,
+        name: 'Range',
+        description: 'Difference between minimum and maximum values',
+        standard: true,
+      },
+      {
+        id: ReducerID.delta,
+        name: 'Delta',
+        description: 'Cumulative change in value',
+        standard: true,
+      },
+      {
+        id: ReducerID.step,
+        name: 'Step',
+        description: 'Minimum interval between values',
+        standard: true,
+      },
+      {
+        id: ReducerID.diff,
+        name: 'Difference',
+        description: 'Difference between first and last values',
+        standard: true,
+      },
+      {
+        id: ReducerID.logmin,
+        name: 'Min (above zero)',
+        description: 'Used for log min scale',
+        standard: true,
+      },
+      {
+        id: ReducerID.changeCount,
+        name: 'Change Count',
+        description: 'Number of times the value changes',
+        standard: false,
+        reduce: calculateChangeCount,
+      },
+      {
+        id: ReducerID.distinctCount,
+        name: 'Distinct Count',
+        description: 'Number of distinct values',
+        standard: false,
+        reduce: calculateDistinctCount,
+      },
+    ].forEach(info => {
+      const { id, alias } = info;
+      if (index.hasOwnProperty(id)) {
+        console.warn('Duplicate Stat', id, info, index);
+      }
+      index[id] = info;
+      if (alias) {
+        if (index.hasOwnProperty(alias)) {
+          console.warn('Duplicate Stat (alias)', alias, info, index);
+        }
+        index[alias] = info;
+      }
+      listOfStats.push(info);
+    });
+    hasBuiltIndex = true;
+  }
+
+  return index[id];
+}

 function doStandardCalcs(data: DataFrame, fieldIndex: number, ignoreNulls: boolean, nullAsZero: boolean): FieldCalcs {
  const calcs = {
@@ -214,7 +253,7 @@ function doStandardCalcs(data: DataFrame, fieldIndex: number, ignoreNulls: boole
    count: 0,
    nonNullCount: 0,
    allIsNull: true,
-    allIsZero: true,
+    allIsZero: false,
    range: null,
    diff: null,
    delta: 0,
@@ -225,7 +264,7 @@ function doStandardCalcs(data: DataFrame, fieldIndex: number, ignoreNulls: boole
  } as FieldCalcs;

  for (let i = 0; i < data.rows.length; i++) {
-    let currentValue = data.rows[i] ? data.rows[i][fieldIndex] : null;
+    let currentValue = data.rows[i][fieldIndex];
    if (i === 0) {
      calcs.first = currentValue;
    }
@@ -311,10 +350,6 @@ function doStandardCalcs(data: DataFrame, fieldIndex: number, ignoreNulls: boole
    calcs.mean = calcs.sum! / calcs.nonNullCount;
  }

-  if (calcs.allIsNull) {
-    calcs.allIsZero = false;
-  }
-
  if (calcs.max !== null && calcs.min !== null) {
    calcs.range = calcs.max - calcs.min;
  }
@@ -1,5 +1,4 @@
 export * from './string';
-export * from './registry';
 export * from './markdown';
 export * from './processDataFrame';
 export * from './csv';
@@ -29,15 +29,6 @@ describe('toDataFrame', () => {
    expect(series.fields[0].name).toEqual('Value');
  });

-  it('assumes TimeSeries values are numbers', () => {
-    const input1 = {
-      target: 'time',
-      datapoints: [[100, 1], [200, 2]],
-    };
-    const data = toDataFrame(input1);
-    expect(data.fields[0].type).toBe(FieldType.number);
-  });
-
  it('keeps dataFrame unchanged', () => {
    const input = {
      fields: [{ text: 'A' }, { text: 'B' }, { text: 'C' }],
@@ -29,7 +29,6 @@ function convertTimeSeriesToDataFrame(timeSeries: TimeSeries): DataFrame {
    fields: [
      {
        name: timeSeries.target || 'Value',
-        type: FieldType.number,
        unit: timeSeries.unit,
      },
      {
@@ -1,134 +0,0 @@
-import { SelectableValue } from '../types/select';
-
-export interface RegistryItem {
-  id: string; // Unique Key -- saved in configs
-  name: string; // Display Name, can change without breaking configs
-  description: string;
-  aliasIds?: string[]; // when the ID changes, we may want backwards compatibility ('current' => 'last')
-
-  /**
-   * Some extensions should not be user selectable
-   *  like: 'all' and 'any' matchers;
-   */
-  excludeFromPicker?: boolean;
-}
-
-interface RegistrySelectInfo {
-  options: Array<SelectableValue<string>>;
-  current: Array<SelectableValue<string>>;
-}
-
-export class Registry<T extends RegistryItem> {
-  private ordered: T[] = [];
-  private byId = new Map<string, T>();
-  private initalized = false;
-
-  constructor(private init?: () => T[]) {}
-
-  getIfExists(id: string | undefined): T | undefined {
-    if (!this.initalized) {
-      if (this.init) {
-        for (const ext of this.init()) {
-          this.register(ext);
-        }
-      }
-      this.sort();
-      this.initalized = true;
-    }
-    if (id) {
-      return this.byId.get(id);
-    }
-    return undefined;
-  }
-
-  get(id: string): T {
-    const v = this.getIfExists(id);
-    if (!v) {
-      throw new Error('Undefined: ' + id);
-    }
-    return v;
-  }
-
-  selectOptions(current?: string[], filter?: (ext: T) => boolean): RegistrySelectInfo {
-    if (!this.initalized) {
-      this.getIfExists('xxx'); // will trigger init
-    }
-
-    const select = {
-      options: [],
-      current: [],
-    } as RegistrySelectInfo;
-
-    const currentIds: any = {};
-    if (current) {
-      for (const id of current) {
-        currentIds[id] = true;
-      }
-    }
-
-    for (const ext of this.ordered) {
-      if (ext.excludeFromPicker) {
-        continue;
-      }
-      if (filter && !filter(ext)) {
-        continue;
-      }
-
-      const option = {
-        value: ext.id,
-        label: ext.name,
-        description: ext.description,
-      };
-
-      select.options.push(option);
-      if (currentIds[ext.id]) {
-        select.current.push(option);
-      }
-    }
-    return select;
-  }
-
-  /**
-   * Return a list of values by ID, or all values if not specified
-   */
-  list(ids?: any[]): T[] {
-    if (ids) {
-      const found: T[] = [];
-      for (const id of ids) {
-        const v = this.getIfExists(id);
-        if (v) {
-          found.push(v);
-        }
-      }
-      return found;
-    }
-    if (!this.initalized) {
-      this.getIfExists('xxx'); // will trigger init
-    }
-    return [...this.ordered]; // copy of everythign just in case
-  }
-
-  register(ext: T) {
-    if (this.byId.has(ext.id)) {
-      throw new Error('Duplicate Key:' + ext.id);
-    }
-    this.byId.set(ext.id, ext);
-    this.ordered.push(ext);
-
-    if (ext.aliasIds) {
-      for (const alias of ext.aliasIds) {
-        if (!this.byId.has(alias)) {
-          this.byId.set(alias, ext);
-        }
-      }
-    }
-
-    if (this.initalized) {
-      this.sort();
-    }
-  }
-
-  private sort() {
-    // TODO sort the list
-  }
-}
@@ -1,22 +1,23 @@
 import { Threshold } from '../types';

-export function getActiveThreshold(value: number, thresholds: Threshold[]): Threshold {
-  let active = thresholds[0];
-  for (const threshold of thresholds) {
-    if (value >= threshold.value) {
-      active = threshold;
-    } else {
-      break;
-    }
+export function getThresholdForValue(
+  thresholds: Threshold[],
+  value: number | null | string | undefined
+): Threshold | null {
+  if (thresholds.length === 1) {
+    return thresholds[0];
  }
-  return active;
-}

-/**
- * Sorts the thresholds
- */
-export function sortThresholds(thresholds: Threshold[]) {
-  return thresholds.sort((t1, t2) => {
-    return t1.value - t2.value;
-  });
+  const atThreshold = thresholds.filter(threshold => (value as number) === threshold.value)[0];
+  if (atThreshold) {
+    return atThreshold;
+  }
+
+  const belowThreshold = thresholds.filter(threshold => (value as number) > threshold.value);
+  if (belowThreshold.length > 0) {
+    const nearestThreshold = belowThreshold.sort((t1: Threshold, t2: Threshold) => t2.value - t1.value)[0];
+    return nearestThreshold;
+  }
+
+  return null;
 }
@@ -1,3 +1,3 @@
 # Grafana Runtime library

-Interfaces that let you use the runtime...
+This package allows access to grafana services.  It requires Grafana to be running already and the functions to be imported as externals. 
@@ -1,11 +1,9 @@
 {
  "name": "@grafana/runtime",
-  "version": "6.3.0-alpha.36",
+  "version": "6.4.0-alpha.12",
  "description": "Grafana Runtime Library",
  "keywords": [
-    "typescript",
-    "react",
-    "react-component"
+    "grafana"
  ],
  "main": "src/index.ts",
  "scripts": {
@@ -13,8 +11,7 @@
    "typecheck": "tsc --noEmit",
    "clean": "rimraf ./dist ./compiled",
    "bundle": "rollup -c rollup.config.ts",
-    "build": "grafana-toolkit package:build --scope=runtime",
-    "postpublish": "npm run clean"
+    "build": "grafana-toolkit package:build --scope=runtime"
  },
  "author": "Grafana Labs",
  "license": "Apache-2.0",
@@ -35,8 +32,5 @@
    "rollup-plugin-typescript2": "0.19.3",
    "rollup-plugin-visualizer": "0.9.2",
    "typescript": "3.4.1"
-  },
-  "resolutions": {
-    "@types/lodash": "4.14.119"
  }
 }
@@ -1,11 +1,11 @@
 {
  "name": "@grafana/toolkit",
-  "version": "6.3.0-alpha.36",
+  "version": "6.4.0-alpha.12",
  "description": "Grafana Toolkit",
  "keywords": [
-    "typescript",
-    "react",
-    "react-component"
+    "grafana",
+    "cli",
+    "plugins"
  ],
  "bin": {
    "grafana-toolkit": "./bin/grafana-toolkit.js"
@@ -15,8 +15,7 @@
    "typecheck": "tsc --noEmit",
    "precommit": "npm run tslint & npm run typecheck",
    "clean": "rimraf ./dist ./compiled",
-    "build": "grafana-toolkit toolkit:build",
-    "postpublish": "npm run clean"
+    "build": "grafana-toolkit toolkit:build"
  },
  "author": "Grafana Labs",
  "license": "Apache-2.0",
@@ -30,6 +29,7 @@
    "@types/node": "^12.0.4",
    "@types/react-dev-utils": "^9.0.1",
    "@types/semver": "^6.0.0",
+    "@types/tmp": "^0.1.0",
    "@types/webpack": "4.4.34",
    "axios": "0.19.0",
    "babel-loader": "8.0.6",
@@ -47,7 +47,7 @@
    "jest": "24.8.0",
    "jest-cli": "^24.8.0",
    "jest-coverage-badges": "^1.1.2",
-    "lodash": "4.17.11",
+    "lodash": "4.17.14",
    "mini-css-extract-plugin": "^0.7.0",
    "node-sass": "^4.12.0",
    "optimize-css-assets-webpack-plugin": "^5.0.3",
@@ -74,9 +74,6 @@
    "url-loader": "^2.0.1",
    "webpack": "4.35.0"
  },
-  "resolutions": {
-    "@types/lodash": "4.14.119"
-  },
  "devDependencies": {
    "@types/glob": "^7.1.1",
    "@types/prettier": "^1.16.4"
@@ -13,7 +13,14 @@ import { pluginTestTask } from './tasks/plugin.tests';
 import { searchTestDataSetupTask } from './tasks/searchTestDataSetup';
 import { closeMilestoneTask } from './tasks/closeMilestone';
 import { pluginDevTask } from './tasks/plugin.dev';
-import { pluginCITask } from './tasks/plugin.ci';
+import {
+  ciBuildPluginTask,
+  ciBuildPluginDocsTask,
+  ciBundlePluginTask,
+  ciTestPluginTask,
+  ciPluginReportTask,
+  ciDeployPluginTask,
+} from './tasks/plugin.ci';
 import { buildPackageTask } from './tasks/package.build';

 export const run = (includeInternalScripts = false) => {
@@ -141,15 +148,53 @@ export const run = (includeInternalScripts = false) => {
    });

  program
-    .command('plugin:ci')
-    .option('--dryRun', "Dry run (don't post results)")
-    .description('Run Plugin CI task')
+    .command('plugin:ci-build')
+    .option('--backend <backend>', 'For backend task, which backend to run')
+    .description('Build the plugin, leaving artifacts in /dist')
    .action(async cmd => {
-      await execTask(pluginCITask)({
-        dryRun: cmd.dryRun,
+      await execTask(ciBuildPluginTask)({
+        backend: cmd.backend,
      });
    });

+  program
+    .command('plugin:ci-docs')
+    .description('Build the HTML docs')
+    .action(async cmd => {
+      await execTask(ciBuildPluginDocsTask)({});
+    });
+
+  program
+    .command('plugin:ci-bundle')
+    .description('Create a zip artifact for the plugin')
+    .action(async cmd => {
+      await execTask(ciBundlePluginTask)({});
+    });
+
+  program
+    .command('plugin:ci-test')
+    .option('--full', 'run all the tests (even stuff that will break)')
+    .description('end-to-end test using bundle in /artifacts')
+    .action(async cmd => {
+      await execTask(ciTestPluginTask)({
+        full: cmd.full,
+      });
+    });
+
+  program
+    .command('plugin:ci-report')
+    .description('Build a report for this whole process')
+    .action(async cmd => {
+      await execTask(ciPluginReportTask)({});
+    });
+
+  program
+    .command('plugin:ci-deploy')
+    .description('Publish plugin CI results')
+    .action(async cmd => {
+      await execTask(ciDeployPluginTask)({});
+    });
+
  program.on('command:*', () => {
    console.error('Invalid command: %s\nSee --help for a list of available commands.', program.args.join(' '));
    process.exit(1);
@@ -99,4 +99,4 @@ const buildTaskRunner: TaskRunner<PackageBuildOptions> = async ({ scope }) => {
  await Promise.all(scopes.map(s => s()));
 };

-export const buildPackageTask = new Task<PackageBuildOptions>('@grafana/ui build', buildTaskRunner);
+export const buildPackageTask = new Task<PackageBuildOptions>('Package build', buildTaskRunner);
@@ -9,7 +9,8 @@ import path = require('path');
 import fs = require('fs');

 export interface PluginCIOptions {
-  dryRun?: boolean;
+  backend?: string;
+  full?: boolean;
 }

 const calcJavascriptSize = (base: string, files?: string[]): number => {
@@ -32,46 +33,353 @@ const calcJavascriptSize = (base: string, files?: string[]): number => {
  return size;
 };

-const pluginCIRunner: TaskRunner<PluginCIOptions> = async ({ dryRun }) => {
+const getJobFromProcessArgv = () => {
+  const arg = process.argv[2];
+  if (arg && arg.startsWith('plugin:ci-')) {
+    const task = arg.substring('plugin:ci-'.length);
+    if ('build' === task) {
+      if ('--platform' === process.argv[3] && process.argv[4]) {
+        return task + '_' + process.argv[4];
+      }
+      return 'build_nodejs';
+    }
+    return task;
+  }
+  return 'unknown_job';
+};
+
+const job = process.env.CIRCLE_JOB || getJobFromProcessArgv();
+
+const getJobFolder = () => {
+  const dir = path.resolve(process.cwd(), 'ci', 'jobs', job);
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+  }
+  return dir;
+};
+
+const getCiFolder = () => {
+  const dir = path.resolve(process.cwd(), 'ci');
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+  }
+  return dir;
+};
+
+const writeJobStats = (startTime: number, workDir: string) => {
+  const stats = {
+    job,
+    startTime,
+    endTime: Date.now(),
+  };
+  const f = path.resolve(workDir, 'stats.json');
+  fs.writeFile(f, JSON.stringify(stats, null, 2), err => {
+    if (err) {
+      throw new Error('Unable to stats: ' + f);
+    }
+  });
+};
+
+/**
+ * 1. BUILD
+ *
+ *  when platform exists it is building backend, otherwise frontend
+ *
+ *  Each build writes data:
+ *   ~/work/build_xxx/
+ *
+ *  Anything that should be put into the final zip file should be put in:
+ *   ~/work/build_xxx/dist
+ */
+const buildPluginRunner: TaskRunner<PluginCIOptions> = async ({ backend }) => {
  const start = Date.now();
-  const distDir = `${process.cwd()}/dist`;
-  const artifactsDir = `${process.cwd()}/artifacts`;
-  await execa('rimraf', [`${process.cwd()}/coverage`]);
-  await execa('rimraf', [artifactsDir]);
+  const workDir = getJobFolder();
+  await execa('rimraf', [workDir]);
+  fs.mkdirSync(workDir);

-  // Do regular build process
-  await pluginBuildRunner({ coverage: true });
-  const elapsed = Date.now() - start;
-
-  if (!fs.existsSync(artifactsDir)) {
-    fs.mkdirSync(artifactsDir);
+  if (backend) {
+    console.log('TODO, backend support?');
+    fs.mkdirSync(path.resolve(process.cwd(), 'dist'));
+    const file = path.resolve(process.cwd(), 'dist', `README_${backend}.txt`);
+    fs.writeFile(file, `TODO... build bakend plugin: ${backend}!`, err => {
+      if (err) {
+        throw new Error('Unable to write: ' + file);
+      }
+    });
+  } else {
+    // Do regular build process with coverage
+    await pluginBuildRunner({ coverage: true });
  }

-  // TODO? can this typed from @grafana/ui?
+  // Move local folders to the scoped job folder
+  for (const name of ['dist', 'coverage']) {
+    const dir = path.resolve(process.cwd(), name);
+    if (fs.existsSync(dir)) {
+      fs.renameSync(dir, path.resolve(workDir, name));
+    }
+  }
+  writeJobStats(start, workDir);
+};
+
+export const ciBuildPluginTask = new Task<PluginCIOptions>('Build Plugin', buildPluginRunner);
+
+/**
+ * 2. Build Docs
+ *
+ *  Take /docs/* and format it into /ci/docs/HTML site
+ *
+ */
+const buildPluginDocsRunner: TaskRunner<PluginCIOptions> = async () => {
+  const docsSrc = path.resolve(process.cwd(), 'docs');
+  if (!fs.existsSync(docsSrc)) {
+    throw new Error('Docs folder does not exist!');
+  }
+
+  const start = Date.now();
+  const workDir = getJobFolder();
+  await execa('rimraf', [workDir]);
+  fs.mkdirSync(workDir);
+
+  const docsDest = path.resolve(process.cwd(), 'ci', 'docs');
+  fs.mkdirSync(docsDest);
+
+  const exe = await execa('cp', ['-rv', docsSrc + '/.', docsDest]);
+  console.log(exe.stdout);
+
+  fs.writeFile(path.resolve(docsDest, 'index.html'), `TODO... actually build docs`, err => {
+    if (err) {
+      throw new Error('Unable to docs');
+    }
+  });
+
+  writeJobStats(start, workDir);
+};
+
+export const ciBuildPluginDocsTask = new Task<PluginCIOptions>('Build Plugin Docs', buildPluginDocsRunner);
+
+/**
+ * 2. BUNDLE
+ *
+ *  Take everything from `~/ci/job/{any}/dist` and
+ *  1. merge it into: `~/ci/dist`
+ *  2. zip it into artifacts in `~/ci/artifacts`
+ *  3. prepare grafana environment in: `~/ci/grafana-test-env`
+ *
+ */
+const bundlePluginRunner: TaskRunner<PluginCIOptions> = async () => {
+  const start = Date.now();
+  const ciDir = getCiFolder();
+  const artifactsDir = path.resolve(ciDir, 'artifacts');
+  const distDir = path.resolve(ciDir, 'dist');
+  const docsDir = path.resolve(ciDir, 'docs');
+  const grafanaEnvDir = path.resolve(ciDir, 'grafana-test-env');
+  await execa('rimraf', [artifactsDir, distDir, grafanaEnvDir]);
+  fs.mkdirSync(artifactsDir);
+  fs.mkdirSync(distDir);
+  fs.mkdirSync(grafanaEnvDir);
+
+  console.log('Build Dist Folder');
+
+  // 1. Check for a local 'dist' folder
+  const d = path.resolve(process.cwd(), 'dist');
+  if (fs.existsSync(d)) {
+    await execa('cp', ['-rn', d + '/.', distDir]);
+  }
+
+  // 2. Look for any 'dist' folders under ci/job/XXX/dist
+  const dirs = fs.readdirSync(path.resolve(ciDir, 'jobs'));
+  for (const j of dirs) {
+    const contents = path.resolve(ciDir, 'jobs', j, 'dist');
+    if (fs.existsSync(contents)) {
+      try {
+        await execa('cp', ['-rn', contents + '/.', distDir]);
+      } catch (er) {
+        throw new Error('Duplicate files found in dist folders');
+      }
+    }
+  }
+
+  console.log('Building ZIP');
  const pluginInfo = getPluginJson(`${distDir}/plugin.json`);
-  const zipName = pluginInfo.id + '-' + pluginInfo.info.version + '.zip';
-  const zipFile = path.resolve(artifactsDir, zipName);
+  let zipName = pluginInfo.id + '-' + pluginInfo.info.version + '.zip';
+  let zipFile = path.resolve(artifactsDir, zipName);
  process.chdir(distDir);
  await execa('zip', ['-r', zipFile, '.']);
  restoreCwd();

-  const stats = {
-    startTime: start,
-    buildTime: elapsed,
-    jsSize: calcJavascriptSize(distDir),
-    zipSize: fs.statSync(zipFile).size,
-    endTime: Date.now(),
+  const zipStats = fs.statSync(zipFile);
+  if (zipStats.size < 100) {
+    throw new Error('Invalid zip file: ' + zipFile);
+  }
+
+  const zipInfo: any = {
+    name: zipName,
+    size: zipStats.size,
  };
-  fs.writeFile(artifactsDir + '/stats.json', JSON.stringify(stats, null, 2), err => {
-    if (err) {
-      throw new Error('Unable to write stats');
+  const info: any = {
+    plugin: zipInfo,
+  };
+  try {
+    const exe = await execa('shasum', [zipFile]);
+    const idx = exe.stdout.indexOf(' ');
+    const sha1 = exe.stdout.substring(0, idx);
+    fs.writeFile(zipFile + '.sha1', sha1, err => {});
+    zipInfo.sha1 = sha1;
+  } catch {
+    console.warn('Unable to read SHA1 Checksum');
+  }
+
+  // If docs exist, zip them into artifacts
+  if (fs.existsSync(docsDir)) {
+    zipName = pluginInfo.id + '-' + pluginInfo.info.version + '-docs.zip';
+    zipFile = path.resolve(artifactsDir, zipName);
+    process.chdir(docsDir);
+    await execa('zip', ['-r', zipFile, '.']);
+    restoreCwd();
+
+    const zipStats = fs.statSync(zipFile);
+    const zipInfo: any = {
+      name: zipName,
+      size: zipStats.size,
+    };
+    try {
+      const exe = await execa('shasum', [zipFile]);
+      const idx = exe.stdout.indexOf(' ');
+      const sha1 = exe.stdout.substring(0, idx);
+      fs.writeFile(zipFile + '.sha1', sha1, err => {});
+      zipInfo.sha1 = sha1;
+    } catch {
+      console.warn('Unable to read SHA1 Checksum');
+    }
+    info.docs = zipInfo;
+  }
+
+  let p = path.resolve(artifactsDir, 'info.json');
+  fs.writeFile(p, JSON.stringify(info, null, 2), err => {
+    if (err) {
+      throw new Error('Error writing artifact info: ' + p);
    }
-    console.log('Stats', stats);
  });

-  if (!dryRun) {
-    console.log('TODO send info to github?');
-  }
+  console.log('Setup Grafan Environment');
+  p = path.resolve(grafanaEnvDir, 'plugins', pluginInfo.id);
+  fs.mkdirSync(p, { recursive: true });
+  await execa('unzip', [zipFile, '-d', p]);
+
+  // Write the custom settings
+  p = path.resolve(grafanaEnvDir, 'custom.ini');
+  const customIniBody =
+    `# Autogenerated by @grafana/toolkit \n` +
+    `[paths] \n` +
+    `plugins = ${path.resolve(grafanaEnvDir, 'plugins')}\n` +
+    `\n`; // empty line
+  fs.writeFile(p, customIniBody, err => {
+    if (err) {
+      throw new Error('Unable to write: ' + p);
+    }
+  });
+
+  writeJobStats(start, getJobFolder());
 };

-export const pluginCITask = new Task<PluginCIOptions>('Plugin CI', pluginCIRunner);
+export const ciBundlePluginTask = new Task<PluginCIOptions>('Bundle Plugin', bundlePluginRunner);
+
+/**
+ * 3. Test (end-to-end)
+ *
+ *  deploy the zip to a running grafana instance
+ *
+ */
+const testPluginRunner: TaskRunner<PluginCIOptions> = async ({ full }) => {
+  const start = Date.now();
+  const workDir = getJobFolder();
+  const pluginInfo = getPluginJson(`${process.cwd()}/src/plugin.json`);
+
+  const args = {
+    withCredentials: true,
+    baseURL: process.env.GRAFANA_URL || 'http://localhost:3000/',
+    responseType: 'json',
+    auth: {
+      username: 'admin',
+      password: 'admin',
+    },
+  };
+
+  const axios = require('axios');
+  const frontendSettings = await axios.get('api/frontend/settings', args);
+
+  console.log('Grafana Version: ' + JSON.stringify(frontendSettings.data.buildInfo, null, 2));
+
+  const allPlugins: any[] = await axios.get('api/plugins', args).data;
+  // for (const plugin of allPlugins) {
+  //   if (plugin.id === pluginInfo.id) {
+  //     console.log('------------');
+  //     console.log(plugin);
+  //     console.log('------------');
+  //   } else {
+  //     console.log('Plugin:', plugin.id, plugin.latestVersion);
+  //   }
+  // }
+  console.log('PLUGINS:', allPlugins);
+
+  if (full) {
+    const pluginSettings = await axios.get(`api/plugins/${pluginInfo.id}/settings`, args);
+    console.log('Plugin Info: ' + JSON.stringify(pluginSettings.data, null, 2));
+  }
+
+  console.log('TODO puppeteer');
+
+  const elapsed = Date.now() - start;
+  const stats = {
+    job,
+    sha1: `${process.env.CIRCLE_SHA1}`,
+    startTime: start,
+    buildTime: elapsed,
+    endTime: Date.now(),
+  };
+
+  console.log('TODO Puppeteer Tests', stats);
+  writeJobStats(start, workDir);
+};
+
+export const ciTestPluginTask = new Task<PluginCIOptions>('Test Plugin (e2e)', testPluginRunner);
+
+/**
+ * 4. Report
+ *
+ *  Create a report from all the previous steps
+ *
+ */
+const pluginReportRunner: TaskRunner<PluginCIOptions> = async () => {
+  const start = Date.now();
+  const workDir = getJobFolder();
+  const reportDir = path.resolve(process.cwd(), 'ci', 'report');
+  await execa('rimraf', [reportDir]);
+  fs.mkdirSync(reportDir);
+
+  const file = path.resolve(reportDir, `report.txt`);
+  fs.writeFile(file, `TODO... actually make a report (csv etc)`, err => {
+    if (err) {
+      throw new Error('Unable to write: ' + file);
+    }
+  });
+
+  console.log('TODO... real report');
+  writeJobStats(start, workDir);
+};
+
+export const ciPluginReportTask = new Task<PluginCIOptions>('Deploy plugin', pluginReportRunner);
+
+/**
+ * 5. Deploy
+ *
+ *  deploy the zip to a running grafana instance
+ *
+ */
+const deployPluginRunner: TaskRunner<PluginCIOptions> = async () => {
+  console.log('TODO DEPLOY??');
+  console.log(' if PR => write a comment to github with difference ');
+  console.log(' if master | vXYZ ==> upload artifacts to some repo ');
+};
+
+export const ciDeployPluginTask = new Task<PluginCIOptions>('Deploy plugin', deployPluginRunner);
@@ -3,7 +3,7 @@ import { getPluginJson, validatePluginJson } from './pluginValidation';
 describe('pluginValdation', () => {
  describe('plugin.json', () => {
    test('missing plugin.json file', () => {
-      expect(() => getPluginJson(`${__dirname}/mocks/missing-plugin-json`)).toThrow('plugin.json file is missing!');
+      expect(() => getPluginJson(`${__dirname}/mocks/missing-plugin.json`)).toThrowError();
    });
  });

@@ -1,5 +1,3 @@
-import path = require('path');
-
 // See: packages/grafana-ui/src/types/plugin.ts
 interface PluginJSONSchema {
  id: string;
@@ -22,15 +20,24 @@ export const validatePluginJson = (pluginJson: any) => {
  if (!pluginJson.info.version) {
    throw new Error('Plugin info.version is missing in plugin.json');
  }
+
+  const types = ['panel', 'datasource', 'app'];
+  const type = pluginJson.type;
+  if (!types.includes(type)) {
+    throw new Error('Invalid plugin type in plugin.json: ' + type);
+  }
+
+  if (!pluginJson.id.endsWith('-' + type)) {
+    throw new Error('[plugin.json] id should end with: -' + type);
+  }
 };

-export const getPluginJson = (root: string = process.cwd()): PluginJSONSchema => {
+export const getPluginJson = (path: string): PluginJSONSchema => {
  let pluginJson;
-
  try {
-    pluginJson = require(path.resolve(root, 'src/plugin.json'));
+    pluginJson = require(path);
  } catch (e) {
-    throw new Error('plugin.json file is missing!');
+    throw new Error('Unable to find: ' + path);
  }

  validatePluginJson(pluginJson);
@@ -1,9 +1,9 @@
 {
  "name": "@grafana/ui",
-  "version": "6.3.0-alpha.36",
+  "version": "6.4.0-alpha.12",
  "description": "Grafana Components Library",
  "keywords": [
-    "typescript",
+    "grafana",
    "react",
    "react-component"
  ],
@@ -15,18 +15,18 @@
    "storybook:build": "build-storybook -o ./dist/storybook -c .storybook",
    "clean": "rimraf ./dist ./compiled",
    "bundle": "rollup -c rollup.config.ts",
-    "build": "grafana-toolkit package:build --scope=ui",
-    "postpublish": "npm run clean"
+    "build": "grafana-toolkit package:build --scope=ui"
  },
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "dependencies": {
+    "@grafana/data": "^6.4.0-alpha.8",
    "@torkelo/react-select": "2.1.1",
    "@types/react-color": "2.17.0",
    "classnames": "2.2.6",
    "d3": "5.9.1",
    "jquery": "3.4.1",
-    "lodash": "4.17.11",
+    "lodash": "4.17.14",
    "moment": "2.24.0",
    "papaparse": "4.6.3",
    "react": "16.8.6",
@@ -77,8 +77,5 @@
    "rollup-plugin-typescript2": "0.19.3",
    "rollup-plugin-visualizer": "0.9.2",
    "typescript": "3.4.1"
-  },
-  "resolutions": {
-    "@types/lodash": "4.14.119"
  }
 }
@@ -49,9 +49,9 @@ function addBarGaugeStory(name: string, overrides: Partial<Props>) {
      orientation: VizOrientation.Vertical,
      displayMode: 'basic',
      thresholds: [
-        { value: -Infinity, color: 'green' },
-        { value: threshold1Value, color: threshold1Color },
-        { value: threshold2Value, color: threshold2Color },
+        { index: 0, value: -Infinity, color: 'green' },
+        { index: 1, value: threshold1Value, color: threshold1Color },
+        { index: 1, value: threshold2Value, color: threshold2Color },
      ],
    };

@@ -25,7 +25,11 @@ function getProps(propOverrides?: Partial<Props>): Props {
    maxValue: 100,
    minValue: 0,
    displayMode: 'basic',
-    thresholds: [{ value: -Infinity, color: 'green' }, { value: 70, color: 'orange' }, { value: 90, color: 'red' }],
+    thresholds: [
+      { index: 0, value: -Infinity, color: 'green' },
+      { index: 1, value: 70, color: 'orange' },
+      { index: 2, value: 90, color: 'red' },
+    ],
    height: 300,
    width: 300,
    value: {
@@ -7,7 +7,7 @@ import { getColorFromHexRgbOrName } from '../../utils';

 // Types
 import { DisplayValue, Themeable, VizOrientation } from '../../types';
-import { Threshold, TimeSeriesValue, getActiveThreshold } from '@grafana/data';
+import { Threshold, TimeSeriesValue, getThresholdForValue } from '@grafana/data';

 const MIN_VALUE_HEIGHT = 18;
 const MAX_VALUE_HEIGHT = 50;
@@ -87,14 +87,8 @@ export class BarGauge extends PureComponent<Props> {

  getCellColor(positionValue: TimeSeriesValue): CellColors {
    const { thresholds, theme, value } = this.props;
-    if (positionValue === null) {
-      return {
-        background: 'gray',
-        border: 'gray',
-      };
-    }
+    const activeThreshold = getThresholdForValue(thresholds, positionValue);

-    const activeThreshold = getActiveThreshold(positionValue, thresholds);
    if (activeThreshold !== null) {
      const color = getColorFromHexRgbOrName(activeThreshold.color, theme.type);

@@ -480,7 +474,7 @@ export function getBarGradient(props: Props, maxSize: number): string {
 export function getValueColor(props: Props): string {
  const { thresholds, theme, value } = props;

-  const activeThreshold = getActiveThreshold(value.numeric, thresholds);
+  const activeThreshold = getThresholdForValue(thresholds, value.numeric);

  if (activeThreshold !== null) {
    return getColorFromHexRgbOrName(activeThreshold.color, theme.type);
@@ -77,7 +77,7 @@ export class CustomScrollbar extends Component<Props> {
        {...passedProps}
        className={cx(
          css`
-            visibility: ${hideTrack ? 'hidden' : 'visible'};
+            visibility: ${hideTrack ? 'none' : 'visible'};
          `,
          track
        )}
@@ -14,7 +14,7 @@ const setup = (propOverrides?: object) => {
    minValue: 0,
    showThresholdMarkers: true,
    showThresholdLabels: false,
-    thresholds: [{ value: -Infinity, color: '#7EB26D' }],
+    thresholds: [{ index: 0, value: -Infinity, color: '#7EB26D' }],
    height: 300,
    width: 300,
    value: {
@@ -48,9 +48,9 @@ describe('Get thresholds formatted', () => {
  it('should get the correct formatted values when thresholds are added', () => {
    const { instance } = setup({
      thresholds: [
-        { value: -Infinity, color: '#7EB26D' },
-        { value: 50, color: '#EAB839' },
-        { value: 75, color: '#6ED0E0' },
+        { index: 0, value: -Infinity, color: '#7EB26D' },
+        { index: 1, value: 50, color: '#EAB839' },
+        { index: 2, value: 75, color: '#6ED0E0' },
      ],
    });

@@ -43,12 +43,12 @@ export class Gauge extends PureComponent<Props> {
    const lastThreshold = thresholds[thresholds.length - 1];

    return [
-      ...thresholds.map((threshold, index) => {
-        if (index === 0) {
+      ...thresholds.map(threshold => {
+        if (threshold.index === 0) {
          return { value: minValue, color: getColorFromHexRgbOrName(threshold.color, theme.type) };
        }

-        const previousThreshold = thresholds[index - 1];
+        const previousThreshold = thresholds[threshold.index - 1];
        return { value: threshold.value, color: getColorFromHexRgbOrName(previousThreshold.color, theme.type) };
      }),
      { value: maxValue, color: getColorFromHexRgbOrName(lastThreshold.color, theme.type) },
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 import classNames from 'classnames';
-import { SelectableValue } from '@grafana/data';
+import { SelectOptionItem } from '../Select/Select';
 import { Tooltip } from '../Tooltip/Tooltip';
 import { ButtonSelect } from '../Select/ButtonSelect';

@@ -23,7 +23,7 @@ export class RefreshPicker extends PureComponent<Props> {
    super(props);
  }

-  intervalsToOptions = (intervals: string[] | undefined): Array<SelectableValue<string>> => {
+  intervalsToOptions = (intervals: string[] | undefined): Array<SelectOptionItem<string>> => {
    const intervalsOrDefault = intervals || defaultIntervals;
    const options = intervalsOrDefault
      .filter(str => str !== '')
@@ -37,7 +37,7 @@ export class RefreshPicker extends PureComponent<Props> {
    return options;
  };

-  onChangeSelect = (item: SelectableValue<string>) => {
+  onChangeSelect = (item: SelectOptionItem<string>) => {
    const { onIntervalChanged } = this.props;
    if (onIntervalChanged) {
      // @ts-ignore
@@ -4,7 +4,7 @@ import { action } from '@storybook/addon-actions';
 import { withKnobs, object, text } from '@storybook/addon-knobs';
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 import { UseState } from '../../utils/storybook/UseState';
-import { SelectableValue } from '@grafana/data';
+import { SelectOptionItem } from './Select';
 import { ButtonSelect } from './ButtonSelect';

 const ButtonSelectStories = storiesOf('UI/Select/ButtonSelect', module);
@@ -12,9 +12,9 @@ const ButtonSelectStories = storiesOf('UI/Select/ButtonSelect', module);
 ButtonSelectStories.addDecorator(withCenteredStory).addDecorator(withKnobs);

 ButtonSelectStories.add('default', () => {
-  const intialState: SelectableValue<string> = { label: 'A label', value: 'A value' };
-  const value = object<SelectableValue<string>>('Selected Value:', intialState);
-  const options = object<Array<SelectableValue<string>>>('Options:', [
+  const intialState: SelectOptionItem<string> = { label: 'A label', value: 'A value' };
+  const value = object<SelectOptionItem<string>>('Selected Value:', intialState);
+  const options = object<Array<SelectOptionItem<string>>>('Options:', [
    intialState,
    { label: 'Another label', value: 'Another value' },
  ]);
@@ -1,7 +1,6 @@
 import React, { PureComponent, ReactElement } from 'react';
-import Select from './Select';
+import Select, { SelectOptionItem } from './Select';
 import { PopperContent } from '../Tooltip/PopperController';
-import { SelectableValue } from '@grafana/data';

 interface ButtonComponentProps {
  label: ReactElement | string | undefined;
@@ -31,13 +30,13 @@ const ButtonComponent = (buttonProps: ButtonComponentProps) => (props: any) => {

 export interface Props<T> {
  className: string | undefined;
-  options: Array<SelectableValue<T>>;
-  value?: SelectableValue<T>;
+  options: Array<SelectOptionItem<T>>;
+  value?: SelectOptionItem<T>;
  label?: ReactElement | string;
  iconClass?: string;
  components?: any;
  maxMenuHeight?: number;
-  onChange: (item: SelectableValue<T>) => void;
+  onChange: (item: SelectOptionItem<T>) => void;
  tooltipContent?: PopperContent<any>;
  isMenuOpen?: boolean;
  onOpenMenu?: () => void;
@@ -46,7 +45,7 @@ export interface Props<T> {
 }

 export class ButtonSelect<T> extends PureComponent<Props<T>> {
-  onChange = (item: SelectableValue<T>) => {
+  onChange = (item: SelectOptionItem<T>) => {
    const { onChange } = this.props;
    onChange(item);
  };
@@ -19,16 +19,23 @@ import resetSelectStyles from './resetSelectStyles';
 import { CustomScrollbar } from '../CustomScrollbar/CustomScrollbar';
 import { PopperContent } from '../Tooltip/PopperController';
 import { Tooltip } from '../Tooltip/Tooltip';
-import { SelectableValue } from '@grafana/data';
+
+export interface SelectOptionItem<T> {
+  label?: string;
+  value?: T;
+  imgUrl?: string;
+  description?: string;
+  [key: string]: any;
+}

 export interface CommonProps<T> {
  defaultValue?: any;
-  getOptionLabel?: (item: SelectableValue<T>) => string;
-  getOptionValue?: (item: SelectableValue<T>) => string;
-  onChange: (item: SelectableValue<T>) => {} | void;
+  getOptionLabel?: (item: SelectOptionItem<T>) => string;
+  getOptionValue?: (item: SelectOptionItem<T>) => string;
+  onChange: (item: SelectOptionItem<T>) => {} | void;
  placeholder?: string;
  width?: number;
-  value?: SelectableValue<T>;
+  value?: SelectOptionItem<T>;
  className?: string;
  isDisabled?: boolean;
  isSearchable?: boolean;
@@ -50,12 +57,12 @@ export interface CommonProps<T> {
 }

 export interface SelectProps<T> extends CommonProps<T> {
-  options: Array<SelectableValue<T>>;
+  options: Array<SelectOptionItem<T>>;
 }

 interface AsyncProps<T> extends CommonProps<T> {
  defaultOptions: boolean;
-  loadOptions: (query: string) => Promise<Array<SelectableValue<T>>>;
+  loadOptions: (query: string) => Promise<Array<SelectOptionItem<T>>>;
  loadingMessage?: () => string;
 }

@@ -3,10 +3,11 @@ import { interval, Subscription, Subject, of, NEVER } from 'rxjs';
 import { tap, switchMap } from 'rxjs/operators';
 import _ from 'lodash';

-import { stringToMs, SelectableValue } from '@grafana/data';
+import { stringToMs } from '@grafana/data';
 import { isLive } from '../RefreshPicker/RefreshPicker';
+import { SelectOptionItem } from '../Select/Select';

-export function getIntervalFromString(strInterval: string): SelectableValue<number> {
+export function getIntervalFromString(strInterval: string): SelectOptionItem<number> {
  return {
    label: strInterval,
    value: stringToMs(strInterval),
@@ -8,10 +8,10 @@ import { StatsPicker } from '../StatsPicker/StatsPicker';

 // Types
 import { FieldDisplayOptions, DEFAULT_FIELD_DISPLAY_VALUES_LIMIT } from '../../utils/fieldDisplay';
-import Select from '../Select/Select';
-import { Field, ReducerID, toNumberString, toIntegerOrUndefined, SelectableValue } from '@grafana/data';
+import Select, { SelectOptionItem } from '../Select/Select';
+import { Field, ReducerID, toNumberString, toIntegerOrUndefined } from '@grafana/data';

-const showOptions: Array<SelectableValue<boolean>> = [
+const showOptions: Array<SelectOptionItem<boolean>> = [
  {
    value: true,
    label: 'All Values',
@@ -31,7 +31,7 @@ export interface Props {
 }

 export class FieldDisplayEditor extends PureComponent<Props> {
-  onShowValuesChange = (item: SelectableValue<boolean>) => {
+  onShowValuesChange = (item: SelectOptionItem<boolean>) => {
    const val = item.value === true;
    this.props.onChange({ ...this.props.value, values: val });
  };
@@ -7,7 +7,8 @@ import { FormLabel } from '../FormLabel/FormLabel';
 import { UnitPicker } from '../UnitPicker/UnitPicker';

 // Types
-import { toIntegerOrUndefined, Field, SelectableValue } from '@grafana/data';
+import { toIntegerOrUndefined, Field } from '@grafana/data';
+import { SelectOptionItem } from '../Select/Select';

 import { VAR_SERIES_NAME, VAR_FIELD_NAME, VAR_CALC, VAR_CELL_PREFIX } from '../../utils/fieldDisplay';

@@ -53,7 +54,7 @@ export const FieldPropertiesEditor: React.FC<Props> = ({ value, onChange, showMi
    [value.max, onChange]
  );

-  const onUnitChange = (unit: SelectableValue<string>) => {
+  const onUnitChange = (unit: SelectOptionItem<string>) => {
    onChange({ ...value, unit: unit.value });
  };

@@ -1,39 +0,0 @@
-import { sharedSingleStatMigrationCheck } from './SingleStatBaseOptions';
-
-describe('sharedSingleStatMigrationCheck', () => {
-  it('from old valueOptions model without pluginVersion', () => {
-    const panel = {
-      options: {
-        valueOptions: {
-          unit: 'watt',
-          stat: 'last',
-          decimals: 5,
-        },
-        minValue: 10,
-        maxValue: 100,
-        valueMappings: [{ type: 1, value: '1', text: 'OK' }],
-        thresholds: [
-          {
-            color: 'green',
-            index: 0,
-            value: null,
-          },
-          {
-            color: 'orange',
-            index: 1,
-            value: 40,
-          },
-          {
-            color: 'red',
-            index: 2,
-            value: 80,
-          },
-        ],
-      },
-      title: 'Usage',
-      type: 'bargauge',
-    };
-
-    expect(sharedSingleStatMigrationCheck(panel as any)).toMatchSnapshot();
-  });
-});
@@ -3,7 +3,7 @@ import omit from 'lodash/omit';

 import { VizOrientation, PanelModel } from '../../types/panel';
 import { FieldDisplayOptions } from '../../utils/fieldDisplay';
-import { fieldReducers, Threshold, sortThresholds } from '@grafana/data';
+import { Field, getFieldReducers } from '@grafana/data';

 export interface SingleStatBaseOptions {
  fieldOptions: FieldDisplayOptions;
@@ -25,99 +25,40 @@ export const sharedSingleStatOptionsCheck = (
  return options;
 };

-export function sharedSingleStatMigrationCheck(panel: PanelModel<SingleStatBaseOptions>) {
+export const sharedSingleStatMigrationCheck = (panel: PanelModel<SingleStatBaseOptions>) => {
  if (!panel.options) {
    // This happens on the first load or when migrating from angular
    return {};
  }

-  const previousVersion = parseFloat(panel.pluginVersion || '6.1');
-  let options = panel.options as any;
+  // This migration aims to keep the most recent changes up-to-date
+  // Plugins should explicitly migrate for known version changes and only use this
+  // as a backup
+  const old = panel.options as any;
+  if (old.valueOptions) {
+    const { valueOptions } = old;

-  if (previousVersion < 6.2) {
-    options = migrateFromValueOptions(options);
-  }
+    const fieldOptions = (old.fieldOptions = {} as FieldDisplayOptions);
+    fieldOptions.mappings = old.valueMappings;
+    fieldOptions.thresholds = old.thresholds;

-  if (previousVersion < 6.3) {
-    options = moveThresholdsAndMappingsToField(options);
-  }
+    const field = (fieldOptions.defaults = {} as Field);
+    if (valueOptions) {
+      field.unit = valueOptions.unit;
+      field.decimals = valueOptions.decimals;

-  return options as SingleStatBaseOptions;
-}
-
-export function moveThresholdsAndMappingsToField(old: any) {
-  const { fieldOptions } = old;
-
-  if (!fieldOptions) {
-    return old;
-  }
-
-  const { mappings, thresholds, ...rest } = old.fieldOptions;
-
-  return {
-    ...old,
-    fieldOptions: {
-      ...rest,
-      defaults: {
-        ...fieldOptions.defaults,
-        mappings,
-        thresholds: migrateOldThresholds(thresholds),
-      },
-    },
-  };
-}
-
-/*
- * Moves valueMappings and thresholds from root to new fieldOptions object
- * Renames valueOptions to to defaults and moves it under fieldOptions
- */
-export function migrateFromValueOptions(old: any) {
-  const { valueOptions } = old;
-  if (!valueOptions) {
-    return old;
-  }
-
-  const fieldOptions: any = {};
-  const fieldDefaults: any = {};
-
-  fieldOptions.mappings = old.valueMappings;
-  fieldOptions.thresholds = old.thresholds;
-  fieldOptions.defaults = fieldDefaults;
-
-  fieldDefaults.unit = valueOptions.unit;
-  fieldDefaults.decimals = valueOptions.decimals;
-
-  // Make sure the stats have a valid name
-  if (valueOptions.stat) {
-    const reducer = fieldReducers.get(valueOptions.stat);
-    if (reducer) {
-      fieldOptions.calcs = [reducer.id];
+      // Make sure the stats have a valid name
+      if (valueOptions.stat) {
+        fieldOptions.calcs = getFieldReducers([valueOptions.stat]).map(s => s.id);
+      }
    }
+
+    field.min = old.minValue;
+    field.max = old.maxValue;
+
+    // remove old props
+    return omit(old, 'valueMappings', 'thresholds', 'valueOptions', 'minValue', 'maxValue');
  }

-  fieldDefaults.min = old.minValue;
-  fieldDefaults.max = old.maxValue;
-
-  const newOptions = {
-    ...old,
-    fieldOptions,
-  };
-
-  return omit(newOptions, 'valueMappings', 'thresholds', 'valueOptions', 'minValue', 'maxValue');
-}
-
-export function migrateOldThresholds(thresholds?: any[]): Threshold[] | undefined {
-  if (!thresholds || !thresholds.length) {
-    return undefined;
-  }
-  const copy = thresholds.map(t => {
-    return {
-      // Drops 'index'
-      value: t.value === null ? -Infinity : t.value,
-      color: t.color,
-    };
-  });
-  sortThresholds(copy);
-  copy[0].value = -Infinity;
-  return copy;
-}
+  return panel.options;
+};
@@ -1,38 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`sharedSingleStatMigrationCheck from old valueOptions model without pluginVersion 1`] = `
-Object {
-  "fieldOptions": Object {
-    "calcs": Array [
-      "last",
-    ],
-    "defaults": Object {
-      "decimals": 5,
-      "mappings": Array [
-        Object {
-          "text": "OK",
-          "type": 1,
-          "value": "1",
-        },
-      ],
-      "max": 100,
-      "min": 10,
-      "thresholds": Array [
-        Object {
-          "color": "green",
-          "value": -Infinity,
-        },
-        Object {
-          "color": "orange",
-          "value": 40,
-        },
-        Object {
-          "color": "red",
-          "value": 80,
-        },
-      ],
-      "unit": "watt",
-    },
-  },
-}
-`;
@@ -5,7 +5,8 @@ import difference from 'lodash/difference';

 import { Select } from '../index';

-import { fieldReducers, SelectableValue } from '@grafana/data';
+import { getFieldReducers } from '@grafana/data';
+import { SelectOptionItem } from '../Select/Select';

 interface Props {
  placeholder?: string;
@@ -33,7 +34,7 @@ export class StatsPicker extends PureComponent<Props> {
  checkInput = () => {
    const { stats, allowMultiple, defaultStat, onChange } = this.props;

-    const current = fieldReducers.list(stats);
+    const current = getFieldReducers(stats);
    if (current.length !== stats.length) {
      const found = current.map(v => v.id);
      const notFound = difference(stats, found);
@@ -53,7 +54,7 @@ export class StatsPicker extends PureComponent<Props> {
    }
  };

-  onSelectionChange = (item: SelectableValue<string>) => {
+  onSelectionChange = (item: SelectOptionItem<string>) => {
    const { onChange } = this.props;
    if (isArray(item)) {
      onChange(item.map(v => v.value));
@@ -64,16 +65,24 @@ export class StatsPicker extends PureComponent<Props> {

  render() {
    const { width, stats, allowMultiple, defaultStat, placeholder } = this.props;
+    const options = getFieldReducers().map(s => {
+      return {
+        value: s.id,
+        label: s.name,
+        description: s.description,
+      };
+    });
+
+    const value: Array<SelectOptionItem<string>> = options.filter(option => stats.find(stat => option.value === stat));

-    const select = fieldReducers.selectOptions(stats);
    return (
      <Select
        width={width}
-        value={select.current}
+        value={value}
        isClearable={!defaultStat}
        isMulti={allowMultiple}
        isSearchable={true}
-        options={select.options}
+        options={options}
        placeholder={placeholder}
        onChange={this.onSelectionChange}
      />
@@ -29,7 +29,7 @@ export class TableInputCSV extends React.PureComponent<Props, State> {
    };
  }

-  readCSV = debounce(() => {
+  readCSV: any = debounce(() => {
    const { config } = this.props;
    const { text } = this.state;

@@ -1,6 +1,6 @@
 import React, { ChangeEvent } from 'react';
 import { mount } from 'enzyme';
-import { ThresholdsEditor, Props, threshodsWithoutKey } from './ThresholdsEditor';
+import { ThresholdsEditor, Props } from './ThresholdsEditor';
 import { colors } from '../../utils';

 const setup = (propOverrides?: Partial<Props>) => {
@@ -20,10 +20,6 @@ const setup = (propOverrides?: Partial<Props>) => {
  };
 };

-function getCurrentThresholds(editor: ThresholdsEditor) {
-  return threshodsWithoutKey(editor.state.thresholds);
-}
-
 describe('Render', () => {
  it('should render with base threshold', () => {
    const { wrapper } = setup();
@@ -36,55 +32,60 @@ describe('Initialization', () => {
  it('should add a base threshold if missing', () => {
    const { instance } = setup();

-    expect(getCurrentThresholds(instance)).toEqual([{ value: -Infinity, color: colors[0] }]);
+    expect(instance.state.thresholds).toEqual([{ index: 0, value: -Infinity, color: colors[0] }]);
  });
 });

 describe('Add threshold', () => {
+  it('should not add threshold at index 0', () => {
+    const { instance } = setup();
+
+    instance.onAddThreshold(0);
+
+    expect(instance.state.thresholds).toEqual([{ index: 0, value: -Infinity, color: colors[0] }]);
+  });
+
  it('should add threshold', () => {
    const { instance } = setup();

-    instance.onAddThresholdAfter(instance.state.thresholds[0]);
+    instance.onAddThreshold(1);

-    expect(getCurrentThresholds(instance)).toEqual([
-      { value: -Infinity, color: colors[0] }, // 0
-      { value: 50, color: colors[2] }, // 1
+    expect(instance.state.thresholds).toEqual([
+      { index: 0, value: -Infinity, color: colors[0] },
+      { index: 1, value: 50, color: colors[2] },
    ]);
  });

  it('should add another threshold above a first', () => {
    const { instance } = setup({
-      thresholds: [
-        { value: -Infinity, color: colors[0] }, // 0
-        { value: 50, color: colors[2] }, // 1
-      ],
+      thresholds: [{ index: 0, value: -Infinity, color: colors[0] }, { index: 1, value: 50, color: colors[2] }],
    });

-    instance.onAddThresholdAfter(instance.state.thresholds[1]);
+    instance.onAddThreshold(2);

-    expect(getCurrentThresholds(instance)).toEqual([
-      { value: -Infinity, color: colors[0] }, // 0
-      { value: 50, color: colors[2] }, // 1
-      { value: 75, color: colors[3] }, // 2
+    expect(instance.state.thresholds).toEqual([
+      { index: 0, value: -Infinity, color: colors[0] },
+      { index: 1, value: 50, color: colors[2] },
+      { index: 2, value: 75, color: colors[3] },
    ]);
  });

  it('should add another threshold between first and second index', () => {
    const { instance } = setup({
      thresholds: [
-        { value: -Infinity, color: colors[0] },
-        { value: 50, color: colors[2] },
-        { value: 75, color: colors[3] },
+        { index: 0, value: -Infinity, color: colors[0] },
+        { index: 1, value: 50, color: colors[2] },
+        { index: 2, value: 75, color: colors[3] },
      ],
    });

-    instance.onAddThresholdAfter(instance.state.thresholds[1]);
+    instance.onAddThreshold(2);

-    expect(getCurrentThresholds(instance)).toEqual([
-      { value: -Infinity, color: colors[0] },
-      { value: 50, color: colors[2] },
-      { value: 62.5, color: colors[4] },
-      { value: 75, color: colors[3] },
+    expect(instance.state.thresholds).toEqual([
+      { index: 0, value: -Infinity, color: colors[0] },
+      { index: 1, value: 50, color: colors[2] },
+      { index: 2, value: 62.5, color: colors[4] },
+      { index: 3, value: 75, color: colors[3] },
    ]);
  });
 });
@@ -92,30 +93,30 @@ describe('Add threshold', () => {
 describe('Remove threshold', () => {
  it('should not remove threshold at index 0', () => {
    const thresholds = [
-      { value: -Infinity, color: '#7EB26D' },
-      { value: 50, color: '#EAB839' },
-      { value: 75, color: '#6ED0E0' },
+      { index: 0, value: -Infinity, color: '#7EB26D' },
+      { index: 1, value: 50, color: '#EAB839' },
+      { index: 2, value: 75, color: '#6ED0E0' },
    ];
    const { instance } = setup({ thresholds });

-    instance.onRemoveThreshold(instance.state.thresholds[0]);
+    instance.onRemoveThreshold(thresholds[0]);

-    expect(getCurrentThresholds(instance)).toEqual(thresholds);
+    expect(instance.state.thresholds).toEqual(thresholds);
  });

  it('should remove threshold', () => {
    const thresholds = [
-      { value: -Infinity, color: '#7EB26D' },
-      { value: 50, color: '#EAB839' },
-      { value: 75, color: '#6ED0E0' },
+      { index: 0, value: -Infinity, color: '#7EB26D' },
+      { index: 1, value: 50, color: '#EAB839' },
+      { index: 2, value: 75, color: '#6ED0E0' },
    ];
    const { instance } = setup({ thresholds });

-    instance.onRemoveThreshold(instance.state.thresholds[1]);
+    instance.onRemoveThreshold(thresholds[1]);

-    expect(getCurrentThresholds(instance)).toEqual([
-      { value: -Infinity, color: '#7EB26D' },
-      { value: 75, color: '#6ED0E0' },
+    expect(instance.state.thresholds).toEqual([
+      { index: 0, value: -Infinity, color: '#7EB26D' },
+      { index: 1, value: 75, color: '#6ED0E0' },
    ]);
  });
 });
@@ -123,25 +124,25 @@ describe('Remove threshold', () => {
 describe('change threshold value', () => {
  it('should not change threshold at index 0', () => {
    const thresholds = [
-      { value: -Infinity, color: '#7EB26D' },
-      { value: 50, color: '#EAB839' },
-      { value: 75, color: '#6ED0E0' },
+      { index: 0, value: -Infinity, color: '#7EB26D' },
+      { index: 1, value: 50, color: '#EAB839' },
+      { index: 2, value: 75, color: '#6ED0E0' },
    ];
    const { instance } = setup({ thresholds });

    const mockEvent = ({ target: { value: '12' } } as any) as ChangeEvent<HTMLInputElement>;

-    instance.onChangeThresholdValue(mockEvent, instance.state.thresholds[0]);
+    instance.onChangeThresholdValue(mockEvent, thresholds[0]);

-    expect(getCurrentThresholds(instance)).toEqual(thresholds);
+    expect(instance.state.thresholds).toEqual(thresholds);
  });

  it('should update value', () => {
    const { instance } = setup();
    const thresholds = [
-      { value: -Infinity, color: '#7EB26D', key: 1 },
-      { value: 50, color: '#EAB839', key: 2 },
-      { value: 75, color: '#6ED0E0', key: 3 },
+      { index: 0, value: -Infinity, color: '#7EB26D' },
+      { index: 1, value: 50, color: '#EAB839' },
+      { index: 2, value: 75, color: '#6ED0E0' },
    ];

    instance.state = {
@@ -152,10 +153,10 @@ describe('change threshold value', () => {

    instance.onChangeThresholdValue(mockEvent, thresholds[1]);

-    expect(getCurrentThresholds(instance)).toEqual([
-      { value: -Infinity, color: '#7EB26D' },
-      { value: 78, color: '#EAB839' },
-      { value: 75, color: '#6ED0E0' },
+    expect(instance.state.thresholds).toEqual([
+      { index: 0, value: -Infinity, color: '#7EB26D' },
+      { index: 1, value: 78, color: '#EAB839' },
+      { index: 2, value: 75, color: '#6ED0E0' },
    ]);
  });
 });
@@ -164,9 +165,9 @@ describe('on blur threshold value', () => {
  it('should resort rows and update indexes', () => {
    const { instance } = setup();
    const thresholds = [
-      { value: -Infinity, color: '#7EB26D', key: 1 },
-      { value: 78, color: '#EAB839', key: 2 },
-      { value: 75, color: '#6ED0E0', key: 3 },
+      { index: 0, value: -Infinity, color: '#7EB26D' },
+      { index: 1, value: 78, color: '#EAB839' },
+      { index: 2, value: 75, color: '#6ED0E0' },
    ];

    instance.setState({
@@ -175,10 +176,10 @@ describe('on blur threshold value', () => {

    instance.onBlur();

-    expect(getCurrentThresholds(instance)).toEqual([
-      { value: -Infinity, color: '#7EB26D' },
-      { value: 75, color: '#6ED0E0' },
-      { value: 78, color: '#EAB839' },
+    expect(instance.state.thresholds).toEqual([
+      { index: 0, value: -Infinity, color: '#7EB26D' },
+      { index: 1, value: 75, color: '#6ED0E0' },
+      { index: 2, value: 78, color: '#EAB839' },
    ]);
  });
 });
@@ -1,5 +1,5 @@
 import React, { PureComponent, ChangeEvent } from 'react';
-import { Threshold, sortThresholds } from '@grafana/data';
+import { Threshold } from '@grafana/data';
 import { colors } from '../../utils';
 import { ThemeContext } from '../../themes';
 import { getColorFromHexRgbOrName } from '../../utils';
@@ -13,121 +13,115 @@ export interface Props {
 }

 interface State {
-  thresholds: ThresholdWithKey[];
+  thresholds: Threshold[];
 }

-interface ThresholdWithKey extends Threshold {
-  key: number;
-}
-
-let counter = 100;
-
 export class ThresholdsEditor extends PureComponent<Props, State> {
  constructor(props: Props) {
    super(props);

-    const thresholds = props.thresholds
-      ? props.thresholds.map(t => {
-          return {
-            color: t.color,
-            value: t.value === null ? -Infinity : t.value,
-            key: counter++,
-          };
-        })
-      : ([] as ThresholdWithKey[]);
-
-    let needsCallback = false;
-    if (!thresholds.length) {
-      thresholds.push({ value: -Infinity, color: colors[0], key: counter++ });
-      needsCallback = true;
-    } else {
-      // First value is always base
-      thresholds[0].value = -Infinity;
-    }
-
-    // Update the state
+    const addDefaultThreshold = this.props.thresholds.length === 0;
+    const thresholds: Threshold[] = addDefaultThreshold
+      ? [{ index: 0, value: -Infinity, color: colors[0] }]
+      : props.thresholds;
    this.state = { thresholds };

-    if (needsCallback) {
+    if (addDefaultThreshold) {
      this.onChange();
    }
  }

-  onAddThresholdAfter = (threshold: ThresholdWithKey) => {
+  onAddThreshold = (index: number) => {
    const { thresholds } = this.state;
-
    const maxValue = 100;
    const minValue = 0;

-    let prev: ThresholdWithKey | undefined = undefined;
-    let next: ThresholdWithKey | undefined = undefined;
-    for (const t of thresholds) {
-      if (prev && prev.key === threshold.key) {
-        next = t;
-        break;
+    if (index === 0) {
+      return;
+    }
+
+    const newThresholds = thresholds.map(threshold => {
+      if (threshold.index >= index) {
+        const index = threshold.index + 1;
+        threshold = { ...threshold, index };
      }
-      prev = t;
-    }
+      return threshold;
+    });

-    const prevValue = prev && isFinite(prev.value) ? prev.value : minValue;
-    const nextValue = next && isFinite(next.value) ? next.value : maxValue;
+    // Setting value to a value between the previous thresholds
+    const beforeThreshold = newThresholds.filter(t => t.index === index - 1 && t.index !== 0)[0];
+    const afterThreshold = newThresholds.filter(t => t.index === index + 1 && t.index !== 0)[0];
+    const beforeThresholdValue = beforeThreshold !== undefined ? beforeThreshold.value : minValue;
+    const afterThresholdValue = afterThreshold !== undefined ? afterThreshold.value : maxValue;
+    const value = afterThresholdValue - (afterThresholdValue - beforeThresholdValue) / 2;

-    const color = colors.filter(c => !thresholds.some(t => t.color === c))[1];
-    const add = {
-      value: prevValue + (nextValue - prevValue) / 2.0,
-      color: color,
-      key: counter++,
-    };
-    const newThresholds = [...thresholds, add];
-    sortThresholds(newThresholds);
+    // Set a color
+    const color = colors.filter(c => !newThresholds.some(t => t.color === c))[1];

    this.setState(
      {
-        thresholds: newThresholds,
+        thresholds: this.sortThresholds([
+          ...newThresholds,
+          {
+            color,
+            index,
+            value: value as number,
+          },
+        ]),
      },
      () => this.onChange()
    );
  };

-  onRemoveThreshold = (threshold: ThresholdWithKey) => {
+  onRemoveThreshold = (threshold: Threshold) => {
+    if (threshold.index === 0) {
+      return;
+    }
+
+    this.setState(
+      prevState => {
+        const newThresholds = prevState.thresholds.map(t => {
+          if (t.index > threshold.index) {
+            const index = t.index - 1;
+            t = { ...t, index };
+          }
+          return t;
+        });
+
+        return {
+          thresholds: newThresholds.filter(t => t !== threshold),
+        };
+      },
+      () => this.onChange()
+    );
+  };
+
+  onChangeThresholdValue = (event: ChangeEvent<HTMLInputElement>, threshold: Threshold) => {
+    if (threshold.index === 0) {
+      return;
+    }
+
    const { thresholds } = this.state;
-    if (!thresholds.length) {
-      return;
-    }
-    // Don't remove index 0
-    if (threshold.key === thresholds[0].key) {
-      return;
-    }
-    this.setState(
-      {
-        thresholds: thresholds.filter(t => t.key !== threshold.key),
-      },
-      () => this.onChange()
-    );
-  };
-
-  onChangeThresholdValue = (event: ChangeEvent<HTMLInputElement>, threshold: ThresholdWithKey) => {
    const cleanValue = event.target.value.replace(/,/g, '.');
    const parsedValue = parseFloat(cleanValue);
    const value = isNaN(parsedValue) ? '' : parsedValue;

-    const thresholds = this.state.thresholds.map(t => {
-      if (t.key === threshold.key) {
+    const newThresholds = thresholds.map(t => {
+      if (t === threshold && t.index !== 0) {
        t = { ...t, value: value as number };
      }
+
      return t;
    });
-    if (thresholds.length) {
-      thresholds[0].value = -Infinity;
-    }
-    this.setState({ thresholds });
+
+    this.setState({ thresholds: newThresholds });
  };

-  onChangeThresholdColor = (threshold: ThresholdWithKey, color: string) => {
+  onChangeThresholdColor = (threshold: Threshold, color: string) => {
    const { thresholds } = this.state;

    const newThresholds = thresholds.map(t => {
-      if (t.key === threshold.key) {
+      if (t === threshold) {
        t = { ...t, color: color };
      }

@@ -143,22 +137,30 @@ export class ThresholdsEditor extends PureComponent<Props, State> {
  };

  onBlur = () => {
-    const thresholds = [...this.state.thresholds];
-    sortThresholds(thresholds);
-    this.setState(
-      {
-        thresholds,
-      },
-      () => this.onChange()
-    );
+    this.setState(prevState => {
+      const sortThresholds = this.sortThresholds([...prevState.thresholds]);
+      let index = 0;
+      sortThresholds.forEach(t => {
+        t.index = index++;
+      });
+
+      return { thresholds: sortThresholds };
+    });
+
+    this.onChange();
  };

  onChange = () => {
-    const { thresholds } = this.state;
-    this.props.onChange(threshodsWithoutKey(thresholds));
+    this.props.onChange(this.state.thresholds);
  };

-  renderInput = (threshold: ThresholdWithKey) => {
+  sortThresholds = (thresholds: Threshold[]) => {
+    return thresholds.sort((t1, t2) => {
+      return t1.value - t2.value;
+    });
+  };
+
+  renderInput = (threshold: Threshold) => {
    return (
      <div className="thresholds-row-input-inner">
        <span className="thresholds-row-input-inner-arrow" />
@@ -173,11 +175,12 @@ export class ThresholdsEditor extends PureComponent<Props, State> {
            </div>
          )}
        </div>
-        {!isFinite(threshold.value) ? (
+        {threshold.index === 0 && (
          <div className="thresholds-row-input-inner-value">
            <Input type="text" value="Base" readOnly />
          </div>
-        ) : (
+        )}
+        {threshold.index > 0 && (
          <>
            <div className="thresholds-row-input-inner-value">
              <Input
@@ -186,6 +189,7 @@ export class ThresholdsEditor extends PureComponent<Props, State> {
                onChange={(event: ChangeEvent<HTMLInputElement>) => this.onChangeThresholdValue(event, threshold)}
                value={threshold.value}
                onBlur={this.onBlur}
+                readOnly={threshold.index === 0}
              />
            </div>
            <div className="thresholds-row-input-inner-remove" onClick={() => this.onRemoveThreshold(threshold)}>
@@ -208,10 +212,13 @@ export class ThresholdsEditor extends PureComponent<Props, State> {
                {thresholds
                  .slice(0)
                  .reverse()
-                  .map(threshold => {
+                  .map((threshold, index) => {
                    return (
-                      <div className="thresholds-row" key={`${threshold.key}`}>
-                        <div className="thresholds-row-add-button" onClick={() => this.onAddThresholdAfter(threshold)}>
+                      <div className="thresholds-row" key={`${threshold.index}-${index}`}>
+                        <div
+                          className="thresholds-row-add-button"
+                          onClick={() => this.onAddThreshold(threshold.index + 1)}
+                        >
                          <i className="fa fa-plus" />
                        </div>
                        <div
@@ -230,10 +237,3 @@ export class ThresholdsEditor extends PureComponent<Props, State> {
    );
  }
 }
-
-export function threshodsWithoutKey(thresholds: ThresholdWithKey[]): Threshold[] {
-  return thresholds.map(t => {
-    const { key, ...rest } = t;
-    return rest; // everything except key
-  });
-}
@@ -9,6 +9,7 @@ exports[`Render should render with base threshold 1`] = `
          Array [
            Object {
              "color": "#7EB26D",
+              "index": 0,
              "value": -Infinity,
            },
          ],
@@ -47,7 +48,7 @@ exports[`Render should render with base threshold 1`] = `
        >
          <div
            className="thresholds-row"
-            key="100"
+            key="0-0"
          >
            <div
              className="thresholds-row-add-button"
@@ -8,13 +8,13 @@ import { TimePickerPopover } from './TimePickerPopover';
 import { ClickOutsideWrapper } from '../ClickOutsideWrapper/ClickOutsideWrapper';

 // Utils & Services
-import { isDateTime, DateTime } from '@grafana/data';
+import { isDateTime } from '@grafana/data';
 import { rangeUtil } from '@grafana/data';
 import { rawToTimeRange } from './time';

 // Types
-import { TimeRange, TimeOption, TimeZone, TIME_FORMAT, SelectableValue } from '@grafana/data';
-import { isMathString } from '@grafana/data/src/utils/datemath';
+import { TimeRange, TimeOption, TimeZone, TIME_FORMAT } from '@grafana/data';
+import { SelectOptionItem } from '../Select/Select';

 export interface Props {
  value: TimeRange;
@@ -77,7 +77,7 @@ export class TimePicker extends PureComponent<Props, State> {
    isCustomOpen: false,
  };

-  mapTimeOptionsToSelectableValues = (selectOptions: TimeOption[]) => {
+  mapTimeOptionsToSelectOptionItems = (selectOptions: TimeOption[]) => {
    const options = selectOptions.map(timeOption => {
      return {
        label: timeOption.display,
@@ -93,7 +93,7 @@ export class TimePicker extends PureComponent<Props, State> {
    return options;
  };

-  onSelectChanged = (item: SelectableValue<TimeOption>) => {
+  onSelectChanged = (item: SelectOptionItem<TimeOption>) => {
    const { onChange, timeZone } = this.props;

    if (item.value && item.value.from === 'custom') {
@@ -122,23 +122,15 @@ export class TimePicker extends PureComponent<Props, State> {
  render() {
    const { selectOptions: selectTimeOptions, value, onMoveBackward, onMoveForward, onZoom, timeZone } = this.props;
    const { isCustomOpen } = this.state;
-    const options = this.mapTimeOptionsToSelectableValues(selectTimeOptions);
+    const options = this.mapTimeOptionsToSelectOptionItems(selectTimeOptions);
    const currentOption = options.find(item => isTimeOptionEqualToTimeRange(item.value, value));
-
-    const isUTC = timeZone === 'utc';
-
-    const adjustedTime = (time: DateTime) => (isUTC ? time.utc() : time.local()) || null;
-    const adjustedTimeRange = {
-      to: isMathString(value.raw.to) ? value.raw.to : adjustedTime(value.to),
-      from: isMathString(value.raw.from) ? value.raw.from : adjustedTime(value.from),
-    };
-    const rangeString = rangeUtil.describeTimeRange(adjustedTimeRange);
+    const rangeString = rangeUtil.describeTimeRange(value.raw);

    const label = (
      <>
        {isCustomOpen && <span>Custom time range</span>}
        {!isCustomOpen && <span>{rangeString}</span>}
-        {isUTC && <span className="time-picker-utc">UTC</span>}
+        {timeZone === 'utc' && <span className="time-picker-utc">UTC</span>}
      </>
    );
    const isAbsolute = isDateTime(value.raw.to);
@@ -156,7 +148,6 @@ export class TimePicker extends PureComponent<Props, State> {
            value={currentOption}
            label={label}
            options={options}
-            maxMenuHeight={600}
            onChange={this.onSelectChanged}
            iconClass={'fa fa-clock-o fa-fw'}
            tooltipContent={<TimePickerTooltipContent timeRange={value} />}
@@ -18,6 +18,7 @@

 .time-picker-popover {
  display: flex;
+  flex-flow: row nowrap;
  justify-content: space-around;
  border: 1px solid $popover-border-color;
  border-radius: $border-radius;
@@ -30,41 +31,41 @@
  max-width: 600px;
  top: 41px;
  right: 0px;
-}

-.time-picker-popover-body {
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: space-around;
-  padding: $space-md;
-  padding-bottom: 0;
-}
-
-.time-picker-popover-title {
-  font-size: $font-size-md;
-  font-weight: $font-weight-semi-bold;
-}
-
-.time-picker-popover-body-custom-ranges:first-child {
-  margin-right: $space-md;
-}
-
-.time-picker-popover-body-custom-ranges-input {
-  display: flex;
-  flex-flow: row nowrap;
-  align-items: center;
-  margin-bottom: $space-sm;
-
-  .time-picker-input-error {
-    box-shadow: inset 0 0px 5px $red;
+  .time-picker-popover-body {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-around;
+    padding: $space-md;
+    padding-bottom: 0;
  }
-}

-.time-picker-popover-footer {
-  display: flex;
-  flex-flow: row nowrap;
-  justify-content: center;
-  padding: $space-md;
+  .time-picker-popover-title {
+    font-size: $font-size-md;
+    font-weight: $font-weight-semi-bold;
+  }
+
+  .time-picker-popover-body-custom-ranges:first-child {
+    margin-right: $space-md;
+  }
+
+  .time-picker-popover-body-custom-ranges-input {
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
+    margin-bottom: $space-sm;
+
+    .time-picker-input-error {
+      box-shadow: inset 0 0px 5px $red;
+    }
+  }
+
+  .time-picker-popover-footer {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: center;
+    padding: $space-md;
+  }
 }

 .time-picker-popover-header {
@@ -1,6 +1,6 @@
 export { DeleteButton } from './DeleteButton/DeleteButton';
 export { Tooltip } from './Tooltip/Tooltip';
-export { PopperController, PopperContent } from './Tooltip/PopperController';
+export { PopperController } from './Tooltip/PopperController';
 export { Popper } from './Tooltip/Popper';
 export { Portal } from './Portal/Portal';
 export { CustomScrollbar } from './CustomScrollbar/CustomScrollbar';
@@ -9,7 +9,7 @@ export * from './Button/Button';
 export { ButtonVariant } from './Button/AbstractButton';

 // Select
-export { Select, AsyncSelect } from './Select/Select';
+export { Select, AsyncSelect, SelectOptionItem } from './Select/Select';
 export { IndicatorsContainer } from './Select/IndicatorsContainer';
 export { NoOptionsMessage } from './Select/NoOptionsMessage';
 export { default as resetSelectStyles } from './Select/resetSelectStyles';
@@ -77,13 +77,6 @@ interface PluginMetaInfoLink {
  url: string;
 }

-export interface PluginBuildInfo {
-  time?: number;
-  repo?: string;
-  branch?: string;
-  hash?: string;
-}
-
 export interface PluginMetaInfo {
  author: {
    name: string;
@@ -95,7 +88,6 @@ export interface PluginMetaInfo {
    large: string;
    small: string;
  };
-  build?: PluginBuildInfo;
  screenshots: any[];
  updated: string;
  version: string;
@@ -1,7 +1,4 @@
-export const deprecationWarning = (file: string, oldName: string, newName?: string) => {
-  let message = `[Deprecation warning] ${file}: ${oldName} is deprecated`;
-  if (newName) {
-    message += `.  Use ${newName} instead`;
-  }
+export const deprecationWarning = (file: string, oldName: string, newName: string) => {
+  const message = `[Deprecation warning] ${file}: ${oldName} is deprecated. Use ${newName} instead`;
  console.warn(message);
 };
@@ -103,7 +103,7 @@ describe('Format value', () => {
  it('should return if value isNaN', () => {
    const valueMappings: ValueMapping[] = [];
    const value = 'N/A';
-    const instance = getDisplayProcessor({ field: { mappings: valueMappings } });
+    const instance = getDisplayProcessor({ mappings: valueMappings });

    const result = instance(value);

@@ -114,7 +114,7 @@ describe('Format value', () => {
    const valueMappings: ValueMapping[] = [];
    const value = '6';

-    const instance = getDisplayProcessor({ field: { decimals: 1, mappings: valueMappings } });
+    const instance = getDisplayProcessor({ mappings: valueMappings, field: { decimals: 1 } });

    const result = instance(value);

@@ -127,7 +127,7 @@ describe('Format value', () => {
      { id: 1, operator: '', text: '1-9', type: MappingType.RangeToText, from: '1', to: '9' },
    ];
    const value = '10';
-    const instance = getDisplayProcessor({ field: { decimals: 1, mappings: valueMappings } });
+    const instance = getDisplayProcessor({ mappings: valueMappings, field: { decimals: 1 } });

    const result = instance(value);

@@ -160,7 +160,7 @@ describe('Format value', () => {
      { id: 1, operator: '', text: 'elva', type: MappingType.ValueToText, value: '11' },
    ];
    const value = '11';
-    const instance = getDisplayProcessor({ field: { decimals: 1, mappings: valueMappings } });
+    const instance = getDisplayProcessor({ mappings: valueMappings, field: { decimals: 1 } });

    expect(instance(value).text).toEqual('1-20');
  });
@@ -7,13 +7,16 @@ import { getColorFromHexRgbOrName } from './namedColorsPalette';

 // Types
 import { DecimalInfo, DisplayValue, GrafanaTheme, GrafanaThemeType, DecimalCount } from '../types';
-import { DateTime, dateTime, Threshold, getMappedValue, Field } from '@grafana/data';
+import { DateTime, dateTime, Threshold, ValueMapping, getMappedValue, Field } from '@grafana/data';

 export type DisplayProcessor = (value: any) => DisplayValue;

 export interface DisplayValueOptions {
  field?: Partial<Field>;

+  mappings?: ValueMapping[];
+  thresholds?: Threshold[];
+
  // Alternative to empty string
  noValue?: string;

@@ -28,8 +31,7 @@ export function getDisplayProcessor(options?: DisplayValueOptions): DisplayProce
    const formatFunc = getValueFormat(field.unit || 'none');

    return (value: any) => {
-      const { theme } = options;
-      const { mappings, thresholds } = field;
+      const { mappings, thresholds, theme } = options;
      let color;

      let text = _.toString(value);
@@ -1,5 +1,5 @@
 import { getFieldProperties, getFieldDisplayValues, GetFieldDisplayValuesOptions } from './fieldDisplay';
-import { FieldType, ReducerID, Threshold } from '@grafana/data';
+import { FieldType, ReducerID } from '@grafana/data';
 import { GrafanaThemeType } from '../types/theme';
 import { getTheme } from '../themes/index';

@@ -55,6 +55,8 @@ describe('FieldDisplay', () => {
    },
    fieldOptions: {
      calcs: [],
+      mappings: [],
+      thresholds: [],
      override: {},
      defaults: {},
    },
@@ -66,6 +68,8 @@ describe('FieldDisplay', () => {
      ...options,
      fieldOptions: {
        calcs: [ReducerID.first],
+        mappings: [],
+        thresholds: [],
        override: {},
        defaults: {
          title: '$__cell_0 * $__field_name * $__series_name',
@@ -84,6 +88,8 @@ describe('FieldDisplay', () => {
      ...options,
      fieldOptions: {
        calcs: [ReducerID.last],
+        mappings: [],
+        thresholds: [],
        override: {},
        defaults: {},
      },
@@ -98,6 +104,8 @@ describe('FieldDisplay', () => {
        values: true, //
        limit: 1000,
        calcs: [],
+        mappings: [],
+        thresholds: [],
        override: {},
        defaults: {},
      },
@@ -112,53 +120,12 @@ describe('FieldDisplay', () => {
        values: true, //
        limit: 2,
        calcs: [],
+        mappings: [],
+        thresholds: [],
        override: {},
        defaults: {},
      },
    });
    expect(display.map(v => v.display.numeric)).toEqual([1, 3]); // First 2 are from the first field
  });
-
-  it('should restore -Infinity value for base threshold', () => {
-    const field = getFieldProperties({
-      thresholds: [
-        ({
-          color: '#73BF69',
-          value: null,
-        } as unknown) as Threshold,
-        {
-          color: '#F2495C',
-          value: 50,
-        },
-      ],
-    });
-    expect(field.thresholds!.length).toEqual(2);
-    expect(field.thresholds![0].value).toBe(-Infinity);
-  });
-
-  it('Should return field thresholds when there is no data', () => {
-    const options: GetFieldDisplayValuesOptions = {
-      data: [
-        {
-          name: 'No data',
-          fields: [],
-          rows: [],
-        },
-      ],
-      replaceVariables: (value: string) => {
-        return value;
-      },
-      fieldOptions: {
-        calcs: [],
-        override: {},
-        defaults: {
-          thresholds: [{ color: '#F2495C', value: 50 }],
-        },
-      },
-      theme: getTheme(GrafanaThemeType.Dark),
-    };
-
-    const display = getFieldDisplayValues(options);
-    expect(display[0].field.thresholds!.length).toEqual(1);
-  });
 });
@@ -4,7 +4,16 @@ import toString from 'lodash/toString';
 import { DisplayValue, GrafanaTheme, InterpolateFunction, ScopedVars, GraphSeriesValue } from '../types/index';
 import { getDisplayProcessor } from './displayValue';
 import { getFlotPairs } from './flotPairs';
-import { ReducerID, reduceField, FieldType, NullValueMode, DataFrame, Field } from '@grafana/data';
+import {
+  ValueMapping,
+  Threshold,
+  ReducerID,
+  reduceField,
+  FieldType,
+  NullValueMode,
+  DataFrame,
+  Field,
+} from '@grafana/data';

 export interface FieldDisplayOptions {
  values?: boolean; // If true show each row value
@@ -13,6 +22,10 @@ export interface FieldDisplayOptions {

  defaults: Partial<Field>; // Use these values unless otherwise stated
  override: Partial<Field>; // Set these values regardless of the source
+
+  // Could these be data driven also?
+  thresholds: Threshold[];
+  mappings: ValueMapping[];
 }

 export const VAR_SERIES_NAME = '__series_name';
@@ -114,6 +127,8 @@ export const getFieldDisplayValues = (options: GetFieldDisplayValuesOptions): Fi

        const display = getDisplayProcessor({
          field,
+          mappings: fieldOptions.mappings,
+          thresholds: fieldOptions.thresholds,
          theme: options.theme,
        });

@@ -182,10 +197,7 @@ export const getFieldDisplayValues = (options: GetFieldDisplayValuesOptions): Fi

  if (values.length === 0) {
    values.push({
-      field: {
-        ...defaults,
-        name: 'No Data',
-      },
+      field: { name: 'No Data' },
      display: {
        numeric: 0,
        text: 'No data',
@@ -247,16 +259,10 @@ type PartialField = Partial<Field>;

 export function getFieldProperties(...props: PartialField[]): Field {
  let field = props[0] as Field;
-
  for (let i = 1; i < props.length; i++) {
    field = applyFieldProperties(field, props[i]);
  }

-  // First value is always -Infinity
-  if (field.thresholds && field.thresholds.length) {
-    field.thresholds[0].value = -Infinity;
-  }
-
  // Verify that max > min
  if (field.hasOwnProperty('min') && field.hasOwnProperty('max') && field.min! > field.max!) {
    return {
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=ubuntu:18.04
+ARG BASE_IMAGE=ubuntu:latest
 FROM ${BASE_IMAGE}

 ARG GRAFANA_TGZ="grafana-latest.linux-x64.tar.gz"
@@ -12,7 +12,7 @@ COPY ${GRAFANA_TGZ} /tmp/grafana.tar.gz
 # Change to tar xfzv to make tar print every file it extracts
 RUN mkdir /tmp/grafana && tar xfz /tmp/grafana.tar.gz --strip-components=1 -C /tmp/grafana

-ARG BASE_IMAGE=ubuntu:18.04
+ARG BASE_IMAGE=ubuntu:latest
 FROM ${BASE_IMAGE}

 ARG GF_UID="472"
@@ -59,16 +59,14 @@ docker_tag_all () {
 	fi
 }

-docker_build "ubuntu:18.04" "grafana-latest.linux-x64.tar.gz" "${_docker_repo}:${_grafana_version}"
+docker_build "ubuntu:latest" "grafana-latest.linux-x64.tar.gz" "${_docker_repo}:${_grafana_version}"
 if [ $BUILD_FAST = "0" ]; then
-	docker_build "arm32v7/ubuntu:18.04" "grafana-latest.linux-armv7.tar.gz" "${_docker_repo}-arm32v7-linux:${_grafana_version}"
-	docker_build "arm64v8/ubuntu:18.04" "grafana-latest.linux-arm64.tar.gz" "${_docker_repo}-arm64v8-linux:${_grafana_version}"
+	docker_build "arm32v7/ubuntu:latest" "grafana-latest.linux-armv7.tar.gz" "${_docker_repo}-arm32v7-linux:${_grafana_version}"
+	docker_build "arm64v8/ubuntu:latest" "grafana-latest.linux-arm64.tar.gz" "${_docker_repo}-arm64v8-linux:${_grafana_version}"
 fi
 # Tag as 'latest' for official release; otherwise tag as grafana/grafana:master
 if echo "$_grafana_tag" | grep -q "^v"; then
 	docker_tag_all "${_docker_repo}" "latest"
-	# Create the expected tag for running the end to end tests successfully
-	docker tag "${_docker_repo}:${_grafana_version}" "grafana/grafana-dev:${_grafana_tag}"
 else
 	docker_tag_all "${_docker_repo}" "master"
 	docker tag "${_docker_repo}:${_grafana_version}" "grafana/grafana-dev:${_grafana_version}"
@@ -38,14 +38,8 @@ if echo "$_grafana_tag" | grep -q "^v" && echo "$_grafana_tag" | grep -vq "beta"
 	echo "pushing ${_docker_repo}:latest"
 	docker_push_all "${_docker_repo}" "latest"
 	docker_push_all "${_docker_repo}" "${_grafana_version}"
-	# Push to the grafana-dev repository with the expected tag
-	# for running the end to end tests successfully
-	docker push "grafana/grafana-dev:${_grafana_tag}"
 elif echo "$_grafana_tag" | grep -q "^v" && echo "$_grafana_tag" | grep -q "beta"; then
 	docker_push_all "${_docker_repo}" "${_grafana_version}"
-	# Push to the grafana-dev repository with the expected tag
-	# for running the end to end tests successfully
-	docker push "grafana/grafana-dev:${_grafana_tag}"
 elif echo "$_grafana_tag" | grep -q "master"; then
 	docker_push_all "${_docker_repo}" "master"
 	docker push "grafana/grafana-dev:${_grafana_version}"
@@ -34,7 +34,7 @@ func AdminCreateUser(c *models.ReqContext, form dtos.AdminCreateUserForm) {
 		return
 	}

-	metrics.MApiAdminUserCreate.Inc()
+	metrics.M_Api_Admin_User_Create.Inc()

 	user := cmd.Result

@@ -68,7 +68,10 @@ func (hs *HTTPServer) AddAPIKey(c *models.ReqContext, cmd models.AddApiKeyComman
 		if err == models.ErrInvalidApiKeyExpiration {
 			return Error(400, err.Error(), nil)
 		}
-		return Error(500, "Failed to add API key", err)
+		if err == models.ErrDuplicateApiKey {
+			return Error(409, err.Error(), nil)
+		}
+		return Error(500, "Failed to add API Key", err)
 	}

 	result := &dtos.NewApiKeyResult{
@@ -133,7 +133,7 @@ func (hs *HTTPServer) GetDashboard(c *m.ReqContext) Response {
 		Meta:      meta,
 	}

-	c.TimeRequest(metrics.MApiDashboardGet)
+	c.TimeRequest(metrics.M_Api_Dashboard_Get)
 	return JSON(200, dto)
 }

@@ -282,7 +282,7 @@ func (hs *HTTPServer) PostDashboard(c *m.ReqContext, cmd m.SaveDashboardCommand)
 		}
 	}

-	c.TimeRequest(metrics.MApiDashboardSave)
+	c.TimeRequest(metrics.M_Api_Dashboard_Save)
 	return JSON(200, util.DynMap{
 		"status":  "success",
 		"slug":    dashboard.Slug,
@@ -97,7 +97,7 @@ func CreateDashboardSnapshot(c *m.ReqContext, cmd m.CreateDashboardSnapshotComma
 		cmd.ExternalDeleteUrl = response.DeleteUrl
 		cmd.Dashboard = simplejson.New()

-		metrics.MApiDashboardSnapshotExternal.Inc()
+		metrics.M_Api_Dashboard_Snapshot_External.Inc()
 	} else {
 		if cmd.Key == "" {
 			cmd.Key = util.GetRandomString(32)
@@ -109,7 +109,7 @@ func CreateDashboardSnapshot(c *m.ReqContext, cmd m.CreateDashboardSnapshotComma

 		url = setting.ToAbsUrl("dashboard/snapshot/" + cmd.Key)

-		metrics.MApiDashboardSnapshotCreate.Inc()
+		metrics.M_Api_Dashboard_Snapshot_Create.Inc()
 	}

 	if err := bus.Dispatch(&cmd); err != nil {
@@ -154,7 +154,7 @@ func GetDashboardSnapshot(c *m.ReqContext) {
 		},
 	}

-	metrics.MApiDashboardSnapshotGet.Inc()
+	metrics.M_Api_Dashboard_Snapshot_Get.Inc()

 	c.Resp.Header().Set("Cache-Control", "public, max-age=3600")
 	c.JSON(200, dto)
@@ -8,7 +8,7 @@ import (
 )

 func (hs *HTTPServer) ProxyDataSourceRequest(c *m.ReqContext) {
-	c.TimeRequest(metrics.MDataSourceProxyReqTimer)
+	c.TimeRequest(metrics.M_DataSource_ProxyReq_Timer)

 	dsId := c.ParamsInt64(":id")
 	ds, err := hs.DatasourceCache.GetDatasource(dsId, c.SignedInUser, c.SkipCache)
@@ -269,8 +269,7 @@ func (hs *HTTPServer) metricsEndpoint(ctx *macaron.Context) {
 		return
 	}

-	promhttp.
-		HandlerFor(prometheus.DefaultGatherer, promhttp.HandlerOpts{}).
+	promhttp.HandlerFor(prometheus.DefaultGatherer, promhttp.HandlerOpts{}).
 		ServeHTTP(ctx.Resp, ctx.Req.Request)
 }

@@ -242,69 +242,74 @@ func (hs *HTTPServer) setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, er
 		}
 	}

-	configNodes := []*dtos.NavLink{}
+	if c.IsGrafanaAdmin || c.OrgRole == m.ROLE_ADMIN {
+		cfgNode := &dtos.NavLink{
+			Id:       "cfg",
+			Text:     "Configuration",
+			SubTitle: "Organization: " + c.OrgName,
+			Icon:     "gicon gicon-cog",
+			Url:      setting.AppSubUrl + "/datasources",
+			Children: []*dtos.NavLink{
+				{
+					Text:        "Data Sources",
+					Icon:        "gicon gicon-datasources",
+					Description: "Add and configure data sources",
+					Id:          "datasources",
+					Url:         setting.AppSubUrl + "/datasources",
+				},
+				{
+					Text:        "Users",
+					Id:          "users",
+					Description: "Manage org members",
+					Icon:        "gicon gicon-user",
+					Url:         setting.AppSubUrl + "/org/users",
+				},
+				{
+					Text:        "Teams",
+					Id:          "teams",
+					Description: "Manage org groups",
+					Icon:        "gicon gicon-team",
+					Url:         setting.AppSubUrl + "/org/teams",
+				},
+				{
+					Text:        "Plugins",
+					Id:          "plugins",
+					Description: "View and configure plugins",
+					Icon:        "gicon gicon-plugins",
+					Url:         setting.AppSubUrl + "/plugins",
+				},
+				{
+					Text:        "Preferences",
+					Id:          "org-settings",
+					Description: "Organization preferences",
+					Icon:        "gicon gicon-preferences",
+					Url:         setting.AppSubUrl + "/org",
+				},

-	if c.OrgRole == m.ROLE_ADMIN {
-		configNodes = append(configNodes, &dtos.NavLink{
-			Text:        "Data Sources",
-			Icon:        "gicon gicon-datasources",
-			Description: "Add and configure data sources",
-			Id:          "datasources",
-			Url:         setting.AppSubUrl + "/datasources",
-		})
-		configNodes = append(configNodes, &dtos.NavLink{
-			Text:        "Users",
-			Id:          "users",
-			Description: "Manage org members",
-			Icon:        "gicon gicon-user",
-			Url:         setting.AppSubUrl + "/org/users",
-		})
+				{
+					Text:        "API Keys",
+					Id:          "apikeys",
+					Description: "Create & manage API keys",
+					Icon:        "gicon gicon-apikeys",
+					Url:         setting.AppSubUrl + "/org/apikeys",
+				},
+			},
+		}
+
+		if c.OrgRole != m.ROLE_ADMIN {
+			cfgNode = &dtos.NavLink{
+				Id:       "cfg",
+				Text:     "Configuration",
+				SubTitle: "Organization: " + c.OrgName,
+				Icon:     "gicon gicon-cog",
+				Url:      setting.AppSubUrl + "/admin/users",
+				Children: make([]*dtos.NavLink, 0),
+			}
+		}
+
+		data.NavTree = append(data.NavTree, cfgNode)
 	}

-	if c.OrgRole == m.ROLE_ADMIN || hs.Cfg.EditorsCanAdmin {
-		configNodes = append(configNodes, &dtos.NavLink{
-			Text:        "Teams",
-			Id:          "teams",
-			Description: "Manage org groups",
-			Icon:        "gicon gicon-team",
-			Url:         setting.AppSubUrl + "/org/teams",
-		})
-	}
-
-	configNodes = append(configNodes, &dtos.NavLink{
-		Text:        "Plugins",
-		Id:          "plugins",
-		Description: "View and configure plugins",
-		Icon:        "gicon gicon-plugins",
-		Url:         setting.AppSubUrl + "/plugins",
-	})
-
-	if c.OrgRole == m.ROLE_ADMIN {
-		configNodes = append(configNodes, &dtos.NavLink{
-			Text:        "Preferences",
-			Id:          "org-settings",
-			Description: "Organization preferences",
-			Icon:        "gicon gicon-preferences",
-			Url:         setting.AppSubUrl + "/org",
-		})
-		configNodes = append(configNodes, &dtos.NavLink{
-			Text:        "API Keys",
-			Id:          "apikeys",
-			Description: "Create & manage API keys",
-			Icon:        "gicon gicon-apikeys",
-			Url:         setting.AppSubUrl + "/org/apikeys",
-		})
-	}
-
-	data.NavTree = append(data.NavTree, &dtos.NavLink{
-		Id:       "cfg",
-		Text:     "Configuration",
-		SubTitle: "Organization: " + c.OrgName,
-		Icon:     "gicon gicon-cog",
-		Url:      configNodes[0].Url,
-		Children: configNodes,
-	})
-
 	if c.IsGrafanaAdmin {
 		data.NavTree = append(data.NavTree, &dtos.NavLink{
 			Text:         "Server Admin",
@@ -322,6 +327,27 @@ func (hs *HTTPServer) setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, er
 		})
 	}

+	if (c.OrgRole == m.ROLE_EDITOR || c.OrgRole == m.ROLE_VIEWER) && hs.Cfg.EditorsCanAdmin {
+		cfgNode := &dtos.NavLink{
+			Id:       "cfg",
+			Text:     "Configuration",
+			SubTitle: "Organization: " + c.OrgName,
+			Icon:     "gicon gicon-cog",
+			Url:      setting.AppSubUrl + "/org/teams",
+			Children: []*dtos.NavLink{
+				{
+					Text:        "Teams",
+					Id:          "teams",
+					Description: "Manage org groups",
+					Icon:        "gicon gicon-team",
+					Url:         setting.AppSubUrl + "/org/teams",
+				},
+			},
+		}
+
+		data.NavTree = append(data.NavTree, cfgNode)
+	}
+
 	data.NavTree = append(data.NavTree, &dtos.NavLink{
 		Text:         "Help",
 		SubTitle:     fmt.Sprintf(`%s v%s (%s)`, setting.ApplicationName, setting.BuildVersion, setting.BuildCommit),
@@ -44,7 +44,7 @@ func (hs *HTTPServer) LoginView(c *models.ReqContext) {
 	viewData.Settings["loginHint"] = setting.LoginHint
 	viewData.Settings["passwordHint"] = setting.PasswordHint
 	viewData.Settings["disableLoginForm"] = setting.DisableLoginForm
-	viewData.Settings["samlEnabled"] = setting.IsEnterprise && hs.Cfg.SAMLEnabled
+	viewData.Settings["samlEnabled"] = hs.Cfg.SAMLEnabled

 	if loginError, ok := tryGetEncryptedCookie(c, LoginErrorCookieName); ok {
 		//this cookie is only set whenever an OAuth login fails
@@ -81,7 +81,7 @@ func tryOAuthAutoLogin(c *models.ReqContext) bool {
 	}
 	oauthInfos := setting.OAuthService.OAuthInfos
 	if len(oauthInfos) != 1 {
-		log.Warn("Skipping OAuth auto login because multiple OAuth providers are configured")
+		log.Warn("Skipping OAuth auto login because multiple OAuth providers are configured.")
 		return false
 	}
 	for key := range setting.OAuthService.OAuthInfos {
@@ -114,16 +114,12 @@ func (hs *HTTPServer) LoginPost(c *models.ReqContext, cmd dtos.LoginCommand) Res
 	}

 	if err := bus.Dispatch(authQuery); err != nil {
-		e401 := Error(401, "Invalid username or password", err)
 		if err == login.ErrInvalidCredentials || err == login.ErrTooManyLoginAttempts {
-			return e401
+			return Error(401, "Invalid username or password", err)
 		}

-		// Do not expose disabled status,
-		// just show incorrect user credentials error (see #17947)
 		if err == login.ErrUserDisabled {
-			hs.log.Warn("User is disabled", "user", cmd.User)
-			return e401
+			return Error(401, "User is disabled", err)
 		}

 		return Error(500, "Error while trying to authenticate user", err)
@@ -142,7 +138,7 @@ func (hs *HTTPServer) LoginPost(c *models.ReqContext, cmd dtos.LoginCommand) Res
 		c.SetCookie("redirect_to", "", -1, setting.AppSubUrl+"/")
 	}

-	metrics.MApiLoginPost.Inc()
+	metrics.M_Api_Login_Post.Inc()
 	return JSON(200, result)
 }

@@ -199,18 +195,15 @@ func (hs *HTTPServer) trySetEncryptedCookie(ctx *models.ReqContext, cookieName s
 		return err
 	}

-	cookie := http.Cookie{
+	http.SetCookie(ctx.Resp, &http.Cookie{
 		Name:     cookieName,
 		MaxAge:   60,
 		Value:    hex.EncodeToString(encryptedError),
 		HttpOnly: true,
 		Path:     setting.AppSubUrl + "/",
 		Secure:   hs.Cfg.CookieSecure,
-	}
-	if hs.Cfg.CookieSameSite != http.SameSiteDefaultMode {
-		cookie.SameSite = hs.Cfg.CookieSameSite
-	}
-	http.SetCookie(ctx.Resp, &cookie)
+		SameSite: hs.Cfg.CookieSameSite,
+	})

 	return nil
 }
@@ -60,7 +60,7 @@ func (hs *HTTPServer) OAuthLogin(ctx *m.ReqContext) {
 	if code == "" {
 		state := GenStateString()
 		hashedState := hashStatecode(state, setting.OAuthService.OAuthInfos[name].ClientSecret)
-		hs.writeCookie(ctx.Resp, OauthStateCookieName, hashedState, 60, hs.Cfg.CookieSameSite)
+		hs.writeCookie(ctx.Resp, OauthStateCookieName, hashedState, 60)
 		if setting.OAuthService.OAuthInfos[name].HostedDomain == "" {
 			ctx.Redirect(connect.AuthCodeURL(state, oauth2.AccessTypeOnline))
 		} else {
@@ -73,7 +73,7 @@ func (hs *HTTPServer) OAuthLogin(ctx *m.ReqContext) {

 	// delete cookie
 	ctx.Resp.Header().Del("Set-Cookie")
-	hs.deleteCookie(ctx.Resp, OauthStateCookieName, hs.Cfg.CookieSameSite)
+	hs.deleteCookie(ctx.Resp, OauthStateCookieName)

 	if cookieState == "" {
 		ctx.Handle(500, "login.OAuthLogin(missing saved state)", nil)
@@ -191,18 +191,15 @@ func (hs *HTTPServer) OAuthLogin(ctx *m.ReqContext) {
 		return
 	}

-	// Do not expose disabled status,
-	// just show incorrect user credentials error (see #17947)
 	if cmd.Result.IsDisabled {
-		oauthLogger.Warn("User is disabled", "user", cmd.Result.Login)
-		hs.redirectWithError(ctx, login.ErrInvalidCredentials)
+		hs.redirectWithError(ctx, login.ErrUserDisabled)
 		return
 	}

 	// login
 	hs.loginUserWithUser(cmd.Result, ctx)

-	metrics.MApiLoginOAuth.Inc()
+	metrics.M_Api_Login_OAuth.Inc()

 	if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 {
 		ctx.SetCookie("redirect_to", "", -1, setting.AppSubUrl+"/")
@@ -213,23 +210,20 @@ func (hs *HTTPServer) OAuthLogin(ctx *m.ReqContext) {
 	ctx.Redirect(setting.AppSubUrl + "/")
 }

-func (hs *HTTPServer) deleteCookie(w http.ResponseWriter, name string, sameSite http.SameSite) {
-	hs.writeCookie(w, name, "", -1, sameSite)
+func (hs *HTTPServer) deleteCookie(w http.ResponseWriter, name string) {
+	hs.writeCookie(w, name, "", -1)
 }

-func (hs *HTTPServer) writeCookie(w http.ResponseWriter, name string, value string, maxAge int, sameSite http.SameSite) {
-	cookie := http.Cookie{
+func (hs *HTTPServer) writeCookie(w http.ResponseWriter, name string, value string, maxAge int) {
+	http.SetCookie(w, &http.Cookie{
 		Name:     name,
 		MaxAge:   maxAge,
 		Value:    value,
 		HttpOnly: true,
 		Path:     setting.AppSubUrl + "/",
 		Secure:   hs.Cfg.CookieSecure,
-	}
-	if sameSite != http.SameSiteDefaultMode {
-		cookie.SameSite = sameSite
-	}
-	http.SetCookie(w, &cookie)
+		SameSite: hs.Cfg.CookieSameSite,
+	})
 }

 func hashStatecode(code, seed string) string {
@@ -88,7 +88,7 @@ func CreateOrg(c *m.ReqContext, cmd m.CreateOrgCommand) Response {
 		return Error(500, "Failed to create organization", err)
 	}

-	metrics.MApiOrgCreate.Inc()
+	metrics.M_Api_Org_Create.Inc()

 	return JSON(200, &util.DynMap{
 		"orgId":   cmd.Result.Id,
@@ -188,8 +188,8 @@ func (hs *HTTPServer) CompleteInvite(c *m.ReqContext, completeInvite dtos.Comple

 	hs.loginUserWithUser(user, c)

-	metrics.MApiUserSignUpCompleted.Inc()
-	metrics.MApiUserSignUpInvite.Inc()
+	metrics.M_Api_User_SignUpCompleted.Inc()
+	metrics.M_Api_User_SignUpInvite.Inc()

 	return Success("User created and logged in")
 }
@@ -61,6 +61,6 @@ func Search(c *m.ReqContext) Response {
 		return Error(500, "Search failed", err)
 	}

-	c.TimeRequest(metrics.MApiDashboardSearch)
+	c.TimeRequest(metrics.M_Api_Dashboard_Search)
 	return JSON(200, searchQuery.Result)
 }
@@ -46,7 +46,7 @@ func SignUp(c *m.ReqContext, form dtos.SignUpForm) Response {
 		Code:  cmd.Code,
 	})

-	metrics.MApiUserSignUpStarted.Inc()
+	metrics.M_Api_User_SignUpStarted.Inc()

 	return JSON(200, util.DynMap{"status": "SignUpCreated"})
 }
@@ -110,7 +110,7 @@ func (hs *HTTPServer) SignUpStep2(c *m.ReqContext, form dtos.SignUpStep2Form) Re
 	}

 	hs.loginUserWithUser(user, c)
-	metrics.MApiUserSignUpCompleted.Inc()
+	metrics.M_Api_User_SignUpCompleted.Inc()

 	return JSON(200, apiResponse)
 }
@@ -335,8 +335,6 @@ func GetAuthProviderLabel(authModule string) string {
 		return "GitLab"
 	case "oauth_grafana_com", "oauth_grafananet":
 		return "grafana.com"
-	case "auth.saml":
-		return "SAML"
 	case "ldap", "":
 		return "LDAP"
 	default:
@@ -6,53 +6,37 @@ import (
 	"path/filepath"

 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
-	"golang.org/x/xerrors"
 )

 func GetGrafanaPluginDir(currentOS string) string {
-	if rootPath, ok := tryGetRootForDevEnvironment(); ok {
-		return filepath.Join(rootPath, "data/plugins")
+	if isDevEnvironment() {
+		return "../data/plugins"
 	}

 	return returnOsDefault(currentOS)
 }

-// getGrafanaRoot tries to get root of directory when developing grafana ie repo root. It is not perfect it just
-// checks what is the binary path and tries to guess based on that but if it is not running in dev env you get a bogus
-// path back.
-func getGrafanaRoot() (string, error) {
+func isDevEnvironment() bool {
+	// if ../conf/defaults.ini exists, grafana is not installed as package
+	// that its in development environment.
 	ex, err := os.Executable()
 	if err != nil {
-		return "", xerrors.New("Failed to get executable path")
+		logger.Error("Could not get executable path. Assuming non dev environment.")
+		return false
 	}
 	exPath := filepath.Dir(ex)
 	_, last := path.Split(exPath)
 	if last == "bin" {
 		// In dev env the executable for current platform is created in 'bin/' dir
-		return filepath.Join(exPath, ".."), nil
+		defaultsPath := filepath.Join(exPath, "../conf/defaults.ini")
+		_, err = os.Stat(defaultsPath)
+		return err == nil
 	}

 	// But at the same time there are per platform directories that contain the binaries and can also be used.
-	return filepath.Join(exPath, "../.."), nil
-}
-
-// tryGetRootForDevEnvironment returns root path if we are in dev environment. It checks if conf/defaults.ini exists
-// which should only exist in dev. Second param is false if we are not in dev or if it wasn't possible to determine it.
-func tryGetRootForDevEnvironment() (string, bool) {
-	rootPath, err := getGrafanaRoot()
-	if err != nil {
-		logger.Error("Could not get executable path. Assuming non dev environment.", err)
-		return "", false
-	}
-
-	devenvPath := filepath.Join(rootPath, "devenv")
-
-	_, err = os.Stat(devenvPath)
-	if err != nil {
-		return "", false
-	}
-
-	return rootPath, true
+	defaultsPath := filepath.Join(exPath, "../../conf/defaults.ini")
+	_, err = os.Stat(defaultsPath)
+	return err == nil
 }

 func returnOsDefault(currentOs string) string {
@@ -3,180 +3,103 @@ package metrics
 import (
 	"runtime"

-	"github.com/prometheus/client_golang/prometheus"
-
 	"github.com/grafana/grafana/pkg/setting"
+
+	"github.com/prometheus/client_golang/prometheus"
 )

 const exporterName = "grafana"

 var (
-	// MInstanceStart is a metric counter for started instances
-	MInstanceStart prometheus.Counter
+	M_Instance_Start       prometheus.Counter
+	M_Page_Status          *prometheus.CounterVec
+	M_Api_Status           *prometheus.CounterVec
+	M_Proxy_Status         *prometheus.CounterVec
+	M_Http_Request_Total   *prometheus.CounterVec
+	M_Http_Request_Summary *prometheus.SummaryVec

-	// MPageStatus is a metric page http response status
-	MPageStatus *prometheus.CounterVec
+	M_Api_User_SignUpStarted   prometheus.Counter
+	M_Api_User_SignUpCompleted prometheus.Counter
+	M_Api_User_SignUpInvite    prometheus.Counter
+	M_Api_Dashboard_Save       prometheus.Summary
+	M_Api_Dashboard_Get        prometheus.Summary
+	M_Api_Dashboard_Search     prometheus.Summary
+	M_Api_Admin_User_Create    prometheus.Counter
+	M_Api_Login_Post           prometheus.Counter
+	M_Api_Login_OAuth          prometheus.Counter
+	M_Api_Org_Create           prometheus.Counter

-	// MApiStatus is a metric api http response status
-	MApiStatus *prometheus.CounterVec
+	M_Api_Dashboard_Snapshot_Create      prometheus.Counter
+	M_Api_Dashboard_Snapshot_External    prometheus.Counter
+	M_Api_Dashboard_Snapshot_Get         prometheus.Counter
+	M_Api_Dashboard_Insert               prometheus.Counter
+	M_Alerting_Result_State              *prometheus.CounterVec
+	M_Alerting_Notification_Sent         *prometheus.CounterVec
+	M_Aws_CloudWatch_GetMetricStatistics prometheus.Counter
+	M_Aws_CloudWatch_ListMetrics         prometheus.Counter
+	M_Aws_CloudWatch_GetMetricData       prometheus.Counter
+	M_DB_DataSource_QueryById            prometheus.Counter

-	// MProxyStatus is a metric proxy http response status
-	MProxyStatus *prometheus.CounterVec
-
-	// MHttpRequestTotal is a metric http request counter
-	MHttpRequestTotal *prometheus.CounterVec
-
-	// MHttpRequestSummary is a metric http request summary
-	MHttpRequestSummary *prometheus.SummaryVec
-
-	// MApiUserSignUpStarted is a metric amount of users who started the signup flow
-	MApiUserSignUpStarted prometheus.Counter
-
-	// MApiUserSignUpCompleted is a metric amount of users who completed the signup flow
-	MApiUserSignUpCompleted prometheus.Counter
-
-	// MApiUserSignUpInvite is a metric amount of users who have been invited
-	MApiUserSignUpInvite prometheus.Counter
-
-	// MApiDashboardSave is a metric summary for dashboard save duration
-	MApiDashboardSave prometheus.Summary
-
-	// MApiDashboardGet is a metric summary for dashboard get duration
-	MApiDashboardGet prometheus.Summary
-
-	// MApiDashboardSearch is a metric summary for dashboard search duration
-	MApiDashboardSearch prometheus.Summary
-
-	// MApiAdminUserCreate is a metric api admin user created counter
-	MApiAdminUserCreate prometheus.Counter
-
-	// MApiLoginPost is a metric api login post counter
-	MApiLoginPost prometheus.Counter
-
-	// MApiLoginOAuth is a metric api login oauth counter
-	MApiLoginOAuth prometheus.Counter
-
-	// MApiLoginSAML is a metric api login SAML counter
-	MApiLoginSAML prometheus.Counter
-
-	// MApiOrgCreate is a metric api org created counter
-	MApiOrgCreate prometheus.Counter
-
-	// MApiDashboardSnapshotCreate is a metric dashboard snapshots created
-	MApiDashboardSnapshotCreate prometheus.Counter
-
-	// MApiDashboardSnapshotExternal is a metric external dashboard snapshots created
-	MApiDashboardSnapshotExternal prometheus.Counter
-
-	// MApiDashboardSnapshotGet is a metric loaded dashboards
-	MApiDashboardSnapshotGet prometheus.Counter
-
-	// MApiDashboardInsert is a metric dashboards inserted
-	MApiDashboardInsert prometheus.Counter
-
-	// MAlertingResultState is a metric alert execution result counter
-	MAlertingResultState *prometheus.CounterVec
-
-	// MAlertingNotificationSent is a metric counter for how many alert notifications been sent
-	MAlertingNotificationSent *prometheus.CounterVec
-
-	// MAwsCloudWatchGetMetricStatistics is a metric counter for getting metric statistics from aws
-	MAwsCloudWatchGetMetricStatistics prometheus.Counter
-
-	// MAwsCloudWatchListMetrics is a metric counter for getting list of metrics from aws
-	MAwsCloudWatchListMetrics prometheus.Counter
-
-	// MAwsCloudWatchGetMetricData is a metric counter for getting metric data time series from aws
-	MAwsCloudWatchGetMetricData prometheus.Counter
-
-	// MDBDataSourceQueryByID is a metric counter for getting datasource by id
-	MDBDataSourceQueryByID prometheus.Counter
-
-	// LDAPUsersSyncExecutionTime is a metric summary for LDAP users sync execution duration
-	LDAPUsersSyncExecutionTime prometheus.Summary
-)
-
-// Timers
-var (
-	// MDataSourceProxyReqTimer is a metric summary for dataproxy request duration
-	MDataSourceProxyReqTimer prometheus.Summary
-
-	// MAlertingExecutionTime is a metric summary of alert exeuction duration
-	MAlertingExecutionTime prometheus.Summary
+	// Timers
+	M_DataSource_ProxyReq_Timer prometheus.Summary
+	M_Alerting_Execution_Time   prometheus.Summary
 )

 // StatTotals
 var (
-	// MAlertingActiveAlerts is a metric amount of active alerts
-	MAlertingActiveAlerts prometheus.Gauge
+	M_Alerting_Active_Alerts prometheus.Gauge
+	M_StatTotal_Dashboards   prometheus.Gauge
+	M_StatTotal_Users        prometheus.Gauge
+	M_StatActive_Users       prometheus.Gauge
+	M_StatTotal_Orgs         prometheus.Gauge
+	M_StatTotal_Playlists    prometheus.Gauge

-	// MStatTotalDashboards is a metric total amount of dashboards
-	MStatTotalDashboards prometheus.Gauge
-
-	// MStatTotalUsers is a metric total amount of users
-	MStatTotalUsers prometheus.Gauge
-
-	// MStatActiveUsers is a metric number of active users
-	MStatActiveUsers prometheus.Gauge
-
-	// MStatTotalOrgs is a metric total amount of orgs
-	MStatTotalOrgs prometheus.Gauge
-
-	// MStatTotalPlaylists is a metric total amount of playlists
-	MStatTotalPlaylists prometheus.Gauge
-
-	// StatsTotalViewers is a metric total amount of viewers
-	StatsTotalViewers prometheus.Gauge
-
-	// StatsTotalEditors is a metric total amount of editors
-	StatsTotalEditors prometheus.Gauge
-
-	// StatsTotalAdmins is a metric total amount of admins
-	StatsTotalAdmins prometheus.Gauge
-
-	// StatsTotalActiveViewers is a metric total amount of viewers
+	StatsTotalViewers       prometheus.Gauge
+	StatsTotalEditors       prometheus.Gauge
+	StatsTotalAdmins        prometheus.Gauge
 	StatsTotalActiveViewers prometheus.Gauge
-
-	// StatsTotalActiveEditors is a metric total amount of active editors
 	StatsTotalActiveEditors prometheus.Gauge
+	StatsTotalActiveAdmins  prometheus.Gauge

-	// StatsTotalActiveAdmins is a metric total amount of active admins
-	StatsTotalActiveAdmins prometheus.Gauge
+	// M_Grafana_Version is a gauge that contains build info about this binary
+	//
+	// Deprecated: use M_Grafana_Build_Version instead.
+	M_Grafana_Version *prometheus.GaugeVec

-	// grafanaBuildVersion is a metric with a constant '1' value labeled by version, revision, branch, and goversion from which Grafana was built
+	// grafanaBuildVersion is a gauge that contains build info about this binary
 	grafanaBuildVersion *prometheus.GaugeVec
 )

 func init() {
-	httpStatusCodes := []string{"200", "404", "500", "unknown"}
-	MInstanceStart = prometheus.NewCounter(prometheus.CounterOpts{
+	M_Instance_Start = prometheus.NewCounter(prometheus.CounterOpts{
 		Name:      "instance_start_total",
 		Help:      "counter for started instances",
 		Namespace: exporterName,
 	})

-	MPageStatus = newCounterVecStartingAtZero(
+	httpStatusCodes := []string{"200", "404", "500", "unknown"}
+	M_Page_Status = newCounterVecStartingAtZero(
 		prometheus.CounterOpts{
 			Name:      "page_response_status_total",
 			Help:      "page http response status",
 			Namespace: exporterName,
 		}, []string{"code"}, httpStatusCodes...)

-	MApiStatus = newCounterVecStartingAtZero(
+	M_Api_Status = newCounterVecStartingAtZero(
 		prometheus.CounterOpts{
 			Name:      "api_response_status_total",
 			Help:      "api http response status",
 			Namespace: exporterName,
 		}, []string{"code"}, httpStatusCodes...)

-	MProxyStatus = newCounterVecStartingAtZero(
+	M_Proxy_Status = newCounterVecStartingAtZero(
 		prometheus.CounterOpts{
 			Name:      "proxy_response_status_total",
 			Help:      "proxy http response status",
 			Namespace: exporterName,
 		}, []string{"code"}, httpStatusCodes...)

-	MHttpRequestTotal = prometheus.NewCounterVec(
+	M_Http_Request_Total = prometheus.NewCounterVec(
 		prometheus.CounterOpts{
 			Name: "http_request_total",
 			Help: "http request counter",
@@ -184,7 +107,7 @@ func init() {
 		[]string{"handler", "statuscode", "method"},
 	)

-	MHttpRequestSummary = prometheus.NewSummaryVec(
+	M_Http_Request_Summary = prometheus.NewSummaryVec(
 		prometheus.SummaryOpts{
 			Name: "http_request_duration_milliseconds",
 			Help: "http request summary",
@@ -192,181 +115,169 @@ func init() {
 		[]string{"handler", "statuscode", "method"},
 	)

-	MApiUserSignUpStarted = newCounterStartingAtZero(prometheus.CounterOpts{
+	M_Api_User_SignUpStarted = newCounterStartingAtZero(prometheus.CounterOpts{
 		Name:      "api_user_signup_started_total",
 		Help:      "amount of users who started the signup flow",
 		Namespace: exporterName,
 	})

-	MApiUserSignUpCompleted = newCounterStartingAtZero(prometheus.CounterOpts{
+	M_Api_User_SignUpCompleted = newCounterStartingAtZero(prometheus.CounterOpts{
 		Name:      "api_user_signup_completed_total",
 		Help:      "amount of users who completed the signup flow",
 		Namespace: exporterName,
 	})

-	MApiUserSignUpInvite = newCounterStartingAtZero(prometheus.CounterOpts{
+	M_Api_User_SignUpInvite = newCounterStartingAtZero(prometheus.CounterOpts{
 		Name:      "api_user_signup_invite_total",
 		Help:      "amount of users who have been invited",
 		Namespace: exporterName,
 	})

-	MApiDashboardSave = prometheus.NewSummary(prometheus.SummaryOpts{
+	M_Api_Dashboard_Save = prometheus.NewSummary(prometheus.SummaryOpts{
 		Name:      "api_dashboard_save_milliseconds",
 		Help:      "summary for dashboard save duration",
 		Namespace: exporterName,
 	})

-	MApiDashboardGet = prometheus.NewSummary(prometheus.SummaryOpts{
+	M_Api_Dashboard_Get = prometheus.NewSummary(prometheus.SummaryOpts{
 		Name:      "api_dashboard_get_milliseconds",
 		Help:      "summary for dashboard get duration",
 		Namespace: exporterName,
 	})

-	MApiDashboardSearch = prometheus.NewSummary(prometheus.SummaryOpts{
+	M_Api_Dashboard_Search = prometheus.NewSummary(prometheus.SummaryOpts{
 		Name:      "api_dashboard_search_milliseconds",
 		Help:      "summary for dashboard search duration",
 		Namespace: exporterName,
 	})

-	MApiAdminUserCreate = newCounterStartingAtZero(prometheus.CounterOpts{
+	M_Api_Admin_User_Create = newCounterStartingAtZero(prometheus.CounterOpts{
 		Name:      "api_admin_user_created_total",
 		Help:      "api admin user created counter",
 		Namespace: exporterName,
 	})

-	MApiLoginPost = newCounterStartingAtZero(prometheus.CounterOpts{
+	M_Api_Login_Post = newCounterStartingAtZero(prometheus.CounterOpts{
 		Name:      "api_login_post_total",
 		Help:      "api login post counter",
 		Namespace: exporterName,
 	})

-	MApiLoginOAuth = newCounterStartingAtZero(prometheus.CounterOpts{
+	M_Api_Login_OAuth = newCounterStartingAtZero(prometheus.CounterOpts{
 		Name:      "api_login_oauth_total",
 		Help:      "api login oauth counter",
 		Namespace: exporterName,
 	})

-	MApiLoginSAML = newCounterStartingAtZero(prometheus.CounterOpts{
-		Name:      "api_login_saml_total",
-		Help:      "api login saml counter",
-		Namespace: exporterName,
-	})
-
-	MApiOrgCreate = newCounterStartingAtZero(prometheus.CounterOpts{
+	M_Api_Org_Create = newCounterStartingAtZero(prometheus.CounterOpts{
 		Name:      "api_org_create_total",
 		Help:      "api org created counter",
 		Namespace: exporterName,
 	})

-	MApiDashboardSnapshotCreate = newCounterStartingAtZero(prometheus.CounterOpts{
+	M_Api_Dashboard_Snapshot_Create = newCounterStartingAtZero(prometheus.CounterOpts{
 		Name:      "api_dashboard_snapshot_create_total",
 		Help:      "dashboard snapshots created",
 		Namespace: exporterName,
 	})

-	MApiDashboardSnapshotExternal = newCounterStartingAtZero(prometheus.CounterOpts{
+	M_Api_Dashboard_Snapshot_External = newCounterStartingAtZero(prometheus.CounterOpts{
 		Name:      "api_dashboard_snapshot_external_total",
 		Help:      "external dashboard snapshots created",
 		Namespace: exporterName,
 	})

-	MApiDashboardSnapshotGet = newCounterStartingAtZero(prometheus.CounterOpts{
+	M_Api_Dashboard_Snapshot_Get = newCounterStartingAtZero(prometheus.CounterOpts{
 		Name:      "api_dashboard_snapshot_get_total",
 		Help:      "loaded dashboards",
 		Namespace: exporterName,
 	})

-	MApiDashboardInsert = newCounterStartingAtZero(prometheus.CounterOpts{
+	M_Api_Dashboard_Insert = newCounterStartingAtZero(prometheus.CounterOpts{
 		Name:      "api_models_dashboard_insert_total",
 		Help:      "dashboards inserted ",
 		Namespace: exporterName,
 	})

-	MAlertingResultState = prometheus.NewCounterVec(prometheus.CounterOpts{
+	M_Alerting_Result_State = prometheus.NewCounterVec(prometheus.CounterOpts{
 		Name:      "alerting_result_total",
 		Help:      "alert execution result counter",
 		Namespace: exporterName,
 	}, []string{"state"})

-	MAlertingNotificationSent = prometheus.NewCounterVec(prometheus.CounterOpts{
+	M_Alerting_Notification_Sent = prometheus.NewCounterVec(prometheus.CounterOpts{
 		Name:      "alerting_notification_sent_total",
 		Help:      "counter for how many alert notifications been sent",
 		Namespace: exporterName,
 	}, []string{"type"})

-	MAwsCloudWatchGetMetricStatistics = newCounterStartingAtZero(prometheus.CounterOpts{
+	M_Aws_CloudWatch_GetMetricStatistics = newCounterStartingAtZero(prometheus.CounterOpts{
 		Name:      "aws_cloudwatch_get_metric_statistics_total",
 		Help:      "counter for getting metric statistics from aws",
 		Namespace: exporterName,
 	})

-	MAwsCloudWatchListMetrics = newCounterStartingAtZero(prometheus.CounterOpts{
+	M_Aws_CloudWatch_ListMetrics = newCounterStartingAtZero(prometheus.CounterOpts{
 		Name:      "aws_cloudwatch_list_metrics_total",
 		Help:      "counter for getting list of metrics from aws",
 		Namespace: exporterName,
 	})

-	MAwsCloudWatchGetMetricData = newCounterStartingAtZero(prometheus.CounterOpts{
+	M_Aws_CloudWatch_GetMetricData = newCounterStartingAtZero(prometheus.CounterOpts{
 		Name:      "aws_cloudwatch_get_metric_data_total",
 		Help:      "counter for getting metric data time series from aws",
 		Namespace: exporterName,
 	})

-	MDBDataSourceQueryByID = newCounterStartingAtZero(prometheus.CounterOpts{
+	M_DB_DataSource_QueryById = newCounterStartingAtZero(prometheus.CounterOpts{
 		Name:      "db_datasource_query_by_id_total",
 		Help:      "counter for getting datasource by id",
 		Namespace: exporterName,
 	})

-	LDAPUsersSyncExecutionTime = prometheus.NewSummary(prometheus.SummaryOpts{
-		Name:      "ldap_users_sync_execution_time",
-		Help:      "summary for LDAP users sync execution duration",
-		Namespace: exporterName,
-	})
-
-	MDataSourceProxyReqTimer = prometheus.NewSummary(prometheus.SummaryOpts{
+	M_DataSource_ProxyReq_Timer = prometheus.NewSummary(prometheus.SummaryOpts{
 		Name:      "api_dataproxy_request_all_milliseconds",
 		Help:      "summary for dataproxy request duration",
 		Namespace: exporterName,
 	})

-	MAlertingExecutionTime = prometheus.NewSummary(prometheus.SummaryOpts{
+	M_Alerting_Execution_Time = prometheus.NewSummary(prometheus.SummaryOpts{
 		Name:      "alerting_execution_time_milliseconds",
 		Help:      "summary of alert exeuction duration",
 		Namespace: exporterName,
 	})

-	MAlertingActiveAlerts = prometheus.NewGauge(prometheus.GaugeOpts{
+	M_Alerting_Active_Alerts = prometheus.NewGauge(prometheus.GaugeOpts{
 		Name:      "alerting_active_alerts",
 		Help:      "amount of active alerts",
 		Namespace: exporterName,
 	})

-	MStatTotalDashboards = prometheus.NewGauge(prometheus.GaugeOpts{
+	M_StatTotal_Dashboards = prometheus.NewGauge(prometheus.GaugeOpts{
 		Name:      "stat_totals_dashboard",
 		Help:      "total amount of dashboards",
 		Namespace: exporterName,
 	})

-	MStatTotalUsers = prometheus.NewGauge(prometheus.GaugeOpts{
+	M_StatTotal_Users = prometheus.NewGauge(prometheus.GaugeOpts{
 		Name:      "stat_total_users",
 		Help:      "total amount of users",
 		Namespace: exporterName,
 	})

-	MStatActiveUsers = prometheus.NewGauge(prometheus.GaugeOpts{
+	M_StatActive_Users = prometheus.NewGauge(prometheus.GaugeOpts{
 		Name:      "stat_active_users",
 		Help:      "number of active users",
 		Namespace: exporterName,
 	})

-	MStatTotalOrgs = prometheus.NewGauge(prometheus.GaugeOpts{
+	M_StatTotal_Orgs = prometheus.NewGauge(prometheus.GaugeOpts{
 		Name:      "stat_total_orgs",
 		Help:      "total amount of orgs",
 		Namespace: exporterName,
 	})

-	MStatTotalPlaylists = prometheus.NewGauge(prometheus.GaugeOpts{
+	M_StatTotal_Playlists = prometheus.NewGauge(prometheus.GaugeOpts{
 		Name:      "stat_total_playlists",
 		Help:      "total amount of playlists",
 		Namespace: exporterName,
@@ -408,69 +319,78 @@ func init() {
 		Namespace: exporterName,
 	})

+	M_Grafana_Version = prometheus.NewGaugeVec(prometheus.GaugeOpts{
+		Name:      "info",
+		Help:      "Information about the Grafana. This metric is deprecated. please use `grafana_build_info`",
+		Namespace: exporterName,
+	}, []string{"version"})
+
 	grafanaBuildVersion = prometheus.NewGaugeVec(prometheus.GaugeOpts{
 		Name:      "build_info",
-		Help:      "A metric with a constant '1' value labeled by version, revision, branch, and goversion from which Grafana was built",
+		Help:      "A metric with a constant '1' value labeled by version, revision, branch, and goversion from which Grafana was built.",
 		Namespace: exporterName,
 	}, []string{"version", "revision", "branch", "goversion", "edition"})
 }

 // SetBuildInformation sets the build information for this binary
 func SetBuildInformation(version, revision, branch string) {
+	// We export this info twice for backwards compatibility.
+	// Once this have been released for some time we should be able to remote `M_Grafana_Version`
+	// The reason we added a new one is that its common practice in the prometheus community
+	// to name this metric `*_build_info` so its easy to do aggregation on all programs.
 	edition := "oss"
 	if setting.IsEnterprise {
 		edition = "enterprise"
 	}

+	M_Grafana_Version.WithLabelValues(version).Set(1)
 	grafanaBuildVersion.WithLabelValues(version, revision, branch, runtime.Version(), edition).Set(1)
 }

 func initMetricVars() {
 	prometheus.MustRegister(
-		MInstanceStart,
-		MPageStatus,
-		MApiStatus,
-		MProxyStatus,
-		MHttpRequestTotal,
-		MHttpRequestSummary,
-		MApiUserSignUpStarted,
-		MApiUserSignUpCompleted,
-		MApiUserSignUpInvite,
-		MApiDashboardSave,
-		MApiDashboardGet,
-		MApiDashboardSearch,
-		MDataSourceProxyReqTimer,
-		MAlertingExecutionTime,
-		MApiAdminUserCreate,
-		MApiLoginPost,
-		MApiLoginOAuth,
-		MApiLoginSAML,
-		MApiOrgCreate,
-		MApiDashboardSnapshotCreate,
-		MApiDashboardSnapshotExternal,
-		MApiDashboardSnapshotGet,
-		MApiDashboardInsert,
-		MAlertingResultState,
-		MAlertingNotificationSent,
-		MAwsCloudWatchGetMetricStatistics,
-		MAwsCloudWatchListMetrics,
-		MAwsCloudWatchGetMetricData,
-		MDBDataSourceQueryByID,
-		LDAPUsersSyncExecutionTime,
-		MAlertingActiveAlerts,
-		MStatTotalDashboards,
-		MStatTotalUsers,
-		MStatActiveUsers,
-		MStatTotalOrgs,
-		MStatTotalPlaylists,
+		M_Instance_Start,
+		M_Page_Status,
+		M_Api_Status,
+		M_Proxy_Status,
+		M_Http_Request_Total,
+		M_Http_Request_Summary,
+		M_Api_User_SignUpStarted,
+		M_Api_User_SignUpCompleted,
+		M_Api_User_SignUpInvite,
+		M_Api_Dashboard_Save,
+		M_Api_Dashboard_Get,
+		M_Api_Dashboard_Search,
+		M_DataSource_ProxyReq_Timer,
+		M_Alerting_Execution_Time,
+		M_Api_Admin_User_Create,
+		M_Api_Login_Post,
+		M_Api_Login_OAuth,
+		M_Api_Org_Create,
+		M_Api_Dashboard_Snapshot_Create,
+		M_Api_Dashboard_Snapshot_External,
+		M_Api_Dashboard_Snapshot_Get,
+		M_Api_Dashboard_Insert,
+		M_Alerting_Result_State,
+		M_Alerting_Notification_Sent,
+		M_Aws_CloudWatch_GetMetricStatistics,
+		M_Aws_CloudWatch_ListMetrics,
+		M_Aws_CloudWatch_GetMetricData,
+		M_DB_DataSource_QueryById,
+		M_Alerting_Active_Alerts,
+		M_StatTotal_Dashboards,
+		M_StatTotal_Users,
+		M_StatActive_Users,
+		M_StatTotal_Orgs,
+		M_StatTotal_Playlists,
+		M_Grafana_Version,
 		StatsTotalViewers,
 		StatsTotalEditors,
 		StatsTotalAdmins,
 		StatsTotalActiveViewers,
 		StatsTotalActiveEditors,
 		StatsTotalActiveAdmins,
-		grafanaBuildVersion,
-	)
+		grafanaBuildVersion)

 }

@@ -46,7 +46,7 @@ func (im *InternalMetricsService) Run(ctx context.Context) error {
 		}
 	}

-	MInstanceStart.Inc()
+	M_Instance_Start.Inc()

 	<-ctx.Done()
 	return ctx.Err()
@@ -22,12 +22,8 @@ func parseRedisConnStr(connStr string) (*redis.Options, error) {
 	keyValueCSV := strings.Split(connStr, ",")
 	options := &redis.Options{Network: "tcp"}
 	for _, rawKeyValue := range keyValueCSV {
-		keyValueTuple := strings.SplitN(rawKeyValue, "=", 2)
+		keyValueTuple := strings.Split(rawKeyValue, "=")
 		if len(keyValueTuple) != 2 {
-			if strings.HasPrefix(rawKeyValue, "password") {
-				// don't log the password
-				rawKeyValue = "password******"
-			}
 			return nil, fmt.Errorf("incorrect redis connection string format detected for '%v', format is key=value,key=value", rawKeyValue)
 		}
 		connKey := keyValueTuple[0]
@@ -161,11 +161,11 @@ func (uss *UsageStatsService) updateTotalStats() {
 		return
 	}

-	metrics.MStatTotalDashboards.Set(float64(statsQuery.Result.Dashboards))
-	metrics.MStatTotalUsers.Set(float64(statsQuery.Result.Users))
-	metrics.MStatActiveUsers.Set(float64(statsQuery.Result.ActiveUsers))
-	metrics.MStatTotalPlaylists.Set(float64(statsQuery.Result.Playlists))
-	metrics.MStatTotalOrgs.Set(float64(statsQuery.Result.Orgs))
+	metrics.M_StatTotal_Dashboards.Set(float64(statsQuery.Result.Dashboards))
+	metrics.M_StatTotal_Users.Set(float64(statsQuery.Result.Users))
+	metrics.M_StatActive_Users.Set(float64(statsQuery.Result.ActiveUsers))
+	metrics.M_StatTotal_Playlists.Set(float64(statsQuery.Result.Playlists))
+	metrics.M_StatTotal_Orgs.Set(float64(statsQuery.Result.Orgs))
 	metrics.StatsTotalViewers.Set(float64(statsQuery.Result.Viewers))
 	metrics.StatsTotalActiveViewers.Set(float64(statsQuery.Result.ActiveViewers))
 	metrics.StatsTotalEditors.Set(float64(statsQuery.Result.Editors))
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dominik Prokop	962089bc2b	test	2019-07-12 15:08:35 +02:00
Dominik Prokop	ae61bb923f	Minor copy	2019-07-12 13:43:58 +02:00
Dominik Prokop	d69b54d41a	Run next packages release on master but not when tagged with release	2019-07-12 13:41:43 +02:00
Dominik Prokop	ceaa30d88e	Rename job and run it after frontend tests and build passes	2019-07-12 13:19:29 +02:00
Dominik Prokop	5e4971ac01	Set git creds before commit	2019-07-12 13:04:00 +02:00
Dominik Prokop	266d8cab89	Publish to npm	2019-07-12 12:53:37 +02:00
Dominik Prokop	1bf2ad37f3	Merge branch 'vvmaster' into packages/circle	2019-07-12 12:45:17 +02:00
Ryan McKinley	ca628832ab	grafana/toolkit: improve CircleCI integration (#18071 ) * don't actually install grafana in the setup step * updat eversion changes * add report stage * update versions * don't do failing test * upate version * print plugins * update versions * copy docs * Update package.json	2019-07-12 10:25:38 +02:00
Oleg Gaidarenko	1cbec50866	Build: consistently reference go binary (#18059 ) Before this applied, go binary is referenced inconsistently in makefile. Sometimes with go modules enabled and sometimes not, sometimes through a variable and sometimes not. This change makes all the references in makefile consistent	2019-07-11 20:55:35 +02:00
Andrej Ocenas	743f8420bc	devenv: Fix typo in nginix docker for mac (#18068 )	2019-07-11 18:13:01 +02:00
Tobias Skarhed	e1cec1069c	noImplicitAny: 1670 errors (#18035 ) * Sub 2000 errors * Down to 1670 errors * Minor fixes	2019-07-11 17:05:45 +02:00
Dominik Prokop	e9dd84f9d3	Remove postpublish	2019-07-11 16:05:49 +02:00
Dominik Prokop	660b9a3126	Packages version bump	2019-07-11 15:58:59 +02:00
Dominik Prokop	b924884240	Correct lerna version	2019-07-11 15:50:02 +02:00
Dominik Prokop	605de54852	Reset git befgore publishing package	2019-07-11 15:40:02 +02:00
Dominik Prokop	9b674b3944	update lerna publish script	2019-07-11 15:33:46 +02:00
Dominik Prokop	d249335a6c	Add publishing packages	2019-07-11 15:27:13 +02:00
Sofia Papagiannaki	6aa58182c7	Add missing pull requests to Changelog (#18061 )	2019-07-11 16:13:23 +03:00
Dominik Prokop	bcabffc25b	Typo fix	2019-07-11 14:42:28 +02:00
Dominik Prokop	e58e7cb4c5	Try any...	2019-07-11 14:41:05 +02:00
Dominik Prokop	74c118f1d1	Remove @types/lodas resolution	2019-07-11 14:34:16 +02:00
Dominik Prokop	ac9774e7bb	lerna add data package to ui	2019-07-11 14:18:07 +02:00
Dominik Prokop	31d619c7de	temporarily add tsignore	2019-07-11 14:08:42 +02:00
Dominik Prokop	ecac5d6931	add lerna bootstrap	2019-07-11 13:52:03 +02:00
Dominik Prokop	6e2c5eb52a	Remove cache tmp	2019-07-11 13:44:50 +02:00
Kyle Brandt	76d08989f0	provisioning: escape literal '$' with '$$' to avoid interpolation (#18045 ) fixes #17986	2019-07-11 07:32:07 -04:00
Dominik Prokop	a28c96090c	Install packages before release	2019-07-11 13:31:27 +02:00
Dominik Prokop	1292d203a8	Add packages:build	2019-07-11 13:26:59 +02:00
Dominik Prokop	2ed7ceb59d	Use packages cache, run lern via npx	2019-07-11 13:23:17 +02:00
Dominik Prokop	98908f7b98	Run lerna from local bin	2019-07-11 13:16:07 +02:00
Dominik Prokop	c8da0ac1c8	yarn fix	2019-07-11 13:10:14 +02:00
Dominik Prokop	add6a0d00a	Remove dependency on test task, fix yarn	2019-07-11 13:08:33 +02:00
Dominik Prokop	c74c7e24e2	Testing lerna on circle	2019-07-11 13:00:58 +02:00
Ryan McKinley	7ec87ee76b	grafana/toolkit: improve CircleCI stubs (#17995 ) * validate type and id * copy all svg and png, useful if people don't use the img folder * update comments * add stubs for each ci task * use ci-work folder rather than build * use axios for basic testing * Packages: publish packages@6.3.0-alpha.39 * bump version * add download task * Packages: publish packages@6.3.0-alpha.40 * merge all dist folders into one * fix folder paths * Fix ts error * Packages: publish packages@6.3.0-beta.0 * Packages: publish packages@6.3.0-beta.1 * bump next to 6.4 * Packages: publish packages@6.4.0-alpha.2 * better build and bundle tasks * fix lint * Packages: publish packages@6.4.0-alpha.3 * copy the file to start grafana * Packages: publish packages@6.4.0-alpha.4 * use sudo for copy * Packages: publish packages@6.4.0-alpha.5 * add missing service * add service and homepath * Packages: publish packages@6.4.0-alpha.6 * make the folder * Update packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts * Update packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts	2019-07-11 12:47:58 +02:00
Mikhail f. Shiryaev	5190949950	Docs: clarify the ttl units (#18039 )	2019-07-11 12:48:24 +03:00
Barry	6f4625bb78	Update docs readme for running MySQL/Postgres tests	2019-07-11 11:33:53 +03:00
Anthony Templeton	3680b95b44	Auth: Duplicate API Key Name Handle With Useful HTTP Code (#17905 ) * API: Duplicate API Key Name Handle With Useful HTTP Code * 17447: make changes requested during review - use dialect.IsUniqueContraintViolation - change if statement to match others - return error properly * Revert "17447: make changes requested during review" This reverts commit `a4a674ea83`. * API: useful http code on duplicate api key error w/ tests * API: API Key Duplicate Handling fixed small typo associated with error	2019-07-11 11:20:34 +03:00
Šimon Podlipský	04e7970375	Chore: upgrade node-sass to 4.12.0 (#18052 )	2019-07-11 09:18:27 +02:00
Sofia Papagiannaki	f2ad3242be	API: Minor fix for nil pointer when trying to log error during creating new dashboard via the API (#18003 ) * Minor fix for nil pointer when trying to log error * Do not return error if a dashboard is created Only log the failures * Do not return error if the folder is created Only log the failures	2019-07-11 09:45:29 +03:00
Ryan McKinley	aa89210c9d	Chore: update lodash (#18055 )	2019-07-10 23:37:52 -07:00
Sofia Papagiannaki	a5834d3250	Update latest.json (#18043 )	2019-07-10 20:24:17 +03:00
Sofia Papagiannaki	f5efef1370	Update Changelog (#18042 )	2019-07-10 19:42:23 +03:00
Sofia Papagiannaki	3bbc40a32f	Chore: bump master version number to 6.4.0-pre	2019-07-10 16:12:28 +03:00
kay delaney	bf7fb67f73	Explore/Loki: Display live tailed logs in correct order (#18031 ) Closes #18027	2019-07-10 13:57:23 +01:00